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 30b1b2db4cc..f9fae3aa160 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 6992add8d36..c9cf7cce647 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 9efb9c6c484..c3208780249 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 d260c1bbbe9..9f65ffa46f5 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 Hc-jL100001 literal 3304 zc-n1NZE#dq8Gi5XhPw?390G);AUz378yZS40SpABd&7sJrF4;20jbTF1c-zrh7B!P z?N+EIj+IR+Sgp>iz;c{cOGF(eqn+Ni)EV>#SV^(^!^J!FM|YfFXzU;XuFrcm0ouAV z=k7i4c|V``<6L!l7pcMES=aNPq^J`oDtc56eb{IVFVi2QIclcJ^pYSog$%pWqkc(c zD(QdRoAM5+h@cqwTmi8VDB0tZ#viXFxlhtmHJgHJFO9>0KqYCS8l=&#@P0u(-GV0c zPoN4=LTaY(t09rm_Cx0N0mC~Q55vNL)S&-?Y3Bdnt)r+~V-UP~6YDovA?S;^LJA7G zF-cUeW)iuU2vAS|a}@0_r^*J)8I`XjgGysHBD798A+`ugh)UJ%WVq4^Q#dj|TYKG) z*lGAD!LKqQy zO1-8h{VSl?K>spFLgFd4p2)f2`~DqzpHvH3<3*t941&6~@NQm5o{xEPyt-;k(-?N$10wOVfkHT^tfPC$#H z>GhxoG<`tt>)0plV+GKt0w&TsLFxQ4#soO99Q%6QG`Ty1f6q@RNhSHYWKoH#=1KxN z)n7u>IgXpL6Q5~`1JpQd4lK*o0 z@V3wCz_Z_J#PewzeBcCynPzymu)_lrH1E=UkaHC~e1cT(|YE$OR~^9;Ar9 zEKX_+1?+i(?8CZ7y08zTe_nH~z6eDRP$RjqK0#48*M|;sGibD^8}ADv?@4<3wTd%@ z+6}0abOe|R>T%<7V&e(s6K(gfY}KBJX2S!r>rbov(Q-cU|=Xs^-89kQCy zI`_{)jGv8<`{G873v`T0num$W@yX%%=EOw@ecBIKcCZu>vFA!1qic11!mEz|bVj6VG>`%<_?(1(Rt zcFeo1`{0IO$TbC6!<$<2S)MKL1iY-!I9%(6?X1ROB2E@@zhmm?332r#x^J;QGc~U$ zt1R>{s&r8IXSJqxI2Mud4swB9ds%cul>z)gOi!K&Ji_&{3=R7#)cvrq2Z9lpW}xo zMa~6yy3FqD69eWM>f^fFh?seHUtn*HD_X`>Gnbz@qKw?}o)%OA}*nyf+Z^GI}C}wS}`9+p`Bq->#eOK1cHGdAA$h zuW-{Tt~bHnql173wDCQ;P-|R-3?yl~It8z$ruh~{Rp4|3$H1JhGF6>6JluO1+{Ksy zA@yexTDEo=heL?f)t(&Gp7g-(bRZ&aaVdlEn_ol66nHQRd7Oq!@AXgM-+*1ArCPMq zPH;@6Nu}rY?K()s`fQgz+p4O3-;I5QZsEH&zyDJ1W=(Sbj1%0a?~0Kuau*oOU4|<( zg5K4)2Z9b|ZsN8;Qy1{$9{8y6O@dqxXZh-@x;9M*?PA#Qr?!CMKv3MOqg?Zrv-N?$ zsCDqX!N|FS?b?>mHDU3DGRyeugKzk-+5m-?WvCVYC0hznxM}pA7-DPm53RYBH4o+C z{Ve_VK2zzh`aL%?Ieh=dJ$2)|V&Hj3foGGJ7{qrRs!hwC)HmN2M0SKmYb)l>uZN-E zjeI@O$S;5iD(L2KY<;Zo;`;`K13~jP^J(1Cqf1K1j1}X`#+$`qGcws6{!KN_;z?8V zYtbk?%K0tCj|mga+oiu}@3R^6yU!i@>g>f;)fIPsXJ7aCe*S&)`SXuP@1D8nYxmr1 z{s64|Q(1G?jK`MTXQm5UI~wbz$L{(3rcX;UN1deA?Xtk63379LS6kC; zxgycp%1n