From: Chen-Yu Tsai Date: Fri, 3 Oct 2014 12:16:22 +0000 (+0800) Subject: ARM: sunxi: Fix build break when CONFIG_USB_EHCI is not defined X-Git-Tag: v2015.01-rc1~127^2~31 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=859b3f1432df7210f118fdbe6535afa4426e49f2;p=u-boot ARM: sunxi: Fix build break when CONFIG_USB_EHCI is not defined BOOT_TARGET_DEVICES includes USB unconditionally. This breaks when CONFIG_CMD_USB is not defined. Use a secondary macro to conditionally include it when CONFIG_EHCI is enabled, as we do for CONFIG_AHCI. Signed-off-by: Chen-Yu Tsai Acked-by: Ian Campbell --- diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index 0c117bc5e7..318f526d34 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -231,10 +231,16 @@ #define BOOT_TARGET_DEVICES_SCSI(func) #endif +#ifdef CONFIG_USB_EHCI +#define BOOT_TARGET_DEVICES_USB(func) func(USB, usb, 0) +#else +#define BOOT_TARGET_DEVICES_USB(func) +#endif + #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 0) \ BOOT_TARGET_DEVICES_SCSI(func) \ - func(USB, usb, 0) \ + BOOT_TARGET_DEVICES_USB(func) \ func(PXE, pxe, na) \ func(DHCP, dhcp, na)