Skip to contentSkip to conversation

arm: dts: Create common imx8mn-u-boot

PATCH Superseded Adam Ford 5 participants 20 messages Jul 31, 2022 – Oct 24, 2022

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Adam Ford

author
#0 lore raw

cover arm: dts: Create common imx8mn-u-boot

Every imx8mn board has a bunch of similar entries on their respective board-u-boot.dtsi file to make the board bootable. Instead of maintaining multiple files with duplicate code, have them all point to a new, common file. This file includes the necessary nodes that were common to nearly all boards and added spba1 to help faciliate SPL_DM_SERIAL. This also adds support for CONFIG_FSPI_CONF_HEADER which can be used to generate flash.bin files for booting from FlexSPI.

Adam Ford (7):
arm: dts: imx8mn-u-boot: Create common imx8mn-u-boot.dtsi
arm: dts: imx8mn-beacon-kit: Consolidate with imx8mn-u-boot
arm: dts: imx8mn-bsh-smm-s2: Consolidate with imx8mn-u-boot
arm: dts: imx8mn-ddr4-evk: Consolidate with imx8mn-u-boot
arm: dts: imx8mn-evk: Consolidate with imx8mn-u-boot
arm: dts: imx8mn-var-som-symphony: Consolidate with imx8mn-u-boot
arm: dts: imx8mn-venice: Consolidate with imx8mn-u-boot

 arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi    | 180 +------------
 .../dts/imx8mn-bsh-smm-s2-u-boot-common.dtsi  | 172 +-----------
 arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi      | 180 +------------
 arch/arm/dts/imx8mn-evk-u-boot.dtsi           | 108 --------
 arch/arm/dts/imx8mn-u-boot.dtsi               | 248 ++++++++++++++++++
 .../dts/imx8mn-var-som-symphony-u-boot.dtsi   | 188 +------------
 arch/arm/dts/imx8mn-venice-u-boot.dtsi        | 188 +------------
 7 files changed, 254 insertions(+), 1010 deletions(-)
 create mode 100644 arch/arm/dts/imx8mn-u-boot.dtsi
Signature · 1 line
2.34.1
author
#1 lore raw

PATCH 1/7 arm: dts: imx8mn-u-boot: Create common imx8mn-u-boot.dtsi

Multiple boards create duplicate entries in their respective -u-boot.dtsi files which all basically do the same thing. To consolidate these and make it easier to make improvements going forward, consolidate them all into one place.

This file creates a flash.bin image using binman, and supports LPDDR4, DDR4 and DDR3. Since individual boards use different peripherals and different UART ports, those entries were kept in their respective board files, but the spba1 node was addded which contains all UART1-3 to help facilitate SPL_DM_SERIAL. Individual users will still need to include their respective UART and pinctrl nodes for those UARTS.

This consolidated file also supports generating a flash.bin file which can boot from flexSPI if CONFIG_FSPI_CONF_HEADER is enabled.

---
Patches on top of [1]

[1] - https://patchwork.ozlabs.org/project/uboot/patch/[email protected]/

arch/arm/dts/imx8mn-u-boot.dtsi new file +248 -0
new file mode 100644
index 0000000000..327d4070fc
@@ -0,0 +1,248 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright 2022 Logic PD, Inc dba Beacon EmbeddedWorks
+ */
+
+/ {
+	binman: binman {
+		multiple-images;
+	};
+
+	firmware {
+		optee {
+			compatible = "linaro,optee-tz";
+			method = "smc";
+		};
+	};
+
+	wdt-reboot {
+		compatible = "wdt-reboot";
+		wdt = <&wdog1>;
+		u-boot,dm-spl;
+	};
+};
+
+&{/soc@0} {
+	u-boot,dm-pre-reloc;
+	u-boot,dm-spl;
+};
+
+&aips1 {
+	u-boot,dm-spl;
+	u-boot,dm-pre-reloc;
+};
+
+&aips2 {
+	u-boot,dm-spl;
+};
+
+&aips3 {
+	u-boot,dm-spl;
+};
+
+&aips4 {
+	u-boot,dm-spl;
+};
+
+&clk {
+	u-boot,dm-spl;
+	u-boot,dm-pre-reloc;
+	/delete-property/ assigned-clocks;
+	/delete-property/ assigned-clock-parents;
+	/delete-property/ assigned-clock-rates;
+};
+
+&iomuxc {
+	u-boot,dm-spl;
+};
+
+&osc_24m {
+	u-boot,dm-spl;
+	u-boot,dm-pre-reloc;
+};
+
+&spba1 {
+	u-boot,dm-spl;
+};
+
+&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>;
+			filename = "u-boot-spl.bin";
+		};
+
+		ddr-1d-imem-fw {
+#ifdef CONFIG_IMX8M_LPDDR4
+			filename = "lpddr4_pmu_train_1d_imem.bin";
+#elif CONFIG_IMX8M_DDR4
+			filename = "ddr4_imem_1d.bin";
+#else
+			filename = "ddr3_imem_1d.bin";
+#endif
+			type = "blob-ext";
+			align-end = <4>;
+		};
+
+		ddr-1d-dmem-fw {
+#ifdef CONFIG_IMX8M_LPDDR4
+			filename = "lpddr4_pmu_train_1d_dmem.bin";
+#elif CONFIG_IMX8M_DDR4
+			filename = "ddr4_dmem_1d.bin";
+#else
+			filename = "ddr3_dmem_1d.bin";
+#endif
+			type = "blob-ext";
+			align-end = <4>;
+		};
+
+		ddr-2d-imem-fw {
+#ifdef CONFIG_IMX8M_LPDDR4
+			filename = "lpddr4_pmu_train_2d_imem.bin";
+#elif CONFIG_IMX8M_DDR4
+			filename = "ddr4_imem_2d.bin";
+#endif
+			type = "blob-ext";
+			align-end = <4>;
+		};
+
+		ddr-2d-dmem-fw {
+#ifdef CONFIG_IMX8M_LPDDR4
+			filename = "lpddr4_pmu_train_2d_dmem.bin";
+#elif CONFIG_IMX8M_DDR4
+			filename = "ddr4_dmem_2d.bin";
+#endif
+			type = "blob-ext";
+			align-end = <4>;
+		};
+	};
+
+	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";
+			fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>;
+			fit,fdt-list = "of-list";
+			#address-cells = <1>;
+
+			images {
+				uboot {
+					arch = "arm64";
+					compression = "none";
+					description = "U-Boot (64-bit)";
+					load = <CONFIG_SYS_TEXT_BASE>;
+					type = "standalone";
+
+					uboot-blob {
+						filename = "u-boot-nodtb.bin";
+						type = "blob-ext";
+					};
+				};
+
+				atf {
+					arch = "arm64";
+					compression = "none";
+					description = "ARM Trusted Firmware";
+					entry = <0x960000>;
+					load = <0x960000>;
+					type = "firmware";
+
+					atf-blob {
+						filename = "bl31.bin";
+						type = "atf-bl31";
+					};
+				};
+
+				binman_fip: fip {
+					arch = "arm64";
+					compression = "none";
+					description = "Trusted Firmware FIP";
+					load = <0x40310000>;
+					type = "firmware";
+				};
+
+				@fdt-SEQ {
+					compression = "none";
+					description = "NAME";
+					type = "flat_dt";
+
+					uboot-fdt-blob {
+						filename = "u-boot.dtb";
+						type = "blob-ext";
+					};
+				};
+			};
+
+			configurations {
+				default = "@config-DEFAULT-SEQ";
+
+				binman_configuration: @config-SEQ {
+					description = "NAME";
+					fdt = "fdt-SEQ";
+					firmware = "uboot";
+					loadables = "atf";
+				};
+			};
+		};
+	};
+
+	imx-boot {
+		filename = "flash.bin";
+		pad-byte = <0x00>;
+
+#ifdef CONFIG_FSPI_CONF_HEADER
+		fspi_conf_block {
+			filename = CONFIG_FSPI_CONF_FILE;
+			type = "blob-ext";
+			offset = <0x400>;
+		};
+
+		spl {
+			filename = "spl.bin";
+			offset = <0x1000>;
+			type = "blob-ext";
+		};
+
+		binman_uboot: uboot {
+			filename = "u-boot.itb";
+			offset = <0x59000>;
+			type = "blob-ext";
+		};
+#else
+
+		spl {
+			offset = <0x0>;
+			filename = "spl.bin";
+			type = "blob-ext";
+		};
+
+		binman_uboot: uboot {
+			offset = <0x58000>;
+			filename = "u-boot.itb";
+			type = "blob-ext";
+		};
+#endif
+	};
+};
Signature · 1 line
2.34.1
author
#5 lore raw

PATCH 2/7 arm: dts: imx8mn-beacon-kit: Consolidate with imx8mn-u-boot

In reply to Adam Ford

Now that a unified imx8mn-u-boot is available, remove duplicated code for generating flash.bin and other common imx8mn peripherals.

arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi +2 -178
index 0efa6862eb..3180d57239 100644
@@ -1,24 +1,9 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
- * Copyright 2020 Compass Electronics Group, LLC
+ * Copyright 2022 Logic PD, Inc. dba Beacon EmbeddedWorks
  */
 
-/ {
-	binman: binman {
-		multiple-images;
-	};
-
-	wdt-reboot {
-		compatible = "wdt-reboot";
-		wdt = <&wdog1>;
-		u-boot,dm-spl;
-	};
-};
-
-&{/soc@0} {
-	u-boot,dm-pre-reloc;
-	u-boot,dm-spl;
-};
+#include "imx8mn-u-boot.dtsi"
 
 &{/soc@0/bus@30800000/i2c@30a20000/pmic@4b} {
 	u-boot,dm-spl;
@@ -28,27 +13,6 @@
 	u-boot,dm-spl;
 };
 
-&aips1 {
-	u-boot,dm-spl;
-	u-boot,dm-pre-reloc;
-};
-
-&aips2 {
-	u-boot,dm-spl;
-};
-
-&aips3 {
-	u-boot,dm-spl;
-};
-
-&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 {
 	u-boot,dm-spl;
 };
@@ -61,15 +25,6 @@
 	u-boot,dm-spl;
 };
 
-&iomuxc {
-	u-boot,dm-spl;
-};
-
-&osc_24m {
-	u-boot,dm-spl;
-	u-boot,dm-pre-reloc;
-};
-
 &pca6416_0 {
 	compatible = "ti,tca6416";
 };
@@ -106,10 +61,6 @@
 	u-boot,off-on-delay-us = <20000>;
 };
 
-&spba1 {
-	u-boot,dm-spl;
-};
-
 &uart2 {
 	u-boot,dm-spl;
 };
@@ -132,133 +83,6 @@
 	mmc-hs400-enhanced-strobe;
 };
 
-&wdog1 {
-	u-boot,dm-spl;
-};
-
 &pinctrl_wdog {
 	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>;
-		};
-
-		ddr-1d-imem-fw {
-			filename = "lpddr4_pmu_train_1d_imem.bin";
-			type = "blob-ext";
-			align-end = <4>;
-		};
-
-		ddr-1d-dmem-fw {
-			filename = "lpddr4_pmu_train_1d_dmem.bin";
-			type = "blob-ext";
-			align-end = <4>;
-		};
-
-		ddr-2d-imem-fw {
-			filename = "lpddr4_pmu_train_2d_imem.bin";
-			type = "blob-ext";
-			align-end = <4>;
-		};
-
-		ddr-2d-dmem-fw {
-			filename = "lpddr4_pmu_train_2d_dmem.bin";
-			type = "blob-ext";
-			align-end = <4>;
-		};
-	};
-
-
-	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";
-		};
-	};
-};
Signature · 1 line
2.34.1
author
#6 lore raw

PATCH 3/7 arm: dts: imx8mn-bsh-smm-s2: Consolidate with imx8mn-u-boot

In reply to Adam Ford

Now that a unified imx8mn-u-boot is available, remove duplicated code for generating flash.bin and other common imx8mn peripherals.

arch/arm/dts/imx8mn-bsh-smm-s2-u-boot-common.dtsi +1 -171
index c4ae7ca4f3..3967e0bd15 100644
@@ -4,22 +4,7 @@
  * Copyright 2021 BSH Hausgeraete GmbH
  */
 
-/ {
-	binman: binman {
-		multiple-images;
-	};
-
-	wdt-reboot {
-		compatible = "wdt-reboot";
-		wdt = <&wdog1>;
-		u-boot,dm-spl;
-	};
-};
-
-&{/soc@0} {
-	u-boot,dm-pre-reloc;
-	u-boot,dm-spl;
-};
+#include "imx8mn-u-boot.dtsi"
 
 &{/soc@0/bus@30800000/i2c@30a20000/pmic@4b} {
 	u-boot,dm-spl;
@@ -29,27 +14,6 @@
 	u-boot,dm-spl;
 };
 
-&aips1 {
-	u-boot,dm-pre-reloc;
-	u-boot,dm-spl;
-};
-
-&aips3 {
-	u-boot,dm-spl;
-};
-
-&aips4 {
-	u-boot,dm-spl;
-};
-
-&clk {
-	u-boot,dm-pre-reloc;
-	u-boot,dm-spl;
-	/delete-property/ assigned-clocks;
-	/delete-property/ assigned-clock-parents;
-	/delete-property/ assigned-clock-rates;
-};
-
 &gpio1 {
 	u-boot,dm-spl;
 };
@@ -66,15 +30,6 @@
 	u-boot,dm-spl;
 };
 
-&iomuxc {
-	u-boot,dm-spl;
-};
-
-&osc_24m {
-	u-boot,dm-pre-reloc;
-	u-boot,dm-spl;
-};
-
 &pinctrl_i2c1 {
 	u-boot,dm-spl;
 };
@@ -98,128 +53,3 @@
 &wdog1 {
 	u-boot,dm-spl;
 };
