diff mbox series

[U-Boot,v1,4/4] colibri_imx7: remove legacy sdboot wrapper

Message ID 20191011095709.15375-4-igor.opaniuk@gmail.com
State Accepted
Commit e2c3c2e32c51d9bab98123782d561b204b6e163d
Delegated to: Stefano Babic
Headers show
Series [U-Boot,v1,1/4] apalis_imx6: remove legacy sdboot wrapper | expand

Commit Message

Igor Opaniuk Oct. 11, 2019, 9:57 a.m. UTC 
From: Igor Opaniuk <igor.opaniuk@toradex.com>

Remove legacy sdboot wrapper as distroboot can be used instead.

Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
---

 include/configs/colibri_imx7.h | 23 -----------------------
 1 file changed, 23 deletions(-)

Comments

Stefano Babic Oct. 14, 2019, 12:40 p.m. UTC | #1 
> From: Igor Opaniuk <igor.opaniuk@toradex.com>
> Remove legacy sdboot wrapper as distroboot can be used instead.
> Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic
diff mbox series

Patch

diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
index ade4df5ad8..c2d98291b0 100644
--- a/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h
@@ -109,28 +109,6 @@ 
 	"ramdisk_addr_r=0x82100000\0" \
 	"scriptaddr=0x82500000\0"
 
-#if defined(CONFIG_TARGET_COLIBRI_IMX7_NAND)
-#define SD_BOOTDEV 0
-#elif defined(CONFIG_TARGET_COLIBRI_IMX7_EMMC)
-#define SD_BOOTDEV 1
-#endif
-
-#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} " \
-	"${setupargs} ${vidargs}; echo Booting from MMC/SD card...; " \
-	"run m4boot && " \
-	"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=" __stringify(SD_BOOTDEV) "\0" \
-	"sdfinduuid=part uuid mmc ${sddev}:${sdrootpart} uuid\0" \
-	"sdrootpart=2\0"
-
-
 #define NFS_BOOTCMD \
 	"nfsargs=ip=:::::eth0: root=/dev/nfs\0" \
 	"nfsboot=run setup; " \
@@ -184,7 +162,6 @@ 
 	BOOTENV \
 	MEM_LAYOUT_ENV_SETTINGS \
 	NFS_BOOTCMD \
-	SD_BOOTCMD \
 	MODULE_EXTRA_ENV_SETTINGS \
 	"boot_file=zImage\0" \
 	"console=ttymxc0\0" \