]> git.ipfire.org Git - people/ms/ipfire-3.x.git/blobdiff - kernel/config-armv7hl-default
kernel: Make configuration management more slink and usable.
[people/ms/ipfire-3.x.git] / kernel / config-armv7hl-default
index 1ab74929e8f2e7599cfcd6fd37cce27d688e1215..73dd9ec887c644e9f32aec4bffd30a6fa8124482 100644 (file)
@@ -1,7 +1,15 @@
+CONFIG_MIGHT_HAVE_PCI=y
 CONFIG_NO_IOPORT=y
-CONFIG_ZONE_DMA=y
+CONFIG_ARCH_HAS_BANDGAP=y
 CONFIG_FIQ=y
 
+#
+# IRQ subsystem
+#
+CONFIG_SPARSE_IRQ=y
+CONFIG_ARCH_HAS_TICK_BROADCAST=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+
 #
 # Timers subsystem
 #
@@ -19,22 +27,42 @@ 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_ALL=y
 
+#
+# Kernel Performance Events And Counters
+#
+CONFIG_SLUB_CPU_PARTIAL=y
+
 #
 # IO Schedulers
 #
 CONFIG_PADATA=y
+CONFIG_MUTEX_SPIN_ON_OWNER=y
+
+#
+# System Type
+#
+CONFIG_ARCH_MULTIPLATFORM=y
+# CONFIG_ARCH_KIRKWOOD 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
 
 #
@@ -50,12 +78,7 @@ CONFIG_ARCH_BCM=y
 #
 # CONFIG_ARCH_BCM_MOBILE is not set
 CONFIG_ARCH_BCM2835=y
-CONFIG_ARCH_CNS3XXX=y
-
-#
-# CNS3XXX platform type
-#
-CONFIG_MACH_CNS3420VB=y
+# CONFIG_ARCH_CNS3XXX is not set
 CONFIG_ARCH_HIGHBANK=y
 CONFIG_ARCH_KEYSTONE=y
 CONFIG_ARCH_MXC=y
@@ -142,17 +165,29 @@ 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
@@ -217,6 +252,7 @@ CONFIG_ARCH_ATLAS6=y
 CONFIG_ARCH_PRIMA2=y
 CONFIG_ARCH_MARCO=y
 CONFIG_SIRF_IRQ=y
+CONFIG_ARCH_TEGRA=y
 
 #
 # NVIDIA Tegra options
@@ -225,6 +261,8 @@ CONFIG_ARCH_TEGRA_2x_SOC=y
 CONFIG_ARCH_TEGRA_3x_SOC=y
 CONFIG_ARCH_TEGRA_114_SOC=y
 CONFIG_ARCH_TEGRA_124_SOC=y
+CONFIG_TEGRA_AHB=y
+# CONFIG_TEGRA_EMC_SCALING_ENABLE is not set
 CONFIG_ARCH_U8500=y
 CONFIG_UX500_SOC_DB8500=y
 
@@ -252,7 +290,6 @@ 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
 
@@ -262,22 +299,37 @@ CONFIG_ARM_TIMER_SP804=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_ARCH_PHYS_ADDR_T_64BIT is not set
+# CONFIG_ARM_THUMBEE is not set
+CONFIG_ARM_VIRT_EXT=y
+CONFIG_SWP_EMULATE=y
 # CONFIG_CPU_BIG_ENDIAN is not set
-CONFIG_KUSER_HELPERS=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_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
@@ -293,7 +345,10 @@ 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_ICST=y
+CONFIG_TI_PRIV_EDMA=y
 
 #
 # Bus support
@@ -304,7 +359,6 @@ CONFIG_PCI_DOMAINS=y
 #
 # PCI host controller drivers
 #
-CONFIG_PCI_MVEBU=y
 CONFIG_PCIE_DW=y
 CONFIG_PCI_IMX6=y
 CONFIG_PCI_TEGRA=y
@@ -313,20 +367,33 @@ CONFIG_PCI_TEGRA=y
 #
 # 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_BIG_LITTLE is not set
 CONFIG_NR_CPUS=8
+CONFIG_HOTPLUG_CPU=y
 CONFIG_ARM_PSCI=y
-# CONFIG_PHYS_ADDR_T_64BIT is not set
-CONFIG_ZONE_DMA_FLAG=1
+CONFIG_ARCH_NR_GPIO=1024
+CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 CONFIG_FORCE_MAX_ZONEORDER=12
 
 #
 # Boot options
 #
+# CONFIG_ARM_ATAG_DTB_COMPAT is not set
 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
 #
@@ -335,18 +402,35 @@ 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
 
@@ -354,7 +438,6 @@ CONFIG_REGMAP_MMIO=y
 # Bus devices
 #
 CONFIG_IMX_WEIM=y
