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>
This commit is contained in:
parent
7e02dbf724
commit
2d33d563b1
|
@ -150,6 +150,7 @@ config ETRAX_FLASH_BUSWIDTH
|
||||||
Width in bytes of the Flash bus (1, 2 or 4). Is usually 2.
|
Width in bytes of the Flash bus (1, 2 or 4). Is usually 2.
|
||||||
|
|
||||||
source arch/cris/arch-v10/Kconfig
|
source arch/cris/arch-v10/Kconfig
|
||||||
|
source arch/cris/arch-v32/Kconfig
|
||||||
|
|
||||||
endmenu
|
endmenu
|
||||||
|
|
||||||
|
@ -157,8 +158,8 @@ source "net/Kconfig"
|
||||||
|
|
||||||
# bring in ETRAX built-in drivers
|
# bring in ETRAX built-in drivers
|
||||||
menu "Drivers for built-in interfaces"
|
menu "Drivers for built-in interfaces"
|
||||||
# arch/cris/arch is a symlink to correct arch (arch-v10 or arch-v32)
|
source arch/cris/arch-v10/drivers/Kconfig
|
||||||
source arch/cris/arch/drivers/Kconfig
|
source arch/cris/arch-v32/drivers/Kconfig
|
||||||
|
|
||||||
endmenu
|
endmenu
|
||||||
|
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
if ETRAX_ARCH_V10
|
||||||
|
|
||||||
# ETRAX 100LX v1 has a MMU "feature" requiring a low mapping
|
# ETRAX 100LX v1 has a MMU "feature" requiring a low mapping
|
||||||
config CRIS_LOW_MAP
|
config CRIS_LOW_MAP
|
||||||
bool
|
bool
|
||||||
|
@ -451,3 +453,5 @@ config ETRAX_POWERBUTTON_BIT
|
||||||
default "25"
|
default "25"
|
||||||
help
|
help
|
||||||
Configure where power button is connected.
|
Configure where power button is connected.
|
||||||
|
|
||||||
|
endif
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
if ETRAX_ARCH_V10
|
||||||
|
|
||||||
config ETRAX_ETHERNET
|
config ETRAX_ETHERNET
|
||||||
bool "Ethernet support"
|
bool "Ethernet support"
|
||||||
depends on ETRAX_ARCH_V10
|
depends on ETRAX_ARCH_V10
|
||||||
|
@ -806,3 +808,5 @@ config ETRAX_DS1302_TRICKLE_CHARGE
|
||||||
1 = 2kohm, 2 = 4kohm, 3 = 4kohm
|
1 = 2kohm, 2 = 4kohm, 3 = 4kohm
|
||||||
4 = 1 diode, 8 = 2 diodes
|
4 = 1 diode, 8 = 2 diodes
|
||||||
Allowed values are (increasing current): 0, 11, 10, 9, 7, 6, 5
|
Allowed values are (increasing current): 0, 11, 10, 9, 7, 6, 5
|
||||||
|
|
||||||
|
endif
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
if ETRAX_ARCH_V32
|
||||||
|
|
||||||
config ETRAX_DRAM_VIRTUAL_BASE
|
config ETRAX_DRAM_VIRTUAL_BASE
|
||||||
hex
|
hex
|
||||||
depends on ETRAX_ARCH_V32
|
depends on ETRAX_ARCH_V32
|
||||||
|
@ -294,3 +296,5 @@ config ETRAX_DEF_GIO_PE_OUT
|
||||||
help
|
help
|
||||||
Configures the initial data for the general port E bits. Most
|
Configures the initial data for the general port E bits. Most
|
||||||
products should use 00000 here.
|
products should use 00000 here.
|
||||||
|
|
||||||
|
endif
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
if ETRAX_ARCH_V32
|
||||||
|
|
||||||
config ETRAX_ETHERNET
|
config ETRAX_ETHERNET
|
||||||
bool "Ethernet support"
|
bool "Ethernet support"
|
||||||
depends on ETRAX_ARCH_V32
|
depends on ETRAX_ARCH_V32
|
||||||
|
@ -610,3 +612,5 @@ config ETRAX_STREAMCOPROC
|
||||||
help
|
help
|
||||||
This option enables a driver for the stream co-processor
|
This option enables a driver for the stream co-processor
|
||||||
for cryptographic operations.
|
for cryptographic operations.
|
||||||
|
|
||||||
|
endif
|
||||||
|
|
Loading…
Reference in a new issue