powerpc/pseries: Don't panic when H_PROD fails during cpu-online.

[safe/jmp/linux-2.6] / arch / powerpc / platforms / Kconfig

diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index 200b9cb..d1663db 100644 (file)
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
@@ -1,14 +1,5 @@
 menu "Platform support"
 
-config PPC_MULTIPLATFORM
-       bool
-       depends on PPC64 || 6xx
-       default y
-
-config CLASSIC32
-       def_bool y
-       depends on 6xx && PPC_MULTIPLATFORM
-
 source "arch/powerpc/platforms/pseries/Kconfig"
 source "arch/powerpc/platforms/iseries/Kconfig"
 source "arch/powerpc/platforms/chrp/Kconfig"
@@ -28,15 +19,28 @@ source "arch/powerpc/platforms/86xx/Kconfig"
 source "arch/powerpc/platforms/embedded6xx/Kconfig"
 source "arch/powerpc/platforms/44x/Kconfig"
 source "arch/powerpc/platforms/40x/Kconfig"
+source "arch/powerpc/platforms/amigaone/Kconfig"
 
 config PPC_NATIVE
        bool
-       depends on PPC_MULTIPLATFORM
+       depends on 6xx || PPC64
        help
          Support for running natively on the hardware, i.e. without
          a hypervisor. This option is not user-selectable but should
          be selected by all platforms that need it.
 
+config PPC_OF_BOOT_TRAMPOLINE
+       bool "Support booting from Open Firmware or yaboot"
+       depends on 6xx || PPC64
+       default y
+       help
+         Support from booting from Open Firmware or yaboot using an
+         Open Firmware client interface. This enables the kernel to
+         communicate with open firmware to retrieve system informations
+         such as the device tree.
+
+         In case of doubt, say Y
+
 config UDBG_RTAS_CONSOLE
        bool "RTAS based debug console"
        depends on PPC_RTAS
@@ -70,7 +74,7 @@ config PPC_I8259
 
 config U3_DART
        bool
-       depends on PPC_MULTIPLATFORM && PPC64
+       depends on PPC64
        default n
 
 config PPC_RTAS
@@ -82,6 +86,11 @@ config RTAS_ERROR_LOGGING
        depends on PPC_RTAS
        default n
 
+config PPC_RTAS_DAEMON
+       bool
+       depends on PPC_RTAS
+       default n
+
 config RTAS_PROC
        bool "Proc interface to RTAS"
        depends on PPC_RTAS
@@ -91,15 +100,6 @@ config RTAS_FLASH
        tristate "Firmware flash interface"
        depends on PPC64 && RTAS_PROC
 
-config PPC_PMI
-       tristate "Support for PMI"
-       depends on PPC_IBM_CELL_BLADE
-       help
-         PMI (Platform Management Interrupt) is a way to
-         communicate with the BMC (Baseboard Management Controller).
-         It is used in some IBM Cell blades.
-       default m
-
 config MMIO_NVRAM
        bool
        default n
@@ -196,7 +196,7 @@ config PPC601_SYNC_FIX
 
 config TAU
        bool "On-chip CPU temperature sensor support"
-       depends on CLASSIC32
+       depends on 6xx
        help
          G3 and G4 processors have an on-chip temperature sensor called the
          'Thermal Assist Unit (TAU)', which, in theory, can measure the on-die
@@ -260,7 +260,7 @@ config QE_GPIO
 
 config CPM2
        bool "Enable support for the CPM2 (Communications Processor Module)"
-       depends on MPC85xx || 8260
+       depends on (FSL_SOC_BOOKE && PPC32) || 8260
        select CPM
        select PPC_LIB_RHEAP
        select PPC_PCI_CHOICE
@@ -274,7 +274,7 @@ config CPM2
 
 config AXON_RAM
        tristate "Axon DDR2 memory device driver"
-       depends on PPC_IBM_CELL_BLADE
+       depends on PPC_IBM_CELL_BLADE && BLOCK
        default m
        help
          It registers one block device per Axon's DDR2 memory bank found
@@ -298,14 +298,14 @@ config CPM
 config OF_RTC
        bool
        help
-         Uses information from the OF or flattened device tree to instatiate
+         Uses information from the OF or flattened device tree to instantiate
          platform devices for direct mapped RTC chips like the DS1742 or DS1743.
 
 source "arch/powerpc/sysdev/bestcomm/Kconfig"
 
 config MPC8xxx_GPIO
        bool "MPC8xxx GPIO support"
-       depends on PPC_MPC831x || PPC_MPC834x || PPC_MPC837x || PPC_85xx || PPC_86xx
+       depends on PPC_MPC831x || PPC_MPC834x || PPC_MPC837x || FSL_SOC_BOOKE || PPC_86xx
        select GENERIC_GPIO
        select ARCH_REQUIRE_GPIOLIB
        help
@@ -334,4 +334,8 @@ config MCU_MPC8349EMITX
          also register MCU GPIOs with the generic GPIO API, so you'll able
          to use MCU pins as GPIOs.
 
+config XILINX_PCI
+       bool "Xilinx PCI host bridge support"
+       depends on PCI && XILINX_VIRTEX
+
 endmenu