random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-10-17 14:18:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

ARM: dts: imx: Introduce SPL and FIT labels to i.MX8M DTs binman nodes

Browse Source 
Add binman_imx_spl and binman_imx_fit labels to nxp-imx8mimage {} and fit {}
nodes respectively, so they can be referened in board DTs no matter how deep
in the top level binman image description they are. Update current board DTs
to use those labels.

Reviewed-by: Tim Harvey <tharvey@gateworks.com>
Signed-off-by: Marek Vasut <marex@denx.de>
This commit is contained in:
Marek Vasut 2024-05-21 12:48:24 +02:00 committed by Fabio Estevam
parent bc6beae7c5
commit e3da4d0a3a
8 changed files with 81 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/dts/imx8mm-u-boot.dtsi
View File

@ -54,7 +54,7 @@
};
#endif
nxp-imx8mimage {
binman_imx_spl: nxp-imx8mimage {
filename = "u-boot-spl-mkimage.bin";
nxp,boot-from = "sd";
nxp,rom-version = <1>;
@ -98,7 +98,7 @@
};
};
fit {
binman_imx_fit: fit {
description = "Configuration to load ATF before U-Boot";
#ifndef CONFIG_IMX_HAB
fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>;

8
arch/arm/dts/imx8mm-verdin-wifi-dev-u-boot.dtsi
View File

@ -35,12 +35,8 @@
bootph-pre-ram;
};
&binman {
section {
fit {
offset = <0x5fc00>;
};
};
&binman_imx_fit {
offset = <0x5fc00>;
};
&gpio1 {

4
arch/arm/dts/imx8mn-u-boot.dtsi
View File

@ -103,7 +103,7 @@
};
#endif
nxp-imx8mimage {
binman_imx_spl: nxp-imx8mimage {
filename = "u-boot-spl-mkimage.bin";
nxp,boot-from = "sd";
nxp,rom-version = <2>;
@ -169,7 +169,7 @@
};
};
fit {
binman_imx_fit: fit {
description = "Configuration to load ATF before U-Boot";
#ifndef CONFIG_IMX_HAB
fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>;

120
arch/arm/dts/imx8mp-dhcom-u-boot.dtsi
View File

@ -135,73 +135,69 @@
bootph-pre-ram;
};
&binman {
section {
fit {
images {
fdt-dto-imx8mp-dhcom-som-overlay-eth1xfast {
description = "imx8mp-dhcom-som-overlay-eth1xfast";
type = "flat_dt";
compression = "none";
&binman_imx_fit {
images {
fdt-dto-imx8mp-dhcom-som-overlay-eth1xfast {
description = "imx8mp-dhcom-som-overlay-eth1xfast";
type = "flat_dt";
compression = "none";
blob-ext {
filename = "imx8mp-dhcom-som-overlay-eth1xfast.dtbo";
};
};
fdt-dto-imx8mp-dhcom-som-overlay-eth2xfast {
description = "imx8mp-dhcom-som-overlay-eth2xfast";
type = "flat_dt";
compression = "none";
blob-ext {
filename = "imx8mp-dhcom-som-overlay-eth2xfast.dtbo";
};
};
fdt-dto-imx8mp-dhcom-pdk-overlay-eth2xfast {
description = "imx8mp-dhcom-pdk-overlay-eth2xfast";
type = "flat_dt";
compression = "none";
blob-ext {
filename = "imx8mp-dhcom-pdk-overlay-eth2xfast.dtbo";
};
};
fdt-dto-imx8mp-dhcom-som-overlay-rev100 {
description = "imx8mp-dhcom-som-overlay-rev100";
type = "flat_dt";
compression = "none";
blob-ext {
filename = "imx8mp-dhcom-som-overlay-rev100.dtbo";
};
};
fdt-dto-imx8mp-dhcom-pdk3-overlay-rev100 {
description = "imx8mp-dhcom-pdk3-overlay-rev100";
type = "flat_dt";
compression = "none";
blob-ext {
filename = "imx8mp-dhcom-pdk3-overlay-rev100.dtbo";
};
};
blob-ext {
filename = "imx8mp-dhcom-som-overlay-eth1xfast.dtbo";
};
};
configurations {
default = "@config-DEFAULT-SEQ";
fdt-dto-imx8mp-dhcom-som-overlay-eth2xfast {
description = "imx8mp-dhcom-som-overlay-eth2xfast";
type = "flat_dt";
compression = "none";
@config-SEQ {
fdt = "fdt-1",
"fdt-dto-imx8mp-dhcom-som-overlay-eth1xfast",
"fdt-dto-imx8mp-dhcom-som-overlay-eth2xfast",
"fdt-dto-imx8mp-dhcom-pdk-overlay-eth2xfast",
"fdt-dto-imx8mp-dhcom-som-overlay-rev100",
"fdt-dto-imx8mp-dhcom-pdk3-overlay-rev100";
};
blob-ext {
filename = "imx8mp-dhcom-som-overlay-eth2xfast.dtbo";
};
};
fdt-dto-imx8mp-dhcom-pdk-overlay-eth2xfast {
description = "imx8mp-dhcom-pdk-overlay-eth2xfast";
type = "flat_dt";
compression = "none";
blob-ext {
filename = "imx8mp-dhcom-pdk-overlay-eth2xfast.dtbo";
};
};
fdt-dto-imx8mp-dhcom-som-overlay-rev100 {
description = "imx8mp-dhcom-som-overlay-rev100";
type = "flat_dt";
compression = "none";
blob-ext {
filename = "imx8mp-dhcom-som-overlay-rev100.dtbo";
};
};
fdt-dto-imx8mp-dhcom-pdk3-overlay-rev100 {
description = "imx8mp-dhcom-pdk3-overlay-rev100";
type = "flat_dt";
compression = "none";
blob-ext {
filename = "imx8mp-dhcom-pdk3-overlay-rev100.dtbo";
};
};
};
configurations {
default = "@config-DEFAULT-SEQ";
@config-SEQ {
fdt = "fdt-1",
"fdt-dto-imx8mp-dhcom-som-overlay-eth1xfast",
"fdt-dto-imx8mp-dhcom-som-overlay-eth2xfast",
"fdt-dto-imx8mp-dhcom-pdk-overlay-eth2xfast",
"fdt-dto-imx8mp-dhcom-som-overlay-rev100",
"fdt-dto-imx8mp-dhcom-pdk3-overlay-rev100";
};
};
};

24
arch/arm/dts/imx8mp-rsb3720-a1-u-boot.dtsi
View File

@ -135,21 +135,17 @@
assigned-clock-parents = <&clk IMX8MP_SYS_PLL1_400M>;
};
&binman {
section {
fit {
images {
fip {
description = "Trusted Firmware FIP";
type = "firmware";
arch = "arm64";
compression = "none";
load = <0x40310000>;
&binman_imx_fit {
images {
fip {
description = "Trusted Firmware FIP";
type = "firmware";
arch = "arm64";
compression = "none";
load = <0x40310000>;
fip_blob: blob-ext{
filename = "fip.bin";
};
};
fip_blob: blob-ext{
filename = "fip.bin";
};
};
};

4
arch/arm/dts/imx8mp-u-boot.dtsi
View File

@ -86,7 +86,7 @@
section {
pad-byte = <0x00>;
nxp-imx8mimage {
binman_imx_spl: nxp-imx8mimage {
filename = "u-boot-spl-mkimage.bin";
nxp,boot-from = "sd";
nxp,rom-version = <2>;
@ -129,7 +129,7 @@
};
};
fit {
binman_imx_fit: fit {
description = "Configuration to load ATF before U-Boot";
#ifndef CONFIG_IMX_HAB
fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>;

10
arch/arm/dts/imx8mq-librem5-r4-u-boot.dtsi
View File

@ -10,14 +10,10 @@
bootph-pre-ram;
};
&binman {
&binman_imx_spl {
section {
nxp-imx8mimage {
section {
signed-hdmi-imx8m {
filename = "signed_dp_imx8m.bin";
};
};
signed-hdmi-imx8m {
filename = "signed_dp_imx8m.bin";
};
};
};

4
arch/arm/dts/imx8mq-u-boot.dtsi
View File

@ -38,7 +38,7 @@
section {
pad-byte = <0x00>;
nxp-imx8mimage {
binman_imx_spl: nxp-imx8mimage {
filename = "u-boot-spl-mkimage.bin";
nxp,boot-from = "sd";
nxp,rom-version = <1>;
@ -87,7 +87,7 @@
};
};
fit {
binman_imx_fit: fit {
description = "Configuration to load ATF before U-Boot";
#ifndef CONFIG_IMX_HAB
fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>;