gwj / at91sam9263 · Commits

Commit 127fc407be0544a473a3a57c19adecdd6304b747

Authored by blueswir1
1 parent 9804c8e2

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
Inline Side-by-side
Showing 3 changed files with 6 additions and 6 deletions
hw/sun4m.c
  View file @127fc40
@@ -692,7 +692,7 @@ static const struct hwdef hwdefs[] = { @@ -692,7 +692,7 @@ static const struct hwdef hwdefs[] = {
692 .dma_base = 0x78400000, 692 .dma_base = 0x78400000,
693 .esp_base = 0x78800000, 693 .esp_base = 0x78800000,
694 .le_base = 0x78c00000, 694 .le_base = 0x78c00000,
695 - .apc_base = 0x7a000000, // XXX 0x6a000000, 695 + .apc_base = 0x6a000000,
696 .aux1_base = 0x71900000, 696 .aux1_base = 0x71900000,
697 .aux2_base = 0x71910000, 697 .aux2_base = 0x71910000,
698 .ecc_base = -1, 698 .ecc_base = -1,
@@ -735,8 +735,8 @@ static const struct hwdef hwdefs[] = { @@ -735,8 +735,8 @@ static const struct hwdef hwdefs[] = {
735 .esp_base = 0xef0800000ULL, 735 .esp_base = 0xef0800000ULL,
736 .le_base = 0xef0c00000ULL, 736 .le_base = 0xef0c00000ULL,
737 .apc_base = 0xefa000000ULL, // XXX should not exist 737 .apc_base = 0xefa000000ULL, // XXX should not exist
738 - .aux1_base = 0xff1900000ULL, // XXX 0xff1800000ULL,  
739 - .aux2_base = 0xff1910000ULL, // XXX 0xff1a01000ULL, 738 + .aux1_base = 0xff1800000ULL,
  739 + .aux2_base = 0xff1a01000ULL,
740 .ecc_base = 0xf00000000ULL, 740 .ecc_base = 0xf00000000ULL,
741 .ecc_version = 0x10000000, // version 0, implementation 1 741 .ecc_version = 0x10000000, // version 0, implementation 1
742 .sun4c_intctl_base = -1, 742 .sun4c_intctl_base = -1,
@@ -779,8 +779,8 @@ static const struct hwdef hwdefs[] = { @@ -779,8 +779,8 @@ static const struct hwdef hwdefs[] = {
779 .esp_base = 0xef0080000ULL, 779 .esp_base = 0xef0080000ULL,
780 .le_base = 0xef0060000ULL, 780 .le_base = 0xef0060000ULL,
781 .apc_base = 0xefa000000ULL, // XXX should not exist 781 .apc_base = 0xefa000000ULL, // XXX should not exist
782 - .aux1_base = 0xff1900000ULL, // XXX 0xff1800000ULL,  
783 - .aux2_base = 0xff1910000ULL, // XXX should not exist 782 + .aux1_base = 0xff1800000ULL,
  783 + .aux2_base = 0xff1a01000ULL, // XXX should not exist
784 .ecc_base = 0xf00000000ULL, 784 .ecc_base = 0xf00000000ULL,
785 .ecc_version = 0x00000000, // version 0, implementation 0 785 .ecc_version = 0x00000000, // version 0, implementation 0
786 .sun4c_intctl_base = -1, 786 .sun4c_intctl_base = -1,
pc-bios/README
  View file @127fc40
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 - OpenBIOS (http://www.openbios.org/) is a free (GPL v2) portable 14 - OpenBIOS (http://www.openbios.org/) is a free (GPL v2) portable
15 firmware implementation. The goal is to implement a 100% IEEE 15 firmware implementation. The goal is to implement a 100% IEEE
16 1275-1994 (referred to as Open Firmware) compliant firmware. 16 1275-1994 (referred to as Open Firmware) compliant firmware.
17 - The included Sparc32 image is built from SVN revision 183 17 + The included Sparc32 image is built from SVN revision 185
18 and Sparc64 from SVN revision 181. 18 and Sparc64 from SVN revision 181.
19 19
20 - The PXE roms come from Rom-o-Matic etherboot 5.4.2. 20 - The PXE roms come from Rom-o-Matic etherboot 5.4.2.
pc-bios/openbios-sparc32
View file @127fc40
No preview for this file type