From bfbf235a1282485732fadc80840900d6c856e871 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Petr=20=C5=A0tetiar?= Date: Fri, 1 Apr 2022 15:11:35 +0200 Subject: [PATCH] imx: bootscript-apalis: make it working with U-Boot 2022.01 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 [pepe2k@gmail.com: updated commit title for 2022.01] Signed-off-by: Piotr Dymacz --- target/linux/imx/image/bootscript-toradex_apalis | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 -- 2.30.2