diff mbox series

[v1,07/13] configs/colibri_vf.h: drop sdboot in favour of distro_bootcmd

Message ID 1592335211-5998-8-git-send-email-igor.opaniuk@gmail.com
State Accepted
Commit 1fd988a9fade5ecff8a6841f9f7932cf83ee18cd
Delegated to: Stefano Babic
Headers show
Series This patch-series includes updates for Toradex modules: | expand

Commit Message

Igor Opaniuk June 16, 2020, 7:20 p.m. UTC 
From: Max Krummenacher <max.krummenacher@toradex.com>

The distro bootscript uses kernel_image to get the file name of
the kernel, so change that variable name.
UBI boot has precedence in the default boot command. If one wants
to boot from SD with a working NAND installation stop in U-Boot
and enter:

setenv fdtfile ${soc}-colibri-${fdt_board}.dtb && run distro_bootcmd

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
---

 include/configs/colibri_vf.h | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

Comments

Stefano Babic June 23, 2020, 7:51 a.m. UTC | #1 
> From: Max Krummenacher <max.krummenacher@toradex.com>
> The distro bootscript uses kernel_image to get the file name of
> the kernel, so change that variable name.
> UBI boot has precedence in the default boot command. If one wants
> to boot from SD with a working NAND installation stop in U-Boot
> and enter:
> setenv fdtfile ${soc}-colibri-${fdt_board}.dtb && run distro_bootcmd
> Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic
diff mbox series

Patch

diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
index 7d17bd8..012350d 100644
--- a/include/configs/colibri_vf.h
+++ b/include/configs/colibri_vf.h
@@ -69,21 +69,6 @@ 
 	"tftp ${fdt_addr_r} ${soc}-colibri-${fdt_board}.dtb && " \
 	"run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
 
-#define SD_BOOTCMD \
-	"set_sdargs=setenv sdargs root=PARTUUID=${uuid} ro rootwait\0"	\
-	"sdboot=run setup; run sdfinduuid; run set_sdargs; " \
-	"setenv bootargs ${defargs} ${sdargs} ${mtdparts} " \
-	"${setupargs} ${vidargs}; echo Booting from MMC/SD card...; " \
-	"load mmc ${sddev}:${sdbootpart} ${kernel_addr_r} ${kernel_file} && " \
-	"load mmc ${sddev}:${sdbootpart} ${fdt_addr_r} " \
-		"${soc}-colibri-${fdt_board}.dtb && " \
-	"run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
-	"sdbootpart=1\0" \
-	"sddev=0\0" \
-	"sdfinduuid=part uuid mmc ${sddev}:${sdrootpart} uuid\0" \
-	"sdrootpart=2\0"
-
-
 #define UBI_BOOTCMD \
 	"ubiargs=ubi.mtd=ubi root=ubi0:rootfs rootfstype=ubifs " \
 	"ubi.fm_autoconvert=1\0" \
@@ -112,7 +97,6 @@ 
 	BOOTENV \
 	MEM_LAYOUT_ENV_SETTINGS \
 	NFS_BOOTCMD \
-	SD_BOOTCMD \
 	UBI_BOOTCMD \
 	UBOOT_UPDATE \
 	"console=ttyLP0\0" \
@@ -120,7 +104,7 @@ 
 	"dfu_alt_info=" DFU_ALT_NAND_INFO "\0" \
 	"fdt_board=eval-v3\0" \
 	"fdt_fixup=;\0" \
-	"kernel_file=zImage\0" \
+	"kernel_image=zImage\0" \
 	"mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
 	"setsdupdate=mmc rescan && set interface mmc && " \
 		"fatload ${interface} 0:1 ${loadaddr} flash_blk.img && " \