OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[POWERPC] move 82xx/83xx/86xx Kconfig options to platform selection 

The cores used in the MPC82xx/83xx/86xx embedded controllers are very similar
to those in the 32 bit general-purpose processors, so it makes sense to
treat them as the same CPU family.

Choosing between the embedded platforms and the multiplatform code is
now done in the platform menu, but functionally everything stays the
same.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2007-06-18 01:06:52 +02:00 committed by Kumar Gala
parent eff2ebd207
commit b9fd305db0
5 changed files with 37 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/powerpc/platforms/82xx/Kconfig
View File

@ -1,5 +1,5 @@
choice
prompt "Machine Type"
prompt "82xx Board Type"
depends on PPC_82xx
default MPC82xx_ADS

2
arch/powerpc/platforms/83xx/Kconfig
View File

@ -1,5 +1,5 @@
choice
prompt "Machine Type"
prompt "83xx Board Type"
depends on PPC_83xx
default MPC834x_MDS

2
arch/powerpc/platforms/86xx/Kconfig
View File

@ -1,5 +1,5 @@
choice
prompt "Machine Type"
prompt "86xx Board Type"
depends on PPC_86xx
default MPC8641_HPCN

25
arch/powerpc/platforms/Kconfig
View File

@ -2,7 +2,7 @@ menu "Platform support"
choice
prompt "Machine type"
depends on PPC64 || CLASSIC32
depends on PPC64 || 6xx
default PPC_MULTIPLATFORM
config PPC_MULTIPLATFORM
@ -16,8 +16,31 @@ config EMBEDDED6xx
bool "Embedded 6xx/7xx/7xxx-based board"
depends on PPC32 && (BROKEN||BROKEN_ON_SMP)
config PPC_82xx
bool "Freescale 82xx"
depends on 6xx
config PPC_83xx
bool "Freescale 83xx"
depends on 6xx
select FSL_SOC
select 83xx
select WANT_DEVICE_TREE
config PPC_86xx
bool "Freescale 86xx"
depends on 6xx
select FSL_SOC
select FSL_PCIE
select ALTIVEC
help
The Freescale E600 SoCs have 74xx cores.
endchoice
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"

51
arch/powerpc/platforms/Kconfig.cputype
View File

@ -10,42 +10,21 @@ choice
prompt "Processor Type"
depends on PPC32
default 6xx
config CLASSIC32
bool "52xx/6xx/7xx/74xx"
select PPC_FPU
select 6xx
help
There are four families of PowerPC chips supported. The more common
types (601, 603, 604, 740, 750, 7400), the Motorola embedded
versions (821, 823, 850, 855, 860, 52xx, 82xx, 83xx), the AMCC
embedded versions (403 and 405) and the high end 64 bit Power
processors (POWER 3, POWER4, and IBM PPC970 also known as G5).
There are five families of 32 bit PowerPC chips supported.
The most common ones are the desktop and server CPUs (601, 603,
604, 740, 750, 74xx) CPUs from Freescale and IBM, with their
embedded 52xx/82xx/83xx/86xx counterparts.
The other embeeded parts, namely 4xx, 8xx, e200 (55xx) and e500
(85xx) each form a family of their own that is not compatible
with the others.
This option is the catch-all for 6xx types, including some of the
embedded versions. Unless there is see an option for the specific
chip family you are using, you want this option.
If unsure, select 52xx/6xx/7xx/74xx/82xx/83xx/86xx.
You do not want this if you are building a kernel for a 64 bit
IBM RS/6000 or an Apple G5, choose 6xx.
If unsure, select this option
Note that the kernel runs in 32-bit mode even on 64-bit chips.
config PPC_82xx
bool "Freescale 82xx"
select 6xx
config 6xx
bool "52xx/6xx/7xx/74xx/82xx/83xx/86xx"
select PPC_FPU
config PPC_83xx
bool "Freescale 83xx"
select 6xx
select FSL_SOC
select 83xx
select PPC_FPU
select WANT_DEVICE_TREE
config PPC_85xx
bool "Freescale 85xx"
select E500
@ -53,16 +32,6 @@ config PPC_85xx
select 85xx
select WANT_DEVICE_TREE
config PPC_86xx
bool "Freescale 86xx"
select 6xx
select FSL_SOC
select FSL_PCIE
select PPC_FPU
select ALTIVEC
help
The Freescale E600 SoCs have 74xx cores.
config PPC_8xx
bool "Freescale 8xx"
select FSL_SOC