diff options
| author | Peng Fan <peng.fan@nxp.com> | 2017-11-02 09:35:55 +0800 |
|---|---|---|
| committer | Leonard Crestez <leonard.crestez@nxp.com> | 2018-08-24 12:41:33 +0300 |
| commit | 3bacf4635986d67d0e0f1a5f2762e3c075fd47d6 (patch) | |
| tree | bdfcc016da831a3a18139679bf308efe87e57730 /arch/arm/configs | |
| parent | 05f7f0ac099be4c044a92de2b5bcb8d0c9fc6ba0 (diff) | |
MLK-16750-1 arch: arm: imx_v7_defconfig Enable PSCI and TEE
Default enable PSCI and TEE.
If no psci optee node in dts, it works as before.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Reviewed-by: Anson Huang <Anson.Huang@nxp.com>
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/imx_v7_defconfig | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/configs/imx_v7_defconfig b/arch/arm/configs/imx_v7_defconfig index db72311e1602..cc304500ad8d 100644 --- a/arch/arm/configs/imx_v7_defconfig +++ b/arch/arm/configs/imx_v7_defconfig @@ -32,6 +32,7 @@ CONFIG_SOC_VF610=y # CONFIG_SWP_EMULATE is not set CONFIG_SMP=y CONFIG_VMSPLIT_2G=y +CONFIG_ARM_PSCI=y CONFIG_PREEMPT=y CONFIG_AEABI=y CONFIG_HIGHMEM=y @@ -123,7 +124,6 @@ CONFIG_SCSI_SCAN_ASYNC=y # CONFIG_SCSI_LOWLEVEL is not set CONFIG_ATA=y CONFIG_SATA_AHCI_PLATFORM=y -CONFIG_AHCI_IMX=y CONFIG_PATA_IMX=y CONFIG_NETDEVICES=y # CONFIG_NET_VENDOR_BROADCOM is not set @@ -388,6 +388,8 @@ CONFIG_VF610_ADC=y CONFIG_PWM=y CONFIG_PWM_IMX=y CONFIG_PWM_TPM=y +CONFIG_TEE=y +CONFIG_OPTEE=y CONFIG_EXT2_FS=y CONFIG_EXT2_FS_XATTR=y CONFIG_EXT2_FS_POSIX_ACL=y |