From: Arnd Bergmann <arnd@arndb.de>
To: linuxppc-dev@ozlabs.org
Cc: paulus@samba.org
Subject: [PATCH 3/6] powerpc: move 82xx/83xx/86xx Kconfig options to platform selection
Date: Wed, 02 May 2007 13:47:12 +0200 [thread overview]
Message-ID: <20070502115644.889484050@arndb.de> (raw)
In-Reply-To: 20070502114709.074174446@arndb.de
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>
Index: linux-2.6/arch/powerpc/platforms/Kconfig
===================================================================
--- linux-2.6.orig/arch/powerpc/platforms/Kconfig
+++ linux-2.6/arch/powerpc/platforms/Kconfig
@@ -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
@@ -23,8 +23,32 @@ config APUS
Select APUS if configuring for a PowerUP Amiga.
More information is available at:
<http://linux-apus.sourceforge.net/>.
+
+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"
Index: linux-2.6/arch/powerpc/platforms/Kconfig.cputype
===================================================================
--- linux-2.6.orig/arch/powerpc/platforms/Kconfig.cputype
+++ linux-2.6/arch/powerpc/platforms/Kconfig.cputype
@@ -15,24 +15,10 @@ config PPC64
bool "any 64 bit PowerPC"
select PPC_FPU
-config CLASSIC32
- bool "52xx/6xx/7xx/74xx"
- select PPC_FPU
- select 6xx
-
-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
@@ -40,16 +26,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
--
next prev parent reply other threads:[~2007-05-02 12:14 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-05-02 11:47 [PATCH 0/6] CPU selection Kconfig cleanup Arnd Bergmann
2007-05-02 11:47 ` [PATCH 1/6] powerpc: split out CPU specific options into a new Kconfig file Arnd Bergmann
2007-05-02 15:54 ` Timur Tabi
2007-05-02 16:40 ` Arnd Bergmann
2007-05-02 17:51 ` Jon Loeliger
2007-05-02 11:47 ` [PATCH 2/6] powerpc: Move CONFIG_PPC64 into CPU selection Arnd Bergmann
2007-05-02 13:35 ` Kumar Gala
2007-05-02 11:47 ` Arnd Bergmann [this message]
2007-05-02 11:47 ` [PATCH 4/6] powerpc: rename add_bridge to avoid namespace clashes Arnd Bergmann
2007-05-02 11:47 ` [PATCH 5/6] powerpc: Multiplatformize 8{2,3,6}xx configuration Arnd Bergmann
2007-05-02 12:13 ` [PATCH 6/6] powerpc: autoselect optimal -mcpu= flag by platform Arnd Bergmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070502115644.889484050@arndb.de \
--to=arnd@arndb.de \
--cc=linuxppc-dev@ozlabs.org \
--cc=paulus@samba.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.