diff mbox series

[2/4] imx: bootscript-apalis: make it working with U-Boot 2022.01

Message ID 20220401131137.697545-2-pepe2k@gmail.com
State Accepted, archived
Delegated to: Piotr Dymacz
Headers show
Series [1/4] uboot-imx: bump to 2022.01 release | expand

Commit Message

Piotr Dymacz April 1, 2022, 1:11 p.m. UTC 
From: Petr Štetiar <ynezz@true.cz>

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>
[pepe2k@gmail.com: updated commit title for 2022.01]
Signed-off-by: Piotr Dymacz <pepe2k@gmail.com>
---
 target/linux/imx/image/bootscript-toradex_apalis | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/target/linux/imx/image/bootscript-toradex_apalis b/target/linux/imx/image/bootscript-toradex_apalis
index 3a3a6dadb1..f163b92ed0 100644
--- a/target/linux/imx/image/bootscript-toradex_apalis
+++ b/target/linux/imx/image/bootscript-toradex_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