aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/imx6
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2014-08-11 20:35:15 +0000
committerLuka Perkov <luka@openwrt.org>2014-08-11 20:35:15 +0000
commit4cbb181a87b6a8342f8ba5cc1ba844dfe6eac08e (patch)
treeb554ae425abbeb307254839695e5e28a68a493b1 /target/linux/imx6
parente859c9bc083be63dbb5e48189894b20b171c8eab (diff)
downloadupstream-4cbb181a87b6a8342f8ba5cc1ba844dfe6eac08e.tar.gz
upstream-4cbb181a87b6a8342f8ba5cc1ba844dfe6eac08e.tar.bz2
upstream-4cbb181a87b6a8342f8ba5cc1ba844dfe6eac08e.zip
imx6: update kernel config
Signed-off-by: Luka Perkov <luka@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42149 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/imx6')
-rw-r--r--target/linux/imx6/config-3.144
1 files changed, 1 insertions, 3 deletions
diff --git a/target/linux/imx6/config-3.14 b/target/linux/imx6/config-3.14
index 55fcf3b5a3..887cebcf56 100644
--- a/target/linux/imx6/config-3.14
+++ b/target/linux/imx6/config-3.14
@@ -18,6 +18,7 @@ CONFIG_ARCH_NR_GPIO=0
CONFIG_ARCH_REQUIRE_GPIOLIB=y
# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
+CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
CONFIG_ARCH_SUSPEND_POSSIBLE=y
CONFIG_ARCH_USE_BUILTIN_BSWAP=y
CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
@@ -220,7 +221,6 @@ CONFIG_MDIO_BOARDINFO=y
CONFIG_MFD_SYSCON=y
CONFIG_MIGHT_HAVE_CACHE_L2X0=y
CONFIG_MIGHT_HAVE_PCI=y
-# CONFIG_MLX5_CORE is not set
CONFIG_MMC=y
CONFIG_MMC_BLOCK=y
# CONFIG_MMC_MXC is not set
@@ -251,7 +251,6 @@ CONFIG_MXS_DMA=y
CONFIG_NEED_DMA_MAP_STATE=y
CONFIG_NEON=y
CONFIG_NET_FLOW_LIMIT=y
-CONFIG_NET_RX_BUSY_POLL=y
CONFIG_NLS=y
CONFIG_NLS_CODEPAGE_437=y
CONFIG_NO_BOOTMEM=y
@@ -361,7 +360,6 @@ CONFIG_XZ_DEC_ARM=y
CONFIG_XZ_DEC_BCJ=y
CONFIG_ZBOOT_ROM_BSS=0x0
CONFIG_ZBOOT_ROM_TEXT=0x0
-# CONFIG_ZBUD is not set
CONFIG_ZLIB_DEFLATE=y
CONFIG_ZLIB_INFLATE=y
CONFIG_ZONE_DMA_FLAG=0