LINARO: update configs

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

4 files changed, 97 insertions, 47 deletions

diff --git a/debian.linaro/config/armel/config.flavour.linaro-mx51 b/debian.linaro/config/armel/config.flavour.linaro-mx51
index 57bc8399f8a..ac05a9571c8 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-mx51
+++ b/debian.linaro/config/armel/config.flavour.linaro-mx51
@@ -1,16 +1,20 @@
 #
 # 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_ERRATA_751472 is not set
 CONFIG_ARM_L1_CACHE_SHIFT=6
 CONFIG_ARM_THUMBEE=y
+CONFIG_AUTO_ZRELADDR=y
 # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 CONFIG_CMDLINE=""
 # CONFIG_DISPLAY_SUPPORT is not set
 # CONFIG_DRM is not set
+# CONFIG_FB_CFB_COPYAREA is not set
+# CONFIG_FB_CFB_FILLRECT is not set
+# CONFIG_FB_CFB_IMAGEBLIT is not set
 # CONFIG_FB_MODE_HELPERS is not set
 # CONFIG_FB_TILEBLITTING is not set
 # CONFIG_FIRMWARE_EDID is not set
@@ -24,11 +28,8 @@ CONFIG_MAC80211_RC_DEFAULT="pid"
 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
diff --git a/debian.linaro/config/armel/config.flavour.linaro-omap b/debian.linaro/config/armel/config.flavour.linaro-omap
index 3b9015de1d1..bbde6dfbf93 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-omap
+++ b/debian.linaro/config/armel/config.flavour.linaro-omap
@@ -6,13 +6,16 @@ CONFIG_AC97_BUS=m
 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_AUTO_ZRELADDR is not set
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_CMDLINE="root=/dev/mmcblk0p2 rootwait console=ttyO2,115200"
 CONFIG_DISPLAY_SUPPORT=y
 CONFIG_DRM=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_IMAGEBLIT=y
 CONFIG_FB_MODE_HELPERS=y
 CONFIG_FB_TILEBLITTING=y
 CONFIG_FIRMWARE_EDID=y
@@ -27,7 +30,6 @@ 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
diff --git a/debian.linaro/config/armel/config.flavour.linaro-vexpress b/debian.linaro/config/armel/config.flavour.linaro-vexpress
index f5b897e01e5..e3880e950b0 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-vexpress
+++ b/debian.linaro/config/armel/config.flavour.linaro-vexpress
@@ -6,13 +6,16 @@ CONFIG_AC97_BUS=y
 # 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_AUTO_ZRELADDR 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_CFB_COPYAREA=y
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_IMAGEBLIT=y
 # CONFIG_FB_MODE_HELPERS is not set
 # CONFIG_FB_TILEBLITTING is not set
 # CONFIG_FIRMWARE_EDID is not set
@@ -27,7 +30,6 @@ CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
 # 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
diff --git a/debian.linaro/config/config.common.ubuntu b/debian.linaro/config/config.common.ubuntu
index 539a9061d1b..70559cb6986 100644
--- a/debian.linaro/config/config.common.ubuntu
+++ b/debian.linaro/config/config.common.ubuntu
@@ -19,11 +19,10 @@ CONFIG_ANON_INODES=y
 # CONFIG_ARCH_CLPS711X is not set
 # CONFIG_ARCH_CNS3XXX is not set
 # CONFIG_ARCH_DAVINCI is not set
-# CONFIG_ARCH_DMA_ADDR_T_64BIT is not set
 # CONFIG_ARCH_DOVE is not set
 # CONFIG_ARCH_EBSA110 is not set
 # CONFIG_ARCH_EP93XX is not set
-# CONFIG_ARCH_EXYNOS4 is not set
+# CONFIG_ARCH_EXYNOS is not set
 # CONFIG_ARCH_FOOTBRIDGE is not set
 # CONFIG_ARCH_GEMINI is not set
 # CONFIG_ARCH_H720X is not set
@@ -31,6 +30,9 @@ CONFIG_ARCH_HAS_CPUFREQ=y
 CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
 CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y
 CONFIG_ARCH_HAS_OPP=y
