Is there a support for meta-mender-imx on zeus?

General Discussions
, ,
10

I’m using the latest release “5.4.47 , 30 september 2020” from here.

And I got an error patching u-boot-imx, your patch is not compatible with the three files:

  • imx8mm_ddr4_evk_defconfig
  • imx8mm_evk_defconfig
  • imx8mm_evk.h

Here is the Yocto patching error log:

Applying patch 0001-Switch-to-CONFIG_DISTRO_DEFAULTS-for-bootcmd.patch

patching file configs/imx8mm_ddr4_evk_defconfig
Hunk #1 FAILED at 80.
1 out of 1 hunk FAILED -- rejects in file configs/imx8mm_ddr4_evk_defconfig

patching file configs/imx8mm_evk_defconfig
Hunk #1 FAILED at 88.
1 out of 1 hunk FAILED -- rejects in file configs/imx8mm_evk_defconfig

patching file include/configs/imx8mm_evk.h
Hunk #1 succeeded at 49 (offset -23 lines).
Hunk #2 succeeded at 80 (offset -42 lines).
Hunk #3 FAILED at 141.
Hunk #4 FAILED at 150.
Hunk #5 FAILED at 246.
Hunk #6 succeeded at 270 (offset -71 lines).
3 out of 6 hunks FAILED -- rejects in file include/configs/imx8mm_evk.h

I did download the release in a clean directoy, and started everything from scratch, even creating a new clean sstate-cache and downloads folders.

I did actuallty try to separate your patch and adapt it to the newest release, because your patch will not be correct for the latest release, for example:

  • CONFIG_IMX_SEC_MIPI_DSI=y do not exist in imx8mm_evk_defconfig of the latest release and that flag is used in your patch to add a line next to it.

  • CONFIG_ENV_SIZE do not exist in imx8m_evk.h

And I’m now waiting for it to complete compiling.

Here are the three patches:
imx8mm_ddr4_evk_defconfig

From d626ff5a993477c2d75685ededfc201403b786e4 Mon Sep 17 00:00:00 2001
From: TALEL BelHadj Salem <talel.hajsalem@sofia-technologies.com>
Date: Tue, 20 Oct 2020 14:06:30 +0100
Subject: [PATCH] Switch to CONFIG_DISTRO_DEFAULTS for bootcmd (imx8mm_ddr4_evk_defconfig)
---
configs/imx8mm_ddr4_evk_defconfig | 2 ++
1 file changed, 2 insertions(+)
diff --git a/configs/imx8mm_ddr4_evk_defconfig b/configs/imx8mm_ddr4_evk_defconfig
index bef944f..d57d874 100644
--- a/configs/imx8mm_ddr4_evk_defconfig
+++ b/configs/imx8mm_ddr4_evk_defconfig
@@ -123,6 +123,8 @@ CONFIG_NAND=y
CONFIG_NAND_MXS=y
CONFIG_NAND_MXS_DT=y
+CONFIG_EFI_LOADER=y
+CONFIG_DISTRO_DEFAULTS=y
CONFIG_OF_LIBFDT_OVERLAY=y
CONFIG_REGMAP=y
--
2.7.4

imx8mm_evk_defconfig

From 42975c89f6528a298cc22b609bd9385b8d85c201 Mon Sep 17 00:00:00 2001
From: TALEL BelHadj Salem <talel.hajsalem@sofia-technologies.com>
Date: Tue, 20 Oct 2020 14:12:48 +0100
Subject: [PATCH] Switch to CONFIG_DISTRO_DEFAULTS for bootcmd. (imx8mm_evk_defconfig)
---
configs/imx8mm_evk_defconfig | 3 +++
1 file changed, 3 insertions(+)
diff --git a/configs/imx8mm_evk_defconfig b/configs/imx8mm_evk_defconfig
index 25044aa..5b74d63 100644
--- a/configs/imx8mm_evk_defconfig
+++ b/configs/imx8mm_evk_defconfig
@@ -139,3 +139,6 @@ CONFIG_DM_VIDEO=y
CONFIG_VIDEO_LCD_RAYDIUM_RM67191=y
CONFIG_VIDEO_ADV7535=y
CONFIG_SYS_WHITE_ON_BLACK=y
+
+CONFIG_EFI_LOADER=y
+CONFIG_DISTRO_DEFAULTS=y
\ No newline at end of file
--
2.7.4

imx8mm_evk.h

From 38a52f8382623f514e49c7b599ceabc5a6259dfa Mon Sep 17 00:00:00 2001
From: TALEL BelHadj Salem <talel.hajsalem@sofia-technologies.com>
Date: Tue, 20 Oct 2020 14:26:18 +0100
Subject: [PATCH] Switch to CONFIG_DISTRO_DEFAULTS for bootcmd. (imx8mm_evk.h)
---
 include/configs/imx8mm_evk.h | 80 ++++++++++----------------------------------
 1 file changed, 17 insertions(+), 63 deletions(-)
diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h
index 0f0c1b2..a4a9f0a 100644
--- a/include/configs/imx8mm_evk.h
+++ b/include/configs/imx8mm_evk.h
@@ -48,7 +48,7 @@
 #define CONFIG_SYS_NAND_U_BOOT_OFFS_REDUND \
 	(CONFIG_SYS_NAND_U_BOOT_OFFS + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512 - 0x8400)
 #endif
-
+#define BOOTENV
 #endif
 
 #define CONFIG_CMD_READ
