LINARO: Cleanup configs after removing other flavours

Signed-off-by: John Rigby <john.rigby@linaro.org>

5 files changed, 55 insertions, 200 deletions

diff --git a/debian.linaro/config/armel/config.common.armel b/debian.linaro/config/armel/config.common.armel
index 1903a346e48..02fe48057c1 100644
--- a/debian.linaro/config/armel/config.common.armel
+++ b/debian.linaro/config/armel/config.common.armel
@@ -1,3 +1,7 @@
 #
 # Config options for config.common.armel automatically generated by splitconfig.pl
 #
+#
+# Single flavour kernel packages have no arch dependent config options
+# look in ../config.common.ubuntu for full config
+#
diff --git a/debian.linaro/config/armel/config.flavour.linaro-mx51 b/debian.linaro/config/armel/config.flavour.linaro-mx51
deleted file mode 100644
index 57bc8399f8a..00000000000
--- a/debian.linaro/config/armel/config.flavour.linaro-mx51
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Config options for config.flavour.linaro-mx51 automatically generated by splitconfig.pl
-#
-CONFIG_AC97_BUS=m
-CONFIG_ARCH_MXC=y
-# CONFIG_ARCH_OMAP is not set
-# CONFIG_ARCH_VEXPRESS is not set
-CONFIG_ARM_L1_CACHE_SHIFT=6
-CONFIG_ARM_THUMBEE=y
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-CONFIG_CMDLINE=""
-# CONFIG_DISPLAY_SUPPORT is not set
-# CONFIG_DRM is not set
-# CONFIG_FB_MODE_HELPERS is not set
-# CONFIG_FB_TILEBLITTING is not set
-# CONFIG_FIRMWARE_EDID is not set
-# CONFIG_FONTS is not set
-# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
-# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-CONFIG_GPIOLIB=y
-CONFIG_HZ=100
-CONFIG_MAC80211_RC_DEFAULT="pid"
-# CONFIG_MAC80211_RC_DEFAULT_MINSTREL is not set
-CONFIG_MAC80211_RC_DEFAULT_PID=y
-# CONFIG_MFD_CORE is not set
-# CONFIG_MMC_UNSAFE_RESUME is not set
-# CONFIG_MTD_ARM_INTEGRATOR is not set
-CONFIG_NOP_USB_XCEIV=y
-CONFIG_SND=m
-CONFIG_SND_AC97_CODEC=m
-CONFIG_SND_ARMAACI=m
-# CONFIG_SND_DYNAMIC_MINORS is not set
-CONFIG_SND_PCM=m
-CONFIG_SND_TIMER=m
-# CONFIG_TWL4030_CORE is not set
-CONFIG_USB_ARCH_HAS_EHCI=y
-# CONFIG_USB_ARCH_HAS_OHCI is not set
-CONFIG_USB_EHCI_ROOT_HUB_TT=y
-# CONFIG_USB_GADGET is not set
-# CONFIG_USB_ISP1760_HCD is not set
-# CONFIG_USB_OTG is not set
-CONFIG_W1=y
diff --git a/debian.linaro/config/armel/config.flavour.linaro-omap b/debian.linaro/config/armel/config.flavour.linaro-omap
index 3b9015de1d1..921c228a28c 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-omap
+++ b/debian.linaro/config/armel/config.flavour.linaro-omap
@@ -1,50 +1,7 @@
 #
 # Config options for config.flavour.linaro-omap automatically generated by splitconfig.pl
 #
-CONFIG_AC97_BUS=m
-# CONFIG_ARCH_MXC is not set
-CONFIG_ARCH_OMAP=y
-# CONFIG_ARCH_VEXPRESS is not set
-# CONFIG_ARM_ERRATA_751472 is not set
-# CONFIG_ARM_ERRATA_753970 is not set
-CONFIG_ARM_L1_CACHE_SHIFT=5
-CONFIG_ARM_THUMBEE=y
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_CMDLINE="root=/dev/mmcblk0p2 rootwait console=ttyO2,115200"
-CONFIG_DISPLAY_SUPPORT=y
-CONFIG_DRM=y
-CONFIG_FB_MODE_HELPERS=y
-CONFIG_FB_TILEBLITTING=y
-CONFIG_FIRMWARE_EDID=y
-CONFIG_FONTS=y
-CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
-CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-CONFIG_GPIOLIB=y
-CONFIG_HZ=128
-CONFIG_MAC80211_RC_DEFAULT="pid"
-# CONFIG_MAC80211_RC_DEFAULT_MINSTREL is not set
-CONFIG_MAC80211_RC_DEFAULT_PID=y
-CONFIG_MFD_CORE=y
-CONFIG_MFD_TWL4030_AUDIO=y
-CONFIG_MMC_UNSAFE_RESUME=y
-# CONFIG_MTD_ARM_INTEGRATOR is not set
-# CONFIG_MUSB_PIO_ONLY is not set
-CONFIG_NOP_USB_XCEIV=y
-CONFIG_NR_CPUS=2
-CONFIG_PL310_ERRATA_588369=y
-CONFIG_PL310_ERRATA_727915=y
-CONFIG_SND=m
-CONFIG_SND_AC97_CODEC=m
-CONFIG_SND_ARMAACI=m
-CONFIG_SND_DYNAMIC_MINORS=y
-CONFIG_SND_PCM=m
-CONFIG_SND_TIMER=m
-CONFIG_TWL4030_CORE=y
-CONFIG_TWL6040_CORE=y
-CONFIG_USB_ARCH_HAS_EHCI=y
-CONFIG_USB_ARCH_HAS_OHCI=y
-# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
-CONFIG_USB_GADGET=y
-# CONFIG_USB_ISP1760_HCD is not set
-CONFIG_USB_OTG=y
-CONFIG_W1=y
+#
+# Single flavour kernel packages have no flavour dependent config options
+# look in ../config.common.ubuntu for full config
+#
diff --git a/debian.linaro/config/armel/config.flavour.linaro-vexpress b/debian.linaro/config/armel/config.flavour.linaro-vexpress
deleted file mode 100644
index f5b897e01e5..00000000000
--- a/debian.linaro/config/armel/config.flavour.linaro-vexpress
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# Config options for config.flavour.linaro-vexpress automatically generated by splitconfig.pl
-#
-CONFIG_AC97_BUS=y
-# CONFIG_ARCH_MXC is not set
-# CONFIG_ARCH_OMAP is not set
-CONFIG_ARCH_VEXPRESS=y
-CONFIG_ARM_ERRATA_751472=y
-CONFIG_ARM_ERRATA_753970=y
-CONFIG_ARM_L1_CACHE_SHIFT=5
-# CONFIG_ARM_THUMBEE is not set
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-CONFIG_CMDLINE="root=/dev/nfs nfsroot=10.1.69.3:/work/nfsroot ip=dhcp console=ttyAMA0 mem=128M"
-# CONFIG_DISPLAY_SUPPORT is not set
-# CONFIG_DRM is not set
-# CONFIG_FB_MODE_HELPERS is not set
-# CONFIG_FB_TILEBLITTING is not set
-# CONFIG_FIRMWARE_EDID is not set
-# CONFIG_FONTS is not set
-# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
-# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-# CONFIG_GPIOLIB is not set
-CONFIG_HZ=100
-CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
-CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
-# CONFIG_MAC80211_RC_DEFAULT_PID is not set
-# CONFIG_MFD_CORE is not set
-# CONFIG_MFD_TWL4030_AUDIO is not set
-# CONFIG_MMC_UNSAFE_RESUME is not set
-CONFIG_MTD_ARM_INTEGRATOR=y
-CONFIG_MUSB_PIO_ONLY=y
-# CONFIG_NOP_USB_XCEIV is not set
-CONFIG_NR_CPUS=4
-# CONFIG_PL310_ERRATA_588369 is not set
-# CONFIG_PL310_ERRATA_727915 is not set
-CONFIG_SND=y
-CONFIG_SND_AC97_CODEC=y
-CONFIG_SND_ARMAACI=y
-# CONFIG_SND_DYNAMIC_MINORS is not set
-CONFIG_SND_PCM=y
-CONFIG_SND_TIMER=y
-CONFIG_TWL4030_CORE=y
-# CONFIG_TWL6040_CORE is not set
-# CONFIG_USB_ARCH_HAS_EHCI is not set
-# CONFIG_USB_ARCH_HAS_OHCI is not set
-CONFIG_USB_GADGET=y
-CONFIG_USB_ISP1760_HCD=y
-CONFIG_USB_OTG=y
-# CONFIG_W1 is not set
diff --git a/debian.linaro/config/config.common.ubuntu b/debian.linaro/config/config.common.ubuntu
index fc18128405c..08cfe8f1d54 100644
--- a/debian.linaro/config/config.common.ubuntu
+++ b/debian.linaro/config/config.common.ubuntu
@@ -2,6 +2,7 @@
 # Common config options automatically generated by splitconfig.pl
 #
 # CONFIG_ABX500_CORE is not set
+CONFIG_AC97_BUS=m
 # CONFIG_ACCESSIBILITY is not set
 # CONFIG_ACORN_PARTITION is not set
 # CONFIG_ADFS_FS is not set
@@ -44,19 +45,12 @@ CONFIG_ARCH_HAS_OPP=y
 # CONFIG_ARCH_MMP is not set
 # CONFIG_ARCH_MSM is not set
 # CONFIG_ARCH_MV78XX0 is not set
-# CONFIG_ARCH_MX1 is not set
-# CONFIG_ARCH_MX2 is not set
-# CONFIG_ARCH_MX25 is not set
-# CONFIG_ARCH_MX3 is not set
-CONFIG_ARCH_MX5=y
-# CONFIG_ARCH_MX503 is not set
-CONFIG_ARCH_MX51=y
-CONFIG_ARCH_MXC_AUDMUX_V2=y
-CONFIG_ARCH_MXC_IOMUX_V3=y
+# CONFIG_ARCH_MXC is not set
 # CONFIG_ARCH_MXS is not set
 # CONFIG_ARCH_NETX is not set
 # CONFIG_ARCH_NOMADIK is not set
 # CONFIG_ARCH_NUC93X is not set
+CONFIG_ARCH_OMAP=y
 # CONFIG_ARCH_OMAP1 is not set
 # CONFIG_ARCH_OMAP2 is not set
 CONFIG_ARCH_OMAP2PLUS=y
@@ -90,10 +84,9 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y
 # CONFIG_ARCH_U8500 is not set
 # CONFIG_ARCH_USES_GETTIMEOFFSET is not set
 # CONFIG_ARCH_VERSATILE is not set
-CONFIG_ARCH_VEXPRESS_CA9X4=y
+# CONFIG_ARCH_VEXPRESS is not set
 # CONFIG_ARCH_VT8500 is not set
 # CONFIG_ARCH_W90X900 is not set
-CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
 # CONFIG_ARCH_ZYNQ is not set
 CONFIG_ARM=y
 CONFIG_ARM_AMBA=y
@@ -108,17 +101,19 @@ CONFIG_ARM_ERRATA_720789=y
 # CONFIG_ARM_ERRATA_742230 is not set
 # CONFIG_ARM_ERRATA_742231 is not set
 # CONFIG_ARM_ERRATA_743622 is not set
+# CONFIG_ARM_ERRATA_751472 is not set
+# CONFIG_ARM_ERRATA_753970 is not set
 # CONFIG_ARM_ERRATA_754322 is not set
 # CONFIG_ARM_ERRATA_754327 is not set
 # CONFIG_ARM_ERRATA_764369 is not set
 CONFIG_ARM_GIC=y
 # CONFIG_ARM_KPROBES_TEST is not set
-CONFIG_ARM_L1_CACHE_SHIFT_6=y
+CONFIG_ARM_L1_CACHE_SHIFT=5
 # CONFIG_ARM_LPAE is not set
 # CONFIG_ARM_PATCH_PHYS_VIRT is not set
 # CONFIG_ARM_SP805_WATCHDOG is not set
 CONFIG_ARM_THUMB=y
-CONFIG_ARM_TIMER_SP804=y
+CONFIG_ARM_THUMBEE=y
 CONFIG_ARM_UNWIND=y
 # CONFIG_ARPD is not set
 CONFIG_AT76C50X_USB=m
@@ -168,6 +163,7 @@ CONFIG_B43_SSB=y
 # CONFIG_BACKLIGHT_ADP8870 is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_GENERIC=y
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
 # CONFIG_BACKTRACE_SELF_TEST is not set
 CONFIG_BASE_FULL=y
 CONFIG_BASE_SMALL=0
@@ -219,7 +215,6 @@ CONFIG_BOUNCE=y
 CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_BRIDGE is not set
 # CONFIG_BROADCOM_PHY is not set
-CONFIG_BROKEN_ON_SMP=y
 # CONFIG_BSD_DISKLABEL is not set
 CONFIG_BSD_PROCESS_ACCT=y
 # CONFIG_BSD_PROCESS_ACCT_V3 is not set
@@ -281,6 +276,7 @@ CONFIG_CGROUPS=y
 # CONFIG_CLEANCACHE is not set
 CONFIG_CLKDEV_LOOKUP=y
 CONFIG_CLKSRC_MMIO=y
+CONFIG_CMDLINE="root=/dev/mmcblk0p2 rootwait console=ttyO2,115200"
 # CONFIG_CMDLINE_EXTEND is not set
 # CONFIG_CMDLINE_FORCE is not set
 CONFIG_CMDLINE_FROM_BOOTLOADER=y
@@ -466,6 +462,7 @@ CONFIG_DETECT_HUNG_TASK=y
 # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_DISPLAY_SUPPORT=y
 # CONFIG_DM9000 is not set
 # CONFIG_DMADEVICES is not set
 # CONFIG_DMA_API_DEBUG is not set
@@ -483,6 +480,7 @@ CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_DNOTIFY=y
 CONFIG_DNS_RESOLVER=y
 # CONFIG_DRAGONRISE_FF is not set
+CONFIG_DRM=y
 CONFIG_DTC=y
 # CONFIG_DUMMY is not set
 CONFIG_DUMMY_CONSOLE=y
@@ -541,6 +539,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 # CONFIG_FB_MACMODES is not set
 # CONFIG_FB_METRONOME is not set
+CONFIG_FB_MODE_HELPERS=y
 CONFIG_FB_OMAP2=y
 CONFIG_FB_OMAP2_DEBUG_SUPPORT=y
 CONFIG_FB_OMAP2_NUM_FBS=3
@@ -552,19 +551,21 @@ CONFIG_FB_OMAP2_NUM_FBS=3
 # CONFIG_FB_SYS_FILLRECT is not set
 # CONFIG_FB_SYS_FOPS is not set
 # CONFIG_FB_SYS_IMAGEBLIT is not set
+CONFIG_FB_TILEBLITTING=y
 # CONFIG_FB_TMIO is not set
 # CONFIG_FB_UDL is not set
 # CONFIG_FB_UVESA is not set
 # CONFIG_FB_VIRTUAL is not set
 # CONFIG_FB_WMT_GE_ROPS is not set
-CONFIG_FEC=y
 # CONFIG_FHANDLE is not set
 CONFIG_FILE_LOCKING=y
+CONFIG_FIRMWARE_EDID=y
 CONFIG_FIRMWARE_IN_KERNEL=y
 # CONFIG_FIXED_PHY is not set
 CONFIG_FLATMEM=y
 CONFIG_FLATMEM_MANUAL=y
 CONFIG_FLAT_NODE_MEM_MAP=y
+CONFIG_FONTS=y
 # CONFIG_FONT_10x18 is not set
 # CONFIG_FONT_6x11 is not set
 # CONFIG_FONT_7x14 is not set
@@ -577,6 +578,8 @@ CONFIG_FONT_8x8=y
 # CONFIG_FONT_SUN8x16 is not set
 CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
+CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 CONFIG_FRAME_WARN=1024
 CONFIG_FREEZER=y
 # CONFIG_FSCACHE is not set
@@ -610,9 +613,9 @@ CONFIG_GENERIC_IRQ_SHOW=y
 CONFIG_GENERIC_LOCKBREAK=y
 CONFIG_GENERIC_TRACER=y
 # CONFIG_GFS2_FS is not set
+CONFIG_GPIOLIB=y
 # CONFIG_GPIO_74X164 is not set
 # CONFIG_GPIO_ADP5588 is not set
-CONFIG_GPIO_GENERIC=y
 # CONFIG_GPIO_GENERIC_PLATFORM is not set
 # CONFIG_GPIO_IT8761E is not set
 # CONFIG_GPIO_MAX7300 is not set
@@ -620,7 +623,6 @@ CONFIG_GPIO_GENERIC=y
 # CONFIG_GPIO_MAX732X is not set
 # CONFIG_GPIO_MC33880 is not set
 # CONFIG_GPIO_MCP23S08 is not set
-CONFIG_GPIO_MXC=y
 # CONFIG_GPIO_PCA953X is not set
 # CONFIG_GPIO_PCF857X is not set
 # CONFIG_GPIO_PL061 is not set
@@ -655,11 +657,8 @@ CONFIG_HAVE_KERNEL_LZMA=y
 CONFIG_HAVE_KERNEL_LZO=y
 CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_LATENCYTOP_SUPPORT=y
-CONFIG_HAVE_MACH_CLKDEV=y
 CONFIG_HAVE_MEMBLOCK=y
 CONFIG_HAVE_OPROFILE=y
-CONFIG_HAVE_PATA_PLATFORM=y
 CONFIG_HAVE_PERF_EVENTS=y
 CONFIG_HAVE_PROC_CPU=y
 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
@@ -734,6 +733,7 @@ CONFIG_HW_CONSOLE=y
 CONFIG_HW_PERF_EVENTS=y
 CONFIG_HW_RANDOM=m
 # CONFIG_HW_RANDOM_TIMERIOMEM is not set
+CONFIG_HZ=128
 CONFIG_I2C=y
 CONFIG_I2C_ALGOBIT=y
 CONFIG_I2C_BOARDINFO=y
