]> git.ipfire.org Git - people/ms/ipfire-3.x.git/blobdiff - kernel/config-armv7hl-default
kernel: Update to 3.12.4.
[people/ms/ipfire-3.x.git] / kernel / config-armv7hl-default
index 6658fdea46c6aebf42a44d2ad2eca10d11ce116f..7c0e3685e82412da20a7c7d8c8a9d83d04c3c78d 100644 (file)
@@ -32,6 +32,7 @@ CONFIG_RCU_NOCB_CPU_ALL=y
 #
 # Kernel Performance Events And Counters
 #
+CONFIG_SLUB_CPU_PARTIAL=y
 CONFIG_USE_GENERIC_SMP_HELPERS=y
 
 #
@@ -178,6 +179,7 @@ CONFIG_ARCH_OMAP2PLUS=y
 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
@@ -216,51 +218,29 @@ CONFIG_OMAP3_EMU=y
 # CONFIG_OMAP3_SDRC_AC_TIMING is not set
 CONFIG_ARCH_PICOXCELL=y
 CONFIG_ARCH_ROCKCHIP=y
-CONFIG_PLAT_SAMSUNG=y
-CONFIG_SAMSUNG_PM=y
-
-#
-# Boot options
-#
-# CONFIG_S3C_BOOT_ERROR_RESET is not set
-CONFIG_S3C_BOOT_UART_FORCE_FIFO=y
-CONFIG_S3C_LOWLEVEL_UART_PORT=0
-CONFIG_S5P_DEV_MFC=y
-
-#
-# Power management
-#
-# CONFIG_SAMSUNG_PM_CHECK is not set
-CONFIG_S5P_PM=y
-CONFIG_S5P_SLEEP=y
 CONFIG_ARCH_SOCFPGA=y
 CONFIG_ARCH_STI=y
 CONFIG_SOC_STIH415=y
 CONFIG_SOC_STIH416=y
-CONFIG_ARCH_EXYNOS_MULTI=y
+CONFIG_ARCH_SHMOBILE_MULTI=y
 
 #
-# SAMSUNG EXYNOS SoCs Support
+# SH-Mobile System Type
 #
-CONFIG_ARCH_EXYNOS4=y
-CONFIG_ARCH_EXYNOS5=y
-CONFIG_ARCH_EXYNOS_COMMON=y
+CONFIG_ARCH_EMEV2=y
 
 #
-# EXYNOS SoCs
+# SH-Mobile Board Type
 #
-CONFIG_CPU_EXYNOS4210=y
-CONFIG_SOC_EXYNOS4212=y
-CONFIG_SOC_EXYNOS4412=y
-CONFIG_SOC_EXYNOS5250=y
-CONFIG_SOC_EXYNOS5420=y
-CONFIG_SOC_EXYNOS5440=y
+CONFIG_MACH_KZM9D_REFERENCE=y
 
 #
-# Flattened Device Tree based board for EXYNOS SoCs
+# Timer and clock configuration
 #
-CONFIG_MACH_EXYNOS4_DT=y
-CONFIG_MACH_EXYNOS5_DT=y
+CONFIG_SHMOBILE_TIMER_HZ=128
+CONFIG_SH_TIMER_CMT=y
+CONFIG_SH_TIMER_TMU=y
+CONFIG_EM_TIMER_STI=y
 CONFIG_ARCH_SUNXI=y
 CONFIG_ARCH_SIRF=y
 
@@ -279,13 +259,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_PCI=y
 CONFIG_TEGRA_AHB=y
 # CONFIG_TEGRA_EMC_SCALING_ENABLE is not set
-
-#
-# ST-Ericsson U300/U335 Feature Selections
-#
 CONFIG_ARCH_U8500=y
 CONFIG_UX500_SOC_COMMON=y
 CONFIG_UX500_SOC_DB8500=y
@@ -365,6 +340,7 @@ 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
 
 #
