From: Bin Meng Date: Thu, 22 Jun 2017 06:42:40 +0000 (+0800) Subject: x86: Remove CONFIG_USB_MAX_CONTROLLER_COUNT X-Git-Tag: v2017.07-rc3~50 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c8f258d8a8452b9f74c0032aaa3dee3804b1fd45;p=oweals%2Fu-boot.git x86: Remove CONFIG_USB_MAX_CONTROLLER_COUNT As all x86 boards have been switched over to use DM USB, remove CONFIG_USB_MAX_CONTROLLER_COUNT which is not used by DM USB. Signed-off-by: Bin Meng Reviewed-by: Simon Glass Reviewed-by: Stefan Roese Tested-by: Stefan Roese --- diff --git a/include/configs/conga-qeval20-qa3-e3845.h b/include/configs/conga-qeval20-qa3-e3845.h index 231e5990ec..b4ea184bcb 100644 --- a/include/configs/conga-qeval20-qa3-e3845.h +++ b/include/configs/conga-qeval20-qa3-e3845.h @@ -23,9 +23,6 @@ {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA}, \ {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA_ALT} -#undef CONFIG_USB_MAX_CONTROLLER_COUNT -#define CONFIG_USB_MAX_CONTROLLER_COUNT 1 - #define VIDEO_IO_OFFSET 0 #define CONFIG_X86EMU_RAW_IO diff --git a/include/configs/dfi-bt700.h b/include/configs/dfi-bt700.h index 1cb4b5ee81..6748b9cb35 100644 --- a/include/configs/dfi-bt700.h +++ b/include/configs/dfi-bt700.h @@ -28,9 +28,6 @@ {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA}, \ {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA_ALT} -#undef CONFIG_USB_MAX_CONTROLLER_COUNT -#define CONFIG_USB_MAX_CONTROLLER_COUNT 1 - #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_ASIX #define CONFIG_USB_ETHER_SMSC95XX diff --git a/include/configs/minnowmax.h b/include/configs/minnowmax.h index 3744811d96..ae95485993 100644 --- a/include/configs/minnowmax.h +++ b/include/configs/minnowmax.h @@ -26,9 +26,6 @@ {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA}, \ {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA_ALT} -#undef CONFIG_USB_MAX_CONTROLLER_COUNT -#define CONFIG_USB_MAX_CONTROLLER_COUNT 1 - #define VIDEO_IO_OFFSET 0 #define CONFIG_X86EMU_RAW_IO diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index b5ef8b5c56..a5ed85236e 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -132,7 +132,6 @@ */ #define CONFIG_USB_EHCI_PCI #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 12 -#define CONFIG_USB_MAX_CONTROLLER_COUNT 2 #define CONFIG_SYS_USB_EVENT_POLL #define CONFIG_USB_HOST_ETHER