]> git.ipfire.org Git - people/ms/ipfire-3.x.git/blobdiff - kernel/config-armv7hl-default
kernel: Update to 3.9.3.
[people/ms/ipfire-3.x.git] / kernel / config-armv7hl-default
similarity index 68%
rename from kernel/config-armv7hl-omap
rename to kernel/config-armv7hl-default
index 0fc10e0cc7043b033cae345472553b1bc956ed4f..01998265f69e53933e46e9bbe3a231e75b5c541c 100644 (file)
@@ -1,16 +1,20 @@
+CONFIG_NO_IOPORT=y
 CONFIG_ARCH_HAS_CPUFREQ=y
+CONFIG_FIQ=y
 
 #
 # IRQ subsystem
 #
 CONFIG_GENERIC_IRQ_CHIP=y
 CONFIG_SPARSE_IRQ=y
+CONFIG_ARCH_HAS_TICK_BROADCAST=y
 CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
 
 #
 # RCU Subsystem
 #
 CONFIG_TREE_RCU=y
+CONFIG_RCU_STALL_COMMON=y
 CONFIG_RCU_FANOUT=32
 CONFIG_RCU_FANOUT_LEAF=16
 # CONFIG_RCU_FANOUT_EXACT is not set
@@ -31,14 +35,106 @@ CONFIG_MUTEX_SPIN_ON_OWNER=y
 #
 # System Type
 #
+CONFIG_ARCH_MULTIPLATFORM=y
 # CONFIG_ARCH_VERSATILE is not set
-CONFIG_ARCH_OMAP=y
 
 #
-# TI OMAP Common Features
-#
-# CONFIG_ARCH_OMAP1 is not set
-CONFIG_ARCH_OMAP2PLUS=y
+# CPU Core family selection
+#
+CONFIG_ARCH_MULTI_V6=y
+CONFIG_ARCH_MULTI_V7=y
+CONFIG_ARCH_MULTI_V6_V7=y
+# CONFIG_ARCH_MULTI_CPU_AUTO is not set
+CONFIG_ARCH_MVEBU=y
+
+#
+# Marvell SOC with device tree
+#
+CONFIG_MACH_ARMADA_370_XP=y
+CONFIG_MACH_ARMADA_370=y
+CONFIG_MACH_ARMADA_XP=y
+CONFIG_ARCH_BCM=y
+CONFIG_ARCH_HIGHBANK=y
+CONFIG_ARCH_MXC=y
+
+#
+# Freescale i.MX support
+#
+CONFIG_MXC_IRQ_PRIOR=y
+CONFIG_MXC_TZIC=y
+CONFIG_MXC_AVIC=y
+CONFIG_MXC_DEBUG_BOARD=y
+CONFIG_MXC_USE_EPIT=y
+CONFIG_ARCH_HAS_RNGA=y
+CONFIG_IRAM_ALLOC=y
+CONFIG_ARCH_MXC_IOMUX_V3=y
+CONFIG_ARCH_MX5=y
+CONFIG_ARCH_MX51=y
+CONFIG_ARCH_MX53=y
+CONFIG_SOC_IMX31=y
+CONFIG_SOC_IMX35=y
+CONFIG_SOC_IMX5=y
+CONFIG_SOC_IMX51=y
+
+#
+# MX31 platforms:
+#
+CONFIG_MACH_MX31ADS=y
+CONFIG_MACH_MX31LILLY=y
+CONFIG_MACH_MX31LITE=y
+CONFIG_MACH_PCM037=y
+CONFIG_MACH_PCM037_EET=y
+CONFIG_MACH_MX31_3DS=y
+# CONFIG_MACH_MX31_3DS_MXC_NAND_USE_BBT is not set
+CONFIG_MACH_MX31MOBOARD=y
+CONFIG_MACH_QONG=y
+CONFIG_MACH_ARMADILLO5X0=y
+CONFIG_MACH_KZM_ARM11_01=y
+CONFIG_MACH_BUG=y
+CONFIG_MACH_IMX31_DT=y
+
+#
+# MX35 platforms:
+#
+CONFIG_MACH_PCM043=y
+CONFIG_MACH_MX35_3DS=y
+CONFIG_MACH_EUKREA_CPUIMX35SD=y
+CONFIG_MACH_EUKREA_MBIMXSD35_BASEBOARD=y
+CONFIG_MACH_VPR200=y
+
+#
+# i.MX51 machines:
+#
+CONFIG_MACH_IMX51_DT=y
+CONFIG_MACH_MX51_BABBAGE=y
+CONFIG_MACH_EUKREA_CPUIMX51SD=y
+CONFIG_MACH_EUKREA_MBIMXSD51_BASEBOARD=y
+
+#
+# Device tree only
+#
+CONFIG_SOC_IMX53=y
+CONFIG_SOC_IMX6Q=y
+CONFIG_IMX_HAVE_PLATFORM_FEC=y
+CONFIG_IMX_HAVE_PLATFORM_FLEXCAN=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_FB=y
+CONFIG_IMX_HAVE_PLATFORM_IMX_I2C=y
+CONFIG_IMX_HAVE_PLATFORM_IMX_KEYPAD=y
+CONFIG_IMX_HAVE_PLATFORM_IMX_SSI=y
+CONFIG_IMX_HAVE_PLATFORM_IMX_UART=y
+CONFIG_IMX_HAVE_PLATFORM_IPU_CORE=y
+CONFIG_IMX_HAVE_PLATFORM_MXC_EHCI=y
+CONFIG_IMX_HAVE_PLATFORM_MXC_MMC=y
+CONFIG_IMX_HAVE_PLATFORM_MXC_NAND=y
+CONFIG_IMX_HAVE_PLATFORM_MXC_RNGA=y
+CONFIG_IMX_HAVE_PLATFORM_MXC_RTC=y
+CONFIG_IMX_HAVE_PLATFORM_MXC_W1=y
+CONFIG_IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX=y
+CONFIG_IMX_HAVE_PLATFORM_SPI_IMX=y
+CONFIG_IMX_HAVE_PLATFORM_AHCI=y
 
 #
 # OMAP Feature Selections
