提交 5b7c3c91 编写于 作者: B Benjamin Herrenschmidt

powerpc: Introduce CONFIG_PPC_BOOK3S

This patch introduce a new Kconfig option, CONFIG_PPC_BOOK3S
that represents processors that are compliant with the "classic"
(aka "server") variant of the PowerPC architecture.

It replaces CONFIG_6xx on 32-bit (though the symbol is still
defined for compatibility) and encompass all currently supported
64-bit processors.
Signed-off-by: NBenjamin Herrenschmidt <benh@kernel.crashing.org>
上级 e821ea70
...@@ -9,7 +9,6 @@ menu "Processor support" ...@@ -9,7 +9,6 @@ menu "Processor support"
choice choice
prompt "Processor Type" prompt "Processor Type"
depends on PPC32 depends on PPC32
default 6xx
help help
There are five families of 32 bit PowerPC chips supported. There are five families of 32 bit PowerPC chips supported.
The most common ones are the desktop and server CPUs (601, 603, The most common ones are the desktop and server CPUs (601, 603,
...@@ -21,7 +20,7 @@ choice ...@@ -21,7 +20,7 @@ choice
If unsure, select 52xx/6xx/7xx/74xx/82xx/83xx/86xx. If unsure, select 52xx/6xx/7xx/74xx/82xx/83xx/86xx.
config 6xx config PPC_BOOK3S
bool "512x/52xx/6xx/7xx/74xx/82xx/83xx/86xx" bool "512x/52xx/6xx/7xx/74xx/82xx/83xx/86xx"
select PPC_FPU select PPC_FPU
...@@ -57,13 +56,11 @@ config E200 ...@@ -57,13 +56,11 @@ config E200
endchoice endchoice
# Until we have a choice of exclusive CPU types on 64-bit, we always
# use PPC_BOOK3S. On 32-bit, this is equivalent to 6xx which is
# "classic" MMU
config PPC_BOOK3S config PPC_BOOK3S
def_bool y default y
depends on PPC64 || 6xx depends on PPC64
select PPC_FPU
config POWER4_ONLY config POWER4_ONLY
bool "Optimize for POWER4" bool "Optimize for POWER4"
...@@ -74,6 +71,10 @@ config POWER4_ONLY ...@@ -74,6 +71,10 @@ config POWER4_ONLY
The resulting binary will not work on POWER3 or RS64 processors The resulting binary will not work on POWER3 or RS64 processors
when compiled with binutils 2.15 or later. when compiled with binutils 2.15 or later.
config 6xx
def_bool y
depends on PPC32 && PPC_BOOK3S
config POWER3 config POWER3
bool bool
depends on PPC64 && PPC_BOOK3S depends on PPC64 && PPC_BOOK3S
...@@ -202,9 +203,8 @@ config SPE ...@@ -202,9 +203,8 @@ config SPE
If in doubt, say Y here. If in doubt, say Y here.
config PPC_STD_MMU config PPC_STD_MMU
bool def_bool y
depends on 6xx || PPC64 depends on PPC_BOOK3S
default y
config PPC_STD_MMU_32 config PPC_STD_MMU_32
def_bool y def_bool y
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册