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 e65cddf7c677c63fb555a737b0ee3851f57ebeeb..b1b047461cced1778ab2ba5e1dee1425b283901d 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 e97426a5e5ef3cb237cef4a1b6f4e094a8f17f99..c371aa8538c15f3e22597d3b410d8304d3536aec 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 2eb60447505bc546e589f77f1f16e241f749628e..e1e59e009124f781d4785bf45bba9692db28b0c2 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