summaryrefslogtreecommitdiffstats
path: root/arch/cris
diff options
context:
space:
mode:
authorJesper Nilsson <jesper.nilsson@axis.com>2008-02-06 13:21:28 +0100
committerJesper Nilsson <jesper.nilsson@axis.com>2008-02-08 11:08:06 +0100
commit79e04fdbb3423f6faa0d93e5ec41c2c2741d4052 (patch)
treeae7930c9a314d4c674d0acfc634f11b72569a866 /arch/cris
parentc261038108b814a1ea1e85daeaa950cbd35a7db7 (diff)
downloadlinux-stable-79e04fdbb3423f6faa0d93e5ec41c2c2741d4052.tar.gz
linux-stable-79e04fdbb3423f6faa0d93e5ec41c2c2741d4052.tar.bz2
linux-stable-79e04fdbb3423f6faa0d93e5ec41c2c2741d4052.zip
CRIS: Move ETRAX_AXISFLASHMAP to common Kconfig file.
Diffstat (limited to 'arch/cris')
-rw-r--r--arch/cris/Kconfig15
-rw-r--r--arch/cris/arch-v10/drivers/Kconfig15
-rw-r--r--arch/cris/arch-v32/drivers/Kconfig16
3 files changed, 15 insertions, 31 deletions
diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig
index e6d440ae5e5b..90d801331586 100644
--- a/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
@@ -259,6 +259,21 @@ menu "Drivers for built-in interfaces"
source arch/cris/arch-v10/drivers/Kconfig
source arch/cris/arch-v32/drivers/Kconfig
+config ETRAX_AXISFLASHMAP
+ bool "Axis flash-map support"
+ select MTD
+ select MTD_CFI
+ select MTD_CFI_AMDSTD
+ select MTD_JEDECPROBE if ETRAX_ARCH_V32
+ select MTD_CHAR
+ select MTD_BLOCK
+ select MTD_PARTITIONS
+ select MTD_CONCAT
+ select MTD_COMPLEX_MAPPINGS
+ help
+ This option enables MTD mapping of flash devices. Needed to use
+ flash memories. If unsure, say Y.
+
config ETRAX_RTC
bool "Real Time Clock support"
depends on ETRAX_I2C
diff --git a/arch/cris/arch-v10/drivers/Kconfig b/arch/cris/arch-v10/drivers/Kconfig
index 42a6d2ed6523..58f5864a6680 100644
--- a/arch/cris/arch-v10/drivers/Kconfig
+++ b/arch/cris/arch-v10/drivers/Kconfig
@@ -428,21 +428,6 @@ config ETRAX_USB_HOST_PORT2
depends on ETRAX_USB_HOST
default n
-config ETRAX_AXISFLASHMAP
- bool "Axis flash-map support"
- depends on ETRAX_ARCH_V10
- select MTD
- select MTD_CFI
- select MTD_CFI_AMDSTD
- select MTD_CHAR
- select MTD_BLOCK
- select MTD_PARTITIONS
- select MTD_CONCAT
- select MTD_COMPLEX_MAPPINGS
- help
- This option enables MTD mapping of flash devices. Needed to use
- flash memories. If unsure, say Y.
-
config ETRAX_PTABLE_SECTOR
int "Byte-offset of partition table sector"
depends on ETRAX_AXISFLASHMAP
diff --git a/arch/cris/arch-v32/drivers/Kconfig b/arch/cris/arch-v32/drivers/Kconfig
index 849c89bd0322..2a92cb1886ca 100644
--- a/arch/cris/arch-v32/drivers/Kconfig
+++ b/arch/cris/arch-v32/drivers/Kconfig
@@ -378,22 +378,6 @@ config ETRAX_RS485_DISABLE_RECEIVER
It is necessary to disable the serial receiver to avoid serial
loopback. Not all products are able to do this in software only.
-config ETRAX_AXISFLASHMAP
- bool "Axis flash-map support"
- depends on ETRAX_ARCH_V32
- select MTD
- select MTD_CFI
- select MTD_CFI_AMDSTD
- select MTD_JEDECPROBE
- select MTD_CHAR
- select MTD_BLOCK
- select MTD_PARTITIONS
- select MTD_CONCAT
- select MTD_COMPLEX_MAPPINGS
- help
- This option enables MTD mapping of flash devices. Needed to use
- flash memories. If unsure, say Y.
-
config ETRAX_SYNCHRONOUS_SERIAL
bool "Synchronous serial-port support"
depends on ETRAX_ARCH_V32