]> git.ipfire.org Git - ipfire-3.x.git/blobdiff - kernel/config-armv7hl-default
kernel: Update to 3.13.2.
[ipfire-3.x.git] / kernel / config-armv7hl-default
index 7c0e3685e82412da20a7c7d8c8a9d83d04c3c78d..1ab74929e8f2e7599cfcd6fd37cce27d688e1215 100644 (file)
@@ -1,59 +1,40 @@
 CONFIG_NO_IOPORT=y
-CONFIG_ARCH_HAS_CPUFREQ=y
-CONFIG_ARCH_HAS_BANDGAP=y
 CONFIG_ZONE_DMA=y
 CONFIG_FIQ=y
 
 #
-# IRQ subsystem
+# Timers subsystem
 #
-CONFIG_GENERIC_IRQ_CHIP=y
-CONFIG_SPARSE_IRQ=y
-CONFIG_ARCH_HAS_TICK_BROADCAST=y
-CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+# CONFIG_NO_HZ_IDLE is not set
+CONFIG_NO_HZ_FULL=y
+CONFIG_NO_HZ_FULL_ALL=y
+# CONFIG_NO_HZ_FULL_SYSIDLE is not set
+
+#
+# CPU/Task time and stats accounting
+#
+CONFIG_VIRT_CPU_ACCOUNTING=y
+CONFIG_VIRT_CPU_ACCOUNTING_GEN=y
 
 #
 # RCU Subsystem
 #
-CONFIG_TREE_RCU=y
-CONFIG_RCU_STALL_COMMON=y
 CONFIG_CONTEXT_TRACKING=y
 CONFIG_RCU_USER_QS=y
 CONFIG_CONTEXT_TRACKING_FORCE=y
-CONFIG_RCU_FANOUT=32
-CONFIG_RCU_FANOUT_LEAF=16
-# CONFIG_RCU_FANOUT_EXACT is not set
 CONFIG_RCU_FAST_NO_HZ=y
 CONFIG_RCU_NOCB_CPU=y
-# CONFIG_RCU_NOCB_CPU_NONE is not set
-# CONFIG_RCU_NOCB_CPU_ZERO is not set
 CONFIG_RCU_NOCB_CPU_ALL=y
 
-#
-# Kernel Performance Events And Counters
-#
-CONFIG_SLUB_CPU_PARTIAL=y
-CONFIG_USE_GENERIC_SMP_HELPERS=y
-
 #
 # IO Schedulers
 #
 CONFIG_PADATA=y
-CONFIG_MUTEX_SPIN_ON_OWNER=y
-
-#
-# System Type
-#
-CONFIG_ARCH_MULTIPLATFORM=y
-# CONFIG_ARCH_VERSATILE is not set
 
 #
 # 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
 
 #
@@ -63,6 +44,11 @@ CONFIG_MACH_ARMADA_370_XP=y
 CONFIG_MACH_ARMADA_370=y
 CONFIG_MACH_ARMADA_XP=y
 CONFIG_ARCH_BCM=y
+
+#
+# Broadcom SoC Selection
+#
+# CONFIG_ARCH_BCM_MOBILE is not set
 CONFIG_ARCH_BCM2835=y
 CONFIG_ARCH_CNS3XXX=y
 
@@ -156,38 +142,25 @@ CONFIG_IMX_HAVE_PLATFORM_SPI_IMX=y
 CONFIG_POWER_AVS_OMAP=y
 CONFIG_POWER_AVS_OMAP_CLASS3=y
 CONFIG_OMAP_RESET_CLOCKS=y
-CONFIG_OMAP_MUX=y
-# CONFIG_OMAP_MUX_DEBUG is not set
-CONFIG_OMAP_MUX_WARNINGS=y
-CONFIG_OMAP_32K_TIMER=y
 # CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE is not set