@@ -376,8 +352,7 @@ CONFIG_PCI_DOMAINS=y
 # PCI host controller drivers
 #
 CONFIG_PCI_MVEBU=y
-CONFIG_PCIE_DW=y
-CONFIG_PCI_EXYNOS=y
+CONFIG_PCI_TEGRA=y
 # CONFIG_PCCARD is not set
 
 #
@@ -392,11 +367,8 @@ CONFIG_SCHED_SMT=y
 CONFIG_NR_CPUS=8
 CONFIG_HOTPLUG_CPU=y
 CONFIG_ARM_PSCI=y
-CONFIG_LOCAL_TIMERS=y
 CONFIG_ARCH_NR_GPIO=1024
-CONFIG_HZ=200
 CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y
-CONFIG_MEMORY_ISOLATION=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_ZONE_DMA_FLAG=1
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
@@ -411,6 +383,10 @@ CONFIG_CMDLINE="root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttyS
 # CPU Frequency scaling
 #
 # CONFIG_CPU_FREQ is not set
+
+#
+# CPU Idle
+#
 CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED=y
 
 #
@@ -418,6 +394,7 @@ CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED=y
 #
 CONFIG_VFPv3=y
 CONFIG_NEON=y
+CONFIG_KERNEL_MODE_NEON=y
 
 #
 # Power management options
@@ -425,9 +402,6 @@ CONFIG_NEON=y
 CONFIG_PM_SLEEP_SMP=y
 CONFIG_ARCH_HAS_OPP=y
 CONFIG_PM_OPP=y
-CONFIG_PM_GENERIC_DOMAINS=y
-CONFIG_PM_GENERIC_DOMAINS_SLEEP=y
-CONFIG_PM_GENERIC_DOMAINS_RUNTIME=y
 
 #
 # Classification
@@ -449,19 +423,6 @@ CONFIG_FIRMWARE_IN_KERNEL=y
 CONFIG_SOC_BUS=y
 CONFIG_REGMAP_I2C=y
 CONFIG_REGMAP_MMIO=y
-CONFIG_CMA=y
-# CONFIG_CMA_DEBUG is not set
-
-#
-# Default contiguous memory area size:
-#
-CONFIG_CMA_SIZE_MBYTES=16
-CONFIG_CMA_SIZE_SEL_MBYTES=y
-# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
-# CONFIG_CMA_SIZE_SEL_MIN is not set
-# CONFIG_CMA_SIZE_SEL_MAX is not set
-CONFIG_CMA_ALIGNMENT=8
-CONFIG_CMA_AREAS=7
 
 #
 # Bus devices
@@ -545,9 +506,9 @@ CONFIG_MTD_NAND_IDS=y
 # CONFIG_MTD_NAND_DISKONCHIP is not set
 # CONFIG_MTD_NAND_DOCG4 is not set
 # CONFIG_MTD_NAND_CAFE is not set
+# CONFIG_MTD_NAND_PXA3xx is not set
 # 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_NAND_FSMC is not set
@@ -555,7 +516,6 @@ CONFIG_MTD_ONENAND=y
 # CONFIG_MTD_ONENAND_VERIFY_WRITE is not set
 # CONFIG_MTD_ONENAND_GENERIC is not set
 CONFIG_MTD_ONENAND_OMAP2=y
-# CONFIG_MTD_ONENAND_SAMSUNG is not set
 # CONFIG_MTD_ONENAND_OTP is not set
 CONFIG_MTD_ONENAND_2X_PROGRAM=y
 
@@ -568,7 +528,6 @@ CONFIG_MTD_ONENAND_2X_PROGRAM=y
 #
 # Device Tree and Open Firmware support
 #
-CONFIG_OF_I2C=y
 CONFIG_OF_MTD=y
 # CONFIG_PARPORT is not set
 CONFIG_BLK_DEV_RAM_SIZE=65536
