core/linux-aarch64-rc to 5.12.rc2-1

core/linux-aarch64-rc/PKGBUILD

@@ -3,8 +3,8 @@
 
 buildarch=8
 
-_rcver=5.11
-_rcrel=7
+_rcver=5.12
+_rcrel=2
 
 pkgbase=linux-aarch64-rc
 _srcname=linux-${_rcver}-rc${_rcrel}
@@ -23,19 +23,19 @@ source=("https://git.kernel.org/torvalds/t/${_srcname}.tar.gz"
         '0003-arm64-dts-rockchip-add-usb3-controller-node-for-RK33.patch'
         '0004-arm64-dts-rockchip-enable-usb3-nodes-on-rk3328-rock6.patch'
         'config'
-        'kernel.its'
+        'generate_chromebook_its.sh'
         'kernel.keyblock'
         'kernel_data_key.vbprivk'
         'linux.preset'
         '60-linux.hook'
         '90-linux.hook')
-md5sums=('7acea5fd1682bc66f6b441f327e3ebaa'
+md5sums=('678ae580f2aa6d36801c37b0e320dffb'
          'f9b6f367eef351eaa89b23a9b1ffc5a2'
          '369fb1dd626c4e0a4a7e068d27dd51c8'
          '1553fe4abbe675ed8abd4644561d8e8c'
          '9844db3484f4d4fa3e63c7e083f656f7'
-         '162d4df02aeb03e66fc52d3b37a10deb'
-         '7f1a96e24f5150f790df94398e9525a3'
+         '6c241418b5adc936e904243903e034a3'
+         'beb35c282bbdadc0aab851d0ad4efd22'
          '61c5ff73c136ed07a7aadbf58db3d96a'
          '584777ae88bce2c5659960151b64c7d8'
          '41cb5fef62715ead2dd109dbea8413d6'
@@ -229,11 +229,24 @@ _package-chromebook() {
   cd "${srcdir}/${_srcname}"
 
   mkdir -p "${pkgdir}/boot"
-  cp ../kernel.its .
+
+  ../generate_chromebook_its.sh ${srcdir} > kernel.its << DT_END
+    rk3399-gru-bob
+    rk3399-gru-kevin
+    rk3399-gru-scarlet-inx
+    rk3399-gru-scarlet-kd
+    sc7180-trogdor-lazor-r0
+    sc7180-trogdor-lazor-r1
+    sc7180-trogdor-lazor-r1-kb
+    sc7180-trogdor-lazor-r1-lte
+    sc7180-trogdor-lazor-r3
+    sc7180-trogdor-lazor-r3-kb
+    sc7180-trogdor-lazor-r3-lte
+DT_END
 
   mkimage -D "-I dts -O dtb -p 2048" -f kernel.its vmlinux.uimg
   dd if=/dev/zero of=bootloader.bin bs=512 count=1
-  echo "console=tty0 console=ttyS2,115200n8 earlyprintk=ttyS2,115200n8 init=/sbin/init root=PARTUUID=%U/PARTNROFF=1 rootwait rw noinitrd" > cmdline
+  echo "console=tty0 console=ttyS2,115200n8 earlyprintk=ttyS2,115200n8 console=ttyMSM0,115200n8 init=/sbin/init root=PARTUUID=%U/PARTNROFF=1 rootwait rw noinitrd" > cmdline
   vbutil_kernel \
     --pack vmlinux.kpart \
     --version 1 \

core/linux-aarch64-rc/generate_chromebook_its.sh

@@ -0,0 +1,62 @@
+#!/bin/bash
+
+srcdir=$1
+read -r -d '' dt_list
+
+cat <<-ITS_HEADER_END
+/dts-v1/;
+
+/ {
+    description = "Chrome OS kernel image with one or more FDT blobs";
+    images {
+        kernel@1{
+            description = "kernel";
+            data = /incbin/("arch/arm64/boot/Image");
+            type = "kernel_noload";
+            arch = "arm64";
+            os = "linux";
+            compression = "none";
+            load = <0>;
+            entry = <0>;
+        };
+ITS_HEADER_END
+
+its_entry_count=1
+for dt in ${dt_list}; do
+	dts_path=${srcdir}/*/arch/arm64/boot/dts/*/${dt}.dts
+	! ls $dts_path >/dev/null && { echo "Error: dt not found $dt" >&2; exit 1; }
+	dt_dir=$(basename $(dirname ${dts_path}))
+	cat <<-FDT_END
+	        fdt@${its_entry_count}{
+	            description = "${dt}.dtb";
+	            data = /incbin/("arch/arm64/boot/dts/${dt_dir}/${dt}.dtb");
+	            type = "flat_dt";
+	            arch = "arm64";
+	            compression = "none";
+	            hash@1{
+	                algo = "sha1";
+	            };
+	        };
+	FDT_END
+	let its_entry_count=${its_entry_count}+1
+done
+
+cat <<-ITS_MIDDLE_END
+    };
+    configurations {
+        default = "conf@1";
+ITS_MIDDLE_END
+
+for((i=1;i<${its_entry_count};i++)); do
+	cat <<-ITS_CONF_END
+	        conf@${i}{
+	            kernel = "kernel@1";
+	            fdt = "fdt@${i}";
+	        };
+	ITS_CONF_END
+done
+
+cat <<-ITS_FOOTER_END
+    };
+};
+ITS_FOOTER_END

core/linux-aarch64-rc/kernel.its

@@ -1,48 +0,0 @@
-/dts-v1/;
-
-/ {
-    description = "Chrome OS kernel image with one or more FDT blobs";
-    images {
-        kernel@1{
-            description = "kernel";
-            data = /incbin/("arch/arm64/boot/Image");
-            type = "kernel_noload";
-            arch = "arm64";
-            os = "linux";
-            compression = "none";
-            load = <0>;
-            entry = <0>;
-        };
-        fdt@1{
-            description = "rk3399-gru-bob.dtb";
-            data = /incbin/("arch/arm64/boot/dts/rockchip/rk3399-gru-bob.dtb");
-            type = "flat_dt";
-            arch = "arm64";
-            compression = "none";
-            hash@1{
-                algo = "sha1";
-            };
-        };
-        fdt@2{
-            description = "rk3399-gru-kevin.dtb";
-            data = /incbin/("arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dtb");
-            type = "flat_dt";
-            arch = "arm64";
-            compression = "none";
-            hash@1{
-                algo = "sha1";
-            };
-        };
-    };
-    configurations {
-        default = "conf@1";
-        conf@1{
-            kernel = "kernel@1";
-            fdt = "fdt@1";
-        };
-        conf@2{
-            kernel = "kernel@1";
-            fdt = "fdt@2";
-        };
-    };
-};