From 1374848fd4abd9c18d3f42e4565dc028fd12665d Mon Sep 17 00:00:00 2001
From: Johannes Schauer Marin Rodrigues <josch@mister-muffin.de>
Date: Sun, 24 Apr 2022 22:27:45 +0200
Subject: [PATCH] try booting from USB first
---
.../boundary/nitrogen8m_som/nitrogen8m_som.c | 23 +++++++++++--------
1 file changed, 13 insertions(+), 10 deletions(-)
diff --git a/board/boundary/nitrogen8m_som/nitrogen8m_som.c b/board/boundary/nitrogen8m_som/nitrogen8m_som.c
index fc02bc263e9..f70bbd92e5d 100644
--- a/board/boundary/nitrogen8m_som/nitrogen8m_som.c
+++ b/board/boundary/nitrogen8m_som/nitrogen8m_som.c
@@ -343,19 +343,22 @@ static void set_env_vars(void)
env_set("kernel_addr_r", "0x40480000");
env_set("fdt_addr_r", "0x50000000");
env_set("ramdisk_addr_r", "0x51000000");
- env_set("devtype", "mmc");
env_set("bootpart", "1");
env_set("script", "boot.scr");
env_set("bootcmd",
- "setenv devnum; " // unset environment variable so that the loop variable takes precedence
- "for devnum in 1 0; do " // first try SD card then eMMC
- "${devtype} dev ${devnum}; "
- "if ${devtype} rescan; then "
- "setenv prefix; " // unset environment variable so that the loop variable takes precedence
- "for prefix in / /boot/; do " // search for boot.scr in / and in /boot/
- "load ${devtype} ${devnum}:${bootpart} ${loadaddr} ${prefix}${script} && source; "
- "done; "
- "fi; "
+ "usb start; "
+ "setenv devtype; " // unset environment variable so that the loop variable takes precedence
+ "for devtype in usb mmc; do " // first try usb, then SD card or eMMC
+ "setenv devnum; " // unset environment variable so that the loop variable takes precedence
+ "for devnum in 1 0; do " // first try SD card (mmc1) then eMMC (mmc0)
+ "${devtype} dev ${devnum}; "
+ "if test \"${devtype}\" = \"usb\" || ${devtype} rescan; then "
+ "setenv prefix; " // unset environment variable so that the loop variable takes precedence
+ "for prefix in / /boot/; do " // search for boot.scr in / and in /boot/
+ "load ${devtype} ${devnum}:${bootpart} ${loadaddr} ${prefix}${script} && source; "
+ "done; "
+ "fi; "
+ "done; "
"done"
);
#endif
--
GitLab