diff options
| author | Jesper Nilsson <jesper.nilsson@axis.com> | 2008-02-04 22:30:31 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-05 09:44:24 -0800 |
| commit | 2d33d563b1e2b4748c585e3169f46481e897c829 (patch) | |
| tree | 843218ff514dea2f8a33aceafa82495fbcfdbfc4 /arch | |
| parent | 7e02dbf7249b1eadeb8b225f1af98701cd1320cc (diff) | |
| download | talos-op-linux-2d33d563b1e2b4748c585e3169f46481e897c829.tar.gz talos-op-linux-2d33d563b1e2b4748c585e3169f46481e897c829.zip | |
CRIS: avoid using arch links in Kconfig
Improve including of architecture dependent Kconfig files.
- Always include the architecture dependent Kconfig files.
- Wrap architecture dependent Kconfig files inside an appropriate
"if ETRAX_ARCH_Vxx" block.
This makes it possible to run the configuration even without the arch links,
which are created later in the build process.
Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/cris/Kconfig | 5 | ||||
| -rw-r--r-- | arch/cris/arch-v10/Kconfig | 4 | ||||
| -rw-r--r-- | arch/cris/arch-v10/drivers/Kconfig | 4 | ||||
| -rw-r--r-- | arch/cris/arch-v32/Kconfig | 4 | ||||
| -rw-r--r-- | arch/cris/arch-v32/drivers/Kconfig | 4 |
5 files changed, 19 insertions, 2 deletions
diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig index 7f0be4cd5e9a..27b082ac7f11 100644 --- a/arch/cris/Kconfig +++ b/arch/cris/Kconfig @@ -150,6 +150,7 @@ config ETRAX_FLASH_BUSWIDTH Width in bytes of the Flash bus (1, 2 or 4). Is usually 2. source arch/cris/arch-v10/Kconfig +source arch/cris/arch-v32/Kconfig endmenu @@ -157,8 +158,8 @@ source "net/Kconfig" # bring in ETRAX built-in drivers menu "Drivers for built-in interfaces" -# arch/cris/arch is a symlink to correct arch (arch-v10 or arch-v32) -source arch/cris/arch/drivers/Kconfig +source arch/cris/arch-v10/drivers/Kconfig +source arch/cris/arch-v32/drivers/Kconfig endmenu diff --git a/arch/cris/arch-v10/Kconfig b/arch/cris/arch-v10/Kconfig index f1ce6f64401d..1d61faec77cd 100644 --- a/arch/cris/arch-v10/Kconfig +++ b/arch/cris/arch-v10/Kconfig @@ -1,3 +1,5 @@ +if ETRAX_ARCH_V10 + # ETRAX 100LX v1 has a MMU "feature" requiring a low mapping config CRIS_LOW_MAP bool @@ -451,3 +453,5 @@ config ETRAX_POWERBUTTON_BIT default "25" help Configure where power button is connected. + +endif diff --git a/arch/cris/arch-v10/drivers/Kconfig b/arch/cris/arch-v10/drivers/Kconfig index e3c0f2928149..96740ef497d4 100644 --- a/arch/cris/arch-v10/drivers/Kconfig +++ b/arch/cris/arch-v10/drivers/Kconfig @@ -1,3 +1,5 @@ +if ETRAX_ARCH_V10 + config ETRAX_ETHERNET bool "Ethernet support" depends on ETRAX_ARCH_V10 @@ -806,3 +808,5 @@ config ETRAX_DS1302_TRICKLE_CHARGE 1 = 2kohm, 2 = 4kohm, 3 = 4kohm 4 = 1 diode, 8 = 2 diodes Allowed values are (increasing current): 0, 11, 10, 9, 7, 6, 5 + +endif diff --git a/arch/cris/arch-v32/Kconfig b/arch/cris/arch-v32/Kconfig index 4f79d8ed3e1c..d8acaa920e1c 100644 --- a/arch/cris/arch-v32/Kconfig +++ b/arch/cris/arch-v32/Kconfig @@ -1,3 +1,5 @@ +if ETRAX_ARCH_V32 + config ETRAX_DRAM_VIRTUAL_BASE hex depends on ETRAX_ARCH_V32 @@ -294,3 +296,5 @@ config ETRAX_DEF_GIO_PE_OUT help Configures the initial data for the general port E bits. Most products should use 00000 here. + +endif diff --git a/arch/cris/arch-v32/drivers/Kconfig b/arch/cris/arch-v32/drivers/Kconfig index 9bccb5e2a960..c329cce2a0c3 100644 --- a/arch/cris/arch-v32/drivers/Kconfig +++ b/arch/cris/arch-v32/drivers/Kconfig @@ -1,3 +1,5 @@ +if ETRAX_ARCH_V32 + config ETRAX_ETHERNET bool "Ethernet support" depends on ETRAX_ARCH_V32 @@ -610,3 +612,5 @@ config ETRAX_STREAMCOPROC help This option enables a driver for the stream co-processor for cryptographic operations. + +endif |
