aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVitaly Andrianov2015-01-20 13:06:05 -0600
committerVitaly Andrianov2015-01-20 13:07:33 -0600
commit85ef2730888a3293da5100729e45f91197342bb0 (patch)
treecd369efd56e0e67aaf9b065906ccd265210302b8
parentd6ff70684fafafc3838209ff7de1ce2edca4a106 (diff)
downloadlinux-85ef2730888a3293da5100729e45f91197342bb0.tar.gz
linux-85ef2730888a3293da5100729e45f91197342bb0.tar.xz
linux-85ef2730888a3293da5100729e45f91197342bb0.zip
ARM: keystone: defconfig: add ARM_PSCI and HOTPLUG_CPU support
Signed-off-by: Vitaly Andrianov <vitalya@ti.com>
-rw-r--r--arch/arm/configs/keystone2_defconfig11
-rw-r--r--arch/arm/configs/keystone2_fullrt_defconfig7
2 files changed, 8 insertions, 10 deletions
diff --git a/arch/arm/configs/keystone2_defconfig b/arch/arm/configs/keystone2_defconfig
index d6dbfbebdb8..fc7682f18fb 100644
--- a/arch/arm/configs/keystone2_defconfig
+++ b/arch/arm/configs/keystone2_defconfig
@@ -32,6 +32,8 @@ CONFIG_TI_KEYSTONE_PCIE=y
32CONFIG_PCIE_ECRC=y 32CONFIG_PCIE_ECRC=y
33CONFIG_SMP=y 33CONFIG_SMP=y
34CONFIG_HAVE_ARM_ARCH_TIMER=y 34CONFIG_HAVE_ARM_ARCH_TIMER=y
35CONFIG_HOTPLUG_CPU=y
36CONFIG_ARM_PSCI=y
35CONFIG_AEABI=y 37CONFIG_AEABI=y
36CONFIG_HIGHMEM=y 38CONFIG_HIGHMEM=y
37CONFIG_VFP=y 39CONFIG_VFP=y
@@ -186,6 +188,8 @@ CONFIG_NET_ACT_SKBEDIT=m
186CONFIG_NET_ACT_CSUM=m 188CONFIG_NET_ACT_CSUM=m
187CONFIG_NET_CLS_IND=y 189CONFIG_NET_CLS_IND=y
188CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 190CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
191CONFIG_DEVTMPFS=y
192CONFIG_DEVTMPFS_MOUNT=y
189CONFIG_MTD=y 193CONFIG_MTD=y
190CONFIG_MTD_TESTS=m 194CONFIG_MTD_TESTS=m
191CONFIG_MTD_CMDLINE_PARTS=y 195CONFIG_MTD_CMDLINE_PARTS=y
@@ -198,7 +202,6 @@ CONFIG_MTD_UBI=y
198CONFIG_PROC_DEVICETREE=y 202CONFIG_PROC_DEVICETREE=y
199CONFIG_BLK_DEV_LOOP=y 203CONFIG_BLK_DEV_LOOP=y
200CONFIG_EEPROM_AT24=y 204CONFIG_EEPROM_AT24=y
201CONFIG_SCSI=y
202CONFIG_BLK_DEV_SD=y 205CONFIG_BLK_DEV_SD=y
203CONFIG_CHR_DEV_SG=y 206CONFIG_CHR_DEV_SG=y
204CONFIG_ATA=y 207CONFIG_ATA=y
@@ -276,15 +279,11 @@ CONFIG_PRINTK_TIME=y
276CONFIG_DEBUG_INFO=y 279CONFIG_DEBUG_INFO=y
277CONFIG_DEBUG_USER=y 280CONFIG_DEBUG_USER=y
278CONFIG_CRYPTO_USER=y 281CONFIG_CRYPTO_USER=y
279CONFIG_CRYPTO_NULL=y
280CONFIG_CRYPTO_GCM=y 282CONFIG_CRYPTO_GCM=y
281CONFIG_CRYPTO_CBC=y 283CONFIG_CRYPTO_CBC=y
282CONFIG_CRYPTO_CTR=y
283CONFIG_CRYPTO_XCBC=y 284CONFIG_CRYPTO_XCBC=y
285CONFIG_CRYPTO_SHA256=y
284CONFIG_CRYPTO_DES=y 286CONFIG_CRYPTO_DES=y
285CONFIG_CRYPTO_ANSI_CPRNG=y 287CONFIG_CRYPTO_ANSI_CPRNG=y
286CONFIG_CRYPTO_USER_API_HASH=y 288CONFIG_CRYPTO_USER_API_HASH=y
287CONFIG_CRYPTO_USER_API_SKCIPHER=y 289CONFIG_CRYPTO_USER_API_SKCIPHER=y
288CONFIG_DEVTMPFS=y
289CONFIG_DEVTMPFS_MOUNT=y
290CONFIG_CRYPTO_SHA256=y
diff --git a/arch/arm/configs/keystone2_fullrt_defconfig b/arch/arm/configs/keystone2_fullrt_defconfig
index c45103f08a5..a841946a1a0 100644
--- a/arch/arm/configs/keystone2_fullrt_defconfig
+++ b/arch/arm/configs/keystone2_fullrt_defconfig
@@ -31,6 +31,8 @@ CONFIG_TI_KEYSTONE_PCIE=y
31CONFIG_PCIE_ECRC=y 31CONFIG_PCIE_ECRC=y
32CONFIG_SMP=y 32CONFIG_SMP=y
33CONFIG_HAVE_ARM_ARCH_TIMER=y 33CONFIG_HAVE_ARM_ARCH_TIMER=y
34CONFIG_HOTPLUG_CPU=y
35CONFIG_ARM_PSCI=y
34CONFIG_PREEMPT_RT_FULL=y 36CONFIG_PREEMPT_RT_FULL=y
35CONFIG_AEABI=y 37CONFIG_AEABI=y
36CONFIG_HIGHMEM=y 38CONFIG_HIGHMEM=y
@@ -202,7 +204,6 @@ CONFIG_MTD_UBI=y
202CONFIG_PROC_DEVICETREE=y 204CONFIG_PROC_DEVICETREE=y
203CONFIG_BLK_DEV_LOOP=y 205CONFIG_BLK_DEV_LOOP=y
204CONFIG_EEPROM_AT24=y 206CONFIG_EEPROM_AT24=y
205CONFIG_SCSI=y
206CONFIG_BLK_DEV_SD=y 207CONFIG_BLK_DEV_SD=y
207CONFIG_CHR_DEV_SG=y 208CONFIG_CHR_DEV_SG=y
208CONFIG_ATA=y 209CONFIG_ATA=y
@@ -282,14 +283,12 @@ CONFIG_DEBUG_INFO=y
282# CONFIG_FTRACE is not set 283# CONFIG_FTRACE is not set
283CONFIG_DEBUG_USER=y 284CONFIG_DEBUG_USER=y
284CONFIG_CRYPTO_USER=y 285CONFIG_CRYPTO_USER=y
285CONFIG_CRYPTO_NULL=y
286CONFIG_CRYPTO_GCM=y 286CONFIG_CRYPTO_GCM=y
287CONFIG_CRYPTO_CBC=y 287CONFIG_CRYPTO_CBC=y
288CONFIG_CRYPTO_CTR=y
289CONFIG_CRYPTO_XCBC=y 288CONFIG_CRYPTO_XCBC=y
289CONFIG_CRYPTO_SHA256=y
290CONFIG_CRYPTO_DES=y 290CONFIG_CRYPTO_DES=y
291CONFIG_CRYPTO_ANSI_CPRNG=y 291CONFIG_CRYPTO_ANSI_CPRNG=y
292CONFIG_CRYPTO_USER_API_HASH=y 292CONFIG_CRYPTO_USER_API_HASH=y
293CONFIG_CRYPTO_USER_API_SKCIPHER=y 293CONFIG_CRYPTO_USER_API_SKCIPHER=y
294CONFIG_LIBCRC32C=y 294CONFIG_LIBCRC32C=y
295CONFIG_CRYPTO_SHA256=y