Skip to contentSkip to conversation

ARM: imx: imx8mn-evk: use one common u-boot.dtsi for the evk boards

PATCH New Heiko Thiery 1 participant 2 messages Jun 26, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v3 1/2 ARM: imx: imx8mn-evk: use one common u-boot.dtsi for the evk boards

To have only one place to describe the common parts for all imx8mn evk boards move this parts to imx8mn-evk-common-u-boot.dtsi.
To support the different DDR firmwares this nodes are included dependent on the used DDR config option.

---
v3:
- change name to imx8mn-evk-common-u-boot.dtsi
v2:
- sync with current master and fix merge conflict

 arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi   | 260 +------------------
 arch/arm/dts/imx8mn-evk-common-u-boot.dtsi | 286 +++++++++++++++++++++
 arch/arm/dts/imx8mn-evk-u-boot.dtsi        | 106 +-------
 3 files changed, 288 insertions(+), 364 deletions(-)
 create mode 100644 arch/arm/dts/imx8mn-evk-common-u-boot.dtsi
arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi +1 -259
index 4d0ecb07d4..a31e090391 100644
@@ -3,262 +3,4 @@
  * 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;
-};
-
-&pinctrl_reg_usdhc2_vmmc {
-	u-boot,dm-spl;
-};
-
-&reg_usdhc2_vmmc {
-	u-boot,off-on-delay-us = <20000>;
-};
-
-&pinctrl_uart2 {
-	u-boot,dm-spl;
-};
-
-&pinctrl_usdhc2_gpio {
-	u-boot,dm-spl;
-};
-
-&pinctrl_usdhc2 {
-	u-boot,dm-spl;
-};
-
-&pinctrl_usdhc3 {
-	u-boot,dm-spl;
-};
-
-&pinctrl_wdog {
-	u-boot,dm-spl;
-};
-
-&gpio1 {
-	u-boot,dm-spl;
-};
-
-&gpio2 {
-	u-boot,dm-spl;
-};
-
-&gpio3 {
-	u-boot,dm-spl;
-};
-
-&gpio4 {
-	u-boot,dm-spl;
-};
-
-&gpio5 {
-	u-boot,dm-spl;
-};
-
-&uart2 {
-	u-boot,dm-spl;
-};
-
-&crypto {
-	u-boot,dm-spl;
-};
-
-&sec_jr0 {
-	u-boot,dm-spl;
-};
-
-&sec_jr1 {
-	u-boot,dm-spl;
-};
-
-&sec_jr2 {
-	u-boot,dm-spl;
-};
-
-&usdhc1 {
-	u-boot,dm-spl;
-};
-
-&usdhc2 {
-	u-boot,dm-spl;
-	sd-uhs-sdr104;
-	sd-uhs-ddr50;
-};
-
-&usdhc3 {
-	u-boot,dm-spl;
-	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>;
-		};
-
-		blob_1: blob-ext@1 {
-			filename = "ddr4_imem_1d_201810.bin";
-			size = <0x8000>;
-		};
-
-		blob_2: blob-ext@2 {
-			filename = "ddr4_dmem_1d_201810.bin";
-			size = <0x4000>;
-		};
-
-		blob_3: blob-ext@3 {
-			filename = "ddr4_imem_2d_201810.bin";
-			size = <0x8000>;
-		};
-
-		blob_4: blob-ext@4 {
-			filename = "ddr4_dmem_2d_201810.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";
-		};
-	};
-};
+#include "imx8mn-evk-common-u-boot.dtsi"
arch/arm/dts/imx8mn-evk-common-u-boot.dtsi new file +286 -0

286 lines not on this page · raw message

arch/arm/dts/imx8mn-evk-u-boot.dtsi +1 -105

115 lines not on this page · raw message

Signature · 1 line
2.30.2
#1 lore raw

PATCH v3 2/2 ARM: imx: imx8mn-evk-common-u-boot.dtsi: cleanup

This cleanup implements several review comments and its target is to prepare for a common imx8mn-common-u-boot.dtsi for all imx8mn boards. It includes changes in node names to use only dashes instead of underscores, improve the odd bloob-ext naming, use the atf-bl31 type and the use of of-list for multiple DTB support.

