From: Petr Štetiar <ynezz@true.cz>
Date: Mon, 8 Feb 2021 14:40:07 +0000 (+0100)
Subject: imx6: bootscript-apalis: make it working on v2021.01 release
X-Git-Tag: v21.02.0-rc1~296
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4968fc8fb110612018af3ba2836be1b4744346e2;p=openwrt%2Fstaging%2Fpepe2k.git

imx6: bootscript-apalis: make it working on v2021.01 release

Upstream in commit 8b9c0cb46471 ("apalis_imx6: boot env configuration
updates") removed emmc legacy wrappers, but so far didn't included any
replacements. Fix it by simply defining the missing variables and UUID
gathering directly into the boot script.

Signed-off-by: Petr Štetiar <ynezz@true.cz>
---

diff --git a/target/linux/imx6/image/bootscript-apalis b/target/linux/imx6/image/bootscript-apalis
index 3a3a6dadb1..f163b92ed0 100644
--- a/target/linux/imx6/image/bootscript-apalis
+++ b/target/linux/imx6/image/bootscript-apalis
@@ -1,13 +1,15 @@
 echo "Toradex Apalis OpenWrt Boot script v1.1"
 
-run emmcfinduuid
+setenv mmcdev 0
+setenv mmcrootpart 2
+part uuid mmc ${mmcdev}:${mmcrootpart} uuid
 
 setenv nextcon 0
 setenv boot_file uImage
 setenv fdt_file imx6q-apalis-ixora.dtb
 setenv root root=PARTUUID=${uuid} rootfstype=squashfs rootwait
 setenv bootargs earlyprintk console=${console},${baudrate}n8 ${root}
-setenv fsload ext4load mmc ${emmcdev}:${emmcbootpart}
+setenv fsload ext4load mmc ${mmcdev}:${mmcbootpart}
 
 if ${fsload} ${kernel_addr_r} ${boot_file}; then
 	if ${fsload} ${fdt_addr_r} ${fdt_file}; then