On 10/01/2019 15:12, Marek Vasut wrote:
On 1/10/19 3:02 PM, Jean-Jacques Hiblot wrote:
On 10/01/2019 09:51, Marek Vasut wrote:
On 1/10/19 8:37 AM, Lukasz Majewski wrote:
On Thu, 10 Jan 2019 01:53:23 +0100 Marek Vasut marex@denx.de wrote:
On 1/10/19 12:21 AM, Lukasz Majewski wrote:
Dear Marek,
I've build tested the patch set from Jean-Jacques on sunxi:
./tools/buildman/buildman.py --branch=HEAD sunxi --detail --verbose --show_errors --force-build --count=5 --output-dir=../BUILD/
It also passes on Travis-CI: https://travis-ci.org/lmajewski/u-boot-dfu/builds/477104303
The following changes since commit 7436f5e54d35bcad53befec90e2e67288071f74e:
Merge tag 'for-master-20190103' of git://git.denx.de/u-boot-rockchip (2019-01-03 08:39:44 -0500)
are available in the git repository at:
git://git.denx.de/u-boot-dfu.git
for you to fetch changes up to 97f2e6987887777eba9ee0ea51b3c2f34e989788:
dm: usb: gadget: Fix boot breakage on sunxi platforms (2019-01-09 01:04:36 +0100)
Jean-Jacques Hiblot (5): dm: usb: udc: Use SEQ_ALIAS to index the USB gadget ports ARM: dts: define USB aliases for all omap5 platforms Kconfig: rename CONFIG_SPL_USB_GADGET_SUPPORT as CONFIG_SPL_USB_GADGET usb: Make compiling gadget support optional dm: usb: gadget: Fix boot breakage on sunxi platforms
I think that's the wrong patch at the end, it still unconditionally pulls in udc-uclass.o if CONFIG_$(SPL_)DM is enabled.
This is the order proposed by Jean-Jacques:
Just changing the order should be enough to prevent any breakage.
- Kconfig: rename CONFIG_SPL_USB_GADGET_SUPPORT as
CONFIG_SPL_USB_GADGET 2) usb: Make compiling gadget support optional 3) dm: usb: gadget: Fix boot breakage on sunxi platforms
But it's still unconditionally pulling in UDC code if DM is enabled, which is what I was complaining in the previous PR too , can you explain why ?
No it does not because the code in drivers/usb/gadget/udc is not compiled if CONFIG_$(SPL_)_USB_GADGET is not set (patch #2)
Ah, I see, thanks.
I wanted to apply this PR, but got conflict:
Auto-merging configs/omap4_panda_defconfig CONFLICT (content): Merge conflict in configs/omap4_panda_defconfig Auto-merging configs/duovero_defconfig CONFLICT (content): Merge conflict in configs/duovero_defconfig Auto-merging Makefile error: could not apply b5d6e0f7b0... usb: Make compiling gadget support optional
I guess something minor changed in the config files, can you respin the PR one more time ? I pushed u-boot-usb/master updated on u-boot/master just now.
Done.