From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Fri, 21 Sep 2018 13:18:24 +0000 (+0200)
Subject: arm: boot.scr: add setting to edit fdt via uEnv.txt
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e2a3147fe5b43f89084cbea25ae174ffe6c6232c;p=people%2Fms%2Fipfire-2.x.git

arm: boot.scr: add setting to edit fdt via uEnv.txt

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---

diff --git a/config/rootfiles/core/124/filelists/aarch64/files b/config/rootfiles/core/124/filelists/aarch64/files
new file mode 100644
index 0000000000..6a00446f4d
--- /dev/null
+++ b/config/rootfiles/core/124/filelists/aarch64/files
@@ -0,0 +1,2 @@
+boot/boot.cmd
+boot/boot.scr
diff --git a/config/rootfiles/core/124/filelists/armv5tel/files b/config/rootfiles/core/124/filelists/armv5tel/files
new file mode 100644
index 0000000000..6a00446f4d
--- /dev/null
+++ b/config/rootfiles/core/124/filelists/armv5tel/files
@@ -0,0 +1,2 @@
+boot/boot.cmd
+boot/boot.scr
diff --git a/config/u-boot/boot.cmd b/config/u-boot/boot.cmd
index 1d3017ba9e..5184e6f872 100644
--- a/config/u-boot/boot.cmd
+++ b/config/u-boot/boot.cmd
@@ -73,6 +73,14 @@ fi;
 setenv fdt_high ffffffff;
 fatload ${boot_dev} ${boot_part} ${kernel_addr_r} vmlinuz-${KVER}-ipfire${kernel_type};
 fatload ${boot_dev} ${boot_part} ${fdt_addr_r} dtb-${KVER}-ipfire${kernel_type}/${fdtfile};
+
+if test "${FDTCMDS}" = ""; then
+	echo ;
+else
+	fdt addr ${fdt_addr_r};
+	run FDTCMDS;
+fi;
+
 setenv ramdisk_addr ${ramdisk_addr_r}
 if fatload ${boot_dev} ${boot_part} ${ramdisk_addr} uInit-${KVER}-ipfire${kernel_type}; then
 	echo Ramdisk loaded...;
diff --git a/config/u-boot/boot.scr b/config/u-boot/boot.scr
index 0d9e67b968..d9395c0aed 100644
Binary files a/config/u-boot/boot.scr and b/config/u-boot/boot.scr differ