aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/Kconfig5
-rw-r--r--drivers/mtd/chips/Kconfig2
2 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 5959e36c3b4c..4a63a8e2e452 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -69,6 +69,9 @@ config GENERIC_ISA_DMA
69config FIQ 69config FIQ
70 bool 70 bool
71 71
72config ARCH_MTD_XIP
73 bool
74
72source "init/Kconfig" 75source "init/Kconfig"
73 76
74menu "System Type" 77menu "System Type"
@@ -136,6 +139,7 @@ config ARCH_L7200
136 139
137config ARCH_PXA 140config ARCH_PXA
138 bool "PXA2xx-based" 141 bool "PXA2xx-based"
142 select ARCH_MTD_XIP
139 143
140config ARCH_RPC 144config ARCH_RPC
141 bool "RiscPC" 145 bool "RiscPC"
@@ -152,6 +156,7 @@ config ARCH_SA1100
152 bool "SA1100-based" 156 bool "SA1100-based"
153 select ISA 157 select ISA
154 select ARCH_DISCONTIGMEM_ENABLE 158 select ARCH_DISCONTIGMEM_ENABLE
159 select ARCH_MTD_XIP
155 160
156config ARCH_S3C2410 161config ARCH_S3C2410
157 bool "Samsung S3C2410" 162 bool "Samsung S3C2410"
diff --git a/drivers/mtd/chips/Kconfig b/drivers/mtd/chips/Kconfig
index effa0d7a73ac..205bb7083335 100644
--- a/drivers/mtd/chips/Kconfig
+++ b/drivers/mtd/chips/Kconfig
@@ -301,7 +301,7 @@ config MTD_JEDEC
301 301
302config MTD_XIP 302config MTD_XIP
303 bool "XIP aware MTD support" 303 bool "XIP aware MTD support"
304 depends on !SMP && (MTD_CFI_INTELEXT || MTD_CFI_AMDSTD) && EXPERIMENTAL && ARM 304 depends on !SMP && (MTD_CFI_INTELEXT || MTD_CFI_AMDSTD) && EXPERIMENTAL && ARCH_MTD_XIP
305 default y if XIP_KERNEL 305 default y if XIP_KERNEL
306 help 306 help
307 This allows MTD support to work with flash memory which is also 307 This allows MTD support to work with flash memory which is also