From 7ce2dc4c23dad6fa5070adf13c82eabe20f78e56 Mon Sep 17 00:00:00 2001 From: Paul Bolle Date: Mon, 11 Mar 2013 13:44:55 +0000 Subject: [PATCH] --- yaml --- r: 361369 b: refs/heads/master c: ff2d7587c7b2a1b46abc7618f45b8cc3476d8716 h: refs/heads/master i: 361367: e92b97ec98c8e4b692125d875ea66a3af017603c v: v3 --- [refs] | 2 +- trunk/arch/powerpc/platforms/Kconfig.cputype | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index a79e02e9816c..b01802dc2ca5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d63ac5f6cf31c8a83170a9509b350c1489a7262b +refs/heads/master: ff2d7587c7b2a1b46abc7618f45b8cc3476d8716 diff --git a/trunk/arch/powerpc/platforms/Kconfig.cputype b/trunk/arch/powerpc/platforms/Kconfig.cputype index cea2f09c4241..18e3b76c78d7 100644 --- a/trunk/arch/powerpc/platforms/Kconfig.cputype +++ b/trunk/arch/powerpc/platforms/Kconfig.cputype @@ -124,9 +124,8 @@ config 6xx select PPC_HAVE_PMU_SUPPORT config POWER3 - bool depends on PPC64 && PPC_BOOK3S - default y if !POWER4_ONLY + def_bool y config POWER4 depends on PPC64 && PPC_BOOK3S @@ -145,8 +144,7 @@ config TUNE_CELL but somewhat slower on other machines. This option only changes the scheduling of instructions, not the selection of instructions itself, so the resulting kernel will keep running on all other - machines. When building a kernel that is supposed to run only - on Cell, you should also select the POWER4_ONLY option. + machines. # this is temp to handle compat with arch=ppc config 8xx