On Sunday, July 27, 2014 at 12:22:31 AM, Hans de Goede wrote: > Hi, > > On Fri, 2014-07-25 at 18:31 +0200, Marek Vasut wrote: > > On Friday, July 25, 2014 at 06:06:45 PM, Ian Campbell wrote: > > > On Fri, 2014-07-25 at 17:41 +0200, Marek Vasut wrote: > <snip> > > > > > If you pick all but 2/5 right now, I am happy with that. It will > > > > prevent conflicts. I will pick 2/5 only after that . Let's do it > > > > like that. Roman will also have to resend only 2/5 once fixed. > > > > > > Some patches (e.g. #5) don't make much sense without #2, but they are > > > harmless and when things eventually meet in whichever upstream tree it > > > should all (hopefully!) burst into life. Does that sound ok? > > > > Yes, let's do it this way please. I will pick a new version of 2/5 only, > > you pick the rest now. > > I've been working on u-boot-sunxi next today to add support for more boards > upstream, and I thought it would be good to cherry pick this set first so > that I can add the necessary CONFIG_USB_EHCI in boards.cfg for boards > which support this right away, but this causes builds to fail, e.g. : > > drivers/usb/host/built-in.o: In function `usb_lowlevel_stop': > /home/hans/projects/sunxi/u-boot/drivers/usb/host/ehci-hcd.c:923: undefined > reference to `ehci_hcd_stop' drivers/usb/host/built-in.o: In function > `usb_lowlevel_init': > /home/hans/projects/sunxi/u-boot/drivers/usb/host/ehci-hcd.c:935: undefined > reference to `ehci_hcd_init' arm-linux-gnu-ld.bfd: BFD version > 2.24.0-4.fc21 20140613 assertion fail > ../../binutils-2.24/bfd/elf32-arm.c:7696 arm-linux-gnu-ld.bfd: BFD version > 2.24.0-4.fc21 20140613 assertion fail > ../../binutils-2.24/bfd/elf32-arm.c:7696 arm-linux-gnu-ld.bfd: error: > required section '.rel.plt' not found in the linker script > arm-linux-gnu-ld.bfd: final link failed: Invalid operation > Makefile:986: recipe for target 'u-boot' failed > > So merging 1 and 3-5 to the sunxi tree while merging 2 through your > (Marek's) tree does not seem to be the best idea. I think it would be best > to take this patch (patch 2) through the sunxi tree too, with your ack > (once your happy with it). > > Roman, this means that it would be nice to get a v4 from you soon, so that > we can line up the next bunch of patches for mainline.
OK, then please pick them all up. Best regards, Marek Vasut -- You received this message because you are subscribed to the Google Groups "linux-sunxi" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
