aboutsummaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorblueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162>2008-02-01 20:12:40 +0000
committerblueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162>2008-02-01 20:12:40 +0000
commit127fc407be0544a473a3a57c19adecdd6304b747 (patch)
treec3c47916230647008db74ed59519a342a69fc983 /hw
parent9804c8e203dae31e31c198d5bfddfe880c81d08b (diff)
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
Diffstat (limited to 'hw')
-rw-r--r--hw/sun4m.c10
1 files changed, 5 insertions, 5 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,