On Fri, Jul 20, 2012 at 2:19 AM, Wolfgang Denk <w...@denx.de> wrote: > Dear Marek, > > In message <201207191452.53818.ma...@denx.de> you wrote: >> >> please apply this into the current release. I'm hereby commiting seppuku. > > > PLEASE send such pull reqeusts to the mailing list, so everybody can > see it. > > >> The following changes since commit 66714b1a6df0a5a9f1656a6d4e6eea3c7ecdf7ae: >> >> Merge branch 'next' of git://git.denx.de/u-boot-video (2012-07-18 10:47:03 >> +0200) >> >> are available in the git repository at: >> >> >> git://git.denx.de/u-boot-usb.git master >> >> for you to fetch changes up to 1b4bd0e66cd3b5124669c78bc968510b1040e9d9: >> >> usb_storage: fix ehci driver max transfer size (2012-07-18 14:46:19 +0200) >> >> ---------------------------------------------------------------- >> Ilya Yanok (6): >> ehci-hcd: program asynclistaddr before every transfer >> ehci-hcd: fix external buffer cache handling >> usb: pass cache-aligned buffer to usb_get_descriptor() >> usb: check return value of submit_{control, bulk}_msg >> ehci-hcd: change debug() to printf() in case of errors >> smsc95xx: align buffers to cache line size >> >> Marek Vasut (1): >> common.h: Introduce DEFINE_CACHE_ALIGN_BUFFER >> >> Stefan Herbrechtsmeier (1): >> usb_storage: fix ehci driver max transfer size >> >> Tom Rini (2): >> ehci-omap: Do not call dcache_off from omap_ehci_hcd_init >> ehci-hcd.c, musb_core, usb.h: Add USB_DMA_MINALIGN define for cache >> alignment >> >> common/usb.c | 12 ++++++++---- >> common/usb_storage.c | 37 +++++++++++++++++++---------------- >> drivers/usb/eth/smsc95xx.c | 13 +++++++++---- >> drivers/usb/host/ehci-hcd.c | 96 >> ++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------- >> drivers/usb/host/ehci-omap.c | 1 - >> drivers/usb/musb/musb_core.h | 2 +- >> include/common.h | 21 +++++++++++++++++--- >> include/usb.h | 10 ++++++++++ >> 8 files changed, 117 insertions(+), 75 deletions(-) > > Applied, thanks.
I think this merge is causing issues. Resetting to the previous merge (ad8439d Merge branch 'sf' of git://git.denx.de/u-boot-blackfin) and the issues go away. -M Generating include/generated/asm-offsets.h bootm.c:329:16: error: expected ')' before '__attribute__' bootm.c:329:25: error: expected identifier or '(' before ')' token bootm.c:59:13: warning: 'boot_jump_linux' defined but not used bootm.c:177:13: warning: 'boot_prep_linux' defined but not used bootm.c:249:12: warning: 'boot_body_linux' defined but not used make[2]: *** [bootm.o] Error 1 make[2]: *** Waiting for unfinished jobs.... fm.c: In function 'fm_init_common': /local/home/mattsm/git/u-boot/include/common.h:344:12: sorry, unimplemented: inlining failed in call to 'setenv': function body not available fm.c:420:8: sorry, unimplemented: called from here make[2]: *** [fm.o] Error 1 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [arch/powerpc/lib/libpowerpc.o] Error 2 make[1]: *** Waiting for unfinished jobs.... make[1]: *** [drivers/net/fm/libfm.o] Error 2 bootp.c: In function 'DhcpHandler': /local/home/mattsm/git/u-boot/include/common.h:344:12: sorry, unimplemented: inlining failed in call to 'setenv': function body not available bootp.c:119:9: sorry, unimplemented: called from here make[2]: *** [bootp.o] Error 1 make[2]: *** Waiting for unfinished jobs.... net.c: In function 'NetLoop': /local/home/mattsm/git/u-boot/include/common.h:344:12: sorry, unimplemented: inlining failed in call to 'setenv': function body not available net.c:516:11: sorry, unimplemented: called from here /local/home/mattsm/git/u-boot/include/common.h:344:12: sorry, unimplemented: inlining failed in call to 'setenv': function body not available net.c:519:11: sorry, unimplemented: called from here make[2]: *** [net.o] Error 1 make[1]: *** [net/libnet.o] Error 2 cmd_net.c: In function 'netboot_common': /local/home/mattsm/git/u-boot/include/common.h:344:12: sorry, unimplemented: inlining failed in call to 'setenv': function body not available cmd_net.c:138:10: sorry, unimplemented: called from here -M > > Best regards, > > Wolfgang Denk > > -- > DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel > HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany > Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de > Substitute "damn" every time you're inclined to write "very"; your > editor will delete it and the writing will be just as it should be. > - Mark Twain > _______________________________________________ > U-Boot mailing list > U-Boot@lists.denx.de > http://lists.denx.de/mailman/listinfo/u-boot _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot