diff mbox series

[v2,09/13] smegw01: Switch to fitImage

Message ID 20230421105656.1062558-9-festevam@gmail.com
State Superseded
Delegated to: Stefano Babic
Headers show
Series [v2,01/13] smegw01: Enable setting additional boot params | expand

Commit Message

Fabio Estevam April 21, 2023, 10:56 a.m. UTC 
From: Eduard Strehlau <eduard@lionizers.com>

Instead of loading the zImage kernel and the devicetree separately, switch
to the fitImage format, which is more convenient when working with secure
boot, for example.

Signed-off-by: Eduard Strehlau <eduard@lionizers.com>
Signed-off-by: Fabio Estevam <festevam@denx.de>
---
Changes since v1:
- None

 include/configs/smegw01.h | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)
diff mbox series

Patch

diff --git a/include/configs/smegw01.h b/include/configs/smegw01.h
index 8f68472f5b..8521883277 100644
--- a/include/configs/smegw01.h
+++ b/include/configs/smegw01.h
@@ -23,7 +23,7 @@ 
 #endif
 
 #define CFG_EXTRA_ENV_SETTINGS \
-	"image=zImage\0" \
+	"image=fitImage\0" \
 	"console=ttymxc0\0" \
 	"fdtfile=imx7d-smegw01.dtb\0" \
 	"fdt_addr=0x83000000\0" \
@@ -39,8 +39,8 @@ 
 								"saveenv;" \
 						  "fi;\0" \
 	"bootlimit=3\0" \
-	"loadimage=load mmc ${mmcdev}#rootfs-${mmcpart_committed} ${loadaddr} boot/${image}\0" \
-	"loadfdt=load mmc ${mmcdev}#rootfs-${mmcpart_committed} ${fdt_addr} boot/${fdtfile}\0" \
+	"fit_addr=0x88000000\0" \
+	"loadimage=load mmc ${mmcdev}#rootfs-${mmcpart_committed} ${fit_addr} boot/${image}\0" \
 	"loadpart=gpt setenv mmc ${mmcdev} rootfs-${mmcpart_committed}\0" \
 	"loadbootpart=mmc partconf 1 boot_part\0" \
 	"mmcboot=echo Booting from mmc ...; " \
@@ -48,12 +48,8 @@ 
 		"run loadpart; " \
 		"run loadbootpart; " \
 		"run mmcargs; " \
-		"if run loadfdt; then " \
-			"if bootz ${loadaddr} - ${fdt_addr}; then " \
-				"; " \
-			"else " \
-				"run altbootcmd; " \
-			"fi;" \
+		"if bootm ${fit_addr}; then " \
+			"; " \
 		"else " \
 			"run altbootcmd; " \
 		"fi;\0" \