aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2009-06-14 14:45:50 +0000
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2009-06-16 14:15:46 +1000
commit48c931125bf228a529b8d05218e9fdda899dfa93 (patch)
treedb8d4f1c1ee9414e2b38d8dbb073278c6675dcf9
parentc4b512bc832c6c6aab14acb2bd96940e867e5018 (diff)
powerpc: Fix invalid construct in our CPU selection Kconfig
commit 5b7c3c918c9c26c50d220b2b50359208cb5a1dbe introduced an invalid construct in our CPU selection. This caused warnings, though it still appeared to do the right thing. This fixes it properly by having separate formal definitions of PPC_BOOK3S_32 and PPC_BOOK3S_64 and one statement defining PPC_BOOK3S based on the two above. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
-rw-r--r--arch/powerpc/platforms/Kconfig.cputype9
1 files changed, 6 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype
index cca6b4fc719..c4192542b80 100644
--- a/arch/powerpc/platforms/Kconfig.cputype
+++ b/arch/powerpc/platforms/Kconfig.cputype
@@ -21,7 +21,7 @@ choice
If unsure, select 52xx/6xx/7xx/74xx/82xx/83xx/86xx.
-config PPC_BOOK3S
+config PPC_BOOK3S_32
bool "512x/52xx/6xx/7xx/74xx/82xx/83xx/86xx"
select PPC_FPU
@@ -57,11 +57,14 @@ config E200
endchoice
-config PPC_BOOK3S
- default y
+config PPC_BOOK3S_64
+ def_bool y
depends on PPC64
select PPC_FPU
+config PPC_BOOK3S
+ def_bool y
+ depends on PPC_BOOK3S_32 || PPC_BOOK3S_64
config POWER4_ONLY
bool "Optimize for POWER4"