kernel: Update to version 4.1.3

[ipfire-3.x.git] / kernel / config-armv5tel-default

diff --git a/kernel/config-armv5tel-default b/kernel/config-armv5tel-default
index 045bce1cff1c5f9c44842e635096c91ea214c265..20dc2719108c23254a81a883bb4e109a0fd9bc63 100644 (file)
--- a/kernel/config-armv5tel-default
+++ b/kernel/config-armv5tel-default
@@ -42,13 +42,6 @@ CONFIG_MACH_NETXBIG=y
 #
 # CONFIG_MACH_MX21ADS is not set
 
-#
-# MX25 platforms:
-#
-# CONFIG_MACH_MX25_3DS is not set
-# CONFIG_MACH_EUKREA_CPUIMX25SD is not set
-# CONFIG_MACH_IMX25_DT is not set
-
 #
 # MX27 platforms:
 #
@@ -57,6 +50,11 @@ CONFIG_MACH_NETXBIG=y
 # CONFIG_MACH_IMX27_VISSTRIM_M10 is not set
 # CONFIG_MACH_PCA100 is not set
 # CONFIG_MACH_IMX27_DT is not set
+
+#
+# Device tree only
+#
+# CONFIG_SOC_IMX25 is not set
 # CONFIG_ARCH_MXS is not set
 # CONFIG_ARCH_NOMADIK is not set
 # CONFIG_ARCH_NSPIRE is not set
@@ -80,6 +78,7 @@ CONFIG_CPU_USE_DOMAINS=y
 #
 # Processor Features
 #
+# CONFIG_CPU_DCACHE_DISABLE is not set
 CONFIG_NEED_KUSER_HELPERS=y
 CONFIG_CACHE_FEROCEON_L2=y
 # CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set
@@ -149,6 +148,7 @@ CONFIG_AHCI_MVEBU=m
 # Distributed Switch Architecture drivers
 #
 # CONFIG_VORTEX is not set
+CONFIG_MACB=m
 CONFIG_MV643XX_ETH=m
 CONFIG_MVNETA=m
 
@@ -190,12 +190,12 @@ CONFIG_PINCTRL_MVEBU=y
 CONFIG_PINCTRL_KIRKWOOD=y
 
 #
-# Memory mapped GPIO drivers:
+# Memory mapped GPIO drivers
 #
 CONFIG_GPIO_MVEBU=y
 
 #
-# USB GPIO expanders:
+# USB GPIO expanders
 #
 # CONFIG_CHARGER_LP8788 is not set
 # CONFIG_POWER_RESET_BRCMSTB is not set
@@ -306,11 +306,6 @@ CONFIG_USB_IMX21_HCD=m
 #
 CONFIG_MUSB_PIO_ONLY=y
 
-#
-# USB Physical Layer drivers
-#
-CONFIG_NOP_USB_XCEIV=m
-
 #
 # MMC/SD/SDIO Host Controller Drivers
 #
@@ -333,6 +328,7 @@ CONFIG_RTC_DRV_ARMADA38X=m
 # DMA Devices
 #
 CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH=y
+CONFIG_DW_DMAC_CORE=m
 CONFIG_DW_DMAC_PCI=m
 CONFIG_MV_XOR=y
 CONFIG_IMX_SDMA=m