+# CONFIG_ARCH_HIGHBANK is not set
+# CONFIG_ARCH_IMX_V4_V5 is not set
+# CONFIG_ARCH_IMX_V6_V7 is not set
 # CONFIG_ARCH_INTEGRATOR is not set
 # CONFIG_ARCH_IOP13XX is not set
 # CONFIG_ARCH_IOP32X is not set
@@ -44,19 +46,14 @@ 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_MX53=y
 CONFIG_ARCH_MXC_AUDMUX_V2=y
 CONFIG_ARCH_MXC_IOMUX_V3=y
 # 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_OMAP1 is not set
 # CONFIG_ARCH_OMAP2 is not set
 CONFIG_ARCH_OMAP2PLUS=y
@@ -65,7 +62,7 @@ CONFIG_ARCH_OMAP3=y
 CONFIG_ARCH_OMAP4=y
 CONFIG_ARCH_OMAP_OTG=y
 # CONFIG_ARCH_ORION5X is not set
-# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
+# CONFIG_ARCH_PICOXCELL is not set
 # CONFIG_ARCH_PNX4008 is not set
 # CONFIG_ARCH_PRIMA2 is not set
 # CONFIG_ARCH_PXA is not set
@@ -99,6 +96,7 @@ CONFIG_ARM=y
 CONFIG_ARM_AMBA=y
 # CONFIG_ARM_APPENDED_DTB is not set
 CONFIG_ARM_ASM_UNIFIED=y
+CONFIG_ARM_CPU_SUSPEND=y
 CONFIG_ARM_CPU_TOPOLOGY=y
 CONFIG_ARM_DMA_MEM_BUFFERABLE=y
 # CONFIG_ARM_ERRATA_430973 is not set
@@ -114,8 +112,7 @@ CONFIG_ARM_ERRATA_720789=y
 CONFIG_ARM_GIC=y
 # CONFIG_ARM_KPROBES_TEST is not set
 CONFIG_ARM_L1_CACHE_SHIFT_6=y
-# CONFIG_ARM_LPAE is not set
-# CONFIG_ARM_PATCH_PHYS_VIRT is not set
+CONFIG_ARM_PATCH_PHYS_VIRT=y
 # CONFIG_ARM_SP805_WATCHDOG is not set
 CONFIG_ARM_THUMB=y
 CONFIG_ARM_TIMER_SP804=y
@@ -131,6 +128,7 @@ CONFIG_ATA_BMDMA=y
 # CONFIG_ATA_OVER_ETH is not set
 CONFIG_ATA_SFF=y
 CONFIG_ATA_VERBOSE_ERROR=y
+# CONFIG_ATH6KL is not set
 # CONFIG_ATH9K is not set
 # CONFIG_ATH9K_HTC is not set
 CONFIG_ATH_COMMON=m
@@ -141,7 +139,6 @@ CONFIG_AUDIT=y
 CONFIG_AUDIT_GENERIC=y
 # CONFIG_AUFS_FS is not set
 # CONFIG_AUTOFS4_FS is not set
-# CONFIG_AUTO_ZRELADDR is not set
 # CONFIG_AUXDISPLAY is not set
 CONFIG_AVERAGE=y
 # CONFIG_AX88796 is not set
@@ -158,6 +155,7 @@ CONFIG_B43LEGACY_PIO=y
 # CONFIG_B43_DEBUG is not set
 CONFIG_B43_HWRNG=y
 CONFIG_B43_LEDS=y
+# CONFIG_B43_PHY_HT is not set
 CONFIG_B43_PHY_LP=y
 CONFIG_B43_PHY_N=y
 CONFIG_B43_PIO=y
@@ -217,6 +215,7 @@ CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
 # CONFIG_BOOT_PRINTK_DELAY is not set
 CONFIG_BOUNCE=y
 CONFIG_BRANCH_PROFILE_NONE=y
+# CONFIG_BRCMFMAC is not set
 # CONFIG_BRIDGE is not set
 # CONFIG_BROADCOM_PHY is not set
 CONFIG_BROKEN_ON_SMP=y