@@ -79,12 +79,12 @@
  */
 #define JAILHOUSE_ENV \
 	"jh_clk= \0 " \
-	"jh_mmcboot=mw 0x303d0518 0xff; setenv fdt_file imx8mm-evk-root.dtb;" \
+	"jh_mmcboot=mw 0x303d0518 0xff; setenv fdtfile imx8mm-evk-root.dtb;" \
 		"setenv jh_clk clk_ignore_unused; " \
 			   "if run loadimage; then " \
 				   "run mmcboot; " \
 			   "else run jh_netboot; fi; \0" \
-	"jh_netboot=mw 0x303d0518 0xff; setenv fdt_file imx8mm-evk-root.dtb; setenv jh_clk clk_ignore_unused; run netboot; \0 "
+	"jh_netboot=mw 0x303d0518 0xff; setenv fdtfile imx8mm-evk-root.dtb; setenv jh_clk clk_ignore_unused; run netboot; \0 "
 
 #define CONFIG_MFG_ENV_SETTINGS \
@@ -99,7 +99,7 @@
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	CONFIG_MFG_ENV_SETTINGS \
 	"splashimage=0x50000000\0" \
-	"fdt_addr=0x43000000\0"			\
+	"fdt_addr_r=0x43000000\0"	\
 	"fdt_high=0xffffffffffffffff\0" \
 	"mtdparts=" MFG_NAND_PARTITION "\0" \
 	"console=ttymxc1,115200 earlycon=ec_imx6q,0x30890000,115200\0" \
@@ -108,76 +108,27 @@
 		MFG_NAND_PARTITION \
 		"\0" \
 	"bootcmd=nand read ${loadaddr} 0x5000000 0x2000000;"\
-		"nand read ${fdt_addr} 0x7000000 0x100000;"\
-		"booti ${loadaddr} - ${fdt_addr}"
+		"nand read ${fdt_addr_r} 0x7000000 0x100000;"\
+		"booti ${loadaddr} - ${fdt_addr_r}"
 #else
 #define CONFIG_EXTRA_ENV_SETTINGS		\
 	CONFIG_MFG_ENV_SETTINGS \
 	JAILHOUSE_ENV \
-	"script=boot.scr\0" \
-	"image=Image\0" \
+	BOOTENV \
 	"splashimage=0x50000000\0" \
 	"console=ttymxc1,115200\0" \
-	"fdt_addr=0x43000000\0"			\
+	"fdt_addr_r=0x43000000\0"			\
 	"fdt_high=0xffffffffffffffff\0"		\
 	"boot_fit=no\0" \
-	"fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
+	"fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
 	"initrd_addr=0x43800000\0"		\
-	"initrd_high=0xffffffffffffffff\0" \
-	"mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
-	"mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
-	"mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
-	"mmcautodetect=yes\0" \
-	"mmcargs=setenv bootargs ${jh_clk} console=${console} root=${mmcroot}\0 " \
-	"loadbootscript=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
-	"bootscript=echo Running bootscript from mmc ...; " \
-		"source\0" \
-	"loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
-	"loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
-	"mmcboot=echo Booting from mmc ...; " \
-		"run mmcargs; " \
-		"if test ${boot_fit} = yes || test ${boot_fit} = try; then " \
-			"bootm ${loadaddr}; " \
-		"else " \
-			"if run loadfdt; then " \
-				"booti ${loadaddr} - ${fdt_addr}; " \
-			"else " \
-				"echo WARN: Cannot load the DT; " \
-			"fi; " \
-		"fi;\0" \
-	"netargs=setenv bootargs ${jh_clk} console=${console} " \
-		"root=/dev/nfs " \
-		"ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
-	"netboot=echo Booting from net ...; " \
-		"run netargs;  " \
-		"if test ${ip_dyn} = yes; then " \
-			"setenv get_cmd dhcp; " \
-		"else " \
-			"setenv get_cmd tftp; " \
-		"fi; " \
-		"${get_cmd} ${loadaddr} ${image}; " \
-		"if test ${boot_fit} = yes || test ${boot_fit} = try; then " \
-			"bootm ${loadaddr}; " \
-		"else " \
-			"if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \
-				"booti ${loadaddr} - ${fdt_addr}; " \
-			"else " \
-				"echo WARN: Cannot load the DT; " \
-			"fi; " \
-		"fi;\0"
+	"initrd_high=0xffffffffffffffff\0"
 #define CONFIG_BOOTCOMMAND \
-	   "mmc dev ${mmcdev}; if mmc rescan; then " \
-		   "if run loadbootscript; then " \
-			   "run bootscript; " \
-		   "else " \
-			   "if run loadimage; then " \
-				   "run mmcboot; " \
-			   "else run netboot; " \
-			   "fi; " \
-		   "fi; " \
-	   "fi;"
+	   "setenv bootargs ${jh_clk} console=${console}; " \
+	   "setenv kernel_addr_r ${loadaddr}; " \
+	   "run distro_bootcmd;"
 #endif
 /* Link Definitions */
@@ -268,7 +219,10 @@
 #define CONFIG_CMD_USB_MASS_STORAGE
 #define CONFIG_USB_GADGET_MASS_STORAGE
 #define CONFIG_USB_FUNCTION_MASS_STORAGE
-
+#define BOOT_TARGET_DEVICES(func) \
+        func(MMC, mmc, 2) \
+        func(MMC, mmc, 1)
+#include <config_distro_bootcmd.h>
 #endif
 #define CONFIG_USB_GADGET_VBUS_DRAW 2
-- 
2.7.4