aboutsummaryrefslogtreecommitdiff
path: root/arch/powerpc/platforms
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2008-01-28 10:24:30 -0600
committerKumar Gala <galak@kernel.crashing.org>2008-01-28 13:13:12 -0600
commit3a83156bd857f31ed264816321b78466bed8e4f4 (patch)
tree9b863a0a0c2444a823cb24ae7c9797cc76c1b64b /arch/powerpc/platforms
parentb9d3f259147d28f559cab3a7d0471cc4d411c511 (diff)
[POWERPC] 85xx: rework platform Kconfig
* Allow multiple boards to be selected in a single build * Removed Kconfig option '85xx' which existed only for compat with arch/ppc * Added a multiplatform 85xx defconfig (mpc85xx_defconfig). This builds all 85xx boards except sbc8560 and stx_gp3 since these to boards have board specific ifdef in driver code that may break all other boards Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/platforms')
-rw-r--r--arch/powerpc/platforms/85xx/Kconfig32
-rw-r--r--arch/powerpc/platforms/Kconfig.cputype6
2 files changed, 12 insertions, 26 deletions
diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig
index 74779b92ff3..7e76ddbd582 100644
--- a/arch/powerpc/platforms/85xx/Kconfig
+++ b/arch/powerpc/platforms/85xx/Kconfig
@@ -1,7 +1,14 @@
-choice
- prompt "Machine Type"
+menuconfig MPC85xx
+ bool "Machine Type"
depends on PPC_85xx
- default MPC8540_ADS
+ select PPC_UDBG_16550
+ select PPC_INDIRECT_PCI if PCI
+ select MPIC
+ select FSL_PCI if PCI
+ select SERIAL_8250_SHARE_IRQ if SERIAL_8250
+ default y
+
+if MPC85xx
config MPC8540_ADS
bool "Freescale MPC8540 ADS"
@@ -96,24 +103,7 @@ config SBC8560
help
This option enables support for the Wind River SBC8560 board
-endchoice
+endif # MPC85xx
config TQM85xx
bool
- select MPC85xx
-
-config MPC8540
- bool
- select PPC_UDBG_16550
- select PPC_INDIRECT_PCI
- default y if MPC8540_ADS || MPC85xx_CDS || SBC8548
-
-config MPC85xx
- bool
- select PPC_UDBG_16550
- select PPC_INDIRECT_PCI if PCI
- select MPIC
- select FSL_PCI if PCI
- select SERIAL_8250_SHARE_IRQ if SERIAL_8250
- default y if MPC8540_ADS || MPC85xx_CDS || MPC8560_ADS \
- || MPC85xx_MDS || MPC85xx_DS || STX_GP3 || SBC8560 || SBC8548
diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype
index c3ee0b58d53..f6bf0257b78 100644
--- a/arch/powerpc/platforms/Kconfig.cputype
+++ b/arch/powerpc/platforms/Kconfig.cputype
@@ -29,8 +29,8 @@ config PPC_85xx
bool "Freescale 85xx"
select E500
select FSL_SOC
- select 85xx
select WANT_DEVICE_TREE
+ select MPC85xx
config PPC_8xx
bool "Freescale 8xx"
@@ -97,10 +97,6 @@ config 8xx
config 83xx
bool
-# this is temp to handle compat with arch=ppc
-config 85xx
- bool
-
config E500
bool