[PATCH 0/3] Parital revert of DT overlays patches

[PATCH 0/3] Parital revert of DT overlays patches

[Uladzimir Bely]

Revert p2-3 from "Rework and extend u-boot-script for DT overlays"
series since they are reported to have issues.

Uladzimir Bely (3):
  Revert "use builtin DT for nanopi-neo target"
  Revert "u-boot-script: add support to use builtin dt"
  Revert "refactor loading of DT overlays in uboot"

 .../lib/wic/canned-wks/nanopi-neo.wks.in      |  4 ++--
 .../u-boot-script/files/u-boot-script         |  3 ---
 .../u-boot-script/files/update-u-boot-script  | 22 +++++++------------
 .../lib/wic/plugins/source/rootfs-u-boot.py   |  3 ---
 4 files changed, 10 insertions(+), 22 deletions(-)

-- 
2.20.1

[PATCH 1/3] Revert "use builtin DT for nanopi-neo target"

[Uladzimir Bely]

This reverts commit 60575d11ec8a6a78b9cd706f608a5c50e2ba1cf6.
---
 meta-isar/scripts/lib/wic/canned-wks/nanopi-neo.wks.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-isar/scripts/lib/wic/canned-wks/nanopi-neo.wks.in b/meta-isar/scripts/lib/wic/canned-wks/nanopi-neo.wks.in
index af5b6f08..de1c92c4 100644
--- a/meta-isar/scripts/lib/wic/canned-wks/nanopi-neo.wks.in
+++ b/meta-isar/scripts/lib/wic/canned-wks/nanopi-neo.wks.in
@@ -1,10 +1,10 @@
 #
-# Copyright (c) Siemens AG, 2018-2023
+# Copyright (c) Siemens AG, 2018
 #
 # SPDX-License-Identifier: MIT
 
 part u-boot --source rawcopy --sourceparams "file=/usr/lib/u-boot/nanopi_neo/u-boot-sunxi-with-spl.bin" --no-table --align 8
 
-part / --source rootfs-u-boot --ondisk mmcblk2 --fstype ext4 --mkfs-extraopts "-T default" --sourceparams "builtin_dt=yes" --label platform --align 1024 --active
+part / --source rootfs-u-boot --ondisk mmcblk0 --fstype ext4 --mkfs-extraopts "-T default" --label platform --align 1024 --active
 
 bootloader --append "rw rootwait"
-- 
2.20.1

[PATCH 2/3] Revert "u-boot-script: add support to use builtin dt"

[Uladzimir Bely]

This reverts commit a2e734a43b00ec7d1e47ae2e963d1a64d527f0df.
---
 .../u-boot-script/files/u-boot-script            |  3 ---
 .../u-boot-script/files/update-u-boot-script     | 16 ++++------------
 .../lib/wic/plugins/source/rootfs-u-boot.py      |  3 ---
 3 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/meta/recipes-bsp/u-boot-script/files/u-boot-script b/meta/recipes-bsp/u-boot-script/files/u-boot-script
index a11212c0..d053d721 100644
--- a/meta/recipes-bsp/u-boot-script/files/u-boot-script
+++ b/meta/recipes-bsp/u-boot-script/files/u-boot-script
@@ -15,6 +15,3 @@ NO_INITRD=""
 
 # U-boot commands to prepend to boot script
 SCRIPT_PREPEND=""
-
-# use u-boot builtin device tree
-BUILTIN_DT="no"
diff --git a/meta/recipes-bsp/u-boot-script/files/update-u-boot-script b/meta/recipes-bsp/u-boot-script/files/update-u-boot-script
index f4e36ed2..14a81563 100755
--- a/meta/recipes-bsp/u-boot-script/files/update-u-boot-script
+++ b/meta/recipes-bsp/u-boot-script/files/update-u-boot-script
@@ -33,18 +33,10 @@ echo "${SCRIPT_PREPEND}" >> ${BOOT_CMD}
 
 echo "setenv bootargs ${KERNEL_ARGS}" >> ${BOOT_CMD}
 
-if [ "${BUILTIN_DT}" = "yes" ]; then
-	echo "echo Loading builtin device tree..." \
-	     >> ${BOOT_CMD}
-	echo "fdt addr \${fdtcontroladdr}" >> ${BOOT_CMD}
-	echo "fdt move \${fdtcontroladdr} \${fdt_addr_r}" >> ${BOOT_CMD}
-else
-	echo "echo Loading /usr/lib/linux-image-${KERNEL_VERSION}/\${fdtfile}..." \
-	     >> ${BOOT_CMD}
-	echo "load \${devtype} \${devnum}:${ROOT_PARTITION} \${fdt_addr_r}" \
-	     "/usr/lib/linux-image-${KERNEL_VERSION}/\${fdtfile}" >> ${BOOT_CMD}
-fi
-
+echo "echo Loading /usr/lib/linux-image-${KERNEL_VERSION}/\${fdtfile}..." \
+     >> ${BOOT_CMD}
+echo "load \${devtype} \${devnum}:${ROOT_PARTITION} \${fdt_addr_r}" \
+     "/usr/lib/linux-image-${KERNEL_VERSION}/\${fdtfile}" >> ${BOOT_CMD}
 echo "echo Loading /boot/${KERNEL_FILE}-${KERNEL_VERSION}..." >> ${BOOT_CMD}
 echo "load \${devtype} \${devnum}:\${distro_bootpart} \${kernel_addr_r}" \
      "/boot/${KERNEL_FILE}-${KERNEL_VERSION}" >> ${BOOT_CMD}