@@ -49,14 +145,13 @@ CONFIG_OMAP_RESET_CLOCKS=y
 CONFIG_OMAP_MUX=y
 # CONFIG_OMAP_MUX_DEBUG is not set
 CONFIG_OMAP_MUX_WARNINGS=y
-CONFIG_OMAP_MBOX_FWK=m
-CONFIG_OMAP_MBOX_KFIFO_SIZE=256
 CONFIG_OMAP_32K_TIMER=y
 # CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE is not set
-CONFIG_OMAP_32K_TIMER_HZ=128
 CONFIG_OMAP_DM_TIMER=y
 CONFIG_OMAP_PM_NOOP=y
 CONFIG_MACH_OMAP_GENERIC=y
+CONFIG_ARCH_OMAP=y
+CONFIG_ARCH_OMAP2PLUS=y
 
 #
 # TI OMAP2/3/4 Specific Features
@@ -109,56 +204,72 @@ CONFIG_MACH_OMAP_4430SDP=y
 CONFIG_MACH_OMAP4_PANDA=y
 CONFIG_OMAP3_EMU=y
 # CONFIG_OMAP3_SDRC_AC_TIMING is not set
-CONFIG_OMAP4_ERRATA_I688=y
+CONFIG_ARCH_PICOXCELL=y
+CONFIG_ARCH_SOCFPGA=y
+CONFIG_ARCH_SUNXI=y
+CONFIG_ARCH_VEXPRESS=y
+
+#
+# Versatile Express platform type
+#
+CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA=y
+CONFIG_ARCH_VEXPRESS_CA9X4=y
+CONFIG_ARCH_VIRT=y
+CONFIG_ARCH_VT8500=y
+CONFIG_ARCH_WM8750=y
+CONFIG_ARCH_WM8850=y
+CONFIG_ARCH_ZYNQ=y
+CONFIG_PLAT_ORION=y
 
 #
 # Processor Type
 #
+CONFIG_CPU_PJ4B=y
+CONFIG_CPU_V6=y
+CONFIG_CPU_V6K=y
 CONFIG_CPU_V7=y
+CONFIG_CPU_32v6=y
 CONFIG_CPU_32v6K=y
 CONFIG_CPU_32v7=y
+CONFIG_CPU_ABRT_EV6=y
 CONFIG_CPU_ABRT_EV7=y
+CONFIG_CPU_PABRT_V6=y
 CONFIG_CPU_PABRT_V7=y
