3 files changed, 19 insertions, 50 deletions
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index fecddf7b9d2..5f731cf22f3 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -8,7 +8,6 @@
 # CONFIG_ATA_NONSTANDARD is not set
 CONFIG_ATM_BR2684_IPFILTER=y
 CONFIG_AX25_DAMA_SLAVE=y
-CONFIG_BCH=y
 # CONFIG_BLK_DEV_SR_VENDOR is not set
 # CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set
 # CONFIG_COMPACTION is not set
@@ -54,14 +53,6 @@ CONFIG_LOG_BUF_SHIFT=17
 CONFIG_MAX_RAW_DEVS=256
 CONFIG_MMC_BLOCK=y
 CONFIG_MMC_SDHCI=y
-CONFIG_MTD_BLKDEVS=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_CHAR=y
-CONFIG_MTD_NAND=y
-CONFIG_MTD_NAND_BCH=y
-CONFIG_MTD_NAND_ECC=y
-CONFIG_MTD_NAND_IDS=y
-CONFIG_MTD_OF_PARTS=y
 # CONFIG_MTD_SM_COMMON is not set
 CONFIG_NEED_DMA_MAP_STATE=y
 # CONFIG_NL80211_TESTMODE is not set
diff --git a/debian.master/config/armhf/config.flavour.highbank b/debian.master/config/armhf/config.flavour.highbank
index 630987c8095..d28cd805cb6 100644
--- a/debian.master/config/armhf/config.flavour.highbank
+++ b/debian.master/config/armhf/config.flavour.highbank
@@ -23,6 +23,7 @@ CONFIG_ARCH_HIGHBANK=y
 # CONFIG_B43LEGACY is not set
 # CONFIG_B44 is not set
 # CONFIG_BATMAN_ADV is not set
+CONFIG_BCH=m
 # CONFIG_BCMA is not set
 # CONFIG_BCM_WIMAX is not set
 # CONFIG_BINARY_PRINTF is not set
@@ -37,21 +38,16 @@ CONFIG_CACHE_L2X0=y
 # CONFIG_CGROUPS is not set
 # CONFIG_CHECKPOINT_RESTORE is not set
 # CONFIG_CLEANCACHE is not set
-# CONFIG_CONNECTOR is not set
 # CONFIG_CORDIC is not set
 CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 # CONFIG_CPU_IDLE is not set
 # CONFIG_CRASH_DUMP is not set
-# CONFIG_CUSE is not set
 # CONFIG_DE600 is not set
 # CONFIG_DE620 is not set
 # CONFIG_DEBUG_KERNEL is not set
 # CONFIG_DEBUG_USER is not set
 # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
 # CONFIG_DM9000 is not set
-# CONFIG_DMA_SHARED_BUFFER is not set
-# CONFIG_DNET is not set
-# CONFIG_DRM is not set
 # CONFIG_DW_DMAC is not set
 # CONFIG_ECHO is not set
 CONFIG_ENABLE_MUST_CHECK=y
@@ -65,31 +61,25 @@ CONFIG_EXT2_FS=y
 # CONFIG_FB_ARMCLCD is not set
 # CONFIG_FB_BROADSHEET is not set
 # CONFIG_FB_METRONOME is not set
-# CONFIG_FB_MODE_HELPERS is not set
 # CONFIG_FB_S1D13XXX is not set
 # CONFIG_FB_SM7XX is not set
 # CONFIG_FB_SMSCUFX is not set
 # CONFIG_FB_UDL is not set
 # CONFIG_FONTS is not set
 # CONFIG_FPE_NWFPE is not set
-# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
-# CONFIG_FSCACHE is not set
 # CONFIG_FT1000 is not set
 # CONFIG_FTRACE is not set
 # CONFIG_GPIO_SYSFS is not set
 # CONFIG_HAMRADIO is not set
 # CONFIG_HIDRAW is not set
 CONFIG_HIGHMEM=y
