From: Alexei Colin <acolin@isi.edu>
To: Alexandre Bounine <alex.bou9@gmail.com>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Paul Mackerras <paulus@samba.org>
Cc: Alexei Colin <acolin@isi.edu>,
Andrew Morton <akpm@linux-foundation.org>,
John Paul Walters <jwalters@isi.edu>,
linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org
Subject: [PATCH 3/6] powerpc: factor out RapidIO Kconfig menu entry
Date: Mon, 30 Jul 2018 18:50:31 -0400 [thread overview]
Message-ID: <20180730225035.28365-4-acolin@isi.edu> (raw)
In-Reply-To: <20180730225035.28365-1-acolin@isi.edu>
The menu entry is now defined in the rapidio subtree. Also, re-order
the bus menu so tha the platform-specific RapidIO controller appears
after the entry for the RapidIO subsystem.
Platforms with a PCI bus will be offered the RapidIO menu since they may
be want support for a RapidIO PCI device. Platforms without a PCI bus
that might include a RapidIO IP block will need to "select HAS_RAPIDIO"
in the platform-/machine-specific "config ARCH_*" Kconfig entry.
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: John Paul Walters <jwalters@isi.edu>
Cc: linuxppc-dev@lists.ozlabs.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Alexei Colin <acolin@isi.edu>
---
arch/powerpc/Kconfig | 13 +------------
1 file changed, 1 insertion(+), 12 deletions(-)
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 25d005af0a5b..17ea8a5f90a0 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -993,16 +993,7 @@ source "drivers/pci/Kconfig"
source "drivers/pcmcia/Kconfig"
-config HAS_RAPIDIO
- bool
- default n
-
-config RAPIDIO
- tristate "RapidIO support"
- depends on HAS_RAPIDIO || PCI
- help
- If you say Y here, the kernel will include drivers and
- infrastructure code to support RapidIO interconnect devices.
+source "drivers/rapidio/Kconfig"
config FSL_RIO
bool "Freescale Embedded SRIO Controller support"
@@ -1012,8 +1003,6 @@ config FSL_RIO
Include support for RapidIO controller on Freescale embedded
processors (MPC8548, MPC8641, etc).
-source "drivers/rapidio/Kconfig"
-
endmenu
config NONSTATIC_KERNEL
--
2.18.0
next prev parent reply other threads:[~2018-07-30 23:01 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-30 22:50 [PATCH 0/6] rapidio: move Kconfig menu definition to subsystem Alexei Colin
2018-07-30 22:50 ` Alexei Colin [this message]
2018-07-31 9:45 ` [PATCH 3/6] powerpc: factor out RapidIO Kconfig menu entry Michael Ellerman
2018-07-30 22:59 ` [PATCH 0/6] rapidio: move Kconfig menu definition to subsystem Russell King - ARM Linux
2018-07-31 1:08 ` Randy Dunlap
2018-07-31 14:26 ` Alex Bounine
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=20180730225035.28365-4-acolin@isi.edu \
--to=acolin@isi.edu \
--cc=akpm@linux-foundation.org \
--cc=alex.bou9@gmail.com \
--cc=benh@kernel.crashing.org \
--cc=jwalters@isi.edu \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.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).