-CONFIG_OMAP_DM_TIMER=y
-CONFIG_OMAP_PM_NOOP=y
-CONFIG_MACH_OMAP_GENERIC=y
-CONFIG_ARCH_OMAP=y
 # CONFIG_ARCH_OMAP2 is not set
 CONFIG_ARCH_OMAP3=y
 CONFIG_ARCH_OMAP4=y
-CONFIG_SOC_OMAP5=y
 CONFIG_SOC_AM33XX=y
 CONFIG_SOC_AM43XX=y
-CONFIG_ARCH_OMAP2PLUS=y
 
 #
 # TI OMAP2/3/4 Specific Features
 #
-CONFIG_ARCH_OMAP2PLUS_TYPICAL=y
 CONFIG_SOC_HAS_OMAP2_SDRC=y
-CONFIG_SOC_HAS_REALTIME_COUNTER=y
 CONFIG_SOC_DRA7XX=y
 CONFIG_SOC_OMAP3430=y
 CONFIG_SOC_TI81XX=y
 CONFIG_OMAP_PACKAGE_CBB=y
 CONFIG_OMAP_PACKAGE_CUS=y
-CONFIG_OMAP_PACKAGE_CBP=y
 
 #
-# OMAP Board Type
+# OMAP Legacy Platform Data Board Type
 #
 CONFIG_MACH_OMAP3_BEAGLE=y
 CONFIG_MACH_DEVKIT8000=y
@@ -195,23 +168,16 @@ CONFIG_MACH_OMAP_LDP=y
 CONFIG_MACH_OMAP3530_LV_SOM=y
 CONFIG_MACH_OMAP3_TORPEDO=y
 CONFIG_MACH_OVERO=y
-CONFIG_MACH_OMAP3EVM=y
 CONFIG_MACH_OMAP3517EVM=y
 CONFIG_MACH_CRANEBOARD=y
 CONFIG_MACH_OMAP3_PANDORA=y
 CONFIG_MACH_TOUCHBOOK=y
 CONFIG_MACH_OMAP_3430SDP=y
-CONFIG_MACH_NOKIA_RM680=y
 CONFIG_MACH_NOKIA_RX51=y
-CONFIG_MACH_OMAP_ZOOM2=y
-CONFIG_MACH_OMAP_ZOOM3=y
 CONFIG_MACH_CM_T35=y
 CONFIG_MACH_CM_T3517=y
 CONFIG_MACH_CM_T3730=y
-CONFIG_MACH_IGEP0020=y
-CONFIG_MACH_IGEP0030=y
 CONFIG_MACH_SBC3530=y
-CONFIG_MACH_OMAP_3630SDP=y
 CONFIG_MACH_TI8168EVM=y
 CONFIG_MACH_TI8148EVM=y
 CONFIG_OMAP3_EMU=y
@@ -232,7 +198,7 @@ CONFIG_ARCH_EMEV2=y
 #
 # SH-Mobile Board Type
 #
-CONFIG_MACH_KZM9D_REFERENCE=y
+CONFIG_MACH_KZM9D=y
 
 #
 # Timer and clock configuration
@@ -251,7 +217,6 @@ CONFIG_ARCH_ATLAS6=y
 CONFIG_ARCH_PRIMA2=y
 CONFIG_ARCH_MARCO=y
 CONFIG_SIRF_IRQ=y
-CONFIG_ARCH_TEGRA=y
 
 #
 # NVIDIA Tegra options
@@ -259,10 +224,8 @@ CONFIG_ARCH_TEGRA=y
 CONFIG_ARCH_TEGRA_2x_SOC=y
 CONFIG_ARCH_TEGRA_3x_SOC=y
 CONFIG_ARCH_TEGRA_114_SOC=y
-CONFIG_TEGRA_AHB=y
-# CONFIG_TEGRA_EMC_SCALING_ENABLE is not set
+CONFIG_ARCH_TEGRA_124_SOC=y
 CONFIG_ARCH_U8500=y
-CONFIG_UX500_SOC_COMMON=y
 CONFIG_UX500_SOC_DB8500=y
 
 #
