aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ppc/Kconfig
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2008-01-25 16:41:00 -0500
committerKumar Gala <galak@kernel.crashing.org>2008-01-28 09:33:09 -0500
commit3155f7f23f7865e64f7eb14e226a2dff8197e51f (patch)
tree1ab72855399616a248c967a15b6a2801a751f2d5 /arch/ppc/Kconfig
parent80f4ec7f5b81e7e238acfaf50ac82489b5fcee6f (diff)
[PPC] Remove 83xx from arch/ppc
83xx 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>
Diffstat (limited to 'arch/ppc/Kconfig')
-rw-r--r--arch/ppc/Kconfig46
1 files changed, 9 insertions, 37 deletions
diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig
index 6473fa7cb4b9..08e083d30dc6 100644
--- a/arch/ppc/Kconfig
+++ b/arch/ppc/Kconfig
@@ -78,18 +78,18 @@ choice
78 default 6xx 78 default 6xx
79 79
80config 6xx 80config 6xx
81 bool "6xx/7xx/74xx/52xx/82xx/83xx" 81 bool "6xx/7xx/74xx/52xx/82xx"
82 select PPC_FPU 82 select PPC_FPU
83 help 83 help
84 There are four types of PowerPC chips supported. The more common 84 There are four types of PowerPC chips supported. The more common
85 types (601, 603, 604, 740, 750, 7400), the older Freescale 85 types (601, 603, 604, 740, 750, 7400), the older Freescale
86 (formerly Motorola) embedded versions (821, 823, 850, 855, 860, 86 (formerly Motorola) embedded versions (821, 823, 850, 855, 860,
87 52xx, 82xx, 83xx), the IBM embedded versions (403 and 405) and 87 52xx, 82xx), the IBM embedded versions (403 and 405) and
88 the Book E embedded processors from IBM (44x) and Freescale (85xx). 88 the Book E embedded processors from IBM (44x) and Freescale (85xx).
89 For support for 64-bit processors, set ARCH=powerpc. 89 For support for 64-bit processors, set ARCH=powerpc.
90 Unless you are building a kernel for one of the embedded processor 90 Unless you are building a kernel for one of the embedded processor
91 systems, choose 6xx. 91 systems, choose 6xx.
92 Also note that because the 52xx, 82xx, & 83xx family have a 603e 92 Also note that because the 52xx, 82xx family have a 603e
93 core, specific support for that chipset is asked later on. 93 core, specific support for that chipset is asked later on.
94 94
95config 40x 95config 40x
@@ -153,7 +153,7 @@ config PHYS_64BIT
153config ALTIVEC 153config ALTIVEC
154 bool "AltiVec Support" 154 bool "AltiVec Support"
155 depends on 6xx 155 depends on 6xx
156 depends on !8260 && !83xx 156 depends on !8260
157 ---help--- 157 ---help---
158 This option enables kernel support for the Altivec extensions to the 158 This option enables kernel support for the Altivec extensions to the
159 PowerPC processor. The kernel currently supports saving and restoring 159 PowerPC processor. The kernel currently supports saving and restoring
@@ -184,7 +184,7 @@ config SPE
184 184
185config TAU 185config TAU
186 bool "Thermal Management Support" 186 bool "Thermal Management Support"
187 depends on 6xx && !8260 && !83xx 187 depends on 6xx && !8260
188 help 188 help
189 G3 and G4 processors have an on-chip temperature sensor called the 189 G3 and G4 processors have an on-chip temperature sensor called the
190 'Thermal Assist Unit (TAU)', which, in theory, can measure the on-die 190 'Thermal Assist Unit (TAU)', which, in theory, can measure the on-die
@@ -721,16 +721,6 @@ config LITE5200B
721 Support for the LITE5200B dev board for the MPC5200 from Freescale. 721 Support for the LITE5200B dev board for the MPC5200 from Freescale.
722 This is the new board with 2 PCI slots. 722 This is the new board with 2 PCI slots.
723 723
724config MPC834x_SYS
725 bool "Freescale MPC834x SYS"
726 help
727 This option enables support for the MPC 834x SYS evaluation board.
728
729 Be aware that PCI buses can only function when SYS board is plugged
730 into the PIB (Platform IO Board) board from Freescale which provide
731 3 PCI slots. The PIBs PCI initialization is the bootloader's
732 responsibility.
733
734config EV64360 724config EV64360
735 bool "Marvell-EV64360BP" 725 bool "Marvell-EV64360BP"
736 help 726 help
@@ -774,18 +764,6 @@ config 8272
774 The MPC8272 CPM has a different internal dpram setup than other CPM2 764 The MPC8272 CPM has a different internal dpram setup than other CPM2
775 devices 765 devices
776 766
777config 83xx
778 bool
779 default y if MPC834x_SYS
780
781config MPC834x
782 bool
783 default y if MPC834x_SYS
784
785config PPC_83xx
786 bool
787 default y if 83xx
788
789config CPM1 767config CPM1
790 bool 768 bool
791 depends on 8xx 769 depends on 8xx
@@ -811,8 +789,7 @@ config PPC_GEN550
811 bool 789 bool
812 depends on SANDPOINT || SPRUCE || PPLUS || \ 790 depends on SANDPOINT || SPRUCE || PPLUS || \
813 PRPMC750 || PRPMC800 || LOPEC || \ 791 PRPMC750 || PRPMC800 || LOPEC || \
814 (EV64260 && !SERIAL_MPSC) || CHESTNUT || RADSTONE_PPC7D || \ 792 (EV64260 && !SERIAL_MPSC) || CHESTNUT || RADSTONE_PPC7D
815 83xx
816 default y 793 default y
817 794
818config FORCE 795config FORCE
@@ -1074,7 +1051,7 @@ config PPC_I8259
1074config PPC_INDIRECT_PCI 1051config PPC_INDIRECT_PCI
1075 bool 1052 bool
1076 depends on PCI 1053 depends on PCI
1077 default y if 40x || 44x || 85xx || 83xx || PPC_PREP 1054 default y if 40x || 44x || 85xx || PPC_PREP
1078 default n 1055 default n
1079 1056
1080config EISA 1057config EISA
@@ -1091,8 +1068,8 @@ config MCA
1091 bool 1068 bool
1092 1069
1093config PCI 1070config PCI
1094 bool "PCI support" if 40x || CPM2 || 83xx || 85xx || PPC_MPC52xx 1071 bool "PCI support" if 40x || CPM2 || 85xx || PPC_MPC52xx
1095 default y if !40x && !CPM2 && !8xx && !83xx && !85xx 1072 default y if !40x && !CPM2 && !8xx && !85xx
1096 default PCI_QSPAN if !4xx && !CPM2 && 8xx 1073 default PCI_QSPAN if !4xx && !CPM2 && 8xx
1097 help 1074 help
1098 Find out whether your system includes a PCI bus. PCI is the name of 1075 Find out whether your system includes a PCI bus. PCI is the name of
@@ -1106,11 +1083,6 @@ config PCI_DOMAINS
1106config PCI_SYSCALL 1083config PCI_SYSCALL
1107 def_bool PCI 1084 def_bool PCI
1108 1085
1109config MPC83xx_PCI2
1110 bool "Support for 2nd PCI host controller"
1111 depends on PCI && MPC834x
1112 default y if MPC834x_SYS
1113
1114config PCI_QSPAN 1086config PCI_QSPAN
1115 bool "QSpan PCI" 1087 bool "QSpan PCI"
1116 depends on !4xx && !CPM2 && 8xx 1088 depends on !4xx && !CPM2 && 8xx