[U-Boot] [PATCH] usb: ehci: Convert CONFIG_USB_EHCI_PCI to Kconfig

[Marek Vasut]

On 08/09/2017 09:21 AM, Bin Meng wrote:
> This converts CONFIG_USB_EHCI_PCI to a Kconfig option, and updates
> all boards that use it.
> 
> Signed-off-by: Bin Meng <bmeng.cn at gmail.com>

Applied, thanks

> ---
> 
>  configs/MPC8544DS_defconfig       | 1 +
>  configs/MPC8572DS_36BIT_defconfig | 1 +
>  configs/MPC8572DS_defconfig       | 1 +
>  drivers/usb/host/Kconfig          | 6 ++++++
>  include/configs/MPC8544DS.h       | 1 -
>  include/configs/MPC8572DS.h       | 1 -
>  include/configs/efi-x86.h         | 1 -
>  include/configs/x86-common.h      | 1 -
>  scripts/config_whitelist.txt      | 1 -
>  9 files changed, 9 insertions(+), 5 deletions(-)
> 
> diff --git a/configs/MPC8544DS_defconfig b/configs/MPC8544DS_defconfig
> index 8142cf2..4380a69 100644
> --- a/configs/MPC8544DS_defconfig
> +++ b/configs/MPC8544DS_defconfig
> @@ -24,5 +24,6 @@ CONFIG_E1000=y
>  CONFIG_RTL8139=y
>  CONFIG_SYS_NS16550=y
>  CONFIG_USB=y
> +CONFIG_USB_EHCI_PCI=y
>  CONFIG_USB_STORAGE=y
>  CONFIG_OF_LIBFDT=y
> diff --git a/configs/MPC8572DS_36BIT_defconfig b/configs/MPC8572DS_36BIT_defconfig
> index 521badc..5646aa8 100644
> --- a/configs/MPC8572DS_36BIT_defconfig
> +++ b/configs/MPC8572DS_36BIT_defconfig
> @@ -23,5 +23,6 @@ CONFIG_NETDEVICES=y
>  CONFIG_E1000=y
>  CONFIG_SYS_NS16550=y
>  CONFIG_USB=y
> +CONFIG_USB_EHCI_PCI=y
>  CONFIG_USB_STORAGE=y
>  CONFIG_OF_LIBFDT=y
> diff --git a/configs/MPC8572DS_defconfig b/configs/MPC8572DS_defconfig
> index 2821c8c..435a20d 100644
> --- a/configs/MPC8572DS_defconfig
> +++ b/configs/MPC8572DS_defconfig
> @@ -22,5 +22,6 @@ CONFIG_NETDEVICES=y
>  CONFIG_E1000=y
>  CONFIG_SYS_NS16550=y
>  CONFIG_USB=y
> +CONFIG_USB_EHCI_PCI=y
>  CONFIG_USB_STORAGE=y
>  CONFIG_OF_LIBFDT=y
> diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
> index 67ad72b..eb035a4 100644
> --- a/drivers/usb/host/Kconfig
> +++ b/drivers/usb/host/Kconfig
> @@ -142,6 +142,12 @@ config USB_EHCI_MSM
>  	  This driver supports combination of Chipidea USB controller
>  	  and Synapsys USB PHY in host mode only.
>  
> +config USB_EHCI_PCI
> +	bool "Support for PCI-based EHCI USB controller"
> +	default y if X86
> +	help
> +	  Enables support for the PCI-based EHCI controller.
> +
>  config USB_EHCI_RCAR_GEN3
>  	bool "Support for Renesas RCar M3/H3 EHCI USB controller"
>  	depends on RCAR_GEN3
> diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h
> index b4f4c4e..ffe7cfb 100644
> --- a/include/configs/MPC8544DS.h
> +++ b/include/configs/MPC8544DS.h
> @@ -358,7 +358,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
>   */
>  
>  #ifdef CONFIG_USB_EHCI_HCD
> -#define CONFIG_USB_EHCI_PCI
>  #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
>  #define CONFIG_PCI_EHCI_DEVICE			0
>  #endif
> diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h
> index 9062702..31c5f49 100644
> --- a/include/configs/MPC8572DS.h
> +++ b/include/configs/MPC8572DS.h
> @@ -556,7 +556,6 @@
>   */
>  
>  #ifdef CONFIG_USB_EHCI_HCD
> -#define CONFIG_USB_EHCI_PCI
>  #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
>  #define CONFIG_PCI_EHCI_DEVICE			0
>  #endif
> diff --git a/include/configs/efi-x86.h b/include/configs/efi-x86.h
> index 4a6b665..f002470 100644
> --- a/include/configs/efi-x86.h
> +++ b/include/configs/efi-x86.h
> @@ -14,7 +14,6 @@
>  #undef CONFIG_TPM_TIS_BASE_ADDRESS
>  
>  #undef CONFIG_SCSI_AHCI
> -#undef CONFIG_USB_EHCI_PCI
>  
>  #define CONFIG_STD_DEVICES_SETTINGS     "stdin=usbkbd,vga,serial\0" \
>  					"stdout=vga,serial\0" \
> diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
> index a70fc9d..968229d 100644
> --- a/include/configs/x86-common.h
> +++ b/include/configs/x86-common.h
> @@ -124,7 +124,6 @@
>  /*-----------------------------------------------------------------------
>   * USB configuration
>   */
> -#define CONFIG_USB_EHCI_PCI
>  #define CONFIG_SYS_USB_EVENT_POLL
>  
>  #define CONFIG_USB_HOST_ETHER
> diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
> index 3b5c17a..f281f3b 100644
> --- a/scripts/config_whitelist.txt
> +++ b/scripts/config_whitelist.txt
> @@ -5083,7 +5083,6 @@ CONFIG_USB_EHCI_KIRKWOOD
>  CONFIG_USB_EHCI_MX5
>  CONFIG_USB_EHCI_MXC
>  CONFIG_USB_EHCI_MXS
> -CONFIG_USB_EHCI_PCI
>  CONFIG_USB_EHCI_RMOBILE
>  CONFIG_USB_EHCI_SPEAR
>  CONFIG_USB_EHCI_SUNXI
> 


-- 
Best regards,
Marek Vasut