From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jean-Jacques Hiblot Date: Tue, 15 Oct 2019 18:59:16 +0200 Subject: [U-Boot] [PULL] u-boot-usb/master In-Reply-To: <6a213035-858a-f352-0b8e-e61a15827715@ti.com> References: <20191015005944.GJ16029@bill-the-cat> <145492b6-8e1c-bde1-94ee-6fc0922d9b3e@denx.de> <6a213035-858a-f352-0b8e-e61a15827715@ti.com> Message-ID: List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit To: u-boot@lists.denx.de On 15/10/2019 11:36, Jean-Jacques Hiblot wrote: > Hi Marek, > > On 15/10/2019 03:01, Marek Vasut wrote: >> On 10/15/19 2:59 AM, Tom Rini wrote: >>> On Tue, Oct 15, 2019 at 01:34:57AM +0200, Marek Vasut wrote: >>> >>>> The following changes since commit >>>> 44fb0d6c9f5147a41c710032869e5e01b3c9e310: >>>> >>>>    Merge tag 'xilinx-for-v2020.01' of >>>> https://gitlab.denx.de/u-boot/custodians/u-boot-microblaze (2019-10-09 >>>> 16:22:03 -0400) >>>> >>>> are available in the Git repository at: >>>> >>>>    git://git.denx.de/u-boot-usb.git master >>>> >>>> for you to fetch changes up to >>>> 3cf0f7a8d485e4bf969628f5658e075084b2f013: >>>> >>>>    usb: ehci-mx6: Fix bus enumeration for iMX7 SoCs (2019-10-12 >>>> 13:07:32 >>>> +0200) >>>> >>> NAK.  From: https://gitlab.denx.de/u-boot/u-boot/-/jobs/19870 >>> sei510 rock64-rk3328 u200 odroid-n2 fail due to: >>> +drivers/usb/gadget/udc/built-in.o: In function >>> `usb_gadget_register_driver': >>> +drivers/usb/gadget/udc/udc-core.c:325: multiple definition of >>> `usb_gadget_register_driver' >>> +drivers/usb/gadget/built-in.o:drivers/usb/gadget/dwc2_udc_otg.c:238: >>> first defined here >>> +drivers/usb/gadget/udc/built-in.o: In function >>> `usb_gadget_unregister_driver': >>> +drivers/usb/gadget/udc/udc-core.c:334: multiple definition of >>> `usb_gadget_unregister_driver' >>> +drivers/usb/gadget/built-in.o:drivers/usb/gadget/dwc2_udc_otg.c:287: >>> first defined here >> Sigh, +CC Jean. > > Looks like v3 has been merged instead of the latest v4 which has the > changes in defconfig to prevent this. > > v4: https://patchwork.ozlabs.org/project/uboot/list/?series=130132 > > v3: https://patchwork.ozlabs.org/project/uboot/list/?series=116460&state=* > > Changes in v4: > - removed patches already merged (DWC3 fixes) > - update more defconfigs (u200, sei510, rock64-rk332 and odroid-n2) > - Fix the test of the USB_DWC3_GADGET option. IS_ENABLED() requires the >   whole option name including the 'CONFIG_' prefix > > JJ Travis build with v4 rebased on top of u-boot-usb/master (minus the v3 patches): https://travis-ci.org/jjhiblot/u-boot/jobs/598065745 > >> > _______________________________________________ > U-Boot mailing list > U-Boot at lists.denx.de > https://lists.denx.de/listinfo/u-boot