* [U-Boot] [PATCH v1 1/4] apalis_imx6: remove legacy sdboot wrapper
@ 2019-10-11 9:57 Igor Opaniuk
2019-10-11 9:57 ` [U-Boot] [PATCH v1 2/4] colibri-imx6ull: " Igor Opaniuk
` (3 more replies)
0 siblings, 4 replies; 7+ messages in thread
From: Igor Opaniuk @ 2019-10-11 9:57 UTC (permalink / raw)
To: u-boot
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/apalis_imx6.h | 19 -------------------
1 file changed, 19 deletions(-)
diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index 5139b01ab3..a5f9a96732 100644
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -158,24 +158,6 @@
"nfsdtbload=setenv dtbparam; tftp ${fdt_addr_r} ${fdt_file} " \
"&& setenv dtbparam \" - ${fdt_addr_r}\" && true\0"
-#define SD_BOOTCMD \
- "set_sdargs=setenv sdargs ip=off root=PARTUUID=${uuid} ro,noatime " \
- "rootfstype=ext4 rootwait\0" \
- "sdboot=run setup; run sdfinduuid; run set_sdargs; " \
- "setenv bootargs ${defargs} ${sdargs} ${setupargs} " \
- "${vidargs}; echo Booting from SD card; " \
- "run sddtbload; load mmc ${sddev}:${sdbootpart} " \
- "${kernel_addr_r} ${boot_file} && run fdt_fixup && " \
- "bootz ${kernel_addr_r} ${dtbparam}\0" \
- "sdbootpart=1\0" \
- "sddev=1\0" \
- "sddtbload=setenv dtbparam; load mmc ${sddev}:${sdbootpart} " \
- "${fdt_addr_r} " \
- "${fdt_file} && setenv dtbparam \" - " \
- "${fdt_addr_r}\" && true\0" \
- "sdfinduuid=part uuid mmc ${sddev}:${sdrootpart} uuid\0" \
- "sdrootpart=2\0"
-
#ifndef CONFIG_TDX_APALIS_IMX6_V1_0
#define FDT_FILE "imx6q-apalis-eval.dtb"
#define FDT_FILE_V1_0 "imx6q-apalis_v1_0-eval.dtb"
@@ -196,7 +178,6 @@
"fdt_fixup=;\0" \
MEM_LAYOUT_ENV_SETTINGS \
NFS_BOOTCMD \
- SD_BOOTCMD \
"setethupdate=if env exists ethaddr; then; else setenv ethaddr " \
"00:14:2d:00:00:00; fi; tftpboot ${loadaddr} " \
"flash_eth.img && source ${loadaddr}\0" \
--
2.17.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [U-Boot] [PATCH v1 2/4] colibri-imx6ull: remove legacy sdboot wrapper
2019-10-11 9:57 [U-Boot] [PATCH v1 1/4] apalis_imx6: remove legacy sdboot wrapper Igor Opaniuk
@ 2019-10-11 9:57 ` Igor Opaniuk
2019-10-14 12:40 ` sbabic at denx.de
2019-10-11 9:57 ` [U-Boot] [PATCH v1 3/4] colibri_imx6: " Igor Opaniuk
` (2 subsequent siblings)
3 siblings, 1 reply; 7+ messages in thread
From: Igor Opaniuk @ 2019-10-11 9:57 UTC (permalink / raw)
To: u-boot
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-imx6ull.h | 14 --------------
1 file changed, 14 deletions(-)
diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h
index 0a4f30fbaf..de94eb95fe 100644
--- a/include/configs/colibri-imx6ull.h
+++ b/include/configs/colibri-imx6ull.h
@@ -56,19 +56,6 @@
"tftp ${fdt_addr_r} " FDT_FILE " && " \
"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} " \
- "${setupargs} ${vidargs}; echo Booting from MMC/SD card...; " \
- "load mmc ${sddev}:${sdbootpart} ${kernel_addr_r} ${kernel_file} && " \
- "load mmc ${sddev}:${sdbootpart} ${fdt_addr_r} " FDT_FILE " && " \
- "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 rw rootfstype=ubifs " \
"ubi.fm_autoconvert=1\0" \
@@ -95,7 +82,6 @@
BOOTENV \
MEM_LAYOUT_ENV_SETTINGS \
NFS_BOOTCMD \
- SD_BOOTCMD \
UBI_BOOTCMD \
"console=ttymxc0\0" \
"defargs=user_debug=30\0" \
--
2.17.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [U-Boot] [PATCH v1 3/4] colibri_imx6: remove legacy sdboot wrapper
2019-10-11 9:57 [U-Boot] [PATCH v1 1/4] apalis_imx6: remove legacy sdboot wrapper Igor Opaniuk
2019-10-11 9:57 ` [U-Boot] [PATCH v1 2/4] colibri-imx6ull: " Igor Opaniuk
@ 2019-10-11 9:57 ` Igor Opaniuk
2019-10-11 9:57 ` [U-Boot] [PATCH v1 4/4] colibri_imx7: " Igor Opaniuk
2019-10-14 12:40 ` [U-Boot] [PATCH v1 1/4] apalis_imx6: " sbabic at denx.de
3 siblings, 0 replies; 7+ messages in thread
From: Igor Opaniuk @ 2019-10-11 9:57 UTC (permalink / raw)
To: u-boot
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_imx6.h | 18 ------------------
1 file changed, 18 deletions(-)
diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
index 69bf8225fe..1f2b89e722 100644
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -148,23 +148,6 @@
"nfsdtbload=setenv dtbparam; tftp ${fdt_addr_r} ${fdt_file} " \
"&& setenv dtbparam \" - ${fdt_addr_r}\" && true\0"
-#define SD_BOOTCMD \
- "set_sdargs=setenv sdargs ip=off root=PARTUUID=${uuid} rw,noatime " \
- "rootfstype=ext4 rootwait\0" \
- "sdboot=run setup; run sdfinduuid; run set_sdargs; " \
- "setenv bootargs ${defargs} ${sdargs} ${setupargs} " \
- "${vidargs}; echo Booting from SD card; " \
- "run sddtbload; load mmc ${sddev}:${sdbootpart} "\
- "${kernel_addr_r} ${boot_file} && run fdt_fixup && " \
- "bootz ${kernel_addr_r} ${dtbparam}\0" \
- "sdbootpart=1\0" \
- "sddev=1\0" \
- "sddtbload=setenv dtbparam; load mmc ${sddev}:${sdbootpart} " \
- "${fdt_addr_r} ${fdt_file} && setenv dtbparam \" - " \
- "${fdt_addr_r}\" && true\0" \
- "sdfinduuid=part uuid mmc ${sddev}:${sdrootpart} uuid\0" \
- "sdrootpart=2\0"
-
#define FDT_FILE "imx6dl-colibri-eval-v3.dtb"
#define CONFIG_EXTRA_ENV_SETTINGS \
BOOTENV \
@@ -180,7 +163,6 @@
"fdt_fixup=;\0" \
MEM_LAYOUT_ENV_SETTINGS \
NFS_BOOTCMD \
- SD_BOOTCMD \
"setethupdate=if env exists ethaddr; then; else setenv ethaddr " \
"00:14:2d:00:00:00; fi; tftpboot ${loadaddr} " \
"flash_eth.img && source ${loadaddr}\0" \
--
2.17.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [U-Boot] [PATCH v1 4/4] colibri_imx7: remove legacy sdboot wrapper
2019-10-11 9:57 [U-Boot] [PATCH v1 1/4] apalis_imx6: remove legacy sdboot wrapper Igor Opaniuk
2019-10-11 9:57 ` [U-Boot] [PATCH v1 2/4] colibri-imx6ull: " Igor Opaniuk
2019-10-11 9:57 ` [U-Boot] [PATCH v1 3/4] colibri_imx6: " Igor Opaniuk
@ 2019-10-11 9:57 ` Igor Opaniuk
2019-10-14 12:40 ` sbabic at denx.de
2019-10-14 12:40 ` [U-Boot] [PATCH v1 1/4] apalis_imx6: " sbabic at denx.de
3 siblings, 1 reply; 7+ messages in thread
From: Igor Opaniuk @ 2019-10-11 9:57 UTC (permalink / raw)
To: u-boot
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(-)
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" \
--
2.17.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [U-Boot] [PATCH v1 2/4] colibri-imx6ull: remove legacy sdboot wrapper
2019-10-11 9:57 ` [U-Boot] [PATCH v1 2/4] colibri-imx6ull: " Igor Opaniuk
@ 2019-10-14 12:40 ` sbabic at denx.de
0 siblings, 0 replies; 7+ messages in thread
From: sbabic at denx.de @ 2019-10-14 12:40 UTC (permalink / raw)
To: u-boot
> 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
--
=====================================================================
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
^ permalink raw reply [flat|nested] 7+ messages in thread
* [U-Boot] [PATCH v1 1/4] apalis_imx6: remove legacy sdboot wrapper
2019-10-11 9:57 [U-Boot] [PATCH v1 1/4] apalis_imx6: remove legacy sdboot wrapper Igor Opaniuk
` (2 preceding siblings ...)
2019-10-11 9:57 ` [U-Boot] [PATCH v1 4/4] colibri_imx7: " Igor Opaniuk
@ 2019-10-14 12:40 ` sbabic at denx.de
3 siblings, 0 replies; 7+ messages in thread
From: sbabic at denx.de @ 2019-10-14 12:40 UTC (permalink / raw)
To: u-boot
> 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
--
=====================================================================
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
^ permalink raw reply [flat|nested] 7+ messages in thread
* [U-Boot] [PATCH v1 4/4] colibri_imx7: remove legacy sdboot wrapper
2019-10-11 9:57 ` [U-Boot] [PATCH v1 4/4] colibri_imx7: " Igor Opaniuk
@ 2019-10-14 12:40 ` sbabic at denx.de
0 siblings, 0 replies; 7+ messages in thread
From: sbabic at denx.de @ 2019-10-14 12:40 UTC (permalink / raw)
To: u-boot
> 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
--
=====================================================================
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2019-10-14 12:40 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-11 9:57 [U-Boot] [PATCH v1 1/4] apalis_imx6: remove legacy sdboot wrapper Igor Opaniuk
2019-10-11 9:57 ` [U-Boot] [PATCH v1 2/4] colibri-imx6ull: " Igor Opaniuk
2019-10-14 12:40 ` sbabic at denx.de
2019-10-11 9:57 ` [U-Boot] [PATCH v1 3/4] colibri_imx6: " Igor Opaniuk
2019-10-11 9:57 ` [U-Boot] [PATCH v1 4/4] colibri_imx7: " Igor Opaniuk
2019-10-14 12:40 ` sbabic at denx.de
2019-10-14 12:40 ` [U-Boot] [PATCH v1 1/4] apalis_imx6: " sbabic at denx.de
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.