From 07edca0bb81857a339f26f3465d5c5602705a94d Mon Sep 17 00:00:00 2001 From: Marcel Ziswiler Date: Fri, 28 Sep 2018 14:40:23 +0200 Subject: toradex boards: sdboot cosmetic clean-up The whole thing meanwhile diverged heavily. Fix this. Signed-off-by: Marcel Ziswiler Acked-by: Philippe Schenker --- include/configs/apalis_imx6.h | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'include/configs/apalis_imx6.h') diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index 125241cdf4..e413ae347a 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -236,14 +236,11 @@ "&& setenv dtbparam \" - ${fdt_addr_r}\" && true\0" #define SD_BOOTCMD \ - "sdargs=ip=off root=/dev/mmcblk1p2 ro rootfstype=ext4 " \ - "rootwait\0" \ - "sdboot=run setup; " \ - "setenv bootargs ${defargs} ${sdargs} ${setupargs} " \ - "${vidargs}; echo Booting from SD card; " \ - "run sddtbload; load mmc 1:1 ${kernel_addr_r} " \ - "${boot_file} && run fdt_fixup && " \ - "bootz ${kernel_addr_r} ${dtbparam}\0" \ + "sdargs=ip=off root=/dev/mmcblk1p2 ro rootfstype=ext4 rootwait\0" \ + "sdboot=run setup; setenv bootargs ${defargs} ${sdargs} ${setupargs} " \ + "${vidargs}; echo Booting from MMC/SD card in 8-bit slot...; " \ + "run sddtbload; load mmc 1:1 ${kernel_addr_r} ${boot_file} " \ + "&& run fdt_fixup && bootz ${kernel_addr_r} ${dtbparam}\0" \ "sddtbload=setenv dtbparam; load mmc 1:1 ${fdt_addr_r} " \ "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0" -- cgit v1.2.3