-
-&binman {
-	u-boot-spl-ddr {
-		align = <4>;
-		align-size = <4>;
-		filename = "u-boot-spl-ddr.bin";
-		pad-byte = <0xff>;
-
-		u-boot-spl {
-			align-end = <4>;
-			filename = "u-boot-spl.bin";
-		};
-
-		ddr-1d-imem-fw {
-			filename = "ddr3_imem_1d.bin";
-			align-end = <4>;
-			type = "blob-ext";
-		};
-
-		ddr-1d-dmem-fw {
-			filename = "ddr3_dmem_1d.bin";
-			align-end = <4>;
-			type = "blob-ext";
-		};
-	};
-
-	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";
-			fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>;
-			fit,fdt-list = "of-list";
-			#address-cells = <1>;
-
-			images {
-				uboot {
-					arch = "arm64";
-					compression = "none";
-					description = "U-Boot (64-bit)";
-					load = <CONFIG_SYS_TEXT_BASE>;
-					type = "standalone";
-
-					uboot_blob {
-						filename = "u-boot-nodtb.bin";
-						type = "blob-ext";
-					};
-				};
-
-				atf {
-					arch = "arm64";
-					compression = "none";
-					description = "ARM Trusted Firmware";
-					entry = <0x960000>;
-					load = <0x960000>;
-					type = "firmware";
-
-					atf_blob {
-						filename = "bl31.bin";
-						type = "atf-bl31";
-					};
-				};
-
-				binman_fip: fip {
-					arch = "arm64";
-					compression = "none";
-					description = "Trusted Firmware FIP";
-					load = <0x40310000>;
-					type = "firmware";
-				};
-
-				@fdt-SEQ {
-					compression = "none";
-					description = "NAME";
-					type = "flat_dt";
-
-					uboot_fdt_blob {
-						filename = "u-boot.dtb";
-						type = "blob-ext";
-					};
-				};
-			};
-
-			configurations {
-				default = "@config-DEFAULT-SEQ";
-
-				binman_configuration: @config-SEQ {
-					description = "NAME";
-					fdt = "fdt-SEQ";
-					firmware = "uboot";
-					loadables = "atf";
-				};
-			};
-		};
-	};
-
-	imx-boot {
-		filename = "flash.bin";
-		pad-byte = <0x00>;
-
-		spl {
-			filename = "spl.bin";
-			offset = <0x0>;
-			type = "blob-ext";
-		};
-
-		binman_uboot: uboot {
-			filename = "u-boot.itb";
-			offset = <0x58000>;
-			type = "blob-ext";
-		};
-	};
-};
Signature · 1 line
2.34.1
author
#7 lore raw

PATCH 4/7 arm: dts: imx8mn-ddr4-evk: Consolidate with imx8mn-u-boot

In reply to Adam Ford

Now that a unified imx8mn-u-boot is available, remove duplicated code for generating flash.bin and other common imx8mn peripherals.

arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi +1 -179
index 78773c198e..54f3ebe88b 100644
@@ -3,58 +3,7 @@
  * Copyright 2019, 2021 NXP
  */
 
-/ {
-	binman: binman {
-		multiple-images;
-	};
-
-	wdt-reboot {
-		compatible = "wdt-reboot";
-		wdt = <&wdog1>;
-		u-boot,dm-spl;
-	};
-	firmware {
-		optee {
-			compatible = "linaro,optee-tz";
-			method = "smc";
-		};
-	};
-};
-
-&{/soc@0} {
-	u-boot,dm-pre-reloc;
-	u-boot,dm-spl;
-};
-
-&clk {
-	u-boot,dm-spl;
-	u-boot,dm-pre-reloc;
-	/delete-property/ assigned-clocks;
-	/delete-property/ assigned-clock-parents;
-	/delete-property/ assigned-clock-rates;
-};
-
-&osc_24m {
-	u-boot,dm-spl;
-	u-boot,dm-pre-reloc;
-};
-
-&aips1 {
-	u-boot,dm-spl;
-	u-boot,dm-pre-reloc;
-};
-
-&aips2 {
-	u-boot,dm-spl;
-};
-
-&aips3 {
-	u-boot,dm-spl;
-};
-
-&iomuxc {
-	u-boot,dm-spl;
-};
+#include "imx8mn-u-boot.dtsi"
 
 &pinctrl_reg_usdhc2_vmmc {
 	u-boot,dm-spl;
@@ -139,130 +88,3 @@
 	mmc-hs400-1_8v;
 	mmc-hs400-enhanced-strobe;
 };
-
-&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>;
-		};
-
-		ddr-1d-imem-fw {
-			filename = "ddr4_imem_1d_201810.bin";
-			type = "blob-ext";
-			align-end = <4>;
-		};
-
-		ddr-1d-dmem-fw {
-			filename = "ddr4_dmem_1d_201810.bin";
-			type = "blob-ext";
-			align-end = <4>;
-		};
-
-		ddr-2d-imem-fw {
-			filename = "ddr4_imem_2d_201810.bin";
-			type = "blob-ext";
-			align-end = <4>;
-		};
-
-		ddr-2d-dmem-fw {
-			filename = "ddr4_dmem_2d_201810.bin";
-			type = "blob-ext";
-			align-end = <4>;
-		};
-	};
-
-
-	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";
-		};
-	};
-};
Signature · 1 line
2.34.1
author
#8 lore raw

PATCH 5/7 arm: dts: imx8mn-evk: Consolidate with imx8mn-u-boot

In reply to Adam Ford

Now that a unified imx8mn-u-boot is available, remove duplicated code for generating flash.bin and other common imx8mn peripherals.

arch/arm/dts/imx8mn-evk-u-boot.dtsi +0 -108
index c4b83d3f7e..6c6c949f43 100644
@@ -24,111 +24,3 @@
 &pinctrl_pmic {
 	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>;
-		};
-
-		ddr-1d-imem-fw {
-			filename = "lpddr4_pmu_train_1d_imem.bin";
-			type = "blob-ext";
-			align-end = <4>;
-		};
-
-		ddr-1d-dmem-fw {
-			filename = "lpddr4_pmu_train_1d_dmem.bin";
-			type = "blob-ext";
-			align-end = <4>;
-		};
-
-		ddr-2d-imem-fw {
-			filename = "lpddr4_pmu_train_2d_imem.bin";
-			type = "blob-ext";
-			align-end = <4>;
-		};
-
-		ddr-2d-dmem-fw {
-			filename = "lpddr4_pmu_train_2d_dmem.bin";
-			type = "blob-ext";
-			align-end = <4>;
-		};
-	};
-
-
-	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";
-				};
-			};
-		};
-	};
-};
Signature · 1 line
2.34.1
author
#9 lore raw

PATCH 6/7 arm: dts: imx8mn-var-som-symphony: Consolidate with imx8mn-u-boot

In reply to Adam Ford

Now that a unified imx8mn-u-boot is available, remove duplicated code for generating flash.bin and other common imx8mn peripherals.

arch/arm/dts/imx8mn-var-som-symphony-u-boot.dtsi +1 -187
index ed1ab10ded..a20683155c 100644
@@ -3,22 +3,7 @@
  * Copyright 2021 Collabora Ltd.
  */
 
-/ {
-	binman: binman {
-		multiple-images;
-	};
-
-	wdt-reboot {
-		compatible = "wdt-reboot";
-		wdt = <&wdog1>;
-		u-boot,dm-spl;
-	};
-};
-
-&{/soc@0} {
-	u-boot,dm-pre-reloc;
-	u-boot,dm-spl;
-};
+#include "imx8mn-u-boot.dtsi"
 
 &{/soc@0/bus@30800000/i2c@30a20000/pmic@4b} {
 	u-boot,dm-spl;
@@ -28,27 +13,6 @@
 	u-boot,dm-spl;
 };
 
-&aips1 {
-	u-boot,dm-pre-reloc;
-	u-boot,dm-spl;
-};
-
-&aips3 {
-	u-boot,dm-spl;
-};
-
-&aips4 {
-	u-boot,dm-spl;
-};
-
-&clk {
-	u-boot,dm-pre-reloc;
-	u-boot,dm-spl;
-	/delete-property/ assigned-clocks;
-	/delete-property/ assigned-clock-parents;
-	/delete-property/ assigned-clock-rates;
-};
-
 &gpio1 {
 	u-boot,dm-spl;
 };
