kernel: add mici and tizi dts overlays

Author: robin-reckmann

kernel/dts/sdm845-mici.dts kernel/dts/sdm845-comma-common.dtsikernel/dts/sdm845-mici.dts renamed to kernel/dts/sdm845-comma-common.dtsi

@@ -4,9 +4,6 @@
 #include "sdm845.dtsi"
 
 / {
-	model = "comma.ai mici";
-	compatible = "comma,mici", "qcom,sdm845";
-
 	aliases {
 		serial0 = &uart9;
 	};

kernel/dts/sdm845-comma-mici.dts

@@ -0,0 +1,10 @@
+/dts-v1/;
+
+#include "sdm845-comma-common.dtsi"
+
+/ {
+	model = "comma.ai mici";
+	compatible = "comma,mici", "qcom,sdm845";
+	qcom,msm-id = <341 0x20001>, <321 0x20001>, <321 0x20000>, <348 0x20001>;
+	qcom,board-id = <0x22 0>;
+};

kernel/dts/sdm845-comma-tizi.dts

@@ -0,0 +1,10 @@
+/dts-v1/;
+
+#include "sdm845-comma-common.dtsi"
+
+/ {
+	model = "comma.ai tizi";
+	compatible = "comma,tizi", "qcom,sdm845";
+	qcom,msm-id = <341 0x20001>, <321 0x20001>, <321 0x20000>, <348 0x20001>;
+	qcom,board-id = <0x21 0>;
+};

…001-Add-mici-dts-entry-in-makefile.patch …01-Add-comma-dts-entry-in-makefile.patchkernel/patches/0001-Add-mici-dts-entry-in-makefile.patch renamed to kernel/patches/0001-Add-comma-dts-entry-in-makefile.patch kernel/patches/0001-Add-mici-dts-entry-in-makefile.patch renamed to kernel/patches/0001-Add-comma-dts-entry-in-makefile.patch

@@ -1,7 +1,7 @@
 From 028e4f587364d096fbbd25b48c22cad71d0c3880 Mon Sep 17 00:00:00 2001
 From: Robin Reckmann <robin.reckmann@gmail.com>
 Date: Sat, 14 Mar 2026 18:53:20 +0900
-Subject: [PATCH] Add mici dts entry in makefile
+Subject: [PATCH] Add comma dts entry in makefile
 
 ---
  arch/arm64/boot/dts/qcom/Makefile | 1 +
@@ -11,11 +11,12 @@ diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefi
 index 296688f7c..5f05ce5a1 100644
 --- a/arch/arm64/boot/dts/qcom/Makefile
 +++ b/arch/arm64/boot/dts/qcom/Makefile
-@@ -240,6 +240,7 @@ dtb-$(CONFIG_ARCH_QCOM)	+= sdm632-motorola-ocean.dtb
+@@ -240,6 +240,8 @@ dtb-$(CONFIG_ARCH_QCOM)	+= sdm632-motorola-ocean.dtb
  dtb-$(CONFIG_ARCH_QCOM)	+= sdm636-sony-xperia-ganges-mermaid.dtb
  dtb-$(CONFIG_ARCH_QCOM)	+= sdm660-xiaomi-lavender.dtb
  dtb-$(CONFIG_ARCH_QCOM)	+= sdm670-google-sargo.dtb
-+dtb-$(CONFIG_ARCH_QCOM)	+= sdm845-mici.dtb
++dtb-$(CONFIG_ARCH_QCOM)	+= sdm845-comma-mici.dtb
++dtb-$(CONFIG_ARCH_QCOM)	+= sdm845-comma-tizi.dtb
  dtb-$(CONFIG_ARCH_QCOM)	+= sdm845-db845c.dtb
 
  sdm845-db845c-navigation-mezzanine-dtbs	:= sdm845-db845c.dtb sdm845-db845c-navigation-mezzanine.dtbo

tools/build/build_kernel.sh

@@ -14,8 +14,11 @@ BOOT_IMG=./boot.img
 BASE_DEFCONFIG="defconfig"
 CONFIG_FRAGMENT="$DIR/kernel/configs/vamos.config"
 
-DTS_FILE="$DIR/kernel/dts/sdm845-mici.dts"
-DTB="qcom/$(basename "${DTS_FILE%.dts}.dtb")"
+COMMON_DTSI="$DIR/kernel/dts/sdm845-comma-common.dtsi"
+DTS_FILES=(
+  "$DIR/kernel/dts/sdm845-comma-mici.dts"
+  "$DIR/kernel/dts/sdm845-comma-tizi.dts"
+)
 
 # Check submodule initted, need to run setup
 if [ ! -f "$KERNEL_DIR/Makefile" ]; then
@@ -90,19 +93,29 @@ build_kernel() {
   echo "CONFIG_EXTRA_FIRMWARE_DIR=\"$DIR/kernel/firmware\"" >> out/.config
   make olddefconfig O=out
 
+  local dtb_targets=()
+  local dts_name
+  local IMAGE_GZ_DTB
+
+  for dts in "${DTS_FILES[@]}"; do
+    dts_name="$(basename "$dts")"
+    dtb_targets+=("qcom/${dts_name%.dts}.dtb")
+  done
+
   echo "-- Building kernel with $(nproc) cores --"
-  make -j$(nproc) O=out Image.gz "$DTB"
+  make -j$(nproc) O=out Image.gz "${dtb_targets[@]}"
 
   # Assemble Image.gz-dtb
   mkdir -p "$TMP_DIR"
-  DTB_PATH="out/arch/arm64/boot/dts/$DTB"
-  if [ ! -f "$DTB_PATH" ]; then
-    echo "ERROR: DTB not found at $DTB_PATH"
-    find out/arch/arm64/boot/dts -name '*.dtb' 2>/dev/null | head -20
-    exit 1
-  fi
+  IMAGE_GZ_DTB="$TMP_DIR/Image.gz-dtb"
+  cp out/arch/arm64/boot/Image.gz "$IMAGE_GZ_DTB"
+
+  for dts in "${DTS_FILES[@]}"; do
+    dts_name="$(basename "$dts")"
+    dtb_path="out/arch/arm64/boot/dts/qcom/${dts_name%.dts}.dtb"
+    cat "$dtb_path" >> "$IMAGE_GZ_DTB"
+  done
 
-  cat out/arch/arm64/boot/Image.gz "$DTB_PATH" > "$TMP_DIR/Image.gz-dtb"
   cd "$TMP_DIR"
 
   # Create boot.img
@@ -147,14 +160,40 @@ cleanup() {
 }
 
 install_dts() {
-  local dts_name dtb_name
+  local dst_dir="$KERNEL_DIR/arch/arm64/boot/dts/qcom"
 
-  dts_name="$(basename "$DTS_FILE")"
-  dtb_name="${dts_name%.dts}.dtb"
+  echo "-- Installing DTS/DTSI files --"
 
-  echo "-- Installing DTS $dts_name --"
-  cp "$DTS_FILE" "$KERNEL_DIR/arch/arm64/boot/dts/qcom/"
+  cp "$COMMON_DTSI" "$dst_dir/"
+  for dts in "${DTS_FILES[@]}"; do
+    cp "$dts" "$dst_dir/"
+  done
 }
 
 # Run build inside container
-docker exec -u "$(id -u):$(id -g)" $CONTAINER_ID bash -c "set -e; export BASE_DEFCONFIG='$BASE_DEFCONFIG' CONFIG_FRAGMENT='$CONFIG_FRAGMENT' DTS_FILE='$DTS_FILE' DIR=$DIR TOOLS=$TOOLS KERNEL_DIR=$KERNEL_DIR PATCHES_DIR=$PATCHES_DIR TMP_DIR=$TMP_DIR OUT_DIR=$OUT_DIR BOOT_IMG=$BOOT_IMG DTB=$DTB; $(declare -f apply_patches build_kernel clean_kernel_tree install_dts); build_kernel"
+docker exec -i -u "$(id -u):$(id -g)" "$CONTAINER_ID" bash <<EOF
+set -e
+
+BASE_DEFCONFIG='$BASE_DEFCONFIG'
+CONFIG_FRAGMENT='$CONFIG_FRAGMENT'
+COMMON_DTSI='$COMMON_DTSI'
+DIR='$DIR'
+TOOLS='$TOOLS'
+KERNEL_DIR='$KERNEL_DIR'
+PATCHES_DIR='$PATCHES_DIR'
+TMP_DIR='$TMP_DIR'
+OUT_DIR='$OUT_DIR'
+BOOT_IMG='$BOOT_IMG'
+
+DTS_FILES=(
+  '${DTS_FILES[0]}'
+  '${DTS_FILES[1]}'
+)
+
+$(declare -f apply_patches)
+$(declare -f build_kernel)
+$(declare -f clean_kernel_tree)
+$(declare -f install_dts)
+
+build_kernel
+EOF