---
 arch/arm/dts/imx8mn-evk-common-u-boot.dtsi | 48 ++++++++++++++--------
 1 file changed, 31 insertions(+), 17 deletions(-)
arch/arm/dts/imx8mn-evk-common-u-boot.dtsi +31 -17
index d5ea2dcb4e..f512be095c 100644
@@ -153,44 +153,52 @@
 		};
 
 #ifdef CONFIG_IMX8M_DDR4
-		blob_1: blob-ext@1 {
+		1d-imem {
 			filename = "ddr4_imem_1d_201810.bin";
 			size = <0x8000>;
+			type = "blob-ext";
 		};
 
-		blob_2: blob-ext@2 {
+		1d-dmem {
 			filename = "ddr4_dmem_1d_201810.bin";
 			size = <0x4000>;
+			type = "blob-ext";
 		};
 
-		blob_3: blob-ext@3 {
+		2d-imem {
 			filename = "ddr4_imem_2d_201810.bin";
 			size = <0x8000>;
+			type = "blob-ext";
 		};
 
-		blob_4: blob-ext@4 {
+		2d-dmem {
 			filename = "ddr4_dmem_2d_201810.bin";
 			size = <0x4000>;
+			type = "blob-ext";
 		};
 #elif CONFIG_IMX8M_LPDDR4
-		blob_1: blob-ext@1 {
+		1d-imem {
 			filename = "lpddr4_pmu_train_1d_imem.bin";
 			size = <0x8000>;
+			type = "blob-ext";
 		};
 
-		blob_2: blob-ext@2 {
+		1d-dmem {
 			filename = "lpddr4_pmu_train_1d_dmem.bin";
 			size = <0x4000>;
+			type = "blob-ext";
 		};
 
-		blob_3: blob-ext@3 {
+		2d-imem {
 			filename = "lpddr4_pmu_train_2d_imem.bin";
 			size = <0x8000>;
+			type = "blob-ext";
 		};
 
-		blob_4: blob-ext@4 {
+		2d-dmem {
 			filename = "lpddr4_pmu_train_2d_dmem.bin";
 			size = <0x4000>;
+			type = "blob-ext";
 		};
 #else
 	#error "no valid ddr config selected"
@@ -216,6 +224,7 @@
 		fit {
 			description = "Configuration to load ATF before U-Boot";
 			#address-cells = <1>;
+			fit,fdt-list = "of-list";
 			fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>;
 
 			images {
@@ -226,8 +235,9 @@
 					compression = "none";
 					load = <CONFIG_SYS_TEXT_BASE>;
 
-					uboot_blob: blob-ext {
+					uboot-blob {
 						filename = "u-boot-nodtb.bin";
+						type = "blob-ext";
 					};
 				};
 
@@ -239,30 +249,32 @@
 					load = <0x960000>;
 					entry = <0x960000>;
 
-					atf_blob: blob-ext {
+					atf-blob {
 						filename = "bl31.bin";
+						type = "atf-bl31";
 					};
 				};
 
-				fdt {
+				@fdt-SEQ {
 					description = "NAME";
 					type = "flat_dt";
 					compression = "none";
 
-					uboot_fdt_blob: blob-ext {
+					uboot-fdt-blob {
 						filename = "u-boot.dtb";
+						type = "blob-ext";
 					};
 				};
 			};
 
 			configurations {
-				default = "conf";
+				default = "@config-DEFAULT-SEQ";
 
-				conf {
+				binman_configuration: @config-SEQ {
 					description = "NAME";
 					firmware = "uboot";
 					loadables = "atf";
-					fdt = "fdt";
+					fdt = "fdt-SEQ";
 				};
 			};
 		};
@@ -272,14 +284,16 @@
 		filename = "flash.bin";
 		pad-byte = <0x00>;
 
-		spl: blob-ext@1 {
+		spl {
 			offset = <0x0>;
 			filename = "spl.bin";
+			type = "blob-ext";
 		};
 
-		uboot: blob-ext@2 {
+		binman_uboot: uboot {
 			offset = <0x58000>;
 			filename = "u-boot.itb";
+			type = "blob-ext";
 		};
 	};
 };
Signature · 1 line
2.30.2