From: arnd@arndb.de
To: paulus@samba.org
Cc: linuxppc-dev@ozlabs.org
Subject: [patch 06/10] powerpc: multiplatformize embedded6xx Kconfig
Date: Tue, 12 Jun 2007 01:28:30 +0200 [thread overview]
Message-ID: <20070611233354.289486461@arndb.de> (raw)
In-Reply-To: 20070611232824.489103547@arndb.de
The existing embedded 6xx platforms will happily coexist
with each other in a single kernel if you let them.
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
@@ -12,10 +12,6 @@ config PPC_MULTIPLATFORM
RS/6000 machine, an Apple machine, or a PReP, CHRP,
Maple or Cell-based machine.
-config EMBEDDED6xx
- bool "Embedded 6xx/7xx/7xxx-based board"
- depends on PPC32 && (BROKEN||BROKEN_ON_SMP)
-
config APUS
bool "Amiga-APUS"
depends on PPC32 && BROKEN
@@ -33,7 +29,6 @@ config CLASSIC32
source "arch/powerpc/platforms/pseries/Kconfig"
source "arch/powerpc/platforms/iseries/Kconfig"
source "arch/powerpc/platforms/chrp/Kconfig"
-source "arch/powerpc/platforms/52xx/Kconfig"
source "arch/powerpc/platforms/powermac/Kconfig"
source "arch/powerpc/platforms/prep/Kconfig"
source "arch/powerpc/platforms/maple/Kconfig"
@@ -42,6 +37,7 @@ source "arch/powerpc/platforms/celleb/Kc
source "arch/powerpc/platforms/ps3/Kconfig"
source "arch/powerpc/platforms/cell/Kconfig"
source "arch/powerpc/platforms/8xx/Kconfig"
+source "arch/powerpc/platforms/52xx/Kconfig"
source "arch/powerpc/platforms/82xx/Kconfig"
source "arch/powerpc/platforms/83xx/Kconfig"
source "arch/powerpc/platforms/85xx/Kconfig"
Index: linux-2.6/arch/powerpc/platforms/embedded6xx/Kconfig
===================================================================
--- linux-2.6.orig/arch/powerpc/platforms/embedded6xx/Kconfig
+++ linux-2.6/arch/powerpc/platforms/embedded6xx/Kconfig
@@ -1,9 +1,10 @@
-choice
- prompt "Machine Type"
- depends on EMBEDDED6xx
+config EMBEDDED6xx
+ bool "Embedded 6xx"
config LINKSTATION
bool "Linkstation / Kurobox(HG) from Buffalo"
+ depends on EMBEDDED6xx
+ depends on (BROKEN || BROKEN_ON_SMP)
select MPIC
select FSL_SOC
select PPC_UDBG_16550 if SERIAL_8250
@@ -17,6 +18,8 @@ config LINKSTATION
config MPC7448HPC2
bool "Freescale MPC7448HPC2(Taiga)"
+ depends on EMBEDDED6xx
+ depends on (BROKEN || BROKEN_ON_SMP)
select TSI108_BRIDGE
select DEFAULT_UIMAGE
select PPC_UDBG_16550
@@ -26,6 +29,7 @@ config MPC7448HPC2
config PPC_HOLLY
bool "PPC750GX/CL with TSI10x bridge (Hickory/Holly)"
+ depends on EMBEDDED6xx
select TSI108_BRIDGE
select PPC_UDBG_16550
help
@@ -34,12 +38,12 @@ config PPC_HOLLY
config PPC_PRPMC2800
bool "Motorola-PrPMC2800"
+ depends on EMBEDDED6xx
select MV64X60
select NOT_COHERENT_CACHE
select WANT_DEVICE_TREE
help
This option enables support for the Motorola PrPMC2800 board
-endchoice
config TSI108_BRIDGE
bool
--
next prev parent reply other threads:[~2007-06-11 23:36 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-06-11 23:28 [patch 00/10] CPU selection Kconfig cleanup, take 2 arnd
2007-06-11 23:28 ` [patch 01/10] powerpc: split out CPU specific options into a new Kconfig file arnd
2007-06-12 4:02 ` Stephen Rothwell
2007-06-12 7:42 ` Arnd Bergmann
2007-06-12 11:12 ` Paul Mackerras
2007-06-12 12:42 ` Arnd Bergmann
2007-06-11 23:28 ` [patch 02/10] powerpc: Move CONFIG_PPC64 into CPU selection arnd
2007-06-12 6:33 ` Paul Mackerras
2007-06-12 8:08 ` Arnd Bergmann
2007-06-12 11:11 ` Paul Mackerras
2007-06-12 11:35 ` Segher Boessenkool
2007-06-12 21:32 ` Benjamin Herrenschmidt
2007-06-13 4:52 ` Segher Boessenkool
2007-06-13 0:42 ` Paul Mackerras
2007-06-13 4:57 ` Segher Boessenkool
2007-06-12 11:49 ` Arnd Bergmann
2007-06-11 23:28 ` [patch 03/10] powerpc: move 82xx/83xx/86xx Kconfig options to platform selection arnd
2007-06-11 23:28 ` [patch 04/10] powerpc: rename add_bridge to avoid namespace clashes arnd
2007-06-12 4:11 ` Stephen Rothwell
2007-06-11 23:28 ` [patch 05/10] powerpc: Multiplatformize 8{2,3,6}xx configuration arnd
2007-06-11 23:28 ` arnd [this message]
2007-06-12 4:15 ` [patch 06/10] powerpc: multiplatformize embedded6xx Kconfig Stephen Rothwell
2007-06-12 4:16 ` Stephen Rothwell
2007-06-12 5:59 ` Kumar Gala
2007-06-12 7:46 ` Arnd Bergmann
2007-06-11 23:28 ` [patch 07/10] powerpc: multiplatformize 52xx configuration arnd
2007-06-11 23:28 ` [patch 08/10] powerpc: multiplatformize 85xx Kconfig arnd
2007-06-11 23:28 ` [patch 09/10] powerpc: autoselect PPC_MULTIPLATFORM arnd
2007-06-11 23:28 ` [patch 10/10] powerpc: autoselect optimal -mcpu= flag by platform 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=20070611233354.289486461@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.