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/colibri_imx7_emmc.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'include/configs/colibri_imx7_emmc.h') diff --git a/include/configs/colibri_imx7_emmc.h b/include/configs/colibri_imx7_emmc.h index 23d8eb94b1..9c49f885d8 100644 --- a/include/configs/colibri_imx7_emmc.h +++ b/include/configs/colibri_imx7_emmc.h @@ -94,16 +94,16 @@ "${setupargs} ${vidargs}; echo Booting from NFS...;" \ "dhcp ${kernel_addr_r} && " \ "tftp ${fdt_addr_r} ${soc}-colibri-emmc-${fdt_board}.dtb && " \ - "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ + "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" #define SD_BOOTCMD \ "sdargs=root=/dev/mmcblk1p2 ro rootwait\0" \ - "sdboot=run setup; setenv bootargs ${defargs} ${sdargs} " \ - "${setupargs} ${vidargs}; echo Booting from MMC/SD card...; " \ - "run m4boot && " \ - "load mmc 1:1 ${kernel_addr_r} ${kernel_file} && " \ - "load mmc 1:1 ${fdt_addr_r} ${soc}-colibri-emmc-${fdt_board}.dtb && " \ - "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ + "sdboot=run setup; setenv bootargs ${defargs} ${sdargs} ${setupargs} " \ + "${vidargs}; echo Booting from MMC/SD card...; run m4boot && " \ + "load mmc 1:1 ${kernel_addr_r} ${kernel_file} && " \ + "load mmc 1:1 ${fdt_addr_r} " \ + "${soc}-colibri-emmc-${fdt_board}.dtb && run fdt_fixup && " \ + "bootz ${kernel_addr_r} - ${fdt_addr_r}\0" #ifdef CONFIG_TDX_EASY_INSTALLER #define CONFIG_BOOTCOMMAND "run distro_bootcmd" -- cgit v1.2.3