arm64: imx8mq/imx8mm: cleanup binman configuration
Subsystems (2)
v2 cover arm64: imx8mq/imx8mm: cleanup binman configuration
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 also fixes node names in the i.MX8MM config.
Changes since v1:
- Underscores in node names replaced with dashes.
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: use dash for node names
arm64: dts: imx8mq-u-boot.dtsi: improve odd blob-ext naming
arch/arm/dts/imx8mm-u-boot.dtsi | 12 +++---- arch/arm/dts/imx8mq-u-boot.dtsi | 59 +++++++++++++++++++-------------- 2 files changed, 40 insertions(+), 31 deletions(-)
Signature · 1 line
2.34.1
PATCH v2 1/4 arm64: dts: imx8mq-u-boot.dtsi: alphabetically re-order properties
Alphabetically re-order properties.
--- arch/arm/dts/imx8mq-u-boot.dtsi | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)
arch/arm/dts/imx8mq-u-boot.dtsi +12 -12
@@ -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>; }; }; };
Signature · 1 line
2.34.1
Re: [PATCH v2 1/4] arm64: dts: imx8mq-u-boot.dtsi: alphabetically re-order properties
arch/arm/dts/imx8mq-u-boot.dtsi line 77
Quoted 10 lines · Patrick Wildt
arch/arm/dts/imx8mq-u-boot.dtsi +1
-2fit { 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)";
Personally, I prefer the 'description' property being the first one, but to keep consistency with imx8mm, let's go this route then.
Signature · 3 lines
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: [email protected]
PATCH v2 2/4 arm64: dts: imx8mq-u-boot.dtsi: explicitly add spl filename
In reply to Patrick WildtExplicitly add SPL aka u-boot-spl.bin filename.
--- arch/arm/dts/imx8mq-u-boot.dtsi | 1 + 1 file changed, 1 insertion(+)
arch/arm/dts/imx8mq-u-boot.dtsi +1 -0
@@ -19,6 +19,7 @@ u-boot-spl { align-end = <4>; + filename = "u-boot-spl.bin"; }; blob_1: blob-ext@1 {
Signature · 1 line
2.34.1
Re: [PATCH v2 2/4] arm64: dts: imx8mq-u-boot.dtsi: explicitly add spl filename
Quoted 3 lines · Patrick Wildt
Explicitly add SPL aka u-boot-spl.bin filename.
Signed-off-by Patrick Wildt <[email protected]>
Signature · 3 lines
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: [email protected]
PATCH v2 3/4 arm64: dts: imx8mm-u-boot.dtsi: use dash for node names
In reply to Patrick WildtSome of the nodes were named using a underscore, so rectify this and consistenly use dashes.
--- arch/arm/dts/imx8mm-u-boot.dtsi | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
arch/arm/dts/imx8mm-u-boot.dtsi +6 -6
@@ -45,19 +45,19 @@ type = "blob-ext"; }; - 1d_dmem { + 1d-dmem { filename = "lpddr4_pmu_train_1d_dmem.bin"; size = <0x4000>; type = "blob-ext"; }; - 2d_imem { + 2d-imem { filename = "lpddr4_pmu_train_2d_imem.bin"; size = <0x8000>; type = "blob-ext"; }; - 2d_dmem { + 2d-dmem { filename = "lpddr4_pmu_train_2d_dmem.bin"; size = <0x4000>; type = "blob-ext";
@@ -93,7 +93,7 @@ load = <CONFIG_SYS_TEXT_BASE>; type = "standalone"; - uboot_blob { + uboot-blob { filename = "u-boot-nodtb.bin"; type = "blob-ext"; };
@@ -107,7 +107,7 @@ load = <0x920000>; type = "firmware"; - atf_blob { + atf-blob { filename = "bl31.bin"; type = "blob-ext"; };
@@ -126,7 +126,7 @@ description = "NAME"; type = "flat_dt"; - uboot_fdt_blob { + uboot-fdt-blob { filename = "u-boot.dtb"; type = "blob-ext"; };
Signature · 1 line
2.34.1
Re: [PATCH v2 3/4] arm64: dts: imx8mm-u-boot.dtsi: use dash for node names
Quoted 4 lines · Patrick Wildt
Some of the nodes were named using a underscore, so rectify this and consistenly use dashes.
Signed-off-by Patrick Wildt <[email protected]>
Signature · 3 lines
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: [email protected]
Re: [PATCH v2 3/4] arm64: dts: imx8mm-u-boot.dtsi: use dash for node names
In reply to Patrick WildtQuoted 4 lines · Patrick Wildt
Some of the nodes were named using a underscore, so rectify this and consistenly use dashes.
Signed-off-by Patrick Wildt <[email protected]>
[snip]
PATCH v2 4/4 arm64: dts: imx8mq-u-boot.dtsi: improve odd blob-ext naming
In reply to Patrick WildtRather than using odd implicit blob-ext naming, explicitly specify the type to be of blob-ext and therefore also simplify the node naming.
--- arch/arm/dts/imx8mq-u-boot.dtsi | 34 ++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-)
arch/arm/dts/imx8mq-u-boot.dtsi +21 -13
@@ -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 { + signed-hdmi { filename = "signed_hdmi.bin"; - blob_5: blob-ext@5 { + signed-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"; }; }; };
Signature · 1 line
2.34.1
Re: [PATCH v2 4/4] arm64: dts: imx8mq-u-boot.dtsi: improve odd blob-ext naming
Quoted 4 lines · 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 <[email protected]>
Signature · 3 lines
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: [email protected]