* [U-Boot] [GIT] Pull request: u-boot-dfu (10.01.2019)
@ 2019-01-09 23:21 Lukasz Majewski
2019-01-10 0:53 ` Marek Vasut
0 siblings, 1 reply; 8+ messages in thread
From: Lukasz Majewski @ 2019-01-09 23:21 UTC (permalink / raw)
To: u-boot
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
Makefile | 4 ++--
arch/arm/dts/omap5-u-boot.dtsi | 5 +++++
arch/arm/mach-imx/mx6/Kconfig | 2 +-
arch/arm/mach-imx/spl.c | 2 +-
common/spl/Kconfig | 4 ++--
configs/am335x_boneblack_vboot_defconfig | 2 +-
configs/am335x_evm_usbspl_defconfig | 2 +-
configs/am43xx_evm_defconfig | 2 +-
configs/am43xx_hs_evm_defconfig | 2 +-
configs/apalis_imx6_defconfig | 2 +-
configs/cm_t3517_defconfig | 1 +
configs/cm_t35_defconfig | 1 +
configs/colibri_imx6_defconfig | 2 +-
configs/display5_factory_defconfig | 2 +-
configs/duovero_defconfig | 1 +
configs/igep0032_defconfig | 1 +
configs/igep00x0_defconfig | 1 +
configs/imx6q_logic_defconfig | 2 +-
configs/mx6memcal_defconfig | 2 +-
configs/mx6sabresd_defconfig | 2 +-
configs/omap3_zoom1_defconfig | 1 +
configs/omap4_panda_defconfig | 1 +
configs/omap4_sdp4430_defconfig | 1 +
configs/pico-hobbit-imx6ul_defconfig | 2 +-
configs/pico-hobbit-imx7d_defconfig | 2 +-
configs/pico-imx6ul_defconfig | 2 +-
configs/pico-imx7d_defconfig | 2 +-
configs/pico-pi-imx6ul_defconfig | 2 +-
configs/pico-pi-imx7d_defconfig | 2 +-
configs/spear300_usbtty_defconfig | 2 ++
configs/spear300_usbtty_nand_defconfig | 2 ++
configs/spear310_usbtty_defconfig | 2 ++
configs/spear310_usbtty_nand_defconfig | 2 ++
configs/spear310_usbtty_pnor_defconfig | 2 ++
configs/spear320_usbtty_defconfig | 2 ++
configs/spear320_usbtty_nand_defconfig | 2 ++
configs/spear320_usbtty_pnor_defconfig | 2 ++
configs/spear600_usbtty_defconfig | 2 ++
configs/spear600_usbtty_nand_defconfig | 2 ++
drivers/Makefile | 6 +++---
drivers/usb/gadget/Makefile | 2 +-
drivers/usb/gadget/udc/Makefile | 3 ++-
drivers/usb/gadget/udc/udc-uclass.c | 7 +++++--
scripts/Makefile.spl | 2 +-
44 files changed, 67 insertions(+), 30 deletions(-)
Best regards,
Lukasz Majewski
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma at denx.de
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190110/ad4f1581/attachment.sig>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [U-Boot] [GIT] Pull request: u-boot-dfu (10.01.2019)
2019-01-09 23:21 [U-Boot] [GIT] Pull request: u-boot-dfu (10.01.2019) Lukasz Majewski
@ 2019-01-10 0:53 ` Marek Vasut
2019-01-10 7:37 ` Lukasz Majewski
0 siblings, 1 reply; 8+ messages in thread
From: Marek Vasut @ 2019-01-10 0:53 UTC (permalink / raw)
To: u-boot
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.
--
Best regards,
Marek Vasut
^ permalink raw reply [flat|nested] 8+ messages in thread
* [U-Boot] [GIT] Pull request: u-boot-dfu (10.01.2019)
2019-01-10 0:53 ` Marek Vasut
@ 2019-01-10 7:37 ` Lukasz Majewski
2019-01-10 8:51 ` Marek Vasut
0 siblings, 1 reply; 8+ messages in thread
From: Lukasz Majewski @ 2019-01-10 7:37 UTC (permalink / raw)
To: u-boot
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.
1) 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
Message-id: <2023e035-748e-ac0d-0dee-64cf000ffe77@ti.com>
Best regards,
Lukasz Majewski
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma at denx.de
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190110/689241a1/attachment.sig>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [U-Boot] [GIT] Pull request: u-boot-dfu (10.01.2019)
2019-01-10 7:37 ` Lukasz Majewski
@ 2019-01-10 8:51 ` Marek Vasut
2019-01-10 9:20 ` Lukasz Majewski
2019-01-10 14:02 ` Jean-Jacques Hiblot
0 siblings, 2 replies; 8+ messages in thread
From: Marek Vasut @ 2019-01-10 8:51 UTC (permalink / raw)
To: u-boot
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.
>
> 1) 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 ?
--
Best regards,
Marek Vasut
^ permalink raw reply [flat|nested] 8+ messages in thread
* [U-Boot] [GIT] Pull request: u-boot-dfu (10.01.2019)
2019-01-10 8:51 ` Marek Vasut
@ 2019-01-10 9:20 ` Lukasz Majewski
2019-01-10 14:02 ` Jean-Jacques Hiblot
1 sibling, 0 replies; 8+ messages in thread
From: Lukasz Majewski @ 2019-01-10 9:20 UTC (permalink / raw)
To: u-boot
Hi Marek, Jean-Jacques
> 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.
> >
> > 1) 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 ?
>
I thought that this rename solves this issue.
However, Jean-Jacques could you provide explanation to the above
question?
Best regards,
Lukasz Majewski
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma at denx.de
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190110/a8b97b14/attachment.sig>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [U-Boot] [GIT] Pull request: u-boot-dfu (10.01.2019)
2019-01-10 8:51 ` Marek Vasut
2019-01-10 9:20 ` Lukasz Majewski
@ 2019-01-10 14:02 ` Jean-Jacques Hiblot
2019-01-10 14:12 ` Marek Vasut
1 sibling, 1 reply; 8+ messages in thread
From: Jean-Jacques Hiblot @ 2019-01-10 14:02 UTC (permalink / raw)
To: u-boot
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.
>>
>> 1) 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)
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [U-Boot] [GIT] Pull request: u-boot-dfu (10.01.2019)
2019-01-10 14:02 ` Jean-Jacques Hiblot
@ 2019-01-10 14:12 ` Marek Vasut
2019-01-10 14:45 ` Jean-Jacques Hiblot
0 siblings, 1 reply; 8+ messages in thread
From: Marek Vasut @ 2019-01-10 14:12 UTC (permalink / raw)
To: u-boot
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.
>>>
>>> 1) 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.
--
Best regards,
Marek Vasut
^ permalink raw reply [flat|nested] 8+ messages in thread
* [U-Boot] [GIT] Pull request: u-boot-dfu (10.01.2019)
2019-01-10 14:12 ` Marek Vasut
@ 2019-01-10 14:45 ` Jean-Jacques Hiblot
0 siblings, 0 replies; 8+ messages in thread
From: Jean-Jacques Hiblot @ 2019-01-10 14:45 UTC (permalink / raw)
To: u-boot
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.
>>>>
>>>> 1) 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.
>
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2019-01-10 14:45 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-09 23:21 [U-Boot] [GIT] Pull request: u-boot-dfu (10.01.2019) Lukasz Majewski
2019-01-10 0:53 ` Marek Vasut
2019-01-10 7:37 ` Lukasz Majewski
2019-01-10 8:51 ` Marek Vasut
2019-01-10 9:20 ` Lukasz Majewski
2019-01-10 14:02 ` Jean-Jacques Hiblot
2019-01-10 14:12 ` Marek Vasut
2019-01-10 14:45 ` Jean-Jacques Hiblot
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.