@@ -247,6 +246,7 @@ CONFIG_CACHE_PL310=y
 # CONFIG_CAN is not set
 CONFIG_CAN_PM_TRACE=y
 CONFIG_CARL9170=m
+# CONFIG_CARL9170_HWRNG is not set
 CONFIG_CARL9170_LEDS=y
 CONFIG_CARL9170_WPC=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
@@ -337,6 +337,7 @@ CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_BLKCIPHER=m
 CONFIG_CRYPTO_BLKCIPHER2=y
 CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_BLOWFISH_COMMON=m
 # CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_CAST5 is not set
 # CONFIG_CRYPTO_CAST6 is not set
@@ -389,6 +390,7 @@ CONFIG_CRYPTO_SHA256=m
 # CONFIG_CRYPTO_TGR192 is not set
 CONFIG_CRYPTO_TWOFISH=m
 CONFIG_CRYPTO_TWOFISH_COMMON=m
+# CONFIG_CRYPTO_USER is not set
 # CONFIG_CRYPTO_USER_API_HASH is not set
 # CONFIG_CRYPTO_USER_API_SKCIPHER is not set
 # CONFIG_CRYPTO_VMAC is not set
@@ -410,6 +412,8 @@ CONFIG_DEBUG_FS=y
 CONFIG_DEBUG_GPIO=y
 # CONFIG_DEBUG_HIGHMEM is not set
 # CONFIG_DEBUG_ICEDCC is not set
+# CONFIG_DEBUG_IMX50_IMX53_UART is not set
+# CONFIG_DEBUG_IMX51_UART is not set
 CONFIG_DEBUG_INFO=y
 # CONFIG_DEBUG_INFO_REDUCED is not set
 CONFIG_DEBUG_KERNEL=y
@@ -417,6 +421,7 @@ CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_KOBJECT is not set
 # CONFIG_DEBUG_LIST is not set
 CONFIG_DEBUG_LL=y
+CONFIG_DEBUG_LL_UART_NONE=y
 # CONFIG_DEBUG_LOCKDEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 CONFIG_DEBUG_LOCK_ALLOC=y
@@ -477,6 +482,7 @@ CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_DM_MULTIPATH is not set
 # CONFIG_DM_RAID is not set
 # CONFIG_DM_SNAPSHOT is not set
+# CONFIG_DM_THIN_PROVISIONING is not set
 # CONFIG_DM_UEVENT is not set
 # CONFIG_DM_ZERO is not set
 # CONFIG_DNET is not set
@@ -500,12 +506,15 @@ CONFIG_ELF_CORE=y
 CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_ENABLE_WARN_DEPRECATED=y
 # CONFIG_ENC28J60 is not set
+# CONFIG_ENCRYPTED_KEYS is not set
 CONFIG_EPOLL=y
 # CONFIG_EQUALIZER is not set
+CONFIG_ETHERNET=y
 # CONFIG_ETHOC is not set
 CONFIG_EVENTFD=y
 CONFIG_EVENT_POWER_TRACING_DEPRECATED=y
 CONFIG_EVENT_TRACING=y
+# CONFIG_EVM is not set
 CONFIG_EXPERIMENTAL=y
 CONFIG_EXPERT=y
 CONFIG_EXT2_FS=y
@@ -533,9 +542,6 @@ CONFIG_FB_ARMCLCD=y
 # CONFIG_FB_BACKLIGHT is not set
 # CONFIG_FB_BOOT_VESA_SUPPORT is not set
 # CONFIG_FB_BROADSHEET is not set
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_IMAGEBLIT=y
 # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
 # CONFIG_FB_DDC is not set
 # CONFIG_FB_FOREIGN_ENDIAN is not set
@@ -545,8 +551,8 @@ CONFIG_FB_OMAP2=y
 CONFIG_FB_OMAP2_DEBUG_SUPPORT=y
 CONFIG_FB_OMAP2_NUM_FBS=3
 # CONFIG_FB_OMAP_BOOTLOADER_INIT is not set
-# CONFIG_FB_OMAP_LCD_VGA is not set
 # CONFIG_FB_S1D13XXX is not set
