Move AUX1 and AUX2 to correct locations

Update Sparc32 OpenBIOS image to SVN revision 185. Changes:
r184: Enforce malloc alignment
r185: Move AUX1 and AUX2 to correct locations, rename APC


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3946 c046a42c-6fe2-441c-8c8c-71466251a162

3 files changed, 6 insertions, 6 deletions

diff --git a/hw/sun4m.c b/hw/sun4m.c
index a0a17f29c3..8b3c49ddb5 100644
--- a/hw/sun4m.c
+++ b/hw/sun4m.c
@@ -692,7 +692,7 @@ static const struct hwdef hwdefs[] = {
         .dma_base     = 0x78400000,
         .esp_base     = 0x78800000,
         .le_base      = 0x78c00000,
-        .apc_base     = 0x7a000000, // XXX 0x6a000000,
+        .apc_base     = 0x6a000000,
         .aux1_base    = 0x71900000,
         .aux2_base    = 0x71910000,
         .ecc_base     = -1,
@@ -735,8 +735,8 @@ static const struct hwdef hwdefs[] = {
         .esp_base     = 0xef0800000ULL,
         .le_base      = 0xef0c00000ULL,
         .apc_base     = 0xefa000000ULL, // XXX should not exist
-        .aux1_base    = 0xff1900000ULL, // XXX 0xff1800000ULL,
-        .aux2_base    = 0xff1910000ULL, // XXX 0xff1a01000ULL,
+        .aux1_base    = 0xff1800000ULL,
+        .aux2_base    = 0xff1a01000ULL,
         .ecc_base     = 0xf00000000ULL,
         .ecc_version  = 0x10000000, // version 0, implementation 1
         .sun4c_intctl_base  = -1,
@@ -779,8 +779,8 @@ static const struct hwdef hwdefs[] = {
         .esp_base     = 0xef0080000ULL,
         .le_base      = 0xef0060000ULL,
         .apc_base     = 0xefa000000ULL, // XXX should not exist
-        .aux1_base    = 0xff1900000ULL, // XXX 0xff1800000ULL,
-        .aux2_base    = 0xff1910000ULL, // XXX should not exist
+        .aux1_base    = 0xff1800000ULL,
+        .aux2_base    = 0xff1a01000ULL, // XXX should not exist
         .ecc_base     = 0xf00000000ULL,
         .ecc_version  = 0x00000000, // version 0, implementation 0
         .sun4c_intctl_base  = -1,
diff --git a/pc-bios/README b/pc-bios/README
index 9ac14f4369..2fe8fa1efe 100644
--- a/pc-bios/README
+++ b/pc-bios/README
@@ -14,7 +14,7 @@
 - OpenBIOS (http://www.openbios.org/) is a free (GPL v2) portable
   firmware implementation. The goal is to implement a 100% IEEE
   1275-1994 (referred to as Open Firmware) compliant firmware.
-  The included Sparc32 image is built from SVN revision 183
+  The included Sparc32 image is built from SVN revision 185
   and Sparc64 from SVN revision 181.
 
 - The PXE roms come from Rom-o-Matic etherboot 5.4.2.
diff --git a/pc-bios/openbios-sparc32 b/pc-bios/openbios-sparc32
index 4b3ed2d912..c17053b0ad 100644
--- a/pc-bios/openbios-sparc32
+++ b/pc-bios/openbios-sparc32