Skip to contentSkip to conversation

imx8mn_beacon: Fix booting hang and switch to binman

PATCH In review Adam Ford 4 participants 13 messages Sep 10, 2021 – Jan 8, 2022

Subsystems (3)
lore
Share & tools
lore

Adam Ford

author
#0 lore raw

PATCH 1/1 imx8mn_beacon: Fix booting hang and switch to binman

Somewhere along the line, the board stopped being able to boot. Rather than just fixing the issue, let's fix the issue and migrate to binman to eliminate a warning when using custom imx tools for generating the binary.

arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi +130 -0
index bbc64a2819..69fd69c8d0 100644
@@ -4,6 +4,10 @@
  */
 
 / {
+	binman: binman {
+		multiple-images;
+	};
+
 	wdt-reboot {
 		compatible = "wdt-reboot";
 		wdt = <&wdog1>;
@@ -40,6 +44,9 @@
 &clk {
 	u-boot,dm-spl;
 	u-boot,dm-pre-reloc;
+	/delete-property/ assigned-clocks;
+	/delete-property/ assigned-clock-parents;
+	/delete-property/ assigned-clock-rates;
 };
 
 &gpio1 {
@@ -99,6 +106,10 @@
 	u-boot,off-on-delay-us = <20000>;
 };
 
+&uart2 {
+	u-boot,dm-spl;
+};
+
 &usdhc1 {
 	u-boot,dm-spl;
 	sd-uhs-sdr104;
@@ -120,3 +131,122 @@
 &wdog1 {
 	u-boot,dm-spl;
 };
+
+&binman {
+	 u-boot-spl-ddr {
+		filename = "u-boot-spl-ddr.bin";
+		pad-byte = <0xff>;
+		align-size = <4>;
+		align = <4>;
+
+		u-boot-spl {
+			align-end = <4>;
+		};
+
+		blob_1: blob-ext@1 {
+			filename = "lpddr4_pmu_train_1d_imem.bin";
+			size = <0x8000>;
+		};
+
+		blob_2: blob-ext@2 {
+			filename = "lpddr4_pmu_train_1d_dmem.bin";
+			size = <0x4000>;
+		};
+
+		blob_3: blob-ext@3 {
+			filename = "lpddr4_pmu_train_2d_imem.bin";
+			size = <0x8000>;
+		};
+
+		blob_4: blob-ext@4 {
+			filename = "lpddr4_pmu_train_2d_dmem.bin";
+			size = <0x4000>;
+		};
+	};
+
+
+	spl {
+		filename = "spl.bin";
+
+		mkimage {
+			args = "-n spl/u-boot-spl.cfgout -T imx8mimage -e 0x912000";
+
+			blob {
+				filename = "u-boot-spl-ddr.bin";
+			};
+		};
+	};
+
+	itb {
+		filename = "u-boot.itb";
+
+		fit {
+			description = "Configuration to load ATF before U-Boot";
+			#address-cells = <1>;
+			fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>;
+
+			images {
+				uboot {
+					description = "U-Boot (64-bit)";
+					type = "standalone";
+					arch = "arm64";
+					compression = "none";
+					load = <CONFIG_SYS_TEXT_BASE>;
+
+					uboot_blob: blob-ext {
+						filename = "u-boot-nodtb.bin";
+					};
+				};
+
+				atf {
+					description = "ARM Trusted Firmware";
+					type = "firmware";
+					arch = "arm64";
+					compression = "none";
+					load = <0x960000>;
+					entry = <0x960000>;
+
+					atf_blob: blob-ext {
+						filename = "bl31.bin";
+					};
+				};
+
+				fdt {
+					description = "NAME";
+					type = "flat_dt";
+					compression = "none";
+
+					uboot_fdt_blob: blob-ext {
+						filename = "u-boot.dtb";
+					};
+				};
+			};
+
+			configurations {
+				default = "conf";
+
+				conf {
+					description = "NAME";
+					firmware = "uboot";
+					loadables = "atf";
+					fdt = "fdt";
+				};
+			};
+		};
+	};
+
+	imx-boot {
+		filename = "flash.bin";
+		pad-byte = <0x00>;
+
+		spl: blob-ext@1 {
+			offset = <0x0>;
+			filename = "spl.bin";
+		};
+
+		uboot: blob-ext@2 {
+			offset = <0x58000>;
+			filename = "u-boot.itb";
+		};
+	};
+};
arch/arm/mach-imx/imx8m/Kconfig +1 -0
index 8fedf45987..9a1eb108e4 100644
@@ -116,6 +116,7 @@ config TARGET_IMX8MM_BEACON
 
 config TARGET_IMX8MN_BEACON
 	bool "imx8mn Beacon Embedded devkit"
+	select BINMAN
 	select IMX8MN
 	select SUPPORT_SPL
 	select IMX8M_LPDDR4
board/beacon/imx8mn/imximage-8mn-lpddr4.cfg new file +10 -0
new file mode 100644
index 0000000000..7286b26494
@@ -0,0 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright 2021 NXP
+ */
+
+#define __ASSEMBLY__
+
+ROM_VERSION	v2
+BOOT_FROM	sd
+LOADER		u-boot-spl-ddr.bin	0x912000
configs/imx8mn_beacon_defconfig +7 -3
index 5296204aad..f2515874a2 100644
@@ -26,9 +26,9 @@ CONFIG_LTO=y
 CONFIG_FIT=y
 CONFIG_FIT_EXTERNAL_OFFSET=0x3000
 CONFIG_SPL_LOAD_FIT=y
-CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
+# CONFIG_USE_SPL_FIT_GENERATOR is not set
 CONFIG_OF_SYSTEM_SETUP=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mn-lpddr4.cfg"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/beacon/imx8mn/imximage-8mn-lpddr4.cfg"
 CONFIG_DEFAULT_FDT_FILE="imx8mn-beacon-kit.dtb"
 CONFIG_ARCH_MISC_INIT=y
 CONFIG_SPL_BOARD_INIT=y
@@ -36,6 +36,7 @@ CONFIG_SPL_BOOTROM_SUPPORT=y
 CONFIG_SPL_SEPARATE_BSS=y
 CONFIG_SPL_I2C=y
 CONFIG_SPL_POWER=y
+CONFIG_SPL_WATCHDOG=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="u-boot=> "
 # CONFIG_BOOTM_NETBSD is not set
@@ -62,7 +63,6 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
 CONFIG_SPL_OF_CONTROL=y
-CONFIG_OF_SPL_REMOVE_PROPS="interrupt-parent interrupts"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_SYS_MMC_ENV_DEV=2
@@ -106,6 +106,7 @@ CONFIG_PHY_GIGE=y
 CONFIG_FEC_MXC=y
 CONFIG_MII=y
 CONFIG_PINCTRL=y
+CONFIG_SPL_PINCTRL=y
 CONFIG_PINCTRL_IMX8M=y
 CONFIG_DM_PMIC=y
 # CONFIG_SPL_PMIC_CHILDREN is not set
@@ -122,7 +123,9 @@ CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_NXP_FSPI=y
 CONFIG_SYSRESET=y
+CONFIG_SPL_SYSRESET=y
 CONFIG_SYSRESET_PSCI=y
+CONFIG_SYSRESET_WATCHDOG=y
 CONFIG_DM_THERMAL=y
 CONFIG_USB=y
 # CONFIG_SPL_DM_USB is not set
@@ -134,3 +137,4 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 CONFIG_CI_UDC=y
 CONFIG_SDP_LOADADDR=0x0
 CONFIG_OF_LIBFDT_OVERLAY=y
+CONFIG_IMX_WATCHDOG=y
Signature · 1 line
2.25.1
Reviewed-by Peng Fan on v1 1/1
#1 lore raw
Quoted 246 lines · Adam Ford

Somewhere along the line, the board stopped being able to boot. Rather than just fixing the issue, let's fix the issue and migrate to binman to eliminate a warning when using custom imx tools for generating the binary.

arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi +130 -0
index bbc64a2819..69fd69c8d0 100644
@@ -4,6 +4,10 @@
   */
 
  / {
+	binman: binman {
+		multiple-images;
+	};
+
  	wdt-reboot {
  		compatible = "wdt-reboot";
  		wdt = <&wdog1>;
@@ -40,6 +44,9 @@
  &clk {
  	u-boot,dm-spl;
  	u-boot,dm-pre-reloc;
+	/delete-property/ assigned-clocks;
+	/delete-property/ assigned-clock-parents;
+	/delete-property/ assigned-clock-rates;
  };
 
  &gpio1 {
@@ -99,6 +106,10 @@
  	u-boot,off-on-delay-us = <20000>;
  };
 
+&uart2 {
+	u-boot,dm-spl;
+};
+
  &usdhc1 {
  	u-boot,dm-spl;
  	sd-uhs-sdr104;
@@ -120,3 +131,122 @@
  &wdog1 {
  	u-boot,dm-spl;
  };
+
+&binman {
+	 u-boot-spl-ddr {
+		filename = "u-boot-spl-ddr.bin";
+		pad-byte = <0xff>;
+		align-size = <4>;
+		align = <4>;
+
+		u-boot-spl {
+			align-end = <4>;
+		};
+
+		blob_1: blob-ext@1 {
+			filename = "lpddr4_pmu_train_1d_imem.bin";
+			size = <0x8000>;
+		};
+
+		blob_2: blob-ext@2 {
+			filename = "lpddr4_pmu_train_1d_dmem.bin";
+			size = <0x4000>;
+		};
+
+		blob_3: blob-ext@3 {
+			filename = "lpddr4_pmu_train_2d_imem.bin";
+			size = <0x8000>;
+		};
+
+		blob_4: blob-ext@4 {
+			filename = "lpddr4_pmu_train_2d_dmem.bin";
+			size = <0x4000>;
+		};
+	};
+
+
+	spl {
+		filename = "spl.bin";
+
+		mkimage {
+			args = "-n spl/u-boot-spl.cfgout -T imx8mimage -e 0x912000";
+
+			blob {
+				filename = "u-boot-spl-ddr.bin";
+			};
+		};
+	};
+
+	itb {
+		filename = "u-boot.itb";
+
+		fit {
+			description = "Configuration to load ATF before U-Boot";
+			#address-cells = <1>;
+			fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>;
+
+			images {
+				uboot {
+					description = "U-Boot (64-bit)";
+					type = "standalone";
+					arch = "arm64";
+					compression = "none";
+					load = <CONFIG_SYS_TEXT_BASE>;
+
+					uboot_blob: blob-ext {
+						filename = "u-boot-nodtb.bin";
+					};
+				};
+
+				atf {
+					description = "ARM Trusted Firmware";
+					type = "firmware";
+					arch = "arm64";
+					compression = "none";
+					load = <0x960000>;
+					entry = <0x960000>;
+
+					atf_blob: blob-ext {
+						filename = "bl31.bin";
+					};
+				};
+
+				fdt {
+					description = "NAME";
+					type = "flat_dt";
+					compression = "none";
+
+					uboot_fdt_blob: blob-ext {
+						filename = "u-boot.dtb";
+					};
+				};
+			};
+
+			configurations {
+				default = "conf";
+
+				conf {
+					description = "NAME";
+					firmware = "uboot";
+					loadables = "atf";
+					fdt = "fdt";
+				};
+			};
+		};
+	};
+
+	imx-boot {
+		filename = "flash.bin";
+		pad-byte = <0x00>;
+
+		spl: blob-ext@1 {
+			offset = <0x0>;
+			filename = "spl.bin";
+		};
+
+		uboot: blob-ext@2 {
+			offset = <0x58000>;
+			filename = "u-boot.itb";
+		};
+	};
+};
arch/arm/mach-imx/imx8m/Kconfig +1 -0
index 8fedf45987..9a1eb108e4 100644
@@ -116,6 +116,7 @@ config TARGET_IMX8MM_BEACON
 
  config TARGET_IMX8MN_BEACON
  	bool "imx8mn Beacon Embedded devkit"
+	select BINMAN
  	select IMX8MN
  	select SUPPORT_SPL
  	select IMX8M_LPDDR4
board/beacon/imx8mn/imximage-8mn-lpddr4.cfg new file +10 -0
new file mode 100644
index 0000000000..7286b26494
@@ -0,0 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright 2021 NXP
+ */
+
+#define __ASSEMBLY__
+
+ROM_VERSION	v2
+BOOT_FROM	sd
+LOADER		u-boot-spl-ddr.bin	0x912000
configs/imx8mn_beacon_defconfig +6 -3
index 5296204aad..f2515874a2 100644
@@ -26,9 +26,9 @@ CONFIG_LTO=y
  CONFIG_FIT=y
  CONFIG_FIT_EXTERNAL_OFFSET=0x3000
  CONFIG_SPL_LOAD_FIT=y
-CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
+# CONFIG_USE_SPL_FIT_GENERATOR is not set
  CONFIG_OF_SYSTEM_SETUP=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mn-lpddr4.cfg"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/beacon/imx8mn/imximage-8mn-lpddr4.cfg"
  CONFIG_DEFAULT_FDT_FILE="imx8mn-beacon-kit.dtb"
  CONFIG_ARCH_MISC_INIT=y
  CONFIG_SPL_BOARD_INIT=y
@@ -36,6 +36,7 @@ CONFIG_SPL_BOOTROM_SUPPORT=y
  CONFIG_SPL_SEPARATE_BSS=y
  CONFIG_SPL_I2C=y
  CONFIG_SPL_POWER=y
+CONFIG_SPL_WATCHDOG=y
  CONFIG_HUSH_PARSER=y
  CONFIG_SYS_PROMPT="u-boot=> "
  # CONFIG_BOOTM_NETBSD is not set
@@ -62,7 +63,6 @@ CONFIG_CMD_EXT4_WRITE=y
  CONFIG_CMD_FAT=y
  CONFIG_OF_CONTROL=y
  CONFIG_SPL_OF_CONTROL=y
-CONFIG_OF_SPL_REMOVE_PROPS="interrupt-parent interrupts"
  CONFIG_ENV_IS_IN_MMC=y
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_SYS_MMC_ENV_DEV=2
@@ -106,6 +106,7 @@ CONFIG_PHY_GIGE=y
  CONFIG_FEC_MXC=y
  CONFIG_MII=y
  CONFIG_PINCTRL=y
+CONFIG_SPL_PINCTRL=y
  CONFIG_PINCTRL_IMX8M=y
  CONFIG_DM_PMIC=y
  # CONFIG_SPL_PMIC_CHILDREN is not set
@@ -122,7 +123,9 @@ CONFIG_SPI=y
  CONFIG_DM_SPI=y
  CONFIG_NXP_FSPI=y
  CONFIG_SYSRESET=y
+CONFIG_SPL_SYSRESET=y
  CONFIG_SYSRESET_PSCI=y
+CONFIG_SYSRESET_WATCHDOG=y
  CONFIG_DM_THERMAL=y
  CONFIG_USB=y
  # CONFIG_SPL_DM_USB is not set

configs/imx8mn_beacon_defconfig CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 · line 140

Quoted 4 lines
configs/imx8mn_beacon_defconfig +1 -0
@@ -134,3 +137,4 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
  CONFIG_CI_UDC=y
  CONFIG_SDP_LOADADDR=0x0
  CONFIG_OF_LIBFDT_OVERLAY=y
+CONFIG_IMX_WATCHDOG=y
author
#2 lore raw
Quoted 9 lines · Peng Fan (OSS)
Quoted 5 lines · Adam Ford

Somewhere along the line, the board stopped being able to boot. Rather than just fixing the issue, let's fix the issue and migrate to binman to eliminate a warning when using custom imx tools for generating the binary.

Any chance this can make it into 2021.10? it's currently broken, and this seems to fix the problem. i didn't bisect to see where the issue broke, or i would have added a fixes tag.

adam

Quoted 247 lines
Quoted 241 lines
arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi +130 -0
index bbc64a2819..69fd69c8d0 100644
@@ -4,6 +4,10 @@
   */
 
  / {
+     binman: binman {
+             multiple-images;
+     };
+
      wdt-reboot {
              compatible = "wdt-reboot";
              wdt = <&wdog1>;
@@ -40,6 +44,9 @@
  &clk {
      u-boot,dm-spl;
      u-boot,dm-pre-reloc;
+     /delete-property/ assigned-clocks;
+     /delete-property/ assigned-clock-parents;
+     /delete-property/ assigned-clock-rates;
  };
 
  &gpio1 {
@@ -99,6 +106,10 @@
      u-boot,off-on-delay-us = <20000>;
  };
 
+&uart2 {
+     u-boot,dm-spl;
+};
+
  &usdhc1 {
      u-boot,dm-spl;
      sd-uhs-sdr104;
@@ -120,3 +131,122 @@
  &wdog1 {
      u-boot,dm-spl;
  };
+
+&binman {
+      u-boot-spl-ddr {
+             filename = "u-boot-spl-ddr.bin";
+             pad-byte = <0xff>;
+             align-size = <4>;
+             align = <4>;
+
+             u-boot-spl {
+                     align-end = <4>;
+             };
+
+             blob_1: blob-ext@1 {
+                     filename = "lpddr4_pmu_train_1d_imem.bin";
+                     size = <0x8000>;
+             };
+
+             blob_2: blob-ext@2 {
+                     filename = "lpddr4_pmu_train_1d_dmem.bin";
+                     size = <0x4000>;
+             };
+
+             blob_3: blob-ext@3 {
+                     filename = "lpddr4_pmu_train_2d_imem.bin";
+                     size = <0x8000>;
+             };
+
+             blob_4: blob-ext@4 {
+                     filename = "lpddr4_pmu_train_2d_dmem.bin";
+                     size = <0x4000>;
+             };
+     };
+
+
+     spl {
+             filename = "spl.bin";
+
+             mkimage {
+                     args = "-n spl/u-boot-spl.cfgout -T imx8mimage -e 0x912000";
+
+                     blob {
+                             filename = "u-boot-spl-ddr.bin";
+                     };
+             };
+     };
+
+     itb {
+             filename = "u-boot.itb";
+
+             fit {
+                     description = "Configuration to load ATF before U-Boot";
+                     #address-cells = <1>;
+                     fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>;
+
+                     images {
+                             uboot {
+                                     description = "U-Boot (64-bit)";
+                                     type = "standalone";
+                                     arch = "arm64";
+                                     compression = "none";
+                                     load = <CONFIG_SYS_TEXT_BASE>;
+
+                                     uboot_blob: blob-ext {
+                                             filename = "u-boot-nodtb.bin";
+                                     };
+                             };
+
+                             atf {
+                                     description = "ARM Trusted Firmware";
+                                     type = "firmware";
+                                     arch = "arm64";
+                                     compression = "none";
+                                     load = <0x960000>;
+                                     entry = <0x960000>;
+
+                                     atf_blob: blob-ext {
+                                             filename = "bl31.bin";
+                                     };
+                             };
+
+                             fdt {
+                                     description = "NAME";
+                                     type = "flat_dt";
+                                     compression = "none";
+
+                                     uboot_fdt_blob: blob-ext {
+                                             filename = "u-boot.dtb";
+                                     };
+                             };
+                     };
+
+                     configurations {
+                             default = "conf";
+
+                             conf {
+                                     description = "NAME";
+                                     firmware = "uboot";
+                                     loadables = "atf";
+                                     fdt = "fdt";
+                             };
+                     };
+             };
+     };
+
+     imx-boot {
+             filename = "flash.bin";
+             pad-byte = <0x00>;
+
+             spl: blob-ext@1 {
+                     offset = <0x0>;
+                     filename = "spl.bin";
+             };
+
+             uboot: blob-ext@2 {
+                     offset = <0x58000>;
+                     filename = "u-boot.itb";
+             };
+     };
+};
arch/arm/mach-imx/imx8m/Kconfig +1 -0
index 8fedf45987..9a1eb108e4 100644
@@ -116,6 +116,7 @@ config TARGET_IMX8MM_BEACON
 
  config TARGET_IMX8MN_BEACON
      bool "imx8mn Beacon Embedded devkit"
+     select BINMAN
      select IMX8MN
      select SUPPORT_SPL
      select IMX8M_LPDDR4
board/beacon/imx8mn/imximage-8mn-lpddr4.cfg new file +10 -0
new file mode 100644
index 0000000000..7286b26494
@@ -0,0 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright 2021 NXP
+ */
+
+#define __ASSEMBLY__
+
+ROM_VERSION  v2
+BOOT_FROM    sd
+LOADER               u-boot-spl-ddr.bin      0x912000
configs/imx8mn_beacon_defconfig +6 -3
index 5296204aad..f2515874a2 100644
@@ -26,9 +26,9 @@ CONFIG_LTO=y
  CONFIG_FIT=y
  CONFIG_FIT_EXTERNAL_OFFSET=0x3000
  CONFIG_SPL_LOAD_FIT=y
-CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
+# CONFIG_USE_SPL_FIT_GENERATOR is not set
  CONFIG_OF_SYSTEM_SETUP=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mn-lpddr4.cfg"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/beacon/imx8mn/imximage-8mn-lpddr4.cfg"
  CONFIG_DEFAULT_FDT_FILE="imx8mn-beacon-kit.dtb"
  CONFIG_ARCH_MISC_INIT=y
  CONFIG_SPL_BOARD_INIT=y
@@ -36,6 +36,7 @@ CONFIG_SPL_BOOTROM_SUPPORT=y
  CONFIG_SPL_SEPARATE_BSS=y
  CONFIG_SPL_I2C=y
  CONFIG_SPL_POWER=y
+CONFIG_SPL_WATCHDOG=y
  CONFIG_HUSH_PARSER=y
  CONFIG_SYS_PROMPT="u-boot=> "
  # CONFIG_BOOTM_NETBSD is not set
@@ -62,7 +63,6 @@ CONFIG_CMD_EXT4_WRITE=y
  CONFIG_CMD_FAT=y
  CONFIG_OF_CONTROL=y
  CONFIG_SPL_OF_CONTROL=y
-CONFIG_OF_SPL_REMOVE_PROPS="interrupt-parent interrupts"
  CONFIG_ENV_IS_IN_MMC=y
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_SYS_MMC_ENV_DEV=2
@@ -106,6 +106,7 @@ CONFIG_PHY_GIGE=y
  CONFIG_FEC_MXC=y
  CONFIG_MII=y
  CONFIG_PINCTRL=y
+CONFIG_SPL_PINCTRL=y
  CONFIG_PINCTRL_IMX8M=y
  CONFIG_DM_PMIC=y
  # CONFIG_SPL_PMIC_CHILDREN is not set
@@ -122,7 +123,9 @@ CONFIG_SPI=y
  CONFIG_DM_SPI=y
  CONFIG_NXP_FSPI=y
  CONFIG_SYSRESET=y
+CONFIG_SPL_SYSRESET=y
  CONFIG_SYSRESET_PSCI=y
+CONFIG_SYSRESET_WATCHDOG=y
  CONFIG_DM_THERMAL=y
  CONFIG_USB=y
  # CONFIG_SPL_DM_USB is not set

configs/imx8mn_beacon_defconfig CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 · line 140

Quoted 4 lines
configs/imx8mn_beacon_defconfig +1 -0
@@ -134,3 +137,4 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
  CONFIG_CI_UDC=y
  CONFIG_SDP_LOADADDR=0x0
  CONFIG_OF_LIBFDT_OVERLAY=y
+CONFIG_IMX_WATCHDOG=y
author
#3 lore raw
Quoted 12 lines · Adam Ford
Quoted 9 lines · Peng Fan (OSS)
Quoted 5 lines · Adam Ford

Somewhere along the line, the board stopped being able to boot. Rather than just fixing the issue, let's fix the issue and migrate to binman to eliminate a warning when using custom imx tools for generating the binary.

Quoted 3 lines

Any chance this can make it into 2021.10? it's currently broken, and this seems to fix the problem. i didn't bisect to see where the issue broke, or i would have added a fixes tag.

Stefano or Tom? could someone comment and/or merge? the board is currently not booting, and this fixes the issue

Quoted 249 lines

adam

Quoted 247 lines
Quoted 241 lines
arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi +130 -0
index bbc64a2819..69fd69c8d0 100644
@@ -4,6 +4,10 @@
   */
 
  / {
+     binman: binman {
+             multiple-images;
+     };
+
      wdt-reboot {
              compatible = "wdt-reboot";
              wdt = <&wdog1>;
@@ -40,6 +44,9 @@
  &clk {
      u-boot,dm-spl;
      u-boot,dm-pre-reloc;
+     /delete-property/ assigned-clocks;
+     /delete-property/ assigned-clock-parents;
+     /delete-property/ assigned-clock-rates;
  };
 
  &gpio1 {
@@ -99,6 +106,10 @@
      u-boot,off-on-delay-us = <20000>;
  };
 
+&uart2 {
+     u-boot,dm-spl;
+};
+
  &usdhc1 {
      u-boot,dm-spl;
      sd-uhs-sdr104;
@@ -120,3 +131,122 @@
  &wdog1 {
      u-boot,dm-spl;
  };
+
+&binman {
+      u-boot-spl-ddr {
+             filename = "u-boot-spl-ddr.bin";
+             pad-byte = <0xff>;
+             align-size = <4>;
+             align = <4>;
+
+             u-boot-spl {
+                     align-end = <4>;
+             };
+
+             blob_1: blob-ext@1 {
+                     filename = "lpddr4_pmu_train_1d_imem.bin";
+                     size = <0x8000>;
+             };
+
+             blob_2: blob-ext@2 {
+                     filename = "lpddr4_pmu_train_1d_dmem.bin";
+                     size = <0x4000>;
+             };
+
+             blob_3: blob-ext@3 {
+                     filename = "lpddr4_pmu_train_2d_imem.bin";
+                     size = <0x8000>;
+             };
+
+             blob_4: blob-ext@4 {
+                     filename = "lpddr4_pmu_train_2d_dmem.bin";
+                     size = <0x4000>;
+             };
+     };
+
+
+     spl {
+             filename = "spl.bin";
+
+             mkimage {
+                     args = "-n spl/u-boot-spl.cfgout -T imx8mimage -e 0x912000";
+
+                     blob {
+                             filename = "u-boot-spl-ddr.bin";
+                     };
+             };
+     };
+
+     itb {
+             filename = "u-boot.itb";
+
+             fit {
+                     description = "Configuration to load ATF before U-Boot";
+                     #address-cells = <1>;
+                     fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>;
+
+                     images {
+                             uboot {
+                                     description = "U-Boot (64-bit)";
+                                     type = "standalone";
+                                     arch = "arm64";
+                                     compression = "none";
+                                     load = <CONFIG_SYS_TEXT_BASE>;
+
+                                     uboot_blob: blob-ext {
+                                             filename = "u-boot-nodtb.bin";
+                                     };
+                             };
+
+                             atf {
+                                     description = "ARM Trusted Firmware";
+                                     type = "firmware";
+                                     arch = "arm64";
+                                     compression = "none";
+                                     load = <0x960000>;
+                                     entry = <0x960000>;
+
+                                     atf_blob: blob-ext {
+                                             filename = "bl31.bin";
+                                     };
+                             };
+
+                             fdt {
+                                     description = "NAME";
+                                     type = "flat_dt";
+                                     compression = "none";
+
+                                     uboot_fdt_blob: blob-ext {
+                                             filename = "u-boot.dtb";
+                                     };
+                             };
+                     };
+
+                     configurations {
+                             default = "conf";
+
+                             conf {
+                                     description = "NAME";
+                                     firmware = "uboot";
+                                     loadables = "atf";
+                                     fdt = "fdt";
+                             };
+                     };
+             };
+     };
+
+     imx-boot {
+             filename = "flash.bin";
+             pad-byte = <0x00>;
+
+             spl: blob-ext@1 {
+                     offset = <0x0>;
+                     filename = "spl.bin";
+             };
+
+             uboot: blob-ext@2 {
+                     offset = <0x58000>;
+                     filename = "u-boot.itb";
+             };
+     };
+};
arch/arm/mach-imx/imx8m/Kconfig +1 -0
index 8fedf45987..9a1eb108e4 100644
@@ -116,6 +116,7 @@ config TARGET_IMX8MM_BEACON
 
  config TARGET_IMX8MN_BEACON
      bool "imx8mn Beacon Embedded devkit"
+     select BINMAN
      select IMX8MN
      select SUPPORT_SPL
      select IMX8M_LPDDR4
board/beacon/imx8mn/imximage-8mn-lpddr4.cfg new file +10 -0
new file mode 100644
index 0000000000..7286b26494
@@ -0,0 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright 2021 NXP
+ */
+
+#define __ASSEMBLY__
+
+ROM_VERSION  v2
+BOOT_FROM    sd
+LOADER               u-boot-spl-ddr.bin      0x912000
configs/imx8mn_beacon_defconfig +6 -3
index 5296204aad..f2515874a2 100644
@@ -26,9 +26,9 @@ CONFIG_LTO=y
  CONFIG_FIT=y
  CONFIG_FIT_EXTERNAL_OFFSET=0x3000
  CONFIG_SPL_LOAD_FIT=y
-CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
+# CONFIG_USE_SPL_FIT_GENERATOR is not set
  CONFIG_OF_SYSTEM_SETUP=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mn-lpddr4.cfg"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/beacon/imx8mn/imximage-8mn-lpddr4.cfg"
  CONFIG_DEFAULT_FDT_FILE="imx8mn-beacon-kit.dtb"
  CONFIG_ARCH_MISC_INIT=y
  CONFIG_SPL_BOARD_INIT=y
@@ -36,6 +36,7 @@ CONFIG_SPL_BOOTROM_SUPPORT=y
  CONFIG_SPL_SEPARATE_BSS=y
  CONFIG_SPL_I2C=y
  CONFIG_SPL_POWER=y
+CONFIG_SPL_WATCHDOG=y
  CONFIG_HUSH_PARSER=y
  CONFIG_SYS_PROMPT="u-boot=> "
  # CONFIG_BOOTM_NETBSD is not set
@@ -62,7 +63,6 @@ CONFIG_CMD_EXT4_WRITE=y
  CONFIG_CMD_FAT=y
  CONFIG_OF_CONTROL=y
  CONFIG_SPL_OF_CONTROL=y
-CONFIG_OF_SPL_REMOVE_PROPS="interrupt-parent interrupts"
  CONFIG_ENV_IS_IN_MMC=y
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_SYS_MMC_ENV_DEV=2
@@ -106,6 +106,7 @@ CONFIG_PHY_GIGE=y
  CONFIG_FEC_MXC=y
  CONFIG_MII=y
  CONFIG_PINCTRL=y
+CONFIG_SPL_PINCTRL=y
  CONFIG_PINCTRL_IMX8M=y
  CONFIG_DM_PMIC=y
  # CONFIG_SPL_PMIC_CHILDREN is not set
@@ -122,7 +123,9 @@ CONFIG_SPI=y
  CONFIG_DM_SPI=y
  CONFIG_NXP_FSPI=y
  CONFIG_SYSRESET=y
+CONFIG_SPL_SYSRESET=y
  CONFIG_SYSRESET_PSCI=y
+CONFIG_SYSRESET_WATCHDOG=y
  CONFIG_DM_THERMAL=y
  CONFIG_USB=y
  # CONFIG_SPL_DM_USB is not set

configs/imx8mn_beacon_defconfig CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 · line 140

Quoted 4 lines
configs/imx8mn_beacon_defconfig +1 -0
@@ -134,3 +137,4 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
  CONFIG_CI_UDC=y
  CONFIG_SDP_LOADADDR=0x0
  CONFIG_OF_LIBFDT_OVERLAY=y
+CONFIG_IMX_WATCHDOG=y
author
#4 lore raw
Quoted 14 lines · Adam Ford
Quoted 12 lines · Adam Ford
Quoted 9 lines · Peng Fan (OSS)
Quoted 5 lines · Adam Ford

Somewhere along the line, the board stopped being able to boot. Rather than just fixing the issue, let's fix the issue and migrate to binman to eliminate a warning when using custom imx tools for generating the binary.

Quoted 6 lines
Quoted 3 lines

Any chance this can make it into 2021.10? it's currently broken, and this seems to fix the problem. i didn't bisect to see where the issue broke, or i would have added a fixes tag.

Stefano or Tom? could someone comment and/or merge? the board is currently not booting, and this fixes the issue

It's been over a month, and we missed the 2021.10 release. Is there something stopping this from being applied?

adam

Quoted 249 lines
Quoted 249 lines

adam

Quoted 247 lines
Quoted 241 lines
arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi +130 -0
index bbc64a2819..69fd69c8d0 100644
@@ -4,6 +4,10 @@
   */
 
  / {
+     binman: binman {
+             multiple-images;
+     };
+
      wdt-reboot {
              compatible = "wdt-reboot";
              wdt = <&wdog1>;
@@ -40,6 +44,9 @@
  &clk {
      u-boot,dm-spl;
      u-boot,dm-pre-reloc;
+     /delete-property/ assigned-clocks;
+     /delete-property/ assigned-clock-parents;
+     /delete-property/ assigned-clock-rates;
  };
 
  &gpio1 {
@@ -99,6 +106,10 @@
      u-boot,off-on-delay-us = <20000>;
  };
 
+&uart2 {
+     u-boot,dm-spl;
+};
+
  &usdhc1 {
      u-boot,dm-spl;
      sd-uhs-sdr104;
@@ -120,3 +131,122 @@
  &wdog1 {
      u-boot,dm-spl;
  };
+
+&binman {
+      u-boot-spl-ddr {
+             filename = "u-boot-spl-ddr.bin";
+             pad-byte = <0xff>;
+             align-size = <4>;
+             align = <4>;
+
+             u-boot-spl {
+                     align-end = <4>;
+             };
+
+             blob_1: blob-ext@1 {
+                     filename = "lpddr4_pmu_train_1d_imem.bin";
+                     size = <0x8000>;
+             };
+
+             blob_2: blob-ext@2 {
+                     filename = "lpddr4_pmu_train_1d_dmem.bin";
+                     size = <0x4000>;
+             };
+
+             blob_3: blob-ext@3 {
+                     filename = "lpddr4_pmu_train_2d_imem.bin";
+                     size = <0x8000>;
+             };
+
+             blob_4: blob-ext@4 {
+                     filename = "lpddr4_pmu_train_2d_dmem.bin";
+                     size = <0x4000>;
+             };
+     };
+
+
+     spl {
+             filename = "spl.bin";
+
+             mkimage {
+                     args = "-n spl/u-boot-spl.cfgout -T imx8mimage -e 0x912000";
+
+                     blob {
+                             filename = "u-boot-spl-ddr.bin";
+                     };
+             };
+     };
+
+     itb {
+             filename = "u-boot.itb";
+
+             fit {
+                     description = "Configuration to load ATF before U-Boot";
+                     #address-cells = <1>;
+                     fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>;
+
+                     images {
+                             uboot {
+                                     description = "U-Boot (64-bit)";
+                                     type = "standalone";
+                                     arch = "arm64";
+                                     compression = "none";
+                                     load = <CONFIG_SYS_TEXT_BASE>;
+
+                                     uboot_blob: blob-ext {
+                                             filename = "u-boot-nodtb.bin";
+                                     };
+                             };
+
+                             atf {
+                                     description = "ARM Trusted Firmware";
+                                     type = "firmware";
+                                     arch = "arm64";
+                                     compression = "none";
+                                     load = <0x960000>;
+                                     entry = <0x960000>;
+
+                                     atf_blob: blob-ext {
+                                             filename = "bl31.bin";
+                                     };
+                             };
+
+                             fdt {
+                                     description = "NAME";
+                                     type = "flat_dt";
+                                     compression = "none";
+
+                                     uboot_fdt_blob: blob-ext {
+                                             filename = "u-boot.dtb";
+                                     };
+                             };
+                     };
+
+                     configurations {
+                             default = "conf";
+
+                             conf {
+                                     description = "NAME";
+                                     firmware = "uboot";
+                                     loadables = "atf";
+                                     fdt = "fdt";
+                             };
+                     };
+             };
+     };
+
+     imx-boot {
+             filename = "flash.bin";
+             pad-byte = <0x00>;
+
+             spl: blob-ext@1 {
+                     offset = <0x0>;
+                     filename = "spl.bin";
+             };
+
+             uboot: blob-ext@2 {
+                     offset = <0x58000>;
+                     filename = "u-boot.itb";
+             };
+     };
+};
arch/arm/mach-imx/imx8m/Kconfig +1 -0
index 8fedf45987..9a1eb108e4 100644
@@ -116,6 +116,7 @@ config TARGET_IMX8MM_BEACON
 
  config TARGET_IMX8MN_BEACON
      bool "imx8mn Beacon Embedded devkit"
+     select BINMAN
      select IMX8MN
      select SUPPORT_SPL
      select IMX8M_LPDDR4
board/beacon/imx8mn/imximage-8mn-lpddr4.cfg new file +10 -0
new file mode 100644
index 0000000000..7286b26494
@@ -0,0 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright 2021 NXP
+ */
+
+#define __ASSEMBLY__
+
+ROM_VERSION  v2
+BOOT_FROM    sd
+LOADER               u-boot-spl-ddr.bin      0x912000
configs/imx8mn_beacon_defconfig +6 -3
index 5296204aad..f2515874a2 100644
@@ -26,9 +26,9 @@ CONFIG_LTO=y
  CONFIG_FIT=y
  CONFIG_FIT_EXTERNAL_OFFSET=0x3000
  CONFIG_SPL_LOAD_FIT=y
-CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
+# CONFIG_USE_SPL_FIT_GENERATOR is not set
  CONFIG_OF_SYSTEM_SETUP=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mn-lpddr4.cfg"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/beacon/imx8mn/imximage-8mn-lpddr4.cfg"
  CONFIG_DEFAULT_FDT_FILE="imx8mn-beacon-kit.dtb"
  CONFIG_ARCH_MISC_INIT=y
  CONFIG_SPL_BOARD_INIT=y
@@ -36,6 +36,7 @@ CONFIG_SPL_BOOTROM_SUPPORT=y
  CONFIG_SPL_SEPARATE_BSS=y
  CONFIG_SPL_I2C=y
  CONFIG_SPL_POWER=y
+CONFIG_SPL_WATCHDOG=y
  CONFIG_HUSH_PARSER=y
  CONFIG_SYS_PROMPT="u-boot=> "
  # CONFIG_BOOTM_NETBSD is not set
@@ -62,7 +63,6 @@ CONFIG_CMD_EXT4_WRITE=y
  CONFIG_CMD_FAT=y
  CONFIG_OF_CONTROL=y
  CONFIG_SPL_OF_CONTROL=y
-CONFIG_OF_SPL_REMOVE_PROPS="interrupt-parent interrupts"
  CONFIG_ENV_IS_IN_MMC=y
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_SYS_MMC_ENV_DEV=2
@@ -106,6 +106,7 @@ CONFIG_PHY_GIGE=y
  CONFIG_FEC_MXC=y
  CONFIG_MII=y
  CONFIG_PINCTRL=y
+CONFIG_SPL_PINCTRL=y
  CONFIG_PINCTRL_IMX8M=y
  CONFIG_DM_PMIC=y
  # CONFIG_SPL_PMIC_CHILDREN is not set
@@ -122,7 +123,9 @@ CONFIG_SPI=y
  CONFIG_DM_SPI=y
  CONFIG_NXP_FSPI=y
  CONFIG_SYSRESET=y
+CONFIG_SPL_SYSRESET=y
  CONFIG_SYSRESET_PSCI=y
+CONFIG_SYSRESET_WATCHDOG=y
  CONFIG_DM_THERMAL=y
  CONFIG_USB=y
  # CONFIG_SPL_DM_USB is not set

configs/imx8mn_beacon_defconfig CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 · line 140

Quoted 4 lines
configs/imx8mn_beacon_defconfig +1 -0
@@ -134,3 +137,4 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
  CONFIG_CI_UDC=y
  CONFIG_SDP_LOADADDR=0x0
  CONFIG_OF_LIBFDT_OVERLAY=y
+CONFIG_IMX_WATCHDOG=y
author
#5 lore raw
Quoted 9 lines · Adam Ford
Quoted 7 lines · Adam Ford
Quoted 5 lines · Adam Ford
Quoted 3 lines · Peng Fan (OSS)

+Tom Rini

Quoted 11 lines
Quoted 11 lines
Quoted 10 lines
Quoted 6 lines · Adam Ford
Quoted 5 lines

Somewhere along the line, the board stopped being able to boot. Rather than just fixing the issue, let's fix the issue and migrate to binman to eliminate a warning when using custom imx tools for generating the binary.

Any chance this can make it into 2021.10? it's currently broken, and this seems to fix the problem. i didn't bisect to see where the issue broke, or i would have added a fixes tag.

Quoted 5 lines
Quoted 2 lines

Stefano or Tom? could someone comment and/or merge? the board is currently not booting, and this fixes the issue

It's been over a month, and we missed the 2021.10 release. Is there something stopping this from being applied?

Tom,

Is there any chance you can apply this? I can't get anyone to respond to me, and it's been over 2 months since the initial submission.

thanks,

adam

Quoted 251 lines

adam

Quoted 249 lines
Quoted 249 lines

adam

Quoted 247 lines
Quoted 241 lines
arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi +130 -0
index bbc64a2819..69fd69c8d0 100644
@@ -4,6 +4,10 @@
   */
 
  / {
+     binman: binman {
+             multiple-images;
+     };
+
      wdt-reboot {
              compatible = "wdt-reboot";
              wdt = <&wdog1>;
@@ -40,6 +44,9 @@
  &clk {
      u-boot,dm-spl;
      u-boot,dm-pre-reloc;
+     /delete-property/ assigned-clocks;
+     /delete-property/ assigned-clock-parents;
+     /delete-property/ assigned-clock-rates;
  };
 
  &gpio1 {
@@ -99,6 +106,10 @@
      u-boot,off-on-delay-us = <20000>;
  };
 
+&uart2 {
+     u-boot,dm-spl;
+};
+
  &usdhc1 {
      u-boot,dm-spl;
      sd-uhs-sdr104;
@@ -120,3 +131,122 @@
  &wdog1 {
      u-boot,dm-spl;
  };
+
+&binman {
+      u-boot-spl-ddr {
+             filename = "u-boot-spl-ddr.bin";
+             pad-byte = <0xff>;
+             align-size = <4>;
+             align = <4>;
+
+             u-boot-spl {
+                     align-end = <4>;
+             };
+
+             blob_1: blob-ext@1 {
+                     filename = "lpddr4_pmu_train_1d_imem.bin";
+                     size = <0x8000>;
+             };
+
+             blob_2: blob-ext@2 {
+                     filename = "lpddr4_pmu_train_1d_dmem.bin";
+                     size = <0x4000>;
+             };
+
+             blob_3: blob-ext@3 {
+                     filename = "lpddr4_pmu_train_2d_imem.bin";
+                     size = <0x8000>;
+             };
+
+             blob_4: blob-ext@4 {
+                     filename = "lpddr4_pmu_train_2d_dmem.bin";
+                     size = <0x4000>;
+             };
+     };
+
+
+     spl {
+             filename = "spl.bin";
+
+             mkimage {
+                     args = "-n spl/u-boot-spl.cfgout -T imx8mimage -e 0x912000";
+
+                     blob {
+                             filename = "u-boot-spl-ddr.bin";
+                     };
+             };
+     };
+
+     itb {
+             filename = "u-boot.itb";
+
+             fit {
+                     description = "Configuration to load ATF before U-Boot";
+                     #address-cells = <1>;
+                     fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>;
+
+                     images {
+                             uboot {
+                                     description = "U-Boot (64-bit)";
+                                     type = "standalone";
+                                     arch = "arm64";
+                                     compression = "none";
+                                     load = <CONFIG_SYS_TEXT_BASE>;
+
+                                     uboot_blob: blob-ext {
+                                             filename = "u-boot-nodtb.bin";
+                                     };
+                             };
+
+                             atf {
+                                     description = "ARM Trusted Firmware";
+                                     type = "firmware";
+                                     arch = "arm64";
+                                     compression = "none";
+                                     load = <0x960000>;
+                                     entry = <0x960000>;
+
+                                     atf_blob: blob-ext {
+                                             filename = "bl31.bin";
+                                     };
+                             };
+
+                             fdt {
+                                     description = "NAME";
+                                     type = "flat_dt";
+                                     compression = "none";
+
+                                     uboot_fdt_blob: blob-ext {
+                                             filename = "u-boot.dtb";
+                                     };
+                             };
+                     };
+
+                     configurations {
+                             default = "conf";
+
+                             conf {
+                                     description = "NAME";
+                                     firmware = "uboot";
+                                     loadables = "atf";
+                                     fdt = "fdt";
+                             };
+                     };
+             };
+     };
+
+     imx-boot {
+             filename = "flash.bin";
+             pad-byte = <0x00>;
+
+             spl: blob-ext@1 {
+                     offset = <0x0>;
+                     filename = "spl.bin";
+             };
+
+             uboot: blob-ext@2 {
+                     offset = <0x58000>;
+                     filename = "u-boot.itb";
+             };
+     };
+};
arch/arm/mach-imx/imx8m/Kconfig +1 -0
index 8fedf45987..9a1eb108e4 100644
@@ -116,6 +116,7 @@ config TARGET_IMX8MM_BEACON
 
  config TARGET_IMX8MN_BEACON
      bool "imx8mn Beacon Embedded devkit"
+     select BINMAN
      select IMX8MN
      select SUPPORT_SPL
      select IMX8M_LPDDR4
board/beacon/imx8mn/imximage-8mn-lpddr4.cfg new file +10 -0
new file mode 100644
index 0000000000..7286b26494
@@ -0,0 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright 2021 NXP
+ */
+
+#define __ASSEMBLY__
+
+ROM_VERSION  v2
+BOOT_FROM    sd
+LOADER               u-boot-spl-ddr.bin      0x912000
configs/imx8mn_beacon_defconfig +6 -3
index 5296204aad..f2515874a2 100644
@@ -26,9 +26,9 @@ CONFIG_LTO=y
  CONFIG_FIT=y
  CONFIG_FIT_EXTERNAL_OFFSET=0x3000
  CONFIG_SPL_LOAD_FIT=y
-CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
+# CONFIG_USE_SPL_FIT_GENERATOR is not set
  CONFIG_OF_SYSTEM_SETUP=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mn-lpddr4.cfg"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/beacon/imx8mn/imximage-8mn-lpddr4.cfg"
  CONFIG_DEFAULT_FDT_FILE="imx8mn-beacon-kit.dtb"
  CONFIG_ARCH_MISC_INIT=y
  CONFIG_SPL_BOARD_INIT=y
@@ -36,6 +36,7 @@ CONFIG_SPL_BOOTROM_SUPPORT=y
  CONFIG_SPL_SEPARATE_BSS=y
  CONFIG_SPL_I2C=y
  CONFIG_SPL_POWER=y
+CONFIG_SPL_WATCHDOG=y
  CONFIG_HUSH_PARSER=y
  CONFIG_SYS_PROMPT="u-boot=> "
  # CONFIG_BOOTM_NETBSD is not set
@@ -62,7 +63,6 @@ CONFIG_CMD_EXT4_WRITE=y
  CONFIG_CMD_FAT=y
  CONFIG_OF_CONTROL=y
  CONFIG_SPL_OF_CONTROL=y
-CONFIG_OF_SPL_REMOVE_PROPS="interrupt-parent interrupts"
  CONFIG_ENV_IS_IN_MMC=y
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_SYS_MMC_ENV_DEV=2
@@ -106,6 +106,7 @@ CONFIG_PHY_GIGE=y
  CONFIG_FEC_MXC=y
  CONFIG_MII=y
  CONFIG_PINCTRL=y
+CONFIG_SPL_PINCTRL=y
  CONFIG_PINCTRL_IMX8M=y
  CONFIG_DM_PMIC=y
  # CONFIG_SPL_PMIC_CHILDREN is not set
@@ -122,7 +123,9 @@ CONFIG_SPI=y
  CONFIG_DM_SPI=y
  CONFIG_NXP_FSPI=y
  CONFIG_SYSRESET=y
+CONFIG_SPL_SYSRESET=y
  CONFIG_SYSRESET_PSCI=y
+CONFIG_SYSRESET_WATCHDOG=y
  CONFIG_DM_THERMAL=y
  CONFIG_USB=y
  # CONFIG_SPL_DM_USB is not set

configs/imx8mn_beacon_defconfig CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 · line 140

Quoted 4 lines
configs/imx8mn_beacon_defconfig +1 -0
@@ -134,3 +137,4 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
  CONFIG_CI_UDC=y
  CONFIG_SDP_LOADADDR=0x0
  CONFIG_OF_LIBFDT_OVERLAY=y
+CONFIG_IMX_WATCHDOG=y
#6 lore raw
Quoted 30 lines · Adam Ford
Quoted 9 lines · Adam Ford
Quoted 7 lines · Adam Ford
Quoted 5 lines · Adam Ford
Quoted 3 lines · Peng Fan (OSS)

+Tom Rini

Quoted 11 lines
Quoted 11 lines
Quoted 10 lines
Quoted 6 lines · Adam Ford
Quoted 5 lines

Somewhere along the line, the board stopped being able to boot. Rather than just fixing the issue, let's fix the issue and migrate to binman to eliminate a warning when using custom imx tools for generating the binary.

Any chance this can make it into 2021.10? it's currently broken, and this seems to fix the problem. i didn't bisect to see where the issue broke, or i would have added a fixes tag.

Quoted 5 lines
Quoted 2 lines

Stefano or Tom? could someone comment and/or merge? the board is currently not booting, and this fixes the issue

It's been over a month, and we missed the 2021.10 release. Is there something stopping this from being applied?

Quoted 259 lines

Tom,

Is there any chance you can apply this? I can't get anyone to respond to me, and it's been over 2 months since the initial submission.

thanks,

adam

Quoted 251 lines

adam

Quoted 249 lines
Quoted 249 lines

adam

Quoted 247 lines
Quoted 241 lines
arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi +130 -0
index bbc64a2819..69fd69c8d0 100644
@@ -4,6 +4,10 @@
   */
 
  / {
+     binman: binman {
+             multiple-images;
+     };
+
      wdt-reboot {
              compatible = "wdt-reboot";
              wdt = <&wdog1>;
@@ -40,6 +44,9 @@
  &clk {
      u-boot,dm-spl;
      u-boot,dm-pre-reloc;
+     /delete-property/ assigned-clocks;
+     /delete-property/ assigned-clock-parents;
+     /delete-property/ assigned-clock-rates;
  };
 
  &gpio1 {
@@ -99,6 +106,10 @@
      u-boot,off-on-delay-us = <20000>;
  };
 
+&uart2 {
+     u-boot,dm-spl;
+};
+
  &usdhc1 {
      u-boot,dm-spl;
      sd-uhs-sdr104;
@@ -120,3 +131,122 @@
  &wdog1 {
      u-boot,dm-spl;
  };
+
+&binman {
+      u-boot-spl-ddr {
+             filename = "u-boot-spl-ddr.bin";
+             pad-byte = <0xff>;
+             align-size = <4>;
+             align = <4>;
+
+             u-boot-spl {
+                     align-end = <4>;
+             };
+
+             blob_1: blob-ext@1 {
+                     filename = "lpddr4_pmu_train_1d_imem.bin";
+                     size = <0x8000>;
+             };
+
+             blob_2: blob-ext@2 {
+                     filename = "lpddr4_pmu_train_1d_dmem.bin";
+                     size = <0x4000>;
+             };
+
+             blob_3: blob-ext@3 {
+                     filename = "lpddr4_pmu_train_2d_imem.bin";
+                     size = <0x8000>;
+             };
+
+             blob_4: blob-ext@4 {
+                     filename = "lpddr4_pmu_train_2d_dmem.bin";
+                     size = <0x4000>;
+             };
+     };
+
+
+     spl {
+             filename = "spl.bin";
+
+             mkimage {
+                     args = "-n spl/u-boot-spl.cfgout -T imx8mimage -e 0x912000";
+
+                     blob {
+                             filename = "u-boot-spl-ddr.bin";
+                     };
+             };
+     };
+
+     itb {
+             filename = "u-boot.itb";
+
+             fit {
+                     description = "Configuration to load ATF before U-Boot";
+                     #address-cells = <1>;
+                     fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>;
+
+                     images {
+                             uboot {
+                                     description = "U-Boot (64-bit)";
+                                     type = "standalone";
+                                     arch = "arm64";
+                                     compression = "none";
+                                     load = <CONFIG_SYS_TEXT_BASE>;
+
+                                     uboot_blob: blob-ext {
+                                             filename = "u-boot-nodtb.bin";
+                                     };
+                             };
+
+                             atf {
+                                     description = "ARM Trusted Firmware";
+                                     type = "firmware";
+                                     arch = "arm64";
+                                     compression = "none";
+                                     load = <0x960000>;
+                                     entry = <0x960000>;
+
+                                     atf_blob: blob-ext {
+                                             filename = "bl31.bin";
+                                     };
+                             };
+
+                             fdt {
+                                     description = "NAME";
+                                     type = "flat_dt";
+                                     compression = "none";
+
+                                     uboot_fdt_blob: blob-ext {
+                                             filename = "u-boot.dtb";
+                                     };
+                             };
+                     };
+
+                     configurations {
+                             default = "conf";
+
+                             conf {
+                                     description = "NAME";
+                                     firmware = "uboot";
+                                     loadables = "atf";
+                                     fdt = "fdt";
+                             };
+                     };
+             };
+     };
+
+     imx-boot {
+             filename = "flash.bin";
+             pad-byte = <0x00>;
+
+             spl: blob-ext@1 {
+                     offset = <0x0>;
+                     filename = "spl.bin";
+             };
+
+             uboot: blob-ext@2 {
+                     offset = <0x58000>;
+                     filename = "u-boot.itb";
+             };
+     };
+};
arch/arm/mach-imx/imx8m/Kconfig +1 -0
index 8fedf45987..9a1eb108e4 100644
@@ -116,6 +116,7 @@ config TARGET_IMX8MM_BEACON
 
  config TARGET_IMX8MN_BEACON
      bool "imx8mn Beacon Embedded devkit"
+     select BINMAN
      select IMX8MN
      select SUPPORT_SPL
      select IMX8M_LPDDR4
board/beacon/imx8mn/imximage-8mn-lpddr4.cfg new file +10 -0
new file mode 100644
index 0000000000..7286b26494
@@ -0,0 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright 2021 NXP
+ */
+
+#define __ASSEMBLY__
+
+ROM_VERSION  v2
+BOOT_FROM    sd
+LOADER               u-boot-spl-ddr.bin      0x912000
configs/imx8mn_beacon_defconfig +6 -3
index 5296204aad..f2515874a2 100644
@@ -26,9 +26,9 @@ CONFIG_LTO=y
  CONFIG_FIT=y
  CONFIG_FIT_EXTERNAL_OFFSET=0x3000
  CONFIG_SPL_LOAD_FIT=y
-CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
+# CONFIG_USE_SPL_FIT_GENERATOR is not set
  CONFIG_OF_SYSTEM_SETUP=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mn-lpddr4.cfg"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/beacon/imx8mn/imximage-8mn-lpddr4.cfg"
  CONFIG_DEFAULT_FDT_FILE="imx8mn-beacon-kit.dtb"
  CONFIG_ARCH_MISC_INIT=y
  CONFIG_SPL_BOARD_INIT=y
@@ -36,6 +36,7 @@ CONFIG_SPL_BOOTROM_SUPPORT=y
  CONFIG_SPL_SEPARATE_BSS=y
  CONFIG_SPL_I2C=y
  CONFIG_SPL_POWER=y
+CONFIG_SPL_WATCHDOG=y
  CONFIG_HUSH_PARSER=y
  CONFIG_SYS_PROMPT="u-boot=> "
  # CONFIG_BOOTM_NETBSD is not set
@@ -62,7 +63,6 @@ CONFIG_CMD_EXT4_WRITE=y
  CONFIG_CMD_FAT=y
  CONFIG_OF_CONTROL=y
  CONFIG_SPL_OF_CONTROL=y
-CONFIG_OF_SPL_REMOVE_PROPS="interrupt-parent interrupts"
  CONFIG_ENV_IS_IN_MMC=y
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_SYS_MMC_ENV_DEV=2
@@ -106,6 +106,7 @@ CONFIG_PHY_GIGE=y
  CONFIG_FEC_MXC=y
  CONFIG_MII=y
  CONFIG_PINCTRL=y
+CONFIG_SPL_PINCTRL=y
  CONFIG_PINCTRL_IMX8M=y
  CONFIG_DM_PMIC=y
  # CONFIG_SPL_PMIC_CHILDREN is not set
@@ -122,7 +123,9 @@ CONFIG_SPI=y
  CONFIG_DM_SPI=y
  CONFIG_NXP_FSPI=y
  CONFIG_SYSRESET=y
+CONFIG_SPL_SYSRESET=y
  CONFIG_SYSRESET_PSCI=y
+CONFIG_SYSRESET_WATCHDOG=y
  CONFIG_DM_THERMAL=y
  CONFIG_USB=y
  # CONFIG_SPL_DM_USB is not set

configs/imx8mn_beacon_defconfig CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 · line 140

Quoted 4 lines
configs/imx8mn_beacon_defconfig +1 -0
@@ -134,3 +137,4 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
  CONFIG_CI_UDC=y
  CONFIG_SDP_LOADADDR=0x0
  CONFIG_OF_LIBFDT_OVERLAY=y
+CONFIG_IMX_WATCHDOG=y

This introduces failure to build now:
https://source.denx.de/u-boot/u-boot/-/jobs/352491

Signature · 1 line
Tom
author
#7 lore raw
Quoted 293 lines · Tom Rini
Quoted 30 lines · Adam Ford
Quoted 9 lines · Adam Ford
Quoted 7 lines · Adam Ford
Quoted 5 lines · Adam Ford
Quoted 3 lines · Peng Fan (OSS)

+Tom Rini

Quoted 11 lines
Quoted 11 lines
Quoted 10 lines
Quoted 6 lines · Adam Ford
Quoted 5 lines

Somewhere along the line, the board stopped being able to boot. Rather than just fixing the issue, let's fix the issue and migrate to binman to eliminate a warning when using custom imx tools for generating the binary.

Any chance this can make it into 2021.10? it's currently broken, and this seems to fix the problem. i didn't bisect to see where the issue broke, or i would have added a fixes tag.

Quoted 5 lines
Quoted 2 lines

Stefano or Tom? could someone comment and/or merge? the board is currently not booting, and this fixes the issue

It's been over a month, and we missed the 2021.10 release. Is there something stopping this from being applied?

Quoted 259 lines

Tom,

Is there any chance you can apply this? I can't get anyone to respond to me, and it's been over 2 months since the initial submission.

thanks,

adam

Quoted 251 lines

adam

Quoted 249 lines
Quoted 249 lines

adam

Quoted 247 lines
Quoted 241 lines
arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi +130 -0
index bbc64a2819..69fd69c8d0 100644
@@ -4,6 +4,10 @@
   */
 
  / {
+     binman: binman {
+             multiple-images;
+     };
+
      wdt-reboot {
              compatible = "wdt-reboot";
              wdt = <&wdog1>;
@@ -40,6 +44,9 @@
  &clk {
      u-boot,dm-spl;
      u-boot,dm-pre-reloc;
+     /delete-property/ assigned-clocks;
+     /delete-property/ assigned-clock-parents;
+     /delete-property/ assigned-clock-rates;
  };
 
  &gpio1 {
@@ -99,6 +106,10 @@
      u-boot,off-on-delay-us = <20000>;
  };
 
+&uart2 {
+     u-boot,dm-spl;
+};
+
  &usdhc1 {
      u-boot,dm-spl;
      sd-uhs-sdr104;
@@ -120,3 +131,122 @@
  &wdog1 {
      u-boot,dm-spl;
  };
+
+&binman {
+      u-boot-spl-ddr {
+             filename = "u-boot-spl-ddr.bin";
+             pad-byte = <0xff>;
+             align-size = <4>;
+             align = <4>;
+
+             u-boot-spl {
+                     align-end = <4>;
+             };
+
+             blob_1: blob-ext@1 {
+                     filename = "lpddr4_pmu_train_1d_imem.bin";
+                     size = <0x8000>;
+             };
+
+             blob_2: blob-ext@2 {
+                     filename = "lpddr4_pmu_train_1d_dmem.bin";
+                     size = <0x4000>;
+             };
+
+             blob_3: blob-ext@3 {
+                     filename = "lpddr4_pmu_train_2d_imem.bin";
+                     size = <0x8000>;
+             };
+
+             blob_4: blob-ext@4 {
+                     filename = "lpddr4_pmu_train_2d_dmem.bin";
+                     size = <0x4000>;
+             };
+     };
+
+
+     spl {
+             filename = "spl.bin";
+
+             mkimage {
+                     args = "-n spl/u-boot-spl.cfgout -T imx8mimage -e 0x912000";
+
+                     blob {
+                             filename = "u-boot-spl-ddr.bin";
+                     };
+             };
+     };
+
+     itb {
+             filename = "u-boot.itb";
+
+             fit {
+                     description = "Configuration to load ATF before U-Boot";
+                     #address-cells = <1>;
+                     fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>;
+
+                     images {
+                             uboot {
+                                     description = "U-Boot (64-bit)";
+                                     type = "standalone";
+                                     arch = "arm64";
+                                     compression = "none";
+                                     load = <CONFIG_SYS_TEXT_BASE>;
+
+                                     uboot_blob: blob-ext {
+                                             filename = "u-boot-nodtb.bin";
+                                     };
+                             };
+
+                             atf {
+                                     description = "ARM Trusted Firmware";
+                                     type = "firmware";
+                                     arch = "arm64";
+                                     compression = "none";
+                                     load = <0x960000>;
+                                     entry = <0x960000>;
+
+                                     atf_blob: blob-ext {
+                                             filename = "bl31.bin";
+                                     };
+                             };
+
+                             fdt {
+                                     description = "NAME";
+                                     type = "flat_dt";
+                                     compression = "none";
+
+                                     uboot_fdt_blob: blob-ext {
+                                             filename = "u-boot.dtb";
+                                     };
+                             };
+                     };
+
+                     configurations {
+                             default = "conf";
+
+                             conf {
+                                     description = "NAME";
+                                     firmware = "uboot";
+                                     loadables = "atf";
+                                     fdt = "fdt";
+                             };
+                     };
+             };
+     };
+
+     imx-boot {
+             filename = "flash.bin";
+             pad-byte = <0x00>;
+
+             spl: blob-ext@1 {
+                     offset = <0x0>;
+                     filename = "spl.bin";
+             };
+
+             uboot: blob-ext@2 {
+                     offset = <0x58000>;
+                     filename = "u-boot.itb";
+             };
+     };
+};
arch/arm/mach-imx/imx8m/Kconfig +1 -0
index 8fedf45987..9a1eb108e4 100644
@@ -116,6 +116,7 @@ config TARGET_IMX8MM_BEACON
 
  config TARGET_IMX8MN_BEACON
      bool "imx8mn Beacon Embedded devkit"
+     select BINMAN
      select IMX8MN
      select SUPPORT_SPL
      select IMX8M_LPDDR4
board/beacon/imx8mn/imximage-8mn-lpddr4.cfg new file +10 -0
new file mode 100644
index 0000000000..7286b26494
@@ -0,0 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright 2021 NXP
+ */
+
+#define __ASSEMBLY__
+
+ROM_VERSION  v2
+BOOT_FROM    sd
+LOADER               u-boot-spl-ddr.bin      0x912000
configs/imx8mn_beacon_defconfig +6 -3
index 5296204aad..f2515874a2 100644
@@ -26,9 +26,9 @@ CONFIG_LTO=y
  CONFIG_FIT=y
  CONFIG_FIT_EXTERNAL_OFFSET=0x3000
  CONFIG_SPL_LOAD_FIT=y
-CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
+# CONFIG_USE_SPL_FIT_GENERATOR is not set
  CONFIG_OF_SYSTEM_SETUP=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mn-lpddr4.cfg"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/beacon/imx8mn/imximage-8mn-lpddr4.cfg"
  CONFIG_DEFAULT_FDT_FILE="imx8mn-beacon-kit.dtb"
  CONFIG_ARCH_MISC_INIT=y
  CONFIG_SPL_BOARD_INIT=y
@@ -36,6 +36,7 @@ CONFIG_SPL_BOOTROM_SUPPORT=y
  CONFIG_SPL_SEPARATE_BSS=y
  CONFIG_SPL_I2C=y
  CONFIG_SPL_POWER=y
+CONFIG_SPL_WATCHDOG=y
  CONFIG_HUSH_PARSER=y
  CONFIG_SYS_PROMPT="u-boot=> "
  # CONFIG_BOOTM_NETBSD is not set
@@ -62,7 +63,6 @@ CONFIG_CMD_EXT4_WRITE=y
  CONFIG_CMD_FAT=y
  CONFIG_OF_CONTROL=y
  CONFIG_SPL_OF_CONTROL=y
-CONFIG_OF_SPL_REMOVE_PROPS="interrupt-parent interrupts"
  CONFIG_ENV_IS_IN_MMC=y
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_SYS_MMC_ENV_DEV=2
@@ -106,6 +106,7 @@ CONFIG_PHY_GIGE=y
  CONFIG_FEC_MXC=y
  CONFIG_MII=y
  CONFIG_PINCTRL=y
+CONFIG_SPL_PINCTRL=y
  CONFIG_PINCTRL_IMX8M=y
  CONFIG_DM_PMIC=y
  # CONFIG_SPL_PMIC_CHILDREN is not set
@@ -122,7 +123,9 @@ CONFIG_SPI=y
  CONFIG_DM_SPI=y
  CONFIG_NXP_FSPI=y
  CONFIG_SYSRESET=y
+CONFIG_SPL_SYSRESET=y
  CONFIG_SYSRESET_PSCI=y
+CONFIG_SYSRESET_WATCHDOG=y
  CONFIG_DM_THERMAL=y
  CONFIG_USB=y
  # CONFIG_SPL_DM_USB is not set

configs/imx8mn_beacon_defconfig CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 · line 140

Quoted 4 lines
configs/imx8mn_beacon_defconfig +1 -0
@@ -134,3 +137,4 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
  CONFIG_CI_UDC=y
  CONFIG_SDP_LOADADDR=0x0
  CONFIG_OF_LIBFDT_OVERLAY=y
+CONFIG_IMX_WATCHDOG=y
Quoted 2 lines

This introduces failure to build now:
https://source.denx.de/u-boot/u-boot/-/jobs/352491

This goes to another discussion [1] because the binman requires some file outside of U-Boot in order to create the binary.
If we could let the CI build with missing files, that would be helpful.

[1] - https://lore.kernel.org/all/20211109194224.GB24579@bill-the-cat/

adam

Quoted 3 lines

--
Tom

#8 lore raw
Quoted 294 lines · Adam Ford
Quoted 293 lines · Tom Rini
Quoted 289 lines · Adam Ford
Quoted 9 lines · Adam Ford
Quoted 7 lines · Adam Ford
Quoted 5 lines · Adam Ford
Quoted 3 lines · Peng Fan (OSS)

+Tom Rini

Quoted 11 lines
Quoted 11 lines
Quoted 10 lines
Quoted 6 lines · Adam Ford
Quoted 5 lines

Somewhere along the line, the board stopped being able to boot. Rather than just fixing the issue, let's fix the issue and migrate to binman to eliminate a warning when using custom imx tools for generating the binary.

Any chance this can make it into 2021.10? it's currently broken, and this seems to fix the problem. i didn't bisect to see where the issue broke, or i would have added a fixes tag.

Quoted 5 lines
Quoted 2 lines

Stefano or Tom? could someone comment and/or merge? the board is currently not booting, and this fixes the issue

It's been over a month, and we missed the 2021.10 release. Is there something stopping this from being applied?

Tom,

Is there any chance you can apply this? I can't get anyone to respond to me, and it's been over 2 months since the initial submission.

thanks,

adam

Quoted 251 lines

adam

Quoted 249 lines
Quoted 249 lines

adam

Quoted 247 lines
Quoted 241 lines
arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi +130 -0
index bbc64a2819..69fd69c8d0 100644
@@ -4,6 +4,10 @@
   */
 
  / {
+     binman: binman {
+             multiple-images;
+     };
+
      wdt-reboot {
              compatible = "wdt-reboot";
              wdt = <&wdog1>;
@@ -40,6 +44,9 @@
  &clk {
      u-boot,dm-spl;
      u-boot,dm-pre-reloc;
+     /delete-property/ assigned-clocks;
+     /delete-property/ assigned-clock-parents;
+     /delete-property/ assigned-clock-rates;
  };
 
  &gpio1 {
@@ -99,6 +106,10 @@
      u-boot,off-on-delay-us = <20000>;
  };
 
+&uart2 {
+     u-boot,dm-spl;
+};
+
  &usdhc1 {
      u-boot,dm-spl;
      sd-uhs-sdr104;
@@ -120,3 +131,122 @@
  &wdog1 {
      u-boot,dm-spl;
  };
+
+&binman {
+      u-boot-spl-ddr {
+             filename = "u-boot-spl-ddr.bin";
+             pad-byte = <0xff>;
+             align-size = <4>;
+             align = <4>;
+
+             u-boot-spl {
+                     align-end = <4>;
+             };
+
+             blob_1: blob-ext@1 {
+                     filename = "lpddr4_pmu_train_1d_imem.bin";
+                     size = <0x8000>;
+             };
+
+             blob_2: blob-ext@2 {
+                     filename = "lpddr4_pmu_train_1d_dmem.bin";
+                     size = <0x4000>;
+             };
+
+             blob_3: blob-ext@3 {
+                     filename = "lpddr4_pmu_train_2d_imem.bin";
+                     size = <0x8000>;
+             };
+
+             blob_4: blob-ext@4 {
+                     filename = "lpddr4_pmu_train_2d_dmem.bin";
+                     size = <0x4000>;
+             };
+     };
+
+
+     spl {
+             filename = "spl.bin";
+
+             mkimage {
+                     args = "-n spl/u-boot-spl.cfgout -T imx8mimage -e 0x912000";
+
+                     blob {
+                             filename = "u-boot-spl-ddr.bin";
+                     };
+             };
+     };
+
+     itb {
+             filename = "u-boot.itb";
+
+             fit {
+                     description = "Configuration to load ATF before U-Boot";
+                     #address-cells = <1>;
+                     fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>;
+
+                     images {
+                             uboot {
+                                     description = "U-Boot (64-bit)";
+                                     type = "standalone";
+                                     arch = "arm64";
+                                     compression = "none";
+                                     load = <CONFIG_SYS_TEXT_BASE>;
+
+                                     uboot_blob: blob-ext {
+                                             filename = "u-boot-nodtb.bin";
+                                     };
+                             };
+
+                             atf {
+                                     description = "ARM Trusted Firmware";
+                                     type = "firmware";
+                                     arch = "arm64";
+                                     compression = "none";
+                                     load = <0x960000>;
+                                     entry = <0x960000>;
+
+                                     atf_blob: blob-ext {
+                                             filename = "bl31.bin";
+                                     };
+                             };
+
+                             fdt {
+                                     description = "NAME";
+                                     type = "flat_dt";
+                                     compression = "none";
+
+                                     uboot_fdt_blob: blob-ext {
+                                             filename = "u-boot.dtb";
+                                     };
+                             };
+                     };
+
+                     configurations {
+                             default = "conf";
+
+                             conf {
+                                     description = "NAME";
+                                     firmware = "uboot";
+                                     loadables = "atf";
+                                     fdt = "fdt";
+                             };
+                     };
+             };
+     };
+
+     imx-boot {
+             filename = "flash.bin";
+             pad-byte = <0x00>;
+
+             spl: blob-ext@1 {
+                     offset = <0x0>;
+                     filename = "spl.bin";
+             };
+
+             uboot: blob-ext@2 {
+                     offset = <0x58000>;
+                     filename = "u-boot.itb";
+             };
+     };
+};
arch/arm/mach-imx/imx8m/Kconfig +1 -0
index 8fedf45987..9a1eb108e4 100644
@@ -116,6 +116,7 @@ config TARGET_IMX8MM_BEACON
 
  config TARGET_IMX8MN_BEACON
      bool "imx8mn Beacon Embedded devkit"
+     select BINMAN
      select IMX8MN
      select SUPPORT_SPL
      select IMX8M_LPDDR4
board/beacon/imx8mn/imximage-8mn-lpddr4.cfg new file +10 -0
new file mode 100644
index 0000000000..7286b26494
@@ -0,0 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright 2021 NXP
+ */
+
+#define __ASSEMBLY__
+
+ROM_VERSION  v2
+BOOT_FROM    sd
+LOADER               u-boot-spl-ddr.bin      0x912000
configs/imx8mn_beacon_defconfig +6 -3
index 5296204aad..f2515874a2 100644
@@ -26,9 +26,9 @@ CONFIG_LTO=y
  CONFIG_FIT=y
  CONFIG_FIT_EXTERNAL_OFFSET=0x3000
  CONFIG_SPL_LOAD_FIT=y
-CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
+# CONFIG_USE_SPL_FIT_GENERATOR is not set
  CONFIG_OF_SYSTEM_SETUP=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mn-lpddr4.cfg"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/beacon/imx8mn/imximage-8mn-lpddr4.cfg"
  CONFIG_DEFAULT_FDT_FILE="imx8mn-beacon-kit.dtb"
  CONFIG_ARCH_MISC_INIT=y
  CONFIG_SPL_BOARD_INIT=y
@@ -36,6 +36,7 @@ CONFIG_SPL_BOOTROM_SUPPORT=y
  CONFIG_SPL_SEPARATE_BSS=y
  CONFIG_SPL_I2C=y
  CONFIG_SPL_POWER=y
+CONFIG_SPL_WATCHDOG=y
  CONFIG_HUSH_PARSER=y
  CONFIG_SYS_PROMPT="u-boot=> "
  # CONFIG_BOOTM_NETBSD is not set
@@ -62,7 +63,6 @@ CONFIG_CMD_EXT4_WRITE=y
  CONFIG_CMD_FAT=y
  CONFIG_OF_CONTROL=y
  CONFIG_SPL_OF_CONTROL=y
-CONFIG_OF_SPL_REMOVE_PROPS="interrupt-parent interrupts"
  CONFIG_ENV_IS_IN_MMC=y
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_SYS_MMC_ENV_DEV=2
@@ -106,6 +106,7 @@ CONFIG_PHY_GIGE=y
  CONFIG_FEC_MXC=y
  CONFIG_MII=y
  CONFIG_PINCTRL=y
+CONFIG_SPL_PINCTRL=y
  CONFIG_PINCTRL_IMX8M=y
  CONFIG_DM_PMIC=y
  # CONFIG_SPL_PMIC_CHILDREN is not set
@@ -122,7 +123,9 @@ CONFIG_SPI=y
  CONFIG_DM_SPI=y
  CONFIG_NXP_FSPI=y
  CONFIG_SYSRESET=y
+CONFIG_SPL_SYSRESET=y
  CONFIG_SYSRESET_PSCI=y
+CONFIG_SYSRESET_WATCHDOG=y
  CONFIG_DM_THERMAL=y
  CONFIG_USB=y
  # CONFIG_SPL_DM_USB is not set

configs/imx8mn_beacon_defconfig CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 · line 140

Quoted 4 lines
configs/imx8mn_beacon_defconfig +1 -0
@@ -134,3 +137,4 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
  CONFIG_CI_UDC=y
  CONFIG_SDP_LOADADDR=0x0
  CONFIG_OF_LIBFDT_OVERLAY=y
+CONFIG_IMX_WATCHDOG=y
Quoted 8 lines
Quoted 2 lines

This introduces failure to build now:
https://source.denx.de/u-boot/u-boot/-/jobs/352491

This goes to another discussion [1] because the binman requires some file outside of U-Boot in order to create the binary.
If we could let the CI build with missing files, that would be helpful.

[1] - https://lore.kernel.org/all/20211109194224.GB24579@bill-the-cat/

Oh this fun.. :(

Signature · 1 line
Tom
author
#9 lore raw
Quoted 299 lines · Tom Rini
Quoted 297 lines · Adam Ford
Quoted 295 lines · Tom Rini
Quoted 30 lines · Adam Ford
Quoted 9 lines · Adam Ford
Quoted 7 lines · Adam Ford
Quoted 5 lines · Adam Ford
Quoted 3 lines · Peng Fan (OSS)

+Tom Rini

Quoted 11 lines
Quoted 11 lines
Quoted 10 lines
Quoted 6 lines · Adam Ford
Quoted 5 lines

Somewhere along the line, the board stopped being able to boot. Rather than just fixing the issue, let's fix the issue and migrate to binman to eliminate a warning when using custom imx tools for generating the binary.

Any chance this can make it into 2021.10? it's currently broken, and this seems to fix the problem. i didn't bisect to see where the issue broke, or i would have added a fixes tag.

Quoted 5 lines
Quoted 2 lines

Stefano or Tom? could someone comment and/or merge? the board is currently not booting, and this fixes the issue

It's been over a month, and we missed the 2021.10 release. Is there something stopping this from being applied?

Quoted 259 lines

Tom,

Is there any chance you can apply this? I can't get anyone to respond to me, and it's been over 2 months since the initial submission.

thanks,

adam

Quoted 251 lines

adam

Quoted 249 lines
Quoted 249 lines

adam

Quoted 247 lines
Quoted 241 lines
arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi +130 -0
index bbc64a2819..69fd69c8d0 100644
@@ -4,6 +4,10 @@
   */
 
  / {
+     binman: binman {
+             multiple-images;
+     };
+
      wdt-reboot {
              compatible = "wdt-reboot";
              wdt = <&wdog1>;
@@ -40,6 +44,9 @@
  &clk {
      u-boot,dm-spl;
      u-boot,dm-pre-reloc;
+     /delete-property/ assigned-clocks;
+     /delete-property/ assigned-clock-parents;
+     /delete-property/ assigned-clock-rates;
  };
 
  &gpio1 {
@@ -99,6 +106,10 @@
      u-boot,off-on-delay-us = <20000>;
  };
 
+&uart2 {
+     u-boot,dm-spl;
+};
+
  &usdhc1 {
      u-boot,dm-spl;
      sd-uhs-sdr104;
@@ -120,3 +131,122 @@
  &wdog1 {
      u-boot,dm-spl;
  };
+
+&binman {
+      u-boot-spl-ddr {
+             filename = "u-boot-spl-ddr.bin";
+             pad-byte = <0xff>;
+             align-size = <4>;
+             align = <4>;
+
+             u-boot-spl {
+                     align-end = <4>;
+             };
+
+             blob_1: blob-ext@1 {
+                     filename = "lpddr4_pmu_train_1d_imem.bin";
+                     size = <0x8000>;
+             };
+
+             blob_2: blob-ext@2 {
+                     filename = "lpddr4_pmu_train_1d_dmem.bin";
+                     size = <0x4000>;
+             };
+
+             blob_3: blob-ext@3 {
+                     filename = "lpddr4_pmu_train_2d_imem.bin";
+                     size = <0x8000>;
+             };
+
+             blob_4: blob-ext@4 {
+                     filename = "lpddr4_pmu_train_2d_dmem.bin";
+                     size = <0x4000>;
+             };
+     };
+
+
+     spl {
+             filename = "spl.bin";
+
+             mkimage {
+                     args = "-n spl/u-boot-spl.cfgout -T imx8mimage -e 0x912000";
+
+                     blob {
+                             filename = "u-boot-spl-ddr.bin";
+                     };
+             };
+     };
+
+     itb {
+             filename = "u-boot.itb";
+
+             fit {
+                     description = "Configuration to load ATF before U-Boot";
+                     #address-cells = <1>;
+                     fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>;
+
+                     images {
+                             uboot {
+                                     description = "U-Boot (64-bit)";
+                                     type = "standalone";
+                                     arch = "arm64";
+                                     compression = "none";
+                                     load = <CONFIG_SYS_TEXT_BASE>;
+
+                                     uboot_blob: blob-ext {
+                                             filename = "u-boot-nodtb.bin";
+                                     };
+                             };
+
+                             atf {
+                                     description = "ARM Trusted Firmware";
+                                     type = "firmware";
+                                     arch = "arm64";
+                                     compression = "none";
+                                     load = <0x960000>;
+                                     entry = <0x960000>;
+
+                                     atf_blob: blob-ext {
+                                             filename = "bl31.bin";
+                                     };
+                             };
+
+                             fdt {
+                                     description = "NAME";
+                                     type = "flat_dt";
+                                     compression = "none";
+
+                                     uboot_fdt_blob: blob-ext {
+                                             filename = "u-boot.dtb";
+                                     };
+                             };
+                     };
+
+                     configurations {
+                             default = "conf";
+
+                             conf {
+                                     description = "NAME";
+                                     firmware = "uboot";
+                                     loadables = "atf";
+                                     fdt = "fdt";
+                             };
+                     };
+             };
+     };
+
+     imx-boot {
+             filename = "flash.bin";
+             pad-byte = <0x00>;
+
+             spl: blob-ext@1 {
+                     offset = <0x0>;
+                     filename = "spl.bin";
+             };
+
+             uboot: blob-ext@2 {
+                     offset = <0x58000>;
+                     filename = "u-boot.itb";
+             };
+     };
+};
arch/arm/mach-imx/imx8m/Kconfig +1 -0
index 8fedf45987..9a1eb108e4 100644
@@ -116,6 +116,7 @@ config TARGET_IMX8MM_BEACON
 
  config TARGET_IMX8MN_BEACON
      bool "imx8mn Beacon Embedded devkit"
+     select BINMAN
      select IMX8MN
      select SUPPORT_SPL
      select IMX8M_LPDDR4
board/beacon/imx8mn/imximage-8mn-lpddr4.cfg new file +10 -0
new file mode 100644
index 0000000000..7286b26494
@@ -0,0 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright 2021 NXP
+ */
+
+#define __ASSEMBLY__
+
+ROM_VERSION  v2
+BOOT_FROM    sd
+LOADER               u-boot-spl-ddr.bin      0x912000
configs/imx8mn_beacon_defconfig +6 -3
index 5296204aad..f2515874a2 100644
@@ -26,9 +26,9 @@ CONFIG_LTO=y
  CONFIG_FIT=y
  CONFIG_FIT_EXTERNAL_OFFSET=0x3000
  CONFIG_SPL_LOAD_FIT=y
-CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
+# CONFIG_USE_SPL_FIT_GENERATOR is not set
  CONFIG_OF_SYSTEM_SETUP=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mn-lpddr4.cfg"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/beacon/imx8mn/imximage-8mn-lpddr4.cfg"
  CONFIG_DEFAULT_FDT_FILE="imx8mn-beacon-kit.dtb"
  CONFIG_ARCH_MISC_INIT=y
  CONFIG_SPL_BOARD_INIT=y
@@ -36,6 +36,7 @@ CONFIG_SPL_BOOTROM_SUPPORT=y
  CONFIG_SPL_SEPARATE_BSS=y
  CONFIG_SPL_I2C=y
  CONFIG_SPL_POWER=y
+CONFIG_SPL_WATCHDOG=y
  CONFIG_HUSH_PARSER=y
  CONFIG_SYS_PROMPT="u-boot=> "
  # CONFIG_BOOTM_NETBSD is not set
@@ -62,7 +63,6 @@ CONFIG_CMD_EXT4_WRITE=y
  CONFIG_CMD_FAT=y
  CONFIG_OF_CONTROL=y
  CONFIG_SPL_OF_CONTROL=y
-CONFIG_OF_SPL_REMOVE_PROPS="interrupt-parent interrupts"
  CONFIG_ENV_IS_IN_MMC=y
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_SYS_MMC_ENV_DEV=2
@@ -106,6 +106,7 @@ CONFIG_PHY_GIGE=y
  CONFIG_FEC_MXC=y
  CONFIG_MII=y
  CONFIG_PINCTRL=y
+CONFIG_SPL_PINCTRL=y
  CONFIG_PINCTRL_IMX8M=y
  CONFIG_DM_PMIC=y
  # CONFIG_SPL_PMIC_CHILDREN is not set
@@ -122,7 +123,9 @@ CONFIG_SPI=y
  CONFIG_DM_SPI=y
  CONFIG_NXP_FSPI=y
  CONFIG_SYSRESET=y
+CONFIG_SPL_SYSRESET=y
  CONFIG_SYSRESET_PSCI=y
+CONFIG_SYSRESET_WATCHDOG=y
  CONFIG_DM_THERMAL=y
  CONFIG_USB=y
  # CONFIG_SPL_DM_USB is not set

configs/imx8mn_beacon_defconfig CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 · line 140

Quoted 4 lines
configs/imx8mn_beacon_defconfig +1 -0
@@ -134,3 +137,4 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
  CONFIG_CI_UDC=y
  CONFIG_SDP_LOADADDR=0x0
  CONFIG_OF_LIBFDT_OVERLAY=y
+CONFIG_IMX_WATCHDOG=y

This introduces failure to build now:
https://source.denx.de/u-boot/u-boot/-/jobs/352491

Quoted 7 lines
Quoted 5 lines

This goes to another discussion [1] because the binman requires some file outside of U-Boot in order to create the binary.
If we could let the CI build with missing files, that would be helpful.

[1] - https://lore.kernel.org/all/20211109194224.GB24579@bill-the-cat/

Oh this fun.. :(

Does that mean I should find a solution without binman?

Quoted 3 lines

--
Tom

#10 lore raw
Quoted 304 lines · Adam Ford
Quoted 303 lines · Tom Rini
Quoted 301 lines · Adam Ford
Quoted 293 lines · Tom Rini
Quoted 30 lines · Adam Ford
Quoted 9 lines · Adam Ford
Quoted 7 lines · Adam Ford
Quoted 5 lines · Adam Ford
Quoted 3 lines · Peng Fan (OSS)

+Tom Rini

Quoted 11 lines
Quoted 11 lines
Quoted 10 lines
Quoted 6 lines · Adam Ford
Quoted 5 lines

Somewhere along the line, the board stopped being able to boot. Rather than just fixing the issue, let's fix the issue and migrate to binman to eliminate a warning when using custom imx tools for generating the binary.

Any chance this can make it into 2021.10? it's currently broken, and this seems to fix the problem. i didn't bisect to see where the issue broke, or i would have added a fixes tag.

Quoted 5 lines
Quoted 2 lines

Stefano or Tom? could someone comment and/or merge? the board is currently not booting, and this fixes the issue

It's been over a month, and we missed the 2021.10 release. Is there something stopping this from being applied?

Quoted 259 lines

Tom,

Is there any chance you can apply this? I can't get anyone to respond to me, and it's been over 2 months since the initial submission.

thanks,

adam

Quoted 251 lines

adam

Quoted 249 lines
Quoted 249 lines

adam

Quoted 247 lines
Quoted 241 lines
arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi +130 -0
index bbc64a2819..69fd69c8d0 100644
@@ -4,6 +4,10 @@
   */
 
  / {
+     binman: binman {
+             multiple-images;
+     };
+
      wdt-reboot {
              compatible = "wdt-reboot";
              wdt = <&wdog1>;
@@ -40,6 +44,9 @@
  &clk {
      u-boot,dm-spl;
      u-boot,dm-pre-reloc;
+     /delete-property/ assigned-clocks;
+     /delete-property/ assigned-clock-parents;
+     /delete-property/ assigned-clock-rates;
  };
 
  &gpio1 {
@@ -99,6 +106,10 @@
      u-boot,off-on-delay-us = <20000>;
  };
 
+&uart2 {
+     u-boot,dm-spl;
+};
+
  &usdhc1 {
      u-boot,dm-spl;
      sd-uhs-sdr104;
@@ -120,3 +131,122 @@
  &wdog1 {
      u-boot,dm-spl;
  };
+
+&binman {
+      u-boot-spl-ddr {
+             filename = "u-boot-spl-ddr.bin";
+             pad-byte = <0xff>;
+             align-size = <4>;
+             align = <4>;
+
+             u-boot-spl {
+                     align-end = <4>;
+             };
+
+             blob_1: blob-ext@1 {
+                     filename = "lpddr4_pmu_train_1d_imem.bin";
+                     size = <0x8000>;
+             };
+
+             blob_2: blob-ext@2 {
+                     filename = "lpddr4_pmu_train_1d_dmem.bin";
+                     size = <0x4000>;
+             };
+
+             blob_3: blob-ext@3 {
+                     filename = "lpddr4_pmu_train_2d_imem.bin";
+                     size = <0x8000>;
+             };
+
+             blob_4: blob-ext@4 {
+                     filename = "lpddr4_pmu_train_2d_dmem.bin";
+                     size = <0x4000>;
+             };
+     };
+
+
+     spl {
+             filename = "spl.bin";
+
+             mkimage {
+                     args = "-n spl/u-boot-spl.cfgout -T imx8mimage -e 0x912000";
+
+                     blob {
+                             filename = "u-boot-spl-ddr.bin";
+                     };
+             };
+     };
+
+     itb {
+             filename = "u-boot.itb";
+
+             fit {
+                     description = "Configuration to load ATF before U-Boot";
+                     #address-cells = <1>;
+                     fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>;
+
+                     images {
+                             uboot {
+                                     description = "U-Boot (64-bit)";
+                                     type = "standalone";
+                                     arch = "arm64";
+                                     compression = "none";
+                                     load = <CONFIG_SYS_TEXT_BASE>;
+
+                                     uboot_blob: blob-ext {
+                                             filename = "u-boot-nodtb.bin";
+                                     };
+                             };
+
+                             atf {
+                                     description = "ARM Trusted Firmware";
+                                     type = "firmware";
+                                     arch = "arm64";
+                                     compression = "none";
+                                     load = <0x960000>;
+                                     entry = <0x960000>;
+
+                                     atf_blob: blob-ext {
+                                             filename = "bl31.bin";
+                                     };
+                             };
+
+                             fdt {
+                                     description = "NAME";
+                                     type = "flat_dt";
+                                     compression = "none";
+
+                                     uboot_fdt_blob: blob-ext {
+                                             filename = "u-boot.dtb";
+                                     };
+                             };
+                     };
+
+                     configurations {
+                             default = "conf";
+
+                             conf {
+                                     description = "NAME";
+                                     firmware = "uboot";
+                                     loadables = "atf";
+                                     fdt = "fdt";
+                             };
+                     };
+             };
+     };
+
+     imx-boot {
+             filename = "flash.bin";
+             pad-byte = <0x00>;
+
+             spl: blob-ext@1 {
+                     offset = <0x0>;
+                     filename = "spl.bin";
+             };
+
+             uboot: blob-ext@2 {
+                     offset = <0x58000>;
+                     filename = "u-boot.itb";
+             };
+     };
+};
arch/arm/mach-imx/imx8m/Kconfig +1 -0
index 8fedf45987..9a1eb108e4 100644
@@ -116,6 +116,7 @@ config TARGET_IMX8MM_BEACON
 
  config TARGET_IMX8MN_BEACON
      bool "imx8mn Beacon Embedded devkit"
+     select BINMAN
      select IMX8MN
      select SUPPORT_SPL
      select IMX8M_LPDDR4
board/beacon/imx8mn/imximage-8mn-lpddr4.cfg new file +10 -0
new file mode 100644
index 0000000000..7286b26494
@@ -0,0 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright 2021 NXP
+ */
+
+#define __ASSEMBLY__
+
+ROM_VERSION  v2
+BOOT_FROM    sd
+LOADER               u-boot-spl-ddr.bin      0x912000
configs/imx8mn_beacon_defconfig +6 -3
index 5296204aad..f2515874a2 100644
@@ -26,9 +26,9 @@ CONFIG_LTO=y
  CONFIG_FIT=y
  CONFIG_FIT_EXTERNAL_OFFSET=0x3000
  CONFIG_SPL_LOAD_FIT=y
-CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
+# CONFIG_USE_SPL_FIT_GENERATOR is not set
  CONFIG_OF_SYSTEM_SETUP=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mn-lpddr4.cfg"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/beacon/imx8mn/imximage-8mn-lpddr4.cfg"
  CONFIG_DEFAULT_FDT_FILE="imx8mn-beacon-kit.dtb"
  CONFIG_ARCH_MISC_INIT=y
  CONFIG_SPL_BOARD_INIT=y
@@ -36,6 +36,7 @@ CONFIG_SPL_BOOTROM_SUPPORT=y
  CONFIG_SPL_SEPARATE_BSS=y
  CONFIG_SPL_I2C=y
  CONFIG_SPL_POWER=y
+CONFIG_SPL_WATCHDOG=y
  CONFIG_HUSH_PARSER=y
  CONFIG_SYS_PROMPT="u-boot=> "
  # CONFIG_BOOTM_NETBSD is not set
@@ -62,7 +63,6 @@ CONFIG_CMD_EXT4_WRITE=y
  CONFIG_CMD_FAT=y
  CONFIG_OF_CONTROL=y
  CONFIG_SPL_OF_CONTROL=y
-CONFIG_OF_SPL_REMOVE_PROPS="interrupt-parent interrupts"
  CONFIG_ENV_IS_IN_MMC=y
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_SYS_MMC_ENV_DEV=2
@@ -106,6 +106,7 @@ CONFIG_PHY_GIGE=y
  CONFIG_FEC_MXC=y
  CONFIG_MII=y
  CONFIG_PINCTRL=y
+CONFIG_SPL_PINCTRL=y
  CONFIG_PINCTRL_IMX8M=y
  CONFIG_DM_PMIC=y
  # CONFIG_SPL_PMIC_CHILDREN is not set
@@ -122,7 +123,9 @@ CONFIG_SPI=y
  CONFIG_DM_SPI=y
  CONFIG_NXP_FSPI=y
  CONFIG_SYSRESET=y
+CONFIG_SPL_SYSRESET=y
  CONFIG_SYSRESET_PSCI=y
+CONFIG_SYSRESET_WATCHDOG=y
  CONFIG_DM_THERMAL=y
  CONFIG_USB=y
  # CONFIG_SPL_DM_USB is not set

configs/imx8mn_beacon_defconfig CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 · line 140

Quoted 4 lines
configs/imx8mn_beacon_defconfig +1 -0
@@ -134,3 +137,4 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
  CONFIG_CI_UDC=y
  CONFIG_SDP_LOADADDR=0x0
  CONFIG_OF_LIBFDT_OVERLAY=y
+CONFIG_IMX_WATCHDOG=y
Quoted 2 lines

This introduces failure to build now:
https://source.denx.de/u-boot/u-boot/-/jobs/352491

This goes to another discussion [1] because the binman requires some file outside of U-Boot in order to create the binary.
If we could let the CI build with missing files, that would be helpful.

Quoted 5 lines
Quoted 3 lines
Quoted 1 line

[1] - https://lore.kernel.org/all/20211109194224.GB24579@bill-the-cat/

Oh this fun.. :(

Does that mean I should find a solution without binman?

I think it depends on how the RFC to allow binman to handle dummy files goes.

Signature · 1 line
Tom
#12 lore raw
In reply to Adam Ford

arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi

Quoted 11 lines · Adam Ford

Somewhere along the line, the board stopped being able to boot. Rather than just fixing the issue, let's fix the issue and migrate to binman to eliminate a warning when using custom imx tools for generating the binary.

arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi +0 -0
index bbc64a2819..69fd69c8d0 100644

Applied to u-boot/master, thanks!

Signature · 1 line
Tom