diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-12-05 14:39:53 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-12-05 14:39:53 +1100 |
| commit | b6d78157ad129b1bce87cc831d0d038e97ca5551 (patch) | |
| tree | 08125fb9c4f78eb103d4cc456204aba89e7ed9b5 /arch | |
| parent | 6fbb618f5da0424adcba5f666035e4772a8df526 (diff) | |
| download | blackbird-op-linux-b6d78157ad129b1bce87cc831d0d038e97ca5551.tar.gz blackbird-op-linux-b6d78157ad129b1bce87cc831d0d038e97ca5551.zip | |
ppc: Build in all three of powermac, PREP and CHRP support
This reverts commit da0825fd201a03294dbf7f8f030676d608da122c, making
it so that if you select CONFIG_PPC_MULTIPLATFORM you get support
for PMAC, PREP and CHRP built in.
The reason for not allowing PMAC, PREP and CHRP to be selected
individually for ARCH=ppc is that there is too much interdependency
between them in the platform support code. For example, CHRP uses
the PMAC nvram code.
Configuring with ARCH=powerpc does allow you to select support for
PMAC and CHRP separately. Support for PREP is not there yet but
should be there soon.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/ppc/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig index 8fa51b0a32d2..cc3f64c084c5 100644 --- a/arch/ppc/Kconfig +++ b/arch/ppc/Kconfig @@ -767,14 +767,14 @@ config CPM2 on it (826x, 827x, 8560). config PPC_CHRP - bool " Common Hardware Reference Platform (CHRP) based machines" + bool depends on PPC_MULTIPLATFORM select PPC_I8259 select PPC_INDIRECT_PCI default y config PPC_PMAC - bool " Apple PowerMac based machines" + bool depends on PPC_MULTIPLATFORM select PPC_INDIRECT_PCI default y @@ -785,7 +785,7 @@ config PPC_PMAC64 default y config PPC_PREP - bool " PowerPC Reference Platform (PReP) based machines" + bool depends on PPC_MULTIPLATFORM select PPC_I8259 select PPC_INDIRECT_PCI |