+# CONFIG_FB_SMSCUFX is not set
 # CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_SYS_COPYAREA is not set
 # CONFIG_FB_SYS_FILLRECT is not set
@@ -597,6 +603,7 @@ CONFIG_FW_LOADER=y
 # CONFIG_GAMEPORT is not set
 # CONFIG_GCOV_KERNEL is not set
 CONFIG_GENERIC_ACL=y
+CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
@@ -648,7 +655,6 @@ CONFIG_HAVE_FUNCTION_TRACER=y
 CONFIG_HAVE_GENERIC_DMA_COHERENT=y
 CONFIG_HAVE_GENERIC_HARDIRQS=y
 CONFIG_HAVE_HW_BREAKPOINT=y
-CONFIG_HAVE_IDE=y
 CONFIG_HAVE_IRQ_WORK=y
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_LZMA=y
@@ -664,6 +670,7 @@ CONFIG_HAVE_PERF_EVENTS=y
 CONFIG_HAVE_PROC_CPU=y
 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
 CONFIG_HAVE_SCHED_CLOCK=y
+CONFIG_HAVE_SECCOMP_FILTER=y
 CONFIG_HAVE_SPARSE_IRQ=y
 # CONFIG_HDQ_MASTER_OMAP is not set
 # CONFIG_HEADERS_CHECK is not set
@@ -689,6 +696,7 @@ CONFIG_HID_KENSINGTON=y
 CONFIG_HID_KYE=y
 # CONFIG_HID_LCPOWER is not set
 CONFIG_HID_LOGITECH=y
+CONFIG_HID_LOGITECH_DJ=m
 CONFIG_HID_MICROSOFT=y
 CONFIG_HID_MONTEREY=y
 # CONFIG_HID_MULTITOUCH is not set
@@ -698,6 +706,7 @@ CONFIG_HID_PANTHERLORD=y
 CONFIG_HID_PETALYNX=y
 # CONFIG_HID_PICOLCD is not set
 # CONFIG_HID_PID is not set
+# CONFIG_HID_PRIMAX is not set
 # CONFIG_HID_PRODIKEYS is not set
 # CONFIG_HID_QUANTA is not set
 # CONFIG_HID_ROCCAT is not set
@@ -729,7 +738,7 @@ CONFIG_HOTPLUG_CPU=y
 CONFIG_HWMON=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
 # CONFIG_HWMON_VID is not set
-# CONFIG_HWSPINLOCK is not set
+# CONFIG_HWSPINLOCK_OMAP is not set
 CONFIG_HW_CONSOLE=y
 CONFIG_HW_PERF_EVENTS=y
 CONFIG_HW_RANDOM=m
@@ -742,7 +751,7 @@ CONFIG_I2C_COMPAT=y
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
 # CONFIG_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_DESIGNWARE is not set
+# CONFIG_I2C_DESIGNWARE_PLATFORM is not set
 # CONFIG_I2C_DIOLAN_U2C is not set
 # CONFIG_I2C_GPIO is not set
 CONFIG_I2C_HELPER_AUTO=y
@@ -759,27 +768,23 @@ CONFIG_I2C_OMAP=y
 # 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
-# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
-# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
-# CONFIG_IBM_NEW_EMAC_RGMII is not set
-# 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_AHCI=y
 CONFIG_IMX_HAVE_PLATFORM_FEC=y
+CONFIG_IMX_HAVE_PLATFORM_FSL_USB2_UDC=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_MXC_EHCI=y
+CONFIG_IMX_HAVE_PLATFORM_PATA_IMX=y
 CONFIG_IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX=y
 CONFIG_IMX_HAVE_PLATFORM_SPI_IMX=y
 CONFIG_INET=y
@@ -839,8 +844,8 @@ CONFIG_INOTIFY_USER=y
 CONFIG_INPUT=y
 # CONFIG_INPUT_AD714X is not set
 # CONFIG_INPUT_ADXL34X is not set
-# CONFIG_INPUT_ATI_REMOTE is not set
 # CONFIG_INPUT_ATI_REMOTE2 is not set
+# CONFIG_INPUT_BMA150 is not set
 # CONFIG_INPUT_CM109 is not set
 # CONFIG_INPUT_CMA3000 is not set
 # CONFIG_INPUT_EVBUG is not set