@@ -649,10 +608,6 @@ CONFIG_INPUT_SIRFSOC_ONKEY=y
 #
 CONFIG_SERIAL_AMBA_PL010=y
 # CONFIG_SERIAL_AMBA_PL010_CONSOLE is not set
-CONFIG_SERIAL_SAMSUNG=y
-CONFIG_SERIAL_SAMSUNG_UARTS_4=y
-CONFIG_SERIAL_SAMSUNG_UARTS=4
-# CONFIG_SERIAL_SAMSUNG_CONSOLE is not set
 CONFIG_SERIAL_SIRFSOC=y
 # CONFIG_SERIAL_SIRFSOC_CONSOLE is not set
 CONFIG_SERIAL_TEGRA=y
@@ -669,6 +624,7 @@ CONFIG_SERIAL_SCCNXP=y
 CONFIG_SERIAL_ARC=y
 # CONFIG_SERIAL_ARC_CONSOLE is not set
 CONFIG_HW_RANDOM_BCM2835=y
+CONFIG_HW_RANDOM_OMAP=m
 CONFIG_HW_RANDOM_MXC_RNGA=m
 CONFIG_I2C=y
 CONFIG_I2C_ALGOBIT=y
@@ -677,11 +633,11 @@ CONFIG_I2C_ALGOBIT=y
 # I2C system bus drivers (mostly embedded / system-on-chip)
 #
 CONFIG_I2C_BCM2835=y
+CONFIG_I2C_DAVINCI=m
 CONFIG_I2C_IMX=y
 CONFIG_I2C_MV64XXX=y
 CONFIG_I2C_NOMADIK=y
 CONFIG_I2C_OMAP=y
-CONFIG_I2C_S3C2410=y
 CONFIG_I2C_SIRF=y
 CONFIG_I2C_TEGRA=y
 CONFIG_I2C_WMT=y
@@ -723,9 +679,7 @@ CONFIG_PINCTRL_TEGRA=y
 CONFIG_PINCTRL_TEGRA20=y
 CONFIG_PINCTRL_TEGRA30=y
 CONFIG_PINCTRL_TEGRA114=y
-CONFIG_PINCTRL_SAMSUNG=y
-CONFIG_PINCTRL_EXYNOS=y
-CONFIG_PINCTRL_EXYNOS5440=y
+# CONFIG_PINCTRL_PALMAS is not set
 CONFIG_PINCTRL_MVEBU=y
 CONFIG_PINCTRL_ARMADA_370=y
 CONFIG_PINCTRL_ARMADA_XP=y
@@ -784,8 +738,8 @@ CONFIG_W1_MASTER_MXC=m
 # CONFIG_BATTERY_88PM860X is not set
 # CONFIG_BATTERY_DA9030 is not set
 # CONFIG_BATTERY_DA9052 is not set
+# CONFIG_BATTERY_TWL4030_MADC is not set
 # CONFIG_BATTERY_RX51 is not set
-# CONFIG_CHARGER_ISP1704 is not set
 # CONFIG_CHARGER_TWL4030 is not set
 # CONFIG_CHARGER_MANAGER is not set
 # CONFIG_CHARGER_MAX8997 is not set
@@ -811,6 +765,7 @@ CONFIG_ARMADA_THERMAL=m
 CONFIG_TI_SOC_THERMAL=m
 CONFIG_OMAP4_THERMAL=y
 CONFIG_OMAP5_THERMAL=y
+CONFIG_DRA752_THERMAL=y
 
 #
 # Watchdog Device Drivers
@@ -820,6 +775,7 @@ CONFIG_OMAP5_THERMAL=y
 # CONFIG_WM831X_WATCHDOG is not set
 # CONFIG_WM8350_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
@@ -836,6 +792,7 @@ CONFIG_PMIC_DA903X=y
 CONFIG_PMIC_DA9052=y
 CONFIG_MFD_DA9052_I2C=y
 CONFIG_MFD_DA9055=y
