ux500: allow 5500 and 8500 to be built together

Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com>
Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
This commit is contained in:
Rabin Vincent 2010-12-08 11:08:01 +05:30 committed by Linus Walleij
parent 5ec65521c9
commit d2a40972ec
2 changed files with 18 additions and 12 deletions

View File

@ -9,6 +9,10 @@ CONFIG_MODULE_UNLOAD=y
# CONFIG_LBDAF is not set # CONFIG_LBDAF is not set
# CONFIG_BLK_DEV_BSG is not set # CONFIG_BLK_DEV_BSG is not set
CONFIG_ARCH_U8500=y CONFIG_ARCH_U8500=y
CONFIG_UX500_SOC_DB5500=y
CONFIG_UX500_SOC_DB8500=y
CONFIG_MACH_U8500=y
CONFIG_MACH_U5500=y
CONFIG_SMP=y CONFIG_SMP=y
CONFIG_NR_CPUS=2 CONFIG_NR_CPUS=2
CONFIG_PREEMPT=y CONFIG_PREEMPT=y

View File

@ -7,28 +7,30 @@ config UX500_SOC_COMMON
select HAS_MTU select HAS_MTU
select NOMADIK_GPIO select NOMADIK_GPIO
config UX500_SOC_DB8500 menu "Ux500 SoC"
bool
config UX500_SOC_DB5500 config UX500_SOC_DB5500
bool bool "DB5500"
choice config UX500_SOC_DB8500
prompt "Ux500 target platform" bool "DB8500"
default MACH_U8500_MOP
config MACH_U8500_MOP endmenu
menu "Ux500 target platform"
config MACH_U8500
bool "U8500 Development platform" bool "U8500 Development platform"
select UX500_SOC_DB8500 depends on UX500_SOC_DB8500
help help
Include support for the mop500 development platform. Include support for the mop500 development platform.
config MACH_U5500 config MACH_U5500
bool "U5500 Development platform" bool "U5500 Development platform"
select UX500_SOC_DB5500 depends on UX500_SOC_DB5500
help help
Include support for the U5500 development platform. Include support for the U5500 development platform.
endchoice endmenu
config UX500_DEBUG_UART config UX500_DEBUG_UART
int "Ux500 UART to use for low-level debug" int "Ux500 UART to use for low-level debug"
@ -39,14 +41,14 @@ config UX500_DEBUG_UART
config U5500_MODEM_IRQ config U5500_MODEM_IRQ
bool "Modem IRQ support" bool "Modem IRQ support"
depends on MACH_U5500 depends on UX500_SOC_DB5500
default y default y
help help
Add support for handling IRQ:s from modem side Add support for handling IRQ:s from modem side
config U5500_MBOX config U5500_MBOX
bool "Mailbox support" bool "Mailbox support"
depends on MACH_U5500 && U5500_MODEM_IRQ depends on U5500_MODEM_IRQ
default y default y
help help
Add support for U5500 mailbox communication with modem side Add support for U5500 mailbox communication with modem side