From: Igor Opaniuk <igor.opaniuk@gmail.com>
To: u-boot@lists.denx.de
Subject: [PATCH v1 07/13] configs/colibri_vf.h: drop sdboot in favour of distro_bootcmd
Date: Tue, 16 Jun 2020 22:20:05 +0300 [thread overview]
Message-ID: <1592335211-5998-8-git-send-email-igor.opaniuk@gmail.com> (raw)
In-Reply-To: <1592335211-5998-1-git-send-email-igor.opaniuk@gmail.com>
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(-)
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 && " \
--
2.7.4
next prev parent reply other threads:[~2020-06-16 19:20 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-16 19:19 [PATCH v1 00/13] This patch-series includes updates for Toradex modules: Igor Opaniuk
2020-06-16 19:19 ` [PATCH v1 01/13] apalis-imx8: enable of_system_setup Igor Opaniuk
2020-06-23 7:49 ` sbabic at denx.de
2020-06-16 19:20 ` [PATCH v1 02/13] apalis/colibri-imx8: re-enable CONFIG_IMX_SCU_THERMAL Igor Opaniuk
2020-06-23 7:50 ` sbabic at denx.de
2020-06-16 19:20 ` [PATCH v1 03/13] colibri-imx8x: declare consoleargs Igor Opaniuk
2020-06-23 7:50 ` sbabic at denx.de
2020-06-16 19:20 ` [PATCH v1 04/13] colibri_imx7: add addresses required for distro boot Igor Opaniuk
2020-06-23 7:51 ` sbabic at denx.de
2020-06-16 19:20 ` [PATCH v1 05/13] colibri-imx6ull/imx7: define bootubipart " Igor Opaniuk
2020-06-23 7:50 ` sbabic at denx.de
2020-06-16 19:20 ` [PATCH v1 06/13] colibri_vf_defconfig: enable part cmd Igor Opaniuk
2020-06-23 7:51 ` sbabic at denx.de
2020-06-16 19:20 ` Igor Opaniuk [this message]
2020-06-23 7:51 ` [PATCH v1 07/13] configs/colibri_vf.h: drop sdboot in favour of distro_bootcmd sbabic at denx.de
2020-06-16 19:20 ` [PATCH v1 08/13] apalis-tk1: enable distroboot Igor Opaniuk
2020-06-23 7:51 ` sbabic at denx.de
2020-06-16 19:20 ` [PATCH v1 09/13] apalis-tk1: fix setting fdtfile value Igor Opaniuk
2020-06-23 7:50 ` sbabic at denx.de
2020-06-16 19:20 ` [PATCH v1 10/13] toradex: imx: enable BOOTCOUNT feature Igor Opaniuk
2020-06-23 7:51 ` sbabic at denx.de
2020-06-16 19:20 ` [PATCH v1 11/13] apalis_imx6: boot env configuration updates Igor Opaniuk
2020-06-23 7:51 ` sbabic at denx.de
2020-06-16 19:20 ` [PATCH v1 12/13] colibri_imx7: " Igor Opaniuk
2020-06-23 7:50 ` sbabic at denx.de
2020-06-16 19:20 ` [PATCH v1 13/13] colibri_imx6: " Igor Opaniuk
2020-06-23 7:50 ` sbabic at denx.de
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1592335211-5998-8-git-send-email-igor.opaniuk@gmail.com \
--to=igor.opaniuk@gmail.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox