arm: dts: imx8mm: move firmware/optee node to common imx8mm-u-boot.dtsi

Move the firmware/optee node to the common imx8mm-u-boot.dtsi and
protect it with an ifdef CONFIG_OPTEE as it is a meaningless node
without the optee driver enabled.

Signed-off-by: Tim Harvey <tharvey@gateworks.com>
Reviewed-by: Fabio Estevam <festevam@denx.de>
Reviewed-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
This commit is contained in:
Tim Harvey
2023-08-24 12:01:42 -07:00
committed by Stefano Babic
parent d0dd76f3eb
commit bb6a4c5536
7 changed files with 9 additions and 42 deletions

View File

@@ -6,13 +6,6 @@
#include "imx8mm-u-boot.dtsi"
/ {
firmware {
optee {
compatible = "linaro,optee-tz";
method = "smc";
};
};
wdt-reboot {
compatible = "wdt-reboot";
bootph-pre-ram;

View File

@@ -6,13 +6,6 @@
#include "imx8mm-u-boot.dtsi"
/ {
firmware {
optee {
compatible = "linaro,optee-tz";
method = "smc";
};
};
wdt-reboot {
compatible = "wdt-reboot";
bootph-pre-ram;

View File

@@ -11,13 +11,6 @@
wdt = <&wdog1>;
bootph-pre-ram;
};
firmware {
optee {
compatible = "linaro,optee-tz";
method = "smc";
};
};
};
&aips4 {

View File

@@ -16,13 +16,6 @@
wdt = <&wdog1>;
bootph-pre-ram;
};
firmware {
optee {
compatible = "linaro,optee-tz";
method = "smc";
};
};
};
&crypto {

View File

@@ -11,13 +11,6 @@
wdt = <&wdog1>;
bootph-pre-ram;
};
firmware {
optee {
compatible = "linaro,optee-tz";
method = "smc";
};
};
};
&aips4 {

View File

@@ -7,6 +7,15 @@
binman: binman {
multiple-images;
};
#ifdef CONFIG_OPTEE
firmware {
optee {
compatible = "linaro,optee-tz";
method = "smc";
};
};
#endif
};
&soc {

View File

@@ -6,13 +6,6 @@
#include "imx8mm-u-boot.dtsi"
/ {
firmware {
optee {
compatible = "linaro,optee-tz";
method = "smc";
};
};
wdt-reboot {
compatible = "wdt-reboot";
bootph-pre-ram;