@@ -746,7 +746,6 @@ CONFIG_I2C_COMPAT=y
 # CONFIG_I2C_DIOLAN_U2C is not set
 # CONFIG_I2C_GPIO is not set
 CONFIG_I2C_HELPER_AUTO=y
-# CONFIG_I2C_IMX is not set
 # CONFIG_I2C_MUX is not set
 # CONFIG_I2C_OCORES is not set
 CONFIG_I2C_OMAP=y
@@ -757,7 +756,6 @@ CONFIG_I2C_OMAP=y
 # CONFIG_I2C_STUB is not set
 # CONFIG_I2C_TAOS_EVM is not set
 # CONFIG_I2C_TINY_USB is not set
-CONFIG_I2C_VERSATILE=y
 # CONFIG_I2C_XILINX is not set
 # CONFIG_IBM_NEW_EMAC_EMAC4 is not set
 # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
@@ -767,21 +765,11 @@ CONFIG_I2C_VERSATILE=y
 # CONFIG_IBM_NEW_EMAC_TAH is not set
 # CONFIG_IBM_NEW_EMAC_ZMII is not set
 # CONFIG_ICPLUS_PHY is not set
-CONFIG_ICST=y
 # CONFIG_IDE is not set
 # CONFIG_IEEE802154 is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 # CONFIG_IMA is not set
-CONFIG_IMX2_WDT=y
-CONFIG_IMX_HAVE_PLATFORM_FEC=y
-CONFIG_IMX_HAVE_PLATFORM_GPIO_KEYS=y
-CONFIG_IMX_HAVE_PLATFORM_IMX2_WDT=y
-CONFIG_IMX_HAVE_PLATFORM_IMX_I2C=y
-CONFIG_IMX_HAVE_PLATFORM_IMX_KEYPAD=y
-CONFIG_IMX_HAVE_PLATFORM_IMX_UART=y
-CONFIG_IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX=y
-CONFIG_IMX_HAVE_PLATFORM_SPI_IMX=y
 CONFIG_INET=y
 # CONFIG_INET6_AH is not set
 # CONFIG_INET6_ESP is not set
@@ -949,7 +937,6 @@ CONFIG_KEXEC=y
 CONFIG_KEYBOARD_ATKBD=y
 CONFIG_KEYBOARD_GPIO=y
 # CONFIG_KEYBOARD_GPIO_POLLED is not set
-# CONFIG_KEYBOARD_IMX is not set
 # CONFIG_KEYBOARD_LKKBD is not set
 # CONFIG_KEYBOARD_LM8323 is not set
 # CONFIG_KEYBOARD_MATRIX is not set
@@ -979,7 +966,6 @@ CONFIG_KS8851_MLL=y
 CONFIG_KTIME_SCALAR=y
 # CONFIG_L2TP is not set
 # CONFIG_LAPB is not set
-# CONFIG_LATENCYTOP is not set
 CONFIG_LBDAF=y
 # CONFIG_LCD_AMS369FG06 is not set
 CONFIG_LCD_CLASS_DEVICE=y
@@ -997,7 +983,6 @@ CONFIG_LEDS=y
 CONFIG_LEDS_CLASS=y
 # CONFIG_LEDS_DAC124S085 is not set
 CONFIG_LEDS_GPIO=y
-CONFIG_LEDS_GPIO_REGISTER=y
 # CONFIG_LEDS_LM3530 is not set
 # CONFIG_LEDS_LP3944 is not set
 # CONFIG_LEDS_LP5521 is not set
@@ -1060,6 +1045,9 @@ CONFIG_MAC80211_HAS_RC=y
 CONFIG_MAC80211_HWSIM=m
 CONFIG_MAC80211_LEDS=y
 # CONFIG_MAC80211_MESH is not set
+CONFIG_MAC80211_RC_DEFAULT="pid"
+# CONFIG_MAC80211_RC_DEFAULT_MINSTREL is not set
+CONFIG_MAC80211_RC_DEFAULT_PID=y
 CONFIG_MAC80211_RC_MINSTREL=y
 CONFIG_MAC80211_RC_MINSTREL_HT=y
 CONFIG_MAC80211_RC_PID=y
@@ -1068,14 +1056,8 @@ CONFIG_MACH_CM_T3517=y
 CONFIG_MACH_CM_T3730=y
 # CONFIG_MACH_CRANEBOARD is not set
 CONFIG_MACH_DEVKIT8000=y
