hw/ppc: on 40p machine, change default firmware to OpenBIOS
PATCH v3 1/1 hw/ppc: on 40p machine, change default firmware to OpenBIOS
OpenBIOS gained 40p support in 5b20e4cacecb62fb2bdc6867c11d44cddd77c4ff Use it, instead of relying on an unmaintained and very limited firmware.
---
Changes v2->v3:
- rebased on dgibson/ppc-for-3.1
Changes v1->v2:
- rebased on master
- fixed tests
hw/ppc/prep.c | 2 +- tests/boot-serial-test.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
hw/ppc/prep.c +1 -1
@@ -651,7 +651,7 @@ static void ibm_40p_init(MachineState *machine)/* PCI host */ dev =qdev_create (NULL ,"raven-pcihost" );if (!bios_name) { - bios_name =BIOS_FILENAME ; + bios_name ="openbios-ppc" ; }qdev_prop_set_string (dev,"bios-name" , bios_name);qdev_prop_set_uint32 (dev,"elf-machine" ,PPC_ELF_MACHINE );
tests/boot-serial-test.c +2 -2
@@ -75,12 +75,12 @@ typedef struct testdef {static testdef_t tests[] = { {"alpha" ,"clipper" ,"" ,"PCI:" }, {"ppc" ,"ppce500" ,"" ,"U-Boot" }, - {"ppc" ,"40p" ,"-boot d" ,"Booting from device d" }, + {"ppc" ,"40p" ,"-vga none -boot d" ,"Trying cd:," }, {"ppc" ,"g3beige" ,"" ,"PowerPC,750" }, {"ppc" ,"mac99" ,"" ,"PowerPC,G4" }, {"ppc" ,"sam460ex" ,"-m 256" ,"DRAM: 256 MiB" }, {"ppc64" ,"ppce500" ,"" ,"U-Boot" }, - {"ppc64" ,"40p" ,"-m 192" ,"Memory size: 192 MB" }, + {"ppc64" ,"40p" ,"-m 192" ,"Memory: 192M" }, {"ppc64" ,"mac99" ,"" ,"PowerPC,970FX" }, {"ppc64" ,"pseries" ,"" ,"Open Firmware" }, {"ppc64" ,"powernv" ,"-cpu POWER8" ,"OPAL" },
Signature · 1 line
2.11.0
Le 08/09/2018 à 18:20, Stefan Weil a écrit :
Quoted 12 lines
Am 08.09.2018 um 18:14 schrieb Hervé Poussineau:
[...]Quoted 10 lines
tests/boot-serial-test.c +1
-1@@ -75,12 +75,12 @@ typedef struct testdef {static testdef_t tests[] = { {"alpha" ,"clipper" ,"" ,"PCI:" }, {"ppc" ,"ppce500" ,"" ,"U-Boot" }, - {"ppc" ,"40p" ,"-boot d" ,"Booting from device d" }, + {"ppc" ,"40p" ,"-vga none -boot d" ,"Trying cd:," },
Quoted 8 lines
tests/boot-serial-test.c typedef struct testdef { · line 83
Quoted 6 lines
tests/boot-serial-test.c +1
-1{ "ppc", "g3beige", "", "PowerPC,750" }, { "ppc", "mac99", "", "PowerPC,G4" }, { "ppc", "sam460ex", "-m 256", "DRAM: 256 MiB" }, { "ppc64", "ppce500", "", "U-Boot" }, - { "ppc64", "40p", "-m 192", "Memory size: 192 MB" }, + { "ppc64", "40p", "-m 192", "Memory: 192M" },I suggest using "Memory: 192 MiB" (like in the code for sam460ex above).
No, because OpenBIOS doesn't print the "iB" letters...
Hervé
Am 08.09.2018 um 18:14 schrieb Hervé Poussineau:
[...]
Quoted 6 lines
tests/boot-serial-test.c +0
-0@@ -75,12 +75,12 @@ typedef struct testdef {static testdef_t tests[] = {
tests/boot-serial-test.c typedef struct testdef { · line 83
Quoted 10 lines
tests/boot-serial-test.c +2
-2{ "alpha", "clipper", "", "PCI:" }, { "ppc", "ppce500", "", "U-Boot" }, - { "ppc", "40p", "-boot d", "Booting from device d" }, + { "ppc", "40p", "-vga none -boot d", "Trying cd:," }, { "ppc", "g3beige", "", "PowerPC,750" }, { "ppc", "mac99", "", "PowerPC,G4" }, { "ppc", "sam460ex", "-m 256", "DRAM: 256 MiB" }, { "ppc64", "ppce500", "", "U-Boot" }, - { "ppc64", "40p", "-m 192", "Memory size: 192 MB" }, + { "ppc64", "40p", "-m 192", "Memory: 192M" },
I suggest using "Memory: 192 MiB" (like in the code for sam460ex above).
Regards,
Stefan Weil
David Gibson
AppliedQuoted 4 lines · Hervé Poussineau
OpenBIOS gained 40p support in
5b20e4cacecb62fb2bdc6867c11d44cddd77c4ffUse it, instead of relying on an unmaintained and very limited firmware.Signed-off-by Hervé Poussineau <[email protected]>
Applied to ppc-for-3.1, thanks.
Quoted 44 lines
---
Changesv2->v3:
- rebased on dgibson/ppc-for-3.1Changes
v1->v2:
- rebased on master
- fixed testshw/ppc/prep.c | 2 +- tests/boot-serial-test.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)hw/ppc/prep.c +1
-1@@ -651,7 +651,7 @@ static void ibm_40p_init(MachineState *machine)/* PCI host */ dev =qdev_create (NULL ,"raven-pcihost" );if (!bios_name) { - bios_name =BIOS_FILENAME ; + bios_name ="openbios-ppc" ; }qdev_prop_set_string (dev,"bios-name" , bios_name);qdev_prop_set_uint32 (dev,"elf-machine" ,PPC_ELF_MACHINE );tests/boot-serial-test.c +2
-2@@ -75,12 +75,12 @@ typedef struct testdef {static testdef_t tests[] = { {"alpha" ,"clipper" ,"" ,"PCI:" }, {"ppc" ,"ppce500" ,"" ,"U-Boot" }, - {"ppc" ,"40p" ,"-boot d" ,"Booting from device d" }, + {"ppc" ,"40p" ,"-vga none -boot d" ,"Trying cd:," }, {"ppc" ,"g3beige" ,"" ,"PowerPC,750" }, {"ppc" ,"mac99" ,"" ,"PowerPC,G4" }, {"ppc" ,"sam460ex" ,"-m 256" ,"DRAM: 256 MiB" }, {"ppc64" ,"ppce500" ,"" ,"U-Boot" }, - {"ppc64" ,"40p" ,"-m 192" ,"Memory size: 192 MB" }, + {"ppc64" ,"40p" ,"-m 192" ,"Memory: 192M" }, {"ppc64" ,"mac99" ,"" ,"PowerPC,970FX" }, {"ppc64" ,"pseries" ,"" ,"Open Firmware" }, {"ppc64" ,"powernv" ,"-cpu POWER8" ,"OPAL" },
Signature · 4 lines
David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson