diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-15 12:32:47 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-15 12:32:47 -0400 |
commit | 9ced9f03d12d7539e86b0bff5bc750153c976c34 (patch) | |
tree | dcb8a23b0245d3d4d2719d7ea987f7eee608c553 /arch/arm/configs | |
parent | 9b963f32c38b4c7d2da667e4458967b550f30bee (diff) | |
parent | b0b6ff0b21057bb8e58b0be8b427a4713fd4b5a5 (diff) |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable
Conflicts:
arch/arm/mm/Kconfig
Diffstat (limited to 'arch/arm/configs')
-rw-r--r-- | arch/arm/configs/exynos4_defconfig | 70 | ||||
-rw-r--r-- | arch/arm/configs/s5p64x0_defconfig | 2 | ||||
-rw-r--r-- | arch/arm/configs/s5pv210_defconfig | 2 |
3 files changed, 74 insertions, 0 deletions
diff --git a/arch/arm/configs/exynos4_defconfig b/arch/arm/configs/exynos4_defconfig new file mode 100644 index 000000000000..2ffba24d2e2a --- /dev/null +++ b/arch/arm/configs/exynos4_defconfig | |||
@@ -0,0 +1,70 @@ | |||
1 | CONFIG_EXPERIMENTAL=y | ||
2 | CONFIG_BLK_DEV_INITRD=y | ||
3 | CONFIG_KALLSYMS_ALL=y | ||
4 | CONFIG_MODULES=y | ||
5 | CONFIG_MODULE_UNLOAD=y | ||
6 | # CONFIG_BLK_DEV_BSG is not set | ||
7 | CONFIG_ARCH_EXYNOS4=y | ||
8 | CONFIG_S3C_LOWLEVEL_UART_PORT=1 | ||
9 | CONFIG_MACH_SMDKC210=y | ||
10 | CONFIG_MACH_SMDKV310=y | ||
11 | CONFIG_MACH_UNIVERSAL_C210=y | ||
12 | CONFIG_NO_HZ=y | ||
13 | CONFIG_HIGH_RES_TIMERS=y | ||
14 | CONFIG_SMP=y | ||
15 | CONFIG_NR_CPUS=2 | ||
16 | CONFIG_HOTPLUG_CPU=y | ||
17 | CONFIG_PREEMPT=y | ||
18 | CONFIG_AEABI=y | ||
19 | CONFIG_CMDLINE="root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC1,115200 init=/linuxrc mem=256M" | ||
20 | CONFIG_VFP=y | ||
21 | CONFIG_NEON=y | ||
22 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
23 | CONFIG_BLK_DEV_LOOP=y | ||
24 | CONFIG_BLK_DEV_RAM=y | ||
25 | CONFIG_BLK_DEV_RAM_SIZE=8192 | ||
26 | CONFIG_SCSI=y | ||
27 | CONFIG_BLK_DEV_SD=y | ||
28 | CONFIG_CHR_DEV_SG=y | ||
29 | CONFIG_INPUT_EVDEV=y | ||
30 | # CONFIG_INPUT_KEYBOARD is not set | ||
31 | # CONFIG_INPUT_MOUSE is not set | ||
32 | CONFIG_INPUT_TOUCHSCREEN=y | ||
33 | CONFIG_SERIAL_8250=y | ||
34 | CONFIG_SERIAL_SAMSUNG=y | ||
35 | CONFIG_SERIAL_SAMSUNG_CONSOLE=y | ||
36 | CONFIG_HW_RANDOM=y | ||
37 | CONFIG_I2C=y | ||
38 | # CONFIG_HWMON is not set | ||
39 | # CONFIG_MFD_SUPPORT is not set | ||
40 | # CONFIG_HID_SUPPORT is not set | ||
41 | # CONFIG_USB_SUPPORT is not set | ||
42 | CONFIG_EXT2_FS=y | ||
43 | CONFIG_MSDOS_FS=y | ||
44 | CONFIG_VFAT_FS=y | ||
45 | CONFIG_TMPFS=y | ||
46 | CONFIG_TMPFS_POSIX_ACL=y | ||
47 | CONFIG_CRAMFS=y | ||
48 | CONFIG_ROMFS_FS=y | ||
49 | CONFIG_PARTITION_ADVANCED=y | ||
50 | CONFIG_BSD_DISKLABEL=y | ||
51 | CONFIG_SOLARIS_X86_PARTITION=y | ||
52 | CONFIG_NLS_CODEPAGE_437=y | ||
53 | CONFIG_NLS_ASCII=y | ||
54 | CONFIG_NLS_ISO8859_1=y | ||
55 | CONFIG_MAGIC_SYSRQ=y | ||
56 | CONFIG_DEBUG_KERNEL=y | ||
57 | CONFIG_DETECT_HUNG_TASK=y | ||
58 | CONFIG_DEBUG_RT_MUTEXES=y | ||
59 | CONFIG_DEBUG_SPINLOCK=y | ||
60 | CONFIG_DEBUG_MUTEXES=y | ||
61 | CONFIG_DEBUG_SPINLOCK_SLEEP=y | ||
62 | CONFIG_DEBUG_INFO=y | ||
63 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
64 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
65 | CONFIG_DEBUG_USER=y | ||
66 | CONFIG_DEBUG_ERRORS=y | ||
67 | CONFIG_DEBUG_LL=y | ||
68 | CONFIG_EARLY_PRINTK=y | ||
69 | CONFIG_DEBUG_S3C_UART=1 | ||
70 | CONFIG_CRC_CCITT=y | ||
diff --git a/arch/arm/configs/s5p64x0_defconfig b/arch/arm/configs/s5p64x0_defconfig index 2993ecd35145..ad6b61b0bd11 100644 --- a/arch/arm/configs/s5p64x0_defconfig +++ b/arch/arm/configs/s5p64x0_defconfig | |||
@@ -10,6 +10,8 @@ CONFIG_S3C_BOOT_ERROR_RESET=y | |||
10 | CONFIG_S3C_LOWLEVEL_UART_PORT=1 | 10 | CONFIG_S3C_LOWLEVEL_UART_PORT=1 |
11 | CONFIG_MACH_SMDK6440=y | 11 | CONFIG_MACH_SMDK6440=y |
12 | CONFIG_MACH_SMDK6450=y | 12 | CONFIG_MACH_SMDK6450=y |
13 | CONFIG_NO_HZ=y | ||
14 | CONFIG_HIGH_RES_TIMERS=y | ||
13 | CONFIG_CPU_32v6K=y | 15 | CONFIG_CPU_32v6K=y |
14 | CONFIG_AEABI=y | 16 | CONFIG_AEABI=y |
15 | CONFIG_CMDLINE="root=/dev/ram0 rw ramdisk=8192 initrd=0x20800000,8M console=ttySAC1,115200 init=/linuxrc" | 17 | CONFIG_CMDLINE="root=/dev/ram0 rw ramdisk=8192 initrd=0x20800000,8M console=ttySAC1,115200 init=/linuxrc" |
diff --git a/arch/arm/configs/s5pv210_defconfig b/arch/arm/configs/s5pv210_defconfig index 0488a1eb4d7d..fa989902236d 100644 --- a/arch/arm/configs/s5pv210_defconfig +++ b/arch/arm/configs/s5pv210_defconfig | |||
@@ -13,6 +13,8 @@ CONFIG_MACH_AQUILA=y | |||
13 | CONFIG_MACH_GONI=y | 13 | CONFIG_MACH_GONI=y |
14 | CONFIG_MACH_SMDKC110=y | 14 | CONFIG_MACH_SMDKC110=y |
15 | CONFIG_MACH_SMDKV210=y | 15 | CONFIG_MACH_SMDKV210=y |
16 | CONFIG_NO_HZ=y | ||
17 | CONFIG_HIGH_RES_TIMERS=y | ||
16 | CONFIG_VMSPLIT_2G=y | 18 | CONFIG_VMSPLIT_2G=y |
17 | CONFIG_PREEMPT=y | 19 | CONFIG_PREEMPT=y |
18 | CONFIG_AEABI=y | 20 | CONFIG_AEABI=y |