+CONFIG_MFD_DA9063=y
 CONFIG_HTC_I2CPLD=y
 CONFIG_MFD_88PM800=m
 CONFIG_MFD_88PM805=m
@@ -890,16 +847,29 @@ CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
 # CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
 # CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
-CONFIG_REGULATOR_GPIO=y
+CONFIG_REGULATOR_88PM800=m
+CONFIG_REGULATOR_88PM8607=y
 CONFIG_REGULATOR_AD5398=m
+CONFIG_REGULATOR_ANATOP=m
 CONFIG_REGULATOR_AAT2870=m
+CONFIG_REGULATOR_AB3100=y
+CONFIG_REGULATOR_AB8500=y
+CONFIG_REGULATOR_AS3711=m
 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
-CONFIG_REGULATOR_ANATOP=m
+CONFIG_REGULATOR_GPIO=y
 CONFIG_REGULATOR_ISL6271A=m
-CONFIG_REGULATOR_88PM8607=y
+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
 CONFIG_REGULATOR_MAX8660=m
@@ -911,19 +881,12 @@ CONFIG_REGULATOR_MAX8997=m
 CONFIG_REGULATOR_MAX8998=m
 CONFIG_REGULATOR_MAX77686=m
 CONFIG_REGULATOR_MAX77693=m
-CONFIG_REGULATOR_LP3971=m
-CONFIG_REGULATOR_LP3972=m
-CONFIG_REGULATOR_LP872X=y
-CONFIG_REGULATOR_LP8755=m
-CONFIG_REGULATOR_LP8788=y
+CONFIG_REGULATOR_PALMAS=m
+CONFIG_REGULATOR_PFUZE100=m
 CONFIG_REGULATOR_RC5T583=m
 CONFIG_REGULATOR_S2MPS11=m
 CONFIG_REGULATOR_S5M8767=m
-CONFIG_REGULATOR_AB3100=y
-CONFIG_REGULATOR_AB8500=y
-CONFIG_REGULATOR_DBX500_PRCMU=y
-CONFIG_REGULATOR_DB8500_PRCMU=y
-CONFIG_REGULATOR_PALMAS=m
+CONFIG_REGULATOR_TI_ABB=y
 CONFIG_REGULATOR_TPS51632=m
 CONFIG_REGULATOR_TPS62360=m
 CONFIG_REGULATOR_TPS65023=m
@@ -934,13 +897,11 @@ CONFIG_REGULATOR_TPS65910=m
 CONFIG_REGULATOR_TPS65912=m
 CONFIG_REGULATOR_TPS80031=m
 CONFIG_REGULATOR_TWL4030=y
-CONFIG_REGULATOR_TI_ABB=y
 CONFIG_REGULATOR_VEXPRESS=m
 CONFIG_REGULATOR_WM831X=m
 CONFIG_REGULATOR_WM8350=m
 CONFIG_REGULATOR_WM8400=m
 CONFIG_REGULATOR_WM8994=m
-CONFIG_REGULATOR_AS3711=m
 
 #
 # Multimedia core support
@@ -955,7 +916,6 @@ CONFIG_VIDEO_OMAP2_VOUT_VRFB=y
 CONFIG_VIDEO_OMAP2_VOUT=m
 CONFIG_VIDEO_MX3=m
 CONFIG_VIDEO_CODA=m
-# CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC is not set
 
 #
 # Media ancillary drivers (tuners, sensors, i2c, frontends)
@@ -1002,15 +962,16 @@ CONFIG_FB_MODE_HELPERS=y
 # Frame buffer hardware drivers
 #
 # CONFIG_FB_IMX is not set
-# CONFIG_FB_S3C is not set
+# CONFIG_FB_VT8500 is not set
+# CONFIG_FB_WM8505 is not set
 # CONFIG_FB_XILINX is not set