@@ -281,12 +244,17 @@ CONFIG_ARCH_VEXPRESS=y
 #
 CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA=y
 CONFIG_ARCH_VEXPRESS_CA9X4=y
+CONFIG_ARCH_VEXPRESS_SPC=y
+CONFIG_PLAT_VERSATILE_CLCD=y
+CONFIG_PLAT_VERSATILE_SCHED_CLOCK=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
+CONFIG_PLAT_VERSATILE=y
+CONFIG_ARM_TIMER_SP804=y
 
 #
 # Processor Type
@@ -294,37 +262,23 @@ CONFIG_PLAT_ORION=y
 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_THUMBEE is not set
-CONFIG_ARM_VIRT_EXT=y
-CONFIG_SWP_EMULATE=y
-# CONFIG_CPU_BPREDICT_DISABLE is not set
+# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
+# CONFIG_CPU_BIG_ENDIAN is not set
+CONFIG_KUSER_HELPERS=y
 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_ARM_L1_CACHE_SHIFT_6=y
-CONFIG_ARM_L1_CACHE_SHIFT=6
-CONFIG_ARM_DMA_MEM_BUFFERABLE=y
+CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y
 CONFIG_PJ4B_ERRATA_4742=y
 # CONFIG_ARM_ERRATA_326103 is not set
 CONFIG_ARM_ERRATA_411920=y
@@ -339,37 +293,31 @@ CONFIG_ARM_ERRATA_364296=y
 CONFIG_ARM_ERRATA_764369=y
 CONFIG_PL310_ERRATA_769419=y
 CONFIG_ARM_ERRATA_775420=y
-CONFIG_ARM_ERRATA_798181=y
-# CONFIG_ARM_ERRATA_773022 is not set
-CONFIG_TI_PRIV_EDMA=y
+CONFIG_ICST=y
 
 #
 # Bus support
 #
+CONFIG_ARM_AMBA=y
 CONFIG_PCI_DOMAINS=y
 
 #
 # PCI host controller drivers
 #
 CONFIG_PCI_MVEBU=y
+CONFIG_PCIE_DW=y
+CONFIG_PCI_IMX6=y
 CONFIG_PCI_TEGRA=y
 # CONFIG_PCCARD is not set
 
 #
 # Kernel Features
 #
-CONFIG_SMP=y
-CONFIG_SMP_ON_UP=y
-CONFIG_ARM_CPU_TOPOLOGY=y
 CONFIG_SCHED_MC=y
 CONFIG_SCHED_SMT=y
-# CONFIG_MCPM is not set
 CONFIG_NR_CPUS=8
-CONFIG_HOTPLUG_CPU=y
 CONFIG_ARM_PSCI=y
-CONFIG_ARCH_NR_GPIO=1024
-CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y
-CONFIG_SPLIT_PTLOCK_CPUS=4
+# CONFIG_PHYS_ADDR_T_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=1
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 CONFIG_FORCE_MAX_ZONEORDER=12
@@ -379,11 +327,6 @@ CONFIG_FORCE_MAX_ZONEORDER=12
 #
 CONFIG_CMDLINE="root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC1,115200 init=/linuxrc mem=256M"
 
-#
-# CPU Frequency scaling
-#
-# CONFIG_CPU_FREQ is not set
-
 #
 # CPU Idle
 #
@@ -392,35 +335,18 @@ CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED=y
 #
 # At least one emulation must be selected
 #
-CONFIG_VFPv3=y
-CONFIG_NEON=y
 CONFIG_KERNEL_MODE_NEON=y
 
 #
 # Power management options
 #
-CONFIG_PM_SLEEP_SMP=y
 CONFIG_ARCH_HAS_OPP=y
 CONFIG_PM_OPP=y
 
-#
-# Classification
-#
-CONFIG_RPS=y
-CONFIG_RFS_ACCEL=y
-CONFIG_XPS=y
-CONFIG_NET_FLOW_LIMIT=y
-
-#
-# Bluetooth device drivers
-#
-# CONFIG_RFKILL_REGULATOR is not set
-
 #
 # Generic Driver Options
 #
 CONFIG_FIRMWARE_IN_KERNEL=y
-CONFIG_SOC_BUS=y
 CONFIG_REGMAP_I2C=y
 CONFIG_REGMAP_MMIO=y
 
@@ -534,6 +460,17 @@ CONFIG_BLK_DEV_RAM_SIZE=65536
 CONFIG_MG_DISK=m
 CONFIG_MG_DISK_RES=0
 
+#
+# Misc devices
+#
+# CONFIG_ARM_CHARLCD is not set
+CONFIG_SRAM=y
+
+#
+# EEPROM support
+#
+CONFIG_EEPROM_SUNXI_SID=m
+
 #
 # Controllers with non-SFF native interface
 #
@@ -603,11 +540,18 @@ CONFIG_INPUT_TWL6040_VIBRA=y
 # CONFIG_INPUT_WM831X_ON is not set
 CONFIG_INPUT_SIRFSOC_ONKEY=y
 
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO_AMBAKMI=m
+
 #
 # Non-8250 serial port support
 #
 CONFIG_SERIAL_AMBA_PL010=y
 # CONFIG_SERIAL_AMBA_PL010_CONSOLE is not set
+CONFIG_SERIAL_AMBA_PL011=y
+CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
 CONFIG_SERIAL_SIRFSOC=y
 # CONFIG_SERIAL_SIRFSOC_CONSOLE is not set
 CONFIG_SERIAL_TEGRA=y
@@ -625,8 +569,8 @@ CONFIG_SERIAL_ARC=y
 # CONFIG_SERIAL_ARC_CONSOLE is not set
 CONFIG_HW_RANDOM_BCM2835=y
 CONFIG_HW_RANDOM_OMAP=m
+CONFIG_HW_RANDOM_OMAP3_ROM=m
 CONFIG_HW_RANDOM_MXC_RNGA=m
-CONFIG_I2C=y
 CONFIG_I2C_ALGOBIT=y
 
 #
@@ -637,28 +581,24 @@ CONFIG_I2C_DAVINCI=m
 CONFIG_I2C_IMX=y
 CONFIG_I2C_MV64XXX=y
 CONFIG_I2C_NOMADIK=y
-CONFIG_I2C_OMAP=y
 CONFIG_I2C_SIRF=y
+CONFIG_I2C_ST=m
 CONFIG_I2C_TEGRA=y
+CONFIG_I2C_VERSATILE=m
 CONFIG_I2C_WMT=y
 
-#
-# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
-#
-CONFIG_PINCTRL=y
-
 #
 # Pin controllers
 #
 CONFIG_PINMUX=y
 CONFIG_PINCONF=y
 CONFIG_GENERIC_PINCONF=y
-# CONFIG_DEBUG_PINCTRL is not set
 CONFIG_PINCTRL_ABX500=y
 CONFIG_PINCTRL_AB8500=y
 CONFIG_PINCTRL_AB8540=y
 CONFIG_PINCTRL_AB9540=y
 CONFIG_PINCTRL_AB8505=y
+# CONFIG_PINCTRL_AS3722 is not set
 CONFIG_PINCTRL_BCM2835=y
 CONFIG_PINCTRL_IMX=y
 CONFIG_PINCTRL_IMX35=y
@@ -671,7 +611,6 @@ CONFIG_PINCTRL_NOMADIK=y
 CONFIG_PINCTRL_DB8500=y
 CONFIG_PINCTRL_DB8540=y
 CONFIG_PINCTRL_ROCKCHIP=y
-# CONFIG_PINCTRL_SINGLE is not set
 CONFIG_PINCTRL_SIRF=y
 CONFIG_PINCTRL_SUNXI=y
 CONFIG_PINCTRL_ST=y
@@ -686,7 +625,7 @@ CONFIG_PINCTRL_ARMADA_XP=y
 CONFIG_PINCTRL_WMT=y
 CONFIG_PINCTRL_WM8750=y
 CONFIG_PINCTRL_WM8850=y