-# CONFIG_MACH_EUKREA_CPUIMX51 is not set
-# CONFIG_MACH_EUKREA_CPUIMX51SD is not set
 CONFIG_MACH_IGEP0020=y
 CONFIG_MACH_IGEP0030=y
-CONFIG_MACH_MX51_3DS=y
-CONFIG_MACH_MX51_BABBAGE=y
-CONFIG_MACH_MX51_EFIKAMX=y
-CONFIG_MACH_MX51_EFIKASB=y
 CONFIG_MACH_NOKIA_RM680=y
 CONFIG_MACH_NOKIA_RX51=y
 CONFIG_MACH_OMAP3517EVM=y
@@ -1107,6 +1089,7 @@ CONFIG_MD=y
 # CONFIG_MFD_88PM860X is not set
 # CONFIG_MFD_AAT2870_CORE is not set
 # CONFIG_MFD_ASIC3 is not set
+CONFIG_MFD_CORE=y
 # CONFIG_MFD_MAX8925 is not set
 # CONFIG_MFD_MAX8997 is not set
 # CONFIG_MFD_MAX8998 is not set
@@ -1125,6 +1108,7 @@ CONFIG_MFD_SUPPORT=y
 # CONFIG_MFD_TPS65910 is not set
 # CONFIG_MFD_TPS65912_I2C is not set
 # CONFIG_MFD_TPS65912_SPI is not set
+CONFIG_MFD_TWL4030_AUDIO=y
 # CONFIG_MFD_WL1273_CORE is not set
 # CONFIG_MFD_WM831X_I2C is not set
 # CONFIG_MFD_WM831X_SPI is not set
@@ -1152,6 +1136,7 @@ CONFIG_MMC_OMAP_HS=y
 # CONFIG_MMC_SDHCI_PXAV2 is not set
 # CONFIG_MMC_SDHCI_PXAV3 is not set
 # CONFIG_MMC_TEST is not set
+CONFIG_MMC_UNSAFE_RESUME=y
 # CONFIG_MMC_USHC is not set
 # CONFIG_MMC_VUB300 is not set
 CONFIG_MMU=y
@@ -1183,6 +1168,7 @@ CONFIG_MTD=y
 # CONFIG_MTD_AFS_PARTS is not set
 # CONFIG_MTD_ALAUDA is not set
 # CONFIG_MTD_AR7_PARTS is not set
+# CONFIG_MTD_ARM_INTEGRATOR is not set
 CONFIG_MTD_BLKDEVS=y
 CONFIG_MTD_BLOCK=y
 # CONFIG_MTD_BLOCK2MTD is not set
@@ -1253,19 +1239,14 @@ CONFIG_MTD_UBI_BEB_RESERVE=1
 # CONFIG_MTD_UBI_DEBUG is not set
 # CONFIG_MTD_UBI_GLUEBI is not set
 CONFIG_MTD_UBI_WL_THRESHOLD=4096
+# CONFIG_MUSB_PIO_ONLY is not set
 # CONFIG_MUTEX_SPIN_ON_OWNER is not set
 CONFIG_MWIFIEX=m
 CONFIG_MWIFIEX_SDIO=m
-CONFIG_MX51_EFIKA_COMMON=y
-CONFIG_MXC_DEBUG_BOARD=y
-# CONFIG_MXC_IRQ_PRIOR is not set
-# CONFIG_MXC_PWM is not set
-CONFIG_MXC_TZIC=y
 CONFIG_NAMESPACES=y
 # CONFIG_NATIONAL_PHY is not set
 # CONFIG_NCP_FS is not set
 CONFIG_NEED_DMA_MAP_STATE=y
-CONFIG_NEED_PER_CPU_KM=y
 CONFIG_NEON=y
 CONFIG_NET=y
 # CONFIG_NETCONSOLE is not set
@@ -1357,7 +1338,9 @@ CONFIG_NLS_ISO8859_1=y
 # CONFIG_NLS_KOI8_U is not set
 # CONFIG_NLS_UTF8 is not set
 CONFIG_NOP_TRACER=y
+CONFIG_NOP_USB_XCEIV=y
 CONFIG_NO_HZ=y
+CONFIG_NR_CPUS=2
 # CONFIG_NTFS_FS is not set
 # CONFIG_N_GSM is not set
 CONFIG_OC_ETM=y
@@ -1430,7 +1413,6 @@ CONFIG_PANEL_TAAL=y
 # CONFIG_PANTHERLORD_FF is not set
 # CONFIG_PARPORT is not set
 CONFIG_PARTITION_ADVANCED=y
-# CONFIG_PATA_IMX is not set
 # CONFIG_PATA_PLATFORM is not set
 # CONFIG_PCCARD is not set
 # CONFIG_PCI_SYSCALL is not set