+# CONFIG_FB_DA8XX is not set
 # CONFIG_FB_MX3 is not set
 CONFIG_OMAP2_VRFB=y
 CONFIG_OMAP2_DSS=y
 # CONFIG_OMAP2_DSS_DEBUG is not set
 # CONFIG_OMAP2_DSS_DEBUGFS is not set
 CONFIG_OMAP2_DSS_DPI=y
-# CONFIG_OMAP2_DSS_RFBI is not set
 CONFIG_OMAP2_DSS_VENC=y
 CONFIG_OMAP4_DSS_HDMI=y
 CONFIG_OMAP4_DSS_HDMI_AUDIO=y
@@ -1020,14 +981,6 @@ CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=1
 CONFIG_OMAP2_DSS_SLEEP_AFTER_VENC_RESET=y
 # CONFIG_FB_OMAP2 is not set
 
-#
-# OMAP2/3 Display Device Drivers (old device model)
-#
-CONFIG_PANEL_GENERIC_DPI=y
-CONFIG_PANEL_TFP410=m
-CONFIG_PANEL_SHARP_LS037V7DW01=y
-# CONFIG_PANEL_PICODLP is not set
-
 #
 # OMAP Display Device Drivers (new device model)
 #
@@ -1054,11 +1007,11 @@ CONFIG_DISPLAY_PANEL_SHARP_LS037V7DW01=m
 #
 # Console display driver support
 #
+CONFIG_SND_DMAENGINE_PCM=m
 CONFIG_SND_SOC_AC97_BUS=y
-CONFIG_SND_SOC_DMAENGINE_PCM=y
 CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
 CONFIG_SND_SOC_FSL_SSI=m
-CONFIG_SND_SOC_FSL_UTILS=m
+CONFIG_SND_SOC_FSL_SPDIF=m
 CONFIG_SND_IMX_SOC=m
 CONFIG_SND_SOC_IMX_SSI=m
 CONFIG_SND_SOC_IMX_PCM_FIQ=m
@@ -1068,6 +1021,7 @@ CONFIG_SND_SOC_PHYCORE_AC97=m
 CONFIG_SND_SOC_EUKREA_TLV320=m
 CONFIG_SND_SOC_IMX_WM8962=m
 CONFIG_SND_SOC_IMX_SGTL5000=m
+CONFIG_SND_SOC_IMX_SPDIF=m
 CONFIG_SND_OMAP_SOC=m
 CONFIG_SND_OMAP_SOC_DMIC=m
 CONFIG_SND_OMAP_SOC_MCBSP=m
@@ -1100,6 +1054,7 @@ CONFIG_SND_SOC_DMIC=m
 CONFIG_SND_SOC_HDMI_CODEC=m
 CONFIG_SND_SOC_RT5640=m
 CONFIG_SND_SOC_SGTL5000=m
+CONFIG_SND_SOC_SPDIF=m
 CONFIG_SND_SOC_TLV320AIC23=m
 CONFIG_SND_SOC_TLV320AIC3X=m
 CONFIG_SND_SOC_TWL4030=m
@@ -1114,7 +1069,6 @@ CONFIG_SND_SOC_TPA6130A2=m
 # I2C HID support
 #
 CONFIG_USB_ARCH_HAS_EHCI=y
-CONFIG_USB_ARCH_HAS_XHCI=y
 
 #
 # USB Host Controller Drivers
@@ -1125,29 +1079,23 @@ CONFIG_USB_EHCI_HCD_ORION=m
 CONFIG_USB_EHCI_TEGRA=y
 # CONFIG_USB_CNS3XXX_EHCI is not set
 CONFIG_USB_OHCI_HCD_OMAP3=y
-CONFIG_USB_OHCI_EXYNOS=y
 CONFIG_USB_CNS3XXX_OHCI=y
 CONFIG_USB_UHCI_SUPPORT_NON_PCI_HC=y
 CONFIG_USB_UHCI_PLATFORM=y
 CONFIG_USB_IMX21_HCD=m
 
 #
