[PATCH] configs: Move some usb config in defconfig

[Patrice CHOTARD]

HI Patrick

On 10/4/21 11:23 AM, Patrick Delaunay wrote:
> Using the tools moveconfig.py to move the following config in the
> defconfig files:
>  CONFIG_USB_HOST_ETHER
>  CONFIG_USB_ETHER_ASIX
>  CONFIG_USB_ETHER_MCS7830
>  CONFIG_USB_ETHER_SMSC95XX
> 
> These option are already migrated since the commit f58ad98a621c ("usb: net:
> migrate USB Ethernet adapters to Kconfig") and the commit ae3584498bf8
> ("usb: net: migrate CONFIG_USB_HOST_ETHER to Kconfig").
> 
> Signed-off-by: Patrick Delaunay <patrick.delaunay at foss.st.com>
> ---
> 
>  configs/dh_imx6_defconfig       | 2 ++
>  configs/kp_imx6q_tpc_defconfig  | 2 ++
>  configs/mx53ppd_defconfig       | 4 ++++
>  configs/stih410-b2260_defconfig | 4 ++++
>  include/configs/dh_imx6.h       | 2 --
>  include/configs/kp_imx6q_tpc.h  | 2 --
>  include/configs/mx53ppd.h       | 4 ----
>  include/configs/stih410-b2260.h | 5 -----
>  8 files changed, 12 insertions(+), 13 deletions(-)
> 
> diff --git a/configs/dh_imx6_defconfig b/configs/dh_imx6_defconfig
> index eb588b68d3..abbb6412e8 100644
> --- a/configs/dh_imx6_defconfig
> +++ b/configs/dh_imx6_defconfig
> @@ -97,6 +97,8 @@ CONFIG_MXC_SPI=y
>  CONFIG_SYSRESET=y
>  CONFIG_SYSRESET_WATCHDOG=y
>  CONFIG_USB=y
> +CONFIG_USB_HOST_ETHER=y
> +CONFIG_USB_ETHER_ASIX=y
>  CONFIG_USB_GADGET=y
>  CONFIG_USB_GADGET_MANUFACTURER="dh"
>  CONFIG_USB_GADGET_VENDOR_NUM=0x0525
> diff --git a/configs/kp_imx6q_tpc_defconfig b/configs/kp_imx6q_tpc_defconfig
> index 85fdfad834..bcaa82ab89 100644
> --- a/configs/kp_imx6q_tpc_defconfig
> +++ b/configs/kp_imx6q_tpc_defconfig
> @@ -76,5 +76,7 @@ CONFIG_SYSRESET_WATCHDOG=y
>  CONFIG_IMX_THERMAL=y
>  CONFIG_USB=y
>  # CONFIG_SPL_DM_USB is not set
> +CONFIG_USB_HOST_ETHER=y
> +CONFIG_USB_ETHER_ASIX=y
>  CONFIG_WATCHDOG_TIMEOUT_MSECS=60000
>  CONFIG_IMX_WATCHDOG=y
> diff --git a/configs/mx53ppd_defconfig b/configs/mx53ppd_defconfig
> index 081707f27e..5f39df85ef 100644
> --- a/configs/mx53ppd_defconfig
> +++ b/configs/mx53ppd_defconfig
> @@ -70,6 +70,10 @@ CONFIG_SYSRESET=y
>  CONFIG_SYSRESET_WATCHDOG=y
>  CONFIG_USB=y
>  CONFIG_USB_EHCI_MX5=y
> +CONFIG_USB_HOST_ETHER=y
> +CONFIG_USB_ETHER_ASIX=y
> +CONFIG_USB_ETHER_MCS7830=y
> +CONFIG_USB_ETHER_SMSC95XX=y
>  CONFIG_DM_VIDEO=y
>  CONFIG_SYS_WHITE_ON_BLACK=y
>  CONFIG_VIDEO_IPUV3=y
> diff --git a/configs/stih410-b2260_defconfig b/configs/stih410-b2260_defconfig
> index d5ec00e1e0..a7ad277066 100644
> --- a/configs/stih410-b2260_defconfig
> +++ b/configs/stih410-b2260_defconfig
> @@ -53,6 +53,10 @@ CONFIG_USB_EHCI_GENERIC=y
>  CONFIG_USB_OHCI_HCD=y
>  CONFIG_USB_OHCI_GENERIC=y
>  CONFIG_USB_DWC3=y
> +CONFIG_USB_HOST_ETHER=y
> +CONFIG_USB_ETHER_ASIX=y
> +CONFIG_USB_ETHER_MCS7830=y
> +CONFIG_USB_ETHER_SMSC95XX=y
>  CONFIG_USB_GADGET=y
>  CONFIG_USB_GADGET_MANUFACTURER="STMicroelectronics"
>  CONFIG_USB_GADGET_VENDOR_NUM=0x483
> diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h
> index 7af8fceb71..ee56eb691a 100644
> --- a/include/configs/dh_imx6.h
> +++ b/include/configs/dh_imx6.h
> @@ -50,8 +50,6 @@
>  /* USB Configs */
>  #ifdef CONFIG_CMD_USB
>  #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
> -#define CONFIG_USB_HOST_ETHER
> -#define CONFIG_USB_ETHER_ASIX
>  #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
>  #define CONFIG_MXC_USB_FLAGS		0
>  #define CONFIG_USB_MAX_CONTROLLER_COUNT	2 /* Enabled USB controller number */
> diff --git a/include/configs/kp_imx6q_tpc.h b/include/configs/kp_imx6q_tpc.h
> index 8471dffe83..3061c96e76 100644
> --- a/include/configs/kp_imx6q_tpc.h
> +++ b/include/configs/kp_imx6q_tpc.h
> @@ -23,8 +23,6 @@
>  /* USB Configs */
>  #ifdef CONFIG_CMD_USB
>  #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
> -#define CONFIG_USB_HOST_ETHER
> -#define CONFIG_USB_ETHER_ASIX
>  #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
>  #define CONFIG_MXC_USB_FLAGS		0
>  #define CONFIG_USB_MAX_CONTROLLER_COUNT	2 /* Enabled USB controller number */
> diff --git a/include/configs/mx53ppd.h b/include/configs/mx53ppd.h
> index b623242256..f8118818b0 100644
> --- a/include/configs/mx53ppd.h
> +++ b/include/configs/mx53ppd.h
> @@ -14,10 +14,6 @@
>  #define CONFIG_SYS_FSL_CLK
>  
>  /* USB Configs */
> -#define CONFIG_USB_HOST_ETHER
> -#define CONFIG_USB_ETHER_ASIX
> -#define CONFIG_USB_ETHER_MCS7830
> -#define CONFIG_USB_ETHER_SMSC95XX
>  #define CONFIG_MXC_USB_PORT	1
>  #define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
>  #define CONFIG_MXC_USB_FLAGS	0
> diff --git a/include/configs/stih410-b2260.h b/include/configs/stih410-b2260.h
> index b1917c9d3f..2fe0900e9f 100644
> --- a/include/configs/stih410-b2260.h
> +++ b/include/configs/stih410-b2260.h
> @@ -57,11 +57,6 @@
>  #define CONFIG_USB_OHCI_NEW
>  #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS	2
>  
> -#define CONFIG_USB_HOST_ETHER
> -#define CONFIG_USB_ETHER_ASIX
> -#define CONFIG_USB_ETHER_MCS7830
> -#define CONFIG_USB_ETHER_SMSC95XX
> -
>  /* NET Configs */
>  
>  #endif /* __CONFIG_H */
> 

Reviewed-by: Patrice Chotard <patrice.chotard at foss.st.com>

Thanks
Patrice