@@ -1443,10 +1425,9 @@ CONFIG_PERF_USE_VMALLOC=y
 CONFIG_PHYLIB=y
 # CONFIG_PHYS_ADDR_T_64BIT is not set
 # CONFIG_PID_NS is not set
+CONFIG_PL310_ERRATA_588369=y
+CONFIG_PL310_ERRATA_727915=y
 # CONFIG_PLAT_SPEAR is not set
-CONFIG_PLAT_VERSATILE=y
-CONFIG_PLAT_VERSATILE_CLCD=y
-CONFIG_PLAT_VERSATILE_SCHED_CLOCK=y
 CONFIG_PM=y
 # CONFIG_PMBUS is not set
 # CONFIG_PMIC_ADP5520 is not set
@@ -1493,7 +1474,6 @@ CONFIG_PROVE_LOCKING=y
 # CONFIG_R3964 is not set
 # CONFIG_RAID_ATTRS is not set
 # CONFIG_RAMOOPS is not set
-CONFIG_RATIONAL=y
 # CONFIG_RAW_DRIVER is not set
 # CONFIG_RCU_BOOST is not set
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
@@ -1612,7 +1592,6 @@ CONFIG_RTC_INTF_DEV=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_SYSFS=y
 CONFIG_RTC_LIB=y
-CONFIG_RTC_MXC=y
 CONFIG_RTL8187=m
 CONFIG_RTL8187_LEDS=y
 CONFIG_RTL8192CU=m
@@ -1782,8 +1761,6 @@ CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SERIAL_IFX6X60 is not set
-CONFIG_SERIAL_IMX=y
-CONFIG_SERIAL_IMX_CONSOLE=y
 # CONFIG_SERIAL_MAX3100 is not set
 # CONFIG_SERIAL_MAX3107 is not set
 # CONFIG_SERIAL_NONSTANDARD is not set
@@ -1816,17 +1793,20 @@ CONFIG_SMSC911X=y
 # CONFIG_SMSC911X_ARCH_HOOKS is not set
 CONFIG_SMSC_PHY=y
 # CONFIG_SM_FTL is not set
+CONFIG_SND=m
+CONFIG_SND_AC97_CODEC=m
 # CONFIG_SND_AC97_POWER_SAVE is not set
 # CONFIG_SND_ALOOP is not set
 CONFIG_SND_ARM=y
+CONFIG_SND_ARMAACI=m
 CONFIG_SND_DEBUG=y
 # CONFIG_SND_DEBUG_VERBOSE is not set
 CONFIG_SND_DRIVERS=y
 # CONFIG_SND_DUMMY is not set
+CONFIG_SND_DYNAMIC_MINORS=y
 # CONFIG_SND_EMU10K1_SEQ is not set
 # CONFIG_SND_HRTIMER is not set
 CONFIG_SND_HWDEP=m
-# CONFIG_SND_IMX_SOC is not set
 CONFIG_SND_JACK=y
 CONFIG_SND_MIXER_OSS=m
 # CONFIG_SND_MPU401 is not set
@@ -1848,6 +1828,7 @@ CONFIG_SND_OMAP_SOC_ZOOM2=m
 # CONFIG_SND_OPL3_LIB_SEQ is not set
 # CONFIG_SND_OPL4_LIB_SEQ is not set
 CONFIG_SND_OSSEMUL=y
+CONFIG_SND_PCM=m
 CONFIG_SND_PCM_OSS=m
 CONFIG_SND_PCM_OSS_PLUGINS=y
 # CONFIG_SND_PCM_XRUN_DEBUG is not set
@@ -1865,6 +1846,7 @@ CONFIG_SND_SOC_TWL4030=m
 CONFIG_SND_SOC_TWL6040=m
 CONFIG_SND_SPI=y
 CONFIG_SND_SUPPORT_OLD_API=y
+CONFIG_SND_TIMER=m
 CONFIG_SND_USB=y
 # CONFIG_SND_USB_6FIRE is not set
 CONFIG_SND_USB_AUDIO=m
@@ -1873,7 +1855,6 @@ CONFIG_SND_USB_AUDIO=m
 CONFIG_SND_VERBOSE_PRINTK=y
 CONFIG_SND_VERBOSE_PROCFS=y
 CONFIG_SND_VMASTER=y
-CONFIG_SOC_IMX51=y
 CONFIG_SOC_OMAP3430=y
 CONFIG_SOC_OMAPTI816X=y
 # CONFIG_SOFT_WATCHDOG is not set
