[PATCH 0/4] arm64: imx8mq/imx8mm: cleanup binman configuration

[PATCH 0/4] arm64: imx8mq/imx8mm: cleanup binman configuration

[Patrick Wildt]

The i.MX8MM boards have been converted for some longer time compared
to i.MX8MQ.  During that time the i.MX8MM binman configuration has
already gotten some cleanup.  This brings the i.MX8MQ binman config
in line with the i.MX8MM one, and fixes a typo in the i.MX8MM config.

Patrick Wildt (4):
  arm64: dts: imx8mq-u-boot.dtsi: alphabetically re-order properties
  arm64: dts: imx8mq-u-boot.dtsi: explicitly add spl filename
  arm64: dts: imx8mm-u-boot.dtsi: fix typo in ddr blob name
  arm64: dts: imx8mq-u-boot.dtsi: improve odd blob-ext naming

 arch/arm/dts/imx8mm-u-boot.dtsi |  2 +-
 arch/arm/dts/imx8mq-u-boot.dtsi | 57 +++++++++++++++++++--------------
 2 files changed, 34 insertions(+), 25 deletions(-)

-- 
2.34.1

[PATCH 1/4] arm64: dts: imx8mq-u-boot.dtsi: alphabetically re-order properties

[Patrick Wildt]

Alphabetically re-order properties.

Signed-off-by: Patrick Wildt <patrick@blueri.se>
---
 arch/arm/dts/imx8mq-u-boot.dtsi | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/arch/arm/dts/imx8mq-u-boot.dtsi b/arch/arm/dts/imx8mq-u-boot.dtsi
