diff options
author | Seung-Woo Kim <sw0312.kim@samsung.com> | 2020-03-16 19:06:53 +0900 |
---|---|---|
committer | Seung-Woo Kim <sw0312.kim@samsung.com> | 2020-03-16 19:12:24 +0900 |
commit | 235c3fbb167a6cb7fea9c2f67e5d63f4bdd87bbb (patch) | |
tree | 6dbd88fd6ca80d8ff20b118fce2bc3412186f47a | |
parent | e517c437cb8042252190de5bad08728a3b0524e6 (diff) | |
download | linux-rpi3-235c3fbb167a6cb7fea9c2f67e5d63f4bdd87bbb.tar.gz linux-rpi3-235c3fbb167a6cb7fea9c2f67e5d63f4bdd87bbb.tar.bz2 linux-rpi3-235c3fbb167a6cb7fea9c2f67e5d63f4bdd87bbb.zip |
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>
-rw-r--r-- | arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/bcm2710-rpi-3-b.dts | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/bcm2710.dtsi | 4 |
3 files changed, 5 insertions, 3 deletions
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 9482f54cbd08..9811f7295209 100644 --- 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 10a2a4949f4c..362156298e80 100644 --- 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 59d66fa63e9e..e8454ed4a6fe 100644 --- 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 |