Merge ~xnox/debian-cd/+git/ubuntu:x13s into ~ubuntu-cdimage/debian-cd/+git/ubuntu:main

[Dimitri John Ledkov]

Implement x13s boot support

Extract and use a dtb. Currently done inside menu entries, such that it
is visible to end user editing the menu entry interactively.

Expecting no changes on any other arm64 images, specifically server
image, preinstalled uefi and tegra.

EXTRA_CMDLINE explicitly does not use args _after_ ---, such that
this setting can be managed with package upgrades and grub.d snippets.

Note yet tested

[Steve Langasek (vorlon)]

review: Approve

diff --git a/tools/boot/mantic/boot-arm64 b/tools/boot/mantic/boot-arm64
index fd7fbbe..cc96a63 100755
--- a/tools/boot/mantic/boot-arm64
+++ b/tools/boot/mantic/boot-arm64
@@ -15,10 +15,19 @@ cd $CDDIR/..
 
 > $N.mkisofs_opts
 
-FLAVOUR=generic
-if [ "$SUBARCH" = "tegra" ]; then
-    FLAVOUR=nvidia-tegra
-fi
+case "$SUBARCH" in
+    tegra)
+	FLAVOUR=nvidia-tegra
+	;;
+    x13s)
+	FLAVOUR=laptop
+	DTB="usr/lib/firmware/*/device-tree/qcom/sc8280xp-lenovo-thinkpad-x13s.dtb"
+	EXTRA_CMDLINE="clk_ignore_unused pd_ignore_unused"
+	;;
+    *)
+	FLAVOUR=generic
+	;;
+esac
 
 # rename kernel+initrd
 mv $CDDIR/casper/filesystem.kernel-$FLAVOUR $CDDIR/casper/vmlinuz
@@ -30,6 +39,15 @@ if [ -e $CDDIR/casper/filesystem.kernel-$FLAVOUR-hwe ]; then
     mv $CDDIR/casper/filesystem.initrd-$FLAVOUR-hwe $CDDIR/casper/hwe-initrd
 fi
 
+# extract dtb
+if [ -n "$DTB" ]; then
+    unsquashfs -i -d $CDDIR/casper/squashfs-root $CDDIR/casper/minimal.squashfs -e "$DTB"
+    mv $CDDIR/casper/squashfs-root/$DTB $CDDIR/casper/
+    rm -rf $CDDIR/casper/squashfs-root
+    DTB_COMMAND="
+	devicetree /casper/$(basename $DTB)"
+fi
+
 # download, extract and include cd-boot-images
 mkdir cd-boot-images
 $BASEDIR/tools/apt-selection download cd-boot-images-arm64
@@ -48,8 +66,8 @@ set menu_color_highlight=black/light-gray
 
 menuentry "Try or Install $HUMANPROJECT" {
 	set gfxpayload=keep
-	linux	/casper/vmlinuz quiet ---
-	initrd	/casper/initrd
+	linux	/casper/vmlinuz"${EXTRA_CMDLINE+ $EXTRA_CMDLINE}" quiet ---
+	initrd	/casper/initrd$DTB_COMMAND
 }
 EOF
 
@@ -57,8 +75,8 @@ if [ "$HWE" ]; then
     cat >> $CDDIR/boot/grub/grub.cfg <<EOF
 menuentry "$HUMANPROJECT with the HWE kernel" {
 	set gfxpayload=keep
-	linux	/casper/hwe-vmlinuz quiet ---
-	initrd	/casper/hwe-initrd
+	linux	/casper/hwe-vmlinuz"${EXTRA_CMDLINE+ $EXTRA_CMDLINE}" quiet ---
+	initrd	/casper/hwe-initrd$DTB_COMMAND
 }
 EOF
 fi