From: Arnd Bergmann <arnd@arndb•de>
To: linuxppc-dev@ozlabs•org
Cc: paulus@samba•org
Subject: [PATCH 5/6] powerpc: Multiplatformize 8{2,3,6}xx configuration
Date: Wed, 02 May 2007 13:47:14 +0200 [thread overview]
Message-ID: <20070502115645.143642636@arndb.de> (raw)
In-Reply-To: 20070502114709.074174446@arndb.de
All platforms based on 6xx compatible cores should be able to
coexisting in a single kernel image and do all necessary configuration
based on the device tree.
This moves the missing 8{2,3,6}xx platforms under
CONFIG_PPC_MULTIPLATFORM to make that possible to configure.
Signed-off-by: Arnd Bergmann <arnd@arndb•de>
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,10 +1,10 @@
-choice
- prompt "Machine Type"
- depends on PPC_82xx
- default MPC82xx_ADS
+config PPC_82xx
+ bool "Freescale 82xx"
+ depends on PPC_MULTIPLATFORM && 6xx
config MPC82xx_ADS
bool "Freescale MPC82xx ADS"
+ depends on PPC_82xx
select DEFAULT_UIMAGE
select PQ2ADS
select 8272
@@ -13,8 +13,6 @@ config MPC82xx_ADS
help
This option enables support for the MPC8272 ADS board
-endchoice
-
config PQ2ADS
bool
default n
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,16 +1,20 @@
-choice
- prompt "Machine Type"
- depends on PPC_83xx
- default MPC834x_MDS
+config PPC_83xx
+ bool "Freescale 83xx"
+ depends on PPC_MULTIPLATFORM && 6xx
+ select FSL_SOC
+ select 83xx
+ select WANT_DEVICE_TREE
config MPC8313_RDB
bool "Freescale MPC8313 RDB"
+ depends on PPC_83xx
select DEFAULT_UIMAGE
help
This option enables support for the MPC8313 RDB board.
config MPC832x_MDS
bool "Freescale MPC832x MDS"
+ depends on PPC_83xx
select DEFAULT_UIMAGE
select QUICC_ENGINE
help
@@ -18,6 +22,7 @@ config MPC832x_MDS
config MPC832x_RDB
bool "Freescale MPC832x RDB"
+ depends on PPC_83xx
select DEFAULT_UIMAGE
select QUICC_ENGINE
help
@@ -25,6 +30,7 @@ config MPC832x_RDB
config MPC834x_MDS
bool "Freescale MPC834x MDS"
+ depends on PPC_83xx
select DEFAULT_UIMAGE
help
This option enables support for the MPC 834x MDS evaluation board.
@@ -36,6 +42,7 @@ config MPC834x_MDS
config MPC834x_ITX
bool "Freescale MPC834x ITX"
+ depends on PPC_83xx
select DEFAULT_UIMAGE
help
This option enables support for the MPC 834x ITX evaluation board.
@@ -45,13 +52,12 @@ config MPC834x_ITX
config MPC836x_MDS
bool "Freescale MPC836x MDS"
+ depends on PPC_83xx
select DEFAULT_UIMAGE
select QUICC_ENGINE
help
This option enables support for the MPC836x MDS Processor Board.
-endchoice
-
config PPC_MPC831x
bool
select PPC_UDBG_16550
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,17 +1,20 @@
-choice
- prompt "Machine Type"
- depends on PPC_86xx
- default MPC8641_HPCN
+config PPC_86xx
+ bool "Freescale 86xx"
+ depends on PPC_MULTIPLATFORM && 6xx
+ select FSL_SOC
+ select FSL_PCIE
+ select ALTIVEC
+ help
+ The Freescale E600 SoCs have 74xx cores.
config MPC8641_HPCN
bool "Freescale MPC8641 HPCN"
+ depends on PPC_86xx
select PPC_I8259
select DEFAULT_UIMAGE
help
This option enables support for the MPC8641 HPCN board.
-endchoice
-
config MPC8641
bool
select PPC_INDIRECT_PCI
Index: linux-2.6/arch/powerpc/platforms/Kconfig
===================================================================
--- linux-2.6.orig/arch/powerpc/platforms/Kconfig
+++ linux-2.6/arch/powerpc/platforms/Kconfig
@@ -24,25 +24,6 @@ config APUS
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
--
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 ` [PATCH 3/6] powerpc: move 82xx/83xx/86xx Kconfig options to platform selection Arnd Bergmann
2007-05-02 11:47 ` [PATCH 4/6] powerpc: rename add_bridge to avoid namespace clashes Arnd Bergmann
2007-05-02 11:47 ` Arnd Bergmann [this message]
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=20070502115645.143642636@arndb.de \
--to=arnd@arndb$(echo .)de \
--cc=linuxppc-dev@ozlabs$(echo .)org \
--cc=paulus@samba$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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