-# CONFIG_HOSTAP is not set
 # CONFIG_HTC_EGPIO is not set
 # CONFIG_HTC_I2CPLD is not set
 # CONFIG_HTC_PASIC3 is not set
 # CONFIG_HVC_DCC is not set
-# CONFIG_HW_RANDOM is not set
 CONFIG_HZ=100
 CONFIG_I2C_DESIGNWARE_PLATFORM=y
 CONFIG_I2C_HELPER_AUTO=y
-# CONFIG_IIO is not set
 # CONFIG_INLINE_READ_UNLOCK is not set
 # CONFIG_INLINE_READ_UNLOCK_IRQ is not set
 # CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set
@@ -135,7 +125,6 @@ CONFIG_LEGACY_PTY_COUNT=256
 # CONFIG_LIBERTAS_THINFIRM is not set
 # CONFIG_LIBFC is not set
 # CONFIG_LIBFCOE is not set
-# CONFIG_LLC2 is not set
 # CONFIG_LOGIG940_FF is not set
 # CONFIG_LOGIRUMBLEPAD2_FF is not set
 # CONFIG_LOGITECH_FF is not set
@@ -147,7 +136,6 @@ CONFIG_LEGACY_PTY_COUNT=256
 # CONFIG_MAC_PARTITION is not set
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_MEDIA_SUPPORT is not set
-# CONFIG_MEMSTICK is not set
 # CONFIG_MFD_88PM860X is not set
 # CONFIG_MFD_AAT2870_CORE is not set
 # CONFIG_MFD_ASIC3 is not set
@@ -175,7 +163,6 @@ CONFIG_LEGACY_PTY_COUNT=256
 # CONFIG_MFD_WM8994 is not set
 # CONFIG_MG_DISK is not set
 CONFIG_MICREL_PHY=y
-CONFIG_MII=m
 # CONFIG_MINIX_SUBPARTITION is not set
 # CONFIG_MMC_ARMMMCI is not set
 # CONFIG_MMC_DW is not set
@@ -194,7 +181,15 @@ CONFIG_MMC_SDHCI_PLTFM=y
 # CONFIG_MOUSE_SERIAL is not set
 # CONFIG_MOUSE_SYNAPTICS_I2C is not set
 # CONFIG_MOUSE_VSXXXAA is not set
-# CONFIG_MTD is not set
+CONFIG_MTD=m
+CONFIG_MTD_BLKDEVS=m
+CONFIG_MTD_BLOCK=m
+CONFIG_MTD_CHAR=m
+CONFIG_MTD_NAND=m
+CONFIG_MTD_NAND_BCH=m
+CONFIG_MTD_NAND_ECC=m
+CONFIG_MTD_NAND_IDS=m
+CONFIG_MTD_OF_PARTS=m
 CONFIG_MUSB_PIO_ONLY=y
 CONFIG_MUTEX_SPIN_ON_OWNER=y
 # CONFIG_MWIFIEX is not set
@@ -215,12 +210,10 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 CONFIG_OPROFILE=y
 # CONFIG_OSF_PARTITION is not set
 # CONFIG_P54_COMMON is not set
-# CONFIG_PANEL is not set
 # CONFIG_PARPORT_1284 is not set
 # CONFIG_PARPORT_AX88796 is not set
 # CONFIG_PATA_ARASAN_CF is not set
 # CONFIG_PERF_COUNTERS is not set
-# CONFIG_PHONE is not set
 # CONFIG_PHYS_ADDR_T_64BIT is not set
 CONFIG_PL330_DMA=y
 # CONFIG_PMIC_ADP5520 is not set
@@ -300,12 +293,10 @@ CONFIG_SERIAL_AMBA_PL011=y
 CONFIG_SERIO_SERPORT=y
 # CONFIG_SGI_PARTITION is not set
 CONFIG_SLHC=m
-# CONFIG_SLIP is not set
 # CONFIG_SMC911X is not set
 # CONFIG_SMC91X is not set
 # CONFIG_SMSC911X is not set
 # CONFIG_SOLARIS_X86_PARTITION is not set
