[PPC] Remove 83xx from arch/ppc

[linux-2.6] / arch / ppc / Kconfig

diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig
index 20dce4681259a0c6daf8f1ccf3af5826b33ca5d8..08e083d30dc68c6d142bb1638963b438d4805ffb 100644 (file)
--- a/arch/ppc/Kconfig
+++ b/arch/ppc/Kconfig
@@ -78,18 +78,18 @@ choice
        default 6xx
 
 config 6xx
-       bool "6xx/7xx/74xx/52xx/82xx/83xx"
+       bool "6xx/7xx/74xx/52xx/82xx"
        select PPC_FPU
        help
          There are four types of PowerPC chips supported.  The more common
          types (601, 603, 604, 740, 750, 7400), the older Freescale
          (formerly Motorola) embedded versions (821, 823, 850, 855, 860,
-         52xx, 82xx, 83xx), the IBM embedded versions (403 and 405) and
+         52xx, 82xx), the IBM embedded versions (403 and 405) and
          the Book E embedded processors from IBM (44x) and Freescale (85xx).
          For support for 64-bit processors, set ARCH=powerpc.
          Unless you are building a kernel for one of the embedded processor
          systems, choose 6xx.
-         Also note that because the 52xx, 82xx, & 83xx family have a 603e
+         Also note that because the 52xx, 82xx family have a 603e
          core, specific support for that chipset is asked later on.
 
 config 40x
@@ -102,6 +102,7 @@ config 44x
 
 config 8xx
        bool "8xx"
+       select PPC_LIB_RHEAP
 
 config E200
        bool "e200"
@@ -152,7 +153,7 @@ config PHYS_64BIT
 config ALTIVEC
        bool "AltiVec Support"
        depends on 6xx
-       depends on !8260 && !83xx
+       depends on !8260
        ---help---
          This option enables kernel support for the Altivec extensions to the
          PowerPC processor. The kernel currently supports saving and restoring
@@ -183,7 +184,7 @@ config SPE
 
 config TAU
        bool "Thermal Management Support"
-       depends on 6xx && !8260 && !83xx
+       depends on 6xx && !8260
        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
@@ -720,16 +721,6 @@ config LITE5200B
          Support for the LITE5200B dev board for the MPC5200 from Freescale.
          This is the new board with 2 PCI slots.
 
-config MPC834x_SYS
-       bool "Freescale MPC834x SYS"
-       help
-         This option enables support for the MPC 834x SYS evaluation board.
-
-         Be aware that PCI buses can only function when SYS board is plugged
-         into the PIB (Platform IO Board) board from Freescale which provide
-         3 PCI slots.  The PIBs PCI initialization is the bootloader's
-         responsibility.
-
 config EV64360
        bool "Marvell-EV64360BP"
        help
@@ -773,18 +764,6 @@ config 8272
          The MPC8272 CPM has a different internal dpram setup than other CPM2
          devices
 
-config 83xx
-       bool
-       default y if MPC834x_SYS
-
-config MPC834x
-       bool
-       default y if MPC834x_SYS
-
-config PPC_83xx
-       bool
-       default y if 83xx
-
 config CPM1
        bool
        depends on 8xx
@@ -798,6 +777,7 @@ config CPM1
 config CPM2
        bool
        depends on 8260 || MPC8560 || MPC8555
+       select PPC_LIB_RHEAP
        default y
        help
          The CPM2 (Communications Processor Module) is a coprocessor on
@@ -809,8 +789,7 @@ config PPC_GEN550
        bool
        depends on SANDPOINT || SPRUCE || PPLUS || \
                PRPMC750 || PRPMC800 || LOPEC || \
-               (EV64260 && !SERIAL_MPSC) || CHESTNUT || RADSTONE_PPC7D || \
-               83xx
+               (EV64260 && !SERIAL_MPSC) || CHESTNUT || RADSTONE_PPC7D
        default y
 
 config FORCE
@@ -1072,7 +1051,7 @@ config PPC_I8259
 config PPC_INDIRECT_PCI
        bool
        depends on PCI
-       default y if 40x || 44x || 85xx || 83xx || PPC_PREP
+       default y if 40x || 44x || 85xx || PPC_PREP
        default n
 
 config EISA
@@ -1089,8 +1068,8 @@ config MCA
        bool
 
 config PCI
-       bool "PCI support" if 40x || CPM2 || 83xx || 85xx || PPC_MPC52xx
-       default y if !40x && !CPM2 && !8xx && !83xx && !85xx
+       bool "PCI support" if 40x || CPM2 || 85xx || PPC_MPC52xx
+       default y if !40x && !CPM2 && !8xx && !85xx
        default PCI_QSPAN if !4xx && !CPM2 && 8xx
        help
          Find out whether your system includes a PCI bus. PCI is the name of
@@ -1104,11 +1083,6 @@ config PCI_DOMAINS
 config PCI_SYSCALL
        def_bool PCI
 
-config MPC83xx_PCI2
-       bool "Support for 2nd PCI host controller"
-       depends on PCI && MPC834x
-       default y if MPC834x_SYS
-
 config PCI_QSPAN
        bool "QSpan PCI"
        depends on !4xx && !CPM2 && 8xx
@@ -1277,6 +1251,10 @@ config BOOT_LOAD
 config PIN_TLB
        bool "Pinned Kernel TLBs (860 ONLY)"
        depends on ADVANCED_OPTIONS && 8xx
+
+config PPC_LIB_RHEAP
+       bool
+
 endmenu
 
 source "net/Kconfig"
@@ -1311,7 +1289,7 @@ endmenu
 
 source "lib/Kconfig"
 
-source "arch/powerpc/oprofile/Kconfig"
+source "kernel/Kconfig.instrumentation"
 
 source "arch/ppc/Kconfig.debug"