From: Igor Opaniuk <igor.opaniuk@gmail.com>
To: u-boot@lists.denx.de
Subject: [PATCH v1 12/13] colibri_imx7: boot env configuration updates
Date: Tue, 16 Jun 2020 22:20:10 +0300 [thread overview]
Message-ID: <1592335211-5998-13-git-send-email-igor.opaniuk@gmail.com> (raw)
In-Reply-To: <1592335211-5998-1-git-send-email-igor.opaniuk@gmail.com>
From: Igor Opaniuk <igor.opaniuk@toradex.com>
1. Drop legacy emmcboot wrapper from env.
2. Change the "boot try" order. Default one is: SD -> eMMC -> USB -> DHCP
3. Drop DFU defines
Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
---
include/configs/colibri_imx7.h | 24 +-----------------------
1 file changed, 1 insertion(+), 23 deletions(-)
diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
index b3f660b..1afa937 100644
--- a/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h
@@ -88,23 +88,6 @@
"mmc read ${android_fdt_addr} ${env_start} ${env_size}; " \
"bootm ${loadaddr} ${loadaddr} ${android_fdt_addr}\0 "
-#define EMMC_BOOTCMD \
- "set_emmcargs=setenv emmcargs ip=off root=PARTUUID=${uuid} ro " \
- "rootfstype=ext4 rootwait\0" \
- "emmcboot=run setup; run emmcfinduuid; run set_emmcargs; " \
- "setenv bootargs ${defargs} ${emmcargs} ${setupargs} " \
- "${vidargs}; echo Booting from internal eMMC chip...; " \
- "run m4boot && " \
- "load mmc ${emmcdev}:${emmcbootpart} ${fdt_addr_r} " \
- "${soc}-colibri-emmc-${fdt_board}.dtb && " \
- "load mmc ${emmcdev}:${emmcbootpart} ${kernel_addr_r} " \
- "${boot_file} && run fdt_fixup && " \
- "bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
- "emmcbootpart=1\0" \
- "emmcdev=0\0" \
- "emmcfinduuid=part uuid mmc ${emmcdev}:${emmcrootpart} uuid\0" \
- "emmcrootpart=2\0"
-
#define MEM_LAYOUT_ENV_SETTINGS \
"bootm_size=0x10000000\0" \
"fdt_addr_r=0x82000000\0" \
@@ -144,7 +127,6 @@
"setenv fdtfile ${soc}-colibri-emmc-${fdt_board}.dtb && run distro_bootcmd;"
#define MODULE_EXTRA_ENV_SETTINGS \
"variant=-emmc\0" \
- EMMC_BOOTCMD \
EMMC_ANDROID_BOOTCMD
#endif
@@ -155,8 +137,8 @@
func(DHCP, dhcp, na)
#elif defined(CONFIG_TARGET_COLIBRI_IMX7_EMMC)
#define BOOT_TARGET_DEVICES(func) \
- func(MMC, mmc, 0) \
func(MMC, mmc, 1) \
+ func(MMC, mmc, 0) \
func(USB, usb, 0) \
func(DHCP, dhcp, na)
#endif
@@ -239,10 +221,6 @@
#define CONFIG_USBD_HS
-/* USB Device Firmware Update support */
-#define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_16M
-#define DFU_DEFAULT_POLL_TIMEOUT 300
-
#if defined(CONFIG_VIDEO) || defined(CONFIG_DM_VIDEO)
#define CONFIG_VIDEO_MXS
#define CONFIG_VIDEO_LOGO
--
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 ` [PATCH v1 07/13] configs/colibri_vf.h: drop sdboot in favour of distro_bootcmd Igor Opaniuk
2020-06-23 7:51 ` 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 ` Igor Opaniuk [this message]
2020-06-23 7:50 ` [PATCH v1 12/13] colibri_imx7: " 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-13-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