-CONFIG_MVEBU_MBUS=y
 CONFIG_OMAP_OCP2SCP=m
 CONFIG_OMAP_INTERCONNECT=y
 CONFIG_MTD=y
@@ -494,7 +577,6 @@ CONFIG_NET_VENDOR_ALLWINNER=y
 CONFIG_SUN4I_EMAC=m
 CONFIG_NET_VENDOR_FREESCALE=y
 CONFIG_FEC=m
-CONFIG_MV643XX_ETH=m
 CONFIG_MVNETA=m
 CONFIG_SFC_MTD=y
 # CONFIG_TI_DAVINCI_EMAC is not set
@@ -571,6 +653,7 @@ 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
 
 #
@@ -581,6 +664,7 @@ 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
@@ -590,9 +674,6 @@ CONFIG_I2C_WMT=y
 #
 # Pin controllers
 #
-CONFIG_PINMUX=y
-CONFIG_PINCONF=y
-CONFIG_GENERIC_PINCONF=y
 CONFIG_PINCTRL_ABX500=y
 CONFIG_PINCTRL_AB8500=y
 CONFIG_PINCTRL_AB8540=y
@@ -611,6 +692,7 @@ 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
@@ -619,21 +701,19 @@ CONFIG_PINCTRL_TEGRA20=y
 CONFIG_PINCTRL_TEGRA30=y
 CONFIG_PINCTRL_TEGRA114=y
 # CONFIG_PINCTRL_PALMAS is not set
-CONFIG_PINCTRL_MVEBU=y
 CONFIG_PINCTRL_ARMADA_370=y
 CONFIG_PINCTRL_ARMADA_XP=y
 CONFIG_PINCTRL_WMT=y
 CONFIG_PINCTRL_WM8750=y
 CONFIG_PINCTRL_WM8850=y
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
-CONFIG_GPIO_GENERIC=y
 # CONFIG_GPIO_DA9052 is not set
 # CONFIG_GPIO_DA9055 is not set
 
 #
 # Memory mapped GPIO drivers:
 #
-CONFIG_GPIO_MVEBU=y
+# CONFIG_GPIO_GENERIC_PLATFORM is not set
 CONFIG_GPIO_MXC=y
 CONFIG_GPIO_PL061=y
 # CONFIG_GPIO_XILINX is not set
@@ -643,6 +723,7 @@ 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
@@ -653,6 +734,11 @@ CONFIG_GPIO_TWL6040=m
 # CONFIG_GPIO_WM8994 is not set
 # CONFIG_GPIO_ADP5520 is not set
 
+#
+# SPI GPIO expanders:
+#
+# CONFIG_GPIO_MCP23S08 is not set
+
 #
 # MODULbus GPIO expanders:
 #
@@ -664,6 +750,7 @@ CONFIG_GPIO_TWL6040=m
 # 1-wire Bus Masters
 #
 CONFIG_W1_MASTER_MXC=m
+# CONFIG_HDQ_MASTER_OMAP is not set
 
 #
 # 1-wire Slaves
@@ -682,7 +769,6 @@ CONFIG_W1_MASTER_MXC=m
 # CONFIG_CHARGER_MAX8998 is not set
 # CONFIG_CHARGER_TPS65090 is not set
 # CONFIG_AB8500_BM is not set
-CONFIG_POWER_RESET_QNAP=y
 
 #
 # Native drivers
@@ -760,6 +846,7 @@ 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
@@ -779,7 +866,6 @@ CONFIG_MFD_WM831X_I2C=y
 CONFIG_MFD_WM8350=y
 CONFIG_MFD_WM8350_I2C=y
 CONFIG_MFD_WM8994=y
-CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_REGULATOR_88PM800=m
 CONFIG_REGULATOR_88PM8607=y
 CONFIG_REGULATOR_AD5398=m
@@ -793,7 +879,6 @@ CONFIG_REGULATOR_DA903X=m
 CONFIG_REGULATOR_DA9052=m
 CONFIG_REGULATOR_DA9055=m
 CONFIG_REGULATOR_DA9063=m
-CONFIG_REGULATOR_DA9210=m
 CONFIG_REGULATOR_DBX500_PRCMU=y
 CONFIG_REGULATOR_DB8500_PRCMU=y
 CONFIG_REGULATOR_FAN53555=m
@@ -802,7 +887,6 @@ CONFIG_REGULATOR_ISL6271A=m
 CONFIG_REGULATOR_LP3971=m
 CONFIG_REGULATOR_LP3972=m
 CONFIG_REGULATOR_LP872X=y
-CONFIG_REGULATOR_LP8755=m
 CONFIG_REGULATOR_LP8788=y
 CONFIG_REGULATOR_MAX1586=m
 CONFIG_REGULATOR_MAX8649=m
