Skip to contentSkip to conversation

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

PATCH In review Tim Harvey 3 participants 7 messages Aug 24, 2023 – Oct 16, 2023

Subsystems (2)
lore
Share & tools
lore

Tim Harvey

author
#0 lore raw

PATCH v2 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.

---
v2: added Fabio's rb tag

---
 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
index 484e31824b85..d12ce6069cc7 100644
@@ -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
index 1878c4e13fbe..219504f61105 100644
@@ -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
index 13688ec0d0f2..155670da18d1 100644
@@ -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
index 65dfd33725ee..1ad9d49a1118 100644
@@ -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
index 3ced97cfaafa..c9e0b4420500 100644
@@ -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
index 035282bf0b00..a843bb851eaf 100644
@@ -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
index 2b268f55cb95..24e565a06c2f 100644
@@ -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
author
#1 lore raw

PATCH v2 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.

---
v2: added Fabio's rb tag

---
 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
index b56f3a2bd2e1..c69f7c9c32c0 100644
@@ -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
index 6784ed2e7c92..17965c58ba10 100644
@@ -11,12 +11,6 @@
 		wdt = <&wdog1>;
 		bootph-pre-ram;
 	};
-	firmware {
-		optee {
-			compatible = "linaro,optee-tz";
-			method = "smc";
-		};
-	};
 };
 
 &reg_usdhc2_vmmc {
arch/arm/dts/imx8mp-icore-mx8mp-edimm2.2-u-boot.dtsi +0 -7
index d411cf79e85d..fe20938af536 100644
@@ -12,13 +12,6 @@
 		wdt = <&wdog1>;
 		bootph-pre-ram;
 	};
-
-	firmware {
-		optee {
-			compatible = "linaro,optee-tz";
-			method = "smc";
-		};
-	};
 };
 
 &reg_usdhc2_vmmc {
arch/arm/dts/imx8mp-rsb3720-a1-u-boot.dtsi +0 -7
index f3fb44046d5c..8f1df232b1b7 100644
@@ -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
index 36e7444a627b..b2f213e3e706 100644
@@ -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
index 501bc0ce200e..240fbc1b568f 100644
@@ -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
index 0162f9b2da37..fc87d3f4035b 100644
@@ -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
#2 lore raw

PATCH v2 2/3 arm: dts: imx8mp: move firmware/optee node to common imx8mp-u-boot.dtsi

Quoted 5 lines

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.

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]
=====================================================================
author
#3 lore raw

PATCH v2 3/3 arm: dts: imx8mn: protect the firmware/optee node with ifdef

In reply to Tim Harvey

There is no need to include the firmware/optee node if the optee driver is not enabled.

---
v2: added Fabio's rb tag

---
 arch/arm/dts/imx8mn-u-boot.dtsi | 2 ++
 1 file changed, 2 insertions(+)
arch/arm/dts/imx8mn-u-boot.dtsi +2 -0
index 5046b38e4e29..86c9a6cd67f0 100644
@@ -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
#4 lore raw

PATCH v2 3/3 arm: dts: imx8mn: protect the firmware/optee node with ifdef

Quoted 4 lines

There is no need to include the firmware/optee node if the optee driver is not enabled.

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]
=====================================================================
Reviewed-by on v2 1/3
#5 lore raw
In reply to Tim Harvey

Hi Tim

Thanks!

Quoted 6 lines · Tim Harvey

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.

For the entire series.

Quoted 135 lines

---
v2: added Fabio's rb tag
---
 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- renamed from arch/arm/dts/imx8mm-cl-iot-gate-optee-u-boot.dtsi +0 -0

boot.dtsi
index 484e31824b85..d12ce6069cc7 100644

arch/arm/dts/imx8mm-cl-iot-gate-optee-u-boot.dtsi +0 -0
@@ -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 -0
index 1878c4e13fbe..219504f61105 100644
@@ -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
index 13688ec0d0f2..155670da18d1 100644
@@ -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- renamed from arch/arm/dts/imx8mm-kontron-bl-common-u-boot.dtsi +0 -0

boot.dtsi
index 65dfd33725ee..1ad9d49a1118 100644

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
index 3ced97cfaafa..c9e0b4420500 100644
@@ -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
index 035282bf0b00..a843bb851eaf 100644
@@ -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- renamed from arch/arm/dts/imx8mm-verdin-wifi-dev-u-boot.dtsi +0 -0

boot.dtsi
index 2b268f55cb95..24e565a06c2f 100644

arch/arm/dts/imx8mm-verdin-wifi-dev-u-boot.dtsi +0 -0
@@ -6,13 +6,6 @@
  #include "imx8mm-u-boot.dtsi"


 / {
-       firmware {
-               optee {

Quoted 8 lines

-                       compatible = "linaro,optee-tz"; -                       method = "smc";
-               };
-       };
-
        wdt-reboot {
                compatible = "wdt-reboot"; bootph-pre-ram;

Cheers

Marcel

#6 lore raw

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

In reply to Tim Harvey
Quoted 6 lines

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.

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]
=====================================================================