From e2a3147fe5b43f89084cbea25ae174ffe6c6232c Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Fri, 21 Sep 2018 15:18:24 +0200 Subject: [PATCH] arm: boot.scr: add setting to edit fdt via uEnv.txt Signed-off-by: Arne Fitzenreiter --- .../core/124/filelists/aarch64/files | 2 ++ .../core/124/filelists/armv5tel/files | 2 ++ config/u-boot/boot.cmd | 8 ++++++++ config/u-boot/boot.scr | Bin 2373 -> 2463 bytes 4 files changed, 12 insertions(+) create mode 100644 config/rootfiles/core/124/filelists/aarch64/files create mode 100644 config/rootfiles/core/124/filelists/armv5tel/files 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 0d9e67b9689c2cbbdb9f512d53ac8ce6fc682926..d9395c0aed4283f1e4e8693b58758a8697be0a8a 100644 GIT binary patch delta 143 zc-lKEG+$U=omDc-lEcL~dda(91_sV}1}NZSxxbo~iEW~yA`4JBe4|Sedn8w8nnFox zafyPGO0}Cyh_kOtaIKPpt%8!0wL(coY91G7YH~)tf;CraPH`$1XIe^$LSjlvk%CG! gkQonR#uwFEb8!}x<|#n+TXUslT61k)%D#XR00WgKtN;K2 delta 52 zc-osUd{jtYomDcduj|U=XtVXv3=EvC3{VhO_4gbr6Wc^ZMHU7Ij=vjSlGrzK%x44u DeH#t< -- 2.39.5