Peppermint
/
debian-cd-clone
mirror of https://salsa.debian.org/images-team/debian-cd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Load the s390x initrd at 0x01000000 when using the ins loader. 

Currently the ins loader (mostly HMC loading into an LPAR) only
supports kernels up to 8 MiB. The jessie kernel has 11 MiB, which
does not fit and hence gets its tail overwritten by the initrd
(root.bin) loaded at this address. This change bumps the load
address to 16 MiB, which should allow for some more growth of
the kernel.

Signed-off-by: Philipp Kern <pkern@debian.org>
This commit is contained in:
Philipp Kern 2015-11-12 01:43:41 +01:00 committed by Steve McIntyre
parent 479c17d917
commit 35bbcda84e
5 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/jessie/s390x/d390.ins
View File

@ -3,4 +3,4 @@ linux_vm 0x00000000
root.off 0x0001040c root.off 0x0001040c
root.siz 0x00010414 root.siz 0x00010414
parmfile 0x00010480 parmfile 0x00010480
root.bin 0x00800000 root.bin 0x01000000

2
data/stretch/s390x/d390.ins
View File

@ -3,4 +3,4 @@ linux_vm 0x00000000
root.off 0x0001040c root.off 0x0001040c
root.siz 0x00010414 root.siz 0x00010414
parmfile 0x00010480 parmfile 0x00010480
root.bin 0x00800000 root.bin 0x01000000

2
debian/changelog vendored
View File

@ -35,6 +35,8 @@ debian-cd (3.1.18) UNRELEASED; urgency=medium
* Make stretch the default suite in the easy-build.sh script. * Make stretch the default suite in the easy-build.sh script.
[ Philipp Kern ] [ Philipp Kern ]
* Load the s390x initrd at 0x01000000 to allow kernels larger than
8 MiB (and smaller than 16 MiB) to be loaded via the ins loader.
* Drop the remaining s390 bits from stretch and jessie. (s390x remains.) * Drop the remaining s390 bits from stretch and jessie. (s390x remains.)
* Drop the d390oco loader from stretch and jessie. * Drop the d390oco loader from stretch and jessie.

2
tools/boot/jessie/boot-s390x
View File

@ -83,7 +83,7 @@ cp $BASEDIR/data/$CODENAME/$ARCH/d390* "$imagedir/"
sed -e 's,^[^*],boot/&,g' < $BASEDIR/data/$CODENAME/$ARCH/d390.ins > "boot$N/d390.ins" sed -e 's,^[^*],boot/&,g' < $BASEDIR/data/$CODENAME/$ARCH/d390.ins > "boot$N/d390.ins"
# Create the files specifying offset and size of the initrd # Create the files specifying offset and size of the initrd
perl -e "print pack('N', 0x800000)" >"$imagedir/root.off" perl -e "print pack('N', 0x1000000)" >"$imagedir/root.off"
perl -e "print pack('N', -s '$imagedir/root.bin')" >"$imagedir/root.siz" perl -e "print pack('N', -s '$imagedir/root.bin')" >"$imagedir/root.siz"
# Copy the README file # Copy the README file

2
tools/boot/stretch/boot-s390x
View File

@ -84,7 +84,7 @@ cp $BASEDIR/data/$CODENAME/$ARCH/d390* "$imagedir/"
sed -e 's,^[^*],boot/&,g' < $BASEDIR/data/$CODENAME/$ARCH/d390.ins > "boot$N/d390.ins" sed -e 's,^[^*],boot/&,g' < $BASEDIR/data/$CODENAME/$ARCH/d390.ins > "boot$N/d390.ins"
# Create the files specifying offset and size of the initrd # Create the files specifying offset and size of the initrd
perl -e "print pack('N', 0x800000)" >"$imagedir/root.off" perl -e "print pack('N', 0x1000000)" >"$imagedir/root.off"
perl -e "print pack('N', -s '$imagedir/root.bin')" >"$imagedir/root.siz" perl -e "print pack('N', -s '$imagedir/root.bin')" >"$imagedir/root.siz"
# Copy the README file # Copy the README file