colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ARM: dts: imx: Wrap i.MX8M binman SPL and FIT nodes in CST node if IMX_HAB enabled

Browse Source 
In case CONFIG_IMX_HAB is enabled, extend the binman image description for
all of i.MX8M{Q,M,N,P} with CST wrapper node. This way, if CONFIG_IMX_HAB
is enabled, binman will be automatically used to sign SPL and fitImage.

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:25 +02:00
committed by Fabio Estevam
parent e3da4d0a3a
commit d415a48b40
4 changed files with 457 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,6 +54,14 @@
}; };
#endif #endif
#ifdef CONFIG_IMX_HAB
nxp-imx8mcst@0 {
filename = "u-boot-spl-mkimage.signed.bin";
nxp,loader-address = <CONFIG_SPL_TEXT_BASE>;
nxp,unlock;
args; /* Needed by mkimage etype superclass */
#endif
binman_imx_spl: nxp-imx8mimage { binman_imx_spl: nxp-imx8mimage {
filename = "u-boot-spl-mkimage.bin"; filename = "u-boot-spl-mkimage.bin";
nxp,boot-from = "sd"; nxp,boot-from = "sd";
@@ -97,6 +105,20 @@
}; };
}; };
}; };
#ifdef CONFIG_IMX_HAB
};
nxp-imx8mcst@1 {
filename = "u-boot-fit.signed.bin";
nxp,loader-address = <CONFIG_SPL_LOAD_FIT_ADDRESS>;
#ifdef CONFIG_FSPI_CONF_HEADER
offset = <0x58C00>;
#else
offset = <0x57c00>;
#endif
args; /* Needed by mkimage etype superclass */
#endif
binman_imx_fit: fit { binman_imx_fit: fit {
description = "Configuration to load ATF before U-Boot"; description = "Configuration to load ATF before U-Boot";
@@ -174,6 +196,9 @@
}; };
}; };
}; };
#ifdef CONFIG_IMX_HAB
};
#endif
}; };
}; };

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

@@ -103,6 +103,14 @@
}; };
#endif #endif
#ifdef CONFIG_IMX_HAB
nxp-imx8mcst@0 {
filename = "u-boot-spl-mkimage.signed.bin";
nxp,loader-address = <CONFIG_SPL_TEXT_BASE>;
nxp,unlock;
args; /* Needed by mkimage etype superclass */
#endif
binman_imx_spl: nxp-imx8mimage { binman_imx_spl: nxp-imx8mimage {
filename = "u-boot-spl-mkimage.bin"; filename = "u-boot-spl-mkimage.bin";
nxp,boot-from = "sd"; nxp,boot-from = "sd";
@@ -169,6 +177,20 @@
}; };
}; };
#ifdef CONFIG_IMX_HAB
};
nxp-imx8mcst@1 {
filename = "u-boot-fit.signed.bin";
nxp,loader-address = <CONFIG_SPL_LOAD_FIT_ADDRESS>;
#ifdef CONFIG_FSPI_CONF_HEADER
offset = <0x59000>;
#else
offset = <0x58000>;
#endif
args; /* Needed by mkimage etype superclass */
#endif
binman_imx_fit: fit { binman_imx_fit: fit {
description = "Configuration to load ATF before U-Boot"; description = "Configuration to load ATF before U-Boot";
#ifndef CONFIG_IMX_HAB #ifndef CONFIG_IMX_HAB
@@ -245,5 +267,8 @@
}; };
}; };
}; };
#ifdef CONFIG_IMX_HAB
};
#endif
}; };
}; };

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

@@ -86,6 +86,14 @@
section { section {
pad-byte = <0x00>; pad-byte = <0x00>;
#ifdef CONFIG_IMX_HAB
nxp-imx8mcst@0 {
filename = "u-boot-spl-mkimage.signed.bin";
nxp,loader-address = <CONFIG_SPL_TEXT_BASE>;
nxp,unlock;
args; /* Needed by mkimage etype superclass */
#endif
binman_imx_spl: nxp-imx8mimage { binman_imx_spl: nxp-imx8mimage {
filename = "u-boot-spl-mkimage.bin"; filename = "u-boot-spl-mkimage.bin";
nxp,boot-from = "sd"; nxp,boot-from = "sd";
@@ -128,6 +136,15 @@
}; };
}; };
}; };
#ifdef CONFIG_IMX_HAB
};
nxp-imx8mcst@1 {
filename = "u-boot-fit.signed.bin";
nxp,loader-address = <CONFIG_SPL_LOAD_FIT_ADDRESS>;
offset = <0x58000>;
args; /* Needed by mkimage etype superclass */
#endif
binman_imx_fit: fit { binman_imx_fit: fit {
description = "Configuration to load ATF before U-Boot"; description = "Configuration to load ATF before U-Boot";
@@ -191,5 +208,8 @@
}; };
}; };
}; };
#ifdef CONFIG_IMX_HAB
};
#endif
}; };
}; };

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

@@ -38,6 +38,14 @@
section { section {
pad-byte = <0x00>; pad-byte = <0x00>;
#ifdef CONFIG_IMX_HAB
nxp-imx8mcst@0 {
filename = "u-boot-spl-mkimage.signed.bin";
nxp,loader-address = <CONFIG_SPL_TEXT_BASE>;
nxp,unlock;
args; /* Needed by mkimage etype superclass */
#endif
binman_imx_spl: nxp-imx8mimage { binman_imx_spl: nxp-imx8mimage {
filename = "u-boot-spl-mkimage.bin"; filename = "u-boot-spl-mkimage.bin";
nxp,boot-from = "sd"; nxp,boot-from = "sd";
@@ -86,6 +94,15 @@
}; };
}; };
}; };
#ifdef CONFIG_IMX_HAB
};
nxp-imx8mcst@1 {
filename = "u-boot-fit.signed.bin";
nxp,loader-address = <CONFIG_SPL_LOAD_FIT_ADDRESS>;
offset = <0x58000>;
args; /* Needed by mkimage etype superclass */
#endif
binman_imx_fit: fit { binman_imx_fit: fit {
description = "Configuration to load ATF before U-Boot"; description = "Configuration to load ATF before U-Boot";
@@ -149,5 +166,8 @@
}; };
}; };
}; };
#ifdef CONFIG_IMX_HAB
};
#endif
}; };
}; };