| Message ID | 20180908161421.18089-1-hpoussin@reactos.org |
|---|---|
| State | New |
| Headers | show |
| Series | [v3] hw/ppc: on 40p machine, change default firmware to OpenBIOS | expand |
Am 08.09.2018 um 18:14 schrieb Hervé Poussineau: [...] > diff --git a/tests/boot-serial-test.c b/tests/boot-serial-test.c > index f123b15e3e..f865822e32 100644 > --- a/tests/boot-serial-test.c > +++ b/tests/boot-serial-test.c > @@ -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" }, I suggest using "Memory: 192 MiB" (like in the code for sam460ex above). Regards, Stefan Weil
Le 08/09/2018 à 18:20, Stefan Weil a écrit : > Am 08.09.2018 um 18:14 schrieb Hervé Poussineau: > [...] >> diff --git a/tests/boot-serial-test.c b/tests/boot-serial-test.c >> index f123b15e3e..f865822e32 100644 >> --- a/tests/boot-serial-test.c >> +++ b/tests/boot-serial-test.c >> @@ -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" }, > > I suggest using "Memory: 192 MiB" (like in the code for sam460ex above). No, because OpenBIOS doesn't print the "iB" letters... Hervé
On Sat, Sep 08, 2018 at 06:14:21PM +0200, Hervé Poussineau wrote: > OpenBIOS gained 40p support in 5b20e4cacecb62fb2bdc6867c11d44cddd77c4ff > Use it, instead of relying on an unmaintained and very limited firmware. > > Signed-off-by: Hervé Poussineau <hpoussin@reactos.org> Applied to ppc-for-3.1, thanks. > --- > 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(-) > > diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c > index 162b27a3b8..baca1d7c04 100644 > --- a/hw/ppc/prep.c > +++ b/hw/ppc/prep.c > @@ -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); > diff --git a/tests/boot-serial-test.c b/tests/boot-serial-test.c > index f123b15e3e..f865822e32 100644 > --- a/tests/boot-serial-test.c > +++ b/tests/boot-serial-test.c > @@ -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" },
diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c index 162b27a3b8..baca1d7c04 100644 --- a/hw/ppc/prep.c +++ b/hw/ppc/prep.c @@ -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); diff --git a/tests/boot-serial-test.c b/tests/boot-serial-test.c index f123b15e3e..f865822e32 100644 --- a/tests/boot-serial-test.c +++ b/tests/boot-serial-test.c @@ -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" },
OpenBIOS gained 40p support in 5b20e4cacecb62fb2bdc6867c11d44cddd77c4ff Use it, instead of relying on an unmaintained and very limited firmware. Signed-off-by: Hervé Poussineau <hpoussin@reactos.org> --- 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(-)