arm: dts: imx8mm: move firmware/optee node to common imx8mm-u-boot.dtsi
Subsystems (2)
PATCH 1/3 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.
--- arch/arm/dts/imx8mm-cl-iot-gate-optee-u-boot.dtsi | 7 ------- arch/arm/dts/imx8mm-cl-iot-gate-u-boot.dtsi | 7 ------- arch/arm/dts/imx8mm-evk-u-boot.dtsi | 7 ------- arch/arm/dts/imx8mm-kontron-bl-common-u-boot.dtsi | 7 ------- arch/arm/dts/imx8mm-phg-u-boot.dtsi | 7 ------- arch/arm/dts/imx8mm-u-boot.dtsi | 9 +++++++++ arch/arm/dts/imx8mm-verdin-wifi-dev-u-boot.dtsi | 7 ------- 7 files changed, 9 insertions(+), 42 deletions(-)
arch/arm/dts/imx8mm-cl-iot-gate-optee-u-boot.dtsi +0 -7
@@ -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;
arch/arm/dts/imx8mm-cl-iot-gate-u-boot.dtsi +0 -7
@@ -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;
arch/arm/dts/imx8mm-evk-u-boot.dtsi +0 -7
@@ -11,13 +11,6 @@ wdt = <&wdog1>; bootph-pre-ram; }; - - firmware { - optee { - compatible = "linaro,optee-tz"; - method = "smc"; - }; - }; }; &aips4 {
arch/arm/dts/imx8mm-kontron-bl-common-u-boot.dtsi +0 -7
@@ -16,13 +16,6 @@ wdt = <&wdog1>; bootph-pre-ram; }; - - firmware { - optee { - compatible = "linaro,optee-tz"; - method = "smc"; - }; - }; }; &crypto {
arch/arm/dts/imx8mm-phg-u-boot.dtsi +0 -7
@@ -11,13 +11,6 @@ wdt = <&wdog1>; bootph-pre-ram; }; - - firmware { - optee { - compatible = "linaro,optee-tz"; - method = "smc"; - }; - }; }; &aips4 {
arch/arm/dts/imx8mm-u-boot.dtsi +9 -0
@@ -7,6 +7,15 @@ binman: binman { multiple-images; }; + +#ifdef CONFIG_OPTEE + firmware { + optee { + compatible = "linaro,optee-tz"; + method = "smc"; + }; + }; +#endif }; &soc {
arch/arm/dts/imx8mm-verdin-wifi-dev-u-boot.dtsi +0 -7
@@ -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;
Signature · 1 line
2.25.1
PATCH 2/3 arm: dts: imx8mp: move firmware/optee node to common imx8mp-u-boot.dtsi
Move the firmware/optee node to the common imx8mp-u-boot.dtsi and protect it with an ifdef CONFIG_OPTEE as it is a meaningless node without the optee driver enabled.
--- arch/arm/dts/imx8mp-beacon-kit-u-boot.dtsi | 7 ------- arch/arm/dts/imx8mp-evk-u-boot.dtsi | 6 ------ arch/arm/dts/imx8mp-icore-mx8mp-edimm2.2-u-boot.dtsi | 7 ------- arch/arm/dts/imx8mp-rsb3720-a1-u-boot.dtsi | 7 ------- arch/arm/dts/imx8mp-u-boot.dtsi | 9 +++++++++ arch/arm/dts/imx8mp-venice-gw74xx-u-boot.dtsi | 7 ------- arch/arm/dts/imx8mp-verdin-wifi-dev-u-boot.dtsi | 7 ------- 7 files changed, 9 insertions(+), 41 deletions(-)
arch/arm/dts/imx8mp-beacon-kit-u-boot.dtsi +0 -7
@@ -11,13 +11,6 @@ wdt = <&wdog1>; bootph-pre-ram; }; - - firmware { - optee { - compatible = "linaro,optee-tz"; - method = "smc"; - }; - }; }; &{/soc@0/bus@30800000/i2c@30a20000/pmic@25} {
arch/arm/dts/imx8mp-evk-u-boot.dtsi +0 -6
@@ -11,12 +11,6 @@ wdt = <&wdog1>; bootph-pre-ram; }; - firmware { - optee { - compatible = "linaro,optee-tz"; - method = "smc"; - }; - }; }; ®_usdhc2_vmmc {
arch/arm/dts/imx8mp-icore-mx8mp-edimm2.2-u-boot.dtsi +0 -7
@@ -12,13 +12,6 @@ wdt = <&wdog1>; bootph-pre-ram; }; - - firmware { - optee { - compatible = "linaro,optee-tz"; - method = "smc"; - }; - }; }; ®_usdhc2_vmmc {
arch/arm/dts/imx8mp-rsb3720-a1-u-boot.dtsi +0 -7
@@ -12,13 +12,6 @@ wdt = <&wdog1>; bootph-pre-ram; }; - - firmware { - optee { - compatible = "linaro,optee-tz"; - method = "smc"; - }; - }; }; &iomuxc {
arch/arm/dts/imx8mp-u-boot.dtsi +9 -0
@@ -8,6 +8,15 @@ binman: binman { multiple-images; }; + +#ifdef CONFIG_OPTEE + firmware { + optee { + compatible = "linaro,optee-tz"; + method = "smc"; + }; + }; +#endif }; &soc {
arch/arm/dts/imx8mp-venice-gw74xx-u-boot.dtsi +0 -7
@@ -6,13 +6,6 @@ #include "imx8mp-u-boot.dtsi" / { - firmware { - optee { - compatible = "linaro,optee-tz"; - method = "smc"; - }; - }; - wdt-reboot { compatible = "wdt-reboot"; bootph-pre-ram;
arch/arm/dts/imx8mp-verdin-wifi-dev-u-boot.dtsi +0 -7
@@ -6,13 +6,6 @@ #include "imx8mp-u-boot.dtsi" / { - firmware { - optee { - compatible = "linaro,optee-tz"; - method = "smc"; - }; - }; - wdt-reboot { compatible = "wdt-reboot"; bootph-pre-ram;
Signature · 1 line
2.25.1
Re: [PATCH 2/3] arm: dts: imx8mp: move firmware/optee node to common imx8mp-u-boot.dtsi
Quoted 6 lines · Tim Harvey
Move the
firmware/opteenode to the commonimx8mp-u-boot.dtsiand protect it with an ifdefCONFIG_OPTEEas it is a meaningless node without the optee driver enabled.Signed-off-by Tim Harvey <[email protected]>
PATCH 3/3 arm: dts: imx8mn: protect the firmware/optee node with ifdef
In reply to Tim HarveyThere is no need to include the firmware/optee node if the optee driver is not enabled.
--- arch/arm/dts/imx8mn-u-boot.dtsi | 2 ++ 1 file changed, 2 insertions(+)
arch/arm/dts/imx8mn-u-boot.dtsi +2 -0
@@ -8,12 +8,14 @@ multiple-images; }; +#ifdef CONFIG_OPTEE firmware { optee { compatible = "linaro,optee-tz"; method = "smc"; }; }; +#endif wdt-reboot { compatible = "wdt-reboot";
Signature · 1 line
2.25.1
Re: [PATCH 3/3] arm: dts: imx8mn: protect the firmware/optee node with ifdef
Quoted 5 lines · Tim Harvey
There is no need to include the
firmware/opteenode if the optee driver is not enabled.Signed-off-by Tim Harvey <[email protected]>
Quoted 6 lines · Tim Harvey
Move the
firmware/opteenode to the commonimx8mm-u-boot.dtsiand protect it with an ifdefCONFIG_OPTEEas it is a meaningless node without the optee driver enabled.Signed-off-by Tim Harvey <[email protected]>