Merge tag 'tags/s390x-2018-06-18' into staging
commit49b67e9440892179c016a7afd33725a50d995ba6
authorCornelia Huck <cohuck@redhat.com>
Mon, 18 Jun 2018 15:05:27 +0000 (18 17:05 +0200)
committerCornelia Huck <cohuck@redhat.com>
Mon, 18 Jun 2018 15:05:39 +0000 (18 17:05 +0200)
tree297624c0beb55d315550dcb8180b0efef0ecf0c0
parent23ad956bff98d949057156ea3f68a9763c2dda0e
parent4046826d46618ef7eb11df41fe8878669ce6991c
Merge tag 'tags/s390x-2018-06-18' into staging

Add support for pxelinux.cfg-style network booting to the s390x firmware

# gpg: Signature made Mon 18 Jun 2018 03:59:06 PM CEST
# gpg:                using RSA key 2ED9D774FE702DB5
# gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [full]
# gpg:                 aka "Thomas Huth <thuth@redhat.com>" [undefined]
# gpg:                 aka "Thomas Huth <huth@tuxfamily.org>" [undefined]
# gpg:                 aka "Thomas Huth <th.huth@posteo.de>" [unknown]

* tag 'tags/s390x-2018-06-18':
  pc-bios/s390-ccw: Update the s390-netboot.img binary
  pc-bios/s390-ccw: Optimize the s390-netboot.img for size
  pc-bios/s390-ccw/net: Try to load pxelinux.cfg file accoring to the UUID
  pc-bios/s390-ccw/net: Add support for pxelinux-style config files
  pc-bios/s390-ccw/net: Update code for the latest changes in SLOF
  roms: Update SLOF submodule to current status
  pc-bios/s390-ccw: define loadparm length

Signed-off-by: Cornelia Huck <cohuck@redhat.com>