ARM: dts: bcm2710-rpi-3: Change build macro for optee

Now, Tizen does not support optee by default. Change build macro
for optee related nodes in default case.

Change-Id: Ib925414ba6fd96099ca984cc8b665263812b9538
Ref: https://bugs.tizen.org/browse/TRE-2318
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>

diff --git a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
index 9482f54cbd08461375b44a44efab7da399ef3e4e..9811f7295209f39e58e441caf731eb36e4ed9353 100644 (file)
--- a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
+++ b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#ifdef RPI364
+#ifdef RPI364_OPTEE
 /memreserve/ 0x08000000 0x02000000;
 #endif
 

diff --git a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
index 10a2a4949f4c2bddf4e9945a85c15509737bbf0d..362156298e80da388679342ade439535408aaf43 100644 (file)
--- a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
+++ b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#ifdef RPI364
+#ifdef RPI364_OPTEE
 /memreserve/ 0x08000000 0x02000000;
 #endif
 

diff --git a/arch/arm/boot/dts/bcm2710.dtsi b/arch/arm/boot/dts/bcm2710.dtsi
index 59d66fa63e9e53e580b5fc5b727acc51f5e4a056..e8454ed4a6febb08c07f8647d7beba114f911de0 100644 (file)
--- a/arch/arm/boot/dts/bcm2710.dtsi
+++ b/arch/arm/boot/dts/bcm2710.dtsi
@@ -27,7 +27,7 @@
                       <&cpu3>, "clock-frequency:0";
        };
 
-#ifdef RPI364
+#ifdef RPI364_OPTEE
        firmware {
                optee {
                        compatible = "linaro,optee-tz";
@@ -42,6 +42,7 @@
 #endif
 };
 
+#ifdef RPI364_OPTEE
 &cpu0 {
        enable-method = "psci";
 };
@@ -57,3 +58,4 @@
 &cpu3 {
        enable-method = "psci";
 };
+#endif