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.
Signed-off-by: Heiko Thiery <heiko.thi...@gmail.com>
---
arch/arm/dts/imx8mn-evk-common-u-boot.dtsi | 48 ++++++++++++++--------
1 file changed, 31 insertions(+), 17 deletions(-)
diff --git a/arch/arm/dts/imx8mn-evk-common-u-boot.dtsi
b/arch/arm/dts/imx8mn-evk-common-u-boot.dtsi
index d5ea2dcb4e..f512be095c 100644
--- a/arch/arm/dts/imx8mn-evk-common-u-boot.dtsi
+++ b/arch/arm/dts/imx8mn-evk-common-u-boot.dtsi
@@ -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";
};
};
};
--
2.30.2
