[U-Boot] [PATCH 12/20] configs: Remove CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS in all boards

[Bin Meng]

Hi Stefan,

On Fri, Jun 16, 2017 at 9:31 PM, Bin Meng <bmeng.cn at gmail.com> wrote:
> Now that xHCD does not use CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS,
> remove it in all boards' config files.
>
> Signed-off-by: Bin Meng <bmeng.cn at gmail.com>
> ---
>
>  include/configs/am43xx_evm.h         | 1 -
>  include/configs/am57xx_evm.h         | 1 -
>  include/configs/cl-som-am57x.h       | 1 -
>  include/configs/cm_t43.h             | 1 -
>  include/configs/dra7xx_evm.h         | 1 -
>  include/configs/ds414.h              | 1 -
>  include/configs/exynos5-common.h     | 1 -
>  include/configs/ls1012afrdm.h        | 1 -
>  include/configs/ls1012aqds.h         | 1 -
>  include/configs/ls1012ardb.h         | 1 -
>  include/configs/ls1021aiot.h         | 1 -
>  include/configs/ls1021aqds.h         | 1 -
>  include/configs/ls1021atwr.h         | 1 -
>  include/configs/ls1043aqds.h         | 1 -
>  include/configs/ls1043ardb.h         | 1 -
>  include/configs/ls1046aqds.h         | 1 -
>  include/configs/ls1046ardb.h         | 1 -
>  include/configs/ls2080aqds.h         | 1 -
>  include/configs/ls2080ardb.h         | 1 -
>  include/configs/mvebu_armada-37xx.h  | 4 +---
>  include/configs/mvebu_armada-8k.h    | 4 +---
>  include/configs/rk3328_common.h      | 2 --
>  include/configs/rk3399_common.h      | 3 ---
>  include/configs/ti_armv7_keystone2.h | 1 -
>  include/configs/uniphier.h           | 3 ---
>  include/configs/xilinx_zynqmp.h      | 2 --
>  scripts/config_whitelist.txt         | 1 -
>  27 files changed, 2 insertions(+), 37 deletions(-)
>

[snip]

> diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h
> index 2dab065..0a4c90c 100644
> --- a/include/configs/ls2080ardb.h
> +++ b/include/configs/ls2080ardb.h
> @@ -349,7 +349,6 @@ unsigned long get_board_sys_clk(void);
>  #define CONFIG_HAS_FSL_XHCI_USB
>  #define CONFIG_USB_XHCI_FSL
>  #define CONFIG_USB_MAX_CONTROLLER_COUNT         2
> -#define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS      2
>
>  #undef CONFIG_CMDLINE_EDITING
>  #include <config_distro_defaults.h>
> diff --git a/include/configs/mvebu_armada-37xx.h b/include/configs/mvebu_armada-37xx.h
> index 5408490..7a255a1 100644
> --- a/include/configs/mvebu_armada-37xx.h
> +++ b/include/configs/mvebu_armada-37xx.h
> @@ -98,10 +98,8 @@
>  #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3
>
>  /* USB 3.0 */
> -#define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 3
> -
>  #define CONFIG_USB_MAX_CONTROLLER_COUNT (CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS + \
> -                                        CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS)
> +                                        3)

I strongly suspect here CONFIG_USB_MAX_CONTROLLER_COUNT is mistakenly
configured, unless each host controller only has 1 root port? Please
review.

>
>  /* USB ethernet */
>  #define CONFIG_USB_HOST_ETHER
> diff --git a/include/configs/mvebu_armada-8k.h b/include/configs/mvebu_armada-8k.h
> index 9d3aeef..c29d7f9 100644
> --- a/include/configs/mvebu_armada-8k.h
> +++ b/include/configs/mvebu_armada-8k.h
> @@ -104,10 +104,8 @@
>  #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3
>
>  /* USB 3.0 */
> -#define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 3
> -
>  #define CONFIG_USB_MAX_CONTROLLER_COUNT (CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS + \
> -                                        CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS)
> +                                        3)

ditto.

>
>  /* USB ethernet */
>  #define CONFIG_USB_HOST_ETHER

[snip]

Regards,
Bin