Skip to content

Commit

Permalink
Merge remote-tracking branch 'remotes/afaerber/tags/prep-for-upstream…
Browse files Browse the repository at this point in the history
…' into staging

PReP machine and devices

* ppc_rom.bin update and submodule

# gpg: Signature made Wed 12 Mar 2014 17:32:40 GMT using RSA key ID 3E7E013F
# gpg: Good signature from "Andreas Färber <afaerber@suse.de>"
# gpg:                 aka "Andreas Färber <afaerber@suse.com>"

* remotes/afaerber/tags/prep-for-upstream:
  prep: Update ppc_rom.bin
  Add OpenHack'Ware submodule

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
  • Loading branch information
pm215 committed Mar 12, 2014
2 parents 2f23e9a + 21143b6 commit 750036a
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 1,844 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Expand Up @@ -13,6 +13,9 @@
[submodule "roms/openbios"]
path = roms/openbios
url = git://git.qemu-project.org/openbios.git
[submodule "roms/openhackware"]
path = roms/openhackware
url = git://git.qemu-project.org/openhackware.git
[submodule "roms/qemu-palcode"]
path = roms/qemu-palcode
url = git://github.com/rth7680/qemu-palcode.git
Expand Down
2 changes: 1 addition & 1 deletion pc-bios/README
Expand Up @@ -5,7 +5,7 @@
project (http://www.nongnu.org/vgabios/).

- The PowerPC Open Hack'Ware Open Firmware Compatible BIOS is
available at http://perso.magic.fr/l_indien/OpenHackWare/index.htm.
available at http://repo.or.cz/w/openhackware.git.

- OpenBIOS (http://www.openbios.org/) is a free (GPL v2) portable
firmware implementation. The goal is to implement a 100% IEEE
Expand Down

0 comments on commit 750036a

Please sign in to comment.