From: Jan Luebbe Date: Mon, 29 Feb 2016 10:26:17 +0000 (+0100) Subject: ARM: imx_v4_v5_defconfig: Cleanup imx_v4_v5_defconfig X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7763327dd2ec38985866b2926c4b05c6460166a8;p=linux-beck.git ARM: imx_v4_v5_defconfig: Cleanup imx_v4_v5_defconfig Regenerate imx_v4_v5_defconfig by running: make imx_v4_v5_defconfig - Manually disable EXT2_FS and EXT3_FS make savedefconfig mv defconfig arch/arm/configs/imx_v4_v5_defconfig Signed-off-by: Jan Luebbe Signed-off-by: Michael Grzeschik Signed-off-by: Shawn Guo --- diff --git a/arch/arm/configs/imx_v4_v5_defconfig b/arch/arm/configs/imx_v4_v5_defconfig index d6754ac47788..c0c432e64ffd 100644 --- a/arch/arm/configs/imx_v4_v5_defconfig +++ b/arch/arm/configs/imx_v4_v5_defconfig @@ -24,14 +24,12 @@ CONFIG_ARCH_MXC=y CONFIG_MACH_SCB9328=y CONFIG_MACH_APF9328=y CONFIG_MACH_MX21ADS=y -CONFIG_MACH_EUKREA_CPUIMX25SD=y -CONFIG_SOC_IMX25=y CONFIG_MACH_MX27ADS=y CONFIG_MACH_MX27_3DS=y CONFIG_MACH_IMX27_VISSTRIM_M10=y CONFIG_MACH_PCA100=y -CONFIG_MACH_MXT_TD60=y CONFIG_MACH_IMX27_DT=y +CONFIG_SOC_IMX25=y CONFIG_PREEMPT=y CONFIG_AEABI=y CONFIG_ZBOOT_ROM_TEXT=0x0 @@ -171,13 +169,11 @@ CONFIG_RTC_DRV_IMXDI=y CONFIG_RTC_DRV_MC13XXX=y CONFIG_RTC_DRV_MXC=y CONFIG_DMADEVICES=y -CONFIG_IMX_SDMA=y CONFIG_IMX_DMA=y +CONFIG_IMX_SDMA=y # CONFIG_IOMMU_SUPPORT is not set CONFIG_IIO=y CONFIG_FSL_MX25_ADC=y -CONFIG_EXT2_FS=y -CONFIG_EXT3_FS=y CONFIG_EXT4_FS=y # CONFIG_DNOTIFY is not set CONFIG_VFAT_FS=y @@ -191,6 +187,5 @@ CONFIG_NLS_CODEPAGE_437=m CONFIG_NLS_CODEPAGE_850=m CONFIG_NLS_ISO8859_1=y CONFIG_NLS_ISO8859_15=m -# CONFIG_CRYPTO_ANSI_CPRNG is not set CONFIG_FONTS=y CONFIG_FONT_8x8=y