@@ -65,15 +29,6 @@
 	u-boot,dm-spl;
 };
 
-&iomuxc {
-	u-boot,dm-spl;
-};
-
-&osc_24m {
-	u-boot,dm-pre-reloc;
-	u-boot,dm-spl;
-};
-
 &pinctrl_i2c1 {
 	u-boot,dm-spl;
 };
@@ -113,144 +68,3 @@
 &usdhc3 {
 	u-boot,dm-spl;
 };
-
-&wdog1 {
-	u-boot,dm-spl;
-};
-
-&binman {
-	u-boot-spl-ddr {
-		align = <4>;
-		align-size = <4>;
-		filename = "u-boot-spl-ddr.bin";
-		pad-byte = <0xff>;
-
-		u-boot-spl {
-			align-end = <4>;
-			filename = "u-boot-spl.bin";
-		};
-
-		ddr-1d-imem-fw {
-			filename = "ddr4_imem_1d.bin";
-			align-end = <4>;
-			type = "blob-ext";
-		};
-
-		ddr-1d-dmem-fw {
-			filename = "ddr4_dmem_1d.bin";
-			align-end = <4>;
-			type = "blob-ext";
-		};
-
-		ddr-2d-imem-fw {
-			filename = "ddr4_imem_2d.bin";
-			align-end = <4>;
-			type = "blob-ext";
-		};
-
-		ddr-2d-dmem-fw {
-			filename = "ddr4_dmem_2d.bin";
-			align-end = <4>;
-			type = "blob-ext";
-		};
-	};
-
-	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";
-			fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>;
-			fit,fdt-list = "of-list";
-			#address-cells = <1>;
-
-			images {
-				uboot {
-					arch = "arm64";
-					compression = "none";
-					description = "U-Boot (64-bit)";
-					load = <CONFIG_SYS_TEXT_BASE>;
-					type = "standalone";
-
-					uboot_blob {
-						filename = "u-boot-nodtb.bin";
-						type = "blob-ext";
-					};
-				};
-
-				atf {
-					arch = "arm64";
-					compression = "none";
-					description = "ARM Trusted Firmware";
-					entry = <0x960000>;
-					load = <0x960000>;
-					type = "firmware";
-
-					atf_blob {
-						filename = "bl31.bin";
-						type = "atf-bl31";
-					};
-				};
-
-				binman_fip: fip {
-					arch = "arm64";
-					compression = "none";
-					description = "Trusted Firmware FIP";
-					load = <0x40310000>;
-					type = "firmware";
-				};
-
-				@fdt-SEQ {
-					compression = "none";
-					description = "NAME";
-					type = "flat_dt";
-
-					uboot_fdt_blob {
-						filename = "u-boot.dtb";
-						type = "blob-ext";
-					};
-				};
-			};
-
-			configurations {
-				default = "@config-DEFAULT-SEQ";
-
-				binman_configuration: @config-SEQ {
-					description = "NAME";
-					fdt = "fdt-SEQ";
-					firmware = "uboot";
-					loadables = "atf";
-				};
-			};
-		};
-	};
-
-	imx-boot {
-		filename = "flash.bin";
-		pad-byte = <0x00>;
-
-		spl {
-			filename = "spl.bin";
-			offset = <0x0>;
-			type = "blob-ext";
-		};
-
-		binman_uboot: uboot {
-			filename = "u-boot.itb";
-			offset = <0x58000>;
-			type = "blob-ext";
-		};
-	};
-};
Signature · 1 line
2.34.1
author
#10 lore raw

PATCH 7/7 arm: dts: imx8mn-venice: Consolidate with imx8mn-u-boot

In reply to Adam Ford

Now that a unified imx8mn-u-boot is available, remove duplicated code for generating flash.bin and other common imx8mn peripherals.

arch/arm/dts/imx8mn-venice-u-boot.dtsi +1 -187
index 9fb3871452..aea48f2d79 100644
@@ -3,52 +3,7 @@
  * Copyright 2022 Gateworks Corporation
  */
 
-/ {
-	binman: binman {
-		multiple-images;
-	};
-
-	wdt-reboot {
-		compatible = "wdt-reboot";
-		wdt = <&wdog1>;
-		u-boot,dm-spl;
-	};
-};
-
-&{/soc@0} {
-	u-boot,dm-pre-reloc;
-	u-boot,dm-spl;
-};
-
-&clk {
-	u-boot,dm-spl;
-	u-boot,dm-pre-reloc;
-	/delete-property/ assigned-clocks;
-	/delete-property/ assigned-clock-parents;
-	/delete-property/ assigned-clock-rates;
-};
-
-&osc_24m {
-	u-boot,dm-spl;
-	u-boot,dm-pre-reloc;
-};
-
-&aips1 {
-	u-boot,dm-spl;
-	u-boot,dm-pre-reloc;
-};
-
-&aips2 {
-	u-boot,dm-spl;
-};
-
-&aips3 {
-	u-boot,dm-spl;
-};
-
-&iomuxc {
-	u-boot,dm-spl;
-};
+#include "imx8mn-u-boot.dtsi"
 
 &gpio1 {
 	u-boot,dm-spl;
@@ -106,147 +61,6 @@
 	u-boot,dm-spl;
 };
 
-&wdog1 {
-	u-boot,dm-spl;
-};
-
 &pinctrl_wdog {
 	u-boot,dm-spl;
 };
-
-&binman {
-	u-boot-spl-ddr {
-		align = <4>;
-		align-size = <4>;
-		filename = "u-boot-spl-ddr.bin";
-		pad-byte = <0xff>;
-
-		u-boot-spl {
-			align-end = <4>;
-			filename = "u-boot-spl.bin";
-		};
-
-		ddr-1d-imem-fw {
-			filename = "lpddr4_pmu_train_1d_imem.bin";
-			align-end = <4>;
-			type = "blob-ext";
-		};
-
-		ddr-1d-dmem-fw {
-			filename = "lpddr4_pmu_train_1d_dmem.bin";
-			align-end = <4>;
-			type = "blob-ext";
-		};
-
-		ddr-2d-imem-fw {
-			filename = "lpddr4_pmu_train_2d_imem.bin";
-			align-end = <4>;
-			type = "blob-ext";
-		};
-
-		ddr-2d-dmem-fw {
-			filename = "lpddr4_pmu_train_2d_dmem.bin";
-			align-end = <4>;
-			type = "blob-ext";
-		};
-	};
-
-	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";
-			fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>;
-			fit,fdt-list = "of-list";
-			#address-cells = <1>;
-
-			images {
-				uboot {
-					arch = "arm64";
-					compression = "none";
-					description = "U-Boot (64-bit)";
-					load = <CONFIG_SYS_TEXT_BASE>;
-					type = "standalone";
-
-					uboot_blob {
-						filename = "u-boot-nodtb.bin";
-						type = "blob-ext";
-					};
-				};
-
-				atf {
-					arch = "arm64";
-					compression = "none";
-					description = "ARM Trusted Firmware";
-					entry = <0x960000>;
-					load = <0x960000>;
-					type = "firmware";
-
-					atf_blob {
-						filename = "bl31.bin";
-						type = "blob-ext";
-					};
-				};
-
-				binman_fip: fip {
-					arch = "arm64";
-					compression = "none";
-					description = "Trusted Firmware FIP";
-					load = <0x40310000>;
-					type = "firmware";
-				};
-
-				@fdt-SEQ {
-					compression = "none";
-					description = "NAME";
-					type = "flat_dt";
-
-					uboot_fdt_blob {
-						filename = "u-boot.dtb";
-						type = "blob-ext";
-					};
-				};
-			};
-
-			configurations {
-				default = "@config-DEFAULT-SEQ";
-
-				binman_configuration: @config-SEQ {
-					description = "NAME";
-					fdt = "fdt-SEQ";
-					firmware = "uboot";
-					loadables = "atf";
-				};
-			};
-		};
-	};
-
-	imx-boot {
-		filename = "flash.bin";
-		pad-byte = <0x00>;
-
-		spl {
-			filename = "spl.bin";
-			offset = <0x0>;
-			type = "blob-ext";
-		};
-
-		binman_uboot: uboot {
-			filename = "u-boot.itb";
-			offset = <0x58000>;
-			type = "blob-ext";
-		};
-	};
-};
Signature · 1 line
2.34.1
Reviewed-by Tested-by on the v1 series
#11 lore raw
In reply to Adam Ford
Quoted 29 lines · Adam Ford

