From: arnd@arndb•de
To: paulus@samba•org
Cc: linuxppc-dev@ozlabs•org
Subject: [patch 09/10] powerpc: autoselect PPC_MULTIPLATFORM
Date: Tue, 12 Jun 2007 01:28:33 +0200 [thread overview]
Message-ID: <20070611233354.706367504@arndb.de> (raw)
In-Reply-To: 20070611232824.489103547@arndb.de
The multiplatform option has become pointless since all
platforms types are multiplatform by definition.
Keep the symbol around in case some code still uses it.
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
@@ -1,30 +1,12 @@
menu "Platform support"
-choice
- prompt "Machine type"
- depends on PPC64 || 6xx
- default PPC_MULTIPLATFORM
-
config PPC_MULTIPLATFORM
- bool "Generic desktop/server/laptop"
- help
- Select this option if configuring for an IBM pSeries or
- RS/6000 machine, an Apple machine, or a PReP, CHRP,
- Maple or Cell-based machine.
-
-config APUS
- bool "Amiga-APUS"
- depends on PPC32 && BROKEN
- help
- Select APUS if configuring for a PowerUP Amiga.
- More information is available at:
- <http://linux-apus.sourceforge.net/>.
-
-endchoice
+ def_bool y
+ depends on 6xx || PPC64
config CLASSIC32
def_bool y
- depends on 6xx && PPC_MULTIPLATFORM
+ depends on 6xx
source "arch/powerpc/platforms/pseries/Kconfig"
source "arch/powerpc/platforms/iseries/Kconfig"
@@ -43,6 +25,7 @@ source "arch/powerpc/platforms/83xx/Kcon
source "arch/powerpc/platforms/85xx/Kconfig"
source "arch/powerpc/platforms/86xx/Kconfig"
source "arch/powerpc/platforms/embedded6xx/Kconfig"
+source "arch/powerpc/platforms/apus/Kconfig"
source "arch/powerpc/platforms/44x/Kconfig"
#source "arch/powerpc/platforms/4xx/Kconfig
Index: linux-2.6/arch/powerpc/platforms/apus/Kconfig
===================================================================
--- linux-2.6.orig/arch/powerpc/platforms/apus/Kconfig
+++ linux-2.6/arch/powerpc/platforms/apus/Kconfig
@@ -1,3 +1,12 @@
+config APUS
+ bool "Amiga-APUS"
+ depends on PPC32 && BROKEN
+ help
+ Select APUS if configuring for a PowerUP Amiga.
+ More information is available at:
+ <http://linux-apus.sourceforge.net/>.
+
+if APUS
config AMIGA
bool
@@ -128,3 +137,5 @@ source "drivers/zorro/Kconfig"
config PCI_PERMEDIA
bool "PCI for Permedia2"
depends on !4xx && !8xx && APUS
+
+endif
--
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 ` [patch 06/10] powerpc: multiplatformize embedded6xx Kconfig arnd
2007-06-12 4:15 ` 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 ` arnd [this message]
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.706367504@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