Hi Ian, Hans, On Mon, Sep 8, 2014 at 9:28 PM, Chen-Yu Tsai <w...@csie.org> wrote: > 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.
The other patches are for the next release, but maybe this fix could go into 2014.10? Thanks ChenYu > > Signed-off-by: Chen-Yu Tsai <w...@csie.org> > --- > include/configs/sunxi-common.h | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h > index 1d947d7..a31656e 100644 > --- a/include/configs/sunxi-common.h > +++ b/include/configs/sunxi-common.h > @@ -233,10 +233,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) > > -- > 2.1.0 > _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
