Skip to content

Commit

Permalink
ppc: Build in all three of powermac, PREP and CHRP support
Browse files Browse the repository at this point in the history
This reverts commit da0825f, 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>
  • Loading branch information
Paul Mackerras committed Dec 5, 2005
1 parent 6fbb618 commit b6d7815
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions arch/ppc/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit b6d7815

Please sign in to comment.