-CONFIG_ARCH_REQUIRE_GPIOLIB=y
+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
 CONFIG_GPIO_GENERIC=y
 # CONFIG_GPIO_DA9052 is not set
 # CONFIG_GPIO_DA9055 is not set
@@ -704,7 +643,6 @@ CONFIG_GPIO_PL061=y
 #
 CONFIG_GPIO_MC9S08DZ60=y
 # CONFIG_GPIO_RC5T583 is not set
-# CONFIG_GPIO_SX150X is not set
 # CONFIG_GPIO_STMPE is not set
 # CONFIG_GPIO_TC3589X is not set
 # CONFIG_GPIO_TPS65912 is not set
@@ -726,7 +664,6 @@ CONFIG_GPIO_TWL6040=m
 # 1-wire Bus Masters
 #
 CONFIG_W1_MASTER_MXC=m
-# CONFIG_HDQ_MASTER_OMAP is not set
 
 #
 # 1-wire Slaves
@@ -741,7 +678,6 @@ CONFIG_W1_MASTER_MXC=m
 # CONFIG_BATTERY_TWL4030_MADC is not set
 # CONFIG_BATTERY_RX51 is not set
 # CONFIG_CHARGER_TWL4030 is not set
-# CONFIG_CHARGER_MANAGER is not set
 # CONFIG_CHARGER_MAX8997 is not set
 # CONFIG_CHARGER_MAX8998 is not set
 # CONFIG_CHARGER_TPS65090 is not set
@@ -774,11 +710,13 @@ CONFIG_DRA752_THERMAL=y
 # CONFIG_DA9055_WATCHDOG is not set
 # CONFIG_WM831X_WATCHDOG is not set
 # CONFIG_WM8350_WATCHDOG is not set
+# CONFIG_ARM_SP805_WATCHDOG is not set
 CONFIG_OMAP_WATCHDOG=y
 CONFIG_SUNXI_WATCHDOG=m
 # CONFIG_TWL4030_WATCHDOG is not set
 CONFIG_IMX2_WDT=m
 CONFIG_UX500_WATCHDOG=y
+CONFIG_SIRFSOC_WATCHDOG=m
 CONFIG_BCM2835_WDT=m
 
 #
@@ -786,6 +724,7 @@ CONFIG_BCM2835_WDT=m
 #
 CONFIG_MFD_CORE=y
 CONFIG_MFD_AS3711=y
+CONFIG_MFD_AS3722=y
 CONFIG_PMIC_ADP5520=y
 CONFIG_MFD_AAT2870_CORE=y
 CONFIG_PMIC_DA903X=y
@@ -821,7 +760,6 @@ CONFIG_MFD_STMPE=y
 CONFIG_STMPE_I2C=y
 CONFIG_MFD_SYSCON=y
 CONFIG_MFD_LP8788=y
-CONFIG_MFD_OMAP_USB_HOST=y
 CONFIG_MFD_PALMAS=y
 CONFIG_MFD_TPS65090=y
 CONFIG_MFD_TPS6586X=y
@@ -841,12 +779,7 @@ CONFIG_MFD_WM831X_I2C=y
 CONFIG_MFD_WM8350=y
 CONFIG_MFD_WM8350_I2C=y
 CONFIG_MFD_WM8994=y
-CONFIG_REGULATOR=y
-# CONFIG_REGULATOR_DEBUG is not set
-# CONFIG_REGULATOR_DUMMY is not set
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
-# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
-# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
 CONFIG_REGULATOR_88PM800=m
 CONFIG_REGULATOR_88PM8607=y
 CONFIG_REGULATOR_AD5398=m
@@ -855,6 +788,7 @@ CONFIG_REGULATOR_AAT2870=m
 CONFIG_REGULATOR_AB3100=y
 CONFIG_REGULATOR_AB8500=y
 CONFIG_REGULATOR_AS3711=m
