[1/2] ARM: imx_v4_v5_defconfig: Cleanup imx_v4_v5_defconfig

Commit Message

Michael Grzeschik Feb. 24, 2016, 2:57 p.m. UTC

From: Jan Luebbe <[e-mail]>

Regenerate imx_v4_v5_defconfig by running:
make imx_v4_v5_defconfig
make savedefconfig
mv defconfig arch/arm/configs/imx_v4_v5_defconfig

Signed-off-by: Jan Luebbe <[e-mail]>
Signed-off-by: Michael Grzeschik <[e-mail]>
---
 arch/arm/configs/imx_v4_v5_defconfig | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

Comments

Shawn Guo Feb. 29, 2016, 2:58 a.m. UTC | #1

On Wed, Feb 24, 2016 at 03:57:46PM +0100, Michael Grzeschik wrote:
> @@ -169,12 +167,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_EXT2_FS=y
>  CONFIG_EXT3_FS=y
> -CONFIG_EXT4_FS=y

I guess that Arnd's comment about keeping CONFIG_EXT4_FS and dropping
the other two applies here too?

Shawn

>  # CONFIG_DNOTIFY is not set
>  CONFIG_VFAT_FS=y
>  # CONFIG_PROC_PAGE_MONITOR is not set
> @@ -187,6 +184,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
> -- 
> 2.7.0
> 
>

Michael Grzeschik Feb. 29, 2016, 10:23 a.m. UTC | #2

On Mon, Feb 29, 2016 at 10:58:22AM +0800, Shawn Guo wrote:
> On Wed, Feb 24, 2016 at 03:57:46PM +0100, Michael Grzeschik wrote:
> > @@ -169,12 +167,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_EXT2_FS=y
> >  CONFIG_EXT3_FS=y
> > -CONFIG_EXT4_FS=y
> 
> I guess that Arnd's comment about keeping CONFIG_EXT4_FS and dropping
> the other two applies here too?

Sure, I missed that. Will send v2 in a second.

Thanks,
Michael

Patch

diff --git a/arch/arm/configs/imx_v4_v5_defconfig b/arch/arm/configs/imx_v4_v5_defconfig
index d3a8018..f23b3ba 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
@@ -169,12 +167,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_EXT2_FS=y
 CONFIG_EXT3_FS=y
-CONFIG_EXT4_FS=y
 # CONFIG_DNOTIFY is not set
 CONFIG_VFAT_FS=y
 # CONFIG_PROC_PAGE_MONITOR is not set
@@ -187,6 +184,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