@@ -816,7 +900,6 @@ CONFIG_REGULATOR_MAX8998=m
 CONFIG_REGULATOR_MAX77686=m
 CONFIG_REGULATOR_MAX77693=m
 CONFIG_REGULATOR_PALMAS=m
-CONFIG_REGULATOR_PFUZE100=m
 CONFIG_REGULATOR_RC5T583=m
 CONFIG_REGULATOR_S2MPS11=m
 CONFIG_REGULATOR_S5M8767=m
@@ -831,12 +914,16 @@ CONFIG_REGULATOR_TPS65910=m
 CONFIG_REGULATOR_TPS65912=m
 CONFIG_REGULATOR_TPS80031=m
 CONFIG_REGULATOR_TWL4030=y
-CONFIG_REGULATOR_VEXPRESS=m
 CONFIG_REGULATOR_WM831X=m
 CONFIG_REGULATOR_WM8350=m
 CONFIG_REGULATOR_WM8400=m
 CONFIG_REGULATOR_WM8994=m
 
+#
+# Multimedia core support
+#
+CONFIG_VIDEO_V4L2=y
+
 #
 # Media drivers
 #
@@ -853,6 +940,26 @@ CONFIG_VIDEO_CODA=m
 CONFIG_VIDEO_TI_VPE=m
 # CONFIG_VIDEO_TI_VPE_DEBUG is not set
 
+#
+# 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
+
 #
 # Graphics support
 #
@@ -991,10 +1098,16 @@ 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
@@ -1008,12 +1121,14 @@ 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_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
 
 #
@@ -1036,7 +1151,6 @@ CONFIG_MMC_SDHCI_BCM2835=m
 CONFIG_MMC_OMAP=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_MMC_MXC=m
-CONFIG_MMC_MVSDIO=m
 # CONFIG_MMC_DW_SOCFPGA is not set
 CONFIG_MMC_WMT=m
 
@@ -1055,7 +1169,6 @@ CONFIG_LEDS_GPIO=y
 # CONFIG_LEDS_WM8350 is not set
 # CONFIG_LEDS_DA903X is not set
 # CONFIG_LEDS_DA9052 is not set
-CONFIG_LEDS_REGULATOR=m
 # CONFIG_LEDS_ADP5520 is not set
 # CONFIG_LEDS_MAX8997 is not set
 
@@ -1102,7 +1215,6 @@ 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
 CONFIG_RTC_DRV_MXC=m
 CONFIG_RTC_DRV_SIRFSOC=m
@@ -1110,9 +1222,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
 CONFIG_TEGRA20_APB_DMA=y
@@ -1128,9 +1238,14 @@ CONFIG_TI_CPPI41=m
 CONFIG_DMA_VIRTUAL_CHANNELS=y
 
 #
-# DMA Clients
+# Speakup console speech
+#
+# CONFIG_MFD_NVEC is not set
+
+#
+# Android
 #
-CONFIG_DMA_ENGINE_RAID=y
+# CONFIG_DRM_IMX is not set
 
 #
 # Common Clock Framework
@@ -1138,12 +1253,10 @@ CONFIG_DMA_ENGINE_RAID=y
 # CONFIG_COMMON_CLK_WM831X is not set
 CONFIG_COMMON_CLK_VERSATILE=y
 # CONFIG_COMMON_CLK_MAX77686 is not set
-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
 CONFIG_ARMADA_XP_CLK=y
@@ -1163,6 +1276,8 @@ 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_ARCH_TIMER_EVTSTREAM=y
 CONFIG_ARM_GLOBAL_TIMER=y
 CONFIG_CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK=y
 CONFIG_VF_PIT_TIMER=y
@@ -1170,13 +1285,14 @@ 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
 #
 CONFIG_TI_EMIF=m
-CONFIG_MVEBU_DEVBUS=y
 CONFIG_TEGRA20_MC=y
 CONFIG_TEGRA30_MC=y
 
@@ -1190,6 +1306,7 @@ 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
@@ -1199,21 +1316,36 @@ CONFIG_ARCH_HAS_RESET_CONTROLLER=y
 #
 CONFIG_OMAP_USB2=m
 
+#
+# File systems
+#
+CONFIG_DCACHE_WORD_ACCESS=y
+
 #
 # 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_8250 is not set
+CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
 CONFIG_OC_ETM=y
+# CONFIG_PID_IN_CONTEXTIDR is not set
 
 #
 # Non-executable pages
@@ -1256,7 +1388,6 @@ CONFIG_CRYPTO_AES_ARM_BS=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
@@ -1269,8 +1400,7 @@ CONFIG_CRYPTO_DEV_UX500=m
 #
 # Library routines
 #
-CONFIG_RATIONAL=y
 CONFIG_STMP_DEVICE=y
 CONFIG_GENERIC_ALLOCATOR=y
-CONFIG_GENERIC_ATOMIC64=y
+CONFIG_CPU_RMAP=y
 CONFIG_DDR=y