aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-07-23 19:33:28 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-07-23 19:33:28 -0400
commita17f29a5e98c0a32a900a773083c719e27f4bc0e (patch)
treed45a539a39c93056a68cf825610517b7358fa89e /arch/arm
parentf01b9b73f57f4f92d39bba0d9aa4a38f318212df (diff)
parent2d05bf6ef7391ac3642ab62bc3a649fdb32731fe (diff)
Merge tag 'defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull arm-soc defconfig updates from Arnd Bergmann: "These are changes to the default configuration files, to account for kernel changes and new hardware." * tag 'defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: ARM: exynos_defconfig: enable more platforms in defconfig ARM: imx_v4_v5_defconfig: update features ARM: imx_v6_v7_defconfig: update features ARM: mxs: defconfig: Enable CONFIG_COMMON_CLK_DEBUG ARM: mxs_defconfig: Enable RTC driver ARM: LPC32xx: Defconfig update ARM: mxs_defconfig: Let AUART driver be built by default ARM: mxs: Enable MACH_APX4DEVKIT ARM: mxs: Let GPMI driver be built by default ARM: tegra: defconfig updates
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/configs/exynos_defconfig92
-rw-r--r--arch/arm/configs/imx_v4_v5_defconfig51
-rw-r--r--arch/arm/configs/imx_v6_v7_defconfig61
-rw-r--r--arch/arm/configs/lpc32xx_defconfig2
-rw-r--r--arch/arm/configs/mxs_defconfig7
-rw-r--r--arch/arm/configs/tegra_defconfig13
6 files changed, 170 insertions, 56 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/imx_v4_v5_defconfig b/arch/arm/configs/imx_v4_v5_defconfig
index e05a2f1665a7..78ed575feb1a 100644
--- a/arch/arm/configs/imx_v4_v5_defconfig
+++ b/arch/arm/configs/imx_v4_v5_defconfig
@@ -2,7 +2,10 @@ CONFIG_EXPERIMENTAL=y
2# CONFIG_SWAP is not set 2# CONFIG_SWAP is not set
3CONFIG_SYSVIPC=y 3CONFIG_SYSVIPC=y
4CONFIG_POSIX_MQUEUE=y 4CONFIG_POSIX_MQUEUE=y
5CONFIG_NO_HZ=y
6CONFIG_HIGH_RES_TIMERS=y
5CONFIG_LOG_BUF_SHIFT=14 7CONFIG_LOG_BUF_SHIFT=14
8CONFIG_CGROUPS=y
6CONFIG_EXPERT=y 9CONFIG_EXPERT=y
7# CONFIG_COMPAT_BRK is not set 10# CONFIG_COMPAT_BRK is not set
8CONFIG_SLAB=y 11CONFIG_SLAB=y
@@ -36,8 +39,6 @@ CONFIG_MACH_IMX27IPCAM=y
36CONFIG_MACH_IMX27_DT=y 39CONFIG_MACH_IMX27_DT=y
37CONFIG_MXC_IRQ_PRIOR=y 40CONFIG_MXC_IRQ_PRIOR=y
38CONFIG_MXC_PWM=y 41CONFIG_MXC_PWM=y
39CONFIG_NO_HZ=y
40CONFIG_HIGH_RES_TIMERS=y
41CONFIG_PREEMPT=y 42CONFIG_PREEMPT=y
42CONFIG_AEABI=y 43CONFIG_AEABI=y
43CONFIG_ZBOOT_ROM_TEXT=0x0 44CONFIG_ZBOOT_ROM_TEXT=0x0
@@ -46,7 +47,6 @@ CONFIG_FPE_NWFPE=y
46CONFIG_FPE_NWFPE_XP=y 47CONFIG_FPE_NWFPE_XP=y
47CONFIG_PM_DEBUG=y 48CONFIG_PM_DEBUG=y
48CONFIG_NET=y 49CONFIG_NET=y
49CONFIG_SMSC911X=y
50CONFIG_PACKET=y 50CONFIG_PACKET=y
51CONFIG_UNIX=y 51CONFIG_UNIX=y
52CONFIG_INET=y 52CONFIG_INET=y
@@ -70,31 +70,31 @@ CONFIG_MTD_CFI=y
70CONFIG_MTD_CFI_ADV_OPTIONS=y 70CONFIG_MTD_CFI_ADV_OPTIONS=y
71CONFIG_MTD_CFI_GEOMETRY=y 71CONFIG_MTD_CFI_GEOMETRY=y
72# CONFIG_MTD_MAP_BANK_WIDTH_1 is not set 72# CONFIG_MTD_MAP_BANK_WIDTH_1 is not set
73CONFIG_MTD_MAP_BANK_WIDTH_4=y
74# CONFIG_MTD_CFI_I2 is not set 73# CONFIG_MTD_CFI_I2 is not set
75CONFIG_MTD_CFI_INTELEXT=y 74CONFIG_MTD_CFI_INTELEXT=y
76CONFIG_MTD_PHYSMAP=y 75CONFIG_MTD_PHYSMAP=y
77CONFIG_MTD_NAND=y 76CONFIG_MTD_NAND=y
78CONFIG_MTD_NAND_MXC=y 77CONFIG_MTD_NAND_MXC=y
79CONFIG_MTD_UBI=y 78CONFIG_MTD_UBI=y
80CONFIG_MISC_DEVICES=y
81CONFIG_EEPROM_AT24=y 79CONFIG_EEPROM_AT24=y
82CONFIG_EEPROM_AT25=y 80CONFIG_EEPROM_AT25=y
81CONFIG_ATA=y
82CONFIG_PATA_IMX=y
83CONFIG_NETDEVICES=y 83CONFIG_NETDEVICES=y
84CONFIG_CS89x0=y 84CONFIG_CS89x0=y
85CONFIG_CS89x0_PLATFORM=y 85CONFIG_CS89x0_PLATFORM=y
86CONFIG_DM9000=y 86CONFIG_DM9000=y
87CONFIG_SMC91X=y 87CONFIG_SMC91X=y
88CONFIG_SMC911X=y 88CONFIG_SMC911X=y
89CONFIG_SMSC911X=y
89CONFIG_SMSC_PHY=y 90CONFIG_SMSC_PHY=y
90# CONFIG_INPUT_MOUSEDEV is not set 91# CONFIG_INPUT_MOUSEDEV is not set
91CONFIG_INPUT_EVDEV=y 92CONFIG_INPUT_EVDEV=y
92# CONFIG_INPUT_KEYBOARD is not set 93CONFIG_KEYBOARD_IMX=y
93# CONFIG_INPUT_MOUSE is not set 94# CONFIG_INPUT_MOUSE is not set
94CONFIG_INPUT_TOUCHSCREEN=y 95CONFIG_INPUT_TOUCHSCREEN=y
95CONFIG_TOUCHSCREEN_ADS7846=m 96CONFIG_TOUCHSCREEN_ADS7846=m
96CONFIG_TOUCHSCREEN_MC13783=m 97CONFIG_TOUCHSCREEN_MC13783=y
97# CONFIG_SERIO is not set
98# CONFIG_LEGACY_PTYS is not set 98# CONFIG_LEGACY_PTYS is not set
99CONFIG_SERIAL_8250=m 99CONFIG_SERIAL_8250=m
100CONFIG_SERIAL_IMX=y 100CONFIG_SERIAL_IMX=y
@@ -113,31 +113,23 @@ CONFIG_HWMON=m
113CONFIG_SENSORS_MC13783_ADC=m 113CONFIG_SENSORS_MC13783_ADC=m
114CONFIG_WATCHDOG=y 114CONFIG_WATCHDOG=y
115CONFIG_IMX2_WDT=y 115CONFIG_IMX2_WDT=y
116CONFIG_MFD_MC13XXX=y 116CONFIG_MFD_MC13XXX_SPI=y
117CONFIG_REGULATOR=y 117CONFIG_REGULATOR=y
118CONFIG_REGULATOR_FIXED_VOLTAGE=y 118CONFIG_REGULATOR_FIXED_VOLTAGE=y
119CONFIG_REGULATOR_MC13783=y 119CONFIG_REGULATOR_MC13783=y
120CONFIG_REGULATOR_MC13892=y 120CONFIG_REGULATOR_MC13892=y
121CONFIG_FB=y
122CONFIG_FB_IMX=y
123CONFIG_BACKLIGHT_LCD_SUPPORT=y
124CONFIG_LCD_CLASS_DEVICE=y
125CONFIG_BACKLIGHT_CLASS_DEVICE=y
126CONFIG_LCD_L4F00242T03=y
127CONFIG_MEDIA_SUPPORT=y 121CONFIG_MEDIA_SUPPORT=y
128CONFIG_VIDEO_DEV=y 122CONFIG_VIDEO_DEV=y
129CONFIG_VIDEO_V4L2_COMMON=y
130CONFIG_VIDEO_MEDIA=y
131CONFIG_VIDEO_V4L2=y
132CONFIG_VIDEOBUF_GEN=y
133CONFIG_VIDEOBUF_DMA_CONTIG=y
134CONFIG_VIDEOBUF2_CORE=y
135CONFIG_VIDEO_CAPTURE_DRIVERS=y
136CONFIG_V4L_PLATFORM_DRIVERS=y 123CONFIG_V4L_PLATFORM_DRIVERS=y
137CONFIG_SOC_CAMERA=y 124CONFIG_SOC_CAMERA=y
138CONFIG_SOC_CAMERA_OV2640=y 125CONFIG_SOC_CAMERA_OV2640=y
139CONFIG_VIDEO_MX2_HOSTSUPPORT=y
140CONFIG_VIDEO_MX2=y 126CONFIG_VIDEO_MX2=y
127CONFIG_FB=y
128CONFIG_FB_IMX=y
129CONFIG_BACKLIGHT_LCD_SUPPORT=y
130CONFIG_LCD_CLASS_DEVICE=y
131CONFIG_LCD_L4F00242T03=y
132CONFIG_BACKLIGHT_CLASS_DEVICE=y
141CONFIG_BACKLIGHT_PWM=y 133CONFIG_BACKLIGHT_PWM=y
142CONFIG_FRAMEBUFFER_CONSOLE=y 134CONFIG_FRAMEBUFFER_CONSOLE=y
143CONFIG_FONTS=y 135CONFIG_FONTS=y
@@ -152,13 +144,17 @@ CONFIG_SND_IMX_SOC=y
152CONFIG_SND_SOC_MX27VIS_AIC32X4=y 144CONFIG_SND_SOC_MX27VIS_AIC32X4=y
153CONFIG_SND_SOC_PHYCORE_AC97=y 145CONFIG_SND_SOC_PHYCORE_AC97=y
154CONFIG_SND_SOC_EUKREA_TLV320=y 146CONFIG_SND_SOC_EUKREA_TLV320=y
147CONFIG_SND_SOC_IMX_SGTL5000=y
148CONFIG_SND_SOC_IMX_MC13783=y
155CONFIG_USB_HID=m 149CONFIG_USB_HID=m
156CONFIG_USB=y 150CONFIG_USB=y
157# CONFIG_USB_DEVICE_CLASS is not set
158CONFIG_USB_EHCI_HCD=y 151CONFIG_USB_EHCI_HCD=y
159CONFIG_USB_EHCI_MXC=y 152CONFIG_USB_EHCI_MXC=y
160CONFIG_USB_ULPI=y 153CONFIG_USB_ULPI=y
161CONFIG_MMC=y 154CONFIG_MMC=y
155CONFIG_MMC_SDHCI=y
156CONFIG_MMC_SDHCI_PLTFM=y
157CONFIG_MMC_SDHCI_ESDHC_IMX=y
162CONFIG_MMC_MXC=y 158CONFIG_MMC_MXC=y
163CONFIG_NEW_LEDS=y 159CONFIG_NEW_LEDS=y
164CONFIG_LEDS_CLASS=y 160CONFIG_LEDS_CLASS=y
@@ -173,22 +169,25 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
173CONFIG_RTC_CLASS=y 169CONFIG_RTC_CLASS=y
174CONFIG_RTC_DRV_PCF8563=y 170CONFIG_RTC_DRV_PCF8563=y
175CONFIG_RTC_DRV_IMXDI=y 171CONFIG_RTC_DRV_IMXDI=y
172CONFIG_RTC_DRV_MC13XXX=y
176CONFIG_RTC_DRV_MXC=y 173CONFIG_RTC_DRV_MXC=y
177CONFIG_DMADEVICES=y 174CONFIG_DMADEVICES=y
178CONFIG_IMX_SDMA=y 175CONFIG_IMX_SDMA=y
179CONFIG_IMX_DMA=y 176CONFIG_IMX_DMA=y
177CONFIG_COMMON_CLK_DEBUG=y
180# CONFIG_IOMMU_SUPPORT is not set 178# CONFIG_IOMMU_SUPPORT is not set
179CONFIG_EXT2_FS=y
180CONFIG_EXT3_FS=y
181CONFIG_EXT4_FS=y
181# CONFIG_DNOTIFY is not set 182# CONFIG_DNOTIFY is not set
182# CONFIG_PROC_PAGE_MONITOR is not set 183# CONFIG_PROC_PAGE_MONITOR is not set
183CONFIG_TMPFS=y 184CONFIG_TMPFS=y
184CONFIG_JFFS2_FS=y 185CONFIG_JFFS2_FS=y
185CONFIG_UBIFS_FS=y 186CONFIG_UBIFS_FS=y
186CONFIG_NFS_FS=y 187CONFIG_NFS_FS=y
187CONFIG_NFS_V3=y
188CONFIG_ROOT_NFS=y 188CONFIG_ROOT_NFS=y
189CONFIG_NLS_CODEPAGE_437=m 189CONFIG_NLS_CODEPAGE_437=m
190CONFIG_NLS_CODEPAGE_850=m 190CONFIG_NLS_CODEPAGE_850=m
191CONFIG_NLS_ISO8859_1=y 191CONFIG_NLS_ISO8859_1=y
192CONFIG_NLS_ISO8859_15=m 192CONFIG_NLS_ISO8859_15=m
193CONFIG_SYSCTL_SYSCALL_CHECK=y
194# CONFIG_CRYPTO_ANSI_CPRNG is not set 193# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig
index b1d3675df72c..f725b9637b33 100644
--- a/arch/arm/configs/imx_v6_v7_defconfig
+++ b/arch/arm/configs/imx_v6_v7_defconfig
@@ -2,6 +2,8 @@ CONFIG_EXPERIMENTAL=y
2# CONFIG_LOCALVERSION_AUTO is not set 2# CONFIG_LOCALVERSION_AUTO is not set
3CONFIG_KERNEL_LZO=y 3CONFIG_KERNEL_LZO=y
4CONFIG_SYSVIPC=y 4CONFIG_SYSVIPC=y
5CONFIG_NO_HZ=y
6CONFIG_HIGH_RES_TIMERS=y
5CONFIG_LOG_BUF_SHIFT=18 7CONFIG_LOG_BUF_SHIFT=18
6CONFIG_CGROUPS=y 8CONFIG_CGROUPS=y
7CONFIG_RELAY=y 9CONFIG_RELAY=y
@@ -29,15 +31,12 @@ CONFIG_MACH_MX35_3DS=y
29CONFIG_MACH_VPR200=y 31CONFIG_MACH_VPR200=y
30CONFIG_MACH_IMX51_DT=y 32CONFIG_MACH_IMX51_DT=y
31CONFIG_MACH_MX51_3DS=y 33CONFIG_MACH_MX51_3DS=y
32CONFIG_MACH_EUKREA_CPUIMX51=y
33CONFIG_MACH_EUKREA_CPUIMX51SD=y 34CONFIG_MACH_EUKREA_CPUIMX51SD=y
34CONFIG_MACH_MX51_EFIKAMX=y 35CONFIG_MACH_MX51_EFIKAMX=y
35CONFIG_MACH_MX51_EFIKASB=y 36CONFIG_MACH_MX51_EFIKASB=y
36CONFIG_MACH_IMX53_DT=y 37CONFIG_MACH_IMX53_DT=y
37CONFIG_SOC_IMX6Q=y 38CONFIG_SOC_IMX6Q=y
38CONFIG_MXC_PWM=y 39CONFIG_MXC_PWM=y
39CONFIG_NO_HZ=y
40CONFIG_HIGH_RES_TIMERS=y
41CONFIG_SMP=y 40CONFIG_SMP=y
42CONFIG_VMSPLIT_2G=y 41CONFIG_VMSPLIT_2G=y
43CONFIG_PREEMPT_VOLUNTARY=y 42CONFIG_PREEMPT_VOLUNTARY=y
@@ -64,17 +63,29 @@ CONFIG_IPV6=y
64# CONFIG_WIRELESS is not set 63# CONFIG_WIRELESS is not set
65CONFIG_DEVTMPFS=y 64CONFIG_DEVTMPFS=y
66CONFIG_DEVTMPFS_MOUNT=y 65CONFIG_DEVTMPFS_MOUNT=y
66# CONFIG_STANDALONE is not set
67CONFIG_CONNECTOR=y
67CONFIG_MTD=y 68CONFIG_MTD=y
68CONFIG_MTD_OF_PARTS=y 69CONFIG_MTD_CMDLINE_PARTS=y
69CONFIG_MTD_CHAR=y 70CONFIG_MTD_CHAR=y
71CONFIG_MTD_BLOCK=y
72CONFIG_MTD_CFI=y
73CONFIG_MTD_JEDECPROBE=y
74CONFIG_MTD_CFI_INTELEXT=y
75CONFIG_MTD_CFI_AMDSTD=y
76CONFIG_MTD_CFI_STAA=y
70CONFIG_MTD_DATAFLASH=y 77CONFIG_MTD_DATAFLASH=y
71CONFIG_MTD_M25P80=y 78CONFIG_MTD_M25P80=y
72CONFIG_MTD_SST25L=y 79CONFIG_MTD_SST25L=y
73# CONFIG_STANDALONE is not set 80CONFIG_MTD_NAND=y
74CONFIG_CONNECTOR=y 81CONFIG_MTD_NAND_GPMI_NAND=y
82CONFIG_MTD_NAND_MXC=y
83CONFIG_MTD_UBI=y
75CONFIG_BLK_DEV_LOOP=y 84CONFIG_BLK_DEV_LOOP=y
76CONFIG_BLK_DEV_RAM=y 85CONFIG_BLK_DEV_RAM=y
77CONFIG_BLK_DEV_RAM_SIZE=65536 86CONFIG_BLK_DEV_RAM_SIZE=65536
87CONFIG_EEPROM_AT24=y
88CONFIG_EEPROM_AT25=y
78# CONFIG_SCSI_PROC_FS is not set 89# CONFIG_SCSI_PROC_FS is not set
79CONFIG_BLK_DEV_SD=y 90CONFIG_BLK_DEV_SD=y
80CONFIG_SCSI_MULTI_LUN=y 91CONFIG_SCSI_MULTI_LUN=y
@@ -105,8 +116,11 @@ CONFIG_SMSC911X=y
105CONFIG_INPUT_EVDEV=y 116CONFIG_INPUT_EVDEV=y
106CONFIG_INPUT_EVBUG=m 117CONFIG_INPUT_EVBUG=m
107CONFIG_KEYBOARD_GPIO=y 118CONFIG_KEYBOARD_GPIO=y
119CONFIG_KEYBOARD_IMX=y
108CONFIG_MOUSE_PS2=m 120CONFIG_MOUSE_PS2=m
109CONFIG_MOUSE_PS2_ELANTECH=y 121CONFIG_MOUSE_PS2_ELANTECH=y
122CONFIG_INPUT_TOUCHSCREEN=y
123CONFIG_TOUCHSCREEN_MC13783=y
110CONFIG_INPUT_MISC=y 124CONFIG_INPUT_MISC=y
111CONFIG_INPUT_MMA8450=y 125CONFIG_INPUT_MMA8450=y
112CONFIG_SERIO_SERPORT=m 126CONFIG_SERIO_SERPORT=m
@@ -116,6 +130,7 @@ CONFIG_VT_HW_CONSOLE_BINDING=y
116CONFIG_SERIAL_IMX=y 130CONFIG_SERIAL_IMX=y
117CONFIG_SERIAL_IMX_CONSOLE=y 131CONFIG_SERIAL_IMX_CONSOLE=y
118CONFIG_HW_RANDOM=y 132CONFIG_HW_RANDOM=y
133CONFIG_HW_RANDOM_MXC_RNGA=y
119CONFIG_I2C=y 134CONFIG_I2C=y
120# CONFIG_I2C_COMPAT is not set 135# CONFIG_I2C_COMPAT is not set
121CONFIG_I2C_CHARDEV=y 136CONFIG_I2C_CHARDEV=y
@@ -130,42 +145,37 @@ CONFIG_GPIO_SYSFS=y
130# CONFIG_HWMON is not set 145# CONFIG_HWMON is not set
131CONFIG_WATCHDOG=y 146CONFIG_WATCHDOG=y
132CONFIG_IMX2_WDT=y 147CONFIG_IMX2_WDT=y
133CONFIG_MFD_MC13XXX=y 148CONFIG_MFD_MC13XXX_SPI=y
149CONFIG_MFD_MC13XXX_I2C=y
134CONFIG_REGULATOR=y 150CONFIG_REGULATOR=y
135CONFIG_REGULATOR_FIXED_VOLTAGE=y 151CONFIG_REGULATOR_FIXED_VOLTAGE=y
136CONFIG_REGULATOR_MC13783=y 152CONFIG_REGULATOR_MC13783=y
137CONFIG_REGULATOR_MC13892=y 153CONFIG_REGULATOR_MC13892=y
138CONFIG_MEDIA_SUPPORT=y 154CONFIG_MEDIA_SUPPORT=y
139CONFIG_VIDEO_V4L2=y
140CONFIG_VIDEO_DEV=y 155CONFIG_VIDEO_DEV=y
141CONFIG_VIDEO_V4L2_COMMON=y
142CONFIG_VIDEOBUF_GEN=y
143CONFIG_VIDEOBUF2_CORE=y
144CONFIG_VIDEOBUF2_MEMOPS=y
145CONFIG_VIDEOBUF2_DMA_CONTIG=y
146CONFIG_VIDEO_CAPTURE_DRIVERS=y
147CONFIG_V4L_PLATFORM_DRIVERS=y 156CONFIG_V4L_PLATFORM_DRIVERS=y
148CONFIG_SOC_CAMERA=y 157CONFIG_SOC_CAMERA=y
149CONFIG_SOC_CAMERA_OV2640=y 158CONFIG_SOC_CAMERA_OV2640=y
150CONFIG_MX3_VIDEO=y
151CONFIG_VIDEO_MX3=y 159CONFIG_VIDEO_MX3=y
152CONFIG_FB=y 160CONFIG_FB=y
153CONFIG_FB_MX3=y
154CONFIG_BACKLIGHT_LCD_SUPPORT=y 161CONFIG_BACKLIGHT_LCD_SUPPORT=y
155CONFIG_LCD_CLASS_DEVICE=y 162CONFIG_LCD_CLASS_DEVICE=y
156CONFIG_LCD_L4F00242T03=y 163CONFIG_LCD_L4F00242T03=y
157CONFIG_BACKLIGHT_CLASS_DEVICE=y 164CONFIG_BACKLIGHT_CLASS_DEVICE=y
158CONFIG_BACKLIGHT_GENERIC=y
159CONFIG_DUMMY_CONSOLE=y
160CONFIG_FRAMEBUFFER_CONSOLE=y 165CONFIG_FRAMEBUFFER_CONSOLE=y
161CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y 166CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
162CONFIG_FONTS=y 167CONFIG_FONTS=y
163CONFIG_FONT_8x8=y 168CONFIG_FONT_8x8=y
164CONFIG_FONT_8x16=y 169CONFIG_FONT_8x16=y
165CONFIG_LOGO=y 170CONFIG_LOGO=y
166CONFIG_LOGO_LINUX_MONO=y 171CONFIG_SOUND=y
167CONFIG_LOGO_LINUX_VGA16=y 172CONFIG_SND=y
168CONFIG_LOGO_LINUX_CLUT224=y 173CONFIG_SND_SOC=y
174CONFIG_SND_IMX_SOC=y
175CONFIG_SND_SOC_PHYCORE_AC97=y
176CONFIG_SND_SOC_EUKREA_TLV320=y
177CONFIG_SND_SOC_IMX_SGTL5000=y
178CONFIG_SND_SOC_IMX_MC13783=y
169CONFIG_USB=y 179CONFIG_USB=y
170CONFIG_USB_EHCI_HCD=y 180CONFIG_USB_EHCI_HCD=y
171CONFIG_USB_EHCI_MXC=y 181CONFIG_USB_EHCI_MXC=y
@@ -178,9 +188,12 @@ CONFIG_NEW_LEDS=y
178CONFIG_LEDS_CLASS=y 188CONFIG_LEDS_CLASS=y
179CONFIG_RTC_CLASS=y 189CONFIG_RTC_CLASS=y
180CONFIG_RTC_INTF_DEV_UIE_EMUL=y 190CONFIG_RTC_INTF_DEV_UIE_EMUL=y
191CONFIG_RTC_DRV_MC13XXX=y
181CONFIG_RTC_DRV_MXC=y 192CONFIG_RTC_DRV_MXC=y
182CONFIG_DMADEVICES=y 193CONFIG_DMADEVICES=y
183CONFIG_IMX_SDMA=y 194CONFIG_IMX_SDMA=y
195CONFIG_COMMON_CLK_DEBUG=y
196# CONFIG_IOMMU_SUPPORT is not set
184CONFIG_EXT2_FS=y 197CONFIG_EXT2_FS=y
185CONFIG_EXT2_FS_XATTR=y 198CONFIG_EXT2_FS_XATTR=y
186CONFIG_EXT2_FS_POSIX_ACL=y 199CONFIG_EXT2_FS_POSIX_ACL=y
@@ -204,8 +217,9 @@ CONFIG_MSDOS_FS=m
204CONFIG_VFAT_FS=y 217CONFIG_VFAT_FS=y
205CONFIG_TMPFS=y 218CONFIG_TMPFS=y
206CONFIG_CONFIGFS_FS=m 219CONFIG_CONFIGFS_FS=m
220CONFIG_JFFS2_FS=y
221CONFIG_UBIFS_FS=y
207CONFIG_NFS_FS=y 222CONFIG_NFS_FS=y
208CONFIG_NFS_V3=y
209CONFIG_NFS_V3_ACL=y 223CONFIG_NFS_V3_ACL=y
210CONFIG_NFS_V4=y 224CONFIG_NFS_V4=y
211CONFIG_ROOT_NFS=y 225CONFIG_ROOT_NFS=y
@@ -216,14 +230,11 @@ CONFIG_NLS_ISO8859_1=y
216CONFIG_NLS_ISO8859_15=m 230CONFIG_NLS_ISO8859_15=m
217CONFIG_NLS_UTF8=y 231CONFIG_NLS_UTF8=y
218CONFIG_MAGIC_SYSRQ=y 232CONFIG_MAGIC_SYSRQ=y
219CONFIG_DEBUG_FS=y
220# CONFIG_SCHED_DEBUG is not set 233# CONFIG_SCHED_DEBUG is not set
221# CONFIG_DEBUG_BUGVERBOSE is not set 234# CONFIG_DEBUG_BUGVERBOSE is not set
222# CONFIG_FTRACE is not set 235# CONFIG_FTRACE is not set
223# CONFIG_ARM_UNWIND is not set 236# CONFIG_ARM_UNWIND is not set
224CONFIG_SECURITYFS=y 237CONFIG_SECURITYFS=y
225CONFIG_CRYPTO_DEFLATE=m
226CONFIG_CRYPTO_LZO=m
227# CONFIG_CRYPTO_ANSI_CPRNG is not set 238# CONFIG_CRYPTO_ANSI_CPRNG is not set
228# CONFIG_CRYPTO_HW is not set 239# CONFIG_CRYPTO_HW is not set
229CONFIG_CRC_CCITT=m 240CONFIG_CRC_CCITT=m
diff --git a/arch/arm/configs/lpc32xx_defconfig b/arch/arm/configs/lpc32xx_defconfig
index eceed186a3c1..e42a0e3d4c3a 100644
--- a/arch/arm/configs/lpc32xx_defconfig
+++ b/arch/arm/configs/lpc32xx_defconfig
@@ -18,6 +18,7 @@ CONFIG_MODULE_UNLOAD=y
18# CONFIG_BLK_DEV_BSG is not set 18# CONFIG_BLK_DEV_BSG is not set
19CONFIG_PARTITION_ADVANCED=y 19CONFIG_PARTITION_ADVANCED=y
20CONFIG_ARCH_LPC32XX=y 20CONFIG_ARCH_LPC32XX=y
21CONFIG_KEYBOARD_GPIO_POLLED=y
21CONFIG_PREEMPT=y 22CONFIG_PREEMPT=y
22CONFIG_AEABI=y 23CONFIG_AEABI=y
23CONFIG_ZBOOT_ROM_TEXT=0x0 24CONFIG_ZBOOT_ROM_TEXT=0x0
@@ -89,6 +90,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=240
89CONFIG_INPUT_MOUSEDEV_SCREEN_Y=320 90CONFIG_INPUT_MOUSEDEV_SCREEN_Y=320
90CONFIG_INPUT_EVDEV=y 91CONFIG_INPUT_EVDEV=y
91# CONFIG_KEYBOARD_ATKBD is not set 92# CONFIG_KEYBOARD_ATKBD is not set
93CONFIG_KEYBOARD_GPIO=y
92CONFIG_KEYBOARD_LPC32XX=y 94CONFIG_KEYBOARD_LPC32XX=y
93# CONFIG_INPUT_MOUSE is not set 95# CONFIG_INPUT_MOUSE is not set
94CONFIG_INPUT_TOUCHSCREEN=y 96CONFIG_INPUT_TOUCHSCREEN=y
diff --git a/arch/arm/configs/mxs_defconfig b/arch/arm/configs/mxs_defconfig
index 5406c23a02e3..ccdb6357fb74 100644
--- a/arch/arm/configs/mxs_defconfig
+++ b/arch/arm/configs/mxs_defconfig
@@ -28,6 +28,7 @@ CONFIG_MACH_MX28EVK=y
28CONFIG_MACH_STMP378X_DEVB=y 28CONFIG_MACH_STMP378X_DEVB=y
29CONFIG_MACH_TX28=y 29CONFIG_MACH_TX28=y
30CONFIG_MACH_M28EVK=y 30CONFIG_MACH_M28EVK=y
31CONFIG_MACH_APX4DEVKIT=y
31# CONFIG_ARM_THUMB is not set 32# CONFIG_ARM_THUMB is not set
32CONFIG_NO_HZ=y 33CONFIG_NO_HZ=y
33CONFIG_HIGH_RES_TIMERS=y 34CONFIG_HIGH_RES_TIMERS=y
@@ -58,6 +59,9 @@ CONFIG_CAN_FLEXCAN=m
58CONFIG_DEVTMPFS=y 59CONFIG_DEVTMPFS=y
59# CONFIG_FIRMWARE_IN_KERNEL is not set 60# CONFIG_FIRMWARE_IN_KERNEL is not set
60# CONFIG_BLK_DEV is not set 61# CONFIG_BLK_DEV is not set
62CONFIG_MTD=y
63CONFIG_MTD_NAND=y
64CONFIG_MTD_NAND_GPMI_NAND=y
61CONFIG_NETDEVICES=y 65CONFIG_NETDEVICES=y
62CONFIG_NET_ETHERNET=y 66CONFIG_NET_ETHERNET=y
63CONFIG_ENC28J60=y 67CONFIG_ENC28J60=y
@@ -77,6 +81,7 @@ CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
77# CONFIG_DEVKMEM is not set 81# CONFIG_DEVKMEM is not set
78CONFIG_SERIAL_AMBA_PL011=y 82CONFIG_SERIAL_AMBA_PL011=y
79CONFIG_SERIAL_AMBA_PL011_CONSOLE=y 83CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
84CONFIG_SERIAL_MXS_AUART=y
80# CONFIG_HW_RANDOM is not set 85# CONFIG_HW_RANDOM is not set
81CONFIG_I2C=y 86CONFIG_I2C=y
82# CONFIG_I2C_COMPAT is not set 87# CONFIG_I2C_COMPAT is not set
@@ -109,8 +114,10 @@ CONFIG_MMC=y
109CONFIG_MMC_MXS=y 114CONFIG_MMC_MXS=y
110CONFIG_RTC_CLASS=y 115CONFIG_RTC_CLASS=y
111CONFIG_RTC_DRV_DS1307=m 116CONFIG_RTC_DRV_DS1307=m
117CONFIG_RTC_DRV_STMP=y
112CONFIG_DMADEVICES=y 118CONFIG_DMADEVICES=y
113CONFIG_MXS_DMA=y 119CONFIG_MXS_DMA=y
120CONFIG_COMMON_CLK_DEBUG=y
114CONFIG_EXT3_FS=y 121CONFIG_EXT3_FS=y
115# CONFIG_DNOTIFY is not set 122# CONFIG_DNOTIFY is not set
116CONFIG_FSCACHE=m 123CONFIG_FSCACHE=m
diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig
index 1198dd61c7c4..4be9c1e80ee6 100644
--- a/arch/arm/configs/tegra_defconfig
+++ b/arch/arm/configs/tegra_defconfig
@@ -1,4 +1,6 @@
1CONFIG_EXPERIMENTAL=y 1CONFIG_EXPERIMENTAL=y
2CONFIG_NO_HZ=y
3CONFIG_HIGH_RES_TIMERS=y
2CONFIG_IKCONFIG=y 4CONFIG_IKCONFIG=y
3CONFIG_IKCONFIG_PROC=y 5CONFIG_IKCONFIG_PROC=y
4CONFIG_CGROUPS=y 6CONFIG_CGROUPS=y
@@ -25,14 +27,9 @@ CONFIG_ARCH_TEGRA=y
25CONFIG_ARCH_TEGRA_2x_SOC=y 27CONFIG_ARCH_TEGRA_2x_SOC=y
26CONFIG_ARCH_TEGRA_3x_SOC=y 28CONFIG_ARCH_TEGRA_3x_SOC=y
27CONFIG_MACH_HARMONY=y 29CONFIG_MACH_HARMONY=y
28CONFIG_MACH_KAEN=y
29CONFIG_MACH_PAZ00=y 30CONFIG_MACH_PAZ00=y
30CONFIG_MACH_TRIMSLICE=y 31CONFIG_MACH_TRIMSLICE=y
31CONFIG_MACH_WARIO=y
32CONFIG_MACH_VENTANA=y
33CONFIG_TEGRA_EMC_SCALING_ENABLE=y 32CONFIG_TEGRA_EMC_SCALING_ENABLE=y
34CONFIG_NO_HZ=y
35CONFIG_HIGH_RES_TIMERS=y
36CONFIG_SMP=y 33CONFIG_SMP=y
37CONFIG_PREEMPT=y 34CONFIG_PREEMPT=y
38CONFIG_AEABI=y 35CONFIG_AEABI=y
@@ -103,19 +100,24 @@ CONFIG_SERIAL_OF_PLATFORM=y
103# CONFIG_HW_RANDOM is not set 100# CONFIG_HW_RANDOM is not set
104CONFIG_I2C=y 101CONFIG_I2C=y
105# CONFIG_I2C_COMPAT is not set 102# CONFIG_I2C_COMPAT is not set
103CONFIG_I2C_MUX=y
104CONFIG_I2C_MUX_PINCTRL=y
106CONFIG_I2C_TEGRA=y 105CONFIG_I2C_TEGRA=y
107CONFIG_SPI=y 106CONFIG_SPI=y
108CONFIG_SPI_TEGRA=y 107CONFIG_SPI_TEGRA=y
108CONFIG_GPIO_TPS65910=y
109CONFIG_POWER_SUPPLY=y 109CONFIG_POWER_SUPPLY=y
110CONFIG_BATTERY_SBS=y 110CONFIG_BATTERY_SBS=y
111CONFIG_SENSORS_LM90=y 111CONFIG_SENSORS_LM90=y
112CONFIG_MFD_TPS6586X=y 112CONFIG_MFD_TPS6586X=y
113CONFIG_MFD_TPS65910=y
113CONFIG_REGULATOR=y 114CONFIG_REGULATOR=y
114CONFIG_REGULATOR_FIXED_VOLTAGE=y 115CONFIG_REGULATOR_FIXED_VOLTAGE=y
115CONFIG_REGULATOR_VIRTUAL_CONSUMER=y 116CONFIG_REGULATOR_VIRTUAL_CONSUMER=y
116CONFIG_REGULATOR_GPIO=y 117CONFIG_REGULATOR_GPIO=y
117CONFIG_REGULATOR_TPS62360=y 118CONFIG_REGULATOR_TPS62360=y
118CONFIG_REGULATOR_TPS6586X=y 119CONFIG_REGULATOR_TPS6586X=y
120CONFIG_REGULATOR_TPS65910=y
119CONFIG_SOUND=y 121CONFIG_SOUND=y
120CONFIG_SND=y 122CONFIG_SND=y
121# CONFIG_SND_SUPPORT_OLD_API is not set 123# CONFIG_SND_SUPPORT_OLD_API is not set
@@ -126,6 +128,7 @@ CONFIG_SND=y
126# CONFIG_SND_USB is not set 128# CONFIG_SND_USB is not set
127CONFIG_SND_SOC=y 129CONFIG_SND_SOC=y
128CONFIG_SND_SOC_TEGRA=y 130CONFIG_SND_SOC_TEGRA=y
131CONFIG_SND_SOC_TEGRA_WM8753=y
129CONFIG_SND_SOC_TEGRA_WM8903=y 132CONFIG_SND_SOC_TEGRA_WM8903=y
130CONFIG_SND_SOC_TEGRA_TRIMSLICE=y 133CONFIG_SND_SOC_TEGRA_TRIMSLICE=y
131CONFIG_SND_SOC_TEGRA_ALC5632=y 134CONFIG_SND_SOC_TEGRA_ALC5632=y
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-29 02:58:16 -0500