diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2006-09-24 23:49:58 -0400 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2006-10-03 02:49:31 -0400 |
commit | a542dbd3172922f178d25b463751da81d7b1e560 (patch) | |
tree | c3b011d7b8a84685a10dffbbfd682406ab0fa9d1 | |
parent | 5e203d686277d87f0a6c9521a3a099ca10ee808d (diff) |
[POWERPC] Allow combined iSeries and MULTIPLATFORM build
This will build with ISERIES, PSERIES and PMAC64 selected, but will only
boot on iSeries so far.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
-rw-r--r-- | arch/powerpc/Kconfig | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index de1ef2fa1a20..0969fe89df83 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
@@ -338,10 +338,6 @@ config PPC_MULTIPLATFORM | |||
338 | RS/6000 machine, an Apple machine, or a PReP, CHRP, | 338 | RS/6000 machine, an Apple machine, or a PReP, CHRP, |
339 | Maple or Cell-based machine. | 339 | Maple or Cell-based machine. |
340 | 340 | ||
341 | config PPC_ISERIES | ||
342 | bool "IBM Legacy iSeries" | ||
343 | depends on PPC64 | ||
344 | |||
345 | config EMBEDDED6xx | 341 | config EMBEDDED6xx |
346 | bool "Embedded 6xx/7xx/7xxx-based board" | 342 | bool "Embedded 6xx/7xx/7xxx-based board" |
347 | depends on PPC32 && (BROKEN||BROKEN_ON_SMP) | 343 | depends on PPC32 && (BROKEN||BROKEN_ON_SMP) |
@@ -365,6 +361,10 @@ config PPC_PSERIES | |||
365 | select PPC_UDBG_16550 | 361 | select PPC_UDBG_16550 |
366 | default y | 362 | default y |
367 | 363 | ||
364 | config PPC_ISERIES | ||
365 | bool "IBM Legacy iSeries" | ||
366 | depends on PPC_MULTIPLATFORM && PPC64 | ||
367 | |||
368 | config PPC_CHRP | 368 | config PPC_CHRP |
369 | bool "Common Hardware Reference Platform (CHRP) based machines" | 369 | bool "Common Hardware Reference Platform (CHRP) based machines" |
370 | depends on PPC_MULTIPLATFORM && PPC32 | 370 | depends on PPC_MULTIPLATFORM && PPC32 |