+CONFIG_CPU_CACHE_V6=y
 CONFIG_CPU_CACHE_V7=y
 CONFIG_CPU_CACHE_VIPT=y
 CONFIG_CPU_COPY_V6=y
+CONFIG_CPU_TLB_V6=y
 CONFIG_CPU_TLB_V7=y
 CONFIG_CPU_HAS_ASID=y
 
 #
 # Processor Features
 #
-# CONFIG_ARM_LPAE is not set
 # CONFIG_ARM_THUMBEE is not set
 CONFIG_ARM_VIRT_EXT=y
 CONFIG_SWP_EMULATE=y
 # CONFIG_CPU_BPREDICT_DISABLE is not set
+CONFIG_DMA_CACHE_RWFO=y
 CONFIG_OUTER_CACHE=y
 CONFIG_OUTER_CACHE_SYNC=y
+CONFIG_MIGHT_HAVE_CACHE_L2X0=y
 CONFIG_CACHE_L2X0=y
-CONFIG_CACHE_PL310=y
 CONFIG_ARM_L1_CACHE_SHIFT_6=y
 CONFIG_ARM_L1_CACHE_SHIFT=6
 CONFIG_ARM_DMA_MEM_BUFFERABLE=y
-CONFIG_ARCH_HAS_BARRIERS=y
+CONFIG_ARM_ERRATA_326103=y
+CONFIG_ARM_ERRATA_411920=y
 CONFIG_ARM_ERRATA_430973=y
-# CONFIG_ARM_ERRATA_458693 is not set
-# CONFIG_ARM_ERRATA_460075 is not set
-# CONFIG_ARM_ERRATA_742230 is not set
-# CONFIG_ARM_ERRATA_742231 is not set
 CONFIG_PL310_ERRATA_588369=y
 CONFIG_ARM_ERRATA_720789=y
 CONFIG_PL310_ERRATA_727915=y
-# CONFIG_ARM_ERRATA_743622 is not set
-# CONFIG_ARM_ERRATA_751472 is not set
-# CONFIG_PL310_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_ERRATA_754322=y
+CONFIG_ARM_ERRATA_754327=y
+CONFIG_ARM_ERRATA_764369=y
 CONFIG_PL310_ERRATA_769419=y
 CONFIG_ARM_ERRATA_775420=y
 CONFIG_ARM_ERRATA_798181=y
-CONFIG_ARM_GIC=y
 
 #
 # Bus support
@@ -174,19 +285,14 @@ CONFIG_SMP_ON_UP=y
 CONFIG_ARM_CPU_TOPOLOGY=y
 CONFIG_SCHED_MC=y
 CONFIG_SCHED_SMT=y
-CONFIG_ARM_ARCH_TIMER=y
 CONFIG_NR_CPUS=8
 CONFIG_HOTPLUG_CPU=y
+# CONFIG_ARM_PSCI is not set
 CONFIG_LOCAL_TIMERS=y
 CONFIG_ARCH_NR_GPIO=512
-CONFIG_HZ=128
-# CONFIG_THUMB2_KERNEL is not set
 CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
-CONFIG_MMU_NOTIFIER=y
 CONFIG_FORCE_MAX_ZONEORDER=12
-CONFIG_XEN_DOM0=y
-CONFIG_XEN=y
 
 #
 # CPU Frequency scaling
@@ -222,8 +328,8 @@ CONFIG_XPS=y
 #
 # Generic Driver Options
 #
-CONFIG_SYS_HYPERVISOR=y
 CONFIG_REGMAP_I2C=y
+CONFIG_REGMAP_MMIO=y
 
 #
 # Bus devices
@@ -309,6 +415,8 @@ CONFIG_MTD_NAND_IDS=y
 # CONFIG_MTD_NAND_NANDSIM is not set
 CONFIG_MTD_NAND_PLATFORM=y
 # CONFIG_MTD_ALAUDA is not set
+CONFIG_MTD_NAND_ORION=m
+CONFIG_MTD_NAND_MXC=m
 CONFIG_MTD_ONENAND=y
 # CONFIG_MTD_ONENAND_VERIFY_WRITE is not set
 # CONFIG_MTD_ONENAND_GENERIC is not set
@@ -332,8 +440,6 @@ CONFIG_OF_MTD=y
 CONFIG_BLK_DEV_RAM_SIZE=65536
 CONFIG_MG_DISK=m
 CONFIG_MG_DISK_RES=0
