[PPC] Remove 85xx from arch/ppc

85xx exists in arch/powerpc as well as cuImage support to boot from
a u-boot that doesn't support device trees.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

1 files changed, 9 insertions, 42 deletions

diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig
index 08e083d30dc6..db5934cdafb3 100644
--- a/arch/ppc/Kconfig
+++ b/arch/ppc/Kconfig
@@ -104,12 +104,6 @@ config 8xx
         bool "8xx"
         select PPC_LIB_RHEAP
 
-config E200
-        bool "e200"
-
-config E500
-        bool "e500"
-
 endchoice
 
 config PPC_FPU
@@ -124,25 +118,14 @@ config PPC_DCR
         depends on PPC_DCR_NATIVE
         default y
 
-config BOOKE
-        bool
-        depends on E200 || E500
-        default y
-
-config FSL_BOOKE
-        bool
-        depends on E200 || E500
-        default y
-
 config PTE_64BIT
         bool
-        depends on 44x || E500
+        depends on 44x
         default y if 44x
-        default y if E500 && PHYS_64BIT
 
 config PHYS_64BIT
-        bool 'Large physical address support' if E500
-        depends on 44x || E500
+        bool
+        depends on 44x
         default y if 44x
         ---help---
           This option enables kernel support for larger than 32-bit physical
@@ -167,21 +150,6 @@ config ALTIVEC
 
           If in doubt, say Y here.
 
-config SPE
-        bool "SPE Support"
-        depends on E200 || E500
-        ---help---
-          This option enables kernel support for the Signal Processing
-          Extensions (SPE) to the PowerPC processor. The kernel currently
-          supports saving and restoring SPE registers, and turning on the
-          'spe enable' bit so user processes can execute SPE instructions.
-
-          This option is only useful if you have a processor that supports
-          SPE (e500, otherwise known as 85xx series), but does not have any
-          effect on a non-spe cpu (it does, however add code to the kernel).
-
-          If in doubt, say Y here.
-
 config TAU
         bool "Thermal Management Support"
         depends on 6xx && !8260
@@ -228,7 +196,7 @@ config TAU_AVERAGE
 
 config MATH_EMULATION
         bool "Math emulation"
-        depends on 4xx || 8xx || E200 || E500
+        depends on 4xx || 8xx
         ---help---
           Some PowerPC chips designed for embedded applications do not have
           a floating-point unit and therefore do not implement the
@@ -279,7 +247,6 @@ config PPC601_SYNC_FIX
           If in doubt, say Y here.
 
 source arch/ppc/platforms/4xx/Kconfig
-source arch/ppc/platforms/85xx/Kconfig
 
 config PPC_STD_MMU
         bool
@@ -288,7 +255,7 @@ config PPC_STD_MMU
 
 config NOT_COHERENT_CACHE
         bool
-        depends on 4xx || 8xx || E200
+        depends on 4xx || 8xx
         default y
 
 endmenu
@@ -1045,13 +1012,13 @@ config GENERIC_ISA_DMA
 
 config PPC_I8259
         bool
-        default y if 85xx || PPC_PREP
+        default y if PPC_PREP
         default n
 
 config PPC_INDIRECT_PCI
         bool
         depends on PCI
-        default y if 40x || 44x || 85xx || PPC_PREP
+        default y if 40x || 44x || PPC_PREP
         default n
 
 config EISA
@@ -1068,8 +1035,8 @@ config MCA
         bool
 
 config PCI
-        bool "PCI support" if 40x || CPM2 || 85xx || PPC_MPC52xx
-        default y if !40x && !CPM2 && !8xx && !85xx
+        bool "PCI support" if 40x || CPM2 || PPC_MPC52xx
+        default y if !40x && !CPM2 && !8xx
         default PCI_QSPAN if !4xx && !CPM2 && 8xx
         help
           Find out whether your system includes a PCI bus. PCI is the name of