index 8a6075c77b..d8208ae7b0 100644
--- a/arch/arm/dts/imx8mq-u-boot.dtsi
+++ b/arch/arm/dts/imx8mq-u-boot.dtsi
@@ -12,10 +12,10 @@
 
 &binman {
 	u-boot-spl-ddr {
+		align = <4>;
+		align-size = <4>;
 		filename = "u-boot-spl-ddr.bin";
 		pad-byte = <0xff>;
-		align-size = <4>;
-		align = <4>;
 
 		u-boot-spl {
 			align-end = <4>;
@@ -69,16 +69,16 @@
 
 		fit {
 			description = "Configuration to load ATF before U-Boot";
-			#address-cells = <1>;
 			fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>;
+			#address-cells = <1>;
 
 			images {
 				uboot {
-					description = "U-Boot (64-bit)";
-					type = "standalone";
 					arch = "arm64";
 					compression = "none";
+					description = "U-Boot (64-bit)";
 					load = <CONFIG_SYS_TEXT_BASE>;
+					type = "standalone";
 
 					uboot_blob: blob-ext {
 						filename = "u-boot-nodtb.bin";
@@ -86,12 +86,12 @@
 				};
 
 				atf {
-					description = "ARM Trusted Firmware";
-					type = "firmware";
 					arch = "arm64";
 					compression = "none";
-					load = <0x910000>;
+					description = "ARM Trusted Firmware";
 					entry = <0x910000>;
+					load = <0x910000>;
+					type = "firmware";
 
 					atf_blob: blob-ext {
 						filename = "bl31.bin";
@@ -99,9 +99,9 @@
 				};
 
 				fdt {
+					compression = "none";
 					description = "NAME";
 					type = "flat_dt";
-					compression = "none";
 
 					uboot_fdt_blob: blob-ext {
 						filename = "u-boot.dtb";
@@ -114,9 +114,9 @@
 
 				conf {
 					description = "NAME";
+					fdt = "fdt";
 					firmware = "uboot";
 					loadables = "atf";
-					fdt = "fdt";
 				};
 			};
 		};
@@ -127,13 +127,13 @@
 		pad-byte = <0x00>;
 
 		spl: blob-ext@1 {
-			offset = <0x0>;
 			filename = "spl.bin";
+			offset = <0x0>;
 		};
 
 		uboot: blob-ext@2 {
-			offset = <0x57c00>;
 			filename = "u-boot.itb";
+			offset = <0x57c00>;
 		};
 	};
 };
-- 
2.34.1

[PATCH 2/4] arm64: dts: imx8mq-u-boot.dtsi: explicitly add spl filename

[Patrick Wildt]

Explicitly add SPL aka u-boot-spl.bin filename.

Signed-off-by: Patrick Wildt <patrick@blueri.se>
---
 arch/arm/dts/imx8mq-u-boot.dtsi | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/dts/imx8mq-u-boot.dtsi b/arch/arm/dts/imx8mq-u-boot.dtsi
index d8208ae7b0..566b8b8035 100644
--- a/arch/arm/dts/imx8mq-u-boot.dtsi
+++ b/arch/arm/dts/imx8mq-u-boot.dtsi
@@ -19,6 +19,7 @@
 
 		u-boot-spl {
 			align-end = <4>;
+			filename = "u-boot-spl.bin";
 		};
 
 		blob_1: blob-ext@1 {
-- 
2.34.1

[PATCH 3/4] arm64: dts: imx8mm-u-boot.dtsi: fix typo in ddr blob name

[Patrick Wildt]

One of the blobs was named using a hyphen instead of an underscore,
so make it consistent.

Signed-off-by: Patrick Wildt <patrick@blueri.se>
---
 arch/arm/dts/imx8mm-u-boot.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/dts/imx8mm-u-boot.dtsi b/arch/arm/dts/imx8mm-u-boot.dtsi
index 7882fe7316..cc022d46c9 100644
--- a/arch/arm/dts/imx8mm-u-boot.dtsi
+++ b/arch/arm/dts/imx8mm-u-boot.dtsi
@@ -39,7 +39,7 @@
 			filename = "u-boot-spl.bin";
 		};
 
-		1d-imem {
+		1d_imem {
 			filename = "lpddr4_pmu_train_1d_imem.bin";
 			size = <0x8000>;
 			type = "blob-ext";
-- 
2.34.1

Re: [PATCH 3/4] arm64: dts: imx8mm-u-boot.dtsi: fix typo in ddr blob name

[Michael Walle]

Hi,

> --- a/arch/arm/dts/imx8mm-u-boot.dtsi
> +++ b/arch/arm/dts/imx8mm-u-boot.dtsi
> @@ -39,7 +39,7 @@
>  			filename = "u-boot-spl.bin";
>  		};
>  
> -		1d-imem {
> +		1d_imem {

I think it is the other way around. Device tree node names should contain
hyphens and not underscores.

I couldn't find any references in dtschema though. Maybe I haven't looked
hard enough.

But you can see linux commit 28d7f0f3f10b, for example.

-michael

Re: [PATCH 3/4] arm64: dts: imx8mm-u-boot.dtsi: fix typo in ddr blob name

[Patrick Wildt]

On Thu, Jan 13, 2022 at 12:42:50PM +0100, Michael Walle wrote:
> Hi,
> 
> > --- a/arch/arm/dts/imx8mm-u-boot.dtsi
> > +++ b/arch/arm/dts/imx8mm-u-boot.dtsi
> > @@ -39,7 +39,7 @@
> >  			filename = "u-boot-spl.bin";
> >  		};
> >  
> > -		1d-imem {
> > +		1d_imem {
> 
> I think it is the other way around. Device tree node names should contain
> hyphens and not underscores.
> 
> I couldn't find any references in dtschema though. Maybe I haven't looked
> hard enough.
> 
> But you can see linux commit 28d7f0f3f10b, for example.
> 
> -michael

Hi,

I don't know what's right, but every other of these in the i.MX8MM file
use _ instead of -, so if at all this makes it consistenly wrong, but
at least now it's consistent. ;)

If it's wrong, I'm sure someone will step up and rectify it.

Cheers,
Patrick

Re: [PATCH 3/4] arm64: dts: imx8mm-u-boot.dtsi: fix typo in ddr blob name

[Michael Walle]

Am 2022-01-13 14:16, schrieb Patrick Wildt:
> On Thu, Jan 13, 2022 at 12:42:50PM +0100, Michael Walle wrote:
>> Hi,
>> 
>> > --- a/arch/arm/dts/imx8mm-u-boot.dtsi
>> > +++ b/arch/arm/dts/imx8mm-u-boot.dtsi
>> > @@ -39,7 +39,7 @@
>> >  			filename = "u-boot-spl.bin";
>> >  		};
>> >
>> > -		1d-imem {
>> > +		1d_imem {
>> 
>> I think it is the other way around. Device tree node names should 
>> contain
>> hyphens and not underscores.
>> 
>> I couldn't find any references in dtschema though. Maybe I haven't 
>> looked
>> hard enough.
>> 
>> But you can see linux commit 28d7f0f3f10b, for example.
>> 
>> -michael
> 
> Hi,
> 
> I don't know what's right, but every other of these in the i.MX8MM file
> use _ instead of -, so if at all this makes it consistenly wrong, but
> at least now it's consistent. ;)
> 
> If it's wrong, I'm sure someone will step up and rectify it.

Why don't you just change it to the correct naming then?

-michael

Re: [PATCH 3/4] arm64: dts: imx8mm-u-boot.dtsi: fix typo in ddr blob name

[Fabio Estevam]

Hi Patrick,

On 13/01/2022 10:29, Michael Walle wrote:

> Why don't you just change it to the correct naming then?

I agree with Michael: node names should use a dash instead of the 
underscore.

dtc complains about it when building with W=2:

arch/arm/dts/imx8mm-evk.dtb: Warning (node_name_chars_strict): 
/binman/u-boot-spl-ddr/1d_dmem: Character '_' not recommended in node 
name

Thanks,

Fabio Estevam
-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-60 Fax: (+49)-8142-66989-80 Email: 
festevam@denx.de

Re: [PATCH 3/4] arm64: dts: imx8mm-u-boot.dtsi: fix typo in ddr blob name

[Patrick Wildt]

On Thu, Jan 13, 2022 at 10:40:21AM -0300, Fabio Estevam wrote:
> Hi Patrick,
> 
> On 13/01/2022 10:29, Michael Walle wrote:
> 
> > Why don't you just change it to the correct naming then?
> 
> I agree with Michael: node names should use a dash instead of the
> underscore.
> 
> dtc complains about it when building with W=2:
> 
> arch/arm/dts/imx8mm-evk.dtb: Warning (node_name_chars_strict):
> /binman/u-boot-spl-ddr/1d_dmem: Character '_' not recommended in node name

Ok, I'll send a v2 for the patchset in a minute.

Cheers,
Patrick

[PATCH 4/4] arm64: dts: imx8mq-u-boot.dtsi: improve odd blob-ext naming

[Patrick Wildt]

Rather than using odd implicit blob-ext naming, explicitly specify the
type to be of blob-ext and therefore also simplify the node naming.

Signed-off-by: Patrick Wildt <patrick@blueri.se>
---
 arch/arm/dts/imx8mq-u-boot.dtsi | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/arch/arm/dts/imx8mq-u-boot.dtsi b/arch/arm/dts/imx8mq-u-boot.dtsi
index 566b8b8035..b27630e3e5 100644
--- a/arch/arm/dts/imx8mq-u-boot.dtsi
+++ b/arch/arm/dts/imx8mq-u-boot.dtsi
@@ -22,32 +22,37 @@
 			filename = "u-boot-spl.bin";
 		};
 
-		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";
 		};
 	};
 
 	signed_hdmi {
 		filename = "signed_hdmi.bin";
 
-		blob_5: blob-ext@5 {
+		hdmi_imx8m {
 			filename = "signed_hdmi_imx8m.bin";
+			type = "blob-ext";
 		};
 	};
 
@@ -60,9 +65,7 @@
 			blob {
 				filename = "u-boot-spl-ddr.bin";
 			};
-
 		};
-
 	};
 
 	itb {
@@ -81,8 +84,9 @@
 					load = <CONFIG_SYS_TEXT_BASE>;
 					type = "standalone";
 
-					uboot_blob: blob-ext {
+					uboot_blob {
 						filename = "u-boot-nodtb.bin";
+						type = "blob-ext";
 					};
 				};
 
@@ -94,8 +98,9 @@
 					load = <0x910000>;
 					type = "firmware";
 
-					atf_blob: blob-ext {
+					atf_blob {
 						filename = "bl31.bin";
+						type = "blob-ext";
 					};
 				};
 
@@ -104,8 +109,9 @@
 					description = "NAME";
 					type = "flat_dt";
 
-					uboot_fdt_blob: blob-ext {
+					uboot_fdt_blob {
 						filename = "u-boot.dtb";
+						type = "blob-ext";
 					};
 				};
 			};
@@ -127,14 +133,16 @@
 		filename = "flash.bin";
 		pad-byte = <0x00>;
 
-		spl: blob-ext@1 {
+		spl {
 			filename = "spl.bin";
 			offset = <0x0>;
+			type = "blob-ext";
 		};
 
-		uboot: blob-ext@2 {
+		binman_uboot: uboot {
 			filename = "u-boot.itb";
 			offset = <0x57c00>;
+			type = "blob-ext";
 		};
 	};
 };
-- 
2.34.1

Re: [PATCH 0/4] arm64: imx8mq/imx8mm: cleanup binman configuration

[Frieder Schrempf]

On 12.01.22 22:19, Patrick Wildt wrote:
> The i.MX8MM boards have been converted for some longer time compared
> to i.MX8MQ.  During that time the i.MX8MM binman configuration has
> already gotten some cleanup.  This brings the i.MX8MQ binman config
> in line with the i.MX8MM one, and fixes a typo in the i.MX8MM config.

Nice cleanup, thanks!

Reviewed-by: Frieder Schrempf <frieder.schrempf@kontron.de>

> 
> Patrick Wildt (4):
>   arm64: dts: imx8mq-u-boot.dtsi: alphabetically re-order properties
>   arm64: dts: imx8mq-u-boot.dtsi: explicitly add spl filename
>   arm64: dts: imx8mm-u-boot.dtsi: fix typo in ddr blob name
>   arm64: dts: imx8mq-u-boot.dtsi: improve odd blob-ext naming
> 
>  arch/arm/dts/imx8mm-u-boot.dtsi |  2 +-
>  arch/arm/dts/imx8mq-u-boot.dtsi | 57 +++++++++++++++++++--------------
>  2 files changed, 34 insertions(+), 25 deletions(-)
>