aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorJesper Nilsson <jesper.nilsson@axis.com>2008-02-05 01:30:31 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-05 12:44:24 -0500
commit2d33d563b1e2b4748c585e3169f46481e897c829 (patch)
tree843218ff514dea2f8a33aceafa82495fbcfdbfc4 /arch
parent7e02dbf7249b1eadeb8b225f1af98701cd1320cc (diff)
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/Kconfig5
-rw-r--r--arch/cris/arch-v10/Kconfig4
-rw-r--r--arch/cris/arch-v10/drivers/Kconfig4
-rw-r--r--arch/cris/arch-v32/Kconfig4
-rw-r--r--arch/cris/arch-v32/drivers/Kconfig4
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
150 Width in bytes of the Flash bus (1, 2 or 4). Is usually 2. 150 Width in bytes of the Flash bus (1, 2 or 4). Is usually 2.
151 151
152source arch/cris/arch-v10/Kconfig 152source arch/cris/arch-v10/Kconfig
153source arch/cris/arch-v32/Kconfig
153 154
154endmenu 155endmenu
155 156
@@ -157,8 +158,8 @@ source "net/Kconfig"
157 158
158# bring in ETRAX built-in drivers 159# bring in ETRAX built-in drivers
159menu "Drivers for built-in interfaces" 160menu "Drivers for built-in interfaces"
160# arch/cris/arch is a symlink to correct arch (arch-v10 or arch-v32) 161source arch/cris/arch-v10/drivers/Kconfig
161source arch/cris/arch/drivers/Kconfig 162source arch/cris/arch-v32/drivers/Kconfig
162 163
163endmenu 164endmenu
164 165
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 @@
1if ETRAX_ARCH_V10
2
1# ETRAX 100LX v1 has a MMU "feature" requiring a low mapping 3# ETRAX 100LX v1 has a MMU "feature" requiring a low mapping
2config CRIS_LOW_MAP 4config CRIS_LOW_MAP
3 bool 5 bool
@@ -451,3 +453,5 @@ config ETRAX_POWERBUTTON_BIT
451 default "25" 453 default "25"
452 help 454 help
453 Configure where power button is connected. 455 Configure where power button is connected.
456
457endif
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 @@
1if ETRAX_ARCH_V10
2
1config ETRAX_ETHERNET 3config ETRAX_ETHERNET
2 bool "Ethernet support" 4 bool "Ethernet support"
3 depends on ETRAX_ARCH_V10 5 depends on ETRAX_ARCH_V10
@@ -806,3 +808,5 @@ config ETRAX_DS1302_TRICKLE_CHARGE
806 1 = 2kohm, 2 = 4kohm, 3 = 4kohm 808 1 = 2kohm, 2 = 4kohm, 3 = 4kohm
807 4 = 1 diode, 8 = 2 diodes 809 4 = 1 diode, 8 = 2 diodes
808 Allowed values are (increasing current): 0, 11, 10, 9, 7, 6, 5 810 Allowed values are (increasing current): 0, 11, 10, 9, 7, 6, 5
811
812endif
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 @@
1if ETRAX_ARCH_V32
2
1config ETRAX_DRAM_VIRTUAL_BASE 3config ETRAX_DRAM_VIRTUAL_BASE
2 hex 4 hex
3 depends on ETRAX_ARCH_V32 5 depends on ETRAX_ARCH_V32
@@ -294,3 +296,5 @@ config ETRAX_DEF_GIO_PE_OUT
294 help 296 help
295 Configures the initial data for the general port E bits. Most 297 Configures the initial data for the general port E bits. Most
296 products should use 00000 here. 298 products should use 00000 here.
299
300endif
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 @@
1if ETRAX_ARCH_V32
2
1config ETRAX_ETHERNET 3config ETRAX_ETHERNET
2 bool "Ethernet support" 4 bool "Ethernet support"
3 depends on ETRAX_ARCH_V32 5 depends on ETRAX_ARCH_V32
@@ -610,3 +612,5 @@ config ETRAX_STREAMCOPROC
610 help 612 help
611 This option enables a driver for the stream co-processor 613 This option enables a driver for the stream co-processor
612 for cryptographic operations. 614 for cryptographic operations.
615
616endif