+CONFIG_REGULATOR_AS3722=m
 CONFIG_REGULATOR_DA903X=m
 CONFIG_REGULATOR_DA9052=m
 CONFIG_REGULATOR_DA9055=m
@@ -904,9 +838,9 @@ CONFIG_REGULATOR_WM8400=m
 CONFIG_REGULATOR_WM8994=m
 
 #
-# Multimedia core support
+# Media drivers
 #
-CONFIG_VIDEO_V4L2=y
+# CONFIG_RC_ST is not set
 
 #
 # Media digital TV PCI Adapters
@@ -916,31 +850,16 @@ CONFIG_VIDEO_OMAP2_VOUT_VRFB=y
 CONFIG_VIDEO_OMAP2_VOUT=m
 CONFIG_VIDEO_MX3=m
 CONFIG_VIDEO_CODA=m
-
-#
-# Media ancillary drivers (tuners, sensors, i2c, frontends)
-#
-CONFIG_VIDEO_IR_I2C=y
-
-#
-# soc_camera sensor drivers
-#
-CONFIG_MEDIA_TUNER=y
-CONFIG_MEDIA_TUNER_SIMPLE=y
-CONFIG_MEDIA_TUNER_TDA8290=y
-CONFIG_MEDIA_TUNER_TDA827X=y
-CONFIG_MEDIA_TUNER_TDA18271=y
-CONFIG_MEDIA_TUNER_TDA9887=y
-CONFIG_MEDIA_TUNER_MT20XX=y
-CONFIG_MEDIA_TUNER_XC2028=y
-CONFIG_MEDIA_TUNER_XC5000=y
-CONFIG_MEDIA_TUNER_XC4000=y
-CONFIG_MEDIA_TUNER_MC44S803=y
+CONFIG_VIDEO_TI_VPE=m
+# CONFIG_VIDEO_TI_VPE_DEBUG is not set
 
 #
 # Graphics support
 #
+CONFIG_TEGRA_HOST1X=y
+# CONFIG_TEGRA_HOST1X_FIREWALL is not set
 CONFIG_DRM=y
+CONFIG_DRM_KMS_HELPER=y
 
 #
 # I2C encoder or helper chips
@@ -953,7 +872,9 @@ CONFIG_DRM_EXYNOS_G2D=y
 # CONFIG_DRM_UDL is not set
 CONFIG_DRM_OMAP=m
 CONFIG_DRM_OMAP_NUM_CRTCS=1
-# CONFIG_TEGRA_HOST1X is not set
+CONFIG_DRM_TEGRA=y
+# CONFIG_DRM_TEGRA_DEBUG is not set
+# CONFIG_DRM_TEGRA_STAGING is not set
 # CONFIG_VIDEO_OUTPUT_CONTROL is not set
 CONFIG_VIDEOMODE_HELPERS=y
 CONFIG_FB_MODE_HELPERS=y
@@ -961,6 +882,7 @@ CONFIG_FB_MODE_HELPERS=y
 #
 # Frame buffer hardware drivers
 #
+# CONFIG_FB_ARMCLCD is not set
 # CONFIG_FB_IMX is not set
 # CONFIG_FB_VT8500 is not set
 # CONFIG_FB_WM8505 is not set
@@ -1008,8 +930,12 @@ CONFIG_DISPLAY_PANEL_SHARP_LS037V7DW01=m
 # Console display driver support
 #
 CONFIG_SND_DMAENGINE_PCM=m
+CONFIG_SND_ARMAACI=m
 CONFIG_SND_SOC_AC97_BUS=y
 CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
+CONFIG_SND_DAVINCI_SOC=m
+CONFIG_SND_DAVINCI_SOC_MCASP=m
+CONFIG_SND_AM33XX_SOC_EVM=m
 CONFIG_SND_SOC_FSL_SSI=m
 CONFIG_SND_SOC_FSL_SPDIF=m
 CONFIG_SND_IMX_SOC=m
@@ -1065,16 +991,10 @@ CONFIG_SND_SOC_WM8962=m
 CONFIG_SND_SOC_WM9712=m
 CONFIG_SND_SOC_TPA6130A2=m
 
