arm: dts: imx8m: move CAAM nodes into common u-boot.dtsi
Subsystems (2)
PATCH 1/1 arm: dts: imx8m: move CAAM nodes into common u-boot.dtsi
Move the crypto and sec_jr* nodes from board-specific u-boot.dtsi files into the common files. Additionally protect the nodes with ifdef FSL_CAAM as they don't serve any purpose if that is not enabled.
--- arch/arm/dts/imx8mm-evk-u-boot.dtsi | 16 --------------- .../dts/imx8mm-kontron-bl-common-u-boot.dtsi | 16 --------------- arch/arm/dts/imx8mm-u-boot.dtsi | 20 +++++++++++++++++++ arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi | 16 --------------- arch/arm/dts/imx8mn-u-boot.dtsi | 20 +++++++++++++++++++ arch/arm/dts/imx8mp-beacon-kit-u-boot.dtsi | 16 --------------- arch/arm/dts/imx8mp-evk-u-boot.dtsi | 16 --------------- .../imx8mp-icore-mx8mp-edimm2.2-u-boot.dtsi | 16 --------------- arch/arm/dts/imx8mp-u-boot.dtsi | 20 +++++++++++++++++++ .../dts/imx8mp-verdin-wifi-dev-u-boot.dtsi | 16 --------------- 10 files changed, 60 insertions(+), 112 deletions(-)
arch/arm/dts/imx8mm-evk-u-boot.dtsi +0 -16
@@ -65,22 +65,6 @@ bootph-pre-ram; }; -&crypto { - bootph-pre-ram; -}; - -&sec_jr0 { - bootph-pre-ram; -}; - -&sec_jr1 { - bootph-pre-ram; -}; - -&sec_jr2 { - bootph-pre-ram; -}; - &usbmisc1 { bootph-pre-ram; };
arch/arm/dts/imx8mm-kontron-bl-common-u-boot.dtsi +0 -16
@@ -18,22 +18,6 @@ }; }; -&crypto { - bootph-pre-ram; -}; - -&sec_jr0 { - bootph-pre-ram; -}; - -&sec_jr1 { - bootph-pre-ram; -}; - -&sec_jr2 { - bootph-pre-ram; -}; - &i2c1 { bootph-pre-ram; bootph-all;
arch/arm/dts/imx8mm-u-boot.dtsi +20 -0
@@ -18,6 +18,12 @@ #endif }; +#ifdef FSL_CAAM +&crypto { + bootph-pre-ram; +}; +#endif + &soc { bootph-all; bootph-pre-ram;
@@ -235,6 +241,20 @@ bootph-pre-ram; }; +#ifdef FSL_CAAM +&sec_jr0 { + bootph-pre-ram; +}; + +&sec_jr1 { + bootph-pre-ram; +}; + +&sec_jr2 { + bootph-pre-ram; +}; +#endif + &spba1 { bootph-all; bootph-pre-ram;
arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi +0 -16
@@ -57,22 +57,6 @@ bootph-pre-ram; }; -&crypto { - bootph-pre-ram; -}; - -&sec_jr0 { - bootph-pre-ram; -}; - -&sec_jr1 { - bootph-pre-ram; -}; - -&sec_jr2 { - bootph-pre-ram; -}; - &usdhc1 { bootph-pre-ram; };
arch/arm/dts/imx8mn-u-boot.dtsi +20 -0
@@ -54,6 +54,12 @@ /delete-property/ assigned-clock-rates; }; +#ifdef FSL_CAAM +&crypto { + bootph-pre-ram; +}; +#endif + &iomuxc { bootph-pre-ram; };
@@ -63,6 +69,20 @@ bootph-all; }; +#ifdef FSL_CAMM +&sec_jr0 { + bootph-pre-ram; +}; + +&sec_jr1 { + bootph-pre-ram; +}; + +&sec_jr2 { + bootph-pre-ram; +}; +#endif + &spba1 { bootph-pre-ram; };
arch/arm/dts/imx8mp-beacon-kit-u-boot.dtsi +0 -16
@@ -21,10 +21,6 @@ bootph-pre-ram; }; -&crypto { - bootph-pre-ram; -}; - &eqos { /delete-property/ assigned-clocks; /delete-property/ assigned-clock-parents;
@@ -131,18 +127,6 @@ u-boot,off-on-delay-us = <20000>; }; -&sec_jr0 { - bootph-pre-ram; -}; - -&sec_jr1 { - bootph-pre-ram; -}; - -&sec_jr2 { - bootph-pre-ram; -}; - &tpm { compatible = "tcg,tpm_tis-spi"; };
arch/arm/dts/imx8mp-evk-u-boot.dtsi +0 -16
@@ -65,22 +65,6 @@ bootph-pre-ram; }; -&crypto { - bootph-pre-ram; -}; - -&sec_jr0 { - bootph-pre-ram; -}; - -&sec_jr1 { - bootph-pre-ram; -}; - -&sec_jr2 { - bootph-pre-ram; -}; - &i2c1 { bootph-pre-ram; };
arch/arm/dts/imx8mp-icore-mx8mp-edimm2.2-u-boot.dtsi +0 -16
@@ -62,22 +62,6 @@ bootph-pre-ram; }; -&crypto { - bootph-pre-ram; -}; - -&sec_jr0 { - bootph-pre-ram; -}; - -&sec_jr1 { - bootph-pre-ram; -}; - -&sec_jr2 { - bootph-pre-ram; -}; - &i2c1 { bootph-pre-ram; };
arch/arm/dts/imx8mp-u-boot.dtsi +20 -0
@@ -19,6 +19,12 @@ #endif }; +#ifdef FSL_CAAM +&crypto { + bootph-pre-ram; +}; +#endif + &soc { bootph-all; bootph-pre-ram;
@@ -59,6 +65,20 @@ bootph-pre-ram; }; +#ifdef FSL_CAAM +&sec_jr0 { + bootph-pre-ram; +}; + +&sec_jr1 { + bootph-pre-ram; +}; + +&sec_jr2 { + bootph-pre-ram; +}; +#endif + &binman { u-boot-spl-ddr { filename = "u-boot-spl-ddr.bin";
arch/arm/dts/imx8mp-verdin-wifi-dev-u-boot.dtsi +0 -16
@@ -28,10 +28,6 @@ }; -&crypto { - bootph-pre-ram; -}; - &gpio1 { bootph-pre-ram; };
@@ -132,18 +128,6 @@ bootph-pre-ram; }; -&sec_jr0 { - bootph-pre-ram; -}; - -&sec_jr1 { - bootph-pre-ram; -}; - -&sec_jr2 { - bootph-pre-ram; -}; - &uart3 { bootph-pre-ram; };
Signature · 1 line
2.25.1
Quoted 7 lines · Tim Harvey
Move the crypto and sec_jr* nodes from board-specific
u-boot.dtsifiles into the common files. Additionally protect the nodes with ifdefFSL_CAAMas they don't serve any purpose if that is not enabled.Signed-off-by Tim Harvey <[email protected]>
Quoted 6 lines · Tim Harvey
Move the crypto and sec_jr* nodes from board-specific
u-boot.dtsifiles into the common files. Additionally protect the nodes with ifdefFSL_CAAMas they don't serve any purpose if that is not enabled.Signed-off-by Tim Harvey<[email protected]>
PATCH 1/1 arm: dts: imx8m: move CAAM nodes into common u-boot.dtsi
In reply to Tim HarveyQuoted 7 lines
Move the crypto and sec_jr* nodes from board-specific
u-boot.dtsifiles into the common files. Additionally protect the nodes with ifdefFSL_CAAMas they don't serve any purpose if that is not enabled.Signed-off-by Tim Harvey <[email protected]>Reviewed-by Fabio Estevam <[email protected]>Reviewed-by Peng Fan <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Erika Unter HRB 165235 Munich, Office: Kirchenstr.5, 82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected] =====================================================================