From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-d.ads.isi.edu (mail-d.ads.isi.edu [128.9.180.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 41fZnG58NXzF10S for ; Tue, 31 Jul 2018 09:01:22 +1000 (AEST) From: Alexei Colin To: Alexandre Bounine , Benjamin Herrenschmidt , Paul Mackerras Cc: Alexei Colin , Andrew Morton , John Paul Walters , 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 Message-Id: <20180730225035.28365-4-acolin@isi.edu> In-Reply-To: <20180730225035.28365-1-acolin@isi.edu> References: <20180730225035.28365-1-acolin@isi.edu> List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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 Cc: John Paul Walters Cc: linuxppc-dev@lists.ozlabs.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Alexei Colin --- 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