aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-07-21 17:22:35 -0400
committerArnd Bergmann <arnd@arndb.de>2012-07-21 17:22:35 -0400
commit2d05bf6ef7391ac3642ab62bc3a649fdb32731fe (patch)
treea8671f0eafa885b4f3ad05204e3ed642b6acab59 /arch/arm/configs
parent9c63cd5a955ce8a3de1776a9e4b6b89c69b2a09e (diff)
parent8c0383b8f6a8012b107cd62eaa5a556586d8ea56 (diff)
Merge branch 'samsung/defconfig' into next/defconfig
From Kukjin Kim <kgene.kim@samsung.com>: It is including new exynos_defconfig for DT configuration of exynos4 and exynos5 together. The old exynos4_defconfig will be used for non-DT for a while and we will try to move on using exynos_defconfig for only DT. * samsung/defconfig: ARM: exynos_defconfig: enable more platforms in defconfig Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/exynos_defconfig92
-rw-r--r--arch/arm/configs/omap2plus_defconfig1
2 files changed, 92 insertions, 1 deletions
diff --git a/arch/arm/configs/exynos_defconfig b/arch/arm/configs/exynos_defconfig
new file mode 100644
index 000000000000..e40b435d204e
--- /dev/null
+++ b/arch/arm/configs/exynos_defconfig
@@ -0,0 +1,92 @@
1CONFIG_EXPERIMENTAL=y
2CONFIG_NO_HZ=y
3CONFIG_HIGH_RES_TIMERS=y
4CONFIG_BLK_DEV_INITRD=y
5CONFIG_KALLSYMS_ALL=y
6CONFIG_MODULES=y
7CONFIG_MODULE_UNLOAD=y
8# CONFIG_BLK_DEV_BSG is not set
9CONFIG_PARTITION_ADVANCED=y
10CONFIG_EFI_PARTITION=y
11CONFIG_ARCH_EXYNOS=y
12CONFIG_S3C_LOWLEVEL_UART_PORT=1
13CONFIG_S3C24XX_PWM=y
14CONFIG_ARCH_EXYNOS5=y
15CONFIG_MACH_EXYNOS4_DT=y
16CONFIG_MACH_EXYNOS5_DT=y
17CONFIG_SMP=y
18CONFIG_NR_CPUS=2
19CONFIG_PREEMPT=y
20CONFIG_AEABI=y
21CONFIG_ARM_APPENDED_DTB=y
22CONFIG_ARM_ATAG_DTB_COMPAT=y
23CONFIG_CMDLINE="root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC1,115200 init=/linuxrc mem=256M"
24CONFIG_VFP=y
25CONFIG_NEON=y
26CONFIG_NET=y
27CONFIG_PACKET=y
28CONFIG_UNIX=y
29CONFIG_NET_KEY=y
30CONFIG_INET=y
31CONFIG_RFKILL_REGULATOR=y
32CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
33CONFIG_PROC_DEVICETREE=y
34CONFIG_BLK_DEV_LOOP=y
35CONFIG_BLK_DEV_RAM=y
36CONFIG_BLK_DEV_RAM_SIZE=8192
37CONFIG_SCSI=y
38CONFIG_BLK_DEV_SD=y
39CONFIG_CHR_DEV_SG=y
40CONFIG_NETDEVICES=y
41CONFIG_SMSC911X=y
42CONFIG_USB_USBNET=y
43CONFIG_USB_NET_SMSC75XX=y
44CONFIG_USB_NET_SMSC95XX=y
45CONFIG_INPUT_EVDEV=y
46# CONFIG_INPUT_KEYBOARD is not set
47# CONFIG_INPUT_MOUSE is not set
48CONFIG_INPUT_TOUCHSCREEN=y
49CONFIG_SERIAL_8250=y
50CONFIG_SERIAL_SAMSUNG=y
51CONFIG_SERIAL_SAMSUNG_CONSOLE=y
52CONFIG_SERIAL_OF_PLATFORM=y
53CONFIG_HW_RANDOM=y
54CONFIG_I2C=y
55# CONFIG_HWMON is not set
56CONFIG_MFD_TPS65090=y
57CONFIG_REGULATOR=y
58CONFIG_REGULATOR_FIXED_VOLTAGE=y
59CONFIG_REGULATOR_GPIO=y
60CONFIG_REGULATOR_TPS65090=y
61CONFIG_FB=y
62CONFIG_EXYNOS_VIDEO=y
63CONFIG_EXYNOS_MIPI_DSI=y
64CONFIG_EXYNOS_DP=y
65CONFIG_FRAMEBUFFER_CONSOLE=y
66CONFIG_FONTS=y
67CONFIG_FONT_7x14=y
68CONFIG_LOGO=y
69CONFIG_USB=y
70CONFIG_EXT2_FS=y
71CONFIG_EXT3_FS=y
72CONFIG_EXT4_FS=y
73CONFIG_MSDOS_FS=y
74CONFIG_VFAT_FS=y
75CONFIG_TMPFS=y
76CONFIG_TMPFS_POSIX_ACL=y
77CONFIG_CRAMFS=y
78CONFIG_ROMFS_FS=y
79CONFIG_NLS_CODEPAGE_437=y
80CONFIG_NLS_ASCII=y
81CONFIG_NLS_ISO8859_1=y
82CONFIG_MAGIC_SYSRQ=y
83CONFIG_DEBUG_KERNEL=y
84CONFIG_DETECT_HUNG_TASK=y
85CONFIG_DEBUG_RT_MUTEXES=y
86CONFIG_DEBUG_SPINLOCK=y
87CONFIG_DEBUG_MUTEXES=y
88CONFIG_DEBUG_INFO=y
89CONFIG_DEBUG_USER=y
90CONFIG_DEBUG_LL=y
91CONFIG_EARLY_PRINTK=y
92CONFIG_CRC_CCITT=y
diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig
index 9854ff4279e0..11828e632532 100644
--- a/arch/arm/configs/omap2plus_defconfig
+++ b/arch/arm/configs/omap2plus_defconfig
@@ -176,7 +176,6 @@ CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
176CONFIG_USB_DEVICEFS=y 176CONFIG_USB_DEVICEFS=y
177CONFIG_USB_SUSPEND=y 177CONFIG_USB_SUSPEND=y
178CONFIG_USB_MON=y 178CONFIG_USB_MON=y
179CONFIG_USB_EHCI_HCD=y
180CONFIG_USB_WDM=y 179CONFIG_USB_WDM=y
181CONFIG_USB_STORAGE=y 180CONFIG_USB_STORAGE=y
182CONFIG_USB_LIBUSUAL=y 181CONFIG_USB_LIBUSUAL=y