diff options
author | Kumar Gala <galak@kernel.crashing.org> | 2008-06-27 12:26:26 -0400 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2008-07-14 08:55:44 -0400 |
commit | d8267c1a36864fc30a2ce01f4349a8f2931ae741 (patch) | |
tree | b005d413df81fb8aba72569d13f9ffb46e4ed936 | |
parent | a64887eb0a376d412cfa07a52728fb3f56cf9d6c (diff) |
powerpc: Add 82xx/83xx/86xx to 6xx Multiplatform
There isn't any reason at this point that we can't build 82xx, 83xx & 86xx
support in with the other 6xx based boards. Twiddle the Kconfigs to allow
this.
This allows us to remove the machine type selection for related to 6xx.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
-rw-r--r-- | arch/powerpc/platforms/82xx/Kconfig | 11 | ||||
-rw-r--r-- | arch/powerpc/platforms/83xx/Kconfig | 10 | ||||
-rw-r--r-- | arch/powerpc/platforms/86xx/Kconfig | 16 | ||||
-rw-r--r-- | arch/powerpc/platforms/Kconfig | 33 |
4 files changed, 26 insertions, 44 deletions
diff --git a/arch/powerpc/platforms/82xx/Kconfig b/arch/powerpc/platforms/82xx/Kconfig index 917ac8891555..1c8034bfa796 100644 --- a/arch/powerpc/platforms/82xx/Kconfig +++ b/arch/powerpc/platforms/82xx/Kconfig | |||
@@ -1,7 +1,8 @@ | |||
1 | choice | 1 | menuconfig PPC_82xx |
2 | prompt "82xx Board Type" | 2 | bool "82xx-based boards (PQ II)" |
3 | depends on PPC_82xx | 3 | depends on 6xx && PPC_MULTIPLATFORM |
4 | default MPC8272_ADS | 4 | |
5 | if PPC_82xx | ||
5 | 6 | ||
6 | config MPC8272_ADS | 7 | config MPC8272_ADS |
7 | bool "Freescale MPC8272 ADS" | 8 | bool "Freescale MPC8272 ADS" |
@@ -36,7 +37,7 @@ config EP8248E | |||
36 | This board is also resold by Freescale as the QUICCStart | 37 | This board is also resold by Freescale as the QUICCStart |
37 | MPC8248 Evaluation System and/or the CWH-PPC-8248N-VE. | 38 | MPC8248 Evaluation System and/or the CWH-PPC-8248N-VE. |
38 | 39 | ||
39 | endchoice | 40 | endif |
40 | 41 | ||
41 | config PQ2ADS | 42 | config PQ2ADS |
42 | bool | 43 | bool |
diff --git a/arch/powerpc/platforms/83xx/Kconfig b/arch/powerpc/platforms/83xx/Kconfig index fe75b2ac3c9f..27d9bf86de01 100644 --- a/arch/powerpc/platforms/83xx/Kconfig +++ b/arch/powerpc/platforms/83xx/Kconfig | |||
@@ -1,10 +1,12 @@ | |||
1 | menuconfig MPC83xx | 1 | menuconfig PPC_83xx |
2 | bool "83xx Board Type" | 2 | bool "83xx-based boards" |
3 | depends on PPC_83xx | 3 | depends on 6xx && PPC_MULTIPLATFORM |
4 | select PPC_UDBG_16550 | 4 | select PPC_UDBG_16550 |
5 | select PPC_INDIRECT_PCI | 5 | select PPC_INDIRECT_PCI |
6 | select FSL_SOC | ||
7 | select IPIC | ||
6 | 8 | ||
7 | if MPC83xx | 9 | if PPC_83xx |
8 | 10 | ||
9 | config MPC831x_RDB | 11 | config MPC831x_RDB |
10 | bool "Freescale MPC831x RDB" | 12 | bool "Freescale MPC831x RDB" |
diff --git a/arch/powerpc/platforms/86xx/Kconfig b/arch/powerpc/platforms/86xx/Kconfig index 053f49a1dcae..80a81e02bb55 100644 --- a/arch/powerpc/platforms/86xx/Kconfig +++ b/arch/powerpc/platforms/86xx/Kconfig | |||
@@ -1,7 +1,13 @@ | |||
1 | choice | 1 | config PPC_86xx |
2 | prompt "86xx Board Type" | 2 | menuconfig PPC_86xx |
3 | depends on PPC_86xx | 3 | bool "86xx-based boards" |
4 | default MPC8641_HPCN | 4 | depends on 6xx && PPC_MULTIPLATFORM |
5 | select FSL_SOC | ||
6 | select ALTIVEC | ||
7 | help | ||
8 | The Freescale E600 SoCs have 74xx cores. | ||
9 | |||
10 | if PPC_86xx | ||
5 | 11 | ||
6 | config MPC8641_HPCN | 12 | config MPC8641_HPCN |
7 | bool "Freescale MPC8641 HPCN" | 13 | bool "Freescale MPC8641 HPCN" |
@@ -24,7 +30,7 @@ config MPC8610_HPCD | |||
24 | help | 30 | help |
25 | This option enables support for the MPC8610 HPCD board. | 31 | This option enables support for the MPC8610 HPCD board. |
26 | 32 | ||
27 | endchoice | 33 | endif |
28 | 34 | ||
29 | config MPC8641 | 35 | config MPC8641 |
30 | bool | 36 | bool |
diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig index 87454c526973..690c1f46e698 100644 --- a/arch/powerpc/platforms/Kconfig +++ b/arch/powerpc/platforms/Kconfig | |||
@@ -1,36 +1,9 @@ | |||
1 | menu "Platform support" | 1 | menu "Platform support" |
2 | 2 | ||
3 | choice | ||
4 | prompt "Machine type" | ||
5 | depends on PPC64 || 6xx | ||
6 | default PPC_MULTIPLATFORM | ||
7 | |||
8 | config PPC_MULTIPLATFORM | 3 | config PPC_MULTIPLATFORM |
9 | bool "Generic desktop/server/laptop" | 4 | bool |
10 | help | 5 | depends on PPC64 || 6xx |
11 | Select this option if configuring for an IBM pSeries or | 6 | default y |
12 | RS/6000 machine, an Apple machine, or a PReP, CHRP, | ||
13 | Maple or Cell-based machine. | ||
14 | |||
15 | config PPC_82xx | ||
16 | bool "Freescale 82xx" | ||
17 | depends on 6xx | ||
18 | |||
19 | config PPC_83xx | ||
20 | bool "Freescale 83xx" | ||
21 | depends on 6xx | ||
22 | select FSL_SOC | ||
23 | select MPC83xx | ||
24 | select IPIC | ||
25 | |||
26 | config PPC_86xx | ||
27 | bool "Freescale 86xx" | ||
28 | depends on 6xx | ||
29 | select FSL_SOC | ||
30 | select ALTIVEC | ||
31 | help | ||
32 | The Freescale E600 SoCs have 74xx cores. | ||
33 | endchoice | ||
34 | 7 | ||
35 | config CLASSIC32 | 8 | config CLASSIC32 |
36 | def_bool y | 9 | def_bool y |