From: arnd@arndb.de
To: paulus@samba.org
Cc: linuxppc-dev@ozlabs.org
Subject: [patch 1/9] move 82xx/83xx/86xx Kconfig options to platform selection
Date: Sat, 16 Jun 2007 02:05:12 +0200 [thread overview]
Message-ID: <20070616000618.183462070@arndb.de> (raw)
In-Reply-To: 20070616000511.712667424@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
@@ -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"
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
@@ -10,41 +10,20 @@ 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).
-
- 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.
-
- 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
- select PPC_FPU
+ 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.
-config PPC_83xx
- bool "Freescale 83xx"
- select 6xx
- select FSL_SOC
- select 83xx
+ If unsure, select 52xx/6xx/7xx/74xx/82xx/83xx/86xx.
+
+config 6xx
+ bool "52xx/6xx/7xx/74xx/82xx/83xx/86xx"
select PPC_FPU
- select WANT_DEVICE_TREE
config PPC_85xx
bool "Freescale 85xx"
@@ -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
Index: linux-2.6/arch/powerpc/platforms/82xx/Kconfig
===================================================================
--- linux-2.6.orig/arch/powerpc/platforms/82xx/Kconfig
+++ linux-2.6/arch/powerpc/platforms/82xx/Kconfig
@@ -1,5 +1,5 @@
choice
- prompt "Machine Type"
+ prompt "82xx Board Type"
depends on PPC_82xx
default MPC82xx_ADS
Index: linux-2.6/arch/powerpc/platforms/83xx/Kconfig
===================================================================
--- linux-2.6.orig/arch/powerpc/platforms/83xx/Kconfig
+++ linux-2.6/arch/powerpc/platforms/83xx/Kconfig
@@ -1,5 +1,5 @@
choice
- prompt "Machine Type"
+ prompt "83xx Board Type"
depends on PPC_83xx
default MPC834x_MDS
Index: linux-2.6/arch/powerpc/platforms/86xx/Kconfig
===================================================================
--- linux-2.6.orig/arch/powerpc/platforms/86xx/Kconfig
+++ linux-2.6/arch/powerpc/platforms/86xx/Kconfig
@@ -1,5 +1,5 @@
choice
- prompt "Machine Type"
+ prompt "86xx Board Type"
depends on PPC_86xx
default MPC8641_HPCN
--
next parent reply other threads:[~2007-06-16 0:09 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20070616000511.712667424@arndb.de>
2007-06-16 0:05 ` arnd [this message]
2007-06-17 14:42 ` [patch 1/9] move 82xx/83xx/86xx Kconfig options to platform selection Kumar Gala
2007-07-11 15:35 ` Mark A. Greer
2007-07-11 20:33 ` Arnd Bergmann
2007-07-11 21:19 ` Segher Boessenkool
2007-07-11 23:47 ` Mark A. Greer
2007-06-16 0:05 ` [patch 2/9] autoselect optimal -mcpu= flag by platform arnd
2007-06-17 14:29 ` Kumar Gala
2007-06-17 16:11 ` Segher Boessenkool
2007-06-17 17:20 ` Arnd Bergmann
2007-06-17 17:46 ` Segher Boessenkool
2007-06-29 5:58 ` Paul Mackerras
2007-06-16 0:05 ` [patch 3/9] rename add_bridge to avoid namespace clashes arnd
2007-06-16 0:05 ` [patch 4/9] mpc82xx_ads build fix arnd
2007-06-16 7:37 ` Stephen Rothwell
2007-06-16 9:33 ` [updated PATCH] " Arnd Bergmann
2007-06-16 0:05 ` [patch 5/9] kill isa_{io,mem}_base definitions for !PCI arnd
2007-06-17 14:33 ` Kumar Gala
2007-06-17 15:32 ` Arnd Bergmann
2007-06-16 0:05 ` [patch 6/9] fix building without PCI arnd
2007-06-16 0:05 ` [patch 7/9] disallow building powermac and tsi108 " arnd
2007-06-17 14:35 ` Kumar Gala
2007-06-17 15:32 ` Arnd Bergmann
2007-06-16 0:05 ` [patch 8/9] fix conflicting mpc85xx board headers arnd
2007-06-16 0:05 ` [patch 9/9] enable multiplatform support for embedded boards arnd
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=20070616000618.183462070@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).