summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOleksandr Suvorov <oleksandr.suvorov@toradex.com>2021-02-05 11:25:52 +0200
committerOleksandr Suvorov <oleksandr.suvorov@toradex.com>2021-02-05 11:31:46 +0200
commitb65bfad82caf4cd388f4b4316764d49edd826ecd (patch)
tree3549caec21a39aa40169436a15cbdd34084a8169
parent2b830c7a4aaf39dc7ea971c638b5042290c9ee1e (diff)
boot.cmd: Add flag skip_fdt_overlays
This flag allows one to skip loading and applying overlay dtbo files, e.g. in case, these files prevent the system from booting. Related-to: ELB-3405 Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
-rw-r--r--recipes-bsp/u-boot/u-boot-distro-boot/boot.cmd.in12
1 files changed, 11 insertions, 1 deletions
diff --git a/recipes-bsp/u-boot/u-boot-distro-boot/boot.cmd.in b/recipes-bsp/u-boot/u-boot-distro-boot/boot.cmd.in
index 56998ec..9f3f2e6 100644
--- a/recipes-bsp/u-boot/u-boot-distro-boot/boot.cmd.in
+++ b/recipes-bsp/u-boot/u-boot-distro-boot/boot.cmd.in
@@ -24,6 +24,12 @@
# - Static IP-address of TFTP/NFS server: serverip := {legal IPv4 address}
# - Static IP-address of the module: ipaddr := {legal IPv4 address}
# - Root-path on NFS-server: rootpath := {legal path, exported by an NFS-server}
+#
+# Common flags:
+# - Skip loading overlays: skip_fdt_overlays := {1, 0}
+# 1 - skip, any other value (or undefined variable) - don't skip.
+# This variable is adopted from the TorizonCore and shouldn't be
+# renamed separately.
if test ${devtype} = "ubi"; then
echo "This script is not meant to distro boot from raw NAND flash."
@@ -96,7 +102,11 @@ fi
env set bootcmd_args 'run rootfsargs_set && env set bootargs ${defargs} ${rootfsargs} ${setupargs} ${vidargs} ${tdxargs}'
env set fdt_resize 'fdt addr ${fdt_addr_r} && fdt resize 0x20000'
-env set bootcmd_overlays 'run load_overlays_file && run fdt_resize && run apply_overlays'
+if test ${skip_fdt_overlays} != 1; then
+ env set bootcmd_overlays 'run load_overlays_file && run fdt_resize && run apply_overlays'
+else
+ env set bootcmd_overlays true
+fi
env set bootcmd_boot 'echo "Bootargs: \${bootargs}" && @@KERNEL_BOOTCMD@@ ${kernel_addr_r} - ${fdt_addr_r}'
env set bootcmd_prepare 'run set_bootcmd_kernel; run set_bootcmd_dtb; run set_load_overlays_file; run set_apply_overlays'
env set bootcmd_run 'run m4boot; run bootcmd_dtb && run bootcmd_overlays && run bootcmd_args && run bootcmd_kernel && run bootcmd_unzip && run bootcmd_boot; echo "Booting from ${devtype} failed!" && false'