aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2011-11-06 00:54:56 -0400
committerKukjin Kim <kgene.kim@samsung.com>2011-11-06 00:54:56 -0400
commit830145796a5c8f1ca3f87ea619063c1d99a57df5 (patch)
treee72a0ecacfcce228c46d93c946cfd65a44cc1fd3 /arch/arm/configs
parente700e41d9abfbf9fee01e979a41b185695132c19 (diff)
ARM: EXYNOS: Add ARCH_EXYNOS and reorganize arch/arm/mach-exynos
The arch/arm/mach-exynos4 directory (CONFIG_ARCH_EXYNOS4) has made for plaforms based on EXYNOS4 SoCs. But since upcoming Samsung's SoCs such as EXYNOS5 (ARM Cortex A15) can reuse most codes in current mach-exynos4, one mach-exynos directory will be used for them. This patch changes to CONFIG_ARCH_EXYNOS (arch/arm/mach-exynos) but keeps original CONFIG_ARCH_EXYNOS4 in mach-exynos/Kconfig to avoid changing in driver side. Cc: Arnd Bergmann <arnd@arndb.de> Cc: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/exynos4_defconfig9
1 files changed, 2 insertions, 7 deletions
diff --git a/arch/arm/configs/exynos4_defconfig b/arch/arm/configs/exynos4_defconfig
index cd40bb56e568..bffe68e190a3 100644
--- a/arch/arm/configs/exynos4_defconfig
+++ b/arch/arm/configs/exynos4_defconfig
@@ -4,19 +4,18 @@ CONFIG_KALLSYMS_ALL=y
4CONFIG_MODULES=y 4CONFIG_MODULES=y
5CONFIG_MODULE_UNLOAD=y 5CONFIG_MODULE_UNLOAD=y
6# CONFIG_BLK_DEV_BSG is not set 6# CONFIG_BLK_DEV_BSG is not set
7CONFIG_ARCH_EXYNOS4=y 7CONFIG_ARCH_EXYNOS=y
8CONFIG_S3C_LOWLEVEL_UART_PORT=1 8CONFIG_S3C_LOWLEVEL_UART_PORT=1
9CONFIG_MACH_SMDKC210=y 9CONFIG_MACH_SMDKC210=y
10CONFIG_MACH_SMDKV310=y
11CONFIG_MACH_ARMLEX4210=y 10CONFIG_MACH_ARMLEX4210=y
12CONFIG_MACH_UNIVERSAL_C210=y 11CONFIG_MACH_UNIVERSAL_C210=y
13CONFIG_MACH_NURI=y 12CONFIG_MACH_NURI=y
14CONFIG_MACH_ORIGEN=y 13CONFIG_MACH_ORIGEN=y
14CONFIG_MACH_SMDK4412=y
15CONFIG_NO_HZ=y 15CONFIG_NO_HZ=y
16CONFIG_HIGH_RES_TIMERS=y 16CONFIG_HIGH_RES_TIMERS=y
17CONFIG_SMP=y 17CONFIG_SMP=y
18CONFIG_NR_CPUS=2 18CONFIG_NR_CPUS=2
19CONFIG_HOTPLUG_CPU=y
20CONFIG_PREEMPT=y 19CONFIG_PREEMPT=y
21CONFIG_AEABI=y 20CONFIG_AEABI=y
22CONFIG_CMDLINE="root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC1,115200 init=/linuxrc mem=256M" 21CONFIG_CMDLINE="root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC1,115200 init=/linuxrc mem=256M"
@@ -61,13 +60,9 @@ CONFIG_DETECT_HUNG_TASK=y
61CONFIG_DEBUG_RT_MUTEXES=y 60CONFIG_DEBUG_RT_MUTEXES=y
62CONFIG_DEBUG_SPINLOCK=y 61CONFIG_DEBUG_SPINLOCK=y
63CONFIG_DEBUG_MUTEXES=y 62CONFIG_DEBUG_MUTEXES=y
64CONFIG_DEBUG_SPINLOCK_SLEEP=y
65CONFIG_DEBUG_INFO=y 63CONFIG_DEBUG_INFO=y
66# CONFIG_RCU_CPU_STALL_DETECTOR is not set
67CONFIG_SYSCTL_SYSCALL_CHECK=y 64CONFIG_SYSCTL_SYSCALL_CHECK=y
68CONFIG_DEBUG_USER=y 65CONFIG_DEBUG_USER=y
69CONFIG_DEBUG_ERRORS=y
70CONFIG_DEBUG_LL=y 66CONFIG_DEBUG_LL=y
71CONFIG_EARLY_PRINTK=y 67CONFIG_EARLY_PRINTK=y
72CONFIG_DEBUG_S3C_UART=1
73CONFIG_CRC_CCITT=y 68CONFIG_CRC_CCITT=y