public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
* [PATCH 1/2] imx8mm-kontron-n801x-s-u-boot.dtsi: Update for common imx8mm-u-boot.dtsi
@ 2022-01-07 21:21 Tom Rini
  2022-01-07 21:21 ` [PATCH 2/2] phycore-imx8mm-u-boot.dtsi: " Tom Rini
  2022-01-07 21:23 ` [PATCH 1/2] imx8mm-kontron-n801x-s-u-boot.dtsi: " Fabio Estevam
  0 siblings, 2 replies; 4+ messages in thread
From: Tom Rini @ 2022-01-07 21:21 UTC (permalink / raw)
  To: u-boot; +Cc: Frieder Schrempf

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 <frieder.schrempf@kontron.de>
Signed-off-by: Tom Rini <trini@konsulko.com>
---
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(-)

diff --git a/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi
index 5e368a61bc9f..cf7212748cf6 100644
--- a/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi
+++ b/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi
@@ -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";
 
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [PATCH 2/2] phycore-imx8mm-u-boot.dtsi: Update for common imx8mm-u-boot.dtsi
  2022-01-07 21:21 [PATCH 1/2] imx8mm-kontron-n801x-s-u-boot.dtsi: Update for common imx8mm-u-boot.dtsi Tom Rini
@ 2022-01-07 21:21 ` Tom Rini
  2022-01-07 21:23 ` [PATCH 1/2] imx8mm-kontron-n801x-s-u-boot.dtsi: " Fabio Estevam
  1 sibling, 0 replies; 4+ messages in thread
From: Tom Rini @ 2022-01-07 21:21 UTC (permalink / raw)
  To: u-boot; +Cc: Teresa Remmet

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 <t.remmet@phytec.de>
Signed-off-by: Tom Rini <trini@konsulko.com>
---
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(-)

diff --git a/arch/arm/dts/phycore-imx8mm-u-boot.dtsi b/arch/arm/dts/phycore-imx8mm-u-boot.dtsi
index f842e02c771b..7c2dfb4a273c 100644
--- a/arch/arm/dts/phycore-imx8mm-u-boot.dtsi
+++ b/arch/arm/dts/phycore-imx8mm-u-boot.dtsi
@@ -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>;
-		};
-	};
-};
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH 1/2] imx8mm-kontron-n801x-s-u-boot.dtsi: Update for common imx8mm-u-boot.dtsi
  2022-01-07 21:21 [PATCH 1/2] imx8mm-kontron-n801x-s-u-boot.dtsi: Update for common imx8mm-u-boot.dtsi Tom Rini
  2022-01-07 21:21 ` [PATCH 2/2] phycore-imx8mm-u-boot.dtsi: " Tom Rini
@ 2022-01-07 21:23 ` Fabio Estevam
  2022-01-07 22:37   ` Tom Rini
  1 sibling, 1 reply; 4+ messages in thread
From: Fabio Estevam @ 2022-01-07 21:23 UTC (permalink / raw)
  To: Tom Rini, Adam Ford; +Cc: U-Boot-Denx, Frieder Schrempf

On Fri, Jan 7, 2022 at 6:21 PM Tom Rini <trini@konsulko.com> wrote:
>
> 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 <frieder.schrempf@kontron.de>
> Signed-off-by: Tom Rini <trini@konsulko.com>
> ---
> 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.

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH 1/2] imx8mm-kontron-n801x-s-u-boot.dtsi: Update for common imx8mm-u-boot.dtsi
  2022-01-07 21:23 ` [PATCH 1/2] imx8mm-kontron-n801x-s-u-boot.dtsi: " Fabio Estevam
@ 2022-01-07 22:37   ` Tom Rini
  0 siblings, 0 replies; 4+ messages in thread
From: Tom Rini @ 2022-01-07 22:37 UTC (permalink / raw)
  To: Fabio Estevam; +Cc: Adam Ford, U-Boot-Denx, Frieder Schrempf

[-- Attachment #1: Type: text/plain, Size: 836 bytes --]

On Fri, Jan 07, 2022 at 06:23:25PM -0300, Fabio Estevam wrote:
> On Fri, Jan 7, 2022 at 6:21 PM Tom Rini <trini@konsulko.com> wrote:
> >
> > 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 <frieder.schrempf@kontron.de>
> > Signed-off-by: Tom Rini <trini@konsulko.com>
> > ---
> > 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.

Ah good, I'll grab his versions.

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2022-01-07 22:37 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-01-07 21:21 [PATCH 1/2] imx8mm-kontron-n801x-s-u-boot.dtsi: Update for common imx8mm-u-boot.dtsi Tom Rini
2022-01-07 21:21 ` [PATCH 2/2] phycore-imx8mm-u-boot.dtsi: " Tom Rini
2022-01-07 21:23 ` [PATCH 1/2] imx8mm-kontron-n801x-s-u-boot.dtsi: " Fabio Estevam
2022-01-07 22:37   ` Tom Rini

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox