[PATCH 2/2] ARM: imx6: mx6sabre-common: Search for boot components in /boot too

[Peng Fan (OSS)]

> Subject: [PATCH 2/2] ARM: imx6: mx6sabre-common: Search for boot
> components in /boot too
> 
> Some root filesystem configurations do not have separate /boot partition, but
> rather place kernel, DT, scripts into /boot directory. Search the /boot directory
> for these boot components in case they are not found in /, which is the old
> behavior.
> 
> Signed-off-by: Marek Vasut <marex at denx.de>
> Cc: Fabio Estevam <festevam at gmail.com>
> Cc: Peng Fan <peng.fan at nxp.com>
> Cc: Stefano Babic <sbabic at denx.de>
> Cc: Ye Li <ye.li at nxp.com>
> Cc: uboot-imx <uboot-imx at nxp.com>

Reviewed-by: Peng Fan <peng.fan at nxp.com>

> ---
>  include/configs/mx6sabre_common.h | 9 ++++++---
>  1 file changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/include/configs/mx6sabre_common.h
> b/include/configs/mx6sabre_common.h
> index 735532955fd..ac579f3338a 100644
> --- a/include/configs/mx6sabre_common.h
> +++ b/include/configs/mx6sabre_common.h
> @@ -73,11 +73,14 @@
>  	"mmcargs=setenv bootargs console=${console},${baudrate} " \
>  		"root=PARTUUID=${uuid} rootwait rw\0" \
>  	"loadbootscript=" \
> -		"load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
> +		"load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script} || " \
> +		"load mmc ${mmcdev}:${mmcpart} ${loadaddr} boot/${script};\0" \
>  	"bootscript=echo Running bootscript from mmc ...; " \
>  		"source\0" \
> -	"loadimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0"
> \
> -	"loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdtfile}\0" \
> +	"loadimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image} ||
> " \
> +		"load mmc ${mmcdev}:${mmcpart} ${loadaddr} boot/${image}\0" \
> +	"loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdtfile} || " \
> +		"load mmc ${mmcdev}:${mmcpart} ${fdt_addr} boot/${fdtfile}\0" \
>  	"mmcboot=echo Booting from mmc ...; " \
>  		"run finduuid; " \
>  		"run mmcargs; " \
> --
> 2.29.2