diff options
author | Kumar Gala <galak@kernel.crashing.org> | 2008-01-28 11:24:30 -0500 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2008-01-28 14:13:12 -0500 |
commit | 3a83156bd857f31ed264816321b78466bed8e4f4 (patch) | |
tree | 9b863a0a0c2444a823cb24ae7c9797cc76c1b64b /arch/powerpc/platforms | |
parent | b9d3f259147d28f559cab3a7d0471cc4d411c511 (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/Kconfig | 32 | ||||
-rw-r--r-- | arch/powerpc/platforms/Kconfig.cputype | 6 |
2 files changed, 12 insertions, 26 deletions
diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig index 74779b92ff36..7e76ddbd5821 100644 --- a/arch/powerpc/platforms/85xx/Kconfig +++ b/arch/powerpc/platforms/85xx/Kconfig | |||
@@ -1,7 +1,14 @@ | |||
1 | choice | 1 | menuconfig MPC85xx |
2 | prompt "Machine Type" | 2 | bool "Machine Type" |
3 | depends on PPC_85xx | 3 | depends on PPC_85xx |
4 | default MPC8540_ADS | 4 | select PPC_UDBG_16550 |
5 | select PPC_INDIRECT_PCI if PCI | ||
6 | select MPIC | ||
7 | select FSL_PCI if PCI | ||
8 | select SERIAL_8250_SHARE_IRQ if SERIAL_8250 | ||
9 | default y | ||
10 | |||
11 | if MPC85xx | ||
5 | 12 | ||
6 | config MPC8540_ADS | 13 | config MPC8540_ADS |
7 | bool "Freescale MPC8540 ADS" | 14 | bool "Freescale MPC8540 ADS" |
@@ -96,24 +103,7 @@ config SBC8560 | |||
96 | help | 103 | help |
97 | This option enables support for the Wind River SBC8560 board | 104 | This option enables support for the Wind River SBC8560 board |
98 | 105 | ||
99 | endchoice | 106 | endif # MPC85xx |
100 | 107 | ||
101 | config TQM85xx | 108 | config TQM85xx |
102 | bool | 109 | bool |
103 | select MPC85xx | ||
104 | |||
105 | config MPC8540 | ||
106 | bool | ||
107 | select PPC_UDBG_16550 | ||
108 | select PPC_INDIRECT_PCI | ||
109 | default y if MPC8540_ADS || MPC85xx_CDS || SBC8548 | ||
110 | |||
111 | config MPC85xx | ||
112 | bool | ||
113 | select PPC_UDBG_16550 | ||
114 | select PPC_INDIRECT_PCI if PCI | ||
115 | select MPIC | ||
116 | select FSL_PCI if PCI | ||
117 | select SERIAL_8250_SHARE_IRQ if SERIAL_8250 | ||
118 | default y if MPC8540_ADS || MPC85xx_CDS || MPC8560_ADS \ | ||
119 | || MPC85xx_MDS || MPC85xx_DS || STX_GP3 || SBC8560 || SBC8548 | ||
diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype index c3ee0b58d539..f6bf0257b780 100644 --- a/arch/powerpc/platforms/Kconfig.cputype +++ b/arch/powerpc/platforms/Kconfig.cputype | |||
@@ -29,8 +29,8 @@ config PPC_85xx | |||
29 | bool "Freescale 85xx" | 29 | bool "Freescale 85xx" |
30 | select E500 | 30 | select E500 |
31 | select FSL_SOC | 31 | select FSL_SOC |
32 | select 85xx | ||
33 | select WANT_DEVICE_TREE | 32 | select WANT_DEVICE_TREE |
33 | select MPC85xx | ||
34 | 34 | ||
35 | config PPC_8xx | 35 | config PPC_8xx |
36 | bool "Freescale 8xx" | 36 | bool "Freescale 8xx" |
@@ -97,10 +97,6 @@ config 8xx | |||
97 | config 83xx | 97 | config 83xx |
98 | bool | 98 | bool |
99 | 99 | ||
100 | # this is temp to handle compat with arch=ppc | ||
101 | config 85xx | ||
102 | bool | ||
103 | |||
104 | config E500 | 100 | config E500 |
105 | bool | 101 | bool |
106 | 102 | ||