@@ -1006,6 +1011,7 @@ CONFIG_LEDS_GPIO_REGISTER=y
 # CONFIG_LEDS_PCA9532 is not set
 # CONFIG_LEDS_PCA955X is not set
 # CONFIG_LEDS_REGULATOR is not set
+# CONFIG_LEDS_RENESAS_TPU is not set
 CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_BACKLIGHT=m
 CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
@@ -1042,7 +1048,7 @@ CONFIG_LOCKD_V4=y
 # CONFIG_LOGIG940_FF is not set
 # CONFIG_LOGIRUMBLEPAD2_FF is not set
 # CONFIG_LOGITECH_FF is not set
-# CONFIG_LOGIWII_FF is not set
+# CONFIG_LOGIWHEELS_FF is not set
 CONFIG_LOGO=y
 CONFIG_LOGO_LINUX_CLUT224=y
 CONFIG_LOGO_LINUX_MONO=y
@@ -1072,10 +1078,16 @@ CONFIG_MACH_DEVKIT8000=y
 # CONFIG_MACH_EUKREA_CPUIMX51SD is not set
 CONFIG_MACH_IGEP0020=y
 CONFIG_MACH_IGEP0030=y
+CONFIG_MACH_IMX51_DT=y
+CONFIG_MACH_IMX53_DT=y
 CONFIG_MACH_MX51_3DS=y
 CONFIG_MACH_MX51_BABBAGE=y
 CONFIG_MACH_MX51_EFIKAMX=y
 CONFIG_MACH_MX51_EFIKASB=y
+CONFIG_MACH_MX53_ARD=y
+CONFIG_MACH_MX53_EVK=y
+CONFIG_MACH_MX53_LOCO=y
+CONFIG_MACH_MX53_SMD=y
 CONFIG_MACH_NOKIA_RM680=y
 CONFIG_MACH_NOKIA_RX51=y
 CONFIG_MACH_OMAP3517EVM=y
@@ -1089,6 +1101,7 @@ CONFIG_MACH_OMAP4_PANDA=y
 CONFIG_MACH_OMAP_3430SDP=y
 CONFIG_MACH_OMAP_3630SDP=y
 CONFIG_MACH_OMAP_4430SDP=y
+CONFIG_MACH_OMAP_GENERIC=y
 CONFIG_MACH_OMAP_LDP=y
 CONFIG_MACH_OMAP_ZOOM2=y
 CONFIG_MACH_OMAP_ZOOM3=y
@@ -1115,7 +1128,6 @@ CONFIG_MFD_OMAP_USB_HOST=y
 # CONFIG_MFD_PCF50633 is not set
 # CONFIG_MFD_SM501 is not set
 # CONFIG_MFD_STMPE is not set
-CONFIG_MFD_SUPPORT=y
 # CONFIG_MFD_T7L66XB is not set
 # CONFIG_MFD_TC3589X is not set
 # CONFIG_MFD_TC6387XB is not set
@@ -1146,6 +1158,7 @@ CONFIG_MMC_BLOCK_MINORS=8
 # CONFIG_MMC_CLKGATE is not set
 # CONFIG_MMC_DEBUG is not set
 # CONFIG_MMC_DW is not set
+# CONFIG_MMC_MXC is not set
 CONFIG_MMC_OMAP=y
 CONFIG_MMC_OMAP_HS=y
 # CONFIG_MMC_SDHCI is not set
@@ -1200,10 +1213,10 @@ CONFIG_MTD_CHAR=y
 CONFIG_MTD_CMDLINE_PARTS=y
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
 # CONFIG_MTD_DATAFLASH is not set
-# CONFIG_MTD_DEBUG is not set
 # CONFIG_MTD_DOC2000 is not set
 # CONFIG_MTD_DOC2001 is not set
 # CONFIG_MTD_DOC2001PLUS is not set
+# CONFIG_MTD_DOCG3 is not set
 CONFIG_MTD_GEN_PROBE=y
 # CONFIG_MTD_JEDECPROBE is not set
 # CONFIG_MTD_LPDDR is not set