-CONFIG_XEN_BLKDEV_FRONTEND=m
-CONFIG_XEN_BLKDEV_BACKEND=m
 
 #
 # Altera FPGA firmware download module
@@ -341,24 +447,28 @@ CONFIG_XEN_BLKDEV_BACKEND=m
 # CONFIG_ALTERA_STAPL is not set
 
 #
-# Generic fallback / legacy drivers
+# PATA SFF controllers with BMDMA
+#
+CONFIG_PATA_IMX=m
+
+#
+# PIO-only SFF controllers
 #
-# CONFIG_MULTICORE_RAID456 is not set
+CONFIG_PATA_PLATFORM=m
+CONFIG_PATA_OF_PLATFORM=m
 
 #
 # Distributed Switch Architecture drivers
 #
+CONFIG_NET_VENDOR_FREESCALE=y
+CONFIG_FEC=m
+CONFIG_MV643XX_ETH=m
+CONFIG_MVNETA=m
 # CONFIG_TI_DAVINCI_EMAC is not set
 CONFIG_TI_DAVINCI_MDIO=m
 CONFIG_TI_DAVINCI_CPDMA=m
 # CONFIG_TI_CPSW is not set
 
-#
-# Enable WiMAX (Networking options) to see the WiMAX drivers
-#
-CONFIG_XEN_NETDEV_FRONTEND=m
-CONFIG_XEN_NETDEV_BACKEND=m
-
 #
 # Input device support
 #
@@ -367,13 +477,13 @@ CONFIG_INPUT_FF_MEMLESS=y
 #
 # Input Device Drivers
 #
+CONFIG_KEYBOARD_IMX=m
 # CONFIG_KEYBOARD_OMAP4 is not set
 CONFIG_KEYBOARD_TWL4030=m
 CONFIG_MOUSE_GPIO=m
 CONFIG_INPUT_TWL4030_PWRBUTTON=y
 CONFIG_INPUT_TWL4030_VIBRA=y
 CONFIG_INPUT_TWL6040_VIBRA=y
-CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m
 
 #
 # Serial drivers
@@ -384,16 +494,20 @@ CONFIG_SERIAL_8250_DETECT_IRQ=y
 # Non-8250 serial port support
 #
 # CONFIG_SERIAL_AMBA_PL010 is not set
+CONFIG_SERIAL_IMX=y
+CONFIG_SERIAL_IMX_CONSOLE=y
+CONFIG_SERIAL_VT8500=y
+CONFIG_SERIAL_VT8500_CONSOLE=y
 CONFIG_SERIAL_OMAP=y
 CONFIG_SERIAL_OMAP_CONSOLE=y
-CONFIG_HVC_IRQ=y
-CONFIG_HVC_XEN=y
-CONFIG_HVC_XEN_FRONTEND=y
+CONFIG_HW_RANDOM_MXC_RNGA=m
 CONFIG_I2C=y
 
 #
 # I2C system bus drivers (mostly embedded / system-on-chip)
 #
+CONFIG_I2C_IMX=m
+CONFIG_I2C_MV64XXX=m
 # CONFIG_I2C_NOMADIK is not set
 CONFIG_I2C_OMAP=y
 
@@ -407,16 +521,36 @@ CONFIG_PINCTRL=y
 #
 CONFIG_PINMUX=y
 CONFIG_PINCONF=y
+CONFIG_GENERIC_PINCONF=y
 # CONFIG_DEBUG_PINCTRL is not set
+CONFIG_PINCTRL_IMX=y
+CONFIG_PINCTRL_IMX35=y
+CONFIG_PINCTRL_IMX51=y
+CONFIG_PINCTRL_IMX53=y
+CONFIG_PINCTRL_IMX6Q=y
 # CONFIG_PINCTRL_SINGLE is not set
+CONFIG_PINCTRL_SUNXI=y
 CONFIG_PINCTRL_SAMSUNG=y
 CONFIG_PINCTRL_EXYNOS=y
 CONFIG_PINCTRL_EXYNOS5440=y
+CONFIG_PINCTRL_MVEBU=y
+CONFIG_PINCTRL_ARMADA_370=y
+CONFIG_PINCTRL_ARMADA_XP=y
 CONFIG_ARCH_REQUIRE_GPIOLIB=y
