Messages in this thread Patch in this message | | | From | Jiri Slaby <> | Subject | [PATCH 13/15] chipidea: Allow user to select PCI/IMX options | Date | Tue, 7 May 2013 16:18:21 +0200 |
| |
From: Jeff Mahoney <jeffm@suse.com>
The chipidea driver currently has needless ifneq rules in the makefile for things that should be config options. This can be problematic, especially in the IMX case, since the OF_DEVICE dependency will be met on powerpc systems - which don't actually support the hardware via that method.
This patch adds _PCI and _IMX config options to allow the user to select whether to build the modules.
Signed-off-by: Jeff Mahoney <jeffm@suse.com> Signed-off-by: Jiri Slaby <jslaby@suse.cz> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: linux-usb@vger.kernel.org --- drivers/usb/chipidea/Kconfig | 11 +++++++++++ drivers/usb/chipidea/Makefile | 11 ++--------- 2 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/drivers/usb/chipidea/Kconfig b/drivers/usb/chipidea/Kconfig index 608a2ae..1ac9bc2 100644 --- a/drivers/usb/chipidea/Kconfig +++ b/drivers/usb/chipidea/Kconfig @@ -31,4 +31,15 @@ config USB_CHIPIDEA_DEBUG help Say Y here to enable debugging output of the ChipIdea driver. +config USB_CHIPIDEA_PCI + bool "ChipIdea PCI support" + depends on PCI + help + This option enables ChipIdea support on PCI. + +config USB_CHIPIDEA_IMX + bool "ChipIdea IMX support" + depends on OF_DEVICE + help + This option enables ChipIdea support on IMX. endif diff --git a/drivers/usb/chipidea/Makefile b/drivers/usb/chipidea/Makefile index 4ab83e9..a97d103 100644 --- a/drivers/usb/chipidea/Makefile +++ b/drivers/usb/chipidea/Makefile @@ -10,12 +10,5 @@ ci_hdrc-$(CONFIG_USB_CHIPIDEA_DEBUG) += debug.o # Glue/Bridge layers go here obj-$(CONFIG_USB_CHIPIDEA) += ci13xxx_msm.o - -# PCI doesn't provide stubs, need to check -ifneq ($(CONFIG_PCI),) - obj-$(CONFIG_USB_CHIPIDEA) += ci13xxx_pci.o -endif - -ifneq ($(CONFIG_OF_DEVICE),) - obj-$(CONFIG_USB_CHIPIDEA) += ci13xxx_imx.o usbmisc_imx.o -endif +obj-$(CONFIG_USB_CHIPIDEA_PCI) += ci13xxx_pci.o +obj-$(CONFIG_USB_CHIPIDEA_IMX) += ci13xxx_imx.o usbmisc_imx.o -- 1.8.2.1
| |