[U-Boot] [PATCH 10/12] sunxi: config update to stick with Kconfig changes

Hans de Goede
2015-07-22T09:33:50Z

Hi,

On 22-07-15 10:45, Paul Kocialkowski wrote:
> Now that some things were updated in Kconfig, they should be reflected on the
> sunxi-common config too.
>
> Signed-off-by: Paul Kocialkowski <contact@paulk.fr>

Ack.

Regards,

Hans

> ---
> include/configs/sunxi-common.h | 8 +++-----
> 1 file changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
> index e34c57c..3d57129 100644
> --- a/include/configs/sunxi-common.h
> +++ b/include/configs/sunxi-common.h
> @@ -318,7 +318,7 @@ extern int soft_i2c_gpio_scl;
> #define CONFIG_PHYLIB
> #endif
>
> -#ifdef CONFIG_USB_EHCI
> +#ifdef CONFIG_USB_EHCI_HCD
> #define CONFIG_USB_OHCI_NEW
> #define CONFIG_USB_OHCI_SUNXI
> #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 1
> @@ -326,13 +326,11 @@ extern int soft_i2c_gpio_scl;
> #endif
>
> #ifdef CONFIG_USB_MUSB_SUNXI
> -#define CONFIG_USB_MUSB_HOST
> #define CONFIG_USB_MUSB_PIO_ONLY
> #endif
>
> -#if defined CONFIG_USB_EHCI || defined CONFIG_USB_MUSB_SUNXI
> +#if defined CONFIG_USB_EHCI_HCD || defined CONFIG_USB_MUSB_HOST
> #define CONFIG_CMD_USB
> -#define CONFIG_USB_STORAGE
> #endif
>
> #ifdef CONFIG_USB_KEYBOARD
> @@ -384,7 +382,7 @@ extern int soft_i2c_gpio_scl;
> #define BOOT_TARGET_DEVICES_SCSI(func)
> #endif
>
> -#ifdef CONFIG_USB_EHCI
> +#ifdef CONFIG_USB_STORAGE
> #define BOOT_TARGET_DEVICES_USB(func) func(USB, usb, 0)
> #else
> #define BOOT_TARGET_DEVICES_USB(func)
>