diff options
| author | Arvind Chauhan <arvind.chauhan@arm.com> | 2017-10-31 12:50:32 +0530 |
|---|---|---|
| committer | Arvind Chauhan <arvind.chauhan@arm.com> | 2017-10-31 12:50:32 +0530 |
| commit | c3b98e11ec48dc8667989bcf348e63a8772412af (patch) | |
| tree | 3c940f2318022e21322c25e401cc298a345eede8 | |
| parent | 34c9373988ee2d35e14f67c3277095594c3b0302 (diff) | |
| parent | 20bf8080c59f7550df694f6d24dea7e5a616b2c6 (diff) | |
Merge branch '4.9-armlt-optee' into 4.9-armlt
| -rw-r--r-- | arch/arm64/boot/dts/arm/juno-base.dtsi | 19 | ||||
| -rw-r--r-- | linaro/configs/vexpress64.conf | 2 |
2 files changed, 21 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/arm/juno-base.dtsi b/arch/arm64/boot/dts/arm/juno-base.dtsi index b84be87e546c..d1df5e360d74 100644 --- a/arch/arm64/boot/dts/arm/juno-base.dtsi +++ b/arch/arm64/boot/dts/arm/juno-base.dtsi @@ -626,6 +626,18 @@ <0x00000008 0x80000000 0x1 0x80000000>; }; + reserved-memory { + #address-cells = <2>; + #size-cells = <2>; + ranges; + + /* Shared memory between secure and non-secure world */ + optee@0xfee00000 { + reg = <0x00000000 0xfee00000 0 0x00200000>; + no-map; + }; + }; + smb@08000000 { compatible = "simple-bus"; #address-cells = <2>; @@ -665,3 +677,10 @@ interrupt-map-mask = <0 0>; interrupt-map = <0 0 &gic 0 0 0 168 IRQ_TYPE_LEVEL_HIGH>; }; + + firmware { + optee { + compatible = "linaro,optee-tz"; + method = "smc"; + }; + }; diff --git a/linaro/configs/vexpress64.conf b/linaro/configs/vexpress64.conf index 24119ad1179e..e57c3ff991d7 100644 --- a/linaro/configs/vexpress64.conf +++ b/linaro/configs/vexpress64.conf @@ -82,3 +82,5 @@ CONFIG_ARM_TIMER_SP804=y CONFIG_ARM_CPUIDLE=y CONFIG_PM_DEBUG=y CONFIG_PM_RUNTIME=y +CONFIG_TEE=y +CONFIG_OPTEE=y |