diff options
| author | Jon Medhurst <tixy@linaro.org> | 2016-04-20 16:43:09 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2016-04-20 16:43:09 +0100 |
| commit | 9aebb6b7ae6088969d548097b4ecea5982b1f27e (patch) | |
| tree | 370faea200f4f8cd567bcb236dc8bffd8d768084 | |
| parent | 5dedb73e6ee9ee30ccdc29de6b395d02d0e66d75 (diff) | |
| parent | 7ca6e9a4f0bf0cb80fd0c7f36a4524431c69596c (diff) | |
Merge branch 'lsk-3.18-armlt-configs' into integration-lsk-3.18-armlt-androidlsk-3.18-armlt-20160420
Conflicts:
linaro/configs/vexpress64.conf
| -rw-r--r-- | linaro/configs/vexpress64.conf | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/linaro/configs/vexpress64.conf b/linaro/configs/vexpress64.conf index a6d011d904da..3ef169e8fdde 100644 --- a/linaro/configs/vexpress64.conf +++ b/linaro/configs/vexpress64.conf @@ -64,6 +64,8 @@ CONFIG_CONNECTOR=y CONFIG_ATA=y CONFIG_SATA_SIL24=y CONFIG_SKY2=y +CONFIG_TEE=y +CONFIG_OPTEE=y CONFIG_DEVMEM=y CONFIG_ARM64_CPUIDLE=y CONFIG_MAILBOX=y |