hostname & dtbo copy to default img

black-device · Jan 23, 2023 · 7a90f59 · 7a90f59
1 parent d65c646
commit 7a90f59
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 31 deletions.
diff --git a/info.txt b/info.txt
@@ -0,0 +1,21 @@
+
+  #- action: run
+  #  description: Copy DTBs for the kernel
+  #  chroot: false
+  #  command: sh -c "mkdir -p ${ROOTDIR}/boot/dtbs; cp -rav ${ROOTDIR}/usr/lib/linux-image-*-arm64/broadcom ${ROOTDIR}/boot/dtbs/"
+
+  #- action: overlay
+  #  description: overlay Blackdevice copy dtbo.
+  #  source: overlays/custom
+  #  #destination: /usr/lib/linux-image-*/rockchip/overlay
+  #  destination: /boot/dtbs/*/rockchip/overlay/
+
+  #- action: overlay
+  #  description: Copy config.txt
+  #  source: overlays/raspberrypi/firmware
+  #  destination: /boot/firmware
+
+  #- action: run
+  #  description: Copy DTB Overlays from u-boot
+  #  chroot: true
+  #  command:  sh -c "cp -av /usr/lib/u-boot/rpi_arm64/bcm2711-vl805.dtbo /boot/firmware/overlays/vl805.dtbo"
diff --git a/...3566/overlays/custom/rk3568-uart5-m0.dtbo → ...566/overlays/opt/sys/rk3568-uart5-m0.dtbo b/...3566/overlays/custom/rk3568-uart5-m0.dtbo → ...566/overlays/opt/sys/rk3568-uart5-m0.dtbo
diff --git a/...3566/overlays/custom/rk3568-uart6-m1.dtbo → ...566/overlays/opt/sys/rk3568-uart6-m1.dtbo b/...3566/overlays/custom/rk3568-uart6-m1.dtbo → ...566/overlays/opt/sys/rk3568-uart6-m1.dtbo
diff --git a/rootfs/recipes/88_blackdevice.yaml b/rootfs/recipes/88_blackdevice.yaml
@@ -1,36 +1,10 @@
 # Blackdevice recipe FTR 2023
   - action: run
-    description: Blackdevice
+    description: BD - Set Hostname
     chroot: true
-    script: scripts/blackdevice.sh
+    script: scripts/hostname.sh
 
   - action: run
-    description: Copy DTB Overlays UART5
-    chroot: false
-    command:  sh -c "cp -av custom/rk3568-uart5-m0.dtbo /usr/lib/*/rockchip/overlay/rk3568-uart5-m0.dtbo"
-
-  - action: run
-    description: Copy DTB Overlays UART6
-    chroot: false
-    command:  sh -c "cp -av custom/rk3568-uart6-m1.dtbo /usr/lib/*/rockchip/overlay/rk3568-uart6-m1.dtbo"
-
-  #- action: run
-  #  description: Copy DTBs for the kernel
-  #  chroot: false
-  #  command: sh -c "mkdir -p ${ROOTDIR}/boot/dtbs; cp -rav ${ROOTDIR}/usr/lib/linux-image-*-arm64/broadcom ${ROOTDIR}/boot/dtbs/"
-
-  #- action: overlay
-  #  description: overlay Blackdevice copy dtbo.
-  #  source: overlays/custom
-  #  #destination: /usr/lib/linux-image-*/rockchip/overlay
-  #  destination: /boot/dtbs/*/rockchip/overlay/
-
-  #- action: overlay
-  #  description: Copy config.txt
-  #  source: overlays/raspberrypi/firmware
-  #  destination: /boot/firmware
-
-  #- action: run
-  #  description: Copy DTB Overlays from u-boot
-  #  chroot: true
-  #  command:  sh -c "cp -av /usr/lib/u-boot/rpi_arm64/bcm2711-vl805.dtbo /boot/firmware/overlays/vl805.dtbo"
+    description: BD - Copy DTB
+    chroot: true
+    script: scripts/cpdtb.sh
diff --git a/rootfs/scripts/cpdtb.sh b/rootfs/scripts/cpdtb.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+
+cp -av /opt/sys/*.dtbo /usr/lib/linux-image-*/rockchip/overlay/
diff --git a/rootfs/scripts/blackdevice.sh → rootfs/scripts/hostname.sh b/rootfs/scripts/blackdevice.sh → rootfs/scripts/hostname.sh
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,4 @@
		#!/bin/bash


		cp -av /opt/sys/.dtbo /usr/lib/linux-image-/rockchip/overlay/