diff --git a/meta/scripts/lib/wic/plugins/source/rootfs-u-boot.py b/meta/scripts/lib/wic/plugins/source/rootfs-u-boot.py
index 93600dc2..0b4f9eec 100644
--- a/meta/scripts/lib/wic/plugins/source/rootfs-u-boot.py
+++ b/meta/scripts/lib/wic/plugins/source/rootfs-u-boot.py
@@ -10,7 +10,6 @@
 # Recognized sourceparams:
 #  - no_initrd=yes          (disables initrd loading)
 #  - overlays=file.dtbo ... (overlay files)
-#  - builtin_dt=no          (use DT from uboot instead of kernel)
 #  - script_prepend=cmd;... (prepends U-Boot command)
 
 import glob
@@ -83,8 +82,6 @@ class RootfsUBootPlugin(RootfsPlugin):
             cfg.write('NO_INITRD="%s"\n' % no_initrd)
             overlays = source_params.get('overlays') or ''
             cfg.write('OVERLAYS="%s"\n' % overlays)
-            builtin_dt = source_params.get('builtin_dt') or ''
-            cfg.write('BUILTIN_DT="%s"\n' % builtin_dt)
             script_prepend = source_params.get('script_prepend') or ''
             # remove escapes from $\{var\} that are needed to avoid expansion by wic
             script_prepend = re.sub(r'\$\\{([^\\]+)\\}', r'${\1}', script_prepend)
-- 
2.20.1

[PATCH 3/3] Revert "refactor loading of DT overlays in uboot"

[Uladzimir Bely]

This reverts commit 680ad2617fc21565bbc4cc7facabc07c6173870f.
---
 meta/recipes-bsp/u-boot-script/files/update-u-boot-script | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-bsp/u-boot-script/files/update-u-boot-script b/meta/recipes-bsp/u-boot-script/files/update-u-boot-script
index 14a81563..e9ace15e 100755
--- a/meta/recipes-bsp/u-boot-script/files/update-u-boot-script
+++ b/meta/recipes-bsp/u-boot-script/files/update-u-boot-script
@@ -63,11 +63,13 @@ if [ -n "${OVERLAYS}" ]; then
 		if ! echo $OVERLAY | grep -q "^/"; then
 			OVERLAY_PATH=/usr/lib/linux-image-${KERNEL_VERSION}/
 		fi
-		echo "echo Loading ${OVERLAY_PATH}${OVERLAY} ..." >> ${BOOT_CMD}
+		echo "for entry in ${OVERLAY}; do" >> ${BOOT_CMD}
+		echo "echo Loading ${OVERLAY_PATH}\${entry}..." >> ${BOOT_CMD}
 		echo "load \${devtype} \${devnum}:${ROOT_PARTITION}" \
-		     "\${overlay_addr_r} ${OVERLAY_PATH}${OVERLAY}" \
+		     "\${overlay_addr_r} ${OVERLAY_PATH}\${entry}" \
 		     >> ${BOOT_CMD}
 		echo "fdt apply \${overlay_addr_r}" >> ${BOOT_CMD}
+		echo "done" >> ${BOOT_CMD}
 	done
 fi
 
-- 
2.20.1

Re: [PATCH 0/3] Parital revert of DT overlays patches

[Uladzimir Bely]

On Wed, 2023-08-09 at 10:01 +0200, Uladzimir Bely wrote:
> Revert p2-3 from "Rework and extend u-boot-script for DT overlays"
> series since they are reported to have issues.
> 

p2-4 are meant and reverted.

> Uladzimir Bely (3):
>   Revert "use builtin DT for nanopi-neo target"
>   Revert "u-boot-script: add support to use builtin dt"
>   Revert "refactor loading of DT overlays in uboot"
> 
>  .../lib/wic/canned-wks/nanopi-neo.wks.in      |  4 ++--
>  .../u-boot-script/files/u-boot-script         |  3 ---
>  .../u-boot-script/files/update-u-boot-script  | 22 +++++++----------
> --
>  .../lib/wic/plugins/source/rootfs-u-boot.py   |  3 ---
>  4 files changed, 10 insertions(+), 22 deletions(-)
> 
> -- 
> 2.20.1
> 

Re: [PATCH 0/3] Parital revert of DT overlays patches

[Uladzimir Bely]

On Wed, 2023-08-09 at 10:01 +0200, Uladzimir Bely wrote:
> Revert p2-3 from "Rework and extend u-boot-script for DT overlays"
> series since they are reported to have issues.
> 
> Uladzimir Bely (3):
>   Revert "use builtin DT for nanopi-neo target"
>   Revert "u-boot-script: add support to use builtin dt"
>   Revert "refactor loading of DT overlays in uboot"
> 
>  .../lib/wic/canned-wks/nanopi-neo.wks.in      |  4 ++--
>  .../u-boot-script/files/u-boot-script         |  3 ---
>  .../u-boot-script/files/update-u-boot-script  | 22 +++++++----------
> --
>  .../lib/wic/plugins/source/rootfs-u-boot.py   |  3 ---
>  4 files changed, 10 insertions(+), 22 deletions(-)
> 
> -- 
> 2.20.1
> 

Applied to next