summaryrefslogtreecommitdiff
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorPeng Fan <peng.fan@nxp.com>2017-11-02 09:35:55 +0800
committerJason Liu <jason.hui.liu@nxp.com>2019-02-12 10:29:25 +0800
commitfb81f16701827c23371a0c1e8b3bdd5a4feb4f37 (patch)
treeeac60a0fc46517d153ef8fa8fe1f6b0986cf8471 /arch/arm/configs
parentb3cced5bed0ff65b603e6cfb07d5f8112250d53e (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_defconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/configs/imx_v7_defconfig b/arch/arm/configs/imx_v7_defconfig
index cbd4fe7cfc74..07ef5dae42b0 100644
--- a/arch/arm/configs/imx_v7_defconfig
+++ b/arch/arm/configs/imx_v7_defconfig
@@ -124,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
@@ -380,6 +379,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