From 3ad48d3c8a8fa5a1364450ea101b839140656279 Mon Sep 17 00:00:00 2001 From: Ming Liu Date: Fri, 20 Sep 2019 15:16:32 +0800 Subject: u-boot-distro-boot: run setup for torizon setup function needs to be run if it's defined in uboot environment, for instance, loadhdp is being called in it for apalis-imx8 board. Some setup functions also take care of setting bootargs, which is safe for torizon as well if we run setup function before bootcmd_args, since the later will override the bootargs. Signed-off-by: Ming Liu --- recipes-bsp/u-boot/u-boot-distro-boot/sota/boot.cmd.in | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/recipes-bsp/u-boot/u-boot-distro-boot/sota/boot.cmd.in b/recipes-bsp/u-boot/u-boot-distro-boot/sota/boot.cmd.in index ca06f1d..cc02599 100644 --- a/recipes-bsp/u-boot/u-boot-distro-boot/sota/boot.cmd.in +++ b/recipes-bsp/u-boot/u-boot-distro-boot/sota/boot.cmd.in @@ -4,12 +4,16 @@ then exit fi +if test -n ${setup} +then + run setup +fi + env set overlays_file "overlays.txt" env set load_overlay 'load ${devtype} ${devnum}:1 ${loadaddr} ${overlays_file}; env import -t ${loadaddr} ${filesize}' env set apply_overlays 'fdt addr ${fdt_addr_r} && fdt resize 0x20000 && for overlay_file in ${fdt_overlays}; do echo "Applying Overlay: ${overlay_file}" && load ${devtype} ${devnum}:1 ${loadaddr} ${overlay_file} && fdt apply ${loadaddr}; done;' - env set bootcmd_load_k 'load ${devtype} ${devnum}:2 ${kernel_addr_r} "/boot"${kernel_image}' env set bootcmd_load_r 'load ${devtype} ${devnum}:2 ${ramdisk_addr_r} "/boot"${ramdisk_image}; env set ramdisk_size ${filesize}' -- cgit v1.2.3