[U-Boot] [PATCH 09/12] sunxi: Kconfig defaults for USB

Hans de Goede
2015-07-22T09:37:38Z

Hi,

On 22-07-15 10:45, Paul Kocialkowski wrote:
> USB_STORAGE and USB_KEYBOARD should only be selected when either USB_EHCI_HCD or
> USB_MUSB_HOST is set. In addition, the musb controller should automatically be
> selected when either USB_MUSB_HOST or USB_MUSB_GADGET is selected, not the other
> way round.
>
> Signed-off-by: Paul Kocialkowski <contact@paulk.fr>

You are mixing / matching 2 things here:

1) Updating the defconfigs for your USB_MUSB_HOST Kconfig addition, that
should have been done in the actual patch adding that option.

2) USB_STORAGE / USB_KEYBOARD related changes, AFAICT these are mostly
superceeded by:

https://github.com/jwrdegoede/u-boot-sunxi/commit/a38b760f8805dfa7d9a0d60fa08802412b38f463

Regards,

Hans

> ---
> board/sunxi/Kconfig | 5 ++++-
> configs/Ainol_AW1_defconfig | 2 +-
> configs/Ampe_A76_defconfig | 2 +-
> configs/Chuwi_V7_CW0825_defconfig | 2 +-
> configs/Et_q8_v1_6_defconfig | 2 +-
> configs/Hyundai_A7HD_defconfig | 2 +-
> configs/Ippo_q8h_v1_2_a33_1024x600_defconfig | 2 +-
> configs/Ippo_q8h_v1_2_defconfig | 2 +-
> configs/Ippo_q8h_v5_defconfig | 2 +-
> configs/MSI_Primo81_defconfig | 2 +-
> configs/TZX-Q8-713B7_defconfig | 2 +-
> configs/UTOO_P66_defconfig | 2 +-
> configs/Yones_Toptech_BD1078_defconfig | 2 +-
> configs/forfun_q88db_defconfig | 2 +-
> configs/ga10h_v1_1_defconfig | 2 +-
> configs/iNet_3F_defconfig | 2 +-
> configs/iNet_3W_defconfig | 2 +-
> configs/iNet_86VS_defconfig | 2 +-
> drivers/usb/musb-new/Kconfig | 2 +-
> 19 files changed, 22 insertions(+), 19 deletions(-)
>
> diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig
> index 66d2c4e..01e2c82 100644
> --- a/board/sunxi/Kconfig
> +++ b/board/sunxi/Kconfig
> @@ -531,8 +531,11 @@ config VIDEO_LCD_TL059WV5C0
>
> endchoice
>
> +config USB_STORAGE
> + default y if USB_EHCI_HCD || USB_MUSB_HOST
> +
> config USB_KEYBOARD
> - default y
> + default y if USB_EHCI_HCD || USB_MUSB_HOST
>
> config GMAC_TX_DELAY
> int "GMAC Transmit Clock Delay Chain"
> diff --git a/configs/Ainol_AW1_defconfig b/configs/Ainol_AW1_defconfig
> index f94cd5a..50380db 100644
> --- a/configs/Ainol_AW1_defconfig
> +++ b/configs/Ainol_AW1_defconfig
> @@ -11,7 +11,7 @@ CONFIG_VIDEO_LCD_MODE="x:800,y:480,depth:18,pclk_khz:40000,le:87,ri:112,up:38,lo
> CONFIG_VIDEO_LCD_POWER="PH8"
> CONFIG_VIDEO_LCD_BL_EN="PH7"
> CONFIG_VIDEO_LCD_BL_PWM="PB2"
> -CONFIG_USB_MUSB_SUNXI=y
> +CONFIG_USB_MUSB_HOST=y
> CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-ainol-aw1"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> CONFIG_SPL=y
> diff --git a/configs/Ampe_A76_defconfig b/configs/Ampe_A76_defconfig
> index 99aa141..bada534 100644
> --- a/configs/Ampe_A76_defconfig
> +++ b/configs/Ampe_A76_defconfig
> @@ -10,7 +10,7 @@ CONFIG_VIDEO_LCD_MODE="x:800,y:480,depth:18,pclk_khz:33000,le:45,ri:82,up:22,lo:
> CONFIG_VIDEO_LCD_POWER="AXP0-0"
> CONFIG_VIDEO_LCD_BL_EN="AXP0-1"
> CONFIG_VIDEO_LCD_BL_PWM="PB2"
> -CONFIG_USB_MUSB_SUNXI=y
> +CONFIG_USB_MUSB_HOST=y
> CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-ampe-a76"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> CONFIG_SPL=y
> diff --git a/configs/Chuwi_V7_CW0825_defconfig b/configs/Chuwi_V7_CW0825_defconfig
> index 3a2a219..298cf9c 100644
> --- a/configs/Chuwi_V7_CW0825_defconfig
> +++ b/configs/Chuwi_V7_CW0825_defconfig
> @@ -10,7 +10,7 @@ CONFIG_VIDEO_LCD_POWER="PH8"
> CONFIG_VIDEO_LCD_BL_EN="PH7"
> CONFIG_VIDEO_LCD_BL_PWM="PB2"
> CONFIG_VIDEO_LCD_PANEL_HITACHI_TX18D42VM=y
> -CONFIG_USB_MUSB_SUNXI=y
> +CONFIG_USB_MUSB_HOST=y
> CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-chuwi-v7-cw0825"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> CONFIG_SPL=y
> diff --git a/configs/Et_q8_v1_6_defconfig b/configs/Et_q8_v1_6_defconfig
> index e36895c..23f7531 100644
> --- a/configs/Et_q8_v1_6_defconfig
> +++ b/configs/Et_q8_v1_6_defconfig
> @@ -11,7 +11,7 @@ CONFIG_VIDEO_LCD_DCLK_PHASE=0
> CONFIG_VIDEO_LCD_POWER="PH7"
> CONFIG_VIDEO_LCD_BL_EN="PH6"
> CONFIG_VIDEO_LCD_BL_PWM="PH0"
> -CONFIG_USB_MUSB_SUNXI=y
> +CONFIG_USB_MUSB_HOST=y
> CONFIG_DEFAULT_DEVICE_TREE="sun8i-a33-et-q8-v1.6"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> CONFIG_SPL=y
> diff --git a/configs/Hyundai_A7HD_defconfig b/configs/Hyundai_A7HD_defconfig
> index 7800fa2..f7983e0 100644
> --- a/configs/Hyundai_A7HD_defconfig
> +++ b/configs/Hyundai_A7HD_defconfig
> @@ -12,7 +12,7 @@ CONFIG_VIDEO_LCD_BL_EN="PH9"
> CONFIG_VIDEO_LCD_BL_PWM="PB2"
> # CONFIG_VIDEO_LCD_BL_PWM_ACTIVE_LOW is not set
> CONFIG_VIDEO_LCD_PANEL_LVDS=y
> -CONFIG_USB_MUSB_SUNXI=y
> +CONFIG_USB_MUSB_HOST=y
> CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-hyundai-a7hd"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> CONFIG_SPL=y
> diff --git a/configs/Ippo_q8h_v1_2_a33_1024x600_defconfig b/configs/Ippo_q8h_v1_2_a33_1024x600_defconfig
> index 8e26f37..9faa0b9 100644
> --- a/configs/Ippo_q8h_v1_2_a33_1024x600_defconfig
> +++ b/configs/Ippo_q8h_v1_2_a33_1024x600_defconfig
> @@ -11,7 +11,7 @@ CONFIG_VIDEO_LCD_DCLK_PHASE=0
> CONFIG_VIDEO_LCD_POWER="PH7"
> CONFIG_VIDEO_LCD_BL_EN="PH6"
> CONFIG_VIDEO_LCD_BL_PWM="PH0"
> -CONFIG_USB_MUSB_SUNXI=y
> +CONFIG_USB_MUSB_HOST=y
> CONFIG_DEFAULT_DEVICE_TREE="sun8i-a33-ippo-q8h-v1.2"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> CONFIG_SPL=y
> diff --git a/configs/Ippo_q8h_v1_2_defconfig b/configs/Ippo_q8h_v1_2_defconfig
> index ab62210..df631d2 100644
> --- a/configs/Ippo_q8h_v1_2_defconfig
> +++ b/configs/Ippo_q8h_v1_2_defconfig
> @@ -11,7 +11,7 @@ CONFIG_VIDEO_LCD_DCLK_PHASE=0
> CONFIG_VIDEO_LCD_POWER="PH7"
> CONFIG_VIDEO_LCD_BL_EN="PH6"
> CONFIG_VIDEO_LCD_BL_PWM="PH0"
> -CONFIG_USB_MUSB_SUNXI=y
> +CONFIG_USB_MUSB_HOST=y
> CONFIG_DEFAULT_DEVICE_TREE="sun8i-a23-ippo-q8h-v1.2"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> CONFIG_SPL=y
> diff --git a/configs/Ippo_q8h_v5_defconfig b/configs/Ippo_q8h_v5_defconfig
> index 312a38c..56b19b5 100644
> --- a/configs/Ippo_q8h_v5_defconfig
> +++ b/configs/Ippo_q8h_v5_defconfig
> @@ -11,7 +11,7 @@ CONFIG_VIDEO_LCD_DCLK_PHASE=0
> CONFIG_VIDEO_LCD_POWER="PH7"
> CONFIG_VIDEO_LCD_BL_EN="PH6"
> CONFIG_VIDEO_LCD_BL_PWM="PH0"
> -CONFIG_USB_MUSB_SUNXI=y
> +CONFIG_USB_MUSB_HOST=y
> CONFIG_DEFAULT_DEVICE_TREE="sun8i-a23-ippo-q8h-v5"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> CONFIG_SPL=y
> diff --git a/configs/MSI_Primo81_defconfig b/configs/MSI_Primo81_defconfig
> index 9787e34..f4e07f5 100644
> --- a/configs/MSI_Primo81_defconfig
> +++ b/configs/MSI_Primo81_defconfig
> @@ -10,7 +10,7 @@ CONFIG_VIDEO_LCD_MODE="x:768,y:1024,depth:18,pclk_khz:66000,le:56,ri:60,up:30,lo
> CONFIG_VIDEO_LCD_BL_EN="PA25"
> CONFIG_VIDEO_LCD_BL_PWM="PH13"
> CONFIG_VIDEO_LCD_PANEL_MIPI_4_LANE_513_MBPS_VIA_SSD2828=y
> -CONFIG_USB_MUSB_SUNXI=y
> +CONFIG_USB_MUSB_HOST=y
> # CONFIG_USB_KEYBOARD is not set
> CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31s-primo81"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> diff --git a/configs/TZX-Q8-713B7_defconfig b/configs/TZX-Q8-713B7_defconfig
> index 68961fc..e4e5670 100644
> --- a/configs/TZX-Q8-713B7_defconfig
> +++ b/configs/TZX-Q8-713B7_defconfig
> @@ -10,7 +10,7 @@ CONFIG_VIDEO_LCD_MODE="x:800,y:480,depth:18,pclk_khz:33000,le:87,ri:40,up:31,lo:
> CONFIG_VIDEO_LCD_POWER="AXP0-0"
> CONFIG_VIDEO_LCD_BL_EN="AXP0-1"
> CONFIG_VIDEO_LCD_BL_PWM="PB2"
> -CONFIG_USB_MUSB_SUNXI=y
> +CONFIG_USB_MUSB_HOST=y
> CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-tzx-q8-713b7"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> CONFIG_SPL=y
> diff --git a/configs/UTOO_P66_defconfig b/configs/UTOO_P66_defconfig
> index c3b13b7..b2459ee 100644
> --- a/configs/UTOO_P66_defconfig
> +++ b/configs/UTOO_P66_defconfig
> @@ -15,7 +15,7 @@ CONFIG_VIDEO_LCD_RESET="PG11"
> CONFIG_VIDEO_LCD_BL_EN="AXP0-1"
> CONFIG_VIDEO_LCD_BL_PWM="PB2"
> CONFIG_VIDEO_LCD_TL059WV5C0=y
> -CONFIG_USB_MUSB_SUNXI=y
> +CONFIG_USB_MUSB_HOST=y
> CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-utoo-p66"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> CONFIG_SPL=y
> diff --git a/configs/Yones_Toptech_BD1078_defconfig b/configs/Yones_Toptech_BD1078_defconfig
> index aab580e..81ba4de 100644
> --- a/configs/Yones_Toptech_BD1078_defconfig
> +++ b/configs/Yones_Toptech_BD1078_defconfig
> @@ -16,7 +16,7 @@ CONFIG_VIDEO_LCD_BL_EN="PH7"
> CONFIG_VIDEO_LCD_BL_PWM="PB2"
> # CONFIG_VIDEO_LCD_BL_PWM_ACTIVE_LOW is not set
> CONFIG_VIDEO_LCD_PANEL_LVDS=y
> -CONFIG_USB_MUSB_SUNXI=y
> +CONFIG_USB_MUSB_HOST=y
> CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-yones-toptech-bd1078"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> CONFIG_SPL=y
> diff --git a/configs/forfun_q88db_defconfig b/configs/forfun_q88db_defconfig
> index 85c807a..547bf78 100644
> --- a/configs/forfun_q88db_defconfig
> +++ b/configs/forfun_q88db_defconfig
> @@ -9,7 +9,7 @@ CONFIG_VIDEO_LCD_MODE="x:800,y:480,depth:18,pclk_khz:33000,le:87,ri:40,up:31,lo:
> CONFIG_VIDEO_LCD_POWER="AXP0-0"
> CONFIG_VIDEO_LCD_BL_EN="AXP0-1"
> CONFIG_VIDEO_LCD_BL_PWM="PB2"
> -CONFIG_USB_MUSB_SUNXI=y
> +CONFIG_USB_MUSB_HOST=y
> CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-forfun-q88db"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> CONFIG_SPL=y
> diff --git a/configs/ga10h_v1_1_defconfig b/configs/ga10h_v1_1_defconfig
> index 315627d..1fb15f4 100644
> --- a/configs/ga10h_v1_1_defconfig
> +++ b/configs/ga10h_v1_1_defconfig
> @@ -13,7 +13,7 @@ CONFIG_VIDEO_LCD_POWER="PH7"
> CONFIG_VIDEO_LCD_BL_EN="PH6"
> CONFIG_VIDEO_LCD_BL_PWM="PH0"
> CONFIG_VIDEO_LCD_PANEL_LVDS=y
> -CONFIG_USB_MUSB_SUNXI=y
> +CONFIG_USB_MUSB_HOST=y
> CONFIG_DEFAULT_DEVICE_TREE="sun8i-a33-ga10h-v1.1"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> CONFIG_SPL=y
> diff --git a/configs/iNet_3F_defconfig b/configs/iNet_3F_defconfig
> index 54de300..138ad62 100644
> --- a/configs/iNet_3F_defconfig
> +++ b/configs/iNet_3F_defconfig
> @@ -11,7 +11,7 @@ CONFIG_VIDEO_LCD_POWER="PH8"
> CONFIG_VIDEO_LCD_BL_EN="PH7"
> CONFIG_VIDEO_LCD_BL_PWM="PB2"
> CONFIG_VIDEO_LCD_PANEL_LVDS=y
> -CONFIG_USB_MUSB_SUNXI=y
> +CONFIG_USB_MUSB_HOST=y
> CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-inet-3f"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> CONFIG_SPL=y
> diff --git a/configs/iNet_3W_defconfig b/configs/iNet_3W_defconfig
> index e1beac8..c0d82b3 100644
> --- a/configs/iNet_3W_defconfig
> +++ b/configs/iNet_3W_defconfig
> @@ -11,7 +11,7 @@ CONFIG_VIDEO_LCD_MODE="x:1024,y:768,depth:24,pclk_khz:65000,le:159,ri:160,up:22,
> CONFIG_VIDEO_LCD_POWER="PH8"
> CONFIG_VIDEO_LCD_BL_EN="PH7"
> CONFIG_VIDEO_LCD_BL_PWM="PB2"
> -CONFIG_USB_MUSB_SUNXI=y
> +CONFIG_USB_MUSB_HOST=y
> CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-inet-3w"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> CONFIG_SPL=y
> diff --git a/configs/iNet_86VS_defconfig b/configs/iNet_86VS_defconfig
> index 627e211..a512191 100644
> --- a/configs/iNet_86VS_defconfig
> +++ b/configs/iNet_86VS_defconfig
> @@ -9,7 +9,7 @@ CONFIG_VIDEO_LCD_MODE="x:800,y:480,depth:18,pclk_khz:33000,le:45,ri:209,up:22,lo
> CONFIG_VIDEO_LCD_POWER="AXP0-0"
> CONFIG_VIDEO_LCD_BL_EN="AXP0-1"
> CONFIG_VIDEO_LCD_BL_PWM="PB2"
> -CONFIG_USB_MUSB_SUNXI=y
> +CONFIG_USB_MUSB_HOST=y
> CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-inet-86vs"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> CONFIG_SPL=y
> diff --git a/drivers/usb/musb-new/Kconfig b/drivers/usb/musb-new/Kconfig
> index 5be072a..0082ff8 100644
> --- a/drivers/usb/musb-new/Kconfig
> +++ b/drivers/usb/musb-new/Kconfig
> @@ -18,7 +18,7 @@ if USB_MUSB_HOST || USB_MUSB_GADGET
> config USB_MUSB_SUNXI
> bool "Enable sunxi OTG / DRC USB controller"
> depends on ARCH_SUNXI
> - default n
> + default y
> ---help---
> Say y here to enable support for the sunxi OTG / DRC USB controller
> used on almost all sunxi boards. Note currently u-boot can only have
>