From: Andre Heider <a.heider@gmail.com>
Date: Sat, 7 Sep 2019 10:36:52 +0000 (+0200)
Subject: omap: support booting off different mmc devices
X-Git-Tag: v21.02.0-rc1~4491
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c5d121654e74b74ca95df5efbca0db699ed07dbc;p=openwrt%2Fstaging%2Fchunkeey.git

omap: support booting off different mmc devices

Tested with installing to/sysupgrading from sd and emmc on boneblack.

Signed-off-by: Andre Heider <a.heider@gmail.com>
---

diff --git a/package/boot/uboot-omap/files/boot.scr.txt b/package/boot/uboot-omap/files/boot.scr.txt
index 3e6b5c351d..a97684b0e6 100644
--- a/package/boot/uboot-omap/files/boot.scr.txt
+++ b/package/boot/uboot-omap/files/boot.scr.txt
@@ -1,5 +1,9 @@
-setenv bootargs console=${console} root=/dev/mmcblk0p2 rootwait
+if test -z "${devnum}"; then
+	setenv devnum 0
+fi
 
-load mmc 0:1 ${loadaddr} /zImage \
-&& load mmc 0:1 ${fdtaddr} /dtbs/${fdtfile} \
+setenv bootargs console=${console} root=/dev/mmcblk${devnum}p2 rootwait
+
+load mmc ${devnum}:1 ${loadaddr} /zImage \
+&& load mmc ${devnum}:1 ${fdtaddr} /dtbs/${fdtfile} \
 && bootz ${loadaddr} - ${fdtaddr}