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 CONFIG_FSL_CAAM as they don't serve any purpose if
that is not enabled.

Signed-off-by: Tim Harvey <tharvey@gateworks.com>
Reviewed-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
This commit is contained in:
Tim Harvey 2023-08-24 12:03:56 -07:00 committed by Stefano Babic
parent c0887faade
commit 93cac45c97
10 changed files with 60 additions and 112 deletions

View file

@ -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;
};

View file

@ -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;

View file

@ -18,6 +18,12 @@
#endif
};
#ifdef CONFIG_FSL_CAAM
&crypto {
bootph-pre-ram;
};
#endif
&soc {
bootph-all;
bootph-pre-ram;
@ -216,6 +222,20 @@
bootph-pre-ram;
};
#ifdef CONFIG_FSL_CAAM
&sec_jr0 {
bootph-pre-ram;
};
&sec_jr1 {
bootph-pre-ram;
};
&sec_jr2 {
bootph-pre-ram;
};
#endif
&spba1 {
bootph-all;
bootph-pre-ram;

View file

@ -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;
};

View file

@ -54,6 +54,12 @@
/delete-property/ assigned-clock-rates;
};
#ifdef CONFIG_FSL_CAAM
&crypto {
bootph-pre-ram;
};
#endif
&iomuxc {
bootph-pre-ram;
};
@ -63,6 +69,20 @@
bootph-all;
};
#ifdef CONFIG_FSL_CAAM
&sec_jr0 {
bootph-pre-ram;
};
&sec_jr1 {
bootph-pre-ram;
};
&sec_jr2 {
bootph-pre-ram;
};
#endif
&spba1 {
bootph-pre-ram;
};

View file

@ -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";
};

View file

@ -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;
};

View file

@ -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;
};

View file

@ -19,6 +19,12 @@
#endif
};
#ifdef CONFIG_FSL_CAAM
&crypto {
bootph-pre-ram;
};
#endif
&soc {
bootph-all;
bootph-pre-ram;
@ -62,6 +68,20 @@
bootph-pre-ram;
};
#ifdef CONFIG_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";

View file

@ -28,10 +28,6 @@
};
&crypto {
bootph-pre-ram;
};
&gpio1 {
bootph-pre-ram;
};
@ -140,18 +136,6 @@
bootph-pre-ram;
};
&sec_jr0 {
bootph-pre-ram;
};
&sec_jr1 {
bootph-pre-ram;
};
&sec_jr2 {
bootph-pre-ram;
};
&uart3 {
bootph-pre-ram;
};