From: Kumar Gala <galak@kernel.crashing.org>
To: linuxppc-dev@ozlabs.org
Subject: [PATCH 2/7] Convert 86xx platform to unified platform Kconfig
Date: Thu, 12 Apr 2007 18:09:53 -0500 (CDT) [thread overview]
Message-ID: <Pine.LNX.4.64.0704121809290.28324@localhost.localdomain> (raw)
In-Reply-To: <Pine.LNX.4.64.0704121806330.28324@localhost.localdomain>
Moved 86xx platform Kconfig over to being sourced by the unified
arch/powerpc/platforms/Kconfig.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---
arch/powerpc/Kconfig | 6 +++++-
arch/powerpc/platforms/86xx/Kconfig | 18 +++---------------
arch/powerpc/platforms/Kconfig | 3 ++-
3 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 740892a..d37e0b8 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -380,7 +380,6 @@ source arch/powerpc/platforms/4xx/Kconfig
source arch/powerpc/platforms/82xx/Kconfig
source arch/powerpc/platforms/83xx/Kconfig
source arch/powerpc/platforms/85xx/Kconfig
-source arch/powerpc/platforms/86xx/Kconfig
source arch/powerpc/platforms/8xx/Kconfig
menu "Kernel options"
@@ -637,6 +636,11 @@ config PPC_INDIRECT_PCI
default y if 40x || 44x
default n
+config PPC_INDIRECT_PCI_BE
+ bool
+ depends PPC_INDIRECT_PCI
+ default n
+
config EISA
bool
diff --git a/arch/powerpc/platforms/86xx/Kconfig b/arch/powerpc/platforms/86xx/Kconfig
index 0c70944..d1bcff5 100644
--- a/arch/powerpc/platforms/86xx/Kconfig
+++ b/arch/powerpc/platforms/86xx/Kconfig
@@ -1,8 +1,6 @@
-menu "Platform Support"
- depends on PPC_86xx
-
choice
prompt "Machine Type"
+ depends on PPC_86xx
default MPC8641_HPCN
config MPC8641_HPCN
@@ -14,20 +12,10 @@ config MPC8641_HPCN
endchoice
-
config MPC8641
bool
select PPC_INDIRECT_PCI
+ select PPC_INDIRECT_PCI_BE
select PPC_UDBG_16550
+ select MPIC
default y if MPC8641_HPCN
-
-config MPIC
- bool
- default y
-
-config PPC_INDIRECT_PCI_BE
- bool
- depends on PPC_86xx
- default y
-
-endmenu
diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index 176a27f..5f2cef0 100644
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
@@ -1,5 +1,5 @@
menu "Platform support"
- depends on PPC64 || CLASSIC32
+ depends on PPC64 || CLASSIC32 || PPC_86xx
choice
prompt "Machine type"
@@ -45,6 +45,7 @@ source "arch/powerpc/platforms/pasemi/Kconfig"
source arch/powerpc/platforms/celleb/Kconfig
source arch/powerpc/platforms/ps3/Kconfig
source arch/powerpc/platforms/cell/Kconfig
+source "arch/powerpc/platforms/86xx/Kconfig"
config PPC_NATIVE
bool
--
1.5.0.6
next prev parent reply other threads:[~2007-04-12 23:13 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-04-12 23:08 [PATCH 0/7] Kconfig cleanup part II Kumar Gala
2007-04-12 23:09 ` [PATCH 1/7] Ensure platform CONFIG options have correct dependencies Kumar Gala
2007-04-12 23:09 ` Kumar Gala [this message]
2007-04-12 23:10 ` [PATCH 3/7] Convert 83xx platform to unified platform Kconfig Kumar Gala
2007-04-12 23:11 ` [PATCH 4/7] Convert 82xx " Kumar Gala
2007-04-12 23:11 ` [PATCH 5/7] Convert 8xx " Kumar Gala
2007-04-12 23:12 ` [PATCH 6/7] Convert 85xx " Kumar Gala
2007-04-12 23:12 ` [PATCH 7/7] Miscellaneous arch/powerpc Kconfig and platform/Kconfig cleanup Kumar Gala
2007-04-13 11:37 ` [PATCH 0/7] Kconfig cleanup part II Arnd Bergmann
2007-04-13 11:48 ` David Gibson
2007-04-13 15:02 ` Kumar Gala
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=Pine.LNX.4.64.0704121809290.28324@localhost.localdomain \
--to=galak@kernel.crashing.org \
--cc=linuxppc-dev@ozlabs.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).