diff options
Diffstat (limited to 'arch/arm/configs')
-rw-r--r-- | arch/arm/configs/mx51_defconfig | 3 | ||||
-rw-r--r-- | arch/arm/configs/mxs_defconfig | 4 | ||||
-rw-r--r-- | arch/arm/configs/u8500_defconfig | 32 |
3 files changed, 29 insertions, 10 deletions
diff --git a/arch/arm/configs/mx51_defconfig b/arch/arm/configs/mx51_defconfig index 0ace16cba9b5..88c5802a2351 100644 --- a/arch/arm/configs/mx51_defconfig +++ b/arch/arm/configs/mx51_defconfig | |||
@@ -106,6 +106,7 @@ CONFIG_GPIO_SYSFS=y | |||
106 | CONFIG_USB=y | 106 | CONFIG_USB=y |
107 | CONFIG_USB_EHCI_HCD=y | 107 | CONFIG_USB_EHCI_HCD=y |
108 | CONFIG_USB_EHCI_MXC=y | 108 | CONFIG_USB_EHCI_MXC=y |
109 | CONFIG_USB_STORAGE=y | ||
109 | CONFIG_MMC=y | 110 | CONFIG_MMC=y |
110 | CONFIG_MMC_BLOCK=m | 111 | CONFIG_MMC_BLOCK=m |
111 | CONFIG_MMC_SDHCI=m | 112 | CONFIG_MMC_SDHCI=m |
@@ -145,7 +146,7 @@ CONFIG_ROOT_NFS=y | |||
145 | CONFIG_NLS_DEFAULT="cp437" | 146 | CONFIG_NLS_DEFAULT="cp437" |
146 | CONFIG_NLS_CODEPAGE_437=y | 147 | CONFIG_NLS_CODEPAGE_437=y |
147 | CONFIG_NLS_ASCII=y | 148 | CONFIG_NLS_ASCII=y |
148 | CONFIG_NLS_ISO8859_1=m | 149 | CONFIG_NLS_ISO8859_1=y |
149 | CONFIG_NLS_ISO8859_15=m | 150 | CONFIG_NLS_ISO8859_15=m |
150 | CONFIG_NLS_UTF8=y | 151 | CONFIG_NLS_UTF8=y |
151 | CONFIG_MAGIC_SYSRQ=y | 152 | CONFIG_MAGIC_SYSRQ=y |
diff --git a/arch/arm/configs/mxs_defconfig b/arch/arm/configs/mxs_defconfig index 2bf224310fb4..db2cb7d180dc 100644 --- a/arch/arm/configs/mxs_defconfig +++ b/arch/arm/configs/mxs_defconfig | |||
@@ -22,6 +22,8 @@ CONFIG_BLK_DEV_INTEGRITY=y | |||
22 | # CONFIG_IOSCHED_DEADLINE is not set | 22 | # CONFIG_IOSCHED_DEADLINE is not set |
23 | # CONFIG_IOSCHED_CFQ is not set | 23 | # CONFIG_IOSCHED_CFQ is not set |
24 | CONFIG_ARCH_MXS=y | 24 | CONFIG_ARCH_MXS=y |
25 | CONFIG_MACH_MX23EVK=y | ||
26 | CONFIG_MACH_MX28EVK=y | ||
25 | CONFIG_MACH_STMP378X_DEVB=y | 27 | CONFIG_MACH_STMP378X_DEVB=y |
26 | CONFIG_MACH_TX28=y | 28 | CONFIG_MACH_TX28=y |
27 | # CONFIG_ARM_THUMB is not set | 29 | # CONFIG_ARM_THUMB is not set |
@@ -89,7 +91,7 @@ CONFIG_DISPLAY_SUPPORT=m | |||
89 | # CONFIG_USB_SUPPORT is not set | 91 | # CONFIG_USB_SUPPORT is not set |
90 | CONFIG_MMC=y | 92 | CONFIG_MMC=y |
91 | CONFIG_MMC_MXS=y | 93 | CONFIG_MMC_MXS=y |
92 | CONFIG_RTC_CLASS=m | 94 | CONFIG_RTC_CLASS=y |
93 | CONFIG_RTC_DRV_DS1307=m | 95 | CONFIG_RTC_DRV_DS1307=m |
94 | CONFIG_DMADEVICES=y | 96 | CONFIG_DMADEVICES=y |
95 | CONFIG_MXS_DMA=y | 97 | CONFIG_MXS_DMA=y |
diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig index a5cce242a775..97d31a4663da 100644 --- a/arch/arm/configs/u8500_defconfig +++ b/arch/arm/configs/u8500_defconfig | |||
@@ -11,12 +11,12 @@ CONFIG_ARCH_U8500=y | |||
11 | CONFIG_UX500_SOC_DB5500=y | 11 | CONFIG_UX500_SOC_DB5500=y |
12 | CONFIG_UX500_SOC_DB8500=y | 12 | CONFIG_UX500_SOC_DB8500=y |
13 | CONFIG_MACH_U8500=y | 13 | CONFIG_MACH_U8500=y |
14 | CONFIG_MACH_SNOWBALL=y | ||
14 | CONFIG_MACH_U5500=y | 15 | CONFIG_MACH_U5500=y |
15 | CONFIG_NO_HZ=y | 16 | CONFIG_NO_HZ=y |
16 | CONFIG_HIGH_RES_TIMERS=y | 17 | CONFIG_HIGH_RES_TIMERS=y |
17 | CONFIG_SMP=y | 18 | CONFIG_SMP=y |
18 | CONFIG_NR_CPUS=2 | 19 | CONFIG_NR_CPUS=2 |
19 | CONFIG_HOTPLUG_CPU=y | ||
20 | CONFIG_PREEMPT=y | 20 | CONFIG_PREEMPT=y |
21 | CONFIG_AEABI=y | 21 | CONFIG_AEABI=y |
22 | CONFIG_CMDLINE="root=/dev/ram0 console=ttyAMA2,115200n8" | 22 | CONFIG_CMDLINE="root=/dev/ram0 console=ttyAMA2,115200n8" |
@@ -25,8 +25,13 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y | |||
25 | CONFIG_VFP=y | 25 | CONFIG_VFP=y |
26 | CONFIG_NEON=y | 26 | CONFIG_NEON=y |
27 | CONFIG_NET=y | 27 | CONFIG_NET=y |
28 | CONFIG_PACKET=y | ||
29 | CONFIG_UNIX=y | ||
30 | CONFIG_INET=y | ||
31 | CONFIG_IP_PNP=y | ||
32 | CONFIG_IP_PNP_DHCP=y | ||
33 | CONFIG_NETFILTER=y | ||
28 | CONFIG_PHONET=y | 34 | CONFIG_PHONET=y |
29 | CONFIG_PHONET_PIPECTRLR=y | ||
30 | # CONFIG_WIRELESS is not set | 35 | # CONFIG_WIRELESS is not set |
31 | CONFIG_CAIF=y | 36 | CONFIG_CAIF=y |
32 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 37 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
@@ -35,6 +40,13 @@ CONFIG_BLK_DEV_RAM_SIZE=65536 | |||
35 | CONFIG_MISC_DEVICES=y | 40 | CONFIG_MISC_DEVICES=y |
36 | CONFIG_AB8500_PWM=y | 41 | CONFIG_AB8500_PWM=y |
37 | CONFIG_SENSORS_BH1780=y | 42 | CONFIG_SENSORS_BH1780=y |
43 | CONFIG_NETDEVICES=y | ||
44 | CONFIG_SMSC_PHY=y | ||
45 | CONFIG_NET_ETHERNET=y | ||
46 | CONFIG_SMSC911X=y | ||
47 | # CONFIG_NETDEV_1000 is not set | ||
48 | # CONFIG_NETDEV_10000 is not set | ||
49 | # CONFIG_WLAN is not set | ||
38 | # CONFIG_INPUT_MOUSEDEV_PSAUX is not set | 50 | # CONFIG_INPUT_MOUSEDEV_PSAUX is not set |
39 | CONFIG_INPUT_EVDEV=y | 51 | CONFIG_INPUT_EVDEV=y |
40 | # CONFIG_KEYBOARD_ATKBD is not set | 52 | # CONFIG_KEYBOARD_ATKBD is not set |
@@ -49,9 +61,9 @@ CONFIG_INPUT_MISC=y | |||
49 | CONFIG_INPUT_AB8500_PONKEY=y | 61 | CONFIG_INPUT_AB8500_PONKEY=y |
50 | # CONFIG_SERIO is not set | 62 | # CONFIG_SERIO is not set |
51 | CONFIG_VT_HW_CONSOLE_BINDING=y | 63 | CONFIG_VT_HW_CONSOLE_BINDING=y |
64 | # CONFIG_LEGACY_PTYS is not set | ||
52 | CONFIG_SERIAL_AMBA_PL011=y | 65 | CONFIG_SERIAL_AMBA_PL011=y |
53 | CONFIG_SERIAL_AMBA_PL011_CONSOLE=y | 66 | CONFIG_SERIAL_AMBA_PL011_CONSOLE=y |
54 | # CONFIG_LEGACY_PTYS is not set | ||
55 | CONFIG_HW_RANDOM=y | 67 | CONFIG_HW_RANDOM=y |
56 | CONFIG_HW_RANDOM_NOMADIK=y | 68 | CONFIG_HW_RANDOM_NOMADIK=y |
57 | CONFIG_I2C=y | 69 | CONFIG_I2C=y |
@@ -64,14 +76,19 @@ CONFIG_GPIO_TC3589X=y | |||
64 | CONFIG_MFD_STMPE=y | 76 | CONFIG_MFD_STMPE=y |
65 | CONFIG_MFD_TC3589X=y | 77 | CONFIG_MFD_TC3589X=y |
66 | CONFIG_AB8500_CORE=y | 78 | CONFIG_AB8500_CORE=y |
67 | CONFIG_REGULATOR=y | ||
68 | CONFIG_REGULATOR_AB8500=y | 79 | CONFIG_REGULATOR_AB8500=y |
69 | # CONFIG_HID_SUPPORT is not set | 80 | # CONFIG_HID_SUPPORT is not set |
70 | # CONFIG_USB_SUPPORT is not set | 81 | CONFIG_USB_MUSB_HDRC=y |
82 | CONFIG_USB_GADGET_MUSB_HDRC=y | ||
83 | CONFIG_MUSB_PIO_ONLY=y | ||
84 | CONFIG_USB_GADGET=y | ||
85 | CONFIG_AB8500_USB=y | ||
71 | CONFIG_MMC=y | 86 | CONFIG_MMC=y |
87 | CONFIG_MMC_CLKGATE=y | ||
72 | CONFIG_MMC_ARMMMCI=y | 88 | CONFIG_MMC_ARMMMCI=y |
73 | CONFIG_NEW_LEDS=y | 89 | CONFIG_NEW_LEDS=y |
74 | CONFIG_LEDS_CLASS=y | 90 | CONFIG_LEDS_CLASS=y |
91 | CONFIG_LEDS_LM3530=y | ||
75 | CONFIG_LEDS_LP5521=y | 92 | CONFIG_LEDS_LP5521=y |
76 | CONFIG_RTC_CLASS=y | 93 | CONFIG_RTC_CLASS=y |
77 | CONFIG_RTC_DRV_AB8500=y | 94 | CONFIG_RTC_DRV_AB8500=y |
@@ -79,7 +96,6 @@ CONFIG_RTC_DRV_PL031=y | |||
79 | CONFIG_DMADEVICES=y | 96 | CONFIG_DMADEVICES=y |
80 | CONFIG_STE_DMA40=y | 97 | CONFIG_STE_DMA40=y |
81 | CONFIG_STAGING=y | 98 | CONFIG_STAGING=y |
82 | # CONFIG_STAGING_EXCLUDE_BUILD is not set | ||
83 | CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=y | 99 | CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=y |
84 | CONFIG_EXT2_FS=y | 100 | CONFIG_EXT2_FS=y |
85 | CONFIG_EXT2_FS_XATTR=y | 101 | CONFIG_EXT2_FS_XATTR=y |
@@ -91,6 +107,8 @@ CONFIG_TMPFS=y | |||
91 | CONFIG_TMPFS_POSIX_ACL=y | 107 | CONFIG_TMPFS_POSIX_ACL=y |
92 | CONFIG_CONFIGFS_FS=m | 108 | CONFIG_CONFIGFS_FS=m |
93 | # CONFIG_MISC_FILESYSTEMS is not set | 109 | # CONFIG_MISC_FILESYSTEMS is not set |
110 | CONFIG_NFS_FS=y | ||
111 | CONFIG_ROOT_NFS=y | ||
94 | CONFIG_NLS_CODEPAGE_437=y | 112 | CONFIG_NLS_CODEPAGE_437=y |
95 | CONFIG_NLS_ISO8859_1=y | 113 | CONFIG_NLS_ISO8859_1=y |
96 | CONFIG_MAGIC_SYSRQ=y | 114 | CONFIG_MAGIC_SYSRQ=y |
@@ -99,7 +117,5 @@ CONFIG_DEBUG_KERNEL=y | |||
99 | # CONFIG_SCHED_DEBUG is not set | 117 | # CONFIG_SCHED_DEBUG is not set |
100 | # CONFIG_DEBUG_PREEMPT is not set | 118 | # CONFIG_DEBUG_PREEMPT is not set |
101 | CONFIG_DEBUG_INFO=y | 119 | CONFIG_DEBUG_INFO=y |
102 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
103 | # CONFIG_FTRACE is not set | 120 | # CONFIG_FTRACE is not set |
104 | CONFIG_DEBUG_USER=y | 121 | CONFIG_DEBUG_USER=y |
105 | CONFIG_DEBUG_ERRORS=y | ||