@@ -1253,6 +1266,7 @@ 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_MULTI_IRQ_HANDLER=y
 # CONFIG_MUTEX_SPIN_ON_OWNER is not set
 CONFIG_MWIFIEX=m
 CONFIG_MWIFIEX_SDIO=m
@@ -1270,8 +1284,6 @@ CONFIG_NEON=y
 CONFIG_NET=y
 # CONFIG_NETCONSOLE is not set
 CONFIG_NETDEVICES=y
-CONFIG_NETDEV_1000=y
-CONFIG_NETDEV_10000=y
 CONFIG_NETFILTER=y
 CONFIG_NETFILTER_ADVANCED=y
 # CONFIG_NETFILTER_DEBUG is not set
@@ -1284,9 +1296,9 @@ CONFIG_NETWORK_FILESYSTEMS=y
 # CONFIG_NETWORK_PHY_TIMESTAMPING is not set
 CONFIG_NETWORK_SECMARK=y
 # CONFIG_NET_9P is not set
+CONFIG_NET_CORE=y
 # CONFIG_NET_DROP_MONITOR is not set
 # CONFIG_NET_DSA is not set
-CONFIG_NET_ETHERNET=y
 # CONFIG_NET_IPGRE_DEMUX is not set
 # CONFIG_NET_IPIP is not set
 CONFIG_NET_KEY=y
@@ -1296,6 +1308,21 @@ CONFIG_NET_KEY_MIGRATE=y
 # CONFIG_NET_POLL_CONTROLLER is not set
 # CONFIG_NET_SCHED is not set
 # CONFIG_NET_TCPPROBE is not set
+CONFIG_NET_VENDOR_8390=y
+CONFIG_NET_VENDOR_BROADCOM=y
+CONFIG_NET_VENDOR_CHELSIO=y
+CONFIG_NET_VENDOR_FARADAY=y
+CONFIG_NET_VENDOR_FREESCALE=y
+CONFIG_NET_VENDOR_I825XX=y
+CONFIG_NET_VENDOR_INTEL=y
+CONFIG_NET_VENDOR_MARVELL=y
+CONFIG_NET_VENDOR_MICREL=y
+CONFIG_NET_VENDOR_MICROCHIP=y
+CONFIG_NET_VENDOR_NATSEMI=y
+CONFIG_NET_VENDOR_SEEQ=y
+CONFIG_NET_VENDOR_SMSC=y
+CONFIG_NET_VENDOR_STMICRO=y
+CONFIG_NET_VENDOR_TI=y
 CONFIG_NEW_LEDS=y
 # CONFIG_NFC is not set
 # CONFIG_NFSD is not set
@@ -1393,6 +1420,7 @@ CONFIG_OMAP4_DSS_HDMI=y
 CONFIG_OMAP_32K_TIMER=y
 CONFIG_OMAP_32K_TIMER_HZ=128
 CONFIG_OMAP_DM_TIMER=y
+# CONFIG_OMAP_IOMMU is not set
 # CONFIG_OMAP_MBOX_FWK is not set
 CONFIG_OMAP_MCBSP=y
 CONFIG_OMAP_MUX=y
@@ -1421,9 +1449,11 @@ CONFIG_P54_USB=m
 CONFIG_PACKET=y
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PAGE_OFFSET=0x80000000
+# CONFIG_PANEL_DVI is not set
 CONFIG_PANEL_GENERIC_DPI=y
 # CONFIG_PANEL_LGPHILIPS_LB035Q02 is not set
 # CONFIG_PANEL_NEC_NL8048HL11_01B is not set
+# CONFIG_PANEL_PICODLP is not set
 # CONFIG_PANEL_SHARP_LS037V7DW01 is not set
 CONFIG_PANEL_TAAL=y
 # CONFIG_PANEL_TPO_TD043MTEA1 is not set
@@ -1443,6 +1473,7 @@ 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_753970 is not set
 # CONFIG_PL310_ERRATA_769419 is not set
 # CONFIG_PLAT_SPEAR is not set
 CONFIG_PLAT_VERSATILE=y
