[U-Boot] [PATCH PATCH v1 0/2] Use CONFIG_USB_GADGET and CONFIG_SPL_USB_GADGET to select the USB gadget code
This series applies on top of u-boot-dfu.
This series renames CONFIG_SPL_USB_GADGET_SUPPORT to CONFIG_SPL_USB_GADGET for consistency. It also uses CONFIG_USB_GADGET to compile-in the gadget code. This make sure that the code is not included if it is not needed. Some defconfigs had to be updated as they relied on the gadget code to be always compiled.
TRAVIS: https://travis-ci.org/jjhiblot/u-boot/builds/476452900
Jean-Jacques Hiblot (2): Kconfig: rename CONFIG_SPL_USB_GADGET_SUPPORT as CONFIG_SPL_USB_GADGET usb: Make compiling gadget support optional
Makefile | 4 ++-- 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 +- scripts/Makefile.spl | 2 +- 41 files changed, 55 insertions(+), 27 deletions(-)
The SPL option for USB gadget should be named after the option for u-boot (CONFIG_USB_GADGET)
Signed-off-by: Jean-Jacques Hiblot jjhiblot@ti.com ---
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/colibri_imx6_defconfig | 2 +- configs/display5_factory_defconfig | 2 +- configs/imx6q_logic_defconfig | 2 +- configs/mx6memcal_defconfig | 2 +- configs/mx6sabresd_defconfig | 2 +- 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 +- drivers/Makefile | 6 +++--- drivers/usb/gadget/Makefile | 2 +- scripts/Makefile.spl | 2 +- 22 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig index e7cce46..3d56346 100644 --- a/arch/arm/mach-imx/mx6/Kconfig +++ b/arch/arm/mach-imx/mx6/Kconfig @@ -263,7 +263,7 @@ config TARGET_MX6DL_MAMOJ select SPL_PINCTRL if SPL select SPL_SEPARATE_BSS if SPL select SPL_SERIAL_SUPPORT if SPL - select SPL_USB_GADGET_SUPPORT if SPL + select SPL_USB_GADGET if SPL select SPL_USB_HOST_SUPPORT if SPL select SPL_USB_SDP_SUPPORT if SPL select SPL_WATCHDOG_SUPPORT if SPL diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c index 58a9227..397d6d4 100644 --- a/arch/arm/mach-imx/spl.c +++ b/arch/arm/mach-imx/spl.c @@ -154,7 +154,7 @@ u32 spl_boot_device(void) } #endif /* CONFIG_MX7 || CONFIG_IMX8M */
-#ifdef CONFIG_SPL_USB_GADGET_SUPPORT +#ifdef CONFIG_SPL_USB_GADGET int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name) { put_unaligned(CONFIG_USB_GADGET_PRODUCT_NUM + 0xfff, &dev->idProduct); diff --git a/common/spl/Kconfig b/common/spl/Kconfig index 35472f4..37ecbc6 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -776,13 +776,13 @@ config SPL_USB_SUPPORT config options. This enables loading from USB using a configured device.
-config SPL_USB_GADGET_SUPPORT +config SPL_USB_GADGET bool "Suppport USB Gadget drivers" help Enable USB Gadget API which allows to enable USB device functions in SPL.
-if SPL_USB_GADGET_SUPPORT +if SPL_USB_GADGET
config SPL_USB_ETHER bool "Support USB Ethernet drivers" diff --git a/configs/am335x_boneblack_vboot_defconfig b/configs/am335x_boneblack_vboot_defconfig index be04424..eb46ebd 100644 --- a/configs/am335x_boneblack_vboot_defconfig +++ b/configs/am335x_boneblack_vboot_defconfig @@ -16,7 +16,7 @@ CONFIG_SPL_MUSB_NEW_SUPPORT=y CONFIG_SPL_NET_SUPPORT=y CONFIG_SPL_NET_VCI_STRING="AM33xx U-Boot SPL" CONFIG_SPL_OS_BOOT=y -CONFIG_SPL_USB_GADGET_SUPPORT=y +CONFIG_SPL_USB_GADGET=y CONFIG_SPL_USB_ETHER=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n" diff --git a/configs/am335x_evm_usbspl_defconfig b/configs/am335x_evm_usbspl_defconfig index ec72538..165b88f 100644 --- a/configs/am335x_evm_usbspl_defconfig +++ b/configs/am335x_evm_usbspl_defconfig @@ -16,7 +16,7 @@ CONFIG_SPL_MUSB_NEW_SUPPORT=y CONFIG_SPL_NET_SUPPORT=y CONFIG_SPL_NET_VCI_STRING="AM335x U-Boot SPL" CONFIG_SPL_OS_BOOT=y -CONFIG_SPL_USB_GADGET_SUPPORT=y +CONFIG_SPL_USB_GADGET=y CONFIG_SPL_USB_ETHER=y # CONFIG_SPL_YMODEM_SUPPORT is not set CONFIG_CMD_SPL=y diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig index 9bbda43..7e134a6 100644 --- a/configs/am43xx_evm_defconfig +++ b/configs/am43xx_evm_defconfig @@ -16,7 +16,7 @@ CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_NET_SUPPORT=y CONFIG_SPL_NET_VCI_STRING="AM43xx U-Boot SPL" CONFIG_SPL_OS_BOOT=y -CONFIG_SPL_USB_GADGET_SUPPORT=y +CONFIG_SPL_USB_GADGET=y CONFIG_SPL_USB_ETHER=y CONFIG_CMD_SPL=y CONFIG_CMD_SPL_NAND_OFS=0x00100000 diff --git a/configs/am43xx_hs_evm_defconfig b/configs/am43xx_hs_evm_defconfig index aaf8d10..0e7a178 100644 --- a/configs/am43xx_hs_evm_defconfig +++ b/configs/am43xx_hs_evm_defconfig @@ -25,7 +25,7 @@ CONFIG_SPL_NET_SUPPORT=y CONFIG_SPL_NET_VCI_STRING="AM43xx U-Boot SPL" CONFIG_SPL_USB_HOST_SUPPORT=y CONFIG_SPL_USB_SUPPORT=y -CONFIG_SPL_USB_GADGET_SUPPORT=y +CONFIG_SPL_USB_GADGET=y CONFIG_SPL_USB_ETHER=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_NAND=y diff --git a/configs/apalis_imx6_defconfig b/configs/apalis_imx6_defconfig index 133fc1a..e02d9bc 100644 --- a/configs/apalis_imx6_defconfig +++ b/configs/apalis_imx6_defconfig @@ -23,7 +23,7 @@ CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SPL_DMA_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_USB_HOST_SUPPORT=y -CONFIG_SPL_USB_GADGET_SUPPORT=y +CONFIG_SPL_USB_GADGET=y CONFIG_SPL_USB_SDP_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="Apalis iMX6 # " diff --git a/configs/colibri_imx6_defconfig b/configs/colibri_imx6_defconfig index d86c087..68f0746 100644 --- a/configs/colibri_imx6_defconfig +++ b/configs/colibri_imx6_defconfig @@ -23,7 +23,7 @@ CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SPL_DMA_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_USB_HOST_SUPPORT=y -CONFIG_SPL_USB_GADGET_SUPPORT=y +CONFIG_SPL_USB_GADGET=y CONFIG_SPL_USB_SDP_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="Colibri iMX6 # " diff --git a/configs/display5_factory_defconfig b/configs/display5_factory_defconfig index 6ef85e2..4c73a3a 100644 --- a/configs/display5_factory_defconfig +++ b/configs/display5_factory_defconfig @@ -25,7 +25,7 @@ CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_OS_BOOT=y CONFIG_SPL_SPI_LOAD=y CONFIG_SPL_USB_HOST_SUPPORT=y -CONFIG_SPL_USB_GADGET_SUPPORT=y +CONFIG_SPL_USB_GADGET=y CONFIG_SPL_USB_SDP_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_HUSH_PARSER=y diff --git a/configs/imx6q_logic_defconfig b/configs/imx6q_logic_defconfig index 036069a..46312a0 100644 --- a/configs/imx6q_logic_defconfig +++ b/configs/imx6q_logic_defconfig @@ -24,7 +24,7 @@ CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_OS_BOOT=y CONFIG_SPL_USB_HOST_SUPPORT=y -CONFIG_SPL_USB_GADGET_SUPPORT=y +CONFIG_SPL_USB_GADGET=y CONFIG_SPL_USB_SDP_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_SYS_PROMPT="i.MX6 Logic # " diff --git a/configs/mx6memcal_defconfig b/configs/mx6memcal_defconfig index 7356deb..e9e1fc2 100644 --- a/configs/mx6memcal_defconfig +++ b/configs/mx6memcal_defconfig @@ -11,7 +11,7 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,SPL,MX6QDL" CONFIG_SUPPORT_RAW_INITRD=y CONFIG_SPL_USB_HOST_SUPPORT=y -CONFIG_SPL_USB_GADGET_SUPPORT=y +CONFIG_SPL_USB_GADGET=y CONFIG_SPL_USB_ETHER=y CONFIG_SPL_USB_SDP_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y diff --git a/configs/mx6sabresd_defconfig b/configs/mx6sabresd_defconfig index e0202ef..1857c18 100644 --- a/configs/mx6sabresd_defconfig +++ b/configs/mx6sabresd_defconfig @@ -19,7 +19,7 @@ CONFIG_SPL_EXT_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_OS_BOOT=y CONFIG_SPL_USB_HOST_SUPPORT=y -CONFIG_SPL_USB_GADGET_SUPPORT=y +CONFIG_SPL_USB_GADGET=y CONFIG_SPL_USB_SDP_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_HUSH_PARSER=y diff --git a/configs/pico-hobbit-imx6ul_defconfig b/configs/pico-hobbit-imx6ul_defconfig index 362c0a2..556cad2 100644 --- a/configs/pico-hobbit-imx6ul_defconfig +++ b/configs/pico-hobbit-imx6ul_defconfig @@ -18,7 +18,7 @@ CONFIG_DEFAULT_FDT_FILE="imx6ul-pico-hobbit.dtb" CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_USB_HOST_SUPPORT=y -CONFIG_SPL_USB_GADGET_SUPPORT=y +CONFIG_SPL_USB_GADGET=y CONFIG_SPL_USB_SDP_SUPPORT=y CONFIG_CMD_BOOTMENU=y CONFIG_CMD_MEMTEST=y diff --git a/configs/pico-hobbit-imx7d_defconfig b/configs/pico-hobbit-imx7d_defconfig index b02cae5..f3f1612 100644 --- a/configs/pico-hobbit-imx7d_defconfig +++ b/configs/pico-hobbit-imx7d_defconfig @@ -18,7 +18,7 @@ CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd" CONFIG_DEFAULT_FDT_FILE="imx7d-pico-hobbit.dtb" CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_USB_HOST_SUPPORT=y -CONFIG_SPL_USB_GADGET_SUPPORT=y +CONFIG_SPL_USB_GADGET=y CONFIG_SPL_USB_SDP_SUPPORT=y # CONFIG_CMD_BOOTD is not set CONFIG_CMD_BOOTMENU=y diff --git a/configs/pico-imx6ul_defconfig b/configs/pico-imx6ul_defconfig index c8d58cb..a795f29 100644 --- a/configs/pico-imx6ul_defconfig +++ b/configs/pico-imx6ul_defconfig @@ -18,7 +18,7 @@ CONFIG_DEFAULT_FDT_FILE="ask" CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_USB_HOST_SUPPORT=y -CONFIG_SPL_USB_GADGET_SUPPORT=y +CONFIG_SPL_USB_GADGET=y CONFIG_SPL_USB_SDP_SUPPORT=y CONFIG_CMD_BOOTMENU=y CONFIG_CMD_SPL=y diff --git a/configs/pico-imx7d_defconfig b/configs/pico-imx7d_defconfig index f355f07..ccae960 100644 --- a/configs/pico-imx7d_defconfig +++ b/configs/pico-imx7d_defconfig @@ -18,7 +18,7 @@ CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd" CONFIG_DEFAULT_FDT_FILE="ask" CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_USB_HOST_SUPPORT=y -CONFIG_SPL_USB_GADGET_SUPPORT=y +CONFIG_SPL_USB_GADGET=y CONFIG_SPL_USB_SDP_SUPPORT=y # CONFIG_CMD_BOOTD is not set CONFIG_CMD_BOOTMENU=y diff --git a/configs/pico-pi-imx6ul_defconfig b/configs/pico-pi-imx6ul_defconfig index 680438d..91c05e3 100644 --- a/configs/pico-pi-imx6ul_defconfig +++ b/configs/pico-pi-imx6ul_defconfig @@ -18,7 +18,7 @@ CONFIG_DEFAULT_FDT_FILE="imx6ul-pico-pi.dtb" CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_USB_HOST_SUPPORT=y -CONFIG_SPL_USB_GADGET_SUPPORT=y +CONFIG_SPL_USB_GADGET=y CONFIG_SPL_USB_SDP_SUPPORT=y CONFIG_CMD_BOOTMENU=y CONFIG_CMD_MEMTEST=y diff --git a/configs/pico-pi-imx7d_defconfig b/configs/pico-pi-imx7d_defconfig index 3a182dc..44986ae 100644 --- a/configs/pico-pi-imx7d_defconfig +++ b/configs/pico-pi-imx7d_defconfig @@ -18,7 +18,7 @@ CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd" CONFIG_DEFAULT_FDT_FILE="imx7d-pico-pi.dtb" CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_USB_HOST_SUPPORT=y -CONFIG_SPL_USB_GADGET_SUPPORT=y +CONFIG_SPL_USB_GADGET=y CONFIG_SPL_USB_SDP_SUPPORT=y # CONFIG_CMD_BOOTD is not set CONFIG_CMD_BOOTMENU=y diff --git a/drivers/Makefile b/drivers/Makefile index 8c53e05..4105864 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -47,9 +47,9 @@ obj-$(CONFIG_SPL_ETH_SUPPORT) += net/ obj-$(CONFIG_SPL_ETH_SUPPORT) += net/phy/ obj-$(CONFIG_SPL_USB_ETHER) += net/phy/ obj-$(CONFIG_SPL_MUSB_NEW_SUPPORT) += usb/musb-new/ -obj-$(CONFIG_SPL_USB_GADGET_SUPPORT) += usb/gadget/ -obj-$(CONFIG_SPL_USB_GADGET_SUPPORT) += usb/common/ -obj-$(CONFIG_SPL_USB_GADGET_SUPPORT) += usb/gadget/udc/ +obj-$(CONFIG_SPL_USB_GADGET) += usb/gadget/ +obj-$(CONFIG_SPL_USB_GADGET) += usb/common/ +obj-$(CONFIG_SPL_USB_GADGET) += usb/gadget/udc/ obj-$(CONFIG_SPL_DFU_SUPPORT) += dfu/ obj-$(CONFIG_SPL_WATCHDOG_SUPPORT) += watchdog/ obj-$(CONFIG_SPL_USB_HOST_SUPPORT) += usb/host/ diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile index b74c1fd..01e2b3a 100644 --- a/drivers/usb/gadget/Makefile +++ b/drivers/usb/gadget/Makefile @@ -7,7 +7,7 @@ obj-$(CONFIG_USB_GADGET) += epautoconf.o config.o usbstring.o obj-$(CONFIG_USB_ETHER) += epautoconf.o config.o usbstring.o
ifdef CONFIG_SPL_BUILD -obj-$(CONFIG_SPL_USB_GADGET_SUPPORT) += g_dnl.o +obj-$(CONFIG_SPL_USB_GADGET) += g_dnl.o obj-$(CONFIG_SPL_DFU_SUPPORT) += f_dfu.o obj-$(CONFIG_SPL_USB_SDP_SUPPORT) += f_sdp.o endif diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl index 2ef19bf..29626e0 100644 --- a/scripts/Makefile.spl +++ b/scripts/Makefile.spl @@ -87,7 +87,7 @@ endif endif
libs-y += drivers/ -libs-$(CONFIG_SPL_USB_GADGET_SUPPORT) += drivers/usb/dwc3/ +libs-$(CONFIG_SPL_USB_GADGET) += drivers/usb/dwc3/ libs-y += dts/ libs-y += fs/ libs-$(CONFIG_SPL_POST_MEM_SUPPORT) += post/drivers/
There is no need to compile and include this code if it is not used. CONFIG_USB_GADGET can be used for the purpose.
Signed-off-by: Jean-Jacques Hiblot jjhiblot@ti.com
---
Makefile | 4 ++-- configs/cm_t3517_defconfig | 1 + configs/cm_t35_defconfig | 1 + configs/duovero_defconfig | 1 + configs/igep0032_defconfig | 1 + configs/igep00x0_defconfig | 1 + configs/omap3_zoom1_defconfig | 1 + configs/omap4_panda_defconfig | 1 + configs/omap4_sdp4430_defconfig | 1 + 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 ++ 19 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile index 27c0919..08af796 100644 --- a/Makefile +++ b/Makefile @@ -712,8 +712,8 @@ libs-y += drivers/usb/dwc3/ libs-y += drivers/usb/common/ libs-y += drivers/usb/emul/ libs-y += drivers/usb/eth/ -libs-y += drivers/usb/gadget/ -libs-y += drivers/usb/gadget/udc/ +libs-$(CONFIG_USB_GADGET) += drivers/usb/gadget/ +libs-$(CONFIG_USB_GADGET) += drivers/usb/gadget/udc/ libs-y += drivers/usb/host/ libs-y += drivers/usb/musb/ libs-y += drivers/usb/musb-new/ diff --git a/configs/cm_t3517_defconfig b/configs/cm_t3517_defconfig index 0901fea..c204a29 100644 --- a/configs/cm_t3517_defconfig +++ b/configs/cm_t3517_defconfig @@ -54,6 +54,7 @@ CONFIG_USB=y CONFIG_USB_MUSB_HOST=y CONFIG_USB_MUSB_AM35X=y CONFIG_USB_STORAGE=y +CONFIG_USB_GADGET=y CONFIG_VIDEO_OMAP3=y CONFIG_LCD=y CONFIG_OF_LIBFDT=y diff --git a/configs/cm_t35_defconfig b/configs/cm_t35_defconfig index f1fe2d0..a27c502 100644 --- a/configs/cm_t35_defconfig +++ b/configs/cm_t35_defconfig @@ -56,6 +56,7 @@ CONFIG_USB_MUSB_UDC=y CONFIG_USB_OMAP3=y CONFIG_TWL4030_USB=y CONFIG_USB_STORAGE=y +CONFIG_USB_GADGET=y CONFIG_VIDEO_OMAP3=y CONFIG_LCD=y CONFIG_OF_LIBFDT=y diff --git a/configs/duovero_defconfig b/configs/duovero_defconfig index 3c1fee4..e09a73d 100644 --- a/configs/duovero_defconfig +++ b/configs/duovero_defconfig @@ -36,6 +36,7 @@ CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_MUSB_UDC=y CONFIG_USB_OMAP3=y +CONFIG_USB_GADGET=y CONFIG_USB_STORAGE=y CONFIG_FAT_WRITE=y CONFIG_OF_LIBFDT=y diff --git a/configs/igep0032_defconfig b/configs/igep0032_defconfig index 3836487..20d2cf5 100644 --- a/configs/igep0032_defconfig +++ b/configs/igep0032_defconfig @@ -45,6 +45,7 @@ CONFIG_USB=y CONFIG_USB_MUSB_UDC=y CONFIG_USB_OMAP3=y CONFIG_TWL4030_USB=y +CONFIG_USB_GADGET=y CONFIG_FAT_WRITE=y CONFIG_UBIFS_SILENCE_MSG=y CONFIG_BCH=y diff --git a/configs/igep00x0_defconfig b/configs/igep00x0_defconfig index f2989e3..330350c 100644 --- a/configs/igep00x0_defconfig +++ b/configs/igep00x0_defconfig @@ -46,6 +46,7 @@ CONFIG_USB=y CONFIG_USB_MUSB_UDC=y CONFIG_USB_OMAP3=y CONFIG_TWL4030_USB=y +CONFIG_USB_GADGET=y CONFIG_FAT_WRITE=y CONFIG_UBIFS_SILENCE_MSG=y CONFIG_BCH=y diff --git a/configs/omap3_zoom1_defconfig b/configs/omap3_zoom1_defconfig index 325c002..489e6a8 100644 --- a/configs/omap3_zoom1_defconfig +++ b/configs/omap3_zoom1_defconfig @@ -35,5 +35,6 @@ CONFIG_USB=y CONFIG_USB_MUSB_UDC=y CONFIG_USB_OMAP3=y CONFIG_TWL4030_USB=y +CONFIG_USB_GADGET=y CONFIG_FAT_WRITE=y CONFIG_OF_LIBFDT=y diff --git a/configs/omap4_panda_defconfig b/configs/omap4_panda_defconfig index 41df480..3852aed 100644 --- a/configs/omap4_panda_defconfig +++ b/configs/omap4_panda_defconfig @@ -36,6 +36,7 @@ CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_MUSB_UDC=y CONFIG_USB_OMAP3=y +CONFIG_USB_GADGET=y CONFIG_USB_STORAGE=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_SMSC95XX=y diff --git a/configs/omap4_sdp4430_defconfig b/configs/omap4_sdp4430_defconfig index 6b2ea20..0e01c8e 100644 --- a/configs/omap4_sdp4430_defconfig +++ b/configs/omap4_sdp4430_defconfig @@ -33,6 +33,7 @@ CONFIG_OMAP3_SPI=y CONFIG_USB=y CONFIG_USB_MUSB_UDC=y CONFIG_USB_OMAP3=y +CONFIG_USB_GADGET=y CONFIG_FAT_WRITE=y # CONFIG_REGEX is not set CONFIG_OF_LIBFDT=y diff --git a/configs/spear300_usbtty_defconfig b/configs/spear300_usbtty_defconfig index bc0c3ec..cb115fe 100644 --- a/configs/spear300_usbtty_defconfig +++ b/configs/spear300_usbtty_defconfig @@ -27,3 +27,5 @@ CONFIG_PHY_GIGE=y CONFIG_ETH_DESIGNWARE=y CONFIG_MII=y CONFIG_CONS_INDEX=0 +CONFIG_USB=y +CONFIG_USB_GADGET=y diff --git a/configs/spear300_usbtty_nand_defconfig b/configs/spear300_usbtty_nand_defconfig index 9b90cd8..4064ba3 100644 --- a/configs/spear300_usbtty_nand_defconfig +++ b/configs/spear300_usbtty_nand_defconfig @@ -28,3 +28,5 @@ CONFIG_PHY_GIGE=y CONFIG_ETH_DESIGNWARE=y CONFIG_MII=y CONFIG_CONS_INDEX=0 +CONFIG_USB=y +CONFIG_USB_GADGET=y diff --git a/configs/spear310_usbtty_defconfig b/configs/spear310_usbtty_defconfig index 7786e66..9373df8 100644 --- a/configs/spear310_usbtty_defconfig +++ b/configs/spear310_usbtty_defconfig @@ -27,3 +27,5 @@ CONFIG_PHY_GIGE=y CONFIG_ETH_DESIGNWARE=y CONFIG_MII=y CONFIG_CONS_INDEX=0 +CONFIG_USB=y +CONFIG_USB_GADGET=y diff --git a/configs/spear310_usbtty_nand_defconfig b/configs/spear310_usbtty_nand_defconfig index 1d41522..a4f09a2 100644 --- a/configs/spear310_usbtty_nand_defconfig +++ b/configs/spear310_usbtty_nand_defconfig @@ -28,3 +28,5 @@ CONFIG_PHY_GIGE=y CONFIG_ETH_DESIGNWARE=y CONFIG_MII=y CONFIG_CONS_INDEX=0 +CONFIG_USB=y +CONFIG_USB_GADGET=y diff --git a/configs/spear310_usbtty_pnor_defconfig b/configs/spear310_usbtty_pnor_defconfig index b5214b5..8263454 100644 --- a/configs/spear310_usbtty_pnor_defconfig +++ b/configs/spear310_usbtty_pnor_defconfig @@ -30,3 +30,5 @@ CONFIG_PHY_GIGE=y CONFIG_ETH_DESIGNWARE=y CONFIG_MII=y CONFIG_CONS_INDEX=0 +CONFIG_USB=y +CONFIG_USB_GADGET=y diff --git a/configs/spear320_usbtty_defconfig b/configs/spear320_usbtty_defconfig index 3c10f32..80acff0 100644 --- a/configs/spear320_usbtty_defconfig +++ b/configs/spear320_usbtty_defconfig @@ -27,3 +27,5 @@ CONFIG_PHY_GIGE=y CONFIG_ETH_DESIGNWARE=y CONFIG_MII=y CONFIG_CONS_INDEX=0 +CONFIG_USB=y +CONFIG_USB_GADGET=y diff --git a/configs/spear320_usbtty_nand_defconfig b/configs/spear320_usbtty_nand_defconfig index 8fb84bc..00534b1 100644 --- a/configs/spear320_usbtty_nand_defconfig +++ b/configs/spear320_usbtty_nand_defconfig @@ -28,3 +28,5 @@ CONFIG_PHY_GIGE=y CONFIG_ETH_DESIGNWARE=y CONFIG_MII=y CONFIG_CONS_INDEX=0 +CONFIG_USB=y +CONFIG_USB_GADGET=y diff --git a/configs/spear320_usbtty_pnor_defconfig b/configs/spear320_usbtty_pnor_defconfig index 2cf39b4..916321c 100644 --- a/configs/spear320_usbtty_pnor_defconfig +++ b/configs/spear320_usbtty_pnor_defconfig @@ -30,3 +30,5 @@ CONFIG_PHY_GIGE=y CONFIG_ETH_DESIGNWARE=y CONFIG_MII=y CONFIG_CONS_INDEX=0 +CONFIG_USB=y +CONFIG_USB_GADGET=y diff --git a/configs/spear600_usbtty_defconfig b/configs/spear600_usbtty_defconfig index 5c7b0a8..d0bdc75 100644 --- a/configs/spear600_usbtty_defconfig +++ b/configs/spear600_usbtty_defconfig @@ -27,3 +27,5 @@ CONFIG_PHY_GIGE=y CONFIG_ETH_DESIGNWARE=y CONFIG_MII=y CONFIG_CONS_INDEX=0 +CONFIG_USB=y +CONFIG_USB_GADGET=y diff --git a/configs/spear600_usbtty_nand_defconfig b/configs/spear600_usbtty_nand_defconfig index 078e934..ccbfec9 100644 --- a/configs/spear600_usbtty_nand_defconfig +++ b/configs/spear600_usbtty_nand_defconfig @@ -28,3 +28,5 @@ CONFIG_PHY_GIGE=y CONFIG_ETH_DESIGNWARE=y CONFIG_MII=y CONFIG_CONS_INDEX=0 +CONFIG_USB=y +CONFIG_USB_GADGET=y
On 1/8/19 11:40 AM, Jean-Jacques Hiblot wrote:
This series applies on top of u-boot-dfu.
This series renames CONFIG_SPL_USB_GADGET_SUPPORT to CONFIG_SPL_USB_GADGET for consistency. It also uses CONFIG_USB_GADGET to compile-in the gadget code. This make sure that the code is not included if it is not needed. Some defconfigs had to be updated as they relied on the gadget code to be always compiled.
TRAVIS: https://travis-ci.org/jjhiblot/u-boot/builds/476452900
Jean-Jacques Hiblot (2): Kconfig: rename CONFIG_SPL_USB_GADGET_SUPPORT as CONFIG_SPL_USB_GADGET usb: Make compiling gadget support optional
Makefile | 4 ++-- 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 +- scripts/Makefile.spl | 2 +- 41 files changed, 55 insertions(+), 27 deletions(-)
I'll let Lukasz handle integrating this. Does it get rid of the patch I complained about in the PR ? I hope so ..
On 08/01/2019 12:18, Marek Vasut wrote:
On 1/8/19 11:40 AM, Jean-Jacques Hiblot wrote:
This series applies on top of u-boot-dfu.
This series renames CONFIG_SPL_USB_GADGET_SUPPORT to CONFIG_SPL_USB_GADGET for consistency. It also uses CONFIG_USB_GADGET to compile-in the gadget code. This make sure that the code is not included if it is not needed. Some defconfigs had to be updated as they relied on the gadget code to be always compiled.
TRAVIS: https://travis-ci.org/jjhiblot/u-boot/builds/476452900
Jean-Jacques Hiblot (2): Kconfig: rename CONFIG_SPL_USB_GADGET_SUPPORT as CONFIG_SPL_USB_GADGET usb: Make compiling gadget support optional
Makefile | 4 ++-- 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 +- scripts/Makefile.spl | 2 +- 41 files changed, 55 insertions(+), 27 deletions(-)
I'll let Lukasz handle integrating this. Does it get rid of the patch I complained about in the PR ? I hope so ..
I applies on top of u-boot-dfu and fixes the issue you complained about.
It doesn't get rid of the patch per se but rather is a complement.
On 1/8/19 1:43 PM, Jean-Jacques Hiblot wrote:
On 08/01/2019 12:18, Marek Vasut wrote:
On 1/8/19 11:40 AM, Jean-Jacques Hiblot wrote:
This series applies on top of u-boot-dfu.
This series renames CONFIG_SPL_USB_GADGET_SUPPORT to CONFIG_SPL_USB_GADGET for consistency. It also uses CONFIG_USB_GADGET to compile-in the gadget code. This make sure that the code is not included if it is not needed. Some defconfigs had to be updated as they relied on the gadget code to be always compiled.
TRAVIS: https://travis-ci.org/jjhiblot/u-boot/builds/476452900
Jean-Jacques Hiblot (2): Kconfig: rename CONFIG_SPL_USB_GADGET_SUPPORT as CONFIG_SPL_USB_GADGET usb: Make compiling gadget support optional
Makefile | 4 ++-- 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 +- scripts/Makefile.spl | 2 +- 41 files changed, 55 insertions(+), 27 deletions(-)
I'll let Lukasz handle integrating this. Does it get rid of the patch I complained about in the PR ? I hope so ..
I applies on top of u-boot-dfu and fixes the issue you complained about.
It doesn't get rid of the patch per se but rather is a complement.
Can they be squashed together somehow ?
On 08/01/2019 13:47, Marek Vasut wrote:
On 1/8/19 1:43 PM, Jean-Jacques Hiblot wrote:
On 08/01/2019 12:18, Marek Vasut wrote:
On 1/8/19 11:40 AM, Jean-Jacques Hiblot wrote:
This series applies on top of u-boot-dfu.
This series renames CONFIG_SPL_USB_GADGET_SUPPORT to CONFIG_SPL_USB_GADGET for consistency. It also uses CONFIG_USB_GADGET to compile-in the gadget code. This make sure that the code is not included if it is not needed. Some defconfigs had to be updated as they relied on the gadget code to be always compiled.
TRAVIS: https://travis-ci.org/jjhiblot/u-boot/builds/476452900
Jean-Jacques Hiblot (2): Kconfig: rename CONFIG_SPL_USB_GADGET_SUPPORT as CONFIG_SPL_USB_GADGET usb: Make compiling gadget support optional
Makefile | 4 ++-- 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 +- scripts/Makefile.spl | 2 +- 41 files changed, 55 insertions(+), 27 deletions(-)
I'll let Lukasz handle integrating this. Does it get rid of the patch I complained about in the PR ? I hope so ..
I applies on top of u-boot-dfu and fixes the issue you complained about.
It doesn't get rid of the patch per se but rather is a complement.
Can they be squashed together somehow ?
IMO they make more sense as separate patches. but I see no problem if Lukasz wants to squash them.
On 1/8/19 2:06 PM, Jean-Jacques Hiblot wrote:
On 08/01/2019 13:47, Marek Vasut wrote:
On 1/8/19 1:43 PM, Jean-Jacques Hiblot wrote:
On 08/01/2019 12:18, Marek Vasut wrote:
On 1/8/19 11:40 AM, Jean-Jacques Hiblot wrote:
This series applies on top of u-boot-dfu.
This series renames CONFIG_SPL_USB_GADGET_SUPPORT to CONFIG_SPL_USB_GADGET for consistency. It also uses CONFIG_USB_GADGET to compile-in the gadget code. This make sure that the code is not included if it is not needed. Some defconfigs had to be updated as they relied on the gadget code to be always compiled.
TRAVIS: https://travis-ci.org/jjhiblot/u-boot/builds/476452900
Jean-Jacques Hiblot (2): Kconfig: rename CONFIG_SPL_USB_GADGET_SUPPORT as CONFIG_SPL_USB_GADGET usb: Make compiling gadget support optional
Makefile | 4 ++-- 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 +- scripts/Makefile.spl | 2 +- 41 files changed, 55 insertions(+), 27 deletions(-)
I'll let Lukasz handle integrating this. Does it get rid of the patch I complained about in the PR ? I hope so ..
I applies on top of u-boot-dfu and fixes the issue you complained about.
It doesn't get rid of the patch per se but rather is a complement.
Can they be squashed together somehow ?
IMO they make more sense as separate patches. but I see no problem if Lukasz wants to squash them.
I'd prefer to replace the broken patch.
On Tue, 8 Jan 2019 14:37:49 +0100 Marek Vasut marex@denx.de wrote:
On 1/8/19 2:06 PM, Jean-Jacques Hiblot wrote:
On 08/01/2019 13:47, Marek Vasut wrote:
On 1/8/19 1:43 PM, Jean-Jacques Hiblot wrote:
On 08/01/2019 12:18, Marek Vasut wrote:
On 1/8/19 11:40 AM, Jean-Jacques Hiblot wrote:
This series applies on top of u-boot-dfu.
This series renames CONFIG_SPL_USB_GADGET_SUPPORT to CONFIG_SPL_USB_GADGET for consistency. It also uses CONFIG_USB_GADGET to compile-in the gadget code. This make sure that the code is not included if it is not needed. Some defconfigs had to be updated as they relied on the gadget code to be always compiled.
TRAVIS: https://travis-ci.org/jjhiblot/u-boot/builds/476452900
Jean-Jacques Hiblot (2): Kconfig: rename CONFIG_SPL_USB_GADGET_SUPPORT as CONFIG_SPL_USB_GADGET usb: Make compiling gadget support optional
Makefile | 4 ++-- 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 +- scripts/Makefile.spl | 2 +- 41 files changed, 55 insertions(+), 27 deletions(-)
I'll let Lukasz handle integrating this. Does it get rid of the patch I complained about in the PR ? I hope so ..
I applies on top of u-boot-dfu and fixes the issue you complained about.
It doesn't get rid of the patch per se but rather is a complement.
Can they be squashed together somehow ?
IMO they make more sense as separate patches. but I see no problem if Lukasz wants to squash them.
I'd prefer to replace the broken patch.
The patch to be replaced/amended is: dm: usb: gadget: Fix boot breakage on sunxi platforms
I'm fine with adding those two patches on top of it.
Or do I miss something?
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@denx.de
On 1/8/19 2:57 PM, Lukasz Majewski wrote:
On Tue, 8 Jan 2019 14:37:49 +0100 Marek Vasut marex@denx.de wrote:
On 1/8/19 2:06 PM, Jean-Jacques Hiblot wrote:
On 08/01/2019 13:47, Marek Vasut wrote:
On 1/8/19 1:43 PM, Jean-Jacques Hiblot wrote:
On 08/01/2019 12:18, Marek Vasut wrote:
On 1/8/19 11:40 AM, Jean-Jacques Hiblot wrote: > This series applies on top of u-boot-dfu. > > This series renames CONFIG_SPL_USB_GADGET_SUPPORT to > CONFIG_SPL_USB_GADGET > for consistency. > It also uses CONFIG_USB_GADGET to compile-in the gadget code. > This make > sure that the code is not included if it is not needed. Some > defconfigs > had to be updated as they relied on the gadget code to be always > compiled. > > TRAVIS: https://travis-ci.org/jjhiblot/u-boot/builds/476452900 > > Jean-Jacques Hiblot (2): > Kconfig: rename CONFIG_SPL_USB_GADGET_SUPPORT as > CONFIG_SPL_USB_GADGET > usb: Make compiling gadget support optional > > Makefile | 4 ++-- > 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 +- > scripts/Makefile.spl | 2 +- > 41 files changed, 55 insertions(+), 27 deletions(-) > I'll let Lukasz handle integrating this. Does it get rid of the patch I complained about in the PR ? I hope so ..
I applies on top of u-boot-dfu and fixes the issue you complained about.
It doesn't get rid of the patch per se but rather is a complement.
Can they be squashed together somehow ?
IMO they make more sense as separate patches. but I see no problem if Lukasz wants to squash them.
I'd prefer to replace the broken patch.
The patch to be replaced/amended is: dm: usb: gadget: Fix boot breakage on sunxi platforms
I'm fine with adding those two patches on top of it.
Or do I miss something?
I don't want broken patches in the tree if it can be avoided, which in this case is still possible.
On 08/01/2019 15:11, Marek Vasut wrote:
On 1/8/19 2:57 PM, Lukasz Majewski wrote:
On Tue, 8 Jan 2019 14:37:49 +0100 Marek Vasut marex@denx.de wrote:
On 1/8/19 2:06 PM, Jean-Jacques Hiblot wrote:
On 08/01/2019 13:47, Marek Vasut wrote:
On 1/8/19 1:43 PM, Jean-Jacques Hiblot wrote:
On 08/01/2019 12:18, Marek Vasut wrote: > On 1/8/19 11:40 AM, Jean-Jacques Hiblot wrote: >> This series applies on top of u-boot-dfu. >> >> This series renames CONFIG_SPL_USB_GADGET_SUPPORT to >> CONFIG_SPL_USB_GADGET >> for consistency. >> It also uses CONFIG_USB_GADGET to compile-in the gadget code. >> This make >> sure that the code is not included if it is not needed. Some >> defconfigs >> had to be updated as they relied on the gadget code to be always >> compiled. >> >> TRAVIS: https://travis-ci.org/jjhiblot/u-boot/builds/476452900 >> >> Jean-Jacques Hiblot (2): >> Kconfig: rename CONFIG_SPL_USB_GADGET_SUPPORT as >> CONFIG_SPL_USB_GADGET >> usb: Make compiling gadget support optional >> >> Makefile | 4 ++-- >> 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 +- >> scripts/Makefile.spl | 2 +- >> 41 files changed, 55 insertions(+), 27 deletions(-) >> > I'll let Lukasz handle integrating this. Does it get rid of the > patch I complained about in the PR ? I hope so .. I applies on top of u-boot-dfu and fixes the issue you complained about.
It doesn't get rid of the patch per se but rather is a complement.
Can they be squashed together somehow ?
IMO they make more sense as separate patches. but I see no problem if Lukasz wants to squash them.
I'd prefer to replace the broken patch.
The patch to be replaced/amended is: dm: usb: gadget: Fix boot breakage on sunxi platforms
I'm fine with adding those two patches on top of it.
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
Or do I miss something?
I don't want broken patches in the tree if it can be avoided, which in this case is still possible.
participants (3)
-
Jean-Jacques Hiblot -
Lukasz Majewski -
Marek Vasut