aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2012-05-31 08:49:46 +0800
committerAnthony Liguori <aliguori@us.ibm.com>2012-05-31 08:49:46 +0800
commit272d28ecf2a2158c4bd89b42e5f45eb9e6201fde (patch)
treefbbc7a6b737ca074dfe1f30c3ccc687d7812a9bd
parentd6111501c15972e48b20a60ab0fdd726e84a3ed1 (diff)
parent6f12926142bd3ab5bea700decdeb59a16b9cd8ae (diff)
Merge remote-tracking branch 'origin/master' into staging
* origin/master: pc-bios: Update OpenBIOS images
-rw-r--r--pc-bios/README2
-rw-r--r--pc-bios/openbios-ppcbin729876 -> 729876 bytes
-rw-r--r--pc-bios/openbios-sparc32bin381764 -> 381764 bytes
-rw-r--r--pc-bios/openbios-sparc64bin1598648 -> 1598648 bytes
m---------roms/openbios0
5 files changed, 1 insertions, 1 deletions
diff --git a/pc-bios/README b/pc-bios/README
index 6b64d68681..e56e9e5f04 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 and Sparc64 are built from OpenBIOS SVN revision
- 1056.
+ 1060.
- 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 d4656db8b3..aeae265880 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 4312c690ab..d90c4e59a0 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 b186105089..457d264228 100644
--- a/pc-bios/openbios-sparc64
+++ b/pc-bios/openbios-sparc64
Binary files differ
diff --git a/roms/openbios b/roms/openbios
-Subproject ff61d973e5a4a68b29e485b3f88e6a2d1d96cf4
+Subproject d1d2787f87167edf487a60e61b9168514d5a743