Skip to contentSkip to conversation

Pull request: u-boot-dfu (10.01.2019)

U-Boot Lukasz Majewski 3 participants 8 messages Jan 9, 2019 – Jan 10, 2019

lore
Share & tools
lore
#0 lore raw

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>

#1 lore raw
Quoted 25 lines · Lukasz Majewski

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)

Quoted 8 lines

----------------------------------------------------------------
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.

Signature · 2 lines
Best regards,
Marek Vasut
#2 lore raw
Quoted 36 lines · On Thu, 10 Jan 2019 01:53:23 +0100 Marek Vasut <[email protected]> wrote:
Quoted 26 lines · Lukasz Majewski

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)

Quoted 8 lines

----------------------------------------------------------------
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

Quoted 3 lines

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: <[email protected]>

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>

#3 lore raw
Quoted 43 lines · Lukasz Majewski
Quoted 36 lines · On Thu, 10 Jan 2019 01:53:23 +0100 Marek Vasut <[email protected]> wrote:
Quoted 26 lines · Lukasz Majewski

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)

Quoted 8 lines

----------------------------------------------------------------
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

Quoted 3 lines

I think that's the wrong patch at the end, it still unconditionally pulls in udc-uclass.o if CONFIG_$(SPL_)DM is enabled.

Quoted 8 lines

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 ?

Signature · 2 lines
Best regards,
Marek Vasut
#4 lore raw

Hi Marek, Jean-Jacques

Quoted 49 lines · Lukasz Majewski
Quoted 48 lines
Quoted 37 lines · On Thu, 10 Jan 2019 01:53:23 +0100 Marek Vasut <[email protected]> wrote:
Quoted 27 lines · Lukasz Majewski

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)

Quoted 8 lines

----------------------------------------------------------------
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

Quoted 3 lines

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.

Quoted 9 lines
Quoted 4 lines

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>

#5 lore raw
In reply to Marek Vasut
Quoted 46 lines · Marek Vasut
Quoted 45 lines · Lukasz Majewski
Quoted 35 lines · On Thu, 10 Jan 2019 01:53:23 +0100 Marek Vasut <[email protected]> wrote:
Quoted 26 lines · Lukasz Majewski

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)

Quoted 8 lines

----------------------------------------------------------------
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

Quoted 3 lines

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.

Quoted 7 lines
Quoted 4 lines

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)

Quoted 1 line
#6 lore raw
Quoted 52 lines · Jean-Jacques Hiblot
Quoted 50 lines · Marek Vasut
Quoted 49 lines · Lukasz Majewski
Quoted 35 lines · On Thu, 10 Jan 2019 01:53:23 +0100 Marek Vasut <[email protected]> wrote:
Quoted 26 lines · Lukasz Majewski

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)

Quoted 8 lines

----------------------------------------------------------------
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

Quoted 3 lines

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

Quoted 6 lines
Quoted 3 lines

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.

Signature · 2 lines
Best regards,
Marek Vasut
#7 lore raw
Quoted 69 lines · Marek Vasut
Quoted 51 lines · Jean-Jacques Hiblot
Quoted 50 lines · Marek Vasut
Quoted 49 lines · Lukasz Majewski
Quoted 35 lines · On Thu, 10 Jan 2019 01:53:23 +0100 Marek Vasut <[email protected]> wrote:
Quoted 26 lines · Lukasz Majewski

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)

Quoted 8 lines

----------------------------------------------------------------
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

Quoted 3 lines

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

Quoted 5 lines
Quoted 3 lines

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

Quoted 3 lines

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.

Quoted 1 line