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 (file)
index 0000000..6a00446
--- /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 (file)
index 0000000..6a00446
--- /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 1d3017ba9e66a5a51155238d6f43727dbcdf03dc..5184e6f8723f56b040a56045d8fc7cbcc9daf1e7 100644 (file)
--- 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 0d9e67b9689c2cbbdb9f512d53ac8ce6fc682926..d9395c0aed4283f1e4e8693b58758a8697be0a8a 100644 (file)
Binary files a/config/u-boot/boot.scr and b/config/u-boot/boot.scr differ