@@ -1455,6 +1486,7 @@ CONFIG_PM=y
 CONFIG_PM_ADVANCED_DEBUG=y
 CONFIG_PM_CLK=y
 CONFIG_PM_DEBUG=y
+# CONFIG_PM_DEVFREQ is not set
 CONFIG_PM_OPP=y
 CONFIG_PM_RUNTIME=y
 CONFIG_PM_SLEEP=y
@@ -1512,12 +1544,14 @@ CONFIG_RD_XZ=y
 # CONFIG_REALTEK_PHY is not set
 CONFIG_REGMAP=y
 CONFIG_REGMAP_I2C=y
+CONFIG_REGMAP_SPI=m
 CONFIG_REGULATOR=y
 # CONFIG_REGULATOR_AD5398 is not set
 # CONFIG_REGULATOR_BQ24022 is not set
 # CONFIG_REGULATOR_DEBUG is not set
 # CONFIG_REGULATOR_DUMMY is not set
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
+# CONFIG_REGULATOR_GPIO is not set
 # CONFIG_REGULATOR_ISL6271A is not set
 # CONFIG_REGULATOR_LP3971 is not set
 # CONFIG_REGULATOR_LP3972 is not set
@@ -1618,8 +1652,6 @@ CONFIG_RTL8187=m
 CONFIG_RTL8187_LEDS=y
 CONFIG_RTL8192CU=m
 CONFIG_RTL8192C_COMMON=m
-# CONFIG_RTL8192DE is not set
-CONFIG_RTL8192SE=m
 CONFIG_RTLWIFI=m
 CONFIG_RT_MUTEXES=y
 # CONFIG_RT_MUTEX_TESTER is not set
@@ -1657,6 +1689,7 @@ CONFIG_SCSI_SCAN_ASYNC=y
 CONFIG_SCSI_WAIT_SCAN=m
 CONFIG_SDIO_UART=y
 CONFIG_SECCOMP=y
+# CONFIG_SECCOMP_FILTER is not set
 CONFIG_SECURITY=y
 CONFIG_SECURITYFS=y
 CONFIG_SECURITY_APPARMOR=y
@@ -1676,7 +1709,9 @@ CONFIG_SECURITY_SELINUX_DEVELOP=y
 CONFIG_SECURITY_SMACK=y
 # CONFIG_SECURITY_TOMOYO is not set
 CONFIG_SECURITY_YAMA=y
+# CONFIG_SEEQ8005 is not set
 CONFIG_SELECT_MEMORY_MODEL=y
+# CONFIG_SENSORS_AD7314 is not set
 # CONFIG_SENSORS_AD7414 is not set
 # CONFIG_SENSORS_AD7418 is not set
 # CONFIG_SENSORS_ADCXX is not set
@@ -1769,6 +1804,7 @@ CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_SERIAL_8250_DETECT_IRQ=y
+# CONFIG_SERIAL_8250_DW is not set
 CONFIG_SERIAL_8250_EXTENDED=y
 CONFIG_SERIAL_8250_MANY_PORTS=y
 CONFIG_SERIAL_8250_NR_UARTS=32
@@ -1875,6 +1911,7 @@ CONFIG_SND_VERBOSE_PRINTK=y
 CONFIG_SND_VERBOSE_PROCFS=y
 CONFIG_SND_VMASTER=y
 CONFIG_SOC_IMX51=y
+CONFIG_SOC_IMX53=y
 CONFIG_SOC_OMAP3430=y
 CONFIG_SOC_OMAPTI816X=y
 # CONFIG_SOFT_WATCHDOG is not set
@@ -1956,8 +1993,7 @@ 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_TINY_PREEMPT_RCU=y
 # CONFIG_TIPC is not set
 # CONFIG_TI_DAVINCI_CPDMA is not set
 # CONFIG_TI_DAVINCI_EMAC is not set
@@ -1990,6 +2026,7 @@ CONFIG_TOUCHSCREEN_ADS7846=m
 # CONFIG_TOUCHSCREEN_TPS6507X is not set
 # CONFIG_TOUCHSCREEN_TSC2005 is not set
 # CONFIG_TOUCHSCREEN_TSC2007 is not set