+CONFIG_GPIO_GENERIC=y
+
+#
+# Memory mapped GPIO drivers:
+#
+CONFIG_GPIO_MVEBU=y
+CONFIG_GPIO_MXC=y
+CONFIG_GPIO_PL061=y
+CONFIG_GPIO_VT8500=y
 
 #
 # I2C GPIO expanders:
 #
+CONFIG_GPIO_MC9S08DZ60=y
 # CONFIG_GPIO_SX150X is not set
 CONFIG_GPIO_TWL4030=y
 CONFIG_GPIO_TWL6040=m
@@ -424,6 +558,7 @@ CONFIG_GPIO_TWL6040=m
 #
 # 1-wire Bus Masters
 #
+CONFIG_W1_MASTER_MXC=m
 # CONFIG_HDQ_MASTER_OMAP is not set
 
 #
@@ -431,6 +566,12 @@ CONFIG_GPIO_TWL6040=m
 #
 # CONFIG_CHARGER_TWL4030 is not set
 # CONFIG_CHARGER_MANAGER is not set
+CONFIG_POWER_RESET_QNAP=y
+
+#
+# Native drivers
+#
+CONFIG_SENSORS_VEXPRESS=m
 
 #
 # Watchdog Device Drivers
@@ -438,7 +579,7 @@ CONFIG_GPIO_TWL6040=m
 # CONFIG_MPCORE_WATCHDOG is not set
 CONFIG_OMAP_WATCHDOG=y
 # CONFIG_TWL4030_WATCHDOG is not set
-CONFIG_XEN_WDT=m
+CONFIG_IMX2_WDT=m
 
 #
 # Multifunction device drivers
@@ -480,8 +621,10 @@ CONFIG_MFD_OMAP_USB_HOST=y
 CONFIG_MFD_TPS65090=y
 # CONFIG_MFD_AAT2870_CORE is not set
 # CONFIG_MFD_RC5T583 is not set
+CONFIG_MFD_SYSCON=y
 # CONFIG_MFD_PALMAS is not set
 # CONFIG_MFD_AS3711 is not set
+CONFIG_VEXPRESS_CONFIG=y
 CONFIG_REGULATOR=y
 # CONFIG_REGULATOR_DEBUG is not set
 # CONFIG_REGULATOR_DUMMY is not set
@@ -491,6 +634,7 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_REGULATOR_GPIO=y
 # CONFIG_REGULATOR_AD5398 is not set
 # CONFIG_REGULATOR_FAN53555 is not set
+CONFIG_REGULATOR_ANATOP=m
 # CONFIG_REGULATOR_ISL6271A is not set
 # CONFIG_REGULATOR_MAX1586 is not set
 # CONFIG_REGULATOR_MAX8649 is not set
@@ -500,22 +644,20 @@ CONFIG_REGULATOR_GPIO=y
 # CONFIG_REGULATOR_LP3971 is not set
 # CONFIG_REGULATOR_LP3972 is not set
 CONFIG_REGULATOR_LP872X=y
+CONFIG_REGULATOR_LP8755=m
 # CONFIG_REGULATOR_TPS51632 is not set
 CONFIG_REGULATOR_TPS62360=m
 # CONFIG_REGULATOR_TPS65023 is not set
 # CONFIG_REGULATOR_TPS6507X is not set
 CONFIG_REGULATOR_TPS65090=m
 CONFIG_REGULATOR_TWL4030=y
+CONFIG_REGULATOR_VEXPRESS=m
 
 #
 # Multimedia core support
 #
 CONFIG_VIDEO_V4L2=y
-
-#
-# Media drivers
-#
-# CONFIG_IR_RX51 is not set
+# CONFIG_TTPCI_EEPROM is not set
 
 #
 # Webcam, TV (analog/digital) USB devices
@@ -523,6 +665,9 @@ CONFIG_VIDEO_V4L2=y
 # CONFIG_VIDEO_VPFE_CAPTURE is not set
 CONFIG_VIDEO_OMAP2_VOUT_VRFB=y
 CONFIG_VIDEO_OMAP2_VOUT=m
+CONFIG_MX3_VIDEO=y
+CONFIG_VIDEO_MX3=m
+CONFIG_VIDEO_CODA=m
 
 #
 # Media ancillary drivers (tuners, sensors, i2c, frontends)
