From c867cb74e2847599d973e1bccab28af90b8e0bac Mon Sep 17 00:00:00 2001
From: Marek Belisko <marek.belisko@open-nandra.com>
Date: Tue, 24 Oct 2023 11:38:14 +0200
Subject: [PATCH] conf: Move logic for handling dtb in deploy dir to common
 include

Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
---
 conf/machine/include/sunxi.inc   | 20 ++++++++++++++++++++
 conf/machine/include/sunxi64.inc | 20 --------------------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/conf/machine/include/sunxi.inc b/conf/machine/include/sunxi.inc
index ff5f238..353af3f 100644
--- a/conf/machine/include/sunxi.inc
+++ b/conf/machine/include/sunxi.inc
@@ -45,3 +45,23 @@ WKS_FILES ?= "sunxi-sdcard-image.wks.in"
 WKS_FILE_DEPENDS ?= "virtual/kernel u-boot"
 # in case of sunxi kernel, sunxi-board-fex must be built prior wic image assembly
 WKS_FILE_DEPENDS += " ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/kernel', 'linux-sunxi', 'sunxi-board-fex', '', d)}"
+
+# arm64 dnd arm32bts are under <vendor>/dts but is deployed under DEPLOYDIR 
+do_fix_device_tree_location() {
+
+    for kdt in ${KERNEL_DEVICETREE}
+    do
+        local dbt_dir=$(dirname ${kdt})
+        if [ "." != "${dbt_dir}" ] ; then
+            local dbt=$(basename ${kdt})
+            local dst=${DEPLOY_DIR_IMAGE}/${dbt_dir}/${dbt}
+            if [ ! -f ${dst} ] ; then
+                mkdir -p ${DEPLOY_DIR_IMAGE}/$dbt_dir
+                ln -s ${DEPLOY_DIR_IMAGE}/${dbt} ${dst}
+            fi
+        fi
+    done
+}
+
+addtask do_fix_device_tree_location after do_write_wks_template before do_image_wic
+
diff --git a/conf/machine/include/sunxi64.inc b/conf/machine/include/sunxi64.inc
index 8c4bca2..1973ce0 100644
--- a/conf/machine/include/sunxi64.inc
+++ b/conf/machine/include/sunxi64.inc
@@ -24,26 +24,6 @@ SPL_BINARY ?= "u-boot-sunxi-with-spl.bin"
 SERIAL_CONSOLES ?= "115200;ttyS0"
 MACHINE_FEATURES ?= "alsa apm keyboard rtc serial screen usbgadget usbhost vfat"
 
-# arm64 dbts are under <vendor>/dts but is deployed under DEPLOYDIR 
-do_fix_device_tree_location() {
-
-    for kdt in ${KERNEL_DEVICETREE}
-    do
-        local dbt_dir=$(dirname ${kdt})
-        if [ "." != "${dbt_dir}" ] ; then
-            local dbt=$(basename ${kdt})
-            local dst=${DEPLOY_DIR_IMAGE}/${dbt_dir}/${dbt}
-            if [ ! -f ${dst} ] ; then
-                mkdir -p ${DEPLOY_DIR_IMAGE}/$dbt_dir
-                ln -s ${DEPLOY_DIR_IMAGE}/${dbt} ${dst}
-            fi
-        fi
-    done
-}
-
-
-addtask do_fix_device_tree_location after do_write_wks_template before do_image_wic
-
 SUNXI_BOOT_SPACE ?= "40"
 IMAGE_BOOT_FILES ?= "${KERNEL_IMAGETYPE} boot.scr ${KERNEL_DEVICETREE}"