From 6e9965d429f22cf68d47aa6397f7d5b0eff913cc Mon Sep 17 00:00:00 2001 From: Michael Tokarev Date: Wed, 10 Feb 2016 14:02:44 +0300 Subject: [PATCH] s390x: remove s390-zipl.rom This is an s390 boot rom which was used in s390-virtio machine. but since commit 3538fb6f89dd9bb2e7e59de2bfad52a45321c744 "s390x: remove s390-virtio machine", this file isn't used. The only place it is referenced in the code is an unused define ZIPL_FILENAME. There's also comment in hw/s390/ipl.c which I'm modifying too, to refer to s390-ccw.img instead. Signed-off-by: Michael Tokarev Acked-by: Christian Borntraeger Acked-by: Cornelia Huck --- Makefile | 1 - hw/s390x/ipl.c | 2 +- hw/s390x/s390-virtio.c | 1 - pc-bios/README | 4 ---- pc-bios/s390-zipl.rom | Bin 3304 -> 0 bytes 5 files changed, 1 insertion(+), 7 deletions(-) delete mode 100644 pc-bios/s390-zipl.rom diff --git a/Makefile b/Makefile index 30b1b2db4c..f9fae3aa16 100644 --- a/Makefile +++ b/Makefile @@ -400,7 +400,6 @@ efi-pcnet.rom efi-rtl8139.rom efi-virtio.rom \ qemu-icon.bmp qemu_logo_no_text.svg \ bamboo.dtb petalogix-s3adsp1800.dtb petalogix-ml605.dtb \ multiboot.bin linuxboot.bin kvmvapic.bin \ -s390-zipl.rom \ s390-ccw.img \ spapr-rtas.bin slof.bin \ palcode-clipper \ diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c index 6992add8d3..c9cf7cce64 100644 --- a/hw/s390x/ipl.c +++ b/hw/s390x/ipl.c @@ -106,7 +106,7 @@ static void s390_ipl_realize(DeviceState *dev, Error **errp) /* Adjust ELF start address to final location */ ipl->bios_start_addr += fwbase; } else { - /* Try to load non-ELF file (e.g. s390-zipl.rom) */ + /* Try to load non-ELF file (e.g. s390-ccw.img) */ bios_size = load_image_targphys(bios_filename, ZIPL_IMAGE_START, 4096); ipl->bios_start_addr = ZIPL_IMAGE_START; diff --git a/hw/s390x/s390-virtio.c b/hw/s390x/s390-virtio.c index 9efb9c6c48..c320878024 100644 --- a/hw/s390x/s390-virtio.c +++ b/hw/s390x/s390-virtio.c @@ -54,7 +54,6 @@ #endif #define MAX_BLK_DEVS 10 -#define ZIPL_FILENAME "s390-zipl.rom" #define S390_MACHINE "s390-virtio" #define TYPE_S390_MACHINE MACHINE_TYPE_NAME(S390_MACHINE) diff --git a/pc-bios/README b/pc-bios/README index d260c1bbbe..9f65ffa46f 100644 --- a/pc-bios/README +++ b/pc-bios/README @@ -35,10 +35,6 @@ 10ec:8139 -> pxe-rtl8139.rom 1af4:1000 -> pxe-virtio.rom -- The S390 zipl loader is an addition to the official IBM s390-tools - package. That fork is maintained in its own git repository at: - git://repo.or.cz/s390-tools.git - - The sources for the Alpha palcode image is available from: git://github.com/rth7680/qemu-palcode.git diff --git a/pc-bios/s390-zipl.rom b/pc-bios/s390-zipl.rom deleted file mode 100644 index 3115128efe465a024b2deb780573358ae1b829a4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3304 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 NSI^ydeF_wS{{kQW+dcpQ -- 2.50.1