Every imx8mn board has a bunch of similar entries on their respective board-u-boot.dtsi file to make the board bootable. Instead of maintaining multiple files with duplicate code, have them all point to a new, common file. This file includes the necessary nodes that were common to nearly all boards and added spba1 to help faciliate SPL_DM_SERIAL. This also adds support for CONFIG_FSPI_CONF_HEADER which can be used to generate flash.bin files for booting from FlexSPI.

Adam Ford (7):
arm: dts: imx8mn-u-boot: Create common imx8mn-u-boot.dtsi
arm: dts: imx8mn-beacon-kit: Consolidate with imx8mn-u-boot
arm: dts: imx8mn-bsh-smm-s2: Consolidate with imx8mn-u-boot
arm: dts: imx8mn-ddr4-evk: Consolidate with imx8mn-u-boot
arm: dts: imx8mn-evk: Consolidate with imx8mn-u-boot
arm: dts: imx8mn-var-som-symphony: Consolidate with imx8mn-u-boot
arm: dts: imx8mn-venice: Consolidate with imx8mn-u-boot

 arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi    | 180 +------------
 .../dts/imx8mn-bsh-smm-s2-u-boot-common.dtsi  | 172 +-----------
 arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi      | 180 +------------
 arch/arm/dts/imx8mn-evk-u-boot.dtsi           | 108 --------
 arch/arm/dts/imx8mn-u-boot.dtsi               | 248 ++++++++++++++++++
 .../dts/imx8mn-var-som-symphony-u-boot.dtsi   | 188 +------------
 arch/arm/dts/imx8mn-venice-u-boot.dtsi        | 188 +------------
 7 files changed, 254 insertions(+), 1010 deletions(-)
 create mode 100644 arch/arm/dts/imx8mn-u-boot.dtsi
Quoted 3 lines

--
2.34.1

Thanks Adam,

For the series:

Best Regards,

Tim

author
#2 lore raw

Re: [PATCH 1/7] arm: dts: imx8mn-u-boot: Create common imx8mn-u-boot.dtsi

In reply to Adam Ford
Quoted 14 lines · Adam Ford

Multiple boards create duplicate entries in their respective -u-boot.dtsi files which all basically do the same thing. To consolidate these and make it easier to make improvements going forward, consolidate them all into one place.

This file creates a flash.bin image using binman, and supports LPDDR4, DDR4 and DDR3. Since individual boards use different peripherals and different UART ports, those entries were kept in their respective board files, but the spba1 node was addded which contains all UART1-3 to help facilitate SPL_DM_SERIAL. Individual users will still need to include their respective UART and pinctrl nodes for those UARTS.

Quoted 4 lines

This consolidated file also supports generating a flash.bin file which can boot from flexSPI if CONFIG_FSPI_CONF_HEADER is enabled.

Fabio / Peng,

Any chance either one of you could review this? This series should fix any Nano boards that cannot boot and currently use DM_SERIAL. after 4e5114daf9eb ("imx8mn: synchronise device tree with linux") which moved the UART nodes under the SPBA node.

thanks

adam

Quoted 263 lines

---
Patches on top of [1]

[1] - https://patchwork.ozlabs.org/project/uboot/patch/[email protected]/

arch/arm/dts/imx8mn-u-boot.dtsi new file +248 -1
new file mode 100644
index 0000000000..327d4070fc
@@ -0,0 +1,248 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright 2022 Logic PD, Inc dba Beacon EmbeddedWorks
+ */
+
+/ {
+       binman: binman {
+               multiple-images;
+       };
+
+       firmware {
+               optee {
+                       compatible = "linaro,optee-tz";
+                       method = "smc";
+               };
+       };
+
+       wdt-reboot {
+               compatible = "wdt-reboot";
+               wdt = <&wdog1>;
+               u-boot,dm-spl;
+       };
+};
+
+&{/soc@0} {
+       u-boot,dm-pre-reloc;
+       u-boot,dm-spl;
+};
+
+&aips1 {
+       u-boot,dm-spl;
+       u-boot,dm-pre-reloc;
+};
+
+&aips2 {
+       u-boot,dm-spl;
+};
+
+&aips3 {
+       u-boot,dm-spl;
+};
+
+&aips4 {
+       u-boot,dm-spl;
+};
+
+&clk {
+       u-boot,dm-spl;
+       u-boot,dm-pre-reloc;
+       /delete-property/ assigned-clocks;
+       /delete-property/ assigned-clock-parents;
+       /delete-property/ assigned-clock-rates;
+};
+
+&iomuxc {
+       u-boot,dm-spl;
+};
+
+&osc_24m {
+       u-boot,dm-spl;
+       u-boot,dm-pre-reloc;
+};
+
+&spba1 {
+       u-boot,dm-spl;
+};
+
+&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>;
+                       filename = "u-boot-spl.bin";
+               };
+
+               ddr-1d-imem-fw {
+#ifdef CONFIG_IMX8M_LPDDR4
+                       filename = "lpddr4_pmu_train_1d_imem.bin";
+#elif CONFIG_IMX8M_DDR4
+                       filename = "ddr4_imem_1d.bin";
+#else
+                       filename = "ddr3_imem_1d.bin";
+#endif
+                       type = "blob-ext";
+                       align-end = <4>;
+               };
+
+               ddr-1d-dmem-fw {
+#ifdef CONFIG_IMX8M_LPDDR4
+                       filename = "lpddr4_pmu_train_1d_dmem.bin";
+#elif CONFIG_IMX8M_DDR4
+                       filename = "ddr4_dmem_1d.bin";
+#else
+                       filename = "ddr3_dmem_1d.bin";
+#endif
+                       type = "blob-ext";
+                       align-end = <4>;
+               };
+
+               ddr-2d-imem-fw {
+#ifdef CONFIG_IMX8M_LPDDR4
+                       filename = "lpddr4_pmu_train_2d_imem.bin";
+#elif CONFIG_IMX8M_DDR4
+                       filename = "ddr4_imem_2d.bin";
+#endif
+                       type = "blob-ext";
+                       align-end = <4>;
+               };
+
+               ddr-2d-dmem-fw {
+#ifdef CONFIG_IMX8M_LPDDR4
+                       filename = "lpddr4_pmu_train_2d_dmem.bin";
+#elif CONFIG_IMX8M_DDR4
+                       filename = "ddr4_dmem_2d.bin";
+#endif
+                       type = "blob-ext";
+                       align-end = <4>;
+               };
+       };
+
+       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";
+                       fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>;
+                       fit,fdt-list = "of-list";
+                       #address-cells = <1>;
+
+                       images {
+                               uboot {
+                                       arch = "arm64";
+                                       compression = "none";
+                                       description = "U-Boot (64-bit)";
+                                       load = <CONFIG_SYS_TEXT_BASE>;
+                                       type = "standalone";
+
+                                       uboot-blob {
+                                               filename = "u-boot-nodtb.bin";
+                                               type = "blob-ext";
+                                       };
+                               };
+
+                               atf {
+                                       arch = "arm64";
+                                       compression = "none";
+                                       description = "ARM Trusted Firmware";
+                                       entry = <0x960000>;
+                                       load = <0x960000>;
+                                       type = "firmware";
+
+                                       atf-blob {
+                                               filename = "bl31.bin";
+                                               type = "atf-bl31";
+                                       };
+                               };
+
+                               binman_fip: fip {
+                                       arch = "arm64";
+                                       compression = "none";
+                                       description = "Trusted Firmware FIP";
+                                       load = <0x40310000>;
+                                       type = "firmware";
+                               };
+
+                               @fdt-SEQ {
+                                       compression = "none";
+                                       description = "NAME";
+                                       type = "flat_dt";
+
+                                       uboot-fdt-blob {
+                                               filename = "u-boot.dtb";
+                                               type = "blob-ext";
+                                       };
+                               };
+                       };
+
+                       configurations {
+                               default = "@config-DEFAULT-SEQ";
+
+                               binman_configuration: @config-SEQ {
+                                       description = "NAME";
+                                       fdt = "fdt-SEQ";
+                                       firmware = "uboot";
+                                       loadables = "atf";
+                               };
+                       };
+               };
+       };
+
+       imx-boot {
+               filename = "flash.bin";
+               pad-byte = <0x00>;
+
+#ifdef CONFIG_FSPI_CONF_HEADER
+               fspi_conf_block {
+                       filename = CONFIG_FSPI_CONF_FILE;
+                       type = "blob-ext";
+                       offset = <0x400>;
+               };
+
+               spl {
+                       filename = "spl.bin";
+                       offset = <0x1000>;
+                       type = "blob-ext";
+               };
+
+               binman_uboot: uboot {
+                       filename = "u-boot.itb";
+                       offset = <0x59000>;
+                       type = "blob-ext";
+               };
+#else
+
+               spl {
+                       offset = <0x0>;
+                       filename = "spl.bin";
+                       type = "blob-ext";
+               };
+
+               binman_uboot: uboot {
+                       offset = <0x58000>;
+                       filename = "u-boot.itb";
+                       type = "blob-ext";
+               };
+#endif
+       };
+};
--