@@ -1890,7 +1871,6 @@ CONFIG_SPI_BITBANG=m
 # CONFIG_SPI_DEBUG is not set
 # CONFIG_SPI_DESIGNWARE is not set
 # CONFIG_SPI_GPIO is not set
-CONFIG_SPI_IMX=m
 CONFIG_SPI_MASTER=y
 # CONFIG_SPI_OC_TINY is not set
 CONFIG_SPI_OMAP24XX=y
@@ -1955,8 +1935,6 @@ CONFIG_THUMB2_KERNEL=y
 CONFIG_TICK_ONESHOT=y
 CONFIG_TIMERFD=y
 CONFIG_TIMER_STATS=y
-# CONFIG_TINY_PREEMPT_RCU is not set
-# CONFIG_TINY_RCU is not set
 # CONFIG_TIPC is not set
 # CONFIG_TI_DAVINCI_CPDMA is not set
 # CONFIG_TI_DAVINCI_EMAC is not set
@@ -2006,12 +1984,14 @@ CONFIG_TREE_PREEMPT_RCU=y
 # CONFIG_TREE_RCU_TRACE is not set
 # CONFIG_TTY_PRINTK is not set
 # CONFIG_TUN is not set
+CONFIG_TWL4030_CORE=y
 # CONFIG_TWL4030_MADC is not set
 CONFIG_TWL4030_POWER=y
 CONFIG_TWL4030_USB=y
 CONFIG_TWL4030_WATCHDOG=y
 # CONFIG_TWL6030_PWM is not set
 CONFIG_TWL6030_USB=y
+CONFIG_TWL6040_CORE=y
 # CONFIG_UACCESS_WITH_MEMCPY is not set
 CONFIG_UBIFS_FS=y
 # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
@@ -2038,7 +2018,9 @@ CONFIG_USB_ALI_M5632=y
 CONFIG_USB_AN2720=y
 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 # CONFIG_USB_APPLEDISPLAY is not set
+CONFIG_USB_ARCH_HAS_EHCI=y
 CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARMLINUX=y
 # CONFIG_USB_AUDIO is not set
 CONFIG_USB_BELKIN=y
@@ -2054,7 +2036,7 @@ CONFIG_USB_DEVICE_CLASS=y
 # CONFIG_USB_DYNAMIC_MINORS is not set
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_HCD_OMAP=y
-CONFIG_USB_EHCI_MXC=y
+# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
 CONFIG_USB_EHCI_TT_NEWSCHED=y
 # CONFIG_USB_EMI26 is not set
 # CONFIG_USB_EMI62 is not set
@@ -2066,6 +2048,7 @@ CONFIG_USB_ETH_RNDIS=y
 # CONFIG_USB_FTDI_ELAN is not set
 # CONFIG_USB_FUNCTIONFS is not set
 CONFIG_USB_FUSB300=m
+CONFIG_USB_GADGET=y
 # CONFIG_USB_GADGETFS is not set
 CONFIG_USB_GADGET_DEBUG=y
 CONFIG_USB_GADGET_DEBUG_FILES=y
@@ -2090,6 +2073,7 @@ CONFIG_USB_INVENTRA_DMA=y
 # CONFIG_USB_ISIGHTFW is not set
 # CONFIG_USB_ISP116X_HCD is not set
 # CONFIG_USB_ISP1362_HCD is not set
+# CONFIG_USB_ISP1760_HCD is not set
 # CONFIG_USB_KAWETH is not set
 CONFIG_USB_KC2190=y
 # CONFIG_USB_LCD is not set
@@ -2132,6 +2116,7 @@ CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_HCD_OMAP3=y
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 # CONFIG_USB_OMAP is not set
+CONFIG_USB_OTG=y
 # CONFIG_USB_OTG_BLACKLIST_HUB is not set
 CONFIG_USB_OTG_UTILS=y
 # CONFIG_USB_OTG_WHITELIST is not set
@@ -2205,12 +2190,12 @@ CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
 CONFIG_VT_HW_CONSOLE_BINDING=y
 # CONFIG_VXFS_FS is not set
+CONFIG_W1=y
 CONFIG_W1_CON=y
 # CONFIG_W1_MASTER_DS1WM is not set
 # CONFIG_W1_MASTER_DS2482 is not set
 # CONFIG_W1_MASTER_DS2490 is not set
 # CONFIG_W1_MASTER_GPIO is not set
-CONFIG_W1_MASTER_MXC=y
 # CONFIG_W1_SLAVE_BQ27000 is not set
 # CONFIG_W1_SLAVE_DS2408 is not set
 # CONFIG_W1_SLAVE_DS2423 is not set