-#
-# I2C HID support
-#
-CONFIG_USB_ARCH_HAS_EHCI=y
-
 #
 # USB Host Controller Drivers
 #
 CONFIG_USB_EHCI_MXC=m
-CONFIG_USB_EHCI_HCD_OMAP=y
 CONFIG_USB_EHCI_HCD_ORION=m
 CONFIG_USB_EHCI_TEGRA=y
 # CONFIG_USB_CNS3XXX_EHCI is not set
@@ -1088,15 +1008,12 @@ CONFIG_USB_IMX21_HCD=m
 # USB Physical Layer drivers
 #
 CONFIG_AB8500_USB=m
-CONFIG_NOP_USB_XCEIV=y
 CONFIG_OMAP_CONTROL_USB=m
-CONFIG_OMAP_USB2=m
 CONFIG_OMAP_USB3=m
 CONFIG_SAMSUNG_USBPHY=y
 CONFIG_SAMSUNG_USB2PHY=y
 CONFIG_SAMSUNG_USB3PHY=y
 CONFIG_USB_MXS_PHY=m
-CONFIG_USB_ULPI_VIEWPORT=y
 CONFIG_MMC=y
 
 #
@@ -1107,6 +1024,7 @@ CONFIG_MMC_BLOCK=y
 #
 # MMC/SD/SDIO Host Controller Drivers
 #
+CONFIG_MMC_ARMMMCI=m
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_IO_ACCESSORS=y
 CONFIG_MMC_SDHCI_CNS3XXX=m
@@ -1151,6 +1069,7 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=y
 #
 # CONFIG_RTC_DRV_88PM860X is not set
 # CONFIG_RTC_DRV_88PM80X is not set
+CONFIG_RTC_DRV_AS3722=m
 # CONFIG_RTC_DRV_LP8788 is not set
 # CONFIG_RTC_DRV_MAX8907 is not set
 # CONFIG_RTC_DRV_MAX8925 is not set
@@ -1163,6 +1082,7 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=y
 # CONFIG_RTC_DRV_TPS65910 is not set
 # CONFIG_RTC_DRV_TPS80031 is not set
 # CONFIG_RTC_DRV_RC5T583 is not set
+CONFIG_RTC_DRV_S5M=m
 
 #
 # Platform RTC drivers
@@ -1179,6 +1099,8 @@ CONFIG_RTC_DRV_AB3100=y
 #
 CONFIG_RTC_DRV_IMXDI=m
 CONFIG_RTC_DRV_OMAP=m
+CONFIG_RTC_DRV_PL030=m
+CONFIG_RTC_DRV_PL031=m
 CONFIG_RTC_DRV_VT8500=m
 CONFIG_RTC_DRV_MV=m
 CONFIG_RTC_DRV_TEGRA=m
@@ -1189,6 +1111,7 @@ CONFIG_RTC_DRV_SIRFSOC=m
 # DMA Devices
 #
 CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH=y
+# CONFIG_AMBA_PL08X is not set
 CONFIG_MV_XOR=y
 CONFIG_MX3_IPU=y
 CONFIG_MX3_IPU_IRQS=4
@@ -1196,6 +1119,7 @@ CONFIG_TEGRA20_APB_DMA=y
 # CONFIG_STE_DMA40 is not set
 CONFIG_SIRF_DMA=y
 CONFIG_TI_EDMA=y
+CONFIG_PL330_DMA=y
 CONFIG_IMX_SDMA=m
 CONFIG_IMX_DMA=m
 # CONFIG_MXS_DMA is not set
@@ -1204,20 +1128,13 @@ CONFIG_TI_CPPI41=m
 CONFIG_DMA_VIRTUAL_CHANNELS=y
 
 #
-# Speakup console speech
+# DMA Clients
 #
