summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorChen-Yu Tsai <wens@csie.org>2014-10-03 20:16:22 +0800
committerHans de Goede <hdegoede@redhat.com>2014-10-24 09:35:37 +0200
commit859b3f1432df7210f118fdbe6535afa4426e49f2 (patch)
treea10bc8fc31a4afb48c7279df33c9727244219ebb /include
parentea520947b125ebd7ce63fae2cbfb6937727eae0a (diff)
downloadblackbird-obmc-uboot-859b3f1432df7210f118fdbe6535afa4426e49f2.tar.gz
blackbird-obmc-uboot-859b3f1432df7210f118fdbe6535afa4426e49f2.zip
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 <wens@csie.org> Acked-by: Ian Campbell <ijc@hellion.org.uk>
Diffstat (limited to 'include')
-rw-r--r--include/configs/sunxi-common.h8
1 files changed, 7 insertions, 1 deletions
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)
OpenPOWER on IntegriCloud