Commit b2ce76a0 authored by Thomas Huth's avatar Thomas Huth Committed by David Gibson
Browse files

hw/ppc/prep: Remove the deprecated "prep" machine and the OpenHackware BIOS 



It's been deprecated since QEMU v3.1. The 40p machine should be
used nowadays instead.

Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Acked-by: default avatarHervé Poussineau <hpoussin@reactos.org>
Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
Message-Id: <20200114114617.28854-1-thuth@redhat.com>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent 79a87336

.gitmodules

+0 −3
Original line number Diff line number Diff line
@@ -10,9 +10,6 @@ 
[submodule "roms/openbios"]

	path = roms/openbios

	url = https://git.qemu.org/git/openbios.git

[submodule "roms/openhackware"]

	path = roms/openhackware

	url = https://git.qemu.org/git/openhackware.git

[submodule "roms/qemu-palcode"]

	path = roms/qemu-palcode

	url = https://git.qemu.org/git/qemu-palcode.git

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -1103,7 +1103,6 @@ F: hw/dma/i82374.c 
F: hw/rtc/m48t59-isa.c

F: include/hw/isa/pc87312.h

F: include/hw/rtc/m48t59.h

F: pc-bios/ppc_rom.bin

F: tests/acceptance/ppc_prep_40p.py



sPAPR

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -784,7 +784,7 @@ ifdef INSTALL_BLOBS 
BLOBS=bios.bin bios-256k.bin bios-microvm.bin sgabios.bin vgabios.bin vgabios-cirrus.bin \

vgabios-stdvga.bin vgabios-vmware.bin vgabios-qxl.bin vgabios-virtio.bin \

vgabios-ramfb.bin vgabios-bochs-display.bin vgabios-ati.bin \

ppc_rom.bin openbios-sparc32 openbios-sparc64 openbios-ppc QEMU,tcx.bin QEMU,cgthree.bin \

openbios-sparc32 openbios-sparc64 openbios-ppc QEMU,tcx.bin QEMU,cgthree.bin \

pxe-e1000.rom pxe-eepro100.rom pxe-ne2k_pci.rom \

pxe-pcnet.rom pxe-rtl8139.rom pxe-virtio.rom \

efi-e1000.rom efi-eepro100.rom efi-ne2k_pci.rom \

docs/interop/firmware.json

+1 −2
Original line number Diff line number Diff line
@@ -27,8 +27,7 @@ 
#

# @openfirmware: The interface is defined by the (historical) IEEE

#                1275-1994 standard. Examples for firmware projects that

#                provide this interface are: OpenBIOS, OpenHackWare,

#                SLOF.

#                provide this interface are: OpenBIOS and SLOF.

#

# @uboot: Firmware interface defined by the U-Boot project.

#

hw/ppc/ppc.c

+0 −18
Original line number Diff line number Diff line
@@ -1490,24 +1490,6 @@ int ppc_dcr_init (CPUPPCState *env, int (*read_error)(int dcrn), 
}



/*****************************************************************************/

/* Debug port */

void PPC_debug_write (void *opaque, uint32_t addr, uint32_t val)

{

    addr &= 0xF;

    switch (addr) {

    case 0:

        printf("%c", val);

        break;

    case 1:

        printf("\n");

        fflush(stdout);

        break;

    case 2:

        printf("Set loglevel to %04" PRIx32 "\n", val);

        qemu_set_log(val | 0x100);

        break;

    }

}



int ppc_cpu_pir(PowerPCCPU *cpu)

{