Skip to contentSkip to conversation

imx8mm-kontron-n801x-s-u-boot.dtsi: Update for common imx8mm-u-boot.dtsi

PATCH In review Tom Rini 2 participants 4 messages Jan 7, 2022

Subsystems (2)
lore
Share & tools
lore

Tom Rini

author
#0 lore raw

PATCH 1/2 imx8mm-kontron-n801x-s-u-boot.dtsi: Update for common imx8mm-u-boot.dtsi

Now that we have the common binman section information included in mx8mm-u-boot.dtsi we must exclude them from the board dts files. Update this to remove the now duplicate information.

Cc Frieder Schrempf <[email protected]>

---
This is based on having all of
https://patchwork.ozlabs.org/bundle/trini/2022-01-07-imx8-and-binman-updates/
applied which includes
https://patchwork.ozlabs.org/project/uboot/list/?series=268510 and so has the common imx8mm-u-boot.dtsi file in question.

---
 .../dts/imx8mm-kontron-n801x-s-u-boot.dtsi    | 120 ------------------
 1 file changed, 120 deletions(-)
arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi +0 -120
index 5e368a61bc9f..cf7212748cf6 100644
@@ -11,10 +11,6 @@
 		usb1 = &usbotg2;
 	};
 
-	binman: binman {
-		multiple-images;
-	};
-
 	wdt-reboot {
 		compatible = "wdt-reboot";
 		wdt = <&wdog1>;
@@ -132,122 +128,6 @@
 };
 
 &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 0x7e1000";
-
-			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 = <0x920000>;
-					entry = <0x920000>;
-
-					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 = <0x57c00>;
-			filename = "u-boot.itb";
-		};
-	};
-
 	u-boot-update {
 		filename = "firmware-update.itb";
 
Signature · 1 line
2.25.1
author
#1 lore raw

PATCH 2/2 phycore-imx8mm-u-boot.dtsi: Update for common imx8mm-u-boot.dtsi

Now that we have the common binman section information included in mx8mm-u-boot.dtsi we must exclude them from the board dts files. Update this to remove the now duplicate information.

Cc Teresa Remmet <[email protected]>

---
This is based on having all of
https://patchwork.ozlabs.org/bundle/trini/2022-01-07-imx8-and-binman-updates/
applied which includes
https://patchwork.ozlabs.org/project/uboot/list/?series=268510 and so has the common imx8mm-u-boot.dtsi file in question.

---
 arch/arm/dts/phycore-imx8mm-u-boot.dtsi | 122 ------------------------
 1 file changed, 122 deletions(-)
arch/arm/dts/phycore-imx8mm-u-boot.dtsi +0 -122
index f842e02c771b..7c2dfb4a273c 100644
@@ -7,10 +7,6 @@
 #include "imx8mm-u-boot.dtsi"
 
 / {
-	binman: binman {
-		multiple-images;
-	};
-
 	wdt-reboot {
 		compatible = "wdt-reboot";
 		wdt = <&wdog1>;
@@ -73,121 +69,3 @@
 &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 0x7e1000";
-
-			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 = <0x920000>;
-					entry = <0x920000>;
-
-					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 {
-			filename = "spl.bin";
-			offset = <0x0>;
-		};
-
-		uboot: blob-ext@2 {
-			filename = "u-boot.itb";
-			offset = <0x57c00>;
-		};
-	};
-};
Signature · 1 line
2.25.1
reviewer
#2 lore raw
In reply to Tom Rini
Quoted 5 lines · Tom Rini

Now that we have the common binman section information included in mx8mm-u-boot.dtsi we must exclude them from the board dts files. Update this to remove the now duplicate information.

Quoted 8 lines
Cc Frieder Schrempf <[email protected]>

---
This is based on having all of
https://patchwork.ozlabs.org/bundle/trini/2022-01-07-imx8-and-binman-updates/
applied which includes
https://patchwork.ozlabs.org/project/uboot/list/?series=268510 and so has the common imx8mm-u-boot.dtsi file in question.

Adam has just submitted these two fixes.

author
#3 lore raw
Quoted 15 lines · Fabio Estevam
Quoted 5 lines · Tom Rini

Now that we have the common binman section information included in mx8mm-u-boot.dtsi we must exclude them from the board dts files. Update this to remove the now duplicate information.

Quoted 8 lines
Cc Frieder Schrempf <[email protected]>

---
This is based on having all of
https://patchwork.ozlabs.org/bundle/trini/2022-01-07-imx8-and-binman-updates/
applied which includes
https://patchwork.ozlabs.org/project/uboot/list/?series=268510 and so has the common imx8mm-u-boot.dtsi file in question.

Quoted 1 line

Adam has just submitted these two fixes.

Ah good, I'll grab his versions.

Signature · 1 line
Tom