aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm53xx/config-3.14
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2014-08-19 20:12:36 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2014-08-19 20:12:36 +0000
commitbcb36cd4943e1216454f54b66a74d5239ee48746 (patch)
tree1bc69cd9ce04dd79a3346954a30aa4a981fa8c65 /target/linux/bcm53xx/config-3.14
parenta8bdf2f1e0b5b6cf9d6158fd6ff6d3f271bcaff1 (diff)
downloadupstream-bcb36cd4943e1216454f54b66a74d5239ee48746.tar.gz
upstream-bcb36cd4943e1216454f54b66a74d5239ee48746.tar.bz2
upstream-bcb36cd4943e1216454f54b66a74d5239ee48746.zip
bcm53xx: backport spi nor code form kernel v3.17-rc1.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 42222
Diffstat (limited to 'target/linux/bcm53xx/config-3.14')
-rw-r--r--target/linux/bcm53xx/config-3.145
1 files changed, 2 insertions, 3 deletions
diff --git a/target/linux/bcm53xx/config-3.14 b/target/linux/bcm53xx/config-3.14
index 6c54436b5c..e4f441190a 100644
--- a/target/linux/bcm53xx/config-3.14
+++ b/target/linux/bcm53xx/config-3.14
@@ -15,6 +15,7 @@ CONFIG_ARCH_MULTI_V7=y
CONFIG_ARCH_NR_GPIO=0
# 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
@@ -163,15 +164,14 @@ CONFIG_IRQ_WORK=y
CONFIG_KTIME_SCALAR=y
CONFIG_MDIO_BOARDINFO=y
CONFIG_MIGHT_HAVE_PCI=y
-# CONFIG_MLX5_CORE is not set
CONFIG_MODULES_USE_ELF_REL=y
CONFIG_MTD_BCM47XX_PARTS=y
# CONFIG_MTD_PHYSMAP_OF is not set
+CONFIG_MTD_SPI_NOR=y
CONFIG_MULTI_IRQ_HANDLER=y
CONFIG_MUTEX_SPIN_ON_OWNER=y
CONFIG_NEED_DMA_MAP_STATE=y
CONFIG_NET_FLOW_LIMIT=y
-CONFIG_NET_RX_BUSY_POLL=y
CONFIG_NO_BOOTMEM=y
CONFIG_NR_CPUS=4
CONFIG_OF=y
@@ -229,5 +229,4 @@ 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_ZONE_DMA_FLAG=0