-# CONFIG_MFD_NVEC is not set
-
-#
-# Android
-#
-# CONFIG_DRM_IMX is not set
-CONFIG_COMMON_CLK=y
+CONFIG_DMA_ENGINE_RAID=y
 
 #
 # Common Clock Framework
 #
-# CONFIG_COMMON_CLK_DEBUG is not set
 # CONFIG_COMMON_CLK_WM831X is not set
 CONFIG_COMMON_CLK_VERSATILE=y
 # CONFIG_COMMON_CLK_MAX77686 is not set
@@ -1225,6 +1142,7 @@ CONFIG_COMMON_CLK_SI5351=m
 CONFIG_COMMON_CLK_S2MPS11=m
 CONFIG_CLK_TWL6040=m
 CONFIG_COMMON_CLK_AXI_CLKGEN=m
+CONFIG_COMMON_CLK_KEYSTONE=y
 CONFIG_MVEBU_CLK_COMMON=y
 CONFIG_MVEBU_CLK_CPU=y
 CONFIG_ARMADA_370_CLK=y
@@ -1245,16 +1163,14 @@ CONFIG_CADENCE_TTC_TIMER=y
 CONFIG_CLKSRC_NOMADIK_MTU=y
 CONFIG_CLKSRC_DBX500_PRCMU=y
 CONFIG_CLKSRC_DBX500_PRCMU_SCHED_CLOCK=y
-CONFIG_ARM_ARCH_TIMER=y
 CONFIG_ARM_GLOBAL_TIMER=y
 CONFIG_CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK=y
 CONFIG_VF_PIT_TIMER=y
+CONFIG_PL320_MBOX=y
 CONFIG_OMAP_MBOX=m
 CONFIG_OMAP2PLUS_MBOX=m
 CONFIG_OMAP_MBOX_KFIFO_SIZE=256
-# CONFIG_OMAP_IOMMU is not set
 # CONFIG_TEGRA_IOMMU_GART is not set
-# CONFIG_TEGRA_IOMMU_SMMU is not set
 
 #
 # Rpmsg drivers
@@ -1274,39 +1190,30 @@ CONFIG_TEGRA30_MC=y
 # Temperature sensors
 #
 # CONFIG_PWM is not set
-CONFIG_ARM_GIC=y
+CONFIG_ARM_VIC=y
+CONFIG_ARM_VIC_NR=2
 CONFIG_ARCH_HAS_RESET_CONTROLLER=y
 
 #
-# File systems
+# PHY Subsystem
 #
-CONFIG_DCACHE_WORD_ACCESS=y
+CONFIG_OMAP_USB2=m
 
 #
 # Pseudo filesystems
 #
 # CONFIG_JFFS2_FS is not set
 
-#
-# Memory Debugging
-#
-# CONFIG_DEBUG_PER_CPU_MAPS is not set
-
 #
 # RCU Debugging
 #
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
-# CONFIG_RCU_CPU_STALL_INFO is not set
 
 #
 # Runtime Testing
 #
 CONFIG_DEBUG_IMX_UART_PORT=1
-CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S"
-# CONFIG_DEBUG_UART_PL01X is not set
-CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
 CONFIG_OC_ETM=y
-# CONFIG_PID_IN_CONTEXTIDR is not set
 
 #
 # Non-executable pages
@@ -1339,6 +1246,12 @@ CONFIG_GRKERNSEC_RWXMAP_LOG=y
 # Crypto core or helper
 #
 CONFIG_CRYPTO_PCRYPT=m
+CONFIG_CRYPTO_ABLK_HELPER=m
+
+#
+# Ciphers
+#
+CONFIG_CRYPTO_AES_ARM_BS=m
 
 #
 # Random Number Generation
@@ -1359,5 +1272,5 @@ CONFIG_CRYPTO_DEV_UX500=m
 CONFIG_RATIONAL=y
 CONFIG_STMP_DEVICE=y
 CONFIG_GENERIC_ALLOCATOR=y
-CONFIG_CPU_RMAP=y
+CONFIG_GENERIC_ATOMIC64=y
 CONFIG_DDR=y