+# CONFIG_TOUCHSCREEN_TSC_SERIO is not set
 # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
 # CONFIG_TOUCHSCREEN_W90X900 is not set
 # CONFIG_TOUCHSCREEN_WACOM_W8001 is not set
@@ -2040,18 +2077,21 @@ CONFIG_USB_AN2720=y
 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 # CONFIG_USB_APPLEDISPLAY is not set
 CONFIG_USB_ARCH_HAS_HCD=y
+# CONFIG_USB_ARCH_HAS_XHCI is not set
 CONFIG_USB_ARMLINUX=y
 # CONFIG_USB_AUDIO is not set
 CONFIG_USB_BELKIN=y
 # CONFIG_USB_C67X00_HCD is not set
 # CONFIG_USB_CATC is not set
 # CONFIG_USB_CDC_COMPOSITE is not set
+CONFIG_USB_COMMON=y
 # CONFIG_USB_CYPRESS_CY7C63 is not set
 # CONFIG_USB_CYTHERM is not set
 CONFIG_USB_DEBUG=y
 # CONFIG_USB_DEVICEFS is not set
 CONFIG_USB_DEVICE_CLASS=y
 # CONFIG_USB_DUMMY_HCD is not set
+# CONFIG_USB_DWC3 is not set
 # CONFIG_USB_DYNAMIC_MINORS is not set
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_HCD_OMAP=y
@@ -2073,8 +2113,10 @@ CONFIG_USB_GADGET_DEBUG_FILES=y
 CONFIG_USB_GADGET_DEBUG_FS=y
 CONFIG_USB_GADGET_DUALSPEED=y
 CONFIG_USB_GADGET_MUSB_HDRC=m
+CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 CONFIG_USB_GADGET_VBUS_DRAW=2
 # CONFIG_USB_GPIO_VBUS is not set
+# CONFIG_USB_G_ACM_MS is not set
 # CONFIG_USB_G_DBGP is not set
 # CONFIG_USB_G_HID is not set
 # CONFIG_USB_G_MULTI is not set
@@ -2085,6 +2127,7 @@ CONFIG_USB_HID=y
 # CONFIG_USB_HIDDEV is not set
 # CONFIG_USB_HWA_HCD is not set
 # CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_IMX21_HCD is not set
 CONFIG_USB_INVENTRA_DMA=y
 # CONFIG_USB_IOWARRIOR is not set
 # CONFIG_USB_IPHETH is not set
@@ -2141,6 +2184,7 @@ CONFIG_USB_OTG_UTILS=y
 # CONFIG_USB_PRINTER is not set
 # CONFIG_USB_R8A66597 is not set
 # CONFIG_USB_R8A66597_HCD is not set
+# CONFIG_USB_RENESAS_USBHS is not set
 # CONFIG_USB_RIO500 is not set
 # CONFIG_USB_RTL8150 is not set
 # CONFIG_USB_SERIAL is not set
@@ -2194,6 +2238,7 @@ CONFIG_VFPv3=y
 # CONFIG_VGASTATE is not set
 # CONFIG_VIDEO_OUTPUT_CONTROL is not set
 # CONFIG_VIRTIO_BALLOON is not set
+# CONFIG_VIRTIO_MMIO is not set
 # CONFIG_VIRT_DRIVERS is not set
 CONFIG_VIRT_TO_BUS=y
 # CONFIG_VITESSE_PHY is not set
@@ -2204,6 +2249,7 @@ CONFIG_VMSPLIT_2G=y
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
+CONFIG_VT_CONSOLE_SLEEP=y
 CONFIG_VT_HW_CONSOLE_BINDING=y
 # CONFIG_VXFS_FS is not set
 CONFIG_W1_CON=y
@@ -2238,7 +2284,6 @@ CONFIG_WL1251=m
 CONFIG_WL1251_SDIO=m
 CONFIG_WL1251_SPI=m
 CONFIG_WL12XX=m
-CONFIG_WL12XX_HT=y
 CONFIG_WL12XX_MENU=m
 CONFIG_WL12XX_PLATFORM_DATA=y
 CONFIG_WL12XX_SDIO=m