2.34.1

reviewer Reviewed-by on the v1 series
#12 lore raw
In reply to Adam Ford

Hi Adam,

Quoted 10 lines · Adam Ford

Every imx8mn board has a bunch of similar entries on their respective board-u-boot.dtsi file to make the board bootable. Instead of maintaining multiple files with duplicate code, have them all point to a new, common file. This file includes the necessary nodes that were common to nearly all boards and added spba1 to help faciliate SPL_DM_SERIAL. This also adds support for CONFIG_FSPI_CONF_HEADER which can be used to generate flash.bin files for booting from FlexSPI.

Quoted 8 lines

Adam Ford (7):
arm: dts: imx8mn-u-boot: Create common imx8mn-u-boot.dtsi
arm: dts: imx8mn-beacon-kit: Consolidate with imx8mn-u-boot
arm: dts: imx8mn-bsh-smm-s2: Consolidate with imx8mn-u-boot
arm: dts: imx8mn-ddr4-evk: Consolidate with imx8mn-u-boot
arm: dts: imx8mn-evk: Consolidate with imx8mn-u-boot
arm: dts: imx8mn-var-som-symphony: Consolidate with imx8mn-u-boot
arm: dts: imx8mn-venice: Consolidate with imx8mn-u-boot

For the series:

author
#13 lore raw
Quoted 23 lines · Fabio Estevam

Hi Adam,

Quoted 10 lines · Adam Ford

Every imx8mn board has a bunch of similar entries on their respective board-u-boot.dtsi file to make the board bootable. Instead of maintaining multiple files with duplicate code, have them all point to a new, common file. This file includes the necessary nodes that were common to nearly all boards and added spba1 to help faciliate SPL_DM_SERIAL. This also adds support for CONFIG_FSPI_CONF_HEADER which can be used to generate flash.bin files for booting from FlexSPI.

Quoted 8 lines

Adam Ford (7):
arm: dts: imx8mn-u-boot: Create common imx8mn-u-boot.dtsi
arm: dts: imx8mn-beacon-kit: Consolidate with imx8mn-u-boot
arm: dts: imx8mn-bsh-smm-s2: Consolidate with imx8mn-u-boot
arm: dts: imx8mn-ddr4-evk: Consolidate with imx8mn-u-boot
arm: dts: imx8mn-evk: Consolidate with imx8mn-u-boot
arm: dts: imx8mn-var-som-symphony: Consolidate with imx8mn-u-boot
arm: dts: imx8mn-venice: Consolidate with imx8mn-u-boot

Quoted 3 lines

For the series:

Thanks!

Stefano,

If you want me to squash the 1 dependent patch, I can squash it into this series and submit a V2, but getting this series applied should fix a bunch of boards which don't boot properly.

adam

author
#14 lore raw
Quoted 25 lines · Adam Ford
Quoted 23 lines · Fabio Estevam

Hi Adam,

Quoted 18 lines · Adam Ford

Every imx8mn board has a bunch of similar entries on their respective board-u-boot.dtsi file to make the board bootable. Instead of maintaining multiple files with duplicate code, have them all point to a new, common file. This file includes the necessary nodes that were common to nearly all boards and added spba1 to help faciliate SPL_DM_SERIAL. This also adds support for CONFIG_FSPI_CONF_HEADER which can be used to generate flash.bin files for booting from FlexSPI.

Adam Ford (7):
arm: dts: imx8mn-u-boot: Create common imx8mn-u-boot.dtsi
arm: dts: imx8mn-beacon-kit: Consolidate with imx8mn-u-boot
arm: dts: imx8mn-bsh-smm-s2: Consolidate with imx8mn-u-boot
arm: dts: imx8mn-ddr4-evk: Consolidate with imx8mn-u-boot
arm: dts: imx8mn-evk: Consolidate with imx8mn-u-boot
arm: dts: imx8mn-var-som-symphony: Consolidate with imx8mn-u-boot
arm: dts: imx8mn-venice: Consolidate with imx8mn-u-boot

Quoted 4 lines
Quoted 3 lines

For the series:

Stefano,

It's been over a month, and I haven't heard any feedback from you and it doesn't appear this series has been accepted. Without it, Nano boards with DM_SERIAL in SPL won't' boot because of the device tree change which moved the UART's into a subnode. Are you able to apply to this series? As I mentioned before, I can squash the dependent patch into this series and push a V2 if you want. With a pending release in a few weeks, it would be nice to have the Nano boards booting again.

thanks!

