Skip to content

Commit

Permalink
powerpc: remove CONFIG_PPC_ISERIES from the architecture Kconfig files
Browse files Browse the repository at this point in the history
After this, we can remove the legacy iSeries code more easily.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
  • Loading branch information
Stephen Rothwell authored and Benjamin Herrenschmidt committed Feb 27, 2012
1 parent fe83364 commit 3d066d7
Show file tree
Hide file tree
Showing 6 changed files with 3 additions and 285 deletions.
2 changes: 1 addition & 1 deletion arch/powerpc/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -614,7 +614,7 @@ endmenu

config ISA_DMA_API
bool
default !PPC_ISERIES || PCI
default PCI

menu "Bus options"

Expand Down
7 changes: 0 additions & 7 deletions arch/powerpc/Kconfig.debug
Original file line number Diff line number Diff line change
Expand Up @@ -196,13 +196,6 @@ config PPC_EARLY_DEBUG_MAPLE
help
Select this to enable early debugging for Maple.

config PPC_EARLY_DEBUG_ISERIES
bool "iSeries HV Console"
depends on PPC_ISERIES
help
Select this to enable early debugging for legacy iSeries. You need
to hit "Ctrl-x Ctrl-x" to see the messages on the console.

config PPC_EARLY_DEBUG_PAS_REALMODE
bool "PA Semi real mode"
depends on PPC_PASEMI
Expand Down
236 changes: 0 additions & 236 deletions arch/powerpc/configs/iseries_defconfig

This file was deleted.

3 changes: 1 addition & 2 deletions arch/powerpc/platforms/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ menu "Platform support"

source "arch/powerpc/platforms/powernv/Kconfig"
source "arch/powerpc/platforms/pseries/Kconfig"
source "arch/powerpc/platforms/iseries/Kconfig"
source "arch/powerpc/platforms/chrp/Kconfig"
source "arch/powerpc/platforms/512x/Kconfig"
source "arch/powerpc/platforms/52xx/Kconfig"
Expand Down Expand Up @@ -138,7 +137,7 @@ config MPIC_BROKEN_REGREAD
of the register contents in software.

config IBMVIO
depends on PPC_PSERIES || PPC_ISERIES
depends on PPC_PSERIES
bool
default y

Expand Down
38 changes: 0 additions & 38 deletions arch/powerpc/platforms/iseries/Kconfig

This file was deleted.

2 changes: 1 addition & 1 deletion arch/powerpc/platforms/pseries/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ config IO_EVENT_IRQ

config LPARCFG
bool "LPAR Configuration Data"
depends on PPC_PSERIES || PPC_ISERIES
depends on PPC_PSERIES
help
Provide system capacity information via human readable
<key word>=<value> pairs through a /proc/ppc64/lparcfg interface.
Expand Down

0 comments on commit 3d066d7

Please sign in to comment.