diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-07 07:49:16 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-07 07:49:16 -0400 |
commit | 84424026c0a910886064049d414a12a4f4dd125e (patch) | |
tree | 62b45188195187acafc08c8ac353cfe399c6c1b1 /arch/arm/configs/imx_v6_v7_defconfig | |
parent | 0b8e74c6f44094189dbe78baf4101acc7570c6af (diff) | |
parent | 3536c27c0fbe41f731ab6f61217ef95d0bdf2e05 (diff) |
Merge tag 'defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM soc defconfig updates from Olof Johansson:
"This might be the last time we do a standalone defconfig branch, since
we now prefer to get them with the rest of the subarch updates
instead. These add a handful of useful options on various platforms,
enable new boards and SoCs, etc."
* tag 'defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
ARM: tegra: defconfig updates
ARM: LPC32xx: Defconfig update
ARM: mach-shmobile: marzen: defconfig update
ARM: mxs_defconfig: Add SPI and LRADC support
ARM: s3c6400_defconfig: enable more boards in defconfig
ARM: imx_v6_v7_defconfig: Remove CONFIG_DEFAULT_MMAP_MIN_ADDR
ARM: imx_v6_v7_defconfig: Add Chipidea USB driver support
ARM: mxs_defconfig: Add framebuffer support
ARM: mxs_defconfig: Add LED, PWM and MTD_CHAR support
ARM: mxs_defconfig: Enable USB host
Diffstat (limited to 'arch/arm/configs/imx_v6_v7_defconfig')
-rw-r--r-- | arch/arm/configs/imx_v6_v7_defconfig | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig index 565132d02105..66aa7a6db884 100644 --- a/arch/arm/configs/imx_v6_v7_defconfig +++ b/arch/arm/configs/imx_v6_v7_defconfig | |||
@@ -40,7 +40,6 @@ CONFIG_VMSPLIT_2G=y | |||
40 | CONFIG_PREEMPT_VOLUNTARY=y | 40 | CONFIG_PREEMPT_VOLUNTARY=y |
41 | CONFIG_AEABI=y | 41 | CONFIG_AEABI=y |
42 | # CONFIG_OABI_COMPAT is not set | 42 | # CONFIG_OABI_COMPAT is not set |
43 | CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 | ||
44 | CONFIG_CMDLINE="noinitrd console=ttymxc0,115200" | 43 | CONFIG_CMDLINE="noinitrd console=ttymxc0,115200" |
45 | CONFIG_VFP=y | 44 | CONFIG_VFP=y |
46 | CONFIG_NEON=y | 45 | CONFIG_NEON=y |
@@ -177,6 +176,9 @@ CONFIG_SND_SOC_IMX_MC13783=y | |||
177 | CONFIG_USB=y | 176 | CONFIG_USB=y |
178 | CONFIG_USB_EHCI_HCD=y | 177 | CONFIG_USB_EHCI_HCD=y |
179 | CONFIG_USB_EHCI_MXC=y | 178 | CONFIG_USB_EHCI_MXC=y |
179 | CONFIG_USB_CHIPIDEA=y | ||
180 | CONFIG_USB_CHIPIDEA_HOST=y | ||
181 | CONFIG_USB_MXS_PHY=y | ||
180 | CONFIG_USB_STORAGE=y | 182 | CONFIG_USB_STORAGE=y |
181 | CONFIG_MMC=y | 183 | CONFIG_MMC=y |
182 | CONFIG_MMC_SDHCI=y | 184 | CONFIG_MMC_SDHCI=y |