adam

Quoted 9 lines

Thanks!

Stefano,

If you want me to squash the 1 dependent patch, I can squash it into this series and submit a V2, but getting this series applied should fix a bunch of boards which don't boot properly.

adam

reviewer Reviewed-by
#3 lore raw

Re: [PATCH 1/7] arm: dts: imx8mn-u-boot: Create common imx8mn-u-boot.dtsi

In reply to Adam Ford

Hi Adam,

Quoted 4 lines · Adam Ford

Any chance either one of you could review this? This series should fix any Nano boards that cannot boot and currently use DM_SERIAL. after 4e5114daf9eb ("imx8mn: synchronise device tree with linux") which moved the UART nodes under the SPBA node.

Sorry for the delay. The series looks good, thanks:

#4 lore raw

Re: [PATCH 1/7] arm: dts: imx8mn-u-boot: Create common imx8mn-u-boot.dtsi

Hi Adam

Quoted 5 lines · Fabio Estevam

Hi Adam,

On Sun, Aug 14, 2022 at 1:32 PM Adam Ford <[email protected]> wrote:

Quoted 8 lines
Quoted 4 lines

Any chance either one of you could review this? This series should fix any Nano boards that cannot boot and currently use DM_SERIAL. after 4e5114daf9eb ("imx8mn: synchronise device tree with linux") which moved the UART nodes under the SPBA node.

Sorry for the delay. The series looks good, thanks:

Thank you for this series ;)

Michael

Signature · 11 lines
Michael Nazzareno Trimarchi
Co-Founder & Chief Executive Officer
M. +39 347 913 2170
[email protected]
__________________________________

Amarula Solutions BV
Joop Geesinkweg 125, 1114 AB, Amsterdam, NL
T. +31 (0)85 111 9172
[email protected]
www.amarulasolutions.com
author
#15 lore raw
In reply to Adam Ford
Quoted 43 lines · Adam Ford
Quoted 25 lines · Adam Ford
Quoted 23 lines · Fabio Estevam

Hi Adam,

Quoted 18 lines · Adam Ford

Every imx8mn board has a bunch of similar entries on their respective board-u-boot.dtsi file to make the board bootable. Instead of maintaining multiple files with duplicate code, have them all point to a new, common file. This file includes the necessary nodes that were common to nearly all boards and added spba1 to help faciliate SPL_DM_SERIAL. This also adds support for CONFIG_FSPI_CONF_HEADER which can be used to generate flash.bin files for booting from FlexSPI.

Adam Ford (7):
arm: dts: imx8mn-u-boot: Create common imx8mn-u-boot.dtsi
arm: dts: imx8mn-beacon-kit: Consolidate with imx8mn-u-boot
arm: dts: imx8mn-bsh-smm-s2: Consolidate with imx8mn-u-boot
arm: dts: imx8mn-ddr4-evk: Consolidate with imx8mn-u-boot
arm: dts: imx8mn-evk: Consolidate with imx8mn-u-boot
arm: dts: imx8mn-var-som-symphony: Consolidate with imx8mn-u-boot
arm: dts: imx8mn-venice: Consolidate with imx8mn-u-boot

Quoted 4 lines
Quoted 3 lines

For the series:

Stefano,

It's been over a month, and I haven't heard any feedback from you and it doesn't appear this series has been accepted. Without it, Nano boards with DM_SERIAL in SPL won't' boot because of the device tree change which moved the UART's into a subnode. Are you able to apply to this series? As I mentioned before, I can squash the dependent patch into this series and push a V2 if you want. With a pending release in a few weeks, it would be nice to have the Nano boards booting again.

Quoted 11 lines

thanks!

adam

Quoted 7 lines

Thanks!

Stefano,

If you want me to squash the 1 dependent patch, I can squash it into this series and submit a V2, but getting this series applied should fix a bunch of boards which don't boot properly.

Stefano,

Gentle nudge on this series. I posted it back in July and several people have responded with positive feedback. Do you think it can be merged?

thanks,

adam

Quoted 2 lines
Quoted 2 lines

adam

#16 lore raw

Hi

Quoted 57 lines · Adam Ford
Quoted 43 lines · Adam Ford
Quoted 25 lines · Adam Ford
Quoted 23 lines · Fabio Estevam

Hi Adam,

Quoted 18 lines · Adam Ford

Every imx8mn board has a bunch of similar entries on their respective board-u-boot.dtsi file to make the board bootable. Instead of maintaining multiple files with duplicate code, have them all point to a new, common file. This file includes the necessary nodes that were common to nearly all boards and added spba1 to help faciliate SPL_DM_SERIAL. This also adds support for CONFIG_FSPI_CONF_HEADER which can be used to generate flash.bin files for booting from FlexSPI.

Adam Ford (7):
arm: dts: imx8mn-u-boot: Create common imx8mn-u-boot.dtsi
arm: dts: imx8mn-beacon-kit: Consolidate with imx8mn-u-boot
arm: dts: imx8mn-bsh-smm-s2: Consolidate with imx8mn-u-boot
arm: dts: imx8mn-ddr4-evk: Consolidate with imx8mn-u-boot
arm: dts: imx8mn-evk: Consolidate with imx8mn-u-boot
arm: dts: imx8mn-var-som-symphony: Consolidate with imx8mn-u-boot
arm: dts: imx8mn-venice: Consolidate with imx8mn-u-boot

Quoted 4 lines
Quoted 3 lines

For the series:

Stefano,

It's been over a month, and I haven't heard any feedback from you and it doesn't appear this series has been accepted. Without it, Nano boards with DM_SERIAL in SPL won't' boot because of the device tree change which moved the UART's into a subnode. Are you able to apply to this series? As I mentioned before, I can squash the dependent patch into this series and push a V2 if you want. With a pending release in a few weeks, it would be nice to have the Nano boards booting again.

Quoted 11 lines

thanks!

adam

Quoted 7 lines

Thanks!

Stefano,

If you want me to squash the 1 dependent patch, I can squash it into this series and submit a V2, but getting this series applied should fix a bunch of boards which don't boot properly.

Quoted 6 lines

Stefano,

Gentle nudge on this series. I posted it back in July and several people have responded with positive feedback. Do you think it can be merged?

It should. Can they need to be rebased?

Michael

Quoted 6 lines

thanks,

adam

Quoted 2 lines
Quoted 2 lines

adam

Signature · 11 lines
Michael Nazzareno Trimarchi
Co-Founder & Chief Executive Officer
M. +39 347 913 2170
[email protected]
__________________________________

Amarula Solutions BV
Joop Geesinkweg 125, 1114 AB, Amsterdam, NL
T. +31 (0)85 111 9172
[email protected]
www.amarulasolutions.com
#17 lore raw
In reply to Adam Ford

Hi Adam,

Quoted 56 lines · Adam Ford
Quoted 43 lines · Adam Ford
Quoted 25 lines · Adam Ford
Quoted 23 lines · Fabio Estevam

Hi Adam,

Quoted 18 lines · Adam Ford

Every imx8mn board has a bunch of similar entries on their respective board-u-boot.dtsi file to make the board bootable. Instead of maintaining multiple files with duplicate code, have them all point to a new, common file. This file includes the necessary nodes that were common to nearly all boards and added spba1 to help faciliate SPL_DM_SERIAL. This also adds support for CONFIG_FSPI_CONF_HEADER which can be used to generate flash.bin files for booting from FlexSPI.

