From 6e9965d429f22cf68d47aa6397f7d5b0eff913cc Mon Sep 17 00:00:00 2001
From: Michael Tokarev <mjt@tls.msk.ru>
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 <mjt@tls.msk.ru>
Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com>
---
 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
zcmZ4fqmp6y7v?LEKYXZQP&p95z`z>2{P+6=M}ZFucCs)SF4q)TFo{8cVYxH|qodLX
zhMfuwLd#43f1A|sVbO940R{(w4+|a(1TZkLOltVBbdv&u@Fpb&g$@M<ndN#6%*$IC
z1efbEFfA`(5MBO-f%~z*hZPJHI|Ud-c8V}4F8{*7vRw23|K-007J%(%VgGlP@x!tJ
zj^!o)zb^ms{}ns?>pdSL7*v)AGBWIBVK}stg<<nf76z8(B@7ae1r!7rSROklFffQM
z*JNOLY#_kIFmY!)gUU`Z1|<)J18lFA7#JCN9gGB6A_NYwfNXrN#K6M9yIhKa@v*`I
z4h9Yh)1~JB{!2J64`g5rU{K(25K!QIyg`A1LB+v9fhR!V0LUip#|j4o7+5?66qrCd
z9Rw7Z9t#|hU|<2ejm5!1fQkLz>+>HH7*q~iU|?W5y8QS5h@C79PCHo`f;X{(!so*R
zkWU#HUK=v-Fz`GU04dwq&Y-xHg@JV^3&X*k91P6Mzc461R&d~8U};uiW!TBY5W2jD
zK@6lH>^lLF84&$D+Zl9rDl#xHS7BgVuED^#{0oCnGXsOmV+98Z2A1WL3=EGI6qpz$
zMk+Y4EN}ULeYpk$!*U4*hUFFv3;_ZTppZ~{EC90UvBO7@KhA&TU|?}D5a0o;Fc9Ei
z|FZlG0|N-Ze*d9>LFItJ|Nl4hmjC{rFcp**S{PJ!vM>mN;?Ge)fKkFx+6gRP^8eRP
z76zl8A`C7E6#oCeS+hKnf#JZ@|NsBXgZU-PEg2YIzyBz}z;fWr|Ns9pAZ+%3?Ch`C
ze+XbuS^oRK2gs#6Sr``YWMMe6Jd%NNxhI1_=K%)J#|j@-FsL{hd{_`5@L>ViyqM(@
z49NikAC`dZ`1f`v3xm~85e6TyoZs?DMrN@1Lq~%T+n0MXFoMOMmPax&fyJ+a`Boq|
zf%yLwA3J>1U|@Ny@L@Z{gxBjqVZ#0etPkYYP3-KT+`)Y7wK9VO1J7$?1_K73<=UW>
z6u`jHu#<;D8RQQThWO>RFj&R!{|U?Gm_Vs_(@qwKrOR6w*uZK23xn!wVUS4&6c`v-
z%q0#kKgGZZc8BNEV+;&CMHsZ<{sDzx(Q-wG|I1q#SU|A?3Xh#E3|c!S7<3*xfWq_j
z`VSu%SlGY3&i`NlNr%jxp!nL!#Gtgigi!@#@;?DkJl^Qs$-?mHz=r?-Z*&|e`2YXL
z&I1Ym|KF%T(D48Njme<A4pvouV8Z|ZH)ezQj~N~?Fia3)Sl+_$;IYC3MurKF0S`dw
z*6Fdp115$E%Y7Ln99;q!mh&+%IhqJCI4%|dsV!a3$H2V2gkkSvgAEc4DpMH}7#=%p
z5MWSw{9pqEgUaIt8x$B+9tUjTU{G0J!mw(u;su7~k_=4Ck1#BGtPmi;F!6Cf00#rh
zPB8|f#{mr-3@WdkLHYT$F*px<^Z$1|@IW>|p#c=OdXB~c437g2a4@huHfR9Z5io&+
zLB-L;fMu!q2ZqN64H670%RLwv9UKf89y=TmV3-)-Fo9vG7=sChsUVXKCI}$wo`9r#
z63YW{4xPl90LmeLpwPO0AL2($|AF!a+>aJuKbA0<JQe`^PXX#b!vKK-26T5kRww|4
zj3fh-qp<?mkB<!sP+V1j#Z_R}%$UR|!0=e$0W-sdoh%Hmc5*R1TpsdYZmE3(1E?$k
zr-f-t<r_3WIpF%q2m=9@rSc5|0R{>Tj~xUU7(hIU#|}&q3@VQmK>WuFOrW>|r!<fW
zuk$}#0Hrphd<!b^jFv0>|G&J1!RoPq0t3SYP|9ZJ_E1n@a8UTL48&t{a8y)an98mI
zN+0SwSr`r<Sir!*Wa_x#!!l6);B2^n!STQWMkj+0%RsLDd-$=y0S2%yw0ANw2re)A
z{{d{y0<i2BkXt~d&~i-%Mrc{K{=*ND%OH6WR1zN$U|?VZg~K7R&Q?&_a*64~QUP$u
z^mmfuh7U`@;UKz`g~1w>-<L-+fJ=x!M|O%Z*ns8O!S)FVDM9it1Jm*^;QXl#7B4tp
zz`($GX}Jdj!{dMtOBp6C*I;CLEMUOEFhNpuc?koDlfwdV$S?oGAh6tvfpNJt1LJZv
zs9)^BX82+HVYws&BRC{gK>lR^_j*65E(FyvOxmEl4H8|tzd>R7Nd>T9{(;H{vBw4*
zK)FC+0|NsK*yP>I_5c3|)t<{s7+4QHWnf@*aon&$;41qCh7F)}6|>xvfnj;c|EHkv
zVf+Qw!@gY8m0`Igb0Vm8d~5)!5gip2IF^h5|G8XJf#dala43IdXMf%Q!2wim|4n$T
z04m5F4}jYZHegdyKw-~#^D6U)1>h2a18l<;kldduQyIXuYntPR0}7zB=UV6TFAQ#v
zCp0iHusjw3x&HBj4H672J6XW>q$Nn#Uuz+y<s}Tt%TF>eJeHZjz`z1Z6+2lNqCkEC
zsa)Q|AhY~D<A>!f|DQg#nZUuovivlI09da%G#nN!FZur%?2>69@jnxne_>E|+^|8x
zQQ*^poeB&am$xuTKNi>^&M;xQ90SwxmjBzA%P}x6FJTY>>&gV{Dtj!jL54w`_aV4;
z{ldTnma7EIWh~eD|NpVWX8{IqUHiKK(*s1B1jQfYc2GXOCIE{?P%dC}eGCdNkbl9U
z_vh$U<^v21Ksf~xZWds(EkGsr)z6SN$zuahIDy62fzu}YfddQ-jE>8{FqlKa@G7$a
zvKeAvwPGOKuU=dp!N9QGgYm&*0Z<-yG!Ou%2?K`ZB@FCBpw<VdhUZuw#lYxjV8FQC
z?f)l71pxs_O#`mKSwOZi+y?uc7i9A9*E?Albik}<AW??PVD<w@9kpEZ|9^;X_AiKb
z#noO=D1gc)u#PW}4Fnh%!1dMdBOu-X(}k3lFJa&Y$uhD-S_~lDe{Y4b+5a)X022cv
zg8+=fz`(%o<N)FQ|If(4z{teR&dFZS&d$!w!^_7nASfiv&c(qlA;}H}GVJVJ;?iIa
zD;qmIyBLVc0wP32*`*ZzH@CDdU~g+*60K*Wp{=Oa)X~|su!p_(VXTUlrgfaIK6@WK
zJ9~e_Qg$8HcsqOc2_T*9>;(x{$`0zbO6-YA$tkI6=^2^p*0Zy-fBcb^os*lFUr<=I
zZ23g?N$k(+ic3n%$}1|X)~*KWoIPjmFLrkJHLKZI)qwcbj!w=lu5Rugp6rvSOkKoY
z>*ej^>*pU37{orUar)vJG2eniLc_u%BBTDY&tzw3H!w6ZHZe6bx3FYqpT*A34hac8
z23{@(23<P^23ISERHH;L1_dsN41}!m4DexK$jmEC%*jkq$W2VoOlC++%*;tmQOL<p
zOv%hkS13+R&rQuM;ev@5mFDGv#H%t3a<~{6$})>eGV|k$QWH~PDquQ6Dy$S3{PGnb
ziWEQs3TgSJc`14dZizWLAY+meld}~{@)dFu^GXwQ6jD;t5=(PR6jJj_iYj4l;9_ut
hxTz!`ETrHctdLfepR16OSd^lWl3ARM;wc6O1^^%a+dcpQ