diff options
Diffstat (limited to 'arch/arm/configs')
-rw-r--r-- | arch/arm/configs/at91sam9g20ek_defconfig | 1 | ||||
-rw-r--r-- | arch/arm/configs/kirkwood_defconfig | 1 | ||||
-rw-r--r-- | arch/arm/configs/mx27_defconfig | 15 | ||||
-rw-r--r-- | arch/arm/configs/mx31pdk_defconfig | 44 | ||||
-rw-r--r-- | arch/arm/configs/mx3_defconfig | 2 | ||||
-rw-r--r-- | arch/arm/configs/mx51_defconfig | 9 | ||||
-rw-r--r-- | arch/arm/configs/realview-smp_defconfig | 15 | ||||
-rw-r--r-- | arch/arm/configs/realview_defconfig | 15 | ||||
-rw-r--r-- | arch/arm/configs/s5p64x0_defconfig (renamed from arch/arm/configs/s5p6440_defconfig) | 3 | ||||
-rw-r--r-- | arch/arm/configs/u300_defconfig | 37 |
10 files changed, 48 insertions, 94 deletions
diff --git a/arch/arm/configs/at91sam9g20ek_defconfig b/arch/arm/configs/at91sam9g20ek_defconfig index f1bac70d6ce9..9e90e6d79297 100644 --- a/arch/arm/configs/at91sam9g20ek_defconfig +++ b/arch/arm/configs/at91sam9g20ek_defconfig | |||
@@ -13,6 +13,7 @@ CONFIG_MODULE_UNLOAD=y | |||
13 | CONFIG_ARCH_AT91=y | 13 | CONFIG_ARCH_AT91=y |
14 | CONFIG_ARCH_AT91SAM9G20=y | 14 | CONFIG_ARCH_AT91SAM9G20=y |
15 | CONFIG_MACH_AT91SAM9G20EK=y | 15 | CONFIG_MACH_AT91SAM9G20EK=y |
16 | CONFIG_MACH_AT91SAM9G20EK_2MMC=y | ||
16 | CONFIG_AT91_PROGRAMMABLE_CLOCKS=y | 17 | CONFIG_AT91_PROGRAMMABLE_CLOCKS=y |
17 | # CONFIG_ARM_THUMB is not set | 18 | # CONFIG_ARM_THUMB is not set |
18 | CONFIG_AEABI=y | 19 | CONFIG_AEABI=y |
diff --git a/arch/arm/configs/kirkwood_defconfig b/arch/arm/configs/kirkwood_defconfig index ccc9c9959b82..2f7042813765 100644 --- a/arch/arm/configs/kirkwood_defconfig +++ b/arch/arm/configs/kirkwood_defconfig | |||
@@ -15,6 +15,7 @@ CONFIG_MACH_MV88F6281GTW_GE=y | |||
15 | CONFIG_MACH_SHEEVAPLUG=y | 15 | CONFIG_MACH_SHEEVAPLUG=y |
16 | CONFIG_MACH_ESATA_SHEEVAPLUG=y | 16 | CONFIG_MACH_ESATA_SHEEVAPLUG=y |
17 | CONFIG_MACH_GURUPLUG=y | 17 | CONFIG_MACH_GURUPLUG=y |
18 | CONFIG_MACH_DOCKSTAR=y | ||
18 | CONFIG_MACH_TS219=y | 19 | CONFIG_MACH_TS219=y |
19 | CONFIG_MACH_TS41X=y | 20 | CONFIG_MACH_TS41X=y |
20 | CONFIG_MACH_OPENRD_BASE=y | 21 | CONFIG_MACH_OPENRD_BASE=y |
diff --git a/arch/arm/configs/mx27_defconfig b/arch/arm/configs/mx27_defconfig index b2038b0e266f..813cfb366c18 100644 --- a/arch/arm/configs/mx27_defconfig +++ b/arch/arm/configs/mx27_defconfig | |||
@@ -21,8 +21,14 @@ CONFIG_ARCH_MX2=y | |||
21 | CONFIG_MACH_MX27=y | 21 | CONFIG_MACH_MX27=y |
22 | CONFIG_MACH_MX27ADS=y | 22 | CONFIG_MACH_MX27ADS=y |
23 | CONFIG_MACH_PCM038=y | 23 | CONFIG_MACH_PCM038=y |
24 | CONFIG_MACH_CPUIMX27=y | ||
25 | CONFIG_MACH_EUKREA_CPUIMX27_USESDHC2=y | ||
26 | CONFIG_MACH_EUKREA_CPUIMX27_USEUART4=y | ||
24 | CONFIG_MACH_MX27_3DS=y | 27 | CONFIG_MACH_MX27_3DS=y |
28 | CONFIG_MACH_IMX27_VISSTRIM_M10=y | ||
25 | CONFIG_MACH_IMX27LITE=y | 29 | CONFIG_MACH_IMX27LITE=y |
30 | CONFIG_MACH_PCA100=y | ||
31 | CONFIG_MACH_MXT_TD60=y | ||
26 | CONFIG_MXC_IRQ_PRIOR=y | 32 | CONFIG_MXC_IRQ_PRIOR=y |
27 | CONFIG_MXC_PWM=y | 33 | CONFIG_MXC_PWM=y |
28 | CONFIG_NO_HZ=y | 34 | CONFIG_NO_HZ=y |
@@ -76,7 +82,9 @@ CONFIG_INPUT_EVDEV=y | |||
76 | # CONFIG_INPUT_KEYBOARD is not set | 82 | # CONFIG_INPUT_KEYBOARD is not set |
77 | # CONFIG_INPUT_MOUSE is not set | 83 | # CONFIG_INPUT_MOUSE is not set |
78 | CONFIG_INPUT_TOUCHSCREEN=y | 84 | CONFIG_INPUT_TOUCHSCREEN=y |
85 | CONFIG_TOUCHSCREEN_ADS7846=m | ||
79 | # CONFIG_SERIO is not set | 86 | # CONFIG_SERIO is not set |
87 | CONFIG_SERIAL_8250=m | ||
80 | CONFIG_SERIAL_IMX=y | 88 | CONFIG_SERIAL_IMX=y |
81 | CONFIG_SERIAL_IMX_CONSOLE=y | 89 | CONFIG_SERIAL_IMX_CONSOLE=y |
82 | # CONFIG_LEGACY_PTYS is not set | 90 | # CONFIG_LEGACY_PTYS is not set |
@@ -85,19 +93,20 @@ CONFIG_I2C=y | |||
85 | CONFIG_I2C_CHARDEV=y | 93 | CONFIG_I2C_CHARDEV=y |
86 | CONFIG_I2C_IMX=y | 94 | CONFIG_I2C_IMX=y |
87 | CONFIG_SPI=y | 95 | CONFIG_SPI=y |
88 | CONFIG_SPI_BITBANG=y | 96 | CONFIG_SPI_IMX=y |
89 | CONFIG_W1=y | 97 | CONFIG_W1=y |
90 | CONFIG_W1_MASTER_MXC=y | 98 | CONFIG_W1_MASTER_MXC=y |
91 | CONFIG_W1_SLAVE_THERM=y | 99 | CONFIG_W1_SLAVE_THERM=y |
92 | # CONFIG_HWMON is not set | 100 | # CONFIG_HWMON is not set |
93 | CONFIG_FB=y | 101 | CONFIG_FB=y |
94 | CONFIG_FB_IMX=y | 102 | CONFIG_FB_IMX=y |
95 | # CONFIG_VGA_CONSOLE is not set | ||
96 | CONFIG_FRAMEBUFFER_CONSOLE=y | 103 | CONFIG_FRAMEBUFFER_CONSOLE=y |
97 | CONFIG_FONTS=y | 104 | CONFIG_FONTS=y |
98 | CONFIG_FONT_8x8=y | 105 | CONFIG_FONT_8x8=y |
99 | # CONFIG_HID_SUPPORT is not set | 106 | # CONFIG_HID_SUPPORT is not set |
100 | # CONFIG_USB_SUPPORT is not set | 107 | CONFIG_USB=m |
108 | # CONFIG_USB_DEVICE_CLASS is not set | ||
109 | CONFIG_USB_ULPI=y | ||
101 | CONFIG_MMC=y | 110 | CONFIG_MMC=y |
102 | CONFIG_MMC_MXC=y | 111 | CONFIG_MMC_MXC=y |
103 | CONFIG_RTC_CLASS=y | 112 | CONFIG_RTC_CLASS=y |
diff --git a/arch/arm/configs/mx31pdk_defconfig b/arch/arm/configs/mx31pdk_defconfig deleted file mode 100644 index 2d29329749e4..000000000000 --- a/arch/arm/configs/mx31pdk_defconfig +++ /dev/null | |||
@@ -1,44 +0,0 @@ | |||
1 | # CONFIG_LOCALVERSION_AUTO is not set | ||
2 | # CONFIG_SWAP is not set | ||
3 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
4 | # CONFIG_COMPAT_BRK is not set | ||
5 | # CONFIG_IOSCHED_DEADLINE is not set | ||
6 | # CONFIG_IOSCHED_CFQ is not set | ||
7 | CONFIG_ARCH_MXC=y | ||
8 | # CONFIG_MACH_MX31ADS is not set | ||
9 | CONFIG_MACH_MX31_3DS=y | ||
10 | CONFIG_AEABI=y | ||
11 | CONFIG_NET=y | ||
12 | CONFIG_PACKET=y | ||
13 | CONFIG_UNIX=y | ||
14 | CONFIG_NET_KEY=y | ||
15 | CONFIG_INET=y | ||
16 | CONFIG_IP_PNP=y | ||
17 | CONFIG_IP_PNP_DHCP=y | ||
18 | # CONFIG_INET_LRO is not set | ||
19 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
20 | # CONFIG_PREVENT_FIRMWARE_BUILD is not set | ||
21 | # CONFIG_FIRMWARE_IN_KERNEL is not set | ||
22 | # CONFIG_BLK_DEV is not set | ||
23 | # CONFIG_MISC_DEVICES is not set | ||
24 | CONFIG_NETDEVICES=y | ||
25 | CONFIG_NET_ETHERNET=y | ||
26 | # CONFIG_INPUT_MOUSEDEV_PSAUX is not set | ||
27 | # CONFIG_INPUT_KEYBOARD is not set | ||
28 | # CONFIG_INPUT_MOUSE is not set | ||
29 | # CONFIG_SERIO is not set | ||
30 | # CONFIG_DEVKMEM is not set | ||
31 | CONFIG_SERIAL_IMX=y | ||
32 | CONFIG_SERIAL_IMX_CONSOLE=y | ||
33 | # CONFIG_LEGACY_PTYS is not set | ||
34 | # CONFIG_HW_RANDOM is not set | ||
35 | # CONFIG_HWMON is not set | ||
36 | # CONFIG_VGA_CONSOLE is not set | ||
37 | # CONFIG_HID_SUPPORT is not set | ||
38 | # CONFIG_USB_SUPPORT is not set | ||
39 | # CONFIG_DNOTIFY is not set | ||
40 | # CONFIG_ENABLE_WARN_DEPRECATED is not set | ||
41 | # CONFIG_ENABLE_MUST_CHECK is not set | ||
42 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
43 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
44 | # CONFIG_CRC32 is not set | ||
diff --git a/arch/arm/configs/mx3_defconfig b/arch/arm/configs/mx3_defconfig index 161f907b611f..f0c339fd5d21 100644 --- a/arch/arm/configs/mx3_defconfig +++ b/arch/arm/configs/mx3_defconfig | |||
@@ -24,6 +24,7 @@ CONFIG_MACH_PCM043=y | |||
24 | CONFIG_MACH_ARMADILLO5X0=y | 24 | CONFIG_MACH_ARMADILLO5X0=y |
25 | CONFIG_MACH_MX35_3DS=y | 25 | CONFIG_MACH_MX35_3DS=y |
26 | CONFIG_MACH_KZM_ARM11_01=y | 26 | CONFIG_MACH_KZM_ARM11_01=y |
27 | CONFIG_MACH_EUKREA_CPUIMX35=y | ||
27 | CONFIG_MXC_IRQ_PRIOR=y | 28 | CONFIG_MXC_IRQ_PRIOR=y |
28 | CONFIG_MXC_PWM=y | 29 | CONFIG_MXC_PWM=y |
29 | CONFIG_NO_HZ=y | 30 | CONFIG_NO_HZ=y |
@@ -108,7 +109,6 @@ CONFIG_MMC=y | |||
108 | CONFIG_MMC_MXC=y | 109 | CONFIG_MMC_MXC=y |
109 | CONFIG_DMADEVICES=y | 110 | CONFIG_DMADEVICES=y |
110 | # CONFIG_DNOTIFY is not set | 111 | # CONFIG_DNOTIFY is not set |
111 | CONFIG_INOTIFY=y | ||
112 | CONFIG_TMPFS=y | 112 | CONFIG_TMPFS=y |
113 | CONFIG_JFFS2_FS=y | 113 | CONFIG_JFFS2_FS=y |
114 | CONFIG_UBIFS_FS=y | 114 | CONFIG_UBIFS_FS=y |
diff --git a/arch/arm/configs/mx51_defconfig b/arch/arm/configs/mx51_defconfig index a665ecbbe2bc..163cfee7644c 100644 --- a/arch/arm/configs/mx51_defconfig +++ b/arch/arm/configs/mx51_defconfig | |||
@@ -15,6 +15,8 @@ CONFIG_MODULE_SRCVERSION_ALL=y | |||
15 | CONFIG_ARCH_MXC=y | 15 | CONFIG_ARCH_MXC=y |
16 | CONFIG_ARCH_MX5=y | 16 | CONFIG_ARCH_MX5=y |
17 | CONFIG_MACH_MX51_BABBAGE=y | 17 | CONFIG_MACH_MX51_BABBAGE=y |
18 | CONFIG_MACH_MX51_3DS=y | ||
19 | CONFIG_MACH_EUKREA_CPUIMX51=y | ||
18 | CONFIG_NO_HZ=y | 20 | CONFIG_NO_HZ=y |
19 | CONFIG_HIGH_RES_TIMERS=y | 21 | CONFIG_HIGH_RES_TIMERS=y |
20 | CONFIG_PREEMPT_VOLUNTARY=y | 22 | CONFIG_PREEMPT_VOLUNTARY=y |
@@ -69,7 +71,6 @@ CONFIG_REALTEK_PHY=y | |||
69 | CONFIG_NATIONAL_PHY=y | 71 | CONFIG_NATIONAL_PHY=y |
70 | CONFIG_STE10XP=y | 72 | CONFIG_STE10XP=y |
71 | CONFIG_LSI_ET1011C_PHY=y | 73 | CONFIG_LSI_ET1011C_PHY=y |
72 | CONFIG_FIXED_PHY=y | ||
73 | CONFIG_MDIO_BITBANG=y | 74 | CONFIG_MDIO_BITBANG=y |
74 | CONFIG_MDIO_GPIO=y | 75 | CONFIG_MDIO_GPIO=y |
75 | CONFIG_NET_ETHERNET=y | 76 | CONFIG_NET_ETHERNET=y |
@@ -100,7 +101,6 @@ CONFIG_I2C_ALGOPCF=m | |||
100 | CONFIG_I2C_ALGOPCA=m | 101 | CONFIG_I2C_ALGOPCA=m |
101 | CONFIG_GPIO_SYSFS=y | 102 | CONFIG_GPIO_SYSFS=y |
102 | # CONFIG_HWMON is not set | 103 | # CONFIG_HWMON is not set |
103 | # CONFIG_VGA_CONSOLE is not set | ||
104 | # CONFIG_HID_SUPPORT is not set | 104 | # CONFIG_HID_SUPPORT is not set |
105 | CONFIG_USB=y | 105 | CONFIG_USB=y |
106 | CONFIG_USB_EHCI_HCD=y | 106 | CONFIG_USB_EHCI_HCD=y |
@@ -117,13 +117,11 @@ CONFIG_EXT2_FS_XATTR=y | |||
117 | CONFIG_EXT2_FS_POSIX_ACL=y | 117 | CONFIG_EXT2_FS_POSIX_ACL=y |
118 | CONFIG_EXT2_FS_SECURITY=y | 118 | CONFIG_EXT2_FS_SECURITY=y |
119 | CONFIG_EXT3_FS=y | 119 | CONFIG_EXT3_FS=y |
120 | CONFIG_EXT3_DEFAULTS_TO_ORDERED=y | ||
121 | CONFIG_EXT3_FS_POSIX_ACL=y | 120 | CONFIG_EXT3_FS_POSIX_ACL=y |
122 | CONFIG_EXT3_FS_SECURITY=y | 121 | CONFIG_EXT3_FS_SECURITY=y |
123 | CONFIG_EXT4_FS=y | 122 | CONFIG_EXT4_FS=y |
124 | CONFIG_EXT4_FS_POSIX_ACL=y | 123 | CONFIG_EXT4_FS_POSIX_ACL=y |
125 | CONFIG_EXT4_FS_SECURITY=y | 124 | CONFIG_EXT4_FS_SECURITY=y |
126 | CONFIG_INOTIFY=y | ||
127 | CONFIG_QUOTA=y | 125 | CONFIG_QUOTA=y |
128 | CONFIG_QUOTA_NETLINK_INTERFACE=y | 126 | CONFIG_QUOTA_NETLINK_INTERFACE=y |
129 | # CONFIG_PRINT_QUOTA_WARNING is not set | 127 | # CONFIG_PRINT_QUOTA_WARNING is not set |
@@ -136,6 +134,7 @@ CONFIG_ZISOFS=y | |||
136 | CONFIG_UDF_FS=m | 134 | CONFIG_UDF_FS=m |
137 | CONFIG_MSDOS_FS=m | 135 | CONFIG_MSDOS_FS=m |
138 | CONFIG_VFAT_FS=y | 136 | CONFIG_VFAT_FS=y |
137 | CONFIG_TMPFS=y | ||
139 | CONFIG_CONFIGFS_FS=m | 138 | CONFIG_CONFIGFS_FS=m |
140 | CONFIG_NFS_FS=y | 139 | CONFIG_NFS_FS=y |
141 | CONFIG_NFS_V3=y | 140 | CONFIG_NFS_V3=y |
@@ -151,7 +150,6 @@ CONFIG_NLS_UTF8=y | |||
151 | CONFIG_MAGIC_SYSRQ=y | 150 | CONFIG_MAGIC_SYSRQ=y |
152 | CONFIG_DEBUG_FS=y | 151 | CONFIG_DEBUG_FS=y |
153 | CONFIG_DEBUG_KERNEL=y | 152 | CONFIG_DEBUG_KERNEL=y |
154 | # CONFIG_DETECT_SOFTLOCKUP is not set | ||
155 | # CONFIG_SCHED_DEBUG is not set | 153 | # CONFIG_SCHED_DEBUG is not set |
156 | # CONFIG_DEBUG_BUGVERBOSE is not set | 154 | # CONFIG_DEBUG_BUGVERBOSE is not set |
157 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 155 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
@@ -159,7 +157,6 @@ CONFIG_DEBUG_KERNEL=y | |||
159 | # CONFIG_ARM_UNWIND is not set | 157 | # CONFIG_ARM_UNWIND is not set |
160 | CONFIG_DEBUG_LL=y | 158 | CONFIG_DEBUG_LL=y |
161 | CONFIG_EARLY_PRINTK=y | 159 | CONFIG_EARLY_PRINTK=y |
162 | CONFIG_KEYS=y | ||
163 | CONFIG_SECURITYFS=y | 160 | CONFIG_SECURITYFS=y |
164 | CONFIG_CRYPTO_DEFLATE=y | 161 | CONFIG_CRYPTO_DEFLATE=y |
165 | CONFIG_CRYPTO_LZO=y | 162 | CONFIG_CRYPTO_LZO=y |
diff --git a/arch/arm/configs/realview-smp_defconfig b/arch/arm/configs/realview-smp_defconfig index 9312ef9f9bf4..5ca7a61f7c01 100644 --- a/arch/arm/configs/realview-smp_defconfig +++ b/arch/arm/configs/realview-smp_defconfig | |||
@@ -39,6 +39,7 @@ CONFIG_MTD_CFI=y | |||
39 | CONFIG_MTD_CFI_INTELEXT=y | 39 | CONFIG_MTD_CFI_INTELEXT=y |
40 | CONFIG_MTD_CFI_AMDSTD=y | 40 | CONFIG_MTD_CFI_AMDSTD=y |
41 | CONFIG_MTD_ARM_INTEGRATOR=y | 41 | CONFIG_MTD_ARM_INTEGRATOR=y |
42 | CONFIG_ARM_CHARLCD=y | ||
42 | CONFIG_NETDEVICES=y | 43 | CONFIG_NETDEVICES=y |
43 | CONFIG_SMSC_PHY=y | 44 | CONFIG_SMSC_PHY=y |
44 | CONFIG_NET_ETHERNET=y | 45 | CONFIG_NET_ETHERNET=y |
@@ -52,10 +53,13 @@ CONFIG_SERIAL_AMBA_PL011=y | |||
52 | CONFIG_SERIAL_AMBA_PL011_CONSOLE=y | 53 | CONFIG_SERIAL_AMBA_PL011_CONSOLE=y |
53 | CONFIG_LEGACY_PTY_COUNT=16 | 54 | CONFIG_LEGACY_PTY_COUNT=16 |
54 | # CONFIG_HW_RANDOM is not set | 55 | # CONFIG_HW_RANDOM is not set |
56 | CONFIG_I2C=y | ||
57 | CONFIG_I2C_VERSATILE=y | ||
58 | CONFIG_SPI=y | ||
59 | CONFIG_GPIOLIB=y | ||
55 | # CONFIG_HWMON is not set | 60 | # CONFIG_HWMON is not set |
56 | CONFIG_FB=y | 61 | CONFIG_FB=y |
57 | CONFIG_FB_ARMCLCD=y | 62 | CONFIG_FB_ARMCLCD=y |
58 | # CONFIG_VGA_CONSOLE is not set | ||
59 | CONFIG_FRAMEBUFFER_CONSOLE=y | 63 | CONFIG_FRAMEBUFFER_CONSOLE=y |
60 | CONFIG_LOGO=y | 64 | CONFIG_LOGO=y |
61 | # CONFIG_LOGO_LINUX_MONO is not set | 65 | # CONFIG_LOGO_LINUX_MONO is not set |
@@ -70,7 +74,13 @@ CONFIG_SND_ARMAACI=y | |||
70 | # CONFIG_USB_SUPPORT is not set | 74 | # CONFIG_USB_SUPPORT is not set |
71 | CONFIG_MMC=y | 75 | CONFIG_MMC=y |
72 | CONFIG_MMC_ARMMMCI=y | 76 | CONFIG_MMC_ARMMMCI=y |
73 | CONFIG_INOTIFY=y | 77 | CONFIG_NEW_LEDS=y |
78 | CONFIG_LEDS_CLASS=y | ||
79 | CONFIG_LEDS_TRIGGERS=y | ||
80 | CONFIG_LEDS_TRIGGER_HEARTBEAT=y | ||
81 | CONFIG_RTC_CLASS=y | ||
82 | CONFIG_RTC_DRV_DS1307=y | ||
83 | CONFIG_RTC_DRV_PL031=y | ||
74 | CONFIG_VFAT_FS=y | 84 | CONFIG_VFAT_FS=y |
75 | CONFIG_TMPFS=y | 85 | CONFIG_TMPFS=y |
76 | CONFIG_CRAMFS=y | 86 | CONFIG_CRAMFS=y |
@@ -80,6 +90,7 @@ CONFIG_ROOT_NFS=y | |||
80 | CONFIG_NLS_CODEPAGE_437=y | 90 | CONFIG_NLS_CODEPAGE_437=y |
81 | CONFIG_NLS_ISO8859_1=y | 91 | CONFIG_NLS_ISO8859_1=y |
82 | CONFIG_MAGIC_SYSRQ=y | 92 | CONFIG_MAGIC_SYSRQ=y |
93 | CONFIG_DEBUG_FS=y | ||
83 | CONFIG_DEBUG_KERNEL=y | 94 | CONFIG_DEBUG_KERNEL=y |
84 | # CONFIG_SCHED_DEBUG is not set | 95 | # CONFIG_SCHED_DEBUG is not set |
85 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 96 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
diff --git a/arch/arm/configs/realview_defconfig b/arch/arm/configs/realview_defconfig index fb75192ee7e5..fcaa60328051 100644 --- a/arch/arm/configs/realview_defconfig +++ b/arch/arm/configs/realview_defconfig | |||
@@ -38,6 +38,7 @@ CONFIG_MTD_CFI=y | |||
38 | CONFIG_MTD_CFI_INTELEXT=y | 38 | CONFIG_MTD_CFI_INTELEXT=y |
39 | CONFIG_MTD_CFI_AMDSTD=y | 39 | CONFIG_MTD_CFI_AMDSTD=y |
40 | CONFIG_MTD_ARM_INTEGRATOR=y | 40 | CONFIG_MTD_ARM_INTEGRATOR=y |
41 | CONFIG_ARM_CHARLCD=y | ||
41 | CONFIG_NETDEVICES=y | 42 | CONFIG_NETDEVICES=y |
42 | CONFIG_SMSC_PHY=y | 43 | CONFIG_SMSC_PHY=y |
43 | CONFIG_NET_ETHERNET=y | 44 | CONFIG_NET_ETHERNET=y |
@@ -51,10 +52,13 @@ CONFIG_SERIAL_AMBA_PL011=y | |||
51 | CONFIG_SERIAL_AMBA_PL011_CONSOLE=y | 52 | CONFIG_SERIAL_AMBA_PL011_CONSOLE=y |
52 | CONFIG_LEGACY_PTY_COUNT=16 | 53 | CONFIG_LEGACY_PTY_COUNT=16 |
53 | # CONFIG_HW_RANDOM is not set | 54 | # CONFIG_HW_RANDOM is not set |
55 | CONFIG_I2C=y | ||
56 | CONFIG_I2C_VERSATILE=y | ||
57 | CONFIG_SPI=y | ||
58 | CONFIG_GPIOLIB=y | ||
54 | # CONFIG_HWMON is not set | 59 | # CONFIG_HWMON is not set |
55 | CONFIG_FB=y | 60 | CONFIG_FB=y |
56 | CONFIG_FB_ARMCLCD=y | 61 | CONFIG_FB_ARMCLCD=y |
57 | # CONFIG_VGA_CONSOLE is not set | ||
58 | CONFIG_FRAMEBUFFER_CONSOLE=y | 62 | CONFIG_FRAMEBUFFER_CONSOLE=y |
59 | CONFIG_LOGO=y | 63 | CONFIG_LOGO=y |
60 | # CONFIG_LOGO_LINUX_MONO is not set | 64 | # CONFIG_LOGO_LINUX_MONO is not set |
@@ -69,7 +73,13 @@ CONFIG_SND_ARMAACI=y | |||
69 | # CONFIG_USB_SUPPORT is not set | 73 | # CONFIG_USB_SUPPORT is not set |
70 | CONFIG_MMC=y | 74 | CONFIG_MMC=y |
71 | CONFIG_MMC_ARMMMCI=y | 75 | CONFIG_MMC_ARMMMCI=y |
72 | CONFIG_INOTIFY=y | 76 | CONFIG_NEW_LEDS=y |
77 | CONFIG_LEDS_CLASS=y | ||
78 | CONFIG_LEDS_TRIGGERS=y | ||
79 | CONFIG_LEDS_TRIGGER_HEARTBEAT=y | ||
80 | CONFIG_RTC_CLASS=y | ||
81 | CONFIG_RTC_DRV_DS1307=y | ||
82 | CONFIG_RTC_DRV_PL031=y | ||
73 | CONFIG_VFAT_FS=y | 83 | CONFIG_VFAT_FS=y |
74 | CONFIG_TMPFS=y | 84 | CONFIG_TMPFS=y |
75 | CONFIG_CRAMFS=y | 85 | CONFIG_CRAMFS=y |
@@ -79,6 +89,7 @@ CONFIG_ROOT_NFS=y | |||
79 | CONFIG_NLS_CODEPAGE_437=y | 89 | CONFIG_NLS_CODEPAGE_437=y |
80 | CONFIG_NLS_ISO8859_1=y | 90 | CONFIG_NLS_ISO8859_1=y |
81 | CONFIG_MAGIC_SYSRQ=y | 91 | CONFIG_MAGIC_SYSRQ=y |
92 | CONFIG_DEBUG_FS=y | ||
82 | CONFIG_DEBUG_KERNEL=y | 93 | CONFIG_DEBUG_KERNEL=y |
83 | # CONFIG_SCHED_DEBUG is not set | 94 | # CONFIG_SCHED_DEBUG is not set |
84 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 95 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
diff --git a/arch/arm/configs/s5p6440_defconfig b/arch/arm/configs/s5p64x0_defconfig index 0b0266c6d326..2993ecd35145 100644 --- a/arch/arm/configs/s5p6440_defconfig +++ b/arch/arm/configs/s5p64x0_defconfig | |||
@@ -5,10 +5,11 @@ CONFIG_KALLSYMS_ALL=y | |||
5 | CONFIG_MODULES=y | 5 | CONFIG_MODULES=y |
6 | CONFIG_MODULE_UNLOAD=y | 6 | CONFIG_MODULE_UNLOAD=y |
7 | # CONFIG_BLK_DEV_BSG is not set | 7 | # CONFIG_BLK_DEV_BSG is not set |
8 | CONFIG_ARCH_S5P6440=y | 8 | CONFIG_ARCH_S5P64X0=y |
9 | CONFIG_S3C_BOOT_ERROR_RESET=y | 9 | 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_CPU_32v6K=y | 13 | CONFIG_CPU_32v6K=y |
13 | CONFIG_AEABI=y | 14 | CONFIG_AEABI=y |
14 | CONFIG_CMDLINE="root=/dev/ram0 rw ramdisk=8192 initrd=0x20800000,8M console=ttySAC1,115200 init=/linuxrc" | 15 | CONFIG_CMDLINE="root=/dev/ram0 rw ramdisk=8192 initrd=0x20800000,8M console=ttySAC1,115200 init=/linuxrc" |
diff --git a/arch/arm/configs/u300_defconfig b/arch/arm/configs/u300_defconfig index 46e5e0747269..c1c252cdca60 100644 --- a/arch/arm/configs/u300_defconfig +++ b/arch/arm/configs/u300_defconfig | |||
@@ -28,26 +28,9 @@ CONFIG_CPU_IDLE=y | |||
28 | CONFIG_FPE_NWFPE=y | 28 | CONFIG_FPE_NWFPE=y |
29 | CONFIG_PM=y | 29 | CONFIG_PM=y |
30 | # CONFIG_SUSPEND is not set | 30 | # CONFIG_SUSPEND is not set |
31 | CONFIG_NET=y | ||
32 | CONFIG_PACKET=y | ||
33 | CONFIG_UNIX=y | ||
34 | CONFIG_INET=y | ||
35 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set | ||
36 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set | ||
37 | # CONFIG_INET_XFRM_MODE_BEET is not set | ||
38 | # CONFIG_INET_LRO is not set | ||
39 | # CONFIG_INET_DIAG is not set | ||
40 | # CONFIG_IPV6 is not set | ||
41 | # CONFIG_WIRELESS is not set | ||
42 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 31 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
43 | # CONFIG_PREVENT_FIRMWARE_BUILD is not set | 32 | # CONFIG_PREVENT_FIRMWARE_BUILD is not set |
44 | CONFIG_MTD=y | 33 | # CONFIG_MISC_DEVICES is not set |
45 | CONFIG_MTD_PARTITIONS=y | ||
46 | CONFIG_MTD_CMDLINE_PARTS=y | ||
47 | CONFIG_MTD_CHAR=y | ||
48 | CONFIG_MTD_BLOCK=y | ||
49 | CONFIG_MTD_NAND=y | ||
50 | CONFIG_MTD_NAND_ECC_SMC=y | ||
51 | # CONFIG_INPUT_MOUSEDEV is not set | 34 | # CONFIG_INPUT_MOUSEDEV is not set |
52 | CONFIG_INPUT_EVDEV=y | 35 | CONFIG_INPUT_EVDEV=y |
53 | # CONFIG_KEYBOARD_ATKBD is not set | 36 | # CONFIG_KEYBOARD_ATKBD is not set |
@@ -58,7 +41,6 @@ CONFIG_SERIAL_AMBA_PL011_CONSOLE=y | |||
58 | CONFIG_LEGACY_PTY_COUNT=16 | 41 | CONFIG_LEGACY_PTY_COUNT=16 |
59 | # CONFIG_HW_RANDOM is not set | 42 | # CONFIG_HW_RANDOM is not set |
60 | CONFIG_I2C=y | 43 | CONFIG_I2C=y |
61 | CONFIG_POWER_SUPPLY=y | ||
62 | # CONFIG_HWMON is not set | 44 | # CONFIG_HWMON is not set |
63 | CONFIG_WATCHDOG=y | 45 | CONFIG_WATCHDOG=y |
64 | CONFIG_REGULATOR=y | 46 | CONFIG_REGULATOR=y |
@@ -66,24 +48,10 @@ CONFIG_FB=y | |||
66 | CONFIG_BACKLIGHT_LCD_SUPPORT=y | 48 | CONFIG_BACKLIGHT_LCD_SUPPORT=y |
67 | # CONFIG_LCD_CLASS_DEVICE is not set | 49 | # CONFIG_LCD_CLASS_DEVICE is not set |
68 | CONFIG_BACKLIGHT_CLASS_DEVICE=y | 50 | CONFIG_BACKLIGHT_CLASS_DEVICE=y |
69 | # CONFIG_VGA_CONSOLE is not set | ||
70 | CONFIG_SOUND=y | ||
71 | CONFIG_SND=y | ||
72 | # CONFIG_SND_SUPPORT_OLD_API is not set | ||
73 | # CONFIG_SND_VERBOSE_PROCFS is not set | ||
74 | # CONFIG_SND_DRIVERS is not set | ||
75 | # CONFIG_SND_ARM is not set | ||
76 | # CONFIG_SND_SPI is not set | ||
77 | CONFIG_SND_SOC=y | ||
78 | # CONFIG_HID_SUPPORT is not set | 51 | # CONFIG_HID_SUPPORT is not set |
79 | # CONFIG_USB_SUPPORT is not set | 52 | # CONFIG_USB_SUPPORT is not set |
80 | CONFIG_MMC=y | 53 | CONFIG_MMC=y |
81 | CONFIG_MMC_DEBUG=y | ||
82 | CONFIG_MMC_ARMMMCI=y | 54 | CONFIG_MMC_ARMMMCI=y |
83 | CONFIG_NEW_LEDS=y | ||
84 | CONFIG_LEDS_CLASS=y | ||
85 | CONFIG_LEDS_TRIGGERS=y | ||
86 | CONFIG_LEDS_TRIGGER_BACKLIGHT=y | ||
87 | CONFIG_RTC_CLASS=y | 55 | CONFIG_RTC_CLASS=y |
88 | # CONFIG_RTC_HCTOSYS is not set | 56 | # CONFIG_RTC_HCTOSYS is not set |
89 | CONFIG_RTC_DRV_COH901331=y | 57 | CONFIG_RTC_DRV_COH901331=y |
@@ -93,12 +61,11 @@ CONFIG_COH901318=y | |||
93 | CONFIG_FUSE_FS=y | 61 | CONFIG_FUSE_FS=y |
94 | CONFIG_VFAT_FS=y | 62 | CONFIG_VFAT_FS=y |
95 | CONFIG_TMPFS=y | 63 | CONFIG_TMPFS=y |
96 | # CONFIG_NETWORK_FILESYSTEMS is not set | ||
97 | CONFIG_NLS_CODEPAGE_437=y | 64 | CONFIG_NLS_CODEPAGE_437=y |
98 | CONFIG_NLS_ISO8859_1=y | 65 | CONFIG_NLS_ISO8859_1=y |
99 | CONFIG_PRINTK_TIME=y | 66 | CONFIG_PRINTK_TIME=y |
67 | CONFIG_DEBUG_FS=y | ||
100 | CONFIG_DEBUG_KERNEL=y | 68 | CONFIG_DEBUG_KERNEL=y |
101 | # CONFIG_DETECT_SOFTLOCKUP is not set | ||
102 | # CONFIG_SCHED_DEBUG is not set | 69 | # CONFIG_SCHED_DEBUG is not set |
103 | CONFIG_TIMER_STATS=y | 70 | CONFIG_TIMER_STATS=y |
104 | # CONFIG_DEBUG_PREEMPT is not set | 71 | # CONFIG_DEBUG_PREEMPT is not set |