Adam Ford (7):
arm: dts: imx8mn-u-boot: Create common imx8mn-u-boot.dtsi
arm: dts: imx8mn-beacon-kit: Consolidate with imx8mn-u-boot
arm: dts: imx8mn-bsh-smm-s2: Consolidate with imx8mn-u-boot
arm: dts: imx8mn-ddr4-evk: Consolidate with imx8mn-u-boot
arm: dts: imx8mn-evk: Consolidate with imx8mn-u-boot
arm: dts: imx8mn-var-som-symphony: Consolidate with imx8mn-u-boot
arm: dts: imx8mn-venice: Consolidate with imx8mn-u-boot

Quoted 4 lines
Quoted 3 lines

For the series:

Stefano,

It's been over a month, and I haven't heard any feedback from you and it doesn't appear this series has been accepted. Without it, Nano boards with DM_SERIAL in SPL won't' boot because of the device tree change which moved the UART's into a subnode. Are you able to apply to this series? As I mentioned before, I can squash the dependent patch into this series and push a V2 if you want. With a pending release in a few weeks, it would be nice to have the Nano boards booting again.

Quoted 11 lines

thanks!

adam

Quoted 7 lines

Thanks!

Stefano,

If you want me to squash the 1 dependent patch, I can squash it into this series and submit a V2, but getting this series applied should fix a bunch of boards which don't boot properly.

Quoted 6 lines

Stefano,

Gentle nudge on this series. I posted it back in July and several people have responded with positive feedback. Do you think it can be merged?

I have applied a second bunch of patches, this will be in the third one. However, I have fixed a couple of small things during first merge. I cannot apply them clean, can you check and rebase on top of u-boot-imx ? Thanks !

Stefano

Quoted 6 lines

thanks,

adam

Quoted 2 lines
Quoted 2 lines

adam

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, 82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected]
=====================================================================
author
#18 lore raw
Quoted 67 lines · Stefano Babic

Hi Adam,

Quoted 56 lines · Adam Ford
Quoted 43 lines · Adam Ford
Quoted 25 lines · Adam Ford
Quoted 23 lines · Fabio Estevam

Hi Adam,

Quoted 18 lines · Adam Ford

Every imx8mn board has a bunch of similar entries on their respective board-u-boot.dtsi file to make the board bootable. Instead of maintaining multiple files with duplicate code, have them all point to a new, common file. This file includes the necessary nodes that were common to nearly all boards and added spba1 to help faciliate SPL_DM_SERIAL. This also adds support for CONFIG_FSPI_CONF_HEADER which can be used to generate flash.bin files for booting from FlexSPI.

Adam Ford (7):
arm: dts: imx8mn-u-boot: Create common imx8mn-u-boot.dtsi
arm: dts: imx8mn-beacon-kit: Consolidate with imx8mn-u-boot
arm: dts: imx8mn-bsh-smm-s2: Consolidate with imx8mn-u-boot
arm: dts: imx8mn-ddr4-evk: Consolidate with imx8mn-u-boot
arm: dts: imx8mn-evk: Consolidate with imx8mn-u-boot
arm: dts: imx8mn-var-som-symphony: Consolidate with imx8mn-u-boot
arm: dts: imx8mn-venice: Consolidate with imx8mn-u-boot

Quoted 4 lines
Quoted 3 lines

For the series:

Stefano,

It's been over a month, and I haven't heard any feedback from you and it doesn't appear this series has been accepted. Without it, Nano boards with DM_SERIAL in SPL won't' boot because of the device tree change which moved the UART's into a subnode. Are you able to apply to this series? As I mentioned before, I can squash the dependent patch into this series and push a V2 if you want. With a pending release in a few weeks, it would be nice to have the Nano boards booting again.

Quoted 11 lines

thanks!

adam

Quoted 7 lines

Thanks!

Stefano,

If you want me to squash the 1 dependent patch, I can squash it into this series and submit a V2, but getting this series applied should fix a bunch of boards which don't boot properly.

Quoted 6 lines

Stefano,

Gentle nudge on this series. I posted it back in July and several people have responded with positive feedback. Do you think it can be merged?

Quoted 4 lines

I have applied a second bunch of patches, this will be in the third one. However, I have fixed a couple of small things during first merge. I cannot apply them clean, can you check and rebase on top of u-boot-imx ? Thanks !

Yes, I'll send out a V2 rebased this afternoon

adam

Quoted 17 lines

Stefano

Quoted 6 lines

thanks,

adam

Quoted 2 lines
Quoted 2 lines

adam

--
=====================================================================
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, 82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected]
=====================================================================

#19 lore raw
Quoted 68 lines · Adam Ford
Quoted 67 lines · Stefano Babic

Hi Adam,

Quoted 62 lines · Adam Ford
Quoted 43 lines · Adam Ford
Quoted 25 lines · Adam Ford
Quoted 23 lines · Fabio Estevam

Hi Adam,

Quoted 18 lines · Adam Ford

Every imx8mn board has a bunch of similar entries on their respective board-u-boot.dtsi file to make the board bootable. Instead of maintaining multiple files with duplicate code, have them all point to a new, common file. This file includes the necessary nodes that were common to nearly all boards and added spba1 to help faciliate SPL_DM_SERIAL. This also adds support for CONFIG_FSPI_CONF_HEADER which can be used to generate flash.bin files for booting from FlexSPI.

Adam Ford (7):
arm: dts: imx8mn-u-boot: Create common imx8mn-u-boot.dtsi
arm: dts: imx8mn-beacon-kit: Consolidate with imx8mn-u-boot
arm: dts: imx8mn-bsh-smm-s2: Consolidate with imx8mn-u-boot
arm: dts: imx8mn-ddr4-evk: Consolidate with imx8mn-u-boot
arm: dts: imx8mn-evk: Consolidate with imx8mn-u-boot
arm: dts: imx8mn-var-som-symphony: Consolidate with imx8mn-u-boot
arm: dts: imx8mn-venice: Consolidate with imx8mn-u-boot

Quoted 4 lines
Quoted 3 lines

For the series:

Stefano,

It's been over a month, and I haven't heard any feedback from you and it doesn't appear this series has been accepted. Without it, Nano boards with DM_SERIAL in SPL won't' boot because of the device tree change which moved the UART's into a subnode. Are you able to apply to this series? As I mentioned before, I can squash the dependent patch into this series and push a V2 if you want. With a pending release in a few weeks, it would be nice to have the Nano boards booting again.

Quoted 11 lines

thanks!

adam

Quoted 7 lines

Thanks!

Stefano,

If you want me to squash the 1 dependent patch, I can squash it into this series and submit a V2, but getting this series applied should fix a bunch of boards which don't boot properly.

Stefano,

Gentle nudge on this series. I posted it back in July and several people have responded with positive feedback. Do you think it can be merged?

Quoted 6 lines
Quoted 4 lines

I have applied a second bunch of patches, this will be in the third one. However, I have fixed a couple of small things during first merge. I cannot apply them clean, can you check and rebase on top of u-boot-imx ? Thanks !

Yes, I'll send out a V2 rebased this afternoon

Thanks, CI is testing.

Stefano

Quoted 19 lines

adam

Quoted 17 lines

Stefano

Quoted 6 lines

thanks,

adam

Quoted 2 lines
Quoted 2 lines

adam

--
=====================================================================
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, 82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected]
=====================================================================

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, 82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected]
=====================================================================