-# USB Miscellaneous drivers
+# USB Physical Layer drivers
 #
-CONFIG_USB_PHY=y
 CONFIG_AB8500_USB=m
-CONFIG_NOP_USB_XCEIV=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_GPIO_VBUS=m
-CONFIG_USB_ISP1301=m
 CONFIG_USB_MXS_PHY=m
-CONFIG_USB_RCAR_PHY=m
-CONFIG_USB_ULPI=y
 CONFIG_USB_ULPI_VIEWPORT=y
 CONFIG_MMC=y
 
@@ -1164,7 +1112,6 @@ CONFIG_MMC_SDHCI_IO_ACCESSORS=y
 CONFIG_MMC_SDHCI_CNS3XXX=m
 CONFIG_MMC_SDHCI_ESDHC_IMX=m
 CONFIG_MMC_SDHCI_TEGRA=m
-# CONFIG_MMC_SDHCI_S3C is not set
 CONFIG_MMC_SDHCI_SIRF=m
 CONFIG_MMC_SDHCI_BCM_KONA=m
 CONFIG_MMC_SDHCI_BCM2835=m
@@ -1172,6 +1119,7 @@ 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
 
 #
@@ -1231,7 +1179,6 @@ CONFIG_RTC_DRV_AB3100=y
 #
 CONFIG_RTC_DRV_IMXDI=m
 CONFIG_RTC_DRV_OMAP=m
-CONFIG_RTC_DRV_S3C=m
 CONFIG_RTC_DRV_VT8500=m
 CONFIG_RTC_DRV_MV=m
 CONFIG_RTC_DRV_TEGRA=m
@@ -1247,12 +1194,13 @@ CONFIG_MX3_IPU=y
 CONFIG_MX3_IPU_IRQS=4
 CONFIG_TEGRA20_APB_DMA=y
 # CONFIG_STE_DMA40 is not set
-# CONFIG_SIRF_DMA is not set
+CONFIG_SIRF_DMA=y
 CONFIG_TI_EDMA=y
 CONFIG_IMX_SDMA=m
 CONFIG_IMX_DMA=m
 # CONFIG_MXS_DMA is not set
 CONFIG_DMA_OMAP=y
+CONFIG_TI_CPPI41=m
 CONFIG_DMA_VIRTUAL_CHANNELS=y
 
 #
@@ -1274,6 +1222,7 @@ CONFIG_COMMON_CLK=y
 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_MVEBU_CLK_COMMON=y
@@ -1299,8 +1248,6 @@ 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_CLKSRC_EXYNOS_MCT=y
-CONFIG_CLKSRC_SAMSUNG_PWM=y
 CONFIG_VF_PIT_TIMER=y
 CONFIG_OMAP_MBOX=m
 CONFIG_OMAP2PLUS_MBOX=m
@@ -1321,13 +1268,13 @@ CONFIG_TEGRA30_MC=y
 # Analog to digital converters
 #
 # CONFIG_LP8788_ADC is not set
+# CONFIG_TWL6030_GPADC is not set
 
 #
-# Pressure Sensors
+# Temperature sensors
 #
 # CONFIG_PWM is not set
 CONFIG_ARM_GIC=y
-CONFIG_GIC_NON_BANKED=y
 CONFIG_ARCH_HAS_RESET_CONTROLLER=y
 
 #
@@ -1355,6 +1302,8 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60
 # 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
@@ -1376,6 +1325,11 @@ CONFIG_PAX_MEMORY_UDEREF=y
 CONFIG_PAX_REFCOUNT=y
 CONFIG_PAX_CONSTIFY_PLUGIN=y
 
+#
+# Memory Protections
+#
+CONFIG_GRKERNSEC_OLD_ARM_USERLAND=y
+
 #
 # Kernel Auditing
 #