aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2014-02-04 16:16:37 +0000
committerPeter Maydell <peter.maydell@linaro.org>2014-02-04 16:16:37 +0000
commit9396b05a5a35d344dc5eaed6fb0dff96c49d5f50 (patch)
tree74319248bff968ddc4bb5fb37c7084ee715ae5b4
parent8cfc114a2f293c40077d1bdb7500b29db359ca22 (diff)
parentfbb9c590cacf1cefb516f523427a920c2fe8c135 (diff)
Merge remote-tracking branch 'remotes/mcayland/qemu-openbios' into staging
* remotes/mcayland/qemu-openbios: Update OpenBIOS images Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rw-r--r--pc-bios/QEMU,tcx.binbin1242 -> 1410 bytes
-rw-r--r--pc-bios/README2
-rw-r--r--pc-bios/openbios-ppcbin729880 -> 729912 bytes
-rw-r--r--pc-bios/openbios-sparc32bin381488 -> 381512 bytes
-rw-r--r--pc-bios/openbios-sparc64bin1598328 -> 1598376 bytes
m---------roms/openbios0
6 files changed, 1 insertions, 1 deletions
diff --git a/pc-bios/QEMU,tcx.bin b/pc-bios/QEMU,tcx.bin
index a8ddd70ef3..eed108f3f1 100644
--- a/pc-bios/QEMU,tcx.bin
+++ b/pc-bios/QEMU,tcx.bin
Binary files differ
diff --git a/pc-bios/README b/pc-bios/README
index a110125a97..f1900686dc 100644
--- a/pc-bios/README
+++ b/pc-bios/README
@@ -12,7 +12,7 @@
1275-1994 (referred to as Open Firmware) compliant firmware.
The included images for PowerPC (for 32 and 64 bit PPC CPUs),
Sparc32 (including QEMU,tcx.bin) and Sparc64 are built from OpenBIOS SVN
- revision 1229.
+ revision 1246.
- SLOF (Slimline Open Firmware) is a free IEEE 1275 Open Firmware
implementation for certain IBM POWER hardware. The sources are at
diff --git a/pc-bios/openbios-ppc b/pc-bios/openbios-ppc
index 550273a5ef..f4a3a396c4 100644
--- a/pc-bios/openbios-ppc
+++ b/pc-bios/openbios-ppc
Binary files differ
diff --git a/pc-bios/openbios-sparc32 b/pc-bios/openbios-sparc32
index 01105fc904..bb7cdfb4ec 100644
--- a/pc-bios/openbios-sparc32
+++ b/pc-bios/openbios-sparc32
Binary files differ
diff --git a/pc-bios/openbios-sparc64 b/pc-bios/openbios-sparc64
index 62c9e77983..46b4fddd08 100644
--- a/pc-bios/openbios-sparc64
+++ b/pc-bios/openbios-sparc64
Binary files differ
diff --git a/roms/openbios b/roms/openbios
-Subproject d363cf50c50c268da7e6d0bf707adde1893d1ab
+Subproject 888126272f92294b0da45158393f1b862742cf6