Commit 8e93b2c3 authored by Hervé Poussineau's avatar Hervé Poussineau Committed by David Gibson
Browse files

hw/ppc: on 40p machine, change default firmware to OpenBIOS 



OpenBIOS gained 40p support in 5b20e4ca
Use it, instead of relying on an unmaintained and very limited firmware.

Signed-off-by: default avatarHervé Poussineau <hpoussin@reactos.org>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent 9545f2e1

hw/ppc/prep.c

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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" },