On Fri, Aug 10, 2018 at 04:41:54PM +1000, David Gibson wrote: > On Fri, Aug 10, 2018 at 07:37:12AM +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 <hpous...@reactos.org> > > Applied to ppc-for-3.1, thanks.
But I'm afraid I've had to pull it out. This breaks boot-serial-test, because the new firmware prints different messages than the old one did and the testcase isn't looking for them. I tried fixing it, but ran into complications I didn't have time to debug. So I'm afraid this will miss my coming-soon pull request. You should be able to reproduce the problem with "make check SPEED=slow", can you fix this up and resubmit. > > > --- > > hw/ppc/prep.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c > > index 3401570d98..1558855247 100644 > > --- a/hw/ppc/prep.c > > +++ b/hw/ppc/prep.c > > @@ -736,7 +736,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); > -- 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
signature.asc
Description: PGP signature