-# CONFIG_SOUND is not set
 # CONFIG_SPEAKUP_SYNTH_DUMMY is not set
 # CONFIG_SPI_ALTERA is not set
 # CONFIG_SPI_BITBANG is not set
@@ -320,7 +311,6 @@ CONFIG_SPI_PL022=y
 # CONFIG_SQUASHFS_LZO is not set
 # CONFIG_SQUASHFS_XATTR is not set
 # CONFIG_SQUASHFS_XZ is not set
-# CONFIG_SSB is not set
 # CONFIG_STAGING_MEDIA is not set
 CONFIG_STE10XP=m
 # CONFIG_STMMAC_ETH is not set
@@ -334,7 +324,6 @@ CONFIG_SWP_EMULATE=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_TEST_KSTRTOX is not set
-# CONFIG_THERMAL is not set
 # CONFIG_TIMB_DMA is not set
 # CONFIG_TOUCHSCREEN_CLEARPAD_TM1217 is not set
 # CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set
diff --git a/debian.master/config/armhf/config.flavour.omap b/debian.master/config/armhf/config.flavour.omap
index db4f88bdac8..ac7d0f42fa2 100644
--- a/debian.master/config/armhf/config.flavour.omap
+++ b/debian.master/config/armhf/config.flavour.omap
@@ -23,6 +23,7 @@ CONFIG_B43=m
 CONFIG_B43LEGACY=m
 CONFIG_B44=m
 CONFIG_BATMAN_ADV=m
+CONFIG_BCH=y
 CONFIG_BCMA=m
 CONFIG_BCM_WIMAX=m
 CONFIG_BINARY_PRINTF=y
@@ -37,21 +38,16 @@ CONFIG_CFG80211_REG_DEBUG=y
 CONFIG_CGROUPS=y
 CONFIG_CHECKPOINT_RESTORE=y
 CONFIG_CLEANCACHE=y
-CONFIG_CONNECTOR=y
 CONFIG_CORDIC=m
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 CONFIG_CPU_IDLE=y
 CONFIG_CRASH_DUMP=y
-CONFIG_CUSE=m
 CONFIG_DE600=m
 CONFIG_DE620=m
 CONFIG_DEBUG_KERNEL=y
 CONFIG_DEBUG_USER=y
 CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
 CONFIG_DM9000=m
-CONFIG_DMA_SHARED_BUFFER=y
-CONFIG_DNET=m
-CONFIG_DRM=m
 CONFIG_DW_DMAC=m
 CONFIG_ECHO=m
 # CONFIG_ENABLE_MUST_CHECK is not set
@@ -65,31 +61,25 @@ CONFIG_FANOTIFY=y
 CONFIG_FB_ARMCLCD=m
 CONFIG_FB_BROADSHEET=m
 CONFIG_FB_METRONOME=m
-CONFIG_FB_MODE_HELPERS=y
 CONFIG_FB_S1D13XXX=m
 CONFIG_FB_SM7XX=m
 CONFIG_FB_SMSCUFX=m
 CONFIG_FB_UDL=m
 CONFIG_FONTS=y
 CONFIG_FPE_NWFPE=y
-CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
-CONFIG_FSCACHE=m
 CONFIG_FT1000=m
 CONFIG_FTRACE=y
 CONFIG_GPIO_SYSFS=y
 CONFIG_HAMRADIO=y
 CONFIG_HIDRAW=y
 # CONFIG_HIGHMEM is not set
-CONFIG_HOSTAP=m
 CONFIG_HTC_EGPIO=y
 CONFIG_HTC_I2CPLD=y
 CONFIG_HTC_PASIC3=m
 CONFIG_HVC_DCC=y
-CONFIG_HW_RANDOM=y
 CONFIG_HZ=128
 CONFIG_I2C_DESIGNWARE_PLATFORM=m
 # CONFIG_I2C_HELPER_AUTO is not set
-CONFIG_IIO=m
 CONFIG_INLINE_READ_UNLOCK=y
 CONFIG_INLINE_READ_UNLOCK_IRQ=y
 CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
