Commit 750036a8 authored Mar 12, 2014 by Peter Maydell

Merge remote-tracking branch 'remotes/afaerber/tags/prep-for-upstream' 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>

parents 2f23e9ae 21143b61

.gitmodules

+3 −0

Original line number	Diff line number	Diff line
		@@ -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

pc-bios/README

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

pc-bios/ohw.diff

deleted100644 → 0

+0 −1843

File deleted.

Preview size limit exceeded, changes collapsed.

pc-bios/ppc_rom.bin

(512 KiB)

File changed.

No diff preview for this file type.

View original file

View changed file

openhackware @ e9829b55

Original line number	Diff line number	Diff line
		Subproject commit e9829b5584169ad14df2ca8776b87f4985aa9f06