@@ -532,15 +677,24 @@ CONFIG_VIDEO_IR_I2C=y
 #
 # I2C encoder or helper chips
 #
+# CONFIG_DRM_EXYNOS is not set
+CONFIG_DRM_OMAP=m
+CONFIG_DRM_OMAP_NUM_CRTCS=1
 # CONFIG_VGASTATE is not set
 # CONFIG_FB_DDC is not set
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
 # CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_BACKLIGHT is not set
 
 #
 # Frame buffer hardware drivers
 #
-CONFIG_XEN_FBDEV_FRONTEND=m
+CONFIG_FB_IMX=m
+# CONFIG_FB_VT8500 is not set
+# CONFIG_FB_WM8505 is not set
+CONFIG_FB_MX3=y
 CONFIG_OMAP2_VRFB=y
 CONFIG_OMAP2_DSS=y
 # CONFIG_OMAP2_DSS_DEBUG is not set
@@ -573,7 +727,23 @@ CONFIG_PANEL_SHARP_LS037V7DW01=y
 # CONFIG_FB_SSD1307 is not set
 # CONFIG_SND_OPL3_LIB_SEQ is not set
 # CONFIG_SND_EMU10K1_SEQ is not set
+CONFIG_SND_SOC_AC97_BUS=y
+CONFIG_SND_SOC_DMAENGINE_PCM=y
+CONFIG_SND_SOC_FSL_SSI=m
+CONFIG_SND_SOC_FSL_UTILS=m
+CONFIG_SND_IMX_SOC=m
+CONFIG_SND_SOC_IMX_SSI=m
+CONFIG_SND_SOC_IMX_PCM=m
+CONFIG_SND_SOC_IMX_PCM_FIQ=y
+CONFIG_SND_SOC_IMX_PCM_DMA=y
+CONFIG_SND_SOC_IMX_AUDMUX=m
+CONFIG_SND_SOC_PHYCORE_AC97=m
+CONFIG_SND_SOC_EUKREA_TLV320=m
+CONFIG_SND_SOC_IMX_SGTL5000=m
 # CONFIG_SND_OMAP_SOC is not set
+CONFIG_SND_SOC_SGTL5000=m
+CONFIG_SND_SOC_TLV320AIC23=m
+CONFIG_SND_SOC_WM9712=m
 
 #
 # I2C HID support
@@ -583,8 +753,12 @@ CONFIG_PANEL_SHARP_LS037V7DW01=y
 #
 # USB Host Controller Drivers
 #
+CONFIG_USB_EHCI_MXC=m
 CONFIG_USB_EHCI_HCD_OMAP=y
 CONFIG_USB_OHCI_HCD_OMAP3=y
+CONFIG_USB_UHCI_SUPPORT_NON_PCI_HC=y
+CONFIG_USB_UHCI_PLATFORM=y
+CONFIG_USB_IMX21_HCD=m
 
 #
 # USB Physical Layer drivers
@@ -595,6 +769,7 @@ CONFIG_OMAP_USB2=m
 # OTG and related infrastructure
 #
 CONFIG_USB_GPIO_VBUS=y
+CONFIG_USB_MXS_PHY=m
 CONFIG_MMC=y
 
 #
@@ -606,8 +781,18 @@ CONFIG_MMC_BLOCK=y
 # MMC/SD/SDIO Host Controller Drivers
 #
 CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_IO_ACCESSORS=y
+CONFIG_MMC_SDHCI_ESDHC_IMX=m
 CONFIG_MMC_OMAP=y
 CONFIG_MMC_OMAP_HS=y
+CONFIG_MMC_MXC=m
+CONFIG_MMC_MVSDIO=m
+CONFIG_MMC_WMT=m
+
+#
+# MemoryStick Host Controller Drivers
+#
+CONFIG_LEDS_GPIO_REGISTER=y
 
 #
 # LED drivers
@@ -628,58 +813,66 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=y
 #
 # on-CPU RTC drivers
 #
+CONFIG_RTC_DRV_IMXDI=m
 # CONFIG_RTC_DRV_OMAP is not set
+CONFIG_RTC_DRV_VT8500=m
+CONFIG_RTC_DRV_MV=m
+CONFIG_RTC_DRV_MXC=m
 
 #
 # DMA Devices
 #
+CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH=y
+CONFIG_MV_XOR=y
+CONFIG_MX3_IPU=y
+CONFIG_MX3_IPU_IRQS=4
+CONFIG_IMX_SDMA=m
+CONFIG_IMX_DMA=m
+# CONFIG_MXS_DMA is not set
 CONFIG_DMA_OMAP=y
 CONFIG_DMA_VIRTUAL_CHANNELS=y
 
-#
-# Xen driver support
-#
-CONFIG_XEN_DEV_EVTCHN=m
-CONFIG_XEN_BACKEND=y
-CONFIG_XENFS=m
-CONFIG_XEN_COMPAT_XENFS=y
-CONFIG_XEN_SYS_HYPERVISOR=y
-CONFIG_XEN_XENBUS_FRONTEND=y
-CONFIG_XEN_GNTDEV=m
-CONFIG_XEN_GRANT_DEV_ALLOC=m
-CONFIG_XEN_PRIVCMD=m
-# CONFIG_TIDSPBRIDGE is not set
-
-#
-# Speakup console speech
-#
-CONFIG_DRM_OMAP=m
-CONFIG_DRM_OMAP_NUM_CRTCS=1
-
 #
 # Android
 #
 # CONFIG_OMAP_BANDGAP is not set
+# CONFIG_DRM_IMX is not set
 CONFIG_COMMON_CLK=y
 
 #
 # Common Clock Framework
 #
 # CONFIG_COMMON_CLK_DEBUG is not set
+CONFIG_COMMON_CLK_VERSATILE=y
 # CONFIG_CLK_TWL6040 is not set
+CONFIG_MVEBU_CLK_CORE=y
+CONFIG_MVEBU_CLK_CPU=y
+CONFIG_MVEBU_CLK_GATING=y
 CONFIG_HWSPINLOCK=m
 
 #
 # Hardware Spinlock drivers
 #
 CONFIG_HWSPINLOCK_OMAP=m
+CONFIG_CLKSRC_OF=y
+CONFIG_DW_APB_TIMER=y
+CONFIG_DW_APB_TIMER_OF=y
+CONFIG_ARMADA_370_XP_TIMER=y
+CONFIG_SUNXI_TIMER=y
+CONFIG_VT8500_TIMER=y
+CONFIG_ARM_ARCH_TIMER=y
 # CONFIG_OMAP_IOMMU is not set
 
 #
-# Rpmsg drivers (EXPERIMENTAL)
+# Rpmsg drivers
 #
 CONFIG_TI_EMIF=m
+
+#
+# Magnetometer sensors
+#
 # CONFIG_PWM is not set
+CONFIG_ARM_GIC=y
 
 #
 # File systems
@@ -692,11 +885,12 @@ CONFIG_DCACHE_WORD_ACCESS=y
 # CONFIG_JFFS2_FS is not set
 
 #
-# Kernel hacking
+# RCU Debugging
 #
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
 # CONFIG_RCU_CPU_STALL_INFO is not set
 # CONFIG_DEBUG_PER_CPU_MAPS is not set
+CONFIG_DEBUG_IMX_UART_PORT=1
 CONFIG_OC_ETM=y
 # CONFIG_PID_IN_CONTEXTIDR is not set
 
@@ -708,11 +902,14 @@ CONFIG_PAX_PAGEEXEC=y
 CONFIG_PAX_MPROTECT=y
 # CONFIG_PAX_MPROTECT_COMPAT is not set
 CONFIG_PAX_ELFRELOCS=y
+CONFIG_PAX_KERNEXEC=y
 
 #
 # Miscellaneous hardening features
 #
+CONFIG_PAX_MEMORY_UDEREF=y
 CONFIG_PAX_REFCOUNT=y
+CONFIG_PAX_CONSTIFY_PLUGIN=y
 
 #
 # Kernel Auditing
@@ -728,11 +925,16 @@ CONFIG_CRYPTO_PCRYPT=m
 #
 # Random Number Generation
 #
+CONFIG_CRYPTO_DEV_MV_CESA=m
 CONFIG_CRYPTO_DEV_OMAP_SHAM=m
 CONFIG_CRYPTO_DEV_OMAP_AES=m
+CONFIG_CRYPTO_DEV_PICOXCELL=m
 
 #
 # Library routines
 #
+CONFIG_RATIONAL=y
+CONFIG_STMP_DEVICE=y
+CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_CPU_RMAP=y
 CONFIG_DDR=y