@@ -135,7 +125,6 @@ CONFIG_LIBERTAS=m
 CONFIG_LIBERTAS_THINFIRM=m
 CONFIG_LIBFC=m
 CONFIG_LIBFCOE=m
-CONFIG_LLC2=m
 CONFIG_LOGIG940_FF=y
 CONFIG_LOGIRUMBLEPAD2_FF=y
 CONFIG_LOGITECH_FF=y
@@ -147,7 +136,6 @@ CONFIG_MACVLAN=m
 CONFIG_MAC_PARTITION=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_MEDIA_SUPPORT=m
-CONFIG_MEMSTICK=m
 CONFIG_MFD_88PM860X=y
 CONFIG_MFD_AAT2870_CORE=y
 CONFIG_MFD_ASIC3=y
@@ -175,7 +163,6 @@ CONFIG_MFD_WM8400=m
 CONFIG_MFD_WM8994=y
 CONFIG_MG_DISK=m
 CONFIG_MICREL_PHY=m
-CONFIG_MII=y
 CONFIG_MINIX_SUBPARTITION=y
 CONFIG_MMC_ARMMMCI=m
 CONFIG_MMC_DW=m
@@ -195,6 +182,14 @@ CONFIG_MOUSE_SERIAL=m
 CONFIG_MOUSE_SYNAPTICS_I2C=m
 CONFIG_MOUSE_VSXXXAA=m
 CONFIG_MTD=y
+CONFIG_MTD_BLKDEVS=y
+CONFIG_MTD_BLOCK=y
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_NAND=y
+CONFIG_MTD_NAND_BCH=y
+CONFIG_MTD_NAND_ECC=y
+CONFIG_MTD_NAND_IDS=y
+CONFIG_MTD_OF_PARTS=y
 # CONFIG_MUSB_PIO_ONLY is not set
 # CONFIG_MUTEX_SPIN_ON_OWNER is not set
 CONFIG_MWIFIEX=m
@@ -215,12 +210,10 @@ CONFIG_OC_ETM=y
 CONFIG_OPROFILE=m
 CONFIG_OSF_PARTITION=y
 CONFIG_P54_COMMON=m
-CONFIG_PANEL=m
 CONFIG_PARPORT_1284=y
 CONFIG_PARPORT_AX88796=m
 CONFIG_PATA_ARASAN_CF=m
 CONFIG_PERF_COUNTERS=y
-CONFIG_PHONE=m
 CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_PL330_DMA=m
 CONFIG_PMIC_ADP5520=y
@@ -300,12 +293,10 @@ CONFIG_SERIO_RAW=m
 CONFIG_SERIO_SERPORT=m
 CONFIG_SGI_PARTITION=y
 CONFIG_SLHC=y
-CONFIG_SLIP=m
 CONFIG_SMC911X=m
 CONFIG_SMC91X=m
 CONFIG_SMSC911X=m
 CONFIG_SOLARIS_X86_PARTITION=y
-CONFIG_SOUND=m
 CONFIG_SPEAKUP_SYNTH_DUMMY=m
 CONFIG_SPI_ALTERA=m
 CONFIG_SPI_BITBANG=m
@@ -320,7 +311,6 @@ CONFIG_SPI_TLE62X0=m
 CONFIG_SQUASHFS_LZO=y
 CONFIG_SQUASHFS_XATTR=y
 CONFIG_SQUASHFS_XZ=y
-CONFIG_SSB=m
 CONFIG_STAGING_MEDIA=y
 CONFIG_STE10XP=y
 CONFIG_STMMAC_ETH=m
@@ -334,7 +324,6 @@ CONFIG_TCG_TPM=y
 CONFIG_TCP_CONG_ADVANCED=y
 CONFIG_TCP_MD5SIG=y
 CONFIG_TEST_KSTRTOX=m
-CONFIG_THERMAL=y
 CONFIG_TIMB_DMA=m
 CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m
 CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m