* [U-Boot] [PATCH v2 00/14] sunxi: convert musb to the device model and enable usb_ether
@ 2017-09-12 19:01 Maxime Ripard
2017-09-12 19:01 ` [U-Boot] [PATCH v2 01/14] usb: gadget: Move USBNET_DEVADDR option out of g_dnl Maxime Ripard
` (14 more replies)
0 siblings, 15 replies; 35+ messages in thread
From: Maxime Ripard @ 2017-09-12 19:01 UTC (permalink / raw)
To: u-boot
Hi,
This serie aims at fixing an issue we had to carry out of tree patches
for for a few years.
The issue is this: a significant number of Allwinner boards don't have
an Ethernet connection, while an Ethernet connection is pretty useful
for example during development to do some PXE/NFS boot.
However, we needed to have DM_ETH enabled for the boards that use our
Ethernet controller drivers that rely on it. It meant having to use
the newly introduced DM_ETH support in the usb_ether gadget, but our
musb peripheral wasn't converted to the device model, and therefore
not usable with it.
The other alternative was to use the old-style usb_ether driver, which
worked fine but were disabling the Ethernet controller driver.
Thus, none were good, upstreamable solution.
Fix this properly by adding support for the musb in peripheral mode in
the device model. While we're doing so, I also took the occasion to
move a number of configuration options to Kconfig, and rework the
dependencies between them to ease the selection of related options
while trying to avoid as much as possible the combinations that are
not valid.
This was tested on a Sinlinx SinA33 that is wired as a peripheral-only
mUSB.
Let me know what you think,
Maxime
Changes from v1:
- Rebased on v2017.09
- Added some help on a number of options introduced
- Added the various tags collected
Maxime Ripard (14):
usb: gadget: Move USBNET_DEVADDR option out of g_dnl
usb: gadget: Document USBNET_DEVADDR
usb: gadget: Move USBNET_HOST_ADDR to Kconfig
usb: gadget: Convert USB_ETHER to Kconfig
usb: gadget: usb_ether: Move the interfaces to Kconfig
usb: gadget: Make g_dnl USB settings common
usb: gadget: usb_ether: Move settings to common
sunxi: provide default USB gadget setup
sunxi: imply USB_GADGET
cmd: fastboot: Rework fastboot dependency
musb: sunxi: switch to the device model
sunxi: Register usb_ether
sunxi: Imply USB_ETHER
sunxi: sina33: Sync the device tree with the kernel
arch/arm/Kconfig | 4 +-
arch/arm/dts/axp223.dtsi | 58 ++-
arch/arm/dts/axp22x.dtsi | 10 +-
arch/arm/dts/sun8i-a23-a33.dtsi | 446 ++++++---------
arch/arm/dts/sun8i-a33-sinlinx-sina33.dts | 43 +-
arch/arm/dts/sun8i-a33.dtsi | 477 +++++++++++++---
arch/arm/include/asm/arch-sunxi/usb_phy.h | 7 +-
board/samsung/common/gadget.c | 4 +-
board/siemens/common/factoryset.c | 4 +-
board/sunxi/board.c | 3 +-
cmd/fastboot/Kconfig | 4 +-
configs/A13-OLinuXino_defconfig | 5 +-
configs/A20-OLinuXino-Lime2-eMMC_defconfig | 5 +-
configs/A20-OLinuXino-Lime2_defconfig | 5 +-
configs/CHIP_defconfig | 5 +-
configs/CHIP_pro_defconfig | 5 +-
configs/Cubietruck_defconfig | 5 +-
configs/Nintendo_NES_Classic_Edition_defconfig | 5 +-
configs/Sinlinx_SinA33_defconfig | 5 +-
configs/am335x_baltos_defconfig | 8 +-
configs/am335x_boneblack_defconfig | 10 +-
configs/am335x_boneblack_vboot_defconfig | 9 +-
configs/am335x_evm_defconfig | 9 +-
configs/am335x_evm_nor_defconfig | 9 +-
configs/am335x_evm_norboot_defconfig | 10 +-
configs/am335x_evm_spiboot_defconfig | 9 +-
configs/am335x_evm_usbspl_defconfig | 9 +-
configs/am335x_hs_evm_defconfig | 7 +-
configs/am43xx_evm_defconfig | 6 +-
configs/am43xx_evm_ethboot_defconfig | 6 +-
configs/am43xx_evm_qspiboot_defconfig | 6 +-
configs/am43xx_evm_usbhost_boot_defconfig | 6 +-
configs/am43xx_hs_evm_defconfig | 6 +-
configs/am57xx_evm_defconfig | 8 +-
configs/am57xx_evm_nodt_defconfig | 9 +-
configs/am57xx_hs_evm_defconfig | 8 +-
configs/apalis-tk1_defconfig | 6 +-
configs/apalis_imx6_defconfig | 6 +-
configs/apalis_imx6_nospl_com_defconfig | 6 +-
configs/apalis_imx6_nospl_it_defconfig | 6 +-
configs/apalis_t30_defconfig | 6 +-
configs/bcm11130_defconfig | 6 +-
configs/bcm11130_nand_defconfig | 6 +-
configs/bcm23550_w1d_defconfig | 9 +-
configs/bcm28155_ap_defconfig | 9 +-
configs/bcm28155_w1d_defconfig | 6 +-
configs/beaver_defconfig | 6 +-
configs/birdland_bav335a_defconfig | 9 +-
configs/birdland_bav335b_defconfig | 9 +-
configs/cei-tk1-som_defconfig | 6 +-
configs/cgtqmx6eval_defconfig | 9 +-
configs/chromebit_mickey_defconfig | 7 +-
configs/chromebook_jerry_defconfig | 7 +-
configs/chromebook_minnie_defconfig | 7 +-
configs/colibri_imx6_defconfig | 6 +-
configs/colibri_imx6_nospl_defconfig | 6 +-
configs/colibri_imx7_defconfig | 6 +-
configs/colibri_t20_defconfig | 6 +-
configs/colibri_t30_defconfig | 6 +-
configs/colibri_vf_defconfig | 6 +-
configs/corvus_defconfig | 6 +-
configs/dalmore_defconfig | 6 +-
configs/dms-ba16-1g_defconfig | 6 +-
configs/dms-ba16_defconfig | 6 +-
configs/dra7xx_evm_defconfig | 8 +-
configs/dra7xx_hs_evm_defconfig | 8 +-
configs/draco_defconfig | 7 +-
configs/e2220-1170_defconfig | 6 +-
configs/edison_defconfig | 6 +-
configs/etamin_defconfig | 7 +-
configs/evb-rk3036_defconfig | 7 +-
configs/evb-rk3229_defconfig | 7 +-
configs/evb-rk3288_defconfig | 7 +-
configs/evb-rk3328_defconfig | 6 +-
configs/fennec-rk3288_defconfig | 7 +-
configs/firefly-rk3288_defconfig | 7 +-
configs/gwventana_emmc_defconfig | 8 +-
configs/gwventana_gw5904_defconfig | 8 +-
configs/gwventana_nand_defconfig | 8 +-
configs/jetson-tk1_defconfig | 6 +-
configs/kc1_defconfig | 9 +-
configs/kylin-rk3036_defconfig | 7 +-
configs/ma5d4evk_defconfig | 7 +-
configs/miqi-rk3288_defconfig | 7 +-
configs/mx6qsabrelite_defconfig | 11 +-
configs/mx6sabreauto_defconfig | 6 +-
configs/mx6sabresd_defconfig | 6 +-
configs/mx7dsabresd_defconfig | 6 +-
configs/mx7dsabresd_secure_defconfig | 6 +-
configs/nitrogen6dl2g_defconfig | 11 +-
configs/nitrogen6dl_defconfig | 11 +-
configs/nitrogen6q2g_defconfig | 11 +-
configs/nitrogen6q_defconfig | 11 +-
configs/nitrogen6s1g_defconfig | 11 +-
configs/nitrogen6s_defconfig | 11 +-
configs/novena_defconfig | 2 +-
configs/nyan-big_defconfig | 6 +-
configs/odroid-xu3_defconfig | 6 +-
configs/odroid_defconfig | 6 +-
configs/omap3_beagle_defconfig | 10 +-
configs/omap3_evm_defconfig | 7 +-
configs/omap3_logic_defconfig | 9 +-
configs/omap5_uevm_defconfig | 6 +-
configs/opos6uldev_defconfig | 6 +-
configs/origen_defconfig | 6 +-
configs/p2371-0000_defconfig | 6 +-
configs/p2371-2180_defconfig | 6 +-
configs/p2571_defconfig | 6 +-
configs/parrot_r16_defconfig | 5 +-
configs/pcm051_rev1_defconfig | 1 +-
configs/pcm051_rev3_defconfig | 1 +-
configs/phycore-rk3288_defconfig | 7 +-
configs/pico-imx6ul_defconfig | 6 +-
configs/pico-imx7d_defconfig | 6 +-
configs/popmetal-rk3288_defconfig | 7 +-
configs/pxm2_defconfig | 8 +-
configs/rastaban_defconfig | 8 +-
configs/rock2_defconfig | 7 +-
configs/rut_defconfig | 7 +-
configs/s5p_goni_defconfig | 6 +-
configs/s5pc210_universal_defconfig | 6 +-
configs/sama5d2_ptc_nandflash_defconfig | 2 +-
configs/sama5d2_ptc_spiflash_defconfig | 2 +-
configs/sansa_fuze_plus_defconfig | 2 +-
configs/smartweb_defconfig | 6 +-
configs/sniper_defconfig | 9 +-
configs/socfpga_arria5_defconfig | 6 +-
configs/socfpga_cyclone5_defconfig | 6 +-
configs/socfpga_de0_nano_soc_defconfig | 6 +-
configs/socfpga_de10_nano_defconfig | 6 +-
configs/socfpga_mcvevk_defconfig | 6 +-
configs/socfpga_sockit_defconfig | 6 +-
configs/socfpga_socrates_defconfig | 6 +-
configs/socfpga_vining_fpga_defconfig | 6 +-
configs/taurus_defconfig | 6 +-
configs/tbs2910_defconfig | 6 +-
configs/thuban_defconfig | 7 +-
configs/tinker-rk3288_defconfig | 7 +-
configs/topic_miami_defconfig | 6 +-
configs/topic_miamilite_defconfig | 6 +-
configs/topic_miamiplus_defconfig | 6 +-
configs/trats2_defconfig | 6 +-
configs/trats_defconfig | 6 +-
configs/venice2_defconfig | 6 +-
configs/vinco_defconfig | 2 +-
configs/warp7_defconfig | 9 +-
configs/warp7_secure_defconfig | 9 +-
configs/warp_defconfig | 6 +-
configs/xfi3_defconfig | 2 +-
configs/xilinx_zynqmp_ep_defconfig | 6 +-
configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 6 +-
configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 6 +-
configs/xilinx_zynqmp_zcu102_revA_defconfig | 6 +-
configs/xilinx_zynqmp_zcu102_revB_defconfig | 6 +-
configs/zynq_microzed_defconfig | 6 +-
configs/zynq_picozed_defconfig | 6 +-
configs/zynq_z_turn_defconfig | 6 +-
configs/zynq_zc702_defconfig | 6 +-
configs/zynq_zc706_defconfig | 6 +-
configs/zynq_zed_defconfig | 6 +-
configs/zynq_zybo_defconfig | 6 +-
doc/README.android-fastboot | 8 +-
drivers/usb/gadget/Kconfig | 78 ++-
drivers/usb/gadget/ether.c | 16 +-
drivers/usb/gadget/g_dnl.c | 12 +-
drivers/usb/musb-new/sunxi.c | 56 +--
include/configs/am335x_evm.h | 6 +-
include/configs/am3517_evm.h | 5 +-
include/configs/am43xx_evm.h | 6 +-
include/configs/baltos.h | 6 +-
include/configs/gw_ventana.h | 2 +-
include/configs/h2200.h | 2 +-
include/configs/ma5d4evk.h | 3 +-
include/configs/nitrogen6x.h | 2 +-
include/configs/novena.h | 2 +-
include/configs/odroid_xu3.h | 2 +-
include/configs/omap3_beagle.h | 1 +-
include/configs/omap3_evm.h | 1 +-
include/configs/omap3_logic.h | 1 +-
include/configs/pcm051.h | 5 +-
include/configs/sama5d2_ptc.h | 3 +-
include/configs/sansa_fuze_plus.h | 2 +-
include/configs/siemens-am33x-common.h | 6 +-
include/configs/tao3530.h | 2 +-
include/configs/vinco.h | 3 +-
include/configs/warp7.h | 4 +-
include/configs/xfi3.h | 2 +-
include/dt-bindings/clock/sun8i-a23-a33-ccu.h | 127 ++++-
include/dt-bindings/reset/sun8i-a23-a33-ccu.h | 87 +++-
scripts/config_whitelist.txt | 5 +-
190 files changed, 1509 insertions(+), 999 deletions(-)
create mode 100644 arch/arm/dts/axp223.dtsi
create mode 100644 include/dt-bindings/clock/sun8i-a23-a33-ccu.h
create mode 100644 include/dt-bindings/reset/sun8i-a23-a33-ccu.h
base-commit: c98ac3487e413c71e5d36322ef3324b21c6f60f9
--
git-series 0.9.1
^ permalink raw reply [flat|nested] 35+ messages in thread
* [U-Boot] [PATCH v2 01/14] usb: gadget: Move USBNET_DEVADDR option out of g_dnl
2017-09-12 19:01 [U-Boot] [PATCH v2 00/14] sunxi: convert musb to the device model and enable usb_ether Maxime Ripard
@ 2017-09-12 19:01 ` Maxime Ripard
2017-09-13 10:37 ` Łukasz Majewski
2017-09-12 19:01 ` [U-Boot] [PATCH v2 02/14] usb: gadget: Document USBNET_DEVADDR Maxime Ripard
` (13 subsequent siblings)
14 siblings, 1 reply; 35+ messages in thread
From: Maxime Ripard @ 2017-09-12 19:01 UTC (permalink / raw)
To: u-boot
The USBNET_DEVADDR has nothing to do with the USB download gadget, but
rather with the USB Ethernet gadget. Move it out of the if statement.
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
drivers/usb/gadget/Kconfig | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index 225b66bc95ff..d52626908846 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -119,10 +119,10 @@ config G_DNL_VENDOR_NUM
config G_DNL_PRODUCT_NUM
hex "Product ID of USB device"
+endif # USB_GADGET_DOWNLOAD
+
config USBNET_DEVADDR
string "USB Gadget Ethernet device mac address"
default "de:ad:be:ef:00:01"
-endif # USB_GADGET_DOWNLOAD
-
endif # USB_GADGET
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 35+ messages in thread
* [U-Boot] [PATCH v2 02/14] usb: gadget: Document USBNET_DEVADDR
2017-09-12 19:01 [U-Boot] [PATCH v2 00/14] sunxi: convert musb to the device model and enable usb_ether Maxime Ripard
2017-09-12 19:01 ` [U-Boot] [PATCH v2 01/14] usb: gadget: Move USBNET_DEVADDR option out of g_dnl Maxime Ripard
@ 2017-09-12 19:01 ` Maxime Ripard
2017-09-13 4:27 ` Simon Glass
2017-09-13 10:37 ` Łukasz Majewski
2017-09-12 19:01 ` [U-Boot] [PATCH v2 03/14] usb: gadget: Move USBNET_HOST_ADDR to Kconfig Maxime Ripard
` (12 subsequent siblings)
14 siblings, 2 replies; 35+ messages in thread
From: Maxime Ripard @ 2017-09-12 19:01 UTC (permalink / raw)
To: u-boot
Add an help about the USBNET_DEVADDR Kconfig option to make it clearer what
it's about.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
drivers/usb/gadget/Kconfig | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index d52626908846..6dc9d177f5ad 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -124,5 +124,8 @@ endif # USB_GADGET_DOWNLOAD
config USBNET_DEVADDR
string "USB Gadget Ethernet device mac address"
default "de:ad:be:ef:00:01"
+ help
+ Ethernet MAC address of the device-side (ie. local board's) MAC
+ address of the usb_ether interface
endif # USB_GADGET
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 35+ messages in thread
* [U-Boot] [PATCH v2 03/14] usb: gadget: Move USBNET_HOST_ADDR to Kconfig
2017-09-12 19:01 [U-Boot] [PATCH v2 00/14] sunxi: convert musb to the device model and enable usb_ether Maxime Ripard
2017-09-12 19:01 ` [U-Boot] [PATCH v2 01/14] usb: gadget: Move USBNET_DEVADDR option out of g_dnl Maxime Ripard
2017-09-12 19:01 ` [U-Boot] [PATCH v2 02/14] usb: gadget: Document USBNET_DEVADDR Maxime Ripard
@ 2017-09-12 19:01 ` Maxime Ripard
2017-09-13 4:27 ` Simon Glass
2017-09-13 10:38 ` Łukasz Majewski
2017-09-12 19:01 ` [U-Boot] [PATCH v2 04/14] usb: gadget: Convert USB_ETHER " Maxime Ripard
` (11 subsequent siblings)
14 siblings, 2 replies; 35+ messages in thread
From: Maxime Ripard @ 2017-09-12 19:01 UTC (permalink / raw)
To: u-boot
While the USB Ethernet device address is already defined in Kconfig, the
host address isn't. Convert it.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
configs/am335x_baltos_defconfig | 1 +
configs/am335x_boneblack_defconfig | 1 +
configs/am335x_evm_norboot_defconfig | 1 +
configs/pxm2_defconfig | 1 +
configs/rastaban_defconfig | 1 +
configs/warp7_defconfig | 1 +
configs/warp7_secure_defconfig | 1 +
drivers/usb/gadget/Kconfig | 7 +++++++
include/configs/am335x_evm.h | 1 -
include/configs/baltos.h | 1 -
include/configs/h2200.h | 1 -
include/configs/siemens-am33x-common.h | 1 -
include/configs/warp7.h | 1 -
scripts/config_whitelist.txt | 1 -
14 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/configs/am335x_baltos_defconfig b/configs/am335x_baltos_defconfig
index eb8338f0f10d..be057acf8634 100644
--- a/configs/am335x_baltos_defconfig
+++ b/configs/am335x_baltos_defconfig
@@ -63,5 +63,6 @@ CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
CONFIG_G_DNL_VENDOR_NUM=0x0403
CONFIG_G_DNL_PRODUCT_NUM=0xbd00
+CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00"
CONFIG_FAT_WRITE=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/am335x_boneblack_defconfig b/configs/am335x_boneblack_defconfig
index b8526fc15ed3..719d16b145eb 100644
--- a/configs/am335x_boneblack_defconfig
+++ b/configs/am335x_boneblack_defconfig
@@ -42,6 +42,7 @@ CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
CONFIG_G_DNL_VENDOR_NUM=0x0451
CONFIG_G_DNL_PRODUCT_NUM=0xd022
+CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00"
CONFIG_LZO=y
CONFIG_OF_LIBFDT=y
CONFIG_OF_LIBFDT_OVERLAY=y
diff --git a/configs/am335x_evm_norboot_defconfig b/configs/am335x_evm_norboot_defconfig
index c5e7425a7797..c9eab68c8299 100644
--- a/configs/am335x_evm_norboot_defconfig
+++ b/configs/am335x_evm_norboot_defconfig
@@ -35,6 +35,7 @@ CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
CONFIG_G_DNL_VENDOR_NUM=0x0451
CONFIG_G_DNL_PRODUCT_NUM=0xd022
+CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00"
CONFIG_LZO=y
CONFIG_OF_LIBFDT=y
CONFIG_OF_LIBFDT_OVERLAY=y
diff --git a/configs/pxm2_defconfig b/configs/pxm2_defconfig
index 38370ee8d8f5..b1da71d4c7ed 100644
--- a/configs/pxm2_defconfig
+++ b/configs/pxm2_defconfig
@@ -74,6 +74,7 @@ CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_G_DNL_MANUFACTURER="Siemens AG"
CONFIG_G_DNL_VENDOR_NUM=0x0908
CONFIG_G_DNL_PRODUCT_NUM=0x02d2
+CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00"
# CONFIG_VIDEO_SW_CURSOR is not set
CONFIG_SYS_CONSOLE_BG_COL=0xff
CONFIG_SYS_CONSOLE_FG_COL=0x00
diff --git a/configs/rastaban_defconfig b/configs/rastaban_defconfig
index 5acfe22b0a6d..940c4144d406 100644
--- a/configs/rastaban_defconfig
+++ b/configs/rastaban_defconfig
@@ -70,3 +70,4 @@ CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_G_DNL_MANUFACTURER="Siemens AG"
CONFIG_G_DNL_VENDOR_NUM=0x0908
CONFIG_G_DNL_PRODUCT_NUM=0x02d2
+CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00"
diff --git a/configs/warp7_defconfig b/configs/warp7_defconfig
index 99fe800317c2..f430f30bbbe5 100644
--- a/configs/warp7_defconfig
+++ b/configs/warp7_defconfig
@@ -38,4 +38,5 @@ CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_G_DNL_MANUFACTURER="FSL"
CONFIG_G_DNL_VENDOR_NUM=0x0525
CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
+CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00"
CONFIG_OF_LIBFDT=y
diff --git a/configs/warp7_secure_defconfig b/configs/warp7_secure_defconfig
index 8beda72cd882..96e2c9e5cfde 100644
--- a/configs/warp7_secure_defconfig
+++ b/configs/warp7_secure_defconfig
@@ -36,4 +36,5 @@ CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_G_DNL_MANUFACTURER="FSL"
CONFIG_G_DNL_VENDOR_NUM=0x0525
CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
+CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00"
CONFIG_OF_LIBFDT=y
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index 6dc9d177f5ad..510efd67b9a4 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -128,4 +128,11 @@ config USBNET_DEVADDR
Ethernet MAC address of the device-side (ie. local board's) MAC
address of the usb_ether interface
+config USBNET_HOST_ADDR
+ string "USB Gadget Ethernet host mac address"
+ default "de:ad:be:ef:00:00"
+ help
+ Ethernet MAC address of the host-side (ie. remote device's) MAC
+ address of the usb_ether interface
+
endif # USB_GADGET
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index 415ce46e0d8d..7c025c7e46c8 100644
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -266,7 +266,6 @@
#ifdef CONFIG_USB_MUSB_GADGET
#define CONFIG_USB_ETHER
#define CONFIG_USB_ETH_RNDIS
-#define CONFIG_USBNET_HOST_ADDR "de:ad:be:af:00:00"
#endif /* CONFIG_USB_MUSB_GADGET */
/*
diff --git a/include/configs/baltos.h b/include/configs/baltos.h
index 185c749d7868..535fdd4373b0 100644
--- a/include/configs/baltos.h
+++ b/include/configs/baltos.h
@@ -286,7 +286,6 @@
#ifdef CONFIG_USB_MUSB_GADGET
#define CONFIG_USB_ETHER
#define CONFIG_USB_ETH_RNDIS
-#define CONFIG_USBNET_HOST_ADDR "de:ad:be:af:00:00"
#endif /* CONFIG_USB_MUSB_GADGET */
#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT)
diff --git a/include/configs/h2200.h b/include/configs/h2200.h
index 870014ddf475..e956e89a89d5 100644
--- a/include/configs/h2200.h
+++ b/include/configs/h2200.h
@@ -127,7 +127,6 @@
#define CONFIG_USB_ETH_SUBSET
#define CONFIG_USBNET_DEV_ADDR "de:ad:be:ef:00:01"
-#define CONFIG_USBNET_HOST_ADDR "de:ad:be:ef:00:02"
#define CONFIG_EXTRA_ENV_SETTINGS \
"stdin=serial\0" \
"stdout=serial\0" \
diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h
index 2314a2d2ef35..2bcd77e9efc8 100644
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -181,7 +181,6 @@
#ifdef CONFIG_USB_MUSB_GADGET
#define CONFIG_USB_ETHER
#define CONFIG_USB_ETH_RNDIS
-#define CONFIG_USBNET_HOST_ADDR "de:ad:be:af:00:00"
#endif /* CONFIG_USB_MUSB_GADGET */
/* USB DRACO ID as default */
diff --git a/include/configs/warp7.h b/include/configs/warp7.h
index 75ae8a3e3338..9ce425156677 100644
--- a/include/configs/warp7.h
+++ b/include/configs/warp7.h
@@ -139,7 +139,6 @@
#define CONFIG_USB_ETHER
#define CONFIG_USB_ETH_CDC
#define CONFIG_USB_ETH_RNDIS
-#define CONFIG_USBNET_HOST_ADDR "de:ad:be:af:00:00"
#define CONFIG_USBNET_DEV_ADDR "de:ad:be:af:00:01"
#endif
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 9ce0c3f039ff..784e83c7c8a1 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -4983,7 +4983,6 @@ CONFIG_USBD_SERIAL_OUT_PKTSIZE
CONFIG_USBD_VENDORID
CONFIG_USBID_ADDR
CONFIG_USBNET_DEV_ADDR
-CONFIG_USBNET_HOST_ADDR
CONFIG_USBNET_MANUFACTURER
CONFIG_USBTTY
CONFIG_USB_AM35X
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 35+ messages in thread
* [U-Boot] [PATCH v2 04/14] usb: gadget: Convert USB_ETHER to Kconfig
2017-09-12 19:01 [U-Boot] [PATCH v2 00/14] sunxi: convert musb to the device model and enable usb_ether Maxime Ripard
` (2 preceding siblings ...)
2017-09-12 19:01 ` [U-Boot] [PATCH v2 03/14] usb: gadget: Move USBNET_HOST_ADDR to Kconfig Maxime Ripard
@ 2017-09-12 19:01 ` Maxime Ripard
2017-09-13 4:27 ` Simon Glass
2017-09-13 10:39 ` Łukasz Majewski
2017-09-12 19:01 ` [U-Boot] [PATCH v2 05/14] usb: gadget: usb_ether: Move the interfaces " Maxime Ripard
` (10 subsequent siblings)
14 siblings, 2 replies; 35+ messages in thread
From: Maxime Ripard @ 2017-09-12 19:01 UTC (permalink / raw)
To: u-boot
The USB Ethernet gadget option has not yet been moved to Kconfig, let's
deal with that.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
configs/am335x_baltos_defconfig | 1 +
configs/am335x_boneblack_defconfig | 1 +
configs/am335x_boneblack_vboot_defconfig | 1 +
configs/am335x_evm_defconfig | 1 +
configs/am335x_evm_nor_defconfig | 1 +
configs/am335x_evm_norboot_defconfig | 1 +
configs/am335x_evm_spiboot_defconfig | 1 +
configs/am335x_evm_usbspl_defconfig | 1 +
configs/am335x_hs_evm_defconfig | 1 +
configs/draco_defconfig | 1 +
configs/etamin_defconfig | 1 +
configs/gwventana_emmc_defconfig | 1 +
configs/gwventana_gw5904_defconfig | 1 +
configs/gwventana_nand_defconfig | 1 +
configs/ma5d4evk_defconfig | 1 +
configs/mx6qsabrelite_defconfig | 1 +
configs/nitrogen6dl2g_defconfig | 1 +
configs/nitrogen6dl_defconfig | 1 +
configs/nitrogen6q2g_defconfig | 1 +
configs/nitrogen6q_defconfig | 1 +
configs/nitrogen6s1g_defconfig | 1 +
configs/nitrogen6s_defconfig | 1 +
configs/novena_defconfig | 1 +
configs/omap3_beagle_defconfig | 1 +
configs/omap3_evm_defconfig | 1 +
configs/omap3_logic_defconfig | 1 +
configs/pcm051_rev1_defconfig | 1 +
configs/pcm051_rev3_defconfig | 1 +
configs/pxm2_defconfig | 1 +
configs/rastaban_defconfig | 1 +
configs/rut_defconfig | 1 +
configs/sama5d2_ptc_nandflash_defconfig | 1 +
configs/sama5d2_ptc_spiflash_defconfig | 1 +
configs/sansa_fuze_plus_defconfig | 1 +
configs/thuban_defconfig | 1 +
configs/vinco_defconfig | 1 +
configs/warp7_defconfig | 1 +
configs/warp7_secure_defconfig | 1 +
configs/xfi3_defconfig | 1 +
drivers/usb/gadget/Kconfig | 14 ++++++++++++++
include/configs/am335x_evm.h | 1 -
include/configs/am3517_evm.h | 1 -
include/configs/baltos.h | 1 -
include/configs/gw_ventana.h | 1 -
include/configs/h2200.h | 1 -
include/configs/ma5d4evk.h | 1 -
include/configs/nitrogen6x.h | 1 -
include/configs/novena.h | 1 -
include/configs/omap3_beagle.h | 1 -
include/configs/omap3_evm.h | 1 -
include/configs/omap3_logic.h | 1 -
include/configs/pcm051.h | 1 -
include/configs/sama5d2_ptc.h | 1 -
include/configs/sansa_fuze_plus.h | 1 -
include/configs/siemens-am33x-common.h | 1 -
include/configs/tao3530.h | 2 --
include/configs/vinco.h | 1 -
include/configs/warp7.h | 1 -
include/configs/xfi3.h | 1 -
scripts/config_whitelist.txt | 1 -
60 files changed, 53 insertions(+), 21 deletions(-)
diff --git a/configs/am335x_baltos_defconfig b/configs/am335x_baltos_defconfig
index be057acf8634..2f075091b27a 100644
--- a/configs/am335x_baltos_defconfig
+++ b/configs/am335x_baltos_defconfig
@@ -63,6 +63,7 @@ CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
CONFIG_G_DNL_VENDOR_NUM=0x0403
CONFIG_G_DNL_PRODUCT_NUM=0xbd00
+CONFIG_USB_ETHER=y
CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00"
CONFIG_FAT_WRITE=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/am335x_boneblack_defconfig b/configs/am335x_boneblack_defconfig
index 719d16b145eb..a3dd9b03b538 100644
--- a/configs/am335x_boneblack_defconfig
+++ b/configs/am335x_boneblack_defconfig
@@ -42,6 +42,7 @@ CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
CONFIG_G_DNL_VENDOR_NUM=0x0451
CONFIG_G_DNL_PRODUCT_NUM=0xd022
+CONFIG_USB_ETHER=y
CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00"
CONFIG_LZO=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/am335x_boneblack_vboot_defconfig b/configs/am335x_boneblack_vboot_defconfig
index 0a239bb73399..7d52382c24dc 100644
--- a/configs/am335x_boneblack_vboot_defconfig
+++ b/configs/am335x_boneblack_vboot_defconfig
@@ -52,4 +52,5 @@ CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
CONFIG_G_DNL_VENDOR_NUM=0x0451
CONFIG_G_DNL_PRODUCT_NUM=0xd022
+CONFIG_USB_ETHER=y
CONFIG_LZO=y
diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig
index 00c1af43449d..69b2cf3e1f61 100644
--- a/configs/am335x_evm_defconfig
+++ b/configs/am335x_evm_defconfig
@@ -54,6 +54,7 @@ CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
CONFIG_G_DNL_VENDOR_NUM=0x0451
CONFIG_G_DNL_PRODUCT_NUM=0xd022
+CONFIG_USB_ETHER=y
CONFIG_RSA=y
CONFIG_LZO=y
CONFIG_OF_LIBFDT_OVERLAY=y
diff --git a/configs/am335x_evm_nor_defconfig b/configs/am335x_evm_nor_defconfig
index 9f08edff4ca5..708df4284093 100644
--- a/configs/am335x_evm_nor_defconfig
+++ b/configs/am335x_evm_nor_defconfig
@@ -41,6 +41,7 @@ CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
CONFIG_G_DNL_VENDOR_NUM=0x0451
CONFIG_G_DNL_PRODUCT_NUM=0xd022
+CONFIG_USB_ETHER=y
CONFIG_LZO=y
CONFIG_OF_LIBFDT=y
CONFIG_OF_LIBFDT_OVERLAY=y
diff --git a/configs/am335x_evm_norboot_defconfig b/configs/am335x_evm_norboot_defconfig
index c9eab68c8299..3f6f2798adce 100644
--- a/configs/am335x_evm_norboot_defconfig
+++ b/configs/am335x_evm_norboot_defconfig
@@ -35,6 +35,7 @@ CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
CONFIG_G_DNL_VENDOR_NUM=0x0451
CONFIG_G_DNL_PRODUCT_NUM=0xd022
+CONFIG_USB_ETHER=y
CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00"
CONFIG_LZO=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/am335x_evm_spiboot_defconfig b/configs/am335x_evm_spiboot_defconfig
index 501fb2b90f4d..427ca371815c 100644
--- a/configs/am335x_evm_spiboot_defconfig
+++ b/configs/am335x_evm_spiboot_defconfig
@@ -39,6 +39,7 @@ CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
CONFIG_G_DNL_VENDOR_NUM=0x0451
CONFIG_G_DNL_PRODUCT_NUM=0xd022
+CONFIG_USB_ETHER=y
CONFIG_LZO=y
CONFIG_OF_LIBFDT=y
CONFIG_OF_LIBFDT_OVERLAY=y
diff --git a/configs/am335x_evm_usbspl_defconfig b/configs/am335x_evm_usbspl_defconfig
index 7c351382d96c..a4e9e8f1b27b 100644
--- a/configs/am335x_evm_usbspl_defconfig
+++ b/configs/am335x_evm_usbspl_defconfig
@@ -45,6 +45,7 @@ CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
CONFIG_G_DNL_VENDOR_NUM=0x0451
CONFIG_G_DNL_PRODUCT_NUM=0xd022
+CONFIG_USB_ETHER=y
CONFIG_LZO=y
CONFIG_OF_LIBFDT=y
CONFIG_OF_LIBFDT_OVERLAY=y
diff --git a/configs/am335x_hs_evm_defconfig b/configs/am335x_hs_evm_defconfig
index acdd56b43558..552150732398 100644
--- a/configs/am335x_hs_evm_defconfig
+++ b/configs/am335x_hs_evm_defconfig
@@ -58,5 +58,6 @@ CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
CONFIG_G_DNL_VENDOR_NUM=0x0451
CONFIG_G_DNL_PRODUCT_NUM=0xd022
+CONFIG_USB_ETHER=y
CONFIG_RSA=y
CONFIG_LZO=y
diff --git a/configs/draco_defconfig b/configs/draco_defconfig
index f5a2c1b52621..e38030bf5913 100644
--- a/configs/draco_defconfig
+++ b/configs/draco_defconfig
@@ -70,3 +70,4 @@ CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_G_DNL_MANUFACTURER="Siemens AG"
CONFIG_G_DNL_VENDOR_NUM=0x0908
CONFIG_G_DNL_PRODUCT_NUM=0x02d2
+CONFIG_USB_ETHER=y
diff --git a/configs/etamin_defconfig b/configs/etamin_defconfig
index 148d4218c090..33ca6858abfd 100644
--- a/configs/etamin_defconfig
+++ b/configs/etamin_defconfig
@@ -70,3 +70,4 @@ CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_G_DNL_MANUFACTURER="Siemens AG"
CONFIG_G_DNL_VENDOR_NUM=0x0908
CONFIG_G_DNL_PRODUCT_NUM=0x02d2
+CONFIG_USB_ETHER=y
diff --git a/configs/gwventana_emmc_defconfig b/configs/gwventana_emmc_defconfig
index 74aa2ef56621..35d9e1ac27dc 100644
--- a/configs/gwventana_emmc_defconfig
+++ b/configs/gwventana_emmc_defconfig
@@ -68,6 +68,7 @@ CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_G_DNL_MANUFACTURER="Gateworks"
CONFIG_G_DNL_VENDOR_NUM=0x0525
CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
+CONFIG_USB_ETHER=y
CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y
CONFIG_USB_ETHER_SMSC95XX=y
diff --git a/configs/gwventana_gw5904_defconfig b/configs/gwventana_gw5904_defconfig
index 7bbdd500a78c..ca7eb5ac573e 100644
--- a/configs/gwventana_gw5904_defconfig
+++ b/configs/gwventana_gw5904_defconfig
@@ -72,6 +72,7 @@ CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_G_DNL_MANUFACTURER="Gateworks"
CONFIG_G_DNL_VENDOR_NUM=0x0525
CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
+CONFIG_USB_ETHER=y
CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y
CONFIG_USB_ETHER_SMSC95XX=y
diff --git a/configs/gwventana_nand_defconfig b/configs/gwventana_nand_defconfig
index aaedf93eeac9..cb9655574888 100644
--- a/configs/gwventana_nand_defconfig
+++ b/configs/gwventana_nand_defconfig
@@ -71,6 +71,7 @@ CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_G_DNL_MANUFACTURER="Gateworks"
CONFIG_G_DNL_VENDOR_NUM=0x0525
CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
+CONFIG_USB_ETHER=y
CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y
CONFIG_USB_ETHER_SMSC95XX=y
diff --git a/configs/ma5d4evk_defconfig b/configs/ma5d4evk_defconfig
index 0d8c109fbcf1..0655505a1321 100644
--- a/configs/ma5d4evk_defconfig
+++ b/configs/ma5d4evk_defconfig
@@ -52,6 +52,7 @@ CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_G_DNL_MANUFACTURER="AriesEmbedded"
CONFIG_G_DNL_VENDOR_NUM=0x0525
CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
+CONFIG_USB_ETHER=y
CONFIG_FAT_WRITE=y
CONFIG_OF_LIBFDT=y
# CONFIG_EFI_LOADER is not set
diff --git a/configs/mx6qsabrelite_defconfig b/configs/mx6qsabrelite_defconfig
index 57aba7e6d09a..bab0d0c79f0d 100644
--- a/configs/mx6qsabrelite_defconfig
+++ b/configs/mx6qsabrelite_defconfig
@@ -54,5 +54,6 @@ CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_G_DNL_MANUFACTURER="Boundary"
CONFIG_G_DNL_VENDOR_NUM=0x0525
CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
+CONFIG_USB_ETHER=y
# CONFIG_VIDEO_SW_CURSOR is not set
CONFIG_OF_LIBFDT=y
diff --git a/configs/nitrogen6dl2g_defconfig b/configs/nitrogen6dl2g_defconfig
index 50e6b70bc9a0..0d19b85a30f3 100644
--- a/configs/nitrogen6dl2g_defconfig
+++ b/configs/nitrogen6dl2g_defconfig
@@ -51,5 +51,6 @@ CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_G_DNL_MANUFACTURER="Boundary"
CONFIG_G_DNL_VENDOR_NUM=0x0525
CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
+CONFIG_USB_ETHER=y
# CONFIG_VIDEO_SW_CURSOR is not set
CONFIG_OF_LIBFDT=y
diff --git a/configs/nitrogen6dl_defconfig b/configs/nitrogen6dl_defconfig
index 61e5ea4e21ef..a20580eb77bb 100644
--- a/configs/nitrogen6dl_defconfig
+++ b/configs/nitrogen6dl_defconfig
@@ -51,5 +51,6 @@ CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_G_DNL_MANUFACTURER="Boundary"
CONFIG_G_DNL_VENDOR_NUM=0x0525
CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
+CONFIG_USB_ETHER=y
# CONFIG_VIDEO_SW_CURSOR is not set
CONFIG_OF_LIBFDT=y
diff --git a/configs/nitrogen6q2g_defconfig b/configs/nitrogen6q2g_defconfig
index 9dbb7181ee23..940c74a5ece2 100644
--- a/configs/nitrogen6q2g_defconfig
+++ b/configs/nitrogen6q2g_defconfig
@@ -52,5 +52,6 @@ CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_G_DNL_MANUFACTURER="Boundary"
CONFIG_G_DNL_VENDOR_NUM=0x0525
CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
+CONFIG_USB_ETHER=y
# CONFIG_VIDEO_SW_CURSOR is not set
CONFIG_OF_LIBFDT=y
diff --git a/configs/nitrogen6q_defconfig b/configs/nitrogen6q_defconfig
index 5478390fd8c3..83772cb2efcf 100644
--- a/configs/nitrogen6q_defconfig
+++ b/configs/nitrogen6q_defconfig
@@ -52,5 +52,6 @@ CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_G_DNL_MANUFACTURER="Boundary"
CONFIG_G_DNL_VENDOR_NUM=0x0525
CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
+CONFIG_USB_ETHER=y
# CONFIG_VIDEO_SW_CURSOR is not set
CONFIG_OF_LIBFDT=y
diff --git a/configs/nitrogen6s1g_defconfig b/configs/nitrogen6s1g_defconfig
index 01881686429b..862b41a3f8c9 100644
--- a/configs/nitrogen6s1g_defconfig
+++ b/configs/nitrogen6s1g_defconfig
@@ -51,5 +51,6 @@ CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_G_DNL_MANUFACTURER="Boundary"
CONFIG_G_DNL_VENDOR_NUM=0x0525
CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
+CONFIG_USB_ETHER=y
# CONFIG_VIDEO_SW_CURSOR is not set
CONFIG_OF_LIBFDT=y
diff --git a/configs/nitrogen6s_defconfig b/configs/nitrogen6s_defconfig
index 51f1f91be854..e5376313b9bd 100644
--- a/configs/nitrogen6s_defconfig
+++ b/configs/nitrogen6s_defconfig
@@ -51,5 +51,6 @@ CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_G_DNL_MANUFACTURER="Boundary"
CONFIG_G_DNL_VENDOR_NUM=0x0525
CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
+CONFIG_USB_ETHER=y
# CONFIG_VIDEO_SW_CURSOR is not set
CONFIG_OF_LIBFDT=y
diff --git a/configs/novena_defconfig b/configs/novena_defconfig
index 2921525f9fb0..786ab2854f70 100644
--- a/configs/novena_defconfig
+++ b/configs/novena_defconfig
@@ -48,6 +48,7 @@ CONFIG_USB_KEYBOARD=y
CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y
CONFIG_USB_GADGET=y
CONFIG_CI_UDC=y
+CONFIG_USB_ETHER=y
CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y
CONFIG_USB_ETHER_SMSC95XX=y
diff --git a/configs/omap3_beagle_defconfig b/configs/omap3_beagle_defconfig
index cf888f3491aa..8896b84ebc9a 100644
--- a/configs/omap3_beagle_defconfig
+++ b/configs/omap3_beagle_defconfig
@@ -52,6 +52,7 @@ CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_G_DNL_MANUFACTURER="TI"
CONFIG_G_DNL_VENDOR_NUM=0x0451
CONFIG_G_DNL_PRODUCT_NUM=0xd022
+CONFIG_USB_ETHER=y
CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y
CONFIG_USB_ETHER_MCS7830=y
diff --git a/configs/omap3_evm_defconfig b/configs/omap3_evm_defconfig
index 962ffa072996..8db95f167a1a 100644
--- a/configs/omap3_evm_defconfig
+++ b/configs/omap3_evm_defconfig
@@ -56,6 +56,7 @@ CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
CONFIG_G_DNL_VENDOR_NUM=0x0451
CONFIG_G_DNL_PRODUCT_NUM=0x5678
+CONFIG_USB_ETHER=y
CONFIG_FAT_WRITE=y
CONFIG_BCH=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig
index 8d0a4d48e415..3bf115e6f8c8 100644
--- a/configs/omap3_logic_defconfig
+++ b/configs/omap3_logic_defconfig
@@ -49,4 +49,5 @@ CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_G_DNL_MANUFACTURER="TI"
CONFIG_G_DNL_VENDOR_NUM=0x0451
CONFIG_G_DNL_PRODUCT_NUM=0xd022
+CONFIG_USB_ETHER=y
CONFIG_BCH=y
diff --git a/configs/pcm051_rev1_defconfig b/configs/pcm051_rev1_defconfig
index 1683f88b690b..9b325d43ba79 100644
--- a/configs/pcm051_rev1_defconfig
+++ b/configs/pcm051_rev1_defconfig
@@ -60,5 +60,6 @@ CONFIG_USB_MUSB_HOST=y
CONFIG_USB_MUSB_GADGET=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_ETHER=y
CONFIG_FAT_WRITE=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/pcm051_rev3_defconfig b/configs/pcm051_rev3_defconfig
index d082bb4af204..14211ec6835e 100644
--- a/configs/pcm051_rev3_defconfig
+++ b/configs/pcm051_rev3_defconfig
@@ -60,5 +60,6 @@ CONFIG_USB_MUSB_HOST=y
CONFIG_USB_MUSB_GADGET=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_ETHER=y
CONFIG_FAT_WRITE=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/pxm2_defconfig b/configs/pxm2_defconfig
index b1da71d4c7ed..b6624f0be16c 100644
--- a/configs/pxm2_defconfig
+++ b/configs/pxm2_defconfig
@@ -74,6 +74,7 @@ CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_G_DNL_MANUFACTURER="Siemens AG"
CONFIG_G_DNL_VENDOR_NUM=0x0908
CONFIG_G_DNL_PRODUCT_NUM=0x02d2
+CONFIG_USB_ETHER=y
CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00"
# CONFIG_VIDEO_SW_CURSOR is not set
CONFIG_SYS_CONSOLE_BG_COL=0xff
diff --git a/configs/rastaban_defconfig b/configs/rastaban_defconfig
index 940c4144d406..ed5f2f841b2a 100644
--- a/configs/rastaban_defconfig
+++ b/configs/rastaban_defconfig
@@ -70,4 +70,5 @@ CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_G_DNL_MANUFACTURER="Siemens AG"
CONFIG_G_DNL_VENDOR_NUM=0x0908
CONFIG_G_DNL_PRODUCT_NUM=0x02d2
+CONFIG_USB_ETHER=y
CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00"
diff --git a/configs/rut_defconfig b/configs/rut_defconfig
index 6ec8ff35710e..1b787906baf9 100644
--- a/configs/rut_defconfig
+++ b/configs/rut_defconfig
@@ -75,6 +75,7 @@ CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_G_DNL_MANUFACTURER="Siemens AG"
CONFIG_G_DNL_VENDOR_NUM=0x0908
CONFIG_G_DNL_PRODUCT_NUM=0x02d2
+CONFIG_USB_ETHER=y
# CONFIG_VIDEO_SW_CURSOR is not set
CONFIG_SYS_CONSOLE_BG_COL=0xff
CONFIG_SYS_CONSOLE_FG_COL=0x00
diff --git a/configs/sama5d2_ptc_nandflash_defconfig b/configs/sama5d2_ptc_nandflash_defconfig
index bca3ac2fcbfc..6672a5ce11f7 100644
--- a/configs/sama5d2_ptc_nandflash_defconfig
+++ b/configs/sama5d2_ptc_nandflash_defconfig
@@ -30,3 +30,4 @@ CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_ATMEL_USBA=y
+CONFIG_USB_ETHER=y
diff --git a/configs/sama5d2_ptc_spiflash_defconfig b/configs/sama5d2_ptc_spiflash_defconfig
index e4fb49f6627d..9a23a808f1b3 100644
--- a/configs/sama5d2_ptc_spiflash_defconfig
+++ b/configs/sama5d2_ptc_spiflash_defconfig
@@ -31,3 +31,4 @@ CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_ATMEL_USBA=y
+CONFIG_USB_ETHER=y
diff --git a/configs/sansa_fuze_plus_defconfig b/configs/sansa_fuze_plus_defconfig
index f6ce09c366b4..c6d50ccb8e15 100644
--- a/configs/sansa_fuze_plus_defconfig
+++ b/configs/sansa_fuze_plus_defconfig
@@ -32,4 +32,5 @@ CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_GADGET=y
CONFIG_CI_UDC=y
+CONFIG_USB_ETHER=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/thuban_defconfig b/configs/thuban_defconfig
index c30e924fb56f..eb9124ce23ec 100644
--- a/configs/thuban_defconfig
+++ b/configs/thuban_defconfig
@@ -70,3 +70,4 @@ CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_G_DNL_MANUFACTURER="Siemens AG"
CONFIG_G_DNL_VENDOR_NUM=0x0908
CONFIG_G_DNL_PRODUCT_NUM=0x02d2
+CONFIG_USB_ETHER=y
diff --git a/configs/vinco_defconfig b/configs/vinco_defconfig
index 2cd4466a08e5..08aa8c52a254 100644
--- a/configs/vinco_defconfig
+++ b/configs/vinco_defconfig
@@ -32,5 +32,6 @@ CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_ATMEL_USBA=y
+CONFIG_USB_ETHER=y
CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_SMSC95XX=y
diff --git a/configs/warp7_defconfig b/configs/warp7_defconfig
index f430f30bbbe5..8a3717facdbd 100644
--- a/configs/warp7_defconfig
+++ b/configs/warp7_defconfig
@@ -38,5 +38,6 @@ CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_G_DNL_MANUFACTURER="FSL"
CONFIG_G_DNL_VENDOR_NUM=0x0525
CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
+CONFIG_USB_ETHER=y
CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00"
CONFIG_OF_LIBFDT=y
diff --git a/configs/warp7_secure_defconfig b/configs/warp7_secure_defconfig
index 96e2c9e5cfde..83a06079fdc5 100644
--- a/configs/warp7_secure_defconfig
+++ b/configs/warp7_secure_defconfig
@@ -36,5 +36,6 @@ CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_G_DNL_MANUFACTURER="FSL"
CONFIG_G_DNL_VENDOR_NUM=0x0525
CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
+CONFIG_USB_ETHER=y
CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00"
CONFIG_OF_LIBFDT=y
diff --git a/configs/xfi3_defconfig b/configs/xfi3_defconfig
index de80da69c68b..6cc78452829c 100644
--- a/configs/xfi3_defconfig
+++ b/configs/xfi3_defconfig
@@ -31,4 +31,5 @@ CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_GADGET=y
CONFIG_CI_UDC=y
+CONFIG_USB_ETHER=y
CONFIG_OF_LIBFDT=y
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index 510efd67b9a4..ae3a37b3a935 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -121,6 +121,18 @@ config G_DNL_PRODUCT_NUM
endif # USB_GADGET_DOWNLOAD
+config USB_ETHER
+ bool "USB Ethernet Gadget"
+ help
+ Creates an Ethernet network device through a USB peripheral
+ controller. This will create a network interface on both the device
+ (U-Boot) and the host (remote device) that can be used just like any
+ other nework interface.
+ It will bind on the peripheral USB controller, ignoring the USB hosts
+ controllers in the system.
+
+if USB_ETHER
+
config USBNET_DEVADDR
string "USB Gadget Ethernet device mac address"
default "de:ad:be:ef:00:01"
@@ -135,4 +147,6 @@ config USBNET_HOST_ADDR
Ethernet MAC address of the host-side (ie. remote device's) MAC
address of the usb_ether interface
+endif # USB_ETHER
+
endif # USB_GADGET
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index 7c025c7e46c8..9238c4bb769c 100644
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -264,7 +264,6 @@
#define CONFIG_AM335X_USB1_MODE MUSB_HOST
#ifdef CONFIG_USB_MUSB_GADGET
-#define CONFIG_USB_ETHER
#define CONFIG_USB_ETH_RNDIS
#endif /* CONFIG_USB_MUSB_GADGET */
diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h
index 5435ca8f4ea4..d09672770134 100644
--- a/include/configs/am3517_evm.h
+++ b/include/configs/am3517_evm.h
@@ -80,7 +80,6 @@
#endif /* CONFIG_USB_MUSB_HOST */
#ifdef CONFIG_USB_MUSB_GADGET
-#define CONFIG_USB_ETHER
#define CONFIG_USB_ETH_RNDIS
#endif /* CONFIG_USB_MUSB_GADGET */
diff --git a/include/configs/baltos.h b/include/configs/baltos.h
index 535fdd4373b0..380a78918f29 100644
--- a/include/configs/baltos.h
+++ b/include/configs/baltos.h
@@ -284,7 +284,6 @@
#define CONFIG_AM335X_USB1_MODE MUSB_OTG
#ifdef CONFIG_USB_MUSB_GADGET
-#define CONFIG_USB_ETHER
#define CONFIG_USB_ETH_RNDIS
#endif /* CONFIG_USB_MUSB_GADGET */
diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index 9c26059a068e..f4b7a061ba12 100644
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -146,7 +146,6 @@
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
#define CONFIG_MXC_USB_FLAGS 0
#define CONFIG_USBD_HS
-#define CONFIG_USB_ETHER
#define CONFIG_USB_ETH_CDC
#define CONFIG_NETCONSOLE
diff --git a/include/configs/h2200.h b/include/configs/h2200.h
index e956e89a89d5..24ff53f6f1e9 100644
--- a/include/configs/h2200.h
+++ b/include/configs/h2200.h
@@ -123,7 +123,6 @@
"bootm ; "
#define CONFIG_USB_GADGET_PXA2XX
-#define CONFIG_USB_ETHER
#define CONFIG_USB_ETH_SUBSET
#define CONFIG_USBNET_DEV_ADDR "de:ad:be:ef:00:01"
diff --git a/include/configs/ma5d4evk.h b/include/configs/ma5d4evk.h
index 50b21c9d97a0..2ad4952f5eeb 100644
--- a/include/configs/ma5d4evk.h
+++ b/include/configs/ma5d4evk.h
@@ -97,7 +97,6 @@
#ifdef CONFIG_CMD_USB
/* USB device */
-#define CONFIG_USB_ETHER
#define CONFIG_USB_ETH_RNDIS
#define CONFIG_USBNET_MANUFACTURER "AriesEmbedded"
#define CONFIG_USB_FUNCTION_MASS_STORAGE
diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index d32d8f871a99..ca37f584f042 100644
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -19,7 +19,6 @@
#define CONFIG_MISC_INIT_R
#define CONFIG_USBD_HS
-#define CONFIG_USB_ETHER
#define CONFIG_USB_ETH_CDC
#define CONFIG_NETCONSOLE
diff --git a/include/configs/novena.h b/include/configs/novena.h
index be8c6911e63a..9068ee2182e3 100644
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -129,7 +129,6 @@
#define CONFIG_MXC_USB_FLAGS 0
/* Gadget part */
#define CONFIG_USBD_HS
-#define CONFIG_USB_ETHER
#define CONFIG_USB_ETH_CDC
#define CONFIG_NETCONSOLE
#endif
diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
index ee22f4fc1bb5..ff6e86e80e9e 100644
--- a/include/configs/omap3_beagle.h
+++ b/include/configs/omap3_beagle.h
@@ -46,7 +46,6 @@
#define CONFIG_USB_MUSB_OMAP2PLUS
#define CONFIG_USB_MUSB_PIO_ONLY
#define CONFIG_TWL4030_USB 1
-#define CONFIG_USB_ETHER
/* USB EHCI */
diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
index af99e8b5cb48..178e61e1b6f7 100644
--- a/include/configs/omap3_evm.h
+++ b/include/configs/omap3_evm.h
@@ -82,7 +82,6 @@
#define CONFIG_USB_OMAP3
#define CONFIG_USB_MUSB_OMAP2PLUS
#define CONFIG_USB_MUSB_PIO_ONLY
-#define CONFIG_USB_ETHER
/* USB EHCI */
#define CONFIG_SYS_USB_FAT_BOOT_PARTITION 1
diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h
index 5fba35668b2d..092bb73a8464 100644
--- a/include/configs/omap3_logic.h
+++ b/include/configs/omap3_logic.h
@@ -57,7 +57,6 @@
/* USB */
#define CONFIG_USB_MUSB_OMAP2PLUS
#define CONFIG_USB_MUSB_PIO_ONLY
-#define CONFIG_USB_ETHER
/* TWL4030 */
#define CONFIG_TWL4030_USB
diff --git a/include/configs/pcm051.h b/include/configs/pcm051.h
index f678b2944dd0..309bbd6bd36f 100644
--- a/include/configs/pcm051.h
+++ b/include/configs/pcm051.h
@@ -134,7 +134,6 @@
#define CONFIG_AM335X_USB1_MODE MUSB_HOST
#ifdef CONFIG_USB_MUSB_GADGET
-#define CONFIG_USB_ETHER
#define CONFIG_USB_ETH_RNDIS
#endif /* CONFIG_USB_MUSB_GADGET */
diff --git a/include/configs/sama5d2_ptc.h b/include/configs/sama5d2_ptc.h
index b04781893d48..a1a0602cdd0c 100644
--- a/include/configs/sama5d2_ptc.h
+++ b/include/configs/sama5d2_ptc.h
@@ -60,7 +60,6 @@
#endif
/* USB device */
-#define CONFIG_USB_ETHER
#define CONFIG_USB_ETH_RNDIS
#define CONFIG_USBNET_MANUFACTURER "Atmel SAMA5D2_PTC"
diff --git a/include/configs/sansa_fuze_plus.h b/include/configs/sansa_fuze_plus.h
index 250917b1dc05..9e33ca42270c 100644
--- a/include/configs/sansa_fuze_plus.h
+++ b/include/configs/sansa_fuze_plus.h
@@ -39,7 +39,6 @@
#define CONFIG_EHCI_MXS_PORT0
#define CONFIG_USB_MAX_CONTROLLER_COUNT 1
-#define CONFIG_USB_ETHER
#define CONFIG_USB_ETH_CDC
#define CONFIG_NETCONSOLE
#endif
diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h
index 2bcd77e9efc8..0600984f95aa 100644
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -179,7 +179,6 @@
#define CONFIG_AM335X_USB1_MODE MUSB_HOST
#ifdef CONFIG_USB_MUSB_GADGET
-#define CONFIG_USB_ETHER
#define CONFIG_USB_ETH_RNDIS
#endif /* CONFIG_USB_MUSB_GADGET */
diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h
index 11b909b7dd88..1a4b78674f01 100644
--- a/include/configs/tao3530.h
+++ b/include/configs/tao3530.h
@@ -215,8 +215,6 @@
/* USB EHCI */
#define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 162
-#define CONFIG_USB_ETHER
-
/* Defines for SPL */
#define CONFIG_SPL_FRAMEWORK
#define CONFIG_SPL_NAND_SIMPLE
diff --git a/include/configs/vinco.h b/include/configs/vinco.h
index 490dc446d6d2..3b3ec6c8f2ad 100644
--- a/include/configs/vinco.h
+++ b/include/configs/vinco.h
@@ -64,7 +64,6 @@
#endif
/* USB device */
-#define CONFIG_USB_ETHER
#define CONFIG_USB_ETH_RNDIS
#define CONFIG_USBNET_MANUFACTURER "L+G VInCo"
diff --git a/include/configs/warp7.h b/include/configs/warp7.h
index 9ce425156677..05ae3542a9ad 100644
--- a/include/configs/warp7.h
+++ b/include/configs/warp7.h
@@ -136,7 +136,6 @@
#define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_16M
#define DFU_DEFAULT_POLL_TIMEOUT 300
-#define CONFIG_USB_ETHER
#define CONFIG_USB_ETH_CDC
#define CONFIG_USB_ETH_RNDIS
#define CONFIG_USBNET_DEV_ADDR "de:ad:be:af:00:01"
diff --git a/include/configs/xfi3.h b/include/configs/xfi3.h
index 73f431681db3..7bbfd75c0cb8 100644
--- a/include/configs/xfi3.h
+++ b/include/configs/xfi3.h
@@ -39,7 +39,6 @@
#define CONFIG_EHCI_MXS_PORT0
#define CONFIG_USB_MAX_CONTROLLER_COUNT 1
-#define CONFIG_USB_ETHER
#define CONFIG_USB_ETH_CDC
#define CONFIG_NETCONSOLE
#endif
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 784e83c7c8a1..e9e716e7c80e 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -5013,7 +5013,6 @@ CONFIG_USB_EHCI_TEGRA
CONFIG_USB_EHCI_TXFIFO_THRESH
CONFIG_USB_EHCI_VCT
CONFIG_USB_EHCI_VF
-CONFIG_USB_ETHER
CONFIG_USB_ETH_CDC
CONFIG_USB_ETH_QMULT
CONFIG_USB_ETH_RNDIS
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 35+ messages in thread
* [U-Boot] [PATCH v2 05/14] usb: gadget: usb_ether: Move the interfaces to Kconfig
2017-09-12 19:01 [U-Boot] [PATCH v2 00/14] sunxi: convert musb to the device model and enable usb_ether Maxime Ripard
` (3 preceding siblings ...)
2017-09-12 19:01 ` [U-Boot] [PATCH v2 04/14] usb: gadget: Convert USB_ETHER " Maxime Ripard
@ 2017-09-12 19:01 ` Maxime Ripard
2017-09-13 4:27 ` Simon Glass
2017-09-13 10:39 ` Łukasz Majewski
2017-09-12 19:01 ` [U-Boot] [PATCH v2 06/14] usb: gadget: Make g_dnl USB settings common Maxime Ripard
` (9 subsequent siblings)
14 siblings, 2 replies; 35+ messages in thread
From: Maxime Ripard @ 2017-09-12 19:01 UTC (permalink / raw)
To: u-boot
We need to select an interface for the usb_ether gadget, and they haven't
been converted to Kconfig yet. Add a choice to make sure we have an option
selected, and convert all the users.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
configs/gwventana_emmc_defconfig | 1 +-
configs/gwventana_gw5904_defconfig | 1 +-
configs/gwventana_nand_defconfig | 1 +-
configs/mx6qsabrelite_defconfig | 1 +-
configs/nitrogen6dl2g_defconfig | 1 +-
configs/nitrogen6dl_defconfig | 1 +-
configs/nitrogen6q2g_defconfig | 1 +-
configs/nitrogen6q_defconfig | 1 +-
configs/nitrogen6s1g_defconfig | 1 +-
configs/nitrogen6s_defconfig | 1 +-
configs/novena_defconfig | 1 +-
configs/sansa_fuze_plus_defconfig | 1 +-
configs/warp7_defconfig | 1 +-
configs/warp7_secure_defconfig | 1 +-
configs/xfi3_defconfig | 1 +-
drivers/usb/gadget/Kconfig | 28 +++++++++++++++++++++++++++-
include/configs/am335x_evm.h | 4 +----
include/configs/am3517_evm.h | 4 +----
include/configs/baltos.h | 4 +----
include/configs/gw_ventana.h | 1 +-
include/configs/ma5d4evk.h | 1 +-
include/configs/nitrogen6x.h | 1 +-
include/configs/novena.h | 1 +-
include/configs/pcm051.h | 4 +----
include/configs/sama5d2_ptc.h | 1 +-
include/configs/sansa_fuze_plus.h | 1 +-
include/configs/siemens-am33x-common.h | 4 +----
include/configs/vinco.h | 1 +-
include/configs/warp7.h | 2 +--
include/configs/xfi3.h | 1 +-
scripts/config_whitelist.txt | 2 +--
31 files changed, 43 insertions(+), 32 deletions(-)
diff --git a/configs/gwventana_emmc_defconfig b/configs/gwventana_emmc_defconfig
index 35d9e1ac27dc..03d732d8f11e 100644
--- a/configs/gwventana_emmc_defconfig
+++ b/configs/gwventana_emmc_defconfig
@@ -69,6 +69,7 @@ CONFIG_G_DNL_MANUFACTURER="Gateworks"
CONFIG_G_DNL_VENDOR_NUM=0x0525
CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
CONFIG_USB_ETHER=y
+CONFIG_USB_ETH_CDC=y
CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y
CONFIG_USB_ETHER_SMSC95XX=y
diff --git a/configs/gwventana_gw5904_defconfig b/configs/gwventana_gw5904_defconfig
index ca7eb5ac573e..51aa13dbaca3 100644
--- a/configs/gwventana_gw5904_defconfig
+++ b/configs/gwventana_gw5904_defconfig
@@ -73,6 +73,7 @@ CONFIG_G_DNL_MANUFACTURER="Gateworks"
CONFIG_G_DNL_VENDOR_NUM=0x0525
CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
CONFIG_USB_ETHER=y
+CONFIG_USB_ETH_CDC=y
CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y
CONFIG_USB_ETHER_SMSC95XX=y
diff --git a/configs/gwventana_nand_defconfig b/configs/gwventana_nand_defconfig
index cb9655574888..4b2e1a752935 100644
--- a/configs/gwventana_nand_defconfig
+++ b/configs/gwventana_nand_defconfig
@@ -72,6 +72,7 @@ CONFIG_G_DNL_MANUFACTURER="Gateworks"
CONFIG_G_DNL_VENDOR_NUM=0x0525
CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
CONFIG_USB_ETHER=y
+CONFIG_USB_ETH_CDC=y
CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y
CONFIG_USB_ETHER_SMSC95XX=y
diff --git a/configs/mx6qsabrelite_defconfig b/configs/mx6qsabrelite_defconfig
index bab0d0c79f0d..f716c8fd7f77 100644
--- a/configs/mx6qsabrelite_defconfig
+++ b/configs/mx6qsabrelite_defconfig
@@ -55,5 +55,6 @@ CONFIG_G_DNL_MANUFACTURER="Boundary"
CONFIG_G_DNL_VENDOR_NUM=0x0525
CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
CONFIG_USB_ETHER=y
+CONFIG_USB_ETH_CDC=y
# CONFIG_VIDEO_SW_CURSOR is not set
CONFIG_OF_LIBFDT=y
diff --git a/configs/nitrogen6dl2g_defconfig b/configs/nitrogen6dl2g_defconfig
index 0d19b85a30f3..fd4a46558129 100644
--- a/configs/nitrogen6dl2g_defconfig
+++ b/configs/nitrogen6dl2g_defconfig
@@ -52,5 +52,6 @@ CONFIG_G_DNL_MANUFACTURER="Boundary"
CONFIG_G_DNL_VENDOR_NUM=0x0525
CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
CONFIG_USB_ETHER=y
+CONFIG_USB_ETH_CDC=y
# CONFIG_VIDEO_SW_CURSOR is not set
CONFIG_OF_LIBFDT=y
diff --git a/configs/nitrogen6dl_defconfig b/configs/nitrogen6dl_defconfig
index a20580eb77bb..30046e3f3a07 100644
--- a/configs/nitrogen6dl_defconfig
+++ b/configs/nitrogen6dl_defconfig
@@ -52,5 +52,6 @@ CONFIG_G_DNL_MANUFACTURER="Boundary"
CONFIG_G_DNL_VENDOR_NUM=0x0525
CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
CONFIG_USB_ETHER=y
+CONFIG_USB_ETH_CDC=y
# CONFIG_VIDEO_SW_CURSOR is not set
CONFIG_OF_LIBFDT=y
diff --git a/configs/nitrogen6q2g_defconfig b/configs/nitrogen6q2g_defconfig
index 940c74a5ece2..f9160c208fe7 100644
--- a/configs/nitrogen6q2g_defconfig
+++ b/configs/nitrogen6q2g_defconfig
@@ -53,5 +53,6 @@ CONFIG_G_DNL_MANUFACTURER="Boundary"
CONFIG_G_DNL_VENDOR_NUM=0x0525
CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
CONFIG_USB_ETHER=y
+CONFIG_USB_ETH_CDC=y
# CONFIG_VIDEO_SW_CURSOR is not set
CONFIG_OF_LIBFDT=y
diff --git a/configs/nitrogen6q_defconfig b/configs/nitrogen6q_defconfig
index 83772cb2efcf..8bca0e04439e 100644
--- a/configs/nitrogen6q_defconfig
+++ b/configs/nitrogen6q_defconfig
@@ -53,5 +53,6 @@ CONFIG_G_DNL_MANUFACTURER="Boundary"
CONFIG_G_DNL_VENDOR_NUM=0x0525
CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
CONFIG_USB_ETHER=y
+CONFIG_USB_ETH_CDC=y
# CONFIG_VIDEO_SW_CURSOR is not set
CONFIG_OF_LIBFDT=y
diff --git a/configs/nitrogen6s1g_defconfig b/configs/nitrogen6s1g_defconfig
index 862b41a3f8c9..668fbaa37010 100644
--- a/configs/nitrogen6s1g_defconfig
+++ b/configs/nitrogen6s1g_defconfig
@@ -52,5 +52,6 @@ CONFIG_G_DNL_MANUFACTURER="Boundary"
CONFIG_G_DNL_VENDOR_NUM=0x0525
CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
CONFIG_USB_ETHER=y
+CONFIG_USB_ETH_CDC=y
# CONFIG_VIDEO_SW_CURSOR is not set
CONFIG_OF_LIBFDT=y
diff --git a/configs/nitrogen6s_defconfig b/configs/nitrogen6s_defconfig
index e5376313b9bd..99106c9a1f5a 100644
--- a/configs/nitrogen6s_defconfig
+++ b/configs/nitrogen6s_defconfig
@@ -52,5 +52,6 @@ CONFIG_G_DNL_MANUFACTURER="Boundary"
CONFIG_G_DNL_VENDOR_NUM=0x0525
CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
CONFIG_USB_ETHER=y
+CONFIG_USB_ETH_CDC=y
# CONFIG_VIDEO_SW_CURSOR is not set
CONFIG_OF_LIBFDT=y
diff --git a/configs/novena_defconfig b/configs/novena_defconfig
index 786ab2854f70..a7056ff13771 100644
--- a/configs/novena_defconfig
+++ b/configs/novena_defconfig
@@ -49,6 +49,7 @@ CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y
CONFIG_USB_GADGET=y
CONFIG_CI_UDC=y
CONFIG_USB_ETHER=y
+CONFIG_USB_ETH_CDC=y
CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y
CONFIG_USB_ETHER_SMSC95XX=y
diff --git a/configs/sansa_fuze_plus_defconfig b/configs/sansa_fuze_plus_defconfig
index c6d50ccb8e15..b5443dda98a9 100644
--- a/configs/sansa_fuze_plus_defconfig
+++ b/configs/sansa_fuze_plus_defconfig
@@ -33,4 +33,5 @@ CONFIG_USB_EHCI_HCD=y
CONFIG_USB_GADGET=y
CONFIG_CI_UDC=y
CONFIG_USB_ETHER=y
+CONFIG_USB_ETH_CDC=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/warp7_defconfig b/configs/warp7_defconfig
index 8a3717facdbd..32cf7a4da4b4 100644
--- a/configs/warp7_defconfig
+++ b/configs/warp7_defconfig
@@ -39,5 +39,6 @@ CONFIG_G_DNL_MANUFACTURER="FSL"
CONFIG_G_DNL_VENDOR_NUM=0x0525
CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
CONFIG_USB_ETHER=y
+CONFIG_USB_ETH_CDC=y
CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00"
CONFIG_OF_LIBFDT=y
diff --git a/configs/warp7_secure_defconfig b/configs/warp7_secure_defconfig
index 83a06079fdc5..99764dbd0bb1 100644
--- a/configs/warp7_secure_defconfig
+++ b/configs/warp7_secure_defconfig
@@ -37,5 +37,6 @@ CONFIG_G_DNL_MANUFACTURER="FSL"
CONFIG_G_DNL_VENDOR_NUM=0x0525
CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
CONFIG_USB_ETHER=y
+CONFIG_USB_ETH_CDC=y
CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00"
CONFIG_OF_LIBFDT=y
diff --git a/configs/xfi3_defconfig b/configs/xfi3_defconfig
index 6cc78452829c..91768a4a7106 100644
--- a/configs/xfi3_defconfig
+++ b/configs/xfi3_defconfig
@@ -32,4 +32,5 @@ CONFIG_USB_EHCI_HCD=y
CONFIG_USB_GADGET=y
CONFIG_CI_UDC=y
CONFIG_USB_ETHER=y
+CONFIG_USB_ETH_CDC=y
CONFIG_OF_LIBFDT=y
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index ae3a37b3a935..1201276be837 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -133,6 +133,34 @@ config USB_ETHER
if USB_ETHER
+choice
+ prompt "USB Ethernet Gadget Model"
+ default USB_ETH_RNDIS
+ help
+ There is several models (protocols) to implement Ethernet over USB
+ devices. The main ones are Microsoft's RNDIS and USB's CDC-Ethernet
+ (also called CDC-ECM). RNDIS is obviously compatible with Windows,
+ while CDC-ECM is not. Most other operating systems support both, so
+ if inter-operability is a concern, RNDIS is to be preferred.
+
+config USB_ETH_CDC
+ bool "CDC-ECM Protocol"
+ help
+ CDC (Communications Device Class) is the standard for Ethernet over
+ USB devices. While there's several alternatives, the most widely used
+ protocol is ECM (Ethernet Control Model). However, compatibility with
+ Windows is not that great.
+
+config USB_ETH_RNDIS
+ bool "RNDIS Protocol"
+ help
+ The RNDIS (Remote Network Driver Interface Specification) is a
+ Microsoft proprietary protocol to create an Ethernet device over USB.
+ Windows obviously supports it, as well as all the major operating
+ systems, so it's the best option for compatibility.
+
+endchoice
+
config USBNET_DEVADDR
string "USB Gadget Ethernet device mac address"
default "de:ad:be:ef:00:01"
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index 9238c4bb769c..96294679bf9b 100644
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -263,10 +263,6 @@
#define CONFIG_AM335X_USB1
#define CONFIG_AM335X_USB1_MODE MUSB_HOST
-#ifdef CONFIG_USB_MUSB_GADGET
-#define CONFIG_USB_ETH_RNDIS
-#endif /* CONFIG_USB_MUSB_GADGET */
-
/*
* Disable MMC DM for SPL build and can be re-enabled after adding
* DM support in SPL
diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h
index d09672770134..38bd6e35e8cd 100644
--- a/include/configs/am3517_evm.h
+++ b/include/configs/am3517_evm.h
@@ -79,10 +79,6 @@
#endif /* CONFIG_USB_MUSB_HOST */
-#ifdef CONFIG_USB_MUSB_GADGET
-#define CONFIG_USB_ETH_RNDIS
-#endif /* CONFIG_USB_MUSB_GADGET */
-
#endif /* CONFIG_USB_MUSB_AM35X */
/* I2C */
diff --git a/include/configs/baltos.h b/include/configs/baltos.h
index 380a78918f29..44af4d3deec8 100644
--- a/include/configs/baltos.h
+++ b/include/configs/baltos.h
@@ -283,10 +283,6 @@
#define CONFIG_AM335X_USB1
#define CONFIG_AM335X_USB1_MODE MUSB_OTG
-#ifdef CONFIG_USB_MUSB_GADGET
-#define CONFIG_USB_ETH_RNDIS
-#endif /* CONFIG_USB_MUSB_GADGET */
-
#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT)
/* disable host part of MUSB in SPL */
/* disable EFI partitions and partition UUID support */
diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index f4b7a061ba12..2795568e8c89 100644
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -146,7 +146,6 @@
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
#define CONFIG_MXC_USB_FLAGS 0
#define CONFIG_USBD_HS
-#define CONFIG_USB_ETH_CDC
#define CONFIG_NETCONSOLE
/* USB Mass Storage Gadget */
diff --git a/include/configs/ma5d4evk.h b/include/configs/ma5d4evk.h
index 2ad4952f5eeb..6d25d84c6eb6 100644
--- a/include/configs/ma5d4evk.h
+++ b/include/configs/ma5d4evk.h
@@ -97,7 +97,6 @@
#ifdef CONFIG_CMD_USB
/* USB device */
-#define CONFIG_USB_ETH_RNDIS
#define CONFIG_USBNET_MANUFACTURER "AriesEmbedded"
#define CONFIG_USB_FUNCTION_MASS_STORAGE
#define CONFIG_SYS_DFU_DATA_BUF_SIZE (1 * 1024 * 1024)
diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index ca37f584f042..6068b70d2d69 100644
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -19,7 +19,6 @@
#define CONFIG_MISC_INIT_R
#define CONFIG_USBD_HS
-#define CONFIG_USB_ETH_CDC
#define CONFIG_NETCONSOLE
#define CONFIG_MXC_UART
diff --git a/include/configs/novena.h b/include/configs/novena.h
index 9068ee2182e3..4825d5bac19a 100644
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -129,7 +129,6 @@
#define CONFIG_MXC_USB_FLAGS 0
/* Gadget part */
#define CONFIG_USBD_HS
-#define CONFIG_USB_ETH_CDC
#define CONFIG_NETCONSOLE
#endif
diff --git a/include/configs/pcm051.h b/include/configs/pcm051.h
index 309bbd6bd36f..79f3f48df87e 100644
--- a/include/configs/pcm051.h
+++ b/include/configs/pcm051.h
@@ -133,10 +133,6 @@
#define CONFIG_AM335X_USB1
#define CONFIG_AM335X_USB1_MODE MUSB_HOST
-#ifdef CONFIG_USB_MUSB_GADGET
-#define CONFIG_USB_ETH_RNDIS
-#endif /* CONFIG_USB_MUSB_GADGET */
-
#define CONFIG_PHY_SMSC
#endif /* ! __CONFIG_PCM051_H */
diff --git a/include/configs/sama5d2_ptc.h b/include/configs/sama5d2_ptc.h
index a1a0602cdd0c..543592e3a574 100644
--- a/include/configs/sama5d2_ptc.h
+++ b/include/configs/sama5d2_ptc.h
@@ -60,7 +60,6 @@
#endif
/* USB device */
-#define CONFIG_USB_ETH_RNDIS
#define CONFIG_USBNET_MANUFACTURER "Atmel SAMA5D2_PTC"
/* Ethernet Hardware */
diff --git a/include/configs/sansa_fuze_plus.h b/include/configs/sansa_fuze_plus.h
index 9e33ca42270c..99200140fe5e 100644
--- a/include/configs/sansa_fuze_plus.h
+++ b/include/configs/sansa_fuze_plus.h
@@ -39,7 +39,6 @@
#define CONFIG_EHCI_MXS_PORT0
#define CONFIG_USB_MAX_CONTROLLER_COUNT 1
-#define CONFIG_USB_ETH_CDC
#define CONFIG_NETCONSOLE
#endif
diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h
index 0600984f95aa..1997c2dd5ae4 100644
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -178,10 +178,6 @@
#define CONFIG_AM335X_USB1
#define CONFIG_AM335X_USB1_MODE MUSB_HOST
-#ifdef CONFIG_USB_MUSB_GADGET
-#define CONFIG_USB_ETH_RNDIS
-#endif /* CONFIG_USB_MUSB_GADGET */
-
/* USB DRACO ID as default */
#define CONFIG_USBD_HS
diff --git a/include/configs/vinco.h b/include/configs/vinco.h
index 3b3ec6c8f2ad..f5aaaa2ffe91 100644
--- a/include/configs/vinco.h
+++ b/include/configs/vinco.h
@@ -64,7 +64,6 @@
#endif
/* USB device */
-#define CONFIG_USB_ETH_RNDIS
#define CONFIG_USBNET_MANUFACTURER "L+G VInCo"
/* Ethernet Hardware */
diff --git a/include/configs/warp7.h b/include/configs/warp7.h
index 05ae3542a9ad..11f1bc3eab75 100644
--- a/include/configs/warp7.h
+++ b/include/configs/warp7.h
@@ -136,8 +136,6 @@
#define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_16M
#define DFU_DEFAULT_POLL_TIMEOUT 300
-#define CONFIG_USB_ETH_CDC
-#define CONFIG_USB_ETH_RNDIS
#define CONFIG_USBNET_DEV_ADDR "de:ad:be:af:00:01"
#endif
diff --git a/include/configs/xfi3.h b/include/configs/xfi3.h
index 7bbfd75c0cb8..1e70a762e0d9 100644
--- a/include/configs/xfi3.h
+++ b/include/configs/xfi3.h
@@ -39,7 +39,6 @@
#define CONFIG_EHCI_MXS_PORT0
#define CONFIG_USB_MAX_CONTROLLER_COUNT 1
-#define CONFIG_USB_ETH_CDC
#define CONFIG_NETCONSOLE
#endif
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index e9e716e7c80e..bbc3d4351bbd 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -5013,9 +5013,7 @@ CONFIG_USB_EHCI_TEGRA
CONFIG_USB_EHCI_TXFIFO_THRESH
CONFIG_USB_EHCI_VCT
CONFIG_USB_EHCI_VF
-CONFIG_USB_ETH_CDC
CONFIG_USB_ETH_QMULT
-CONFIG_USB_ETH_RNDIS
CONFIG_USB_ETH_SUBSET
CONFIG_USB_EXT2_BOOT
CONFIG_USB_FAT_BOOT
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 35+ messages in thread
* [U-Boot] [PATCH v2 06/14] usb: gadget: Make g_dnl USB settings common
2017-09-12 19:01 [U-Boot] [PATCH v2 00/14] sunxi: convert musb to the device model and enable usb_ether Maxime Ripard
` (4 preceding siblings ...)
2017-09-12 19:01 ` [U-Boot] [PATCH v2 05/14] usb: gadget: usb_ether: Move the interfaces " Maxime Ripard
@ 2017-09-12 19:01 ` Maxime Ripard
2017-09-12 19:01 ` [U-Boot] [PATCH v2 07/14] usb: gadget: usb_ether: Move settings to common Maxime Ripard
` (8 subsequent siblings)
14 siblings, 0 replies; 35+ messages in thread
From: Maxime Ripard @ 2017-09-12 19:01 UTC (permalink / raw)
To: u-boot
The g_dnl USB settings for the vendor ID, product ID and manufacturer are
actually common settings that can and should be shared by all the gadgets.
Make them common by renaming them, and convert all the users.
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Lukasz Majewski <lukma@denx.de>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
board/samsung/common/gadget.c | 4 +--
board/siemens/common/factoryset.c | 4 +--
configs/A13-OLinuXino_defconfig | 6 ++--
configs/A20-OLinuXino-Lime2-eMMC_defconfig | 6 ++--
configs/A20-OLinuXino-Lime2_defconfig | 6 ++--
configs/CHIP_defconfig | 6 ++--
configs/CHIP_pro_defconfig | 6 ++--
configs/Cubietruck_defconfig | 6 ++--
configs/Nintendo_NES_Classic_Edition_defconfig | 6 ++--
configs/Sinlinx_SinA33_defconfig | 6 ++--
configs/am335x_baltos_defconfig | 6 ++--
configs/am335x_boneblack_defconfig | 6 ++--
configs/am335x_boneblack_vboot_defconfig | 6 ++--
configs/am335x_evm_defconfig | 6 ++--
configs/am335x_evm_nor_defconfig | 6 ++--
configs/am335x_evm_norboot_defconfig | 6 ++--
configs/am335x_evm_spiboot_defconfig | 6 ++--
configs/am335x_evm_usbspl_defconfig | 6 ++--
configs/am335x_hs_evm_defconfig | 6 ++--
configs/am43xx_evm_defconfig | 6 ++--
configs/am43xx_evm_ethboot_defconfig | 6 ++--
configs/am43xx_evm_qspiboot_defconfig | 6 ++--
configs/am43xx_evm_usbhost_boot_defconfig | 6 ++--
configs/am43xx_hs_evm_defconfig | 6 ++--
configs/am57xx_evm_defconfig | 6 ++--
configs/am57xx_evm_nodt_defconfig | 6 ++--
configs/am57xx_hs_evm_defconfig | 6 ++--
configs/apalis-tk1_defconfig | 6 ++--
configs/apalis_imx6_defconfig | 6 ++--
configs/apalis_imx6_nospl_com_defconfig | 6 ++--
configs/apalis_imx6_nospl_it_defconfig | 6 ++--
configs/apalis_t30_defconfig | 6 ++--
configs/bcm11130_defconfig | 6 ++--
configs/bcm11130_nand_defconfig | 6 ++--
configs/bcm23550_w1d_defconfig | 6 ++--
configs/bcm28155_ap_defconfig | 6 ++--
configs/bcm28155_w1d_defconfig | 6 ++--
configs/beaver_defconfig | 6 ++--
configs/birdland_bav335a_defconfig | 6 ++--
configs/birdland_bav335b_defconfig | 6 ++--
configs/cei-tk1-som_defconfig | 6 ++--
configs/cgtqmx6eval_defconfig | 6 ++--
configs/chromebit_mickey_defconfig | 6 ++--
configs/chromebook_jerry_defconfig | 6 ++--
configs/chromebook_minnie_defconfig | 6 ++--
configs/colibri_imx6_defconfig | 6 ++--
configs/colibri_imx6_nospl_defconfig | 6 ++--
configs/colibri_imx7_defconfig | 6 ++--
configs/colibri_t20_defconfig | 6 ++--
configs/colibri_t30_defconfig | 6 ++--
configs/colibri_vf_defconfig | 6 ++--
configs/corvus_defconfig | 6 ++--
configs/dalmore_defconfig | 6 ++--
configs/dms-ba16-1g_defconfig | 6 ++--
configs/dms-ba16_defconfig | 6 ++--
configs/dra7xx_evm_defconfig | 6 ++--
configs/dra7xx_hs_evm_defconfig | 6 ++--
configs/draco_defconfig | 6 ++--
configs/e2220-1170_defconfig | 6 ++--
configs/edison_defconfig | 6 ++--
configs/etamin_defconfig | 6 ++--
configs/evb-rk3036_defconfig | 6 ++--
configs/evb-rk3229_defconfig | 6 ++--
configs/evb-rk3288_defconfig | 6 ++--
configs/evb-rk3328_defconfig | 6 ++--
configs/fennec-rk3288_defconfig | 6 ++--
configs/firefly-rk3288_defconfig | 6 ++--
configs/gwventana_emmc_defconfig | 6 ++--
configs/gwventana_gw5904_defconfig | 6 ++--
configs/gwventana_nand_defconfig | 6 ++--
configs/jetson-tk1_defconfig | 6 ++--
configs/kc1_defconfig | 6 ++--
configs/kylin-rk3036_defconfig | 6 ++--
configs/ma5d4evk_defconfig | 6 ++--
configs/miqi-rk3288_defconfig | 6 ++--
configs/mx6qsabrelite_defconfig | 6 ++--
configs/mx6sabreauto_defconfig | 6 ++--
configs/mx6sabresd_defconfig | 6 ++--
configs/mx7dsabresd_defconfig | 6 ++--
configs/mx7dsabresd_secure_defconfig | 6 ++--
configs/nitrogen6dl2g_defconfig | 6 ++--
configs/nitrogen6dl_defconfig | 6 ++--
configs/nitrogen6q2g_defconfig | 6 ++--
configs/nitrogen6q_defconfig | 6 ++--
configs/nitrogen6s1g_defconfig | 6 ++--
configs/nitrogen6s_defconfig | 6 ++--
configs/nyan-big_defconfig | 6 ++--
configs/odroid-xu3_defconfig | 6 ++--
configs/odroid_defconfig | 6 ++--
configs/omap3_beagle_defconfig | 6 ++--
configs/omap3_evm_defconfig | 6 ++--
configs/omap3_logic_defconfig | 6 ++--
configs/omap5_uevm_defconfig | 6 ++--
configs/opos6uldev_defconfig | 6 ++--
configs/origen_defconfig | 6 ++--
configs/p2371-0000_defconfig | 6 ++--
configs/p2371-2180_defconfig | 6 ++--
configs/p2571_defconfig | 6 ++--
configs/parrot_r16_defconfig | 6 ++--
configs/phycore-rk3288_defconfig | 6 ++--
configs/pico-imx6ul_defconfig | 6 ++--
configs/pico-imx7d_defconfig | 6 ++--
configs/popmetal-rk3288_defconfig | 6 ++--
configs/pxm2_defconfig | 6 ++--
configs/rastaban_defconfig | 6 ++--
configs/rock2_defconfig | 6 ++--
configs/rut_defconfig | 6 ++--
configs/s5p_goni_defconfig | 6 ++--
configs/s5pc210_universal_defconfig | 6 ++--
configs/smartweb_defconfig | 6 ++--
configs/sniper_defconfig | 6 ++--
configs/socfpga_arria5_defconfig | 6 ++--
configs/socfpga_cyclone5_defconfig | 6 ++--
configs/socfpga_de0_nano_soc_defconfig | 6 ++--
configs/socfpga_de10_nano_defconfig | 6 ++--
configs/socfpga_mcvevk_defconfig | 6 ++--
configs/socfpga_sockit_defconfig | 6 ++--
configs/socfpga_socrates_defconfig | 6 ++--
configs/socfpga_vining_fpga_defconfig | 6 ++--
configs/taurus_defconfig | 6 ++--
configs/tbs2910_defconfig | 6 ++--
configs/thuban_defconfig | 6 ++--
configs/tinker-rk3288_defconfig | 6 ++--
configs/topic_miami_defconfig | 6 ++--
configs/topic_miamilite_defconfig | 6 ++--
configs/topic_miamiplus_defconfig | 6 ++--
configs/trats2_defconfig | 6 ++--
configs/trats_defconfig | 6 ++--
configs/venice2_defconfig | 6 ++--
configs/warp7_defconfig | 6 ++--
configs/warp7_secure_defconfig | 6 ++--
configs/warp_defconfig | 6 ++--
configs/xilinx_zynqmp_ep_defconfig | 6 ++--
configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 6 ++--
configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 6 ++--
configs/xilinx_zynqmp_zcu102_revA_defconfig | 6 ++--
configs/xilinx_zynqmp_zcu102_revB_defconfig | 6 ++--
configs/zynq_microzed_defconfig | 6 ++--
configs/zynq_picozed_defconfig | 6 ++--
configs/zynq_z_turn_defconfig | 6 ++--
configs/zynq_zc702_defconfig | 6 ++--
configs/zynq_zc706_defconfig | 6 ++--
configs/zynq_zed_defconfig | 6 ++--
configs/zynq_zybo_defconfig | 6 ++--
doc/README.android-fastboot | 8 ++---
drivers/usb/gadget/Kconfig | 25 ++++++++++-------
drivers/usb/gadget/g_dnl.c | 12 ++++----
include/configs/am43xx_evm.h | 6 ++--
include/configs/odroid_xu3.h | 2 +-
149 files changed, 460 insertions(+), 453 deletions(-)
diff --git a/board/samsung/common/gadget.c b/board/samsung/common/gadget.c
index 6a1e57f1645c..ef732befc44e 100644
--- a/board/samsung/common/gadget.c
+++ b/board/samsung/common/gadget.c
@@ -17,8 +17,8 @@ int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name)
put_unaligned(CONFIG_G_DNL_UMS_VENDOR_NUM, &dev->idVendor);
put_unaligned(CONFIG_G_DNL_UMS_PRODUCT_NUM, &dev->idProduct);
} else {
- put_unaligned(CONFIG_G_DNL_VENDOR_NUM, &dev->idVendor);
- put_unaligned(CONFIG_G_DNL_PRODUCT_NUM, &dev->idProduct);
+ put_unaligned(CONFIG_USB_GADGET_VENDOR_NUM, &dev->idVendor);
+ put_unaligned(CONFIG_USB_GADGET_PRODUCT_NUM, &dev->idProduct);
}
return 0;
}
diff --git a/board/siemens/common/factoryset.c b/board/siemens/common/factoryset.c
index b4f027af2862..81bbb5758d0b 100644
--- a/board/siemens/common/factoryset.c
+++ b/board/siemens/common/factoryset.c
@@ -145,8 +145,8 @@ int factoryset_read_eeprom(int i2c_addr)
unsigned char *cp, *cp1;
#if defined(CONFIG_USB_FUNCTION_DFU)
- factory_dat.usb_vendor_id = CONFIG_G_DNL_VENDOR_NUM;
- factory_dat.usb_product_id = CONFIG_G_DNL_PRODUCT_NUM;
+ factory_dat.usb_vendor_id = CONFIG_USB_GADGET_VENDOR_NUM;
+ factory_dat.usb_product_id = CONFIG_USB_GADGET_PRODUCT_NUM;
#endif
if (i2c_probe(i2c_addr))
goto err;
diff --git a/configs/A13-OLinuXino_defconfig b/configs/A13-OLinuXino_defconfig
index fbacce07cf0c..2574018d8213 100644
--- a/configs/A13-OLinuXino_defconfig
+++ b/configs/A13-OLinuXino_defconfig
@@ -32,7 +32,7 @@ CONFIG_USB_EHCI_HCD=y
CONFIG_USB_MUSB_GADGET=y
CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Allwinner Technology"
+CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a
+CONFIG_USB_GADGET_PRODUCT_NUM=0x1010
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Allwinner Technology"
-CONFIG_G_DNL_VENDOR_NUM=0x1f3a
-CONFIG_G_DNL_PRODUCT_NUM=0x1010
diff --git a/configs/A20-OLinuXino-Lime2-eMMC_defconfig b/configs/A20-OLinuXino-Lime2-eMMC_defconfig
index 58aa988b2363..5663a824e71b 100644
--- a/configs/A20-OLinuXino-Lime2-eMMC_defconfig
+++ b/configs/A20-OLinuXino-Lime2-eMMC_defconfig
@@ -34,7 +34,7 @@ CONFIG_USB_EHCI_HCD=y
CONFIG_USB_MUSB_GADGET=y
CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Allwinner Technology"
+CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a
+CONFIG_USB_GADGET_PRODUCT_NUM=0x1010
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Allwinner Technology"
-CONFIG_G_DNL_VENDOR_NUM=0x1f3a
-CONFIG_G_DNL_PRODUCT_NUM=0x1010
diff --git a/configs/A20-OLinuXino-Lime2_defconfig b/configs/A20-OLinuXino-Lime2_defconfig
index 6d7c58861373..63d013293690 100644
--- a/configs/A20-OLinuXino-Lime2_defconfig
+++ b/configs/A20-OLinuXino-Lime2_defconfig
@@ -33,7 +33,7 @@ CONFIG_USB_EHCI_HCD=y
CONFIG_USB_MUSB_GADGET=y
CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Allwinner Technology"
+CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a
+CONFIG_USB_GADGET_PRODUCT_NUM=0x1010
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Allwinner Technology"
-CONFIG_G_DNL_VENDOR_NUM=0x1f3a
-CONFIG_G_DNL_PRODUCT_NUM=0x1010
diff --git a/configs/CHIP_defconfig b/configs/CHIP_defconfig
index 83228bd10f05..278039c05573 100644
--- a/configs/CHIP_defconfig
+++ b/configs/CHIP_defconfig
@@ -23,8 +23,8 @@ CONFIG_USB_EHCI_HCD=y
CONFIG_USB_MUSB_GADGET=y
CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Allwinner Technology"
+CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a
+CONFIG_USB_GADGET_PRODUCT_NUM=0x1010
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Allwinner Technology"
-CONFIG_G_DNL_VENDOR_NUM=0x1f3a
-CONFIG_G_DNL_PRODUCT_NUM=0x1010
CONFIG_OF_LIBFDT_OVERLAY=y
diff --git a/configs/CHIP_pro_defconfig b/configs/CHIP_pro_defconfig
index 3a748fc27e07..edbdefc69ddf 100644
--- a/configs/CHIP_pro_defconfig
+++ b/configs/CHIP_pro_defconfig
@@ -28,8 +28,8 @@ CONFIG_USB_EHCI_HCD=y
CONFIG_USB_MUSB_GADGET=y
CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Allwinner Technology"
+CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a
+CONFIG_USB_GADGET_PRODUCT_NUM=0x1010
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Allwinner Technology"
-CONFIG_G_DNL_VENDOR_NUM=0x1f3a
-CONFIG_G_DNL_PRODUCT_NUM=0x1010
CONFIG_OF_LIBFDT_OVERLAY=y
diff --git a/configs/Cubietruck_defconfig b/configs/Cubietruck_defconfig
index f93ff0d6c463..2d1753645b0f 100644
--- a/configs/Cubietruck_defconfig
+++ b/configs/Cubietruck_defconfig
@@ -33,7 +33,7 @@ CONFIG_USB_EHCI_HCD=y
CONFIG_USB_MUSB_GADGET=y
CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Allwinner Technology"
+CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a
+CONFIG_USB_GADGET_PRODUCT_NUM=0x1010
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Allwinner Technology"
-CONFIG_G_DNL_VENDOR_NUM=0x1f3a
-CONFIG_G_DNL_PRODUCT_NUM=0x1010
diff --git a/configs/Nintendo_NES_Classic_Edition_defconfig b/configs/Nintendo_NES_Classic_Edition_defconfig
index d05375d0dbd5..99f7d30f150d 100644
--- a/configs/Nintendo_NES_Classic_Edition_defconfig
+++ b/configs/Nintendo_NES_Classic_Edition_defconfig
@@ -23,7 +23,7 @@ CONFIG_AXP_ELDO2_VOLT=1800
CONFIG_USB_MUSB_GADGET=y
CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Allwinner Technology"
+CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a
+CONFIG_USB_GADGET_PRODUCT_NUM=0x1010
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Allwinner Technology"
-CONFIG_G_DNL_VENDOR_NUM=0x1f3a
-CONFIG_G_DNL_PRODUCT_NUM=0x1010
diff --git a/configs/Sinlinx_SinA33_defconfig b/configs/Sinlinx_SinA33_defconfig
index af00e5434763..8c5fc7587909 100644
--- a/configs/Sinlinx_SinA33_defconfig
+++ b/configs/Sinlinx_SinA33_defconfig
@@ -28,7 +28,7 @@ CONFIG_USB_EHCI_HCD=y
CONFIG_USB_MUSB_GADGET=y
CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Allwinner Technology"
+CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a
+CONFIG_USB_GADGET_PRODUCT_NUM=0x1010
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Allwinner Technology"
-CONFIG_G_DNL_VENDOR_NUM=0x1f3a
-CONFIG_G_DNL_PRODUCT_NUM=0x1010
diff --git a/configs/am335x_baltos_defconfig b/configs/am335x_baltos_defconfig
index 2f075091b27a..efcbc523749c 100644
--- a/configs/am335x_baltos_defconfig
+++ b/configs/am335x_baltos_defconfig
@@ -59,10 +59,10 @@ CONFIG_USB_MUSB_HOST=y
CONFIG_USB_MUSB_GADGET=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0403
+CONFIG_USB_GADGET_PRODUCT_NUM=0xbd00
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
-CONFIG_G_DNL_VENDOR_NUM=0x0403
-CONFIG_G_DNL_PRODUCT_NUM=0xbd00
CONFIG_USB_ETHER=y
CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00"
CONFIG_FAT_WRITE=y
diff --git a/configs/am335x_boneblack_defconfig b/configs/am335x_boneblack_defconfig
index a3dd9b03b538..85f220329e4e 100644
--- a/configs/am335x_boneblack_defconfig
+++ b/configs/am335x_boneblack_defconfig
@@ -38,10 +38,10 @@ CONFIG_USB_MUSB_HOST=y
CONFIG_USB_MUSB_GADGET=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0451
+CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
-CONFIG_G_DNL_VENDOR_NUM=0x0451
-CONFIG_G_DNL_PRODUCT_NUM=0xd022
CONFIG_USB_ETHER=y
CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00"
CONFIG_LZO=y
diff --git a/configs/am335x_boneblack_vboot_defconfig b/configs/am335x_boneblack_vboot_defconfig
index 7d52382c24dc..9ba3f7c04d73 100644
--- a/configs/am335x_boneblack_vboot_defconfig
+++ b/configs/am335x_boneblack_vboot_defconfig
@@ -48,9 +48,9 @@ CONFIG_USB_MUSB_HOST=y
CONFIG_USB_MUSB_GADGET=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0451
+CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
-CONFIG_G_DNL_VENDOR_NUM=0x0451
-CONFIG_G_DNL_PRODUCT_NUM=0xd022
CONFIG_USB_ETHER=y
CONFIG_LZO=y
diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig
index 69b2cf3e1f61..8aa3c0de8824 100644
--- a/configs/am335x_evm_defconfig
+++ b/configs/am335x_evm_defconfig
@@ -50,10 +50,10 @@ CONFIG_USB_MUSB_GADGET=y
CONFIG_USB_MUSB_TI=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0451
+CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
-CONFIG_G_DNL_VENDOR_NUM=0x0451
-CONFIG_G_DNL_PRODUCT_NUM=0xd022
CONFIG_USB_ETHER=y
CONFIG_RSA=y
CONFIG_LZO=y
diff --git a/configs/am335x_evm_nor_defconfig b/configs/am335x_evm_nor_defconfig
index 708df4284093..b745f2997334 100644
--- a/configs/am335x_evm_nor_defconfig
+++ b/configs/am335x_evm_nor_defconfig
@@ -37,10 +37,10 @@ CONFIG_USB_MUSB_HOST=y
CONFIG_USB_MUSB_GADGET=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0451
+CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
-CONFIG_G_DNL_VENDOR_NUM=0x0451
-CONFIG_G_DNL_PRODUCT_NUM=0xd022
CONFIG_USB_ETHER=y
CONFIG_LZO=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/am335x_evm_norboot_defconfig b/configs/am335x_evm_norboot_defconfig
index 3f6f2798adce..9662b6684c1f 100644
--- a/configs/am335x_evm_norboot_defconfig
+++ b/configs/am335x_evm_norboot_defconfig
@@ -31,10 +31,10 @@ CONFIG_USB_MUSB_HOST=y
CONFIG_USB_MUSB_GADGET=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0451
+CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
-CONFIG_G_DNL_VENDOR_NUM=0x0451
-CONFIG_G_DNL_PRODUCT_NUM=0xd022
CONFIG_USB_ETHER=y
CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00"
CONFIG_LZO=y
diff --git a/configs/am335x_evm_spiboot_defconfig b/configs/am335x_evm_spiboot_defconfig
index 427ca371815c..5e2c19066daa 100644
--- a/configs/am335x_evm_spiboot_defconfig
+++ b/configs/am335x_evm_spiboot_defconfig
@@ -35,10 +35,10 @@ CONFIG_USB_MUSB_HOST=y
CONFIG_USB_MUSB_GADGET=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0451
+CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
-CONFIG_G_DNL_VENDOR_NUM=0x0451
-CONFIG_G_DNL_PRODUCT_NUM=0xd022
CONFIG_USB_ETHER=y
CONFIG_LZO=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/am335x_evm_usbspl_defconfig b/configs/am335x_evm_usbspl_defconfig
index a4e9e8f1b27b..d6c21b8e85ee 100644
--- a/configs/am335x_evm_usbspl_defconfig
+++ b/configs/am335x_evm_usbspl_defconfig
@@ -41,10 +41,10 @@ CONFIG_USB_MUSB_HOST=y
CONFIG_USB_MUSB_GADGET=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0451
+CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
-CONFIG_G_DNL_VENDOR_NUM=0x0451
-CONFIG_G_DNL_PRODUCT_NUM=0xd022
CONFIG_USB_ETHER=y
CONFIG_LZO=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/am335x_hs_evm_defconfig b/configs/am335x_hs_evm_defconfig
index 552150732398..683c102d0f1f 100644
--- a/configs/am335x_hs_evm_defconfig
+++ b/configs/am335x_hs_evm_defconfig
@@ -54,10 +54,10 @@ CONFIG_USB_MUSB_GADGET=y
CONFIG_USB_MUSB_TI=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0451
+CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
-CONFIG_G_DNL_VENDOR_NUM=0x0451
-CONFIG_G_DNL_PRODUCT_NUM=0xd022
CONFIG_USB_ETHER=y
CONFIG_RSA=y
CONFIG_LZO=y
diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig
index 15c25d39f1ae..ce5d0eb29142 100644
--- a/configs/am43xx_evm_defconfig
+++ b/configs/am43xx_evm_defconfig
@@ -52,7 +52,7 @@ CONFIG_USB_DWC3_OMAP=y
CONFIG_USB_DWC3_PHY_OMAP=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0403
+CONFIG_USB_GADGET_PRODUCT_NUM=0xbd00
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
-CONFIG_G_DNL_VENDOR_NUM=0x0403
-CONFIG_G_DNL_PRODUCT_NUM=0xbd00
diff --git a/configs/am43xx_evm_ethboot_defconfig b/configs/am43xx_evm_ethboot_defconfig
index 6c170888680c..7bcec25af36f 100644
--- a/configs/am43xx_evm_ethboot_defconfig
+++ b/configs/am43xx_evm_ethboot_defconfig
@@ -61,8 +61,8 @@ CONFIG_USB_DWC3_OMAP=y
CONFIG_USB_DWC3_PHY_OMAP=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0403
+CONFIG_USB_GADGET_PRODUCT_NUM=0xbd00
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
-CONFIG_G_DNL_VENDOR_NUM=0x0403
-CONFIG_G_DNL_PRODUCT_NUM=0xbd00
CONFIG_OF_LIBFDT=y
diff --git a/configs/am43xx_evm_qspiboot_defconfig b/configs/am43xx_evm_qspiboot_defconfig
index fde41c5c7e1c..e72d435cfe06 100644
--- a/configs/am43xx_evm_qspiboot_defconfig
+++ b/configs/am43xx_evm_qspiboot_defconfig
@@ -52,9 +52,9 @@ CONFIG_USB_DWC3_OMAP=y
CONFIG_USB_DWC3_PHY_OMAP=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0403
+CONFIG_USB_GADGET_PRODUCT_NUM=0xbd00
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
-CONFIG_G_DNL_VENDOR_NUM=0x0403
-CONFIG_G_DNL_PRODUCT_NUM=0xbd00
CONFIG_FAT_WRITE=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/am43xx_evm_usbhost_boot_defconfig b/configs/am43xx_evm_usbhost_boot_defconfig
index 0bed33572297..8109f98b4b7c 100644
--- a/configs/am43xx_evm_usbhost_boot_defconfig
+++ b/configs/am43xx_evm_usbhost_boot_defconfig
@@ -75,7 +75,7 @@ CONFIG_USB_DWC3_OMAP=y
CONFIG_USB_DWC3_PHY_OMAP=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0403
+CONFIG_USB_GADGET_PRODUCT_NUM=0xbd00
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
-CONFIG_G_DNL_VENDOR_NUM=0x0403
-CONFIG_G_DNL_PRODUCT_NUM=0xbd00
diff --git a/configs/am43xx_hs_evm_defconfig b/configs/am43xx_hs_evm_defconfig
index a4d23e10b60e..da7dbfb02b9e 100644
--- a/configs/am43xx_hs_evm_defconfig
+++ b/configs/am43xx_hs_evm_defconfig
@@ -63,7 +63,7 @@ CONFIG_USB_DWC3_OMAP=y
CONFIG_USB_DWC3_PHY_OMAP=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0403
+CONFIG_USB_GADGET_PRODUCT_NUM=0xbd00
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
-CONFIG_G_DNL_VENDOR_NUM=0x0403
-CONFIG_G_DNL_PRODUCT_NUM=0xbd00
diff --git a/configs/am57xx_evm_defconfig b/configs/am57xx_evm_defconfig
index 3d455eb7d4e1..a9ee2e448f3c 100644
--- a/configs/am57xx_evm_defconfig
+++ b/configs/am57xx_evm_defconfig
@@ -72,7 +72,7 @@ CONFIG_USB_DWC3_OMAP=y
CONFIG_USB_DWC3_PHY_OMAP=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0451
+CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
-CONFIG_G_DNL_VENDOR_NUM=0x0451
-CONFIG_G_DNL_PRODUCT_NUM=0xd022
diff --git a/configs/am57xx_evm_nodt_defconfig b/configs/am57xx_evm_nodt_defconfig
index f96348699bad..ae7c3464e0cb 100644
--- a/configs/am57xx_evm_nodt_defconfig
+++ b/configs/am57xx_evm_nodt_defconfig
@@ -62,9 +62,9 @@ CONFIG_USB_DWC3_OMAP=y
CONFIG_USB_DWC3_PHY_OMAP=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0451
+CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
-CONFIG_G_DNL_VENDOR_NUM=0x0451
-CONFIG_G_DNL_PRODUCT_NUM=0xd022
CONFIG_FAT_WRITE=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/am57xx_hs_evm_defconfig b/configs/am57xx_hs_evm_defconfig
index 01d77cbbd09e..1047f33237ef 100644
--- a/configs/am57xx_hs_evm_defconfig
+++ b/configs/am57xx_hs_evm_defconfig
@@ -75,7 +75,7 @@ CONFIG_USB_DWC3_OMAP=y
CONFIG_USB_DWC3_PHY_OMAP=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0451
+CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
-CONFIG_G_DNL_VENDOR_NUM=0x0451
-CONFIG_G_DNL_PRODUCT_NUM=0xd022
diff --git a/configs/apalis-tk1_defconfig b/configs/apalis-tk1_defconfig
index e6e3a9bfe932..84e010649115 100644
--- a/configs/apalis-tk1_defconfig
+++ b/configs/apalis-tk1_defconfig
@@ -47,9 +47,9 @@ CONFIG_DM_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Toradex"
+CONFIG_USB_GADGET_VENDOR_NUM=0x1b67
+CONFIG_USB_GADGET_PRODUCT_NUM=0xffff
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Toradex"
-CONFIG_G_DNL_VENDOR_NUM=0x1b67
-CONFIG_G_DNL_PRODUCT_NUM=0xffff
CONFIG_OF_LIBFDT_OVERLAY=y
diff --git a/configs/apalis_imx6_defconfig b/configs/apalis_imx6_defconfig
index b2284acc34a3..1ab836389d6e 100644
--- a/configs/apalis_imx6_defconfig
+++ b/configs/apalis_imx6_defconfig
@@ -56,11 +56,11 @@ CONFIG_USB_STORAGE=y
CONFIG_USB_KEYBOARD=y
CONFIG_SYS_USB_EVENT_POLL=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Toradex"
+CONFIG_USB_GADGET_VENDOR_NUM=0x1b67
+CONFIG_USB_GADGET_PRODUCT_NUM=0x4000
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Toradex"
-CONFIG_G_DNL_VENDOR_NUM=0x1b67
-CONFIG_G_DNL_PRODUCT_NUM=0x4000
CONFIG_USB_HOST_ETHER=y
CONFIG_FAT_WRITE=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/apalis_imx6_nospl_com_defconfig b/configs/apalis_imx6_nospl_com_defconfig
index 239605dadfaa..3f4f8a500b26 100644
--- a/configs/apalis_imx6_nospl_com_defconfig
+++ b/configs/apalis_imx6_nospl_com_defconfig
@@ -45,11 +45,11 @@ CONFIG_USB_STORAGE=y
CONFIG_USB_KEYBOARD=y
CONFIG_SYS_USB_EVENT_POLL=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Toradex"
+CONFIG_USB_GADGET_VENDOR_NUM=0x1b67
+CONFIG_USB_GADGET_PRODUCT_NUM=0x4020
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Toradex"
-CONFIG_G_DNL_VENDOR_NUM=0x1b67
-CONFIG_G_DNL_PRODUCT_NUM=0x4020
CONFIG_USB_HOST_ETHER=y
CONFIG_FAT_WRITE=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/apalis_imx6_nospl_it_defconfig b/configs/apalis_imx6_nospl_it_defconfig
index 1bc05d7266d3..f88dd02a4f9e 100644
--- a/configs/apalis_imx6_nospl_it_defconfig
+++ b/configs/apalis_imx6_nospl_it_defconfig
@@ -45,11 +45,11 @@ CONFIG_USB_STORAGE=y
CONFIG_USB_KEYBOARD=y
CONFIG_SYS_USB_EVENT_POLL=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Toradex"
+CONFIG_USB_GADGET_VENDOR_NUM=0x1b67
+CONFIG_USB_GADGET_PRODUCT_NUM=0x4020
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Toradex"
-CONFIG_G_DNL_VENDOR_NUM=0x1b67
-CONFIG_G_DNL_PRODUCT_NUM=0x4020
CONFIG_USB_HOST_ETHER=y
CONFIG_FAT_WRITE=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/apalis_t30_defconfig b/configs/apalis_t30_defconfig
index e15e11ad929a..588c1842a3d3 100644
--- a/configs/apalis_t30_defconfig
+++ b/configs/apalis_t30_defconfig
@@ -40,9 +40,9 @@ CONFIG_DM_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Toradex"
+CONFIG_USB_GADGET_VENDOR_NUM=0x1b67
+CONFIG_USB_GADGET_PRODUCT_NUM=0x4000
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Toradex"
-CONFIG_G_DNL_VENDOR_NUM=0x1b67
-CONFIG_G_DNL_PRODUCT_NUM=0x4000
CONFIG_OF_LIBFDT_OVERLAY=y
diff --git a/configs/bcm11130_defconfig b/configs/bcm11130_defconfig
index cf3a7cd74d09..4d93975d69aa 100644
--- a/configs/bcm11130_defconfig
+++ b/configs/bcm11130_defconfig
@@ -27,9 +27,9 @@ CONFIG_MMC_SDHCI_KONA=y
CONFIG_SYS_NS16550=y
CONFIG_USB=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Broadcom Corporation"
+CONFIG_USB_GADGET_VENDOR_NUM=0x18d1
+CONFIG_USB_GADGET_PRODUCT_NUM=0x0d02
CONFIG_USB_GADGET_DWC2_OTG=y
CONFIG_USB_GADGET_DWC2_OTG_PHY_BUS_WIDTH_8=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Broadcom Corporation"
-CONFIG_G_DNL_VENDOR_NUM=0x18d1
-CONFIG_G_DNL_PRODUCT_NUM=0x0d02
diff --git a/configs/bcm11130_nand_defconfig b/configs/bcm11130_nand_defconfig
index 2ce917981ecb..555ff0538216 100644
--- a/configs/bcm11130_nand_defconfig
+++ b/configs/bcm11130_nand_defconfig
@@ -27,9 +27,9 @@ CONFIG_NAND=y
CONFIG_SYS_NS16550=y
CONFIG_USB=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Broadcom Corporation"
+CONFIG_USB_GADGET_VENDOR_NUM=0x18d1
+CONFIG_USB_GADGET_PRODUCT_NUM=0x0d02
CONFIG_USB_GADGET_DWC2_OTG=y
CONFIG_USB_GADGET_DWC2_OTG_PHY_BUS_WIDTH_8=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Broadcom Corporation"
-CONFIG_G_DNL_VENDOR_NUM=0x18d1
-CONFIG_G_DNL_PRODUCT_NUM=0x0d02
diff --git a/configs/bcm23550_w1d_defconfig b/configs/bcm23550_w1d_defconfig
index 70918654f5ca..49f7e40d15d9 100644
--- a/configs/bcm23550_w1d_defconfig
+++ b/configs/bcm23550_w1d_defconfig
@@ -34,11 +34,11 @@ CONFIG_MMC_SDHCI_KONA=y
CONFIG_SYS_NS16550=y
CONFIG_USB=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Broadcom Corporation"
+CONFIG_USB_GADGET_VENDOR_NUM=0x18d1
+CONFIG_USB_GADGET_PRODUCT_NUM=0x0d02
CONFIG_USB_GADGET_BCM_UDC_OTG_PHY=y
CONFIG_USB_GADGET_DWC2_OTG=y
CONFIG_USB_GADGET_DWC2_OTG_PHY_BUS_WIDTH_8=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Broadcom Corporation"
-CONFIG_G_DNL_VENDOR_NUM=0x18d1
-CONFIG_G_DNL_PRODUCT_NUM=0x0d02
CONFIG_OF_LIBFDT=y
diff --git a/configs/bcm28155_ap_defconfig b/configs/bcm28155_ap_defconfig
index db1ad401324f..9e17b60e54e4 100644
--- a/configs/bcm28155_ap_defconfig
+++ b/configs/bcm28155_ap_defconfig
@@ -35,11 +35,11 @@ CONFIG_MMC_SDHCI_KONA=y
CONFIG_SYS_NS16550=y
CONFIG_USB=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Broadcom Corporation"
+CONFIG_USB_GADGET_VENDOR_NUM=0x18d1
+CONFIG_USB_GADGET_PRODUCT_NUM=0x0d02
CONFIG_USB_GADGET_BCM_UDC_OTG_PHY=y
CONFIG_USB_GADGET_DWC2_OTG=y
CONFIG_USB_GADGET_DWC2_OTG_PHY_BUS_WIDTH_8=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Broadcom Corporation"
-CONFIG_G_DNL_VENDOR_NUM=0x18d1
-CONFIG_G_DNL_PRODUCT_NUM=0x0d02
CONFIG_OF_LIBFDT=y
diff --git a/configs/bcm28155_w1d_defconfig b/configs/bcm28155_w1d_defconfig
index 3684fae37005..8f8668ba5b74 100644
--- a/configs/bcm28155_w1d_defconfig
+++ b/configs/bcm28155_w1d_defconfig
@@ -29,9 +29,9 @@ CONFIG_BCM_SF2_ETH_GMAC=y
CONFIG_SYS_NS16550=y
CONFIG_USB=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Broadcom Corporation"
+CONFIG_USB_GADGET_VENDOR_NUM=0x18d1
+CONFIG_USB_GADGET_PRODUCT_NUM=0x0d02
CONFIG_USB_GADGET_DWC2_OTG=y
CONFIG_USB_GADGET_DWC2_OTG_PHY_BUS_WIDTH_8=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Broadcom Corporation"
-CONFIG_G_DNL_VENDOR_NUM=0x18d1
-CONFIG_G_DNL_PRODUCT_NUM=0x0d02
diff --git a/configs/beaver_defconfig b/configs/beaver_defconfig
index 7fb88e452b99..ad26354b4df9 100644
--- a/configs/beaver_defconfig
+++ b/configs/beaver_defconfig
@@ -45,10 +45,10 @@ CONFIG_DM_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="NVIDIA"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0955
+CONFIG_USB_GADGET_PRODUCT_NUM=0x701a
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="NVIDIA"
-CONFIG_G_DNL_VENDOR_NUM=0x0955
-CONFIG_G_DNL_PRODUCT_NUM=0x701a
CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y
diff --git a/configs/birdland_bav335a_defconfig b/configs/birdland_bav335a_defconfig
index 44f4eac6f63b..41b77302155f 100644
--- a/configs/birdland_bav335a_defconfig
+++ b/configs/birdland_bav335a_defconfig
@@ -66,10 +66,10 @@ CONFIG_USB_MUSB_HOST=y
CONFIG_USB_MUSB_GADGET=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0451
+CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
-CONFIG_G_DNL_VENDOR_NUM=0x0451
-CONFIG_G_DNL_PRODUCT_NUM=0xd022
CONFIG_FAT_WRITE=y
CONFIG_LZO=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/birdland_bav335b_defconfig b/configs/birdland_bav335b_defconfig
index 1dffd1a1950d..6ecf8d035478 100644
--- a/configs/birdland_bav335b_defconfig
+++ b/configs/birdland_bav335b_defconfig
@@ -66,10 +66,10 @@ CONFIG_USB_MUSB_HOST=y
CONFIG_USB_MUSB_GADGET=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0451
+CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
-CONFIG_G_DNL_VENDOR_NUM=0x0451
-CONFIG_G_DNL_PRODUCT_NUM=0xd022
CONFIG_FAT_WRITE=y
CONFIG_LZO=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/cei-tk1-som_defconfig b/configs/cei-tk1-som_defconfig
index 91b5647e6436..a4cd2701e14f 100644
--- a/configs/cei-tk1-som_defconfig
+++ b/configs/cei-tk1-som_defconfig
@@ -48,10 +48,10 @@ CONFIG_DM_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="NVIDIA"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0955
+CONFIG_USB_GADGET_PRODUCT_NUM=0x701a
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="NVIDIA"
-CONFIG_G_DNL_VENDOR_NUM=0x0955
-CONFIG_G_DNL_PRODUCT_NUM=0x701a
CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y
diff --git a/configs/cgtqmx6eval_defconfig b/configs/cgtqmx6eval_defconfig
index fc336103cf2b..b17c30fcd2f6 100644
--- a/configs/cgtqmx6eval_defconfig
+++ b/configs/cgtqmx6eval_defconfig
@@ -57,11 +57,11 @@ CONFIG_USB_STORAGE=y
CONFIG_USB_KEYBOARD=y
CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Congatec"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0525
+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Congatec"
-CONFIG_G_DNL_VENDOR_NUM=0x0525
-CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y
# CONFIG_VIDEO_SW_CURSOR is not set
diff --git a/configs/chromebit_mickey_defconfig b/configs/chromebit_mickey_defconfig
index f40c0b9afa7d..fccff80780bc 100644
--- a/configs/chromebit_mickey_defconfig
+++ b/configs/chromebit_mickey_defconfig
@@ -75,11 +75,11 @@ CONFIG_ROCKCHIP_SPI=y
CONFIG_SYSRESET=y
CONFIG_USB=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
+CONFIG_USB_GADGET_VENDOR_NUM=0x2207
+CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
CONFIG_USB_GADGET_DWC2_OTG=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Rockchip"
-CONFIG_G_DNL_VENDOR_NUM=0x2207
-CONFIG_G_DNL_PRODUCT_NUM=0x320a
CONFIG_DM_VIDEO=y
CONFIG_DISPLAY=y
CONFIG_VIDEO_ROCKCHIP=y
diff --git a/configs/chromebook_jerry_defconfig b/configs/chromebook_jerry_defconfig
index cdeabaa12aa6..18790b30898f 100644
--- a/configs/chromebook_jerry_defconfig
+++ b/configs/chromebook_jerry_defconfig
@@ -76,11 +76,11 @@ CONFIG_ROCKCHIP_SPI=y
CONFIG_SYSRESET=y
CONFIG_USB=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
+CONFIG_USB_GADGET_VENDOR_NUM=0x2207
+CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
CONFIG_USB_GADGET_DWC2_OTG=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Rockchip"
-CONFIG_G_DNL_VENDOR_NUM=0x2207
-CONFIG_G_DNL_PRODUCT_NUM=0x320a
CONFIG_DM_VIDEO=y
CONFIG_DISPLAY=y
CONFIG_VIDEO_ROCKCHIP=y
diff --git a/configs/chromebook_minnie_defconfig b/configs/chromebook_minnie_defconfig
index c1e36fa8601d..fdb992d59252 100644
--- a/configs/chromebook_minnie_defconfig
+++ b/configs/chromebook_minnie_defconfig
@@ -75,11 +75,11 @@ CONFIG_ROCKCHIP_SPI=y
CONFIG_SYSRESET=y
CONFIG_USB=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
+CONFIG_USB_GADGET_VENDOR_NUM=0x2207
+CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
CONFIG_USB_GADGET_DWC2_OTG=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Rockchip"
-CONFIG_G_DNL_VENDOR_NUM=0x2207
-CONFIG_G_DNL_PRODUCT_NUM=0x320a
CONFIG_DM_VIDEO=y
CONFIG_DISPLAY=y
CONFIG_VIDEO_ROCKCHIP=y
diff --git a/configs/colibri_imx6_defconfig b/configs/colibri_imx6_defconfig
index 7d1e709d4c47..600387aed428 100644
--- a/configs/colibri_imx6_defconfig
+++ b/configs/colibri_imx6_defconfig
@@ -54,11 +54,11 @@ CONFIG_USB_STORAGE=y
CONFIG_USB_KEYBOARD=y
CONFIG_SYS_USB_EVENT_POLL=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Toradex"
+CONFIG_USB_GADGET_VENDOR_NUM=0x1b67
+CONFIG_USB_GADGET_PRODUCT_NUM=0x4000
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Toradex"
-CONFIG_G_DNL_VENDOR_NUM=0x1b67
-CONFIG_G_DNL_PRODUCT_NUM=0x4000
CONFIG_USB_HOST_ETHER=y
CONFIG_FAT_WRITE=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/colibri_imx6_nospl_defconfig b/configs/colibri_imx6_nospl_defconfig
index 6877993088f4..2e69195cc6c9 100644
--- a/configs/colibri_imx6_nospl_defconfig
+++ b/configs/colibri_imx6_nospl_defconfig
@@ -43,11 +43,11 @@ CONFIG_USB_STORAGE=y
CONFIG_USB_KEYBOARD=y
CONFIG_SYS_USB_EVENT_POLL=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Toradex"
+CONFIG_USB_GADGET_VENDOR_NUM=0x1b67
+CONFIG_USB_GADGET_PRODUCT_NUM=0x4000
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Toradex"
-CONFIG_G_DNL_VENDOR_NUM=0x1b67
-CONFIG_G_DNL_PRODUCT_NUM=0x4000
CONFIG_USB_HOST_ETHER=y
CONFIG_FAT_WRITE=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/colibri_imx7_defconfig b/configs/colibri_imx7_defconfig
index d0b6c6814631..56ae86799140 100644
--- a/configs/colibri_imx7_defconfig
+++ b/configs/colibri_imx7_defconfig
@@ -56,10 +56,10 @@ CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Toradex"
+CONFIG_USB_GADGET_VENDOR_NUM=0x1b67
+CONFIG_USB_GADGET_PRODUCT_NUM=0x4000
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Toradex"
-CONFIG_G_DNL_VENDOR_NUM=0x1b67
-CONFIG_G_DNL_PRODUCT_NUM=0x4000
CONFIG_OF_LIBFDT_OVERLAY=y
CONFIG_FDT_FIXUP_PARTITIONS=y
diff --git a/configs/colibri_t20_defconfig b/configs/colibri_t20_defconfig
index 0b5604c85158..786d50b458b3 100644
--- a/configs/colibri_t20_defconfig
+++ b/configs/colibri_t20_defconfig
@@ -47,11 +47,11 @@ CONFIG_USB_ULPI_VIEWPORT=y
CONFIG_USB_ULPI=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Toradex"
+CONFIG_USB_GADGET_VENDOR_NUM=0x1b67
+CONFIG_USB_GADGET_PRODUCT_NUM=0x4000
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Toradex"
-CONFIG_G_DNL_VENDOR_NUM=0x1b67
-CONFIG_G_DNL_PRODUCT_NUM=0x4000
CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y
CONFIG_DM_VIDEO=y
diff --git a/configs/colibri_t30_defconfig b/configs/colibri_t30_defconfig
index 65fa90fa2909..1601aa6bc6bf 100644
--- a/configs/colibri_t30_defconfig
+++ b/configs/colibri_t30_defconfig
@@ -34,11 +34,11 @@ CONFIG_DM_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Toradex"
+CONFIG_USB_GADGET_VENDOR_NUM=0x1b67
+CONFIG_USB_GADGET_PRODUCT_NUM=0x4000
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Toradex"
-CONFIG_G_DNL_VENDOR_NUM=0x1b67
-CONFIG_G_DNL_PRODUCT_NUM=0x4000
CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y
CONFIG_OF_LIBFDT_OVERLAY=y
diff --git a/configs/colibri_vf_defconfig b/configs/colibri_vf_defconfig
index 1ffe86180974..c0d664ec2fcd 100644
--- a/configs/colibri_vf_defconfig
+++ b/configs/colibri_vf_defconfig
@@ -53,11 +53,11 @@ CONFIG_DM_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Toradex"
+CONFIG_USB_GADGET_VENDOR_NUM=0x1b67
+CONFIG_USB_GADGET_PRODUCT_NUM=0x4000
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Toradex"
-CONFIG_G_DNL_VENDOR_NUM=0x1b67
-CONFIG_G_DNL_PRODUCT_NUM=0x4000
CONFIG_VIDEO_FSL_DCU_FB=y
CONFIG_SYS_CONSOLE_FG_COL=0x00
CONFIG_OF_LIBFDT_OVERLAY=y
diff --git a/configs/corvus_defconfig b/configs/corvus_defconfig
index 705e00145700..066dc38535d0 100644
--- a/configs/corvus_defconfig
+++ b/configs/corvus_defconfig
@@ -49,9 +49,9 @@ CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Siemens AG"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0908
+CONFIG_USB_GADGET_PRODUCT_NUM=0x02d2
CONFIG_USB_GADGET_ATMEL_USBA=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Siemens AG"
-CONFIG_G_DNL_VENDOR_NUM=0x0908
-CONFIG_G_DNL_PRODUCT_NUM=0x02d2
# CONFIG_EFI_LOADER is not set
diff --git a/configs/dalmore_defconfig b/configs/dalmore_defconfig
index ba3d478b1e7b..caf998be99cc 100644
--- a/configs/dalmore_defconfig
+++ b/configs/dalmore_defconfig
@@ -39,10 +39,10 @@ CONFIG_DM_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="NVIDIA"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0955
+CONFIG_USB_GADGET_PRODUCT_NUM=0x701a
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="NVIDIA"
-CONFIG_G_DNL_VENDOR_NUM=0x0955
-CONFIG_G_DNL_PRODUCT_NUM=0x701a
CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y
diff --git a/configs/dms-ba16-1g_defconfig b/configs/dms-ba16-1g_defconfig
index 2342f34e7885..352ab04c8ba3 100644
--- a/configs/dms-ba16-1g_defconfig
+++ b/configs/dms-ba16-1g_defconfig
@@ -38,10 +38,10 @@ CONFIG_USB_STORAGE=y
CONFIG_USB_KEYBOARD=y
CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Advantech"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0525
+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Advantech"
-CONFIG_G_DNL_VENDOR_NUM=0x0525
-CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
# CONFIG_VIDEO_SW_CURSOR is not set
CONFIG_OF_LIBFDT=y
diff --git a/configs/dms-ba16_defconfig b/configs/dms-ba16_defconfig
index 08d96add3b93..8a38c8d8c4c9 100644
--- a/configs/dms-ba16_defconfig
+++ b/configs/dms-ba16_defconfig
@@ -37,10 +37,10 @@ CONFIG_USB_STORAGE=y
CONFIG_USB_KEYBOARD=y
CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Advantech"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0525
+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Advantech"
-CONFIG_G_DNL_VENDOR_NUM=0x0525
-CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
# CONFIG_VIDEO_SW_CURSOR is not set
CONFIG_OF_LIBFDT=y
diff --git a/configs/dra7xx_evm_defconfig b/configs/dra7xx_evm_defconfig
index e4bb299275d9..4aca3a4a043a 100644
--- a/configs/dra7xx_evm_defconfig
+++ b/configs/dra7xx_evm_defconfig
@@ -90,7 +90,7 @@ CONFIG_USB_DWC3_OMAP=y
CONFIG_USB_DWC3_PHY_OMAP=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0451
+CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
-CONFIG_G_DNL_VENDOR_NUM=0x0451
-CONFIG_G_DNL_PRODUCT_NUM=0xd022
diff --git a/configs/dra7xx_hs_evm_defconfig b/configs/dra7xx_hs_evm_defconfig
index f55fc501aa48..4d126e09f6a6 100644
--- a/configs/dra7xx_hs_evm_defconfig
+++ b/configs/dra7xx_hs_evm_defconfig
@@ -92,7 +92,7 @@ CONFIG_USB_DWC3_OMAP=y
CONFIG_USB_DWC3_PHY_OMAP=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0451
+CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
-CONFIG_G_DNL_VENDOR_NUM=0x0451
-CONFIG_G_DNL_PRODUCT_NUM=0xd022
diff --git a/configs/draco_defconfig b/configs/draco_defconfig
index e38030bf5913..de2961bfb9c7 100644
--- a/configs/draco_defconfig
+++ b/configs/draco_defconfig
@@ -66,8 +66,8 @@ CONFIG_USB_MUSB_HOST=y
CONFIG_USB_MUSB_GADGET=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Siemens AG"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0908
+CONFIG_USB_GADGET_PRODUCT_NUM=0x02d2
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Siemens AG"
-CONFIG_G_DNL_VENDOR_NUM=0x0908
-CONFIG_G_DNL_PRODUCT_NUM=0x02d2
CONFIG_USB_ETHER=y
diff --git a/configs/e2220-1170_defconfig b/configs/e2220-1170_defconfig
index 41248189e3e4..267051228623 100644
--- a/configs/e2220-1170_defconfig
+++ b/configs/e2220-1170_defconfig
@@ -35,8 +35,8 @@ CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="NVIDIA"
-CONFIG_G_DNL_VENDOR_NUM=0x0955
-CONFIG_G_DNL_PRODUCT_NUM=0x701a
+CONFIG_USB_GADGET_MANUFACTURER="NVIDIA"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0955
+CONFIG_USB_GADGET_PRODUCT_NUM=0x701a
CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y
diff --git a/configs/edison_defconfig b/configs/edison_defconfig
index d58700c204cb..d3b67c336f47 100644
--- a/configs/edison_defconfig
+++ b/configs/edison_defconfig
@@ -33,9 +33,9 @@ CONFIG_DM_PCI_COMPAT=y
CONFIG_USB_DWC3_GADGET=y
CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Intel"
-CONFIG_G_DNL_VENDOR_NUM=0x8087
-CONFIG_G_DNL_PRODUCT_NUM=0x0a99
+CONFIG_USB_GADGET_MANUFACTURER="Intel"
+CONFIG_USB_GADGET_VENDOR_NUM=0x8087
+CONFIG_USB_GADGET_PRODUCT_NUM=0x0a99
# CONFIG_USB_HOST_ETHER is not set
CONFIG_FAT_WRITE=y
CONFIG_SHA1=y
diff --git a/configs/etamin_defconfig b/configs/etamin_defconfig
index 33ca6858abfd..70559892b6e3 100644
--- a/configs/etamin_defconfig
+++ b/configs/etamin_defconfig
@@ -66,8 +66,8 @@ CONFIG_USB_MUSB_HOST=y
CONFIG_USB_MUSB_GADGET=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Siemens AG"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0908
+CONFIG_USB_GADGET_PRODUCT_NUM=0x02d2
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Siemens AG"
-CONFIG_G_DNL_VENDOR_NUM=0x0908
-CONFIG_G_DNL_PRODUCT_NUM=0x02d2
CONFIG_USB_ETHER=y
diff --git a/configs/evb-rk3036_defconfig b/configs/evb-rk3036_defconfig
index 5a53951314e2..9cce3351f80b 100644
--- a/configs/evb-rk3036_defconfig
+++ b/configs/evb-rk3036_defconfig
@@ -44,11 +44,11 @@ CONFIG_DEBUG_UART_SHIFT=2
CONFIG_SYSRESET=y
CONFIG_USB=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
+CONFIG_USB_GADGET_VENDOR_NUM=0x2207
+CONFIG_USB_GADGET_PRODUCT_NUM=0x310a
CONFIG_USB_GADGET_DWC2_OTG=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Rockchip"
-CONFIG_G_DNL_VENDOR_NUM=0x2207
-CONFIG_G_DNL_PRODUCT_NUM=0x310a
CONFIG_SPL_TINY_MEMSET=y
CONFIG_CMD_DHRYSTONE=y
CONFIG_ERRNO_STR=y
diff --git a/configs/evb-rk3229_defconfig b/configs/evb-rk3229_defconfig
index 5a658a149522..61fdacaa1340 100644
--- a/configs/evb-rk3229_defconfig
+++ b/configs/evb-rk3229_defconfig
@@ -44,9 +44,9 @@ CONFIG_SYS_NS16550=y
CONFIG_SYSRESET=y
CONFIG_USB=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
+CONFIG_USB_GADGET_VENDOR_NUM=0x2207
+CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
CONFIG_USB_GADGET_DWC2_OTG=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Rockchip"
-CONFIG_G_DNL_VENDOR_NUM=0x2207
-CONFIG_G_DNL_PRODUCT_NUM=0x320a
CONFIG_ERRNO_STR=y
diff --git a/configs/evb-rk3288_defconfig b/configs/evb-rk3288_defconfig
index 5294ba9f5feb..0d91cdd53ff6 100644
--- a/configs/evb-rk3288_defconfig
+++ b/configs/evb-rk3288_defconfig
@@ -66,11 +66,11 @@ CONFIG_SYS_NS16550=y
CONFIG_SYSRESET=y
CONFIG_USB=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
+CONFIG_USB_GADGET_VENDOR_NUM=0x2207
+CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
CONFIG_USB_GADGET_DWC2_OTG=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Rockchip"
-CONFIG_G_DNL_VENDOR_NUM=0x2207
-CONFIG_G_DNL_PRODUCT_NUM=0x320a
CONFIG_DM_VIDEO=y
CONFIG_DISPLAY=y
CONFIG_VIDEO_ROCKCHIP=y
diff --git a/configs/evb-rk3328_defconfig b/configs/evb-rk3328_defconfig
index 7bec00178692..e3999556d8b2 100644
--- a/configs/evb-rk3328_defconfig
+++ b/configs/evb-rk3328_defconfig
@@ -47,8 +47,8 @@ CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_DWC2_OTG=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Rockchip"
-CONFIG_G_DNL_VENDOR_NUM=0x2207
-CONFIG_G_DNL_PRODUCT_NUM=0x330a
+CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
+CONFIG_USB_GADGET_VENDOR_NUM=0x2207
+CONFIG_USB_GADGET_PRODUCT_NUM=0x330a
CONFIG_USE_TINY_PRINTF=y
CONFIG_ERRNO_STR=y
diff --git a/configs/fennec-rk3288_defconfig b/configs/fennec-rk3288_defconfig
index 96a07defce64..51420e5b66db 100644
--- a/configs/fennec-rk3288_defconfig
+++ b/configs/fennec-rk3288_defconfig
@@ -69,11 +69,11 @@ CONFIG_USB=y
CONFIG_USB_DWC2=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
+CONFIG_USB_GADGET_VENDOR_NUM=0x2207
+CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
CONFIG_USB_GADGET_DWC2_OTG=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Rockchip"
-CONFIG_G_DNL_VENDOR_NUM=0x2207
-CONFIG_G_DNL_PRODUCT_NUM=0x320a
CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y
CONFIG_USB_ETHER_SMSC95XX=y
diff --git a/configs/firefly-rk3288_defconfig b/configs/firefly-rk3288_defconfig
index 82da6016e654..eb42def73fc2 100644
--- a/configs/firefly-rk3288_defconfig
+++ b/configs/firefly-rk3288_defconfig
@@ -75,11 +75,11 @@ CONFIG_USB_STORAGE=y
CONFIG_USB_KEYBOARD=y
CONFIG_SYS_USB_EVENT_POLL=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
+CONFIG_USB_GADGET_VENDOR_NUM=0x2207
+CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
CONFIG_USB_GADGET_DWC2_OTG=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Rockchip"
-CONFIG_G_DNL_VENDOR_NUM=0x2207
-CONFIG_G_DNL_PRODUCT_NUM=0x320a
CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y
CONFIG_USB_ETHER_SMSC95XX=y
diff --git a/configs/gwventana_emmc_defconfig b/configs/gwventana_emmc_defconfig
index 03d732d8f11e..eeb795876f2c 100644
--- a/configs/gwventana_emmc_defconfig
+++ b/configs/gwventana_emmc_defconfig
@@ -63,11 +63,11 @@ CONFIG_USB_STORAGE=y
CONFIG_USB_KEYBOARD=y
CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Gateworks"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0525
+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Gateworks"
-CONFIG_G_DNL_VENDOR_NUM=0x0525
-CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
CONFIG_USB_ETHER=y
CONFIG_USB_ETH_CDC=y
CONFIG_USB_HOST_ETHER=y
diff --git a/configs/gwventana_gw5904_defconfig b/configs/gwventana_gw5904_defconfig
index 51aa13dbaca3..75a07c587400 100644
--- a/configs/gwventana_gw5904_defconfig
+++ b/configs/gwventana_gw5904_defconfig
@@ -67,11 +67,11 @@ CONFIG_USB_STORAGE=y
CONFIG_USB_KEYBOARD=y
CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Gateworks"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0525
+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Gateworks"
-CONFIG_G_DNL_VENDOR_NUM=0x0525
-CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
CONFIG_USB_ETHER=y
CONFIG_USB_ETH_CDC=y
CONFIG_USB_HOST_ETHER=y
diff --git a/configs/gwventana_nand_defconfig b/configs/gwventana_nand_defconfig
index 4b2e1a752935..1819b9f09d14 100644
--- a/configs/gwventana_nand_defconfig
+++ b/configs/gwventana_nand_defconfig
@@ -66,11 +66,11 @@ CONFIG_USB_STORAGE=y
CONFIG_USB_KEYBOARD=y
CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Gateworks"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0525
+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Gateworks"
-CONFIG_G_DNL_VENDOR_NUM=0x0525
-CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
CONFIG_USB_ETHER=y
CONFIG_USB_ETH_CDC=y
CONFIG_USB_HOST_ETHER=y
diff --git a/configs/jetson-tk1_defconfig b/configs/jetson-tk1_defconfig
index 1e3e4bed6af2..f40f6ae56f53 100644
--- a/configs/jetson-tk1_defconfig
+++ b/configs/jetson-tk1_defconfig
@@ -49,10 +49,10 @@ CONFIG_DM_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="NVIDIA"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0955
+CONFIG_USB_GADGET_PRODUCT_NUM=0x701a
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="NVIDIA"
-CONFIG_G_DNL_VENDOR_NUM=0x0955
-CONFIG_G_DNL_PRODUCT_NUM=0x701a
CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y
diff --git a/configs/kc1_defconfig b/configs/kc1_defconfig
index d9c2efcf7cbe..d27a7f5abbe0 100644
--- a/configs/kc1_defconfig
+++ b/configs/kc1_defconfig
@@ -42,8 +42,8 @@ CONFIG_SYS_NS16550=y
CONFIG_USB=y
CONFIG_USB_MUSB_GADGET=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0451
+CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
-CONFIG_G_DNL_VENDOR_NUM=0x0451
-CONFIG_G_DNL_PRODUCT_NUM=0xd022
CONFIG_OF_LIBFDT=y
diff --git a/configs/kylin-rk3036_defconfig b/configs/kylin-rk3036_defconfig
index a42f5e0efb40..0904eb14d4fc 100644
--- a/configs/kylin-rk3036_defconfig
+++ b/configs/kylin-rk3036_defconfig
@@ -44,11 +44,11 @@ CONFIG_USB=y
CONFIG_USB_DWC2=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
+CONFIG_USB_GADGET_VENDOR_NUM=0x2207
+CONFIG_USB_GADGET_PRODUCT_NUM=0x310a
CONFIG_USB_GADGET_DWC2_OTG=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Rockchip"
-CONFIG_G_DNL_VENDOR_NUM=0x2207
-CONFIG_G_DNL_PRODUCT_NUM=0x310a
CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y
CONFIG_USB_ETHER_SMSC95XX=y
diff --git a/configs/ma5d4evk_defconfig b/configs/ma5d4evk_defconfig
index 0655505a1321..43ab70416331 100644
--- a/configs/ma5d4evk_defconfig
+++ b/configs/ma5d4evk_defconfig
@@ -47,11 +47,11 @@ CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="AriesEmbedded"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0525
+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_USB_GADGET_ATMEL_USBA=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="AriesEmbedded"
-CONFIG_G_DNL_VENDOR_NUM=0x0525
-CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
CONFIG_USB_ETHER=y
CONFIG_FAT_WRITE=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/miqi-rk3288_defconfig b/configs/miqi-rk3288_defconfig
index b0437e13a7a7..e607ecd7dd71 100644
--- a/configs/miqi-rk3288_defconfig
+++ b/configs/miqi-rk3288_defconfig
@@ -69,11 +69,11 @@ CONFIG_USB=y
CONFIG_USB_DWC2=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
+CONFIG_USB_GADGET_VENDOR_NUM=0x2207
+CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
CONFIG_USB_GADGET_DWC2_OTG=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Rockchip"
-CONFIG_G_DNL_VENDOR_NUM=0x2207
-CONFIG_G_DNL_PRODUCT_NUM=0x320a
CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y
CONFIG_USB_ETHER_SMSC95XX=y
diff --git a/configs/mx6qsabrelite_defconfig b/configs/mx6qsabrelite_defconfig
index f716c8fd7f77..92e0a578dfde 100644
--- a/configs/mx6qsabrelite_defconfig
+++ b/configs/mx6qsabrelite_defconfig
@@ -49,11 +49,11 @@ CONFIG_USB_STORAGE=y
CONFIG_USB_KEYBOARD=y
CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Boundary"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0525
+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Boundary"
-CONFIG_G_DNL_VENDOR_NUM=0x0525
-CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
CONFIG_USB_ETHER=y
CONFIG_USB_ETH_CDC=y
# CONFIG_VIDEO_SW_CURSOR is not set
diff --git a/configs/mx6sabreauto_defconfig b/configs/mx6sabreauto_defconfig
index 828318931560..2e375c3068f8 100644
--- a/configs/mx6sabreauto_defconfig
+++ b/configs/mx6sabreauto_defconfig
@@ -48,11 +48,11 @@ CONFIG_PHYLIB=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="FSL"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0525
+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="FSL"
-CONFIG_G_DNL_VENDOR_NUM=0x0525
-CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y
# CONFIG_VIDEO_SW_CURSOR is not set
diff --git a/configs/mx6sabresd_defconfig b/configs/mx6sabresd_defconfig
index 0e49e69c8cd5..d511fc98b906 100644
--- a/configs/mx6sabresd_defconfig
+++ b/configs/mx6sabresd_defconfig
@@ -48,11 +48,11 @@ CONFIG_PCI=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="FSL"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0525
+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="FSL"
-CONFIG_G_DNL_VENDOR_NUM=0x0525
-CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y
# CONFIG_VIDEO_SW_CURSOR is not set
diff --git a/configs/mx7dsabresd_defconfig b/configs/mx7dsabresd_defconfig
index 795c4f2b7124..26250fdb5e91 100644
--- a/configs/mx7dsabresd_defconfig
+++ b/configs/mx7dsabresd_defconfig
@@ -64,11 +64,11 @@ CONFIG_USB_EHCI_HCD=y
CONFIG_MXC_USB_OTG_HACTIVE=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="FSL"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0525
+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="FSL"
-CONFIG_G_DNL_VENDOR_NUM=0x0525
-CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y
CONFIG_ERRNO_STR=y
diff --git a/configs/mx7dsabresd_secure_defconfig b/configs/mx7dsabresd_secure_defconfig
index bd68831db7cc..970f8211ef2c 100644
--- a/configs/mx7dsabresd_secure_defconfig
+++ b/configs/mx7dsabresd_secure_defconfig
@@ -66,11 +66,11 @@ CONFIG_USB_EHCI_HCD=y
CONFIG_MXC_USB_OTG_HACTIVE=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="FSL"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0525
+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="FSL"
-CONFIG_G_DNL_VENDOR_NUM=0x0525
-CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y
CONFIG_ERRNO_STR=y
diff --git a/configs/nitrogen6dl2g_defconfig b/configs/nitrogen6dl2g_defconfig
index fd4a46558129..a5fdb48d2452 100644
--- a/configs/nitrogen6dl2g_defconfig
+++ b/configs/nitrogen6dl2g_defconfig
@@ -46,11 +46,11 @@ CONFIG_USB_STORAGE=y
CONFIG_USB_KEYBOARD=y
CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Boundary"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0525
+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Boundary"
-CONFIG_G_DNL_VENDOR_NUM=0x0525
-CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
CONFIG_USB_ETHER=y
CONFIG_USB_ETH_CDC=y
# CONFIG_VIDEO_SW_CURSOR is not set
diff --git a/configs/nitrogen6dl_defconfig b/configs/nitrogen6dl_defconfig
index 30046e3f3a07..1803bdba888e 100644
--- a/configs/nitrogen6dl_defconfig
+++ b/configs/nitrogen6dl_defconfig
@@ -46,11 +46,11 @@ CONFIG_USB_STORAGE=y
CONFIG_USB_KEYBOARD=y
CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Boundary"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0525
+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Boundary"
-CONFIG_G_DNL_VENDOR_NUM=0x0525
-CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
CONFIG_USB_ETHER=y
CONFIG_USB_ETH_CDC=y
# CONFIG_VIDEO_SW_CURSOR is not set
diff --git a/configs/nitrogen6q2g_defconfig b/configs/nitrogen6q2g_defconfig
index f9160c208fe7..3c9b44023f82 100644
--- a/configs/nitrogen6q2g_defconfig
+++ b/configs/nitrogen6q2g_defconfig
@@ -47,11 +47,11 @@ CONFIG_USB_STORAGE=y
CONFIG_USB_KEYBOARD=y
CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Boundary"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0525
+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Boundary"
-CONFIG_G_DNL_VENDOR_NUM=0x0525
-CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
CONFIG_USB_ETHER=y
CONFIG_USB_ETH_CDC=y
# CONFIG_VIDEO_SW_CURSOR is not set
diff --git a/configs/nitrogen6q_defconfig b/configs/nitrogen6q_defconfig
index 8bca0e04439e..82b05febae40 100644
--- a/configs/nitrogen6q_defconfig
+++ b/configs/nitrogen6q_defconfig
@@ -47,11 +47,11 @@ CONFIG_USB_STORAGE=y
CONFIG_USB_KEYBOARD=y
CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Boundary"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0525
+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Boundary"
-CONFIG_G_DNL_VENDOR_NUM=0x0525
-CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
CONFIG_USB_ETHER=y
CONFIG_USB_ETH_CDC=y
# CONFIG_VIDEO_SW_CURSOR is not set
diff --git a/configs/nitrogen6s1g_defconfig b/configs/nitrogen6s1g_defconfig
index 668fbaa37010..3e4c20357c16 100644
--- a/configs/nitrogen6s1g_defconfig
+++ b/configs/nitrogen6s1g_defconfig
@@ -46,11 +46,11 @@ CONFIG_USB_STORAGE=y
CONFIG_USB_KEYBOARD=y
CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Boundary"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0525
+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Boundary"
-CONFIG_G_DNL_VENDOR_NUM=0x0525
-CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
CONFIG_USB_ETHER=y
CONFIG_USB_ETH_CDC=y
# CONFIG_VIDEO_SW_CURSOR is not set
diff --git a/configs/nitrogen6s_defconfig b/configs/nitrogen6s_defconfig
index 99106c9a1f5a..107cbfc9bc55 100644
--- a/configs/nitrogen6s_defconfig
+++ b/configs/nitrogen6s_defconfig
@@ -46,11 +46,11 @@ CONFIG_USB_STORAGE=y
CONFIG_USB_KEYBOARD=y
CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Boundary"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0525
+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Boundary"
-CONFIG_G_DNL_VENDOR_NUM=0x0525
-CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
CONFIG_USB_ETHER=y
CONFIG_USB_ETH_CDC=y
# CONFIG_VIDEO_SW_CURSOR is not set
diff --git a/configs/nyan-big_defconfig b/configs/nyan-big_defconfig
index 29d918d974e4..ba9d8f545ccc 100644
--- a/configs/nyan-big_defconfig
+++ b/configs/nyan-big_defconfig
@@ -65,11 +65,11 @@ CONFIG_DM_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="NVIDIA"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0955
+CONFIG_USB_GADGET_PRODUCT_NUM=0x701a
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="NVIDIA"
-CONFIG_G_DNL_VENDOR_NUM=0x0955
-CONFIG_G_DNL_PRODUCT_NUM=0x701a
CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y
CONFIG_DM_VIDEO=y
diff --git a/configs/odroid-xu3_defconfig b/configs/odroid-xu3_defconfig
index a5e47c84f248..ab7f8bde9dd7 100644
--- a/configs/odroid-xu3_defconfig
+++ b/configs/odroid-xu3_defconfig
@@ -43,10 +43,10 @@ CONFIG_USB_DWC3_GADGET=y
CONFIG_USB_DWC3_PHY_SAMSUNG=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Samsung"
+CONFIG_USB_GADGET_VENDOR_NUM=0x04e8
+CONFIG_USB_GADGET_PRODUCT_NUM=0x6601
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Samsung"
-CONFIG_G_DNL_VENDOR_NUM=0x04e8
-CONFIG_G_DNL_PRODUCT_NUM=0x6601
CONFIG_USB_HOST_ETHER=y
CONFIG_VIDEO_BRIDGE=y
CONFIG_ERRNO_STR=y
diff --git a/configs/odroid_defconfig b/configs/odroid_defconfig
index 0dc1a250c5d0..ddac08cb98fd 100644
--- a/configs/odroid_defconfig
+++ b/configs/odroid_defconfig
@@ -56,11 +56,11 @@ CONFIG_DM_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Samsung"
+CONFIG_USB_GADGET_VENDOR_NUM=0x04e8
+CONFIG_USB_GADGET_PRODUCT_NUM=0x6601
CONFIG_USB_GADGET_DWC2_OTG=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Samsung"
-CONFIG_G_DNL_VENDOR_NUM=0x04e8
-CONFIG_G_DNL_PRODUCT_NUM=0x6601
CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_SMSC95XX=y
CONFIG_ERRNO_STR=y
diff --git a/configs/omap3_beagle_defconfig b/configs/omap3_beagle_defconfig
index 8896b84ebc9a..86967b07fb9c 100644
--- a/configs/omap3_beagle_defconfig
+++ b/configs/omap3_beagle_defconfig
@@ -48,10 +48,10 @@ CONFIG_USB_EHCI_HCD=y
CONFIG_USB_MUSB_GADGET=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="TI"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0451
+CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="TI"
-CONFIG_G_DNL_VENDOR_NUM=0x0451
-CONFIG_G_DNL_PRODUCT_NUM=0xd022
CONFIG_USB_ETHER=y
CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y
diff --git a/configs/omap3_evm_defconfig b/configs/omap3_evm_defconfig
index 8db95f167a1a..5f6067e689d0 100644
--- a/configs/omap3_evm_defconfig
+++ b/configs/omap3_evm_defconfig
@@ -52,10 +52,10 @@ CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_MUSB_GADGET=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0451
+CONFIG_USB_GADGET_PRODUCT_NUM=0x5678
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
-CONFIG_G_DNL_VENDOR_NUM=0x0451
-CONFIG_G_DNL_PRODUCT_NUM=0x5678
CONFIG_USB_ETHER=y
CONFIG_FAT_WRITE=y
CONFIG_BCH=y
diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig
index 3bf115e6f8c8..b1693be7edd7 100644
--- a/configs/omap3_logic_defconfig
+++ b/configs/omap3_logic_defconfig
@@ -45,9 +45,9 @@ CONFIG_OMAP3_SPI=y
CONFIG_USB=y
CONFIG_USB_MUSB_GADGET=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="TI"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0451
+CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="TI"
-CONFIG_G_DNL_VENDOR_NUM=0x0451
-CONFIG_G_DNL_PRODUCT_NUM=0xd022
CONFIG_USB_ETHER=y
CONFIG_BCH=y
diff --git a/configs/omap5_uevm_defconfig b/configs/omap5_uevm_defconfig
index 6e860ef5e32d..e2295759f0ef 100644
--- a/configs/omap5_uevm_defconfig
+++ b/configs/omap5_uevm_defconfig
@@ -49,10 +49,10 @@ CONFIG_USB_DWC3_OMAP=y
CONFIG_USB_DWC3_PHY_OMAP=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0403
+CONFIG_USB_GADGET_PRODUCT_NUM=0xbd00
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
-CONFIG_G_DNL_VENDOR_NUM=0x0403
-CONFIG_G_DNL_PRODUCT_NUM=0xbd00
CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_SMSC95XX=y
CONFIG_FAT_WRITE=y
diff --git a/configs/opos6uldev_defconfig b/configs/opos6uldev_defconfig
index a880c62eb6ac..0c2319272ac7 100644
--- a/configs/opos6uldev_defconfig
+++ b/configs/opos6uldev_defconfig
@@ -79,10 +79,10 @@ CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Armadeus Systems"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0525
+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Armadeus Systems"
-CONFIG_G_DNL_VENDOR_NUM=0x0525
-CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
CONFIG_OF_LIBFDT_OVERLAY=y
# CONFIG_EFI_LOADER is not set
diff --git a/configs/origen_defconfig b/configs/origen_defconfig
index 298e7a494371..013eec185aaf 100644
--- a/configs/origen_defconfig
+++ b/configs/origen_defconfig
@@ -41,8 +41,8 @@ CONFIG_MMC_SDHCI_S5P=y
CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Samsung"
+CONFIG_USB_GADGET_VENDOR_NUM=0x04e8
+CONFIG_USB_GADGET_PRODUCT_NUM=0x6601
CONFIG_USB_GADGET_DWC2_OTG=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Samsung"
-CONFIG_G_DNL_VENDOR_NUM=0x04e8
-CONFIG_G_DNL_PRODUCT_NUM=0x6601
diff --git a/configs/p2371-0000_defconfig b/configs/p2371-0000_defconfig
index e499b82d344f..e186526550ee 100644
--- a/configs/p2371-0000_defconfig
+++ b/configs/p2371-0000_defconfig
@@ -36,8 +36,8 @@ CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="NVIDIA"
-CONFIG_G_DNL_VENDOR_NUM=0x0955
-CONFIG_G_DNL_PRODUCT_NUM=0x701a
+CONFIG_USB_GADGET_MANUFACTURER="NVIDIA"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0955
+CONFIG_USB_GADGET_PRODUCT_NUM=0x701a
CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y
diff --git a/configs/p2371-2180_defconfig b/configs/p2371-2180_defconfig
index 3330d23e4089..6713564763d6 100644
--- a/configs/p2371-2180_defconfig
+++ b/configs/p2371-2180_defconfig
@@ -43,8 +43,8 @@ CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="NVIDIA"
-CONFIG_G_DNL_VENDOR_NUM=0x0955
-CONFIG_G_DNL_PRODUCT_NUM=0x701a
+CONFIG_USB_GADGET_MANUFACTURER="NVIDIA"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0955
+CONFIG_USB_GADGET_PRODUCT_NUM=0x701a
CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y
diff --git a/configs/p2571_defconfig b/configs/p2571_defconfig
index 9259c1316e27..ae896bdde6ff 100644
--- a/configs/p2571_defconfig
+++ b/configs/p2571_defconfig
@@ -36,8 +36,8 @@ CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="NVIDIA"
-CONFIG_G_DNL_VENDOR_NUM=0x0955
-CONFIG_G_DNL_PRODUCT_NUM=0x701a
+CONFIG_USB_GADGET_MANUFACTURER="NVIDIA"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0955
+CONFIG_USB_GADGET_PRODUCT_NUM=0x701a
CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y
diff --git a/configs/parrot_r16_defconfig b/configs/parrot_r16_defconfig
index 53825eba33c3..4b70fc5687eb 100644
--- a/configs/parrot_r16_defconfig
+++ b/configs/parrot_r16_defconfig
@@ -24,7 +24,7 @@ CONFIG_USB_EHCI_HCD=y
CONFIG_USB_MUSB_GADGET=y
CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Allwinner Technology"
+CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a
+CONFIG_USB_GADGET_PRODUCT_NUM=0x1010
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Allwinner Technology"
-CONFIG_G_DNL_VENDOR_NUM=0x1f3a
-CONFIG_G_DNL_PRODUCT_NUM=0x1010
diff --git a/configs/phycore-rk3288_defconfig b/configs/phycore-rk3288_defconfig
index 93ee353d0dc2..ba50ea9d8665 100644
--- a/configs/phycore-rk3288_defconfig
+++ b/configs/phycore-rk3288_defconfig
@@ -72,11 +72,11 @@ CONFIG_SYSRESET=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
+CONFIG_USB_GADGET_VENDOR_NUM=0x2207
+CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
CONFIG_USB_GADGET_DWC2_OTG=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Rockchip"
-CONFIG_G_DNL_VENDOR_NUM=0x2207
-CONFIG_G_DNL_PRODUCT_NUM=0x320a
CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y
CONFIG_USB_ETHER_SMSC95XX=y
diff --git a/configs/pico-imx6ul_defconfig b/configs/pico-imx6ul_defconfig
index abafc65f578c..c213493b12c0 100644
--- a/configs/pico-imx6ul_defconfig
+++ b/configs/pico-imx6ul_defconfig
@@ -32,9 +32,9 @@ CONFIG_PHY_MICREL=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="FSL"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0525
+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="FSL"
-CONFIG_G_DNL_VENDOR_NUM=0x0525
-CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
CONFIG_OF_LIBFDT=y
diff --git a/configs/pico-imx7d_defconfig b/configs/pico-imx7d_defconfig
index 114c397d2e92..d34e6cecbbd9 100644
--- a/configs/pico-imx7d_defconfig
+++ b/configs/pico-imx7d_defconfig
@@ -28,9 +28,9 @@ CONFIG_USB_EHCI_HCD=y
CONFIG_MXC_USB_OTG_HACTIVE=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="FSL"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0525
+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="FSL"
-CONFIG_G_DNL_VENDOR_NUM=0x0525
-CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
CONFIG_OF_LIBFDT=y
diff --git a/configs/popmetal-rk3288_defconfig b/configs/popmetal-rk3288_defconfig
index 5e99f9c08922..a8d5cbf70940 100644
--- a/configs/popmetal-rk3288_defconfig
+++ b/configs/popmetal-rk3288_defconfig
@@ -69,11 +69,11 @@ CONFIG_USB=y
CONFIG_USB_DWC2=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
+CONFIG_USB_GADGET_VENDOR_NUM=0x2207
+CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
CONFIG_USB_GADGET_DWC2_OTG=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Rockchip"
-CONFIG_G_DNL_VENDOR_NUM=0x2207
-CONFIG_G_DNL_PRODUCT_NUM=0x320a
CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y
CONFIG_USB_ETHER_SMSC95XX=y
diff --git a/configs/pxm2_defconfig b/configs/pxm2_defconfig
index b6624f0be16c..384ad35aec9c 100644
--- a/configs/pxm2_defconfig
+++ b/configs/pxm2_defconfig
@@ -70,10 +70,10 @@ CONFIG_USB_MUSB_HOST=y
CONFIG_USB_MUSB_GADGET=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Siemens AG"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0908
+CONFIG_USB_GADGET_PRODUCT_NUM=0x02d2
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Siemens AG"
-CONFIG_G_DNL_VENDOR_NUM=0x0908
-CONFIG_G_DNL_PRODUCT_NUM=0x02d2
CONFIG_USB_ETHER=y
CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00"
# CONFIG_VIDEO_SW_CURSOR is not set
diff --git a/configs/rastaban_defconfig b/configs/rastaban_defconfig
index ed5f2f841b2a..3c9c2b342359 100644
--- a/configs/rastaban_defconfig
+++ b/configs/rastaban_defconfig
@@ -66,9 +66,9 @@ CONFIG_USB_MUSB_HOST=y
CONFIG_USB_MUSB_GADGET=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Siemens AG"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0908
+CONFIG_USB_GADGET_PRODUCT_NUM=0x02d2
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Siemens AG"
-CONFIG_G_DNL_VENDOR_NUM=0x0908
-CONFIG_G_DNL_PRODUCT_NUM=0x02d2
CONFIG_USB_ETHER=y
CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00"
diff --git a/configs/rock2_defconfig b/configs/rock2_defconfig
index b41644ef5fb3..d0ffdc7b0e70 100644
--- a/configs/rock2_defconfig
+++ b/configs/rock2_defconfig
@@ -67,11 +67,11 @@ CONFIG_SYS_NS16550=y
CONFIG_SYSRESET=y
CONFIG_USB=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
+CONFIG_USB_GADGET_VENDOR_NUM=0x2207
+CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
CONFIG_USB_GADGET_DWC2_OTG=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Rockchip"
-CONFIG_G_DNL_VENDOR_NUM=0x2207
-CONFIG_G_DNL_PRODUCT_NUM=0x320a
CONFIG_DM_VIDEO=y
CONFIG_DISPLAY=y
CONFIG_VIDEO_ROCKCHIP=y
diff --git a/configs/rut_defconfig b/configs/rut_defconfig
index 1b787906baf9..1f472009321e 100644
--- a/configs/rut_defconfig
+++ b/configs/rut_defconfig
@@ -71,10 +71,10 @@ CONFIG_USB_MUSB_HOST=y
CONFIG_USB_MUSB_GADGET=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Siemens AG"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0908
+CONFIG_USB_GADGET_PRODUCT_NUM=0x02d2
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Siemens AG"
-CONFIG_G_DNL_VENDOR_NUM=0x0908
-CONFIG_G_DNL_PRODUCT_NUM=0x02d2
CONFIG_USB_ETHER=y
# CONFIG_VIDEO_SW_CURSOR is not set
CONFIG_SYS_CONSOLE_BG_COL=0xff
diff --git a/configs/s5p_goni_defconfig b/configs/s5p_goni_defconfig
index 7d8792cb0580..eb6c2d70c0a6 100644
--- a/configs/s5p_goni_defconfig
+++ b/configs/s5p_goni_defconfig
@@ -35,9 +35,9 @@ CONFIG_DM_PMIC=y
CONFIG_DM_PMIC_MAX8998=y
CONFIG_USB=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Samsung"
+CONFIG_USB_GADGET_VENDOR_NUM=0x04e8
+CONFIG_USB_GADGET_PRODUCT_NUM=0x6601
CONFIG_USB_GADGET_DWC2_OTG=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Samsung"
-CONFIG_G_DNL_VENDOR_NUM=0x04e8
-CONFIG_G_DNL_PRODUCT_NUM=0x6601
CONFIG_FAT_WRITE=y
diff --git a/configs/s5pc210_universal_defconfig b/configs/s5pc210_universal_defconfig
index 16352ad7a061..e48e4b53835f 100644
--- a/configs/s5pc210_universal_defconfig
+++ b/configs/s5pc210_universal_defconfig
@@ -46,8 +46,8 @@ CONFIG_DM_PMIC_MAX8998=y
CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Samsung"
+CONFIG_USB_GADGET_VENDOR_NUM=0x04e8
+CONFIG_USB_GADGET_PRODUCT_NUM=0x6601
CONFIG_USB_GADGET_DWC2_OTG=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Samsung"
-CONFIG_G_DNL_VENDOR_NUM=0x04e8
-CONFIG_G_DNL_PRODUCT_NUM=0x6601
diff --git a/configs/smartweb_defconfig b/configs/smartweb_defconfig
index accdd5da8818..583000e952d6 100644
--- a/configs/smartweb_defconfig
+++ b/configs/smartweb_defconfig
@@ -46,10 +46,10 @@ CONFIG_PHYLIB=y
CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Siemens AG"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0908
+CONFIG_USB_GADGET_PRODUCT_NUM=0x02d2
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Siemens AG"
-CONFIG_G_DNL_VENDOR_NUM=0x0908
-CONFIG_G_DNL_PRODUCT_NUM=0x02d2
CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y
CONFIG_USB_ETHER_MCS7830=y
diff --git a/configs/sniper_defconfig b/configs/sniper_defconfig
index f24153b56fd3..75371c47ce8e 100644
--- a/configs/sniper_defconfig
+++ b/configs/sniper_defconfig
@@ -43,8 +43,8 @@ CONFIG_SYS_NS16550=y
CONFIG_USB=y
CONFIG_USB_MUSB_GADGET=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0451
+CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
-CONFIG_G_DNL_VENDOR_NUM=0x0451
-CONFIG_G_DNL_PRODUCT_NUM=0xd022
CONFIG_OF_LIBFDT=y
diff --git a/configs/socfpga_arria5_defconfig b/configs/socfpga_arria5_defconfig
index cf4fa20f2c1c..dc2182138c1d 100644
--- a/configs/socfpga_arria5_defconfig
+++ b/configs/socfpga_arria5_defconfig
@@ -64,9 +64,9 @@ CONFIG_DM_USB=y
CONFIG_USB_DWC2=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="altera"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0525
+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_USB_GADGET_DWC2_OTG=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="altera"
-CONFIG_G_DNL_VENDOR_NUM=0x0525
-CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
CONFIG_USE_TINY_PRINTF=y
diff --git a/configs/socfpga_cyclone5_defconfig b/configs/socfpga_cyclone5_defconfig
index 1cc6e161d969..9d465761440b 100644
--- a/configs/socfpga_cyclone5_defconfig
+++ b/configs/socfpga_cyclone5_defconfig
@@ -64,9 +64,9 @@ CONFIG_DM_USB=y
CONFIG_USB_DWC2=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="altera"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0525
+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_USB_GADGET_DWC2_OTG=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="altera"
-CONFIG_G_DNL_VENDOR_NUM=0x0525
-CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
CONFIG_USE_TINY_PRINTF=y
diff --git a/configs/socfpga_de0_nano_soc_defconfig b/configs/socfpga_de0_nano_soc_defconfig
index 0bb9121c262e..7a03e8240cd3 100644
--- a/configs/socfpga_de0_nano_soc_defconfig
+++ b/configs/socfpga_de0_nano_soc_defconfig
@@ -58,9 +58,9 @@ CONFIG_DM_USB=y
CONFIG_USB_DWC2=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="terasic"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0525
+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_USB_GADGET_DWC2_OTG=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="terasic"
-CONFIG_G_DNL_VENDOR_NUM=0x0525
-CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
CONFIG_USE_TINY_PRINTF=y
diff --git a/configs/socfpga_de10_nano_defconfig b/configs/socfpga_de10_nano_defconfig
index 16cff90369e7..c9f9e50ac85f 100644
--- a/configs/socfpga_de10_nano_defconfig
+++ b/configs/socfpga_de10_nano_defconfig
@@ -56,9 +56,9 @@ CONFIG_DM_USB=y
CONFIG_USB_DWC2=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="terasic"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0525
+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_USB_GADGET_DWC2_OTG=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="terasic"
-CONFIG_G_DNL_VENDOR_NUM=0x0525
-CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
CONFIG_USE_TINY_PRINTF=y
diff --git a/configs/socfpga_mcvevk_defconfig b/configs/socfpga_mcvevk_defconfig
index 0b4ad4118f24..d06db2548cde 100644
--- a/configs/socfpga_mcvevk_defconfig
+++ b/configs/socfpga_mcvevk_defconfig
@@ -58,9 +58,9 @@ CONFIG_DM_USB=y
CONFIG_USB_DWC2=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="denx"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0525
+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_USB_GADGET_DWC2_OTG=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="denx"
-CONFIG_G_DNL_VENDOR_NUM=0x0525
-CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
CONFIG_USE_TINY_PRINTF=y
diff --git a/configs/socfpga_sockit_defconfig b/configs/socfpga_sockit_defconfig
index b22bf6f608c5..1d50140119a5 100644
--- a/configs/socfpga_sockit_defconfig
+++ b/configs/socfpga_sockit_defconfig
@@ -64,9 +64,9 @@ CONFIG_DM_USB=y
CONFIG_USB_DWC2=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="terasic"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0525
+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_USB_GADGET_DWC2_OTG=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="terasic"
-CONFIG_G_DNL_VENDOR_NUM=0x0525
-CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
CONFIG_USE_TINY_PRINTF=y
diff --git a/configs/socfpga_socrates_defconfig b/configs/socfpga_socrates_defconfig
index 335c9e8384e4..c088c3ed479a 100644
--- a/configs/socfpga_socrates_defconfig
+++ b/configs/socfpga_socrates_defconfig
@@ -64,9 +64,9 @@ CONFIG_DM_USB=y
CONFIG_USB_DWC2=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="ebv"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0525
+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_USB_GADGET_DWC2_OTG=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="ebv"
-CONFIG_G_DNL_VENDOR_NUM=0x0525
-CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
CONFIG_USE_TINY_PRINTF=y
diff --git a/configs/socfpga_vining_fpga_defconfig b/configs/socfpga_vining_fpga_defconfig
index 3bcedb6d1aee..1911735af1ac 100644
--- a/configs/socfpga_vining_fpga_defconfig
+++ b/configs/socfpga_vining_fpga_defconfig
@@ -81,9 +81,9 @@ CONFIG_DM_USB=y
CONFIG_USB_DWC2=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="samtec"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0525
+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_USB_GADGET_DWC2_OTG=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="samtec"
-CONFIG_G_DNL_VENDOR_NUM=0x0525
-CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
CONFIG_USE_TINY_PRINTF=y
diff --git a/configs/taurus_defconfig b/configs/taurus_defconfig
index 71a382a3e132..bde93e958325 100644
--- a/configs/taurus_defconfig
+++ b/configs/taurus_defconfig
@@ -53,8 +53,8 @@ CONFIG_PHYLIB=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Siemens AG"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0908
+CONFIG_USB_GADGET_PRODUCT_NUM=0x02d2
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Siemens AG"
-CONFIG_G_DNL_VENDOR_NUM=0x0908
-CONFIG_G_DNL_PRODUCT_NUM=0x02d2
CONFIG_USE_TINY_PRINTF=y
diff --git a/configs/tbs2910_defconfig b/configs/tbs2910_defconfig
index 20814ccea33b..81225e865abf 100644
--- a/configs/tbs2910_defconfig
+++ b/configs/tbs2910_defconfig
@@ -45,10 +45,10 @@ CONFIG_USB_STORAGE=y
CONFIG_USB_KEYBOARD=y
CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="TBS"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0525
+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="TBS"
-CONFIG_G_DNL_VENDOR_NUM=0x0525
-CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
CONFIG_CFB_CONSOLE_ANSI=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/thuban_defconfig b/configs/thuban_defconfig
index eb9124ce23ec..d9030ec82766 100644
--- a/configs/thuban_defconfig
+++ b/configs/thuban_defconfig
@@ -66,8 +66,8 @@ CONFIG_USB_MUSB_HOST=y
CONFIG_USB_MUSB_GADGET=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Siemens AG"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0908
+CONFIG_USB_GADGET_PRODUCT_NUM=0x02d2
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Siemens AG"
-CONFIG_G_DNL_VENDOR_NUM=0x0908
-CONFIG_G_DNL_PRODUCT_NUM=0x02d2
CONFIG_USB_ETHER=y
diff --git a/configs/tinker-rk3288_defconfig b/configs/tinker-rk3288_defconfig
index 00e2d8195434..84fcd8979f20 100644
--- a/configs/tinker-rk3288_defconfig
+++ b/configs/tinker-rk3288_defconfig
@@ -72,11 +72,11 @@ CONFIG_USB=y
CONFIG_USB_DWC2=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
+CONFIG_USB_GADGET_VENDOR_NUM=0x2207
+CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
CONFIG_USB_GADGET_DWC2_OTG=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Rockchip"
-CONFIG_G_DNL_VENDOR_NUM=0x2207
-CONFIG_G_DNL_PRODUCT_NUM=0x320a
CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y
CONFIG_USB_ETHER_SMSC95XX=y
diff --git a/configs/topic_miami_defconfig b/configs/topic_miami_defconfig
index 1080554cba37..a8028b6b18cd 100644
--- a/configs/topic_miami_defconfig
+++ b/configs/topic_miami_defconfig
@@ -46,8 +46,8 @@ CONFIG_USB_ULPI_VIEWPORT=y
CONFIG_USB_ULPI=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Xilinx"
+CONFIG_USB_GADGET_VENDOR_NUM=0x03fd
+CONFIG_USB_GADGET_PRODUCT_NUM=0x0300
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Xilinx"
-CONFIG_G_DNL_VENDOR_NUM=0x03fd
-CONFIG_G_DNL_PRODUCT_NUM=0x0300
diff --git a/configs/topic_miamilite_defconfig b/configs/topic_miamilite_defconfig
index 1450fbc61aa0..568eb66d516d 100644
--- a/configs/topic_miamilite_defconfig
+++ b/configs/topic_miamilite_defconfig
@@ -47,8 +47,8 @@ CONFIG_USB_ULPI_VIEWPORT=y
CONFIG_USB_ULPI=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Xilinx"
+CONFIG_USB_GADGET_VENDOR_NUM=0x03fd
+CONFIG_USB_GADGET_PRODUCT_NUM=0x0300
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Xilinx"
-CONFIG_G_DNL_VENDOR_NUM=0x03fd
-CONFIG_G_DNL_PRODUCT_NUM=0x0300
diff --git a/configs/topic_miamiplus_defconfig b/configs/topic_miamiplus_defconfig
index d3fc7ad63f32..94fa96221ce5 100644
--- a/configs/topic_miamiplus_defconfig
+++ b/configs/topic_miamiplus_defconfig
@@ -46,8 +46,8 @@ CONFIG_USB_ULPI_VIEWPORT=y
CONFIG_USB_ULPI=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Xilinx"
+CONFIG_USB_GADGET_VENDOR_NUM=0x03fd
+CONFIG_USB_GADGET_PRODUCT_NUM=0x0300
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Xilinx"
-CONFIG_G_DNL_VENDOR_NUM=0x03fd
-CONFIG_G_DNL_PRODUCT_NUM=0x0300
diff --git a/configs/trats2_defconfig b/configs/trats2_defconfig
index bcc73d4fa266..a4cd8c875ca8 100644
--- a/configs/trats2_defconfig
+++ b/configs/trats2_defconfig
@@ -50,8 +50,8 @@ CONFIG_DM_PMIC_MAX77686=y
CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Samsung"
+CONFIG_USB_GADGET_VENDOR_NUM=0x04e8
+CONFIG_USB_GADGET_PRODUCT_NUM=0x6601
CONFIG_USB_GADGET_DWC2_OTG=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Samsung"
-CONFIG_G_DNL_VENDOR_NUM=0x04e8
-CONFIG_G_DNL_PRODUCT_NUM=0x6601
diff --git a/configs/trats_defconfig b/configs/trats_defconfig
index 3f0c59baadcf..5c567f660d04 100644
--- a/configs/trats_defconfig
+++ b/configs/trats_defconfig
@@ -49,8 +49,8 @@ CONFIG_PMIC_MAX8997=y
CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Samsung"
+CONFIG_USB_GADGET_VENDOR_NUM=0x04e8
+CONFIG_USB_GADGET_PRODUCT_NUM=0x6601
CONFIG_USB_GADGET_DWC2_OTG=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Samsung"
-CONFIG_G_DNL_VENDOR_NUM=0x04e8
-CONFIG_G_DNL_PRODUCT_NUM=0x6601
diff --git a/configs/venice2_defconfig b/configs/venice2_defconfig
index f90936e7440e..5820897ae5b0 100644
--- a/configs/venice2_defconfig
+++ b/configs/venice2_defconfig
@@ -38,10 +38,10 @@ CONFIG_DM_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="NVIDIA"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0955
+CONFIG_USB_GADGET_PRODUCT_NUM=0x701a
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="NVIDIA"
-CONFIG_G_DNL_VENDOR_NUM=0x0955
-CONFIG_G_DNL_PRODUCT_NUM=0x701a
CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y
diff --git a/configs/warp7_defconfig b/configs/warp7_defconfig
index 32cf7a4da4b4..c91090cac08b 100644
--- a/configs/warp7_defconfig
+++ b/configs/warp7_defconfig
@@ -33,11 +33,11 @@ CONFIG_USB_EHCI_HCD=y
CONFIG_MXC_USB_OTG_HACTIVE=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="FSL"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0525
+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="FSL"
-CONFIG_G_DNL_VENDOR_NUM=0x0525
-CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
CONFIG_USB_ETHER=y
CONFIG_USB_ETH_CDC=y
CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00"
diff --git a/configs/warp7_secure_defconfig b/configs/warp7_secure_defconfig
index 99764dbd0bb1..5a2b39493a24 100644
--- a/configs/warp7_secure_defconfig
+++ b/configs/warp7_secure_defconfig
@@ -31,11 +31,11 @@ CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_MXC_USB_OTG_HACTIVE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="FSL"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0525
+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="FSL"
-CONFIG_G_DNL_VENDOR_NUM=0x0525
-CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
CONFIG_USB_ETHER=y
CONFIG_USB_ETH_CDC=y
CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00"
diff --git a/configs/warp_defconfig b/configs/warp_defconfig
index 8e58790269b8..3432a786ba78 100644
--- a/configs/warp_defconfig
+++ b/configs/warp_defconfig
@@ -30,9 +30,9 @@ CONFIG_DFU_MMC=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="FSL"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0525
+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="FSL"
-CONFIG_G_DNL_VENDOR_NUM=0x0525
-CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
CONFIG_OF_LIBFDT=y
diff --git a/configs/xilinx_zynqmp_ep_defconfig b/configs/xilinx_zynqmp_ep_defconfig
index c3ba5bf63242..03f529e6f4dd 100644
--- a/configs/xilinx_zynqmp_ep_defconfig
+++ b/configs/xilinx_zynqmp_ep_defconfig
@@ -85,8 +85,8 @@ CONFIG_USB_DWC3_GADGET=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Xilinx"
-CONFIG_G_DNL_VENDOR_NUM=0x03fd
-CONFIG_G_DNL_PRODUCT_NUM=0x0300
+CONFIG_USB_GADGET_MANUFACTURER="Xilinx"
+CONFIG_USB_GADGET_VENDOR_NUM=0x03fd
+CONFIG_USB_GADGET_PRODUCT_NUM=0x0300
# CONFIG_REGEX is not set
CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
diff --git a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
index 588b15430bf6..92ac41a6f25c 100644
--- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
+++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
@@ -77,7 +77,7 @@ CONFIG_USB_ULPI=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Xilinx"
-CONFIG_G_DNL_VENDOR_NUM=0x03FD
-CONFIG_G_DNL_PRODUCT_NUM=0x0300
+CONFIG_USB_GADGET_MANUFACTURER="Xilinx"
+CONFIG_USB_GADGET_VENDOR_NUM=0x03FD
+CONFIG_USB_GADGET_PRODUCT_NUM=0x0300
CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
diff --git a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
index 0a3ac9dbeadc..7a40b055a199 100644
--- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
+++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
@@ -75,7 +75,7 @@ CONFIG_USB_ULPI=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Xilinx"
-CONFIG_G_DNL_VENDOR_NUM=0x03FD
-CONFIG_G_DNL_PRODUCT_NUM=0x0300
+CONFIG_USB_GADGET_MANUFACTURER="Xilinx"
+CONFIG_USB_GADGET_VENDOR_NUM=0x03FD
+CONFIG_USB_GADGET_PRODUCT_NUM=0x0300
CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
diff --git a/configs/xilinx_zynqmp_zcu102_revA_defconfig b/configs/xilinx_zynqmp_zcu102_revA_defconfig
index ee0beda47a8e..670206800e04 100644
--- a/configs/xilinx_zynqmp_zcu102_revA_defconfig
+++ b/configs/xilinx_zynqmp_zcu102_revA_defconfig
@@ -80,7 +80,7 @@ CONFIG_USB_ULPI=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Xilinx"
-CONFIG_G_DNL_VENDOR_NUM=0x03FD
-CONFIG_G_DNL_PRODUCT_NUM=0x0300
+CONFIG_USB_GADGET_MANUFACTURER="Xilinx"
+CONFIG_USB_GADGET_VENDOR_NUM=0x03FD
+CONFIG_USB_GADGET_PRODUCT_NUM=0x0300
CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
diff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig b/configs/xilinx_zynqmp_zcu102_revB_defconfig
index e47e4bf6e5e1..d878c18476ec 100644
--- a/configs/xilinx_zynqmp_zcu102_revB_defconfig
+++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig
@@ -80,7 +80,7 @@ CONFIG_USB_ULPI=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Xilinx"
-CONFIG_G_DNL_VENDOR_NUM=0x03FD
-CONFIG_G_DNL_PRODUCT_NUM=0x0300
+CONFIG_USB_GADGET_MANUFACTURER="Xilinx"
+CONFIG_USB_GADGET_VENDOR_NUM=0x03FD
+CONFIG_USB_GADGET_PRODUCT_NUM=0x0300
CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
diff --git a/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig
index ae248f51bc26..cb867010e261 100644
--- a/configs/zynq_microzed_defconfig
+++ b/configs/zynq_microzed_defconfig
@@ -53,8 +53,8 @@ CONFIG_USB_ULPI_VIEWPORT=y
CONFIG_USB_ULPI=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Xilinx"
+CONFIG_USB_GADGET_VENDOR_NUM=0x03FD
+CONFIG_USB_GADGET_PRODUCT_NUM=0x0300
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Xilinx"
-CONFIG_G_DNL_VENDOR_NUM=0x03FD
-CONFIG_G_DNL_PRODUCT_NUM=0x0300
diff --git a/configs/zynq_picozed_defconfig b/configs/zynq_picozed_defconfig
index 0afdd1147a90..39d76ba96553 100644
--- a/configs/zynq_picozed_defconfig
+++ b/configs/zynq_picozed_defconfig
@@ -42,8 +42,8 @@ CONFIG_USB_ULPI_VIEWPORT=y
CONFIG_USB_ULPI=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Xilinx"
+CONFIG_USB_GADGET_VENDOR_NUM=0x03fd
+CONFIG_USB_GADGET_PRODUCT_NUM=0x0300
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Xilinx"
-CONFIG_G_DNL_VENDOR_NUM=0x03fd
-CONFIG_G_DNL_PRODUCT_NUM=0x0300
diff --git a/configs/zynq_z_turn_defconfig b/configs/zynq_z_turn_defconfig
index 3684b8531fa9..d21a8faa0f64 100644
--- a/configs/zynq_z_turn_defconfig
+++ b/configs/zynq_z_turn_defconfig
@@ -52,8 +52,8 @@ CONFIG_USB_ULPI_VIEWPORT=y
CONFIG_USB_ULPI=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Xilinx"
+CONFIG_USB_GADGET_VENDOR_NUM=0x03FD
+CONFIG_USB_GADGET_PRODUCT_NUM=0x0300
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Xilinx"
-CONFIG_G_DNL_VENDOR_NUM=0x03FD
-CONFIG_G_DNL_PRODUCT_NUM=0x0300
diff --git a/configs/zynq_zc702_defconfig b/configs/zynq_zc702_defconfig
index 21852e55b6d4..a574a8991737 100644
--- a/configs/zynq_zc702_defconfig
+++ b/configs/zynq_zc702_defconfig
@@ -60,8 +60,8 @@ CONFIG_USB_ULPI_VIEWPORT=y
CONFIG_USB_ULPI=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Xilinx"
+CONFIG_USB_GADGET_VENDOR_NUM=0x03fd
+CONFIG_USB_GADGET_PRODUCT_NUM=0x0300
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Xilinx"
-CONFIG_G_DNL_VENDOR_NUM=0x03fd
-CONFIG_G_DNL_PRODUCT_NUM=0x0300
diff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig
index dfafc9a9f6d5..d9718b06de2e 100644
--- a/configs/zynq_zc706_defconfig
+++ b/configs/zynq_zc706_defconfig
@@ -56,8 +56,8 @@ CONFIG_USB_ULPI_VIEWPORT=y
CONFIG_USB_ULPI=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Xilinx"
+CONFIG_USB_GADGET_VENDOR_NUM=0x03fd
+CONFIG_USB_GADGET_PRODUCT_NUM=0x0300
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Xilinx"
-CONFIG_G_DNL_VENDOR_NUM=0x03fd
-CONFIG_G_DNL_PRODUCT_NUM=0x0300
diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig
index bb512aff09d1..3a18c4aeb3a8 100644
--- a/configs/zynq_zed_defconfig
+++ b/configs/zynq_zed_defconfig
@@ -53,8 +53,8 @@ CONFIG_USB_ULPI_VIEWPORT=y
CONFIG_USB_ULPI=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Xilinx"
+CONFIG_USB_GADGET_VENDOR_NUM=0x03fd
+CONFIG_USB_GADGET_PRODUCT_NUM=0x0300
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Xilinx"
-CONFIG_G_DNL_VENDOR_NUM=0x03fd
-CONFIG_G_DNL_PRODUCT_NUM=0x0300
diff --git a/configs/zynq_zybo_defconfig b/configs/zynq_zybo_defconfig
index fd31b4dc14f0..9edde2ace32c 100644
--- a/configs/zynq_zybo_defconfig
+++ b/configs/zynq_zybo_defconfig
@@ -58,8 +58,8 @@ CONFIG_USB_ULPI_VIEWPORT=y
CONFIG_USB_ULPI=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Xilinx"
+CONFIG_USB_GADGET_VENDOR_NUM=0x03fd
+CONFIG_USB_GADGET_PRODUCT_NUM=0x0300
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Xilinx"
-CONFIG_G_DNL_VENDOR_NUM=0x03fd
-CONFIG_G_DNL_PRODUCT_NUM=0x0300
diff --git a/doc/README.android-fastboot b/doc/README.android-fastboot
index b8afa1576244..2c3ee7810a4f 100644
--- a/doc/README.android-fastboot
+++ b/doc/README.android-fastboot
@@ -34,11 +34,11 @@ The fastboot gadget relies on the USB download gadget, so the following
options must be configured:
CONFIG_USB_GADGET_DOWNLOAD
-CONFIG_G_DNL_VENDOR_NUM
-CONFIG_G_DNL_PRODUCT_NUM
-CONFIG_G_DNL_MANUFACTURER
+CONFIG_USB_GADGET_VENDOR_NUM
+CONFIG_USB_GADGET_PRODUCT_NUM
+CONFIG_USB_GADGET_MANUFACTURER
-NOTE: The CONFIG_G_DNL_VENDOR_NUM must be one of the numbers supported by
+NOTE: The CONFIG_USB_GADGET_VENDOR_NUM must be one of the numbers supported by
the fastboot client. The list of vendor IDs supported can be found in the
fastboot client source code (fastboot.c) mentioned above.
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index 1201276be837..7bbfde26d0be 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -36,6 +36,22 @@ menuconfig USB_GADGET
if USB_GADGET
+config USB_GADGET_MANUFACTURER
+ string "Vendor name of the USB device"
+ help
+ Vendor name of the USB device emulated, reported to the host device.
+ This is usually either the manufacturer of the device or the SoC.
+
+config USB_GADGET_VENDOR_NUM
+ hex "Vendor ID of the USB device"
+ Vendor ID of the USB device emulated, reported to the host device.
+ This is usually the board or SoC vendor's, unless you've registered
+ for one.
+
+config USB_GADGET_PRODUCT_NUM
+ hex "Product ID of the USB device"
+ Product ID of the USB device emulated, reported to the host device.
+
config USB_GADGET_ATMEL_USBA
bool "Atmel USBA"
select USB_GADGET_DUALSPEED
@@ -110,15 +126,6 @@ config USB_FUNCTION_SDP
allows to download images into memory and execute (jump to) them
using the same protocol as implemented by the i.MX family's boot ROM.
-config G_DNL_MANUFACTURER
- string "Vendor name of USB device"
-
-config G_DNL_VENDOR_NUM
- hex "Vendor ID of USB device"
-
-config G_DNL_PRODUCT_NUM
- hex "Product ID of USB device"
-
endif # USB_GADGET_DOWNLOAD
config USB_ETHER
diff --git a/drivers/usb/gadget/g_dnl.c b/drivers/usb/gadget/g_dnl.c
index 039331a5afd9..99d500a6af4e 100644
--- a/drivers/usb/gadget/g_dnl.c
+++ b/drivers/usb/gadget/g_dnl.c
@@ -26,9 +26,9 @@
/*
* One needs to define the following:
- * CONFIG_G_DNL_VENDOR_NUM
- * CONFIG_G_DNL_PRODUCT_NUM
- * CONFIG_G_DNL_MANUFACTURER
+ * CONFIG_USB_GADGET_VENDOR_NUM
+ * CONFIG_USB_GADGET_PRODUCT_NUM
+ * CONFIG_USB_GADGET_MANUFACTURER
* at e.g. ./configs/<board>_defconfig
*/
@@ -46,7 +46,7 @@
static const char product[] = "USB download gadget";
static char g_dnl_serial[MAX_STRING_SERIAL];
-static const char manufacturer[] = CONFIG_G_DNL_MANUFACTURER;
+static const char manufacturer[] = CONFIG_USB_GADGET_MANUFACTURER;
void g_dnl_set_serialnumber(char *s)
{
@@ -62,8 +62,8 @@ static struct usb_device_descriptor device_desc = {
.bDeviceClass = USB_CLASS_PER_INTERFACE,
.bDeviceSubClass = 0, /*0x02:CDC-modem , 0x00:CDC-serial*/
- .idVendor = __constant_cpu_to_le16(CONFIG_G_DNL_VENDOR_NUM),
- .idProduct = __constant_cpu_to_le16(CONFIG_G_DNL_PRODUCT_NUM),
+ .idVendor = __constant_cpu_to_le16(CONFIG_USB_GADGET_VENDOR_NUM),
+ .idProduct = __constant_cpu_to_le16(CONFIG_USB_GADGET_PRODUCT_NUM),
/* .iProduct = DYNAMIC */
/* .iSerialNumber = DYNAMIC */
.bNumConfigurations = 1,
diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h
index b84f6e3480cb..6e76729ef41c 100644
--- a/include/configs/am43xx_evm.h
+++ b/include/configs/am43xx_evm.h
@@ -89,9 +89,9 @@
#undef CONFIG_USB_GADGET_DOWNLOAD
#undef CONFIG_USB_GADGET_VBUS_DRAW
-#undef CONFIG_G_DNL_MANUFACTURER
-#undef CONFIG_G_DNL_VENDOR_NUM
-#undef CONFIG_G_DNL_PRODUCT_NUM
+#undef CONFIG_USB_GADGET_MANUFACTURER
+#undef CONFIG_USB_GADGET_VENDOR_NUM
+#undef CONFIG_USB_GADGET_PRODUCT_NUM
#undef CONFIG_USB_GADGET_DUALSPEED
#endif
diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h
index 8bc7fbde9e36..13a45010bf5b 100644
--- a/include/configs/odroid_xu3.h
+++ b/include/configs/odroid_xu3.h
@@ -45,7 +45,7 @@
#define DFU_MANIFEST_POLL_TIMEOUT 25000
/* THOR */
-#define CONFIG_G_DNL_THOR_VENDOR_NUM CONFIG_G_DNL_VENDOR_NUM
+#define CONFIG_G_DNL_THOR_VENDOR_NUM CONFIG_USB_GADGET_VENDOR_NUM
#define CONFIG_G_DNL_THOR_PRODUCT_NUM 0x685D
#define CONFIG_USB_FUNCTION_THOR
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 35+ messages in thread
* [U-Boot] [PATCH v2 07/14] usb: gadget: usb_ether: Move settings to common
2017-09-12 19:01 [U-Boot] [PATCH v2 00/14] sunxi: convert musb to the device model and enable usb_ether Maxime Ripard
` (5 preceding siblings ...)
2017-09-12 19:01 ` [U-Boot] [PATCH v2 06/14] usb: gadget: Make g_dnl USB settings common Maxime Ripard
@ 2017-09-12 19:01 ` Maxime Ripard
2017-09-12 19:01 ` [U-Boot] [PATCH v2 08/14] sunxi: provide default USB gadget setup Maxime Ripard
` (7 subsequent siblings)
14 siblings, 0 replies; 35+ messages in thread
From: Maxime Ripard @ 2017-09-12 19:01 UTC (permalink / raw)
To: u-boot
The usb_ether gadget duplicates the USB settings for the manufacturer,
product ID and vendor ID.
Make sure we use the common option so that we can expect a single VID/PID
couple for a single device.
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Lukasz Majewski <lukma@denx.de>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
configs/sama5d2_ptc_nandflash_defconfig | 1 +
configs/sama5d2_ptc_spiflash_defconfig | 1 +
configs/vinco_defconfig | 1 +
drivers/usb/gadget/Kconfig | 2 ++
drivers/usb/gadget/ether.c | 16 ++++++++--------
include/configs/ma5d4evk.h | 1 -
include/configs/sama5d2_ptc.h | 1 -
include/configs/vinco.h | 1 -
scripts/config_whitelist.txt | 1 -
9 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/configs/sama5d2_ptc_nandflash_defconfig b/configs/sama5d2_ptc_nandflash_defconfig
index 6672a5ce11f7..431056a50a8b 100644
--- a/configs/sama5d2_ptc_nandflash_defconfig
+++ b/configs/sama5d2_ptc_nandflash_defconfig
@@ -29,5 +29,6 @@ CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Atmel SAMA5D2_PTC"
CONFIG_USB_GADGET_ATMEL_USBA=y
CONFIG_USB_ETHER=y
diff --git a/configs/sama5d2_ptc_spiflash_defconfig b/configs/sama5d2_ptc_spiflash_defconfig
index 9a23a808f1b3..66bb671820a6 100644
--- a/configs/sama5d2_ptc_spiflash_defconfig
+++ b/configs/sama5d2_ptc_spiflash_defconfig
@@ -30,5 +30,6 @@ CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Atmel SAMA5D2_PTC"
CONFIG_USB_GADGET_ATMEL_USBA=y
CONFIG_USB_ETHER=y
diff --git a/configs/vinco_defconfig b/configs/vinco_defconfig
index 08aa8c52a254..57ca8f949077 100644
--- a/configs/vinco_defconfig
+++ b/configs/vinco_defconfig
@@ -31,6 +31,7 @@ CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="L+G VInCo"
CONFIG_USB_GADGET_ATMEL_USBA=y
CONFIG_USB_ETHER=y
CONFIG_USB_HOST_ETHER=y
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index 7bbfde26d0be..ef13bd2edb66 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -44,12 +44,14 @@ config USB_GADGET_MANUFACTURER
config USB_GADGET_VENDOR_NUM
hex "Vendor ID of the USB device"
+ help
Vendor ID of the USB device emulated, reported to the host device.
This is usually the board or SoC vendor's, unless you've registered
for one.
config USB_GADGET_PRODUCT_NUM
hex "Product ID of the USB device"
+ help
Product ID of the USB device emulated, reported to the host device.
config USB_GADGET_ATMEL_USBA
diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c
index 2cf5c8d31e25..dbb578258f96 100644
--- a/drivers/usb/gadget/ether.c
+++ b/drivers/usb/gadget/ether.c
@@ -273,8 +273,8 @@ static inline int BITRATE(struct usb_gadget *g)
* static ushort idProduct;
*/
-#if defined(CONFIG_USBNET_MANUFACTURER)
-static char *iManufacturer = CONFIG_USBNET_MANUFACTURER;
+#if defined(CONFIG_USB_GADGET_MANUFACTURER)
+static char *iManufacturer = CONFIG_USB_GADGET_MANUFACTURER;
#else
static char *iManufacturer = "U-Boot";
#endif
@@ -2073,11 +2073,11 @@ static int eth_bind(struct usb_gadget *gadget)
* to choose the right configuration otherwise.
*/
if (rndis) {
-#if defined(CONFIG_USB_RNDIS_VENDOR_ID) && defined(CONFIG_USB_RNDIS_PRODUCT_ID)
+#if defined(CONFIG_USB_GADGET_VENDOR_NUM) && defined(CONFIG_USB_GADGET_PRODUCT_NUM)
device_desc.idVendor =
- __constant_cpu_to_le16(CONFIG_USB_RNDIS_VENDOR_ID);
+ __constant_cpu_to_le16(CONFIG_USB_GADGET_VENDOR_NUM);
device_desc.idProduct =
- __constant_cpu_to_le16(CONFIG_USB_RNDIS_PRODUCT_ID);
+ __constant_cpu_to_le16(CONFIG_USB_GADGET_PRODUCT_NUM);
#else
device_desc.idVendor =
__constant_cpu_to_le16(RNDIS_VENDOR_NUM);
@@ -2092,9 +2092,9 @@ static int eth_bind(struct usb_gadget *gadget)
* supporting one submode of the "SAFE" variant of MDLM.)
*/
} else {
-#if defined(CONFIG_USB_CDC_VENDOR_ID) && defined(CONFIG_USB_CDC_PRODUCT_ID)
- device_desc.idVendor = cpu_to_le16(CONFIG_USB_CDC_VENDOR_ID);
- device_desc.idProduct = cpu_to_le16(CONFIG_USB_CDC_PRODUCT_ID);
+#if defined(CONFIG_USB_GADGET_VENDOR_NUM) && defined(CONFIG_USB_GADGET_PRODUCT_NUM)
+ device_desc.idVendor = cpu_to_le16(CONFIG_USB_GADGET_VENDOR_NUM);
+ device_desc.idProduct = cpu_to_le16(CONFIG_USB_GADGET_PRODUCT_NUM);
#else
if (!cdc) {
device_desc.idVendor =
diff --git a/include/configs/ma5d4evk.h b/include/configs/ma5d4evk.h
index 6d25d84c6eb6..3aeb7e6ef136 100644
--- a/include/configs/ma5d4evk.h
+++ b/include/configs/ma5d4evk.h
@@ -97,7 +97,6 @@
#ifdef CONFIG_CMD_USB
/* USB device */
-#define CONFIG_USBNET_MANUFACTURER "AriesEmbedded"
#define CONFIG_USB_FUNCTION_MASS_STORAGE
#define CONFIG_SYS_DFU_DATA_BUF_SIZE (1 * 1024 * 1024)
#define DFU_DEFAULT_POLL_TIMEOUT 300
diff --git a/include/configs/sama5d2_ptc.h b/include/configs/sama5d2_ptc.h
index 543592e3a574..2328c7614ed7 100644
--- a/include/configs/sama5d2_ptc.h
+++ b/include/configs/sama5d2_ptc.h
@@ -60,7 +60,6 @@
#endif
/* USB device */
-#define CONFIG_USBNET_MANUFACTURER "Atmel SAMA5D2_PTC"
/* Ethernet Hardware */
#define CONFIG_MACB
diff --git a/include/configs/vinco.h b/include/configs/vinco.h
index f5aaaa2ffe91..0a23b93f669e 100644
--- a/include/configs/vinco.h
+++ b/include/configs/vinco.h
@@ -64,7 +64,6 @@
#endif
/* USB device */
-#define CONFIG_USBNET_MANUFACTURER "L+G VInCo"
/* Ethernet Hardware */
#define CONFIG_PHY_SMSC
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index bbc3d4351bbd..5cb6ce6612d1 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -4983,7 +4983,6 @@ CONFIG_USBD_SERIAL_OUT_PKTSIZE
CONFIG_USBD_VENDORID
CONFIG_USBID_ADDR
CONFIG_USBNET_DEV_ADDR
-CONFIG_USBNET_MANUFACTURER
CONFIG_USBTTY
CONFIG_USB_AM35X
CONFIG_USB_ATMEL
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 35+ messages in thread
* [U-Boot] [PATCH v2 08/14] sunxi: provide default USB gadget setup
2017-09-12 19:01 [U-Boot] [PATCH v2 00/14] sunxi: convert musb to the device model and enable usb_ether Maxime Ripard
` (6 preceding siblings ...)
2017-09-12 19:01 ` [U-Boot] [PATCH v2 07/14] usb: gadget: usb_ether: Move settings to common Maxime Ripard
@ 2017-09-12 19:01 ` Maxime Ripard
2017-09-13 10:42 ` Łukasz Majewski
2017-09-12 19:01 ` [U-Boot] [PATCH v2 09/14] sunxi: imply USB_GADGET Maxime Ripard
` (6 subsequent siblings)
14 siblings, 1 reply; 35+ messages in thread
From: Maxime Ripard @ 2017-09-12 19:01 UTC (permalink / raw)
To: u-boot
All the Allwinner boards use the same manufacturer, VID and PID for the
gadgets. Make them the defaults to remove some boilerplate from our
defconfigs.
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
configs/A13-OLinuXino_defconfig | 3 ---
configs/A20-OLinuXino-Lime2-eMMC_defconfig | 3 ---
configs/A20-OLinuXino-Lime2_defconfig | 3 ---
configs/CHIP_defconfig | 3 ---
configs/CHIP_pro_defconfig | 3 ---
configs/Cubietruck_defconfig | 3 ---
configs/Nintendo_NES_Classic_Edition_defconfig | 3 ---
configs/Sinlinx_SinA33_defconfig | 3 ---
configs/parrot_r16_defconfig | 3 ---
drivers/usb/gadget/Kconfig | 3 +++
10 files changed, 3 insertions(+), 27 deletions(-)
diff --git a/configs/A13-OLinuXino_defconfig b/configs/A13-OLinuXino_defconfig
index 2574018d8213..ae790164dff7 100644
--- a/configs/A13-OLinuXino_defconfig
+++ b/configs/A13-OLinuXino_defconfig
@@ -32,7 +32,4 @@ CONFIG_USB_EHCI_HCD=y
CONFIG_USB_MUSB_GADGET=y
CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_MANUFACTURER="Allwinner Technology"
-CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a
-CONFIG_USB_GADGET_PRODUCT_NUM=0x1010
CONFIG_USB_GADGET_DOWNLOAD=y
diff --git a/configs/A20-OLinuXino-Lime2-eMMC_defconfig b/configs/A20-OLinuXino-Lime2-eMMC_defconfig
index 5663a824e71b..b136af66b71f 100644
--- a/configs/A20-OLinuXino-Lime2-eMMC_defconfig
+++ b/configs/A20-OLinuXino-Lime2-eMMC_defconfig
@@ -34,7 +34,4 @@ CONFIG_USB_EHCI_HCD=y
CONFIG_USB_MUSB_GADGET=y
CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_MANUFACTURER="Allwinner Technology"
-CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a
-CONFIG_USB_GADGET_PRODUCT_NUM=0x1010
CONFIG_USB_GADGET_DOWNLOAD=y
diff --git a/configs/A20-OLinuXino-Lime2_defconfig b/configs/A20-OLinuXino-Lime2_defconfig
index 63d013293690..ebb435f30956 100644
--- a/configs/A20-OLinuXino-Lime2_defconfig
+++ b/configs/A20-OLinuXino-Lime2_defconfig
@@ -33,7 +33,4 @@ CONFIG_USB_EHCI_HCD=y
CONFIG_USB_MUSB_GADGET=y
CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_MANUFACTURER="Allwinner Technology"
-CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a
-CONFIG_USB_GADGET_PRODUCT_NUM=0x1010
CONFIG_USB_GADGET_DOWNLOAD=y
diff --git a/configs/CHIP_defconfig b/configs/CHIP_defconfig
index 278039c05573..7d50d0533dcd 100644
--- a/configs/CHIP_defconfig
+++ b/configs/CHIP_defconfig
@@ -23,8 +23,5 @@ CONFIG_USB_EHCI_HCD=y
CONFIG_USB_MUSB_GADGET=y
CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_MANUFACTURER="Allwinner Technology"
-CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a
-CONFIG_USB_GADGET_PRODUCT_NUM=0x1010
CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_OF_LIBFDT_OVERLAY=y
diff --git a/configs/CHIP_pro_defconfig b/configs/CHIP_pro_defconfig
index edbdefc69ddf..76daf477ec87 100644
--- a/configs/CHIP_pro_defconfig
+++ b/configs/CHIP_pro_defconfig
@@ -28,8 +28,5 @@ CONFIG_USB_EHCI_HCD=y
CONFIG_USB_MUSB_GADGET=y
CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_MANUFACTURER="Allwinner Technology"
-CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a
-CONFIG_USB_GADGET_PRODUCT_NUM=0x1010
CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_OF_LIBFDT_OVERLAY=y
diff --git a/configs/Cubietruck_defconfig b/configs/Cubietruck_defconfig
index 2d1753645b0f..1b2989d364f6 100644
--- a/configs/Cubietruck_defconfig
+++ b/configs/Cubietruck_defconfig
@@ -33,7 +33,4 @@ CONFIG_USB_EHCI_HCD=y
CONFIG_USB_MUSB_GADGET=y
CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_MANUFACTURER="Allwinner Technology"
-CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a
-CONFIG_USB_GADGET_PRODUCT_NUM=0x1010
CONFIG_USB_GADGET_DOWNLOAD=y
diff --git a/configs/Nintendo_NES_Classic_Edition_defconfig b/configs/Nintendo_NES_Classic_Edition_defconfig
index 99f7d30f150d..5986764a14b9 100644
--- a/configs/Nintendo_NES_Classic_Edition_defconfig
+++ b/configs/Nintendo_NES_Classic_Edition_defconfig
@@ -23,7 +23,4 @@ CONFIG_AXP_ELDO2_VOLT=1800
CONFIG_USB_MUSB_GADGET=y
CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_MANUFACTURER="Allwinner Technology"
-CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a
-CONFIG_USB_GADGET_PRODUCT_NUM=0x1010
CONFIG_USB_GADGET_DOWNLOAD=y
diff --git a/configs/Sinlinx_SinA33_defconfig b/configs/Sinlinx_SinA33_defconfig
index 8c5fc7587909..9299aedd6019 100644
--- a/configs/Sinlinx_SinA33_defconfig
+++ b/configs/Sinlinx_SinA33_defconfig
@@ -28,7 +28,4 @@ CONFIG_USB_EHCI_HCD=y
CONFIG_USB_MUSB_GADGET=y
CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_MANUFACTURER="Allwinner Technology"
-CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a
-CONFIG_USB_GADGET_PRODUCT_NUM=0x1010
CONFIG_USB_GADGET_DOWNLOAD=y
diff --git a/configs/parrot_r16_defconfig b/configs/parrot_r16_defconfig
index 4b70fc5687eb..57db9587fe77 100644
--- a/configs/parrot_r16_defconfig
+++ b/configs/parrot_r16_defconfig
@@ -24,7 +24,4 @@ CONFIG_USB_EHCI_HCD=y
CONFIG_USB_MUSB_GADGET=y
CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_MANUFACTURER="Allwinner Technology"
-CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a
-CONFIG_USB_GADGET_PRODUCT_NUM=0x1010
CONFIG_USB_GADGET_DOWNLOAD=y
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index ef13bd2edb66..32b9a7e9fe49 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -38,12 +38,14 @@ if USB_GADGET
config USB_GADGET_MANUFACTURER
string "Vendor name of the USB device"
+ default "Allwinner Technology" if ARCH_SUNXI
help
Vendor name of the USB device emulated, reported to the host device.
This is usually either the manufacturer of the device or the SoC.
config USB_GADGET_VENDOR_NUM
hex "Vendor ID of the USB device"
+ default 0x1f3a if ARCH_SUNXI
help
Vendor ID of the USB device emulated, reported to the host device.
This is usually the board or SoC vendor's, unless you've registered
@@ -51,6 +53,7 @@ config USB_GADGET_VENDOR_NUM
config USB_GADGET_PRODUCT_NUM
hex "Product ID of the USB device"
+ default 0x1010 if ARCH_SUNXI
help
Product ID of the USB device emulated, reported to the host device.
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 35+ messages in thread
* [U-Boot] [PATCH v2 09/14] sunxi: imply USB_GADGET
2017-09-12 19:01 [U-Boot] [PATCH v2 00/14] sunxi: convert musb to the device model and enable usb_ether Maxime Ripard
` (7 preceding siblings ...)
2017-09-12 19:01 ` [U-Boot] [PATCH v2 08/14] sunxi: provide default USB gadget setup Maxime Ripard
@ 2017-09-12 19:01 ` Maxime Ripard
2017-09-13 10:42 ` Łukasz Majewski
2017-09-22 3:20 ` Chen-Yu Tsai
2017-09-12 19:01 ` [U-Boot] [PATCH v2 10/14] cmd: fastboot: Rework fastboot dependency Maxime Ripard
` (5 subsequent siblings)
14 siblings, 2 replies; 35+ messages in thread
From: Maxime Ripard @ 2017-09-12 19:01 UTC (permalink / raw)
To: u-boot
A good number of our boards have USB_GADGET enabled. Imply it so that all
the boards can benefit from it, and remove some boilerplate from our
defconfigs.
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
arch/arm/Kconfig | 1 +
configs/A13-OLinuXino_defconfig | 1 -
configs/A20-OLinuXino-Lime2-eMMC_defconfig | 1 -
configs/A20-OLinuXino-Lime2_defconfig | 1 -
configs/CHIP_defconfig | 1 -
configs/CHIP_pro_defconfig | 1 -
configs/Cubietruck_defconfig | 1 -
configs/Nintendo_NES_Classic_Edition_defconfig | 1 -
configs/Sinlinx_SinA33_defconfig | 1 -
configs/parrot_r16_defconfig | 1 -
10 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 53eae8953e0b..1eb59c591a54 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -705,6 +705,7 @@ config ARCH_SUNXI
imply SPL_POWER_SUPPORT
imply SPL_SERIAL_SUPPORT
imply USB_FUNCTION_FASTBOOT
+ imply USB_GADGET
config TARGET_TS4600
bool "Support TS4600"
diff --git a/configs/A13-OLinuXino_defconfig b/configs/A13-OLinuXino_defconfig
index ae790164dff7..e55dbff44d36 100644
--- a/configs/A13-OLinuXino_defconfig
+++ b/configs/A13-OLinuXino_defconfig
@@ -31,5 +31,4 @@ CONFIG_AXP_ALDO3_VOLT=3300
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_MUSB_GADGET=y
CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
-CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_DOWNLOAD=y
diff --git a/configs/A20-OLinuXino-Lime2-eMMC_defconfig b/configs/A20-OLinuXino-Lime2-eMMC_defconfig
index b136af66b71f..9491708d80c6 100644
--- a/configs/A20-OLinuXino-Lime2-eMMC_defconfig
+++ b/configs/A20-OLinuXino-Lime2-eMMC_defconfig
@@ -33,5 +33,4 @@ CONFIG_SCSI=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_MUSB_GADGET=y
CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
-CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_DOWNLOAD=y
diff --git a/configs/A20-OLinuXino-Lime2_defconfig b/configs/A20-OLinuXino-Lime2_defconfig
index ebb435f30956..2bb8ee8c9ebd 100644
--- a/configs/A20-OLinuXino-Lime2_defconfig
+++ b/configs/A20-OLinuXino-Lime2_defconfig
@@ -32,5 +32,4 @@ CONFIG_SCSI=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_MUSB_GADGET=y
CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
-CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_DOWNLOAD=y
diff --git a/configs/CHIP_defconfig b/configs/CHIP_defconfig
index 7d50d0533dcd..b9f70d240c3c 100644
--- a/configs/CHIP_defconfig
+++ b/configs/CHIP_defconfig
@@ -22,6 +22,5 @@ CONFIG_AXP_ALDO4_VOLT=3300
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_MUSB_GADGET=y
CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
-CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_OF_LIBFDT_OVERLAY=y
diff --git a/configs/CHIP_pro_defconfig b/configs/CHIP_pro_defconfig
index 76daf477ec87..74f6eb10fc01 100644
--- a/configs/CHIP_pro_defconfig
+++ b/configs/CHIP_pro_defconfig
@@ -27,6 +27,5 @@ CONFIG_AXP_ALDO4_VOLT=3300
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_MUSB_GADGET=y
CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
-CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_OF_LIBFDT_OVERLAY=y
diff --git a/configs/Cubietruck_defconfig b/configs/Cubietruck_defconfig
index 1b2989d364f6..458e2a9d8b04 100644
--- a/configs/Cubietruck_defconfig
+++ b/configs/Cubietruck_defconfig
@@ -32,5 +32,4 @@ CONFIG_SCSI=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_MUSB_GADGET=y
CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
-CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_DOWNLOAD=y
diff --git a/configs/Nintendo_NES_Classic_Edition_defconfig b/configs/Nintendo_NES_Classic_Edition_defconfig
index 5986764a14b9..e031dd8f5d5f 100644
--- a/configs/Nintendo_NES_Classic_Edition_defconfig
+++ b/configs/Nintendo_NES_Classic_Edition_defconfig
@@ -22,5 +22,4 @@ CONFIG_AXP_DLDO1_VOLT=3300
CONFIG_AXP_ELDO2_VOLT=1800
CONFIG_USB_MUSB_GADGET=y
CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
-CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_DOWNLOAD=y
diff --git a/configs/Sinlinx_SinA33_defconfig b/configs/Sinlinx_SinA33_defconfig
index 9299aedd6019..143a9b4b6c10 100644
--- a/configs/Sinlinx_SinA33_defconfig
+++ b/configs/Sinlinx_SinA33_defconfig
@@ -27,5 +27,4 @@ CONFIG_DFU_RAM=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_MUSB_GADGET=y
CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
-CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_DOWNLOAD=y
diff --git a/configs/parrot_r16_defconfig b/configs/parrot_r16_defconfig
index 57db9587fe77..b36b9efec650 100644
--- a/configs/parrot_r16_defconfig
+++ b/configs/parrot_r16_defconfig
@@ -23,5 +23,4 @@ CONFIG_FASTBOOT_FLASH_MMC_DEV=0
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_MUSB_GADGET=y
CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
-CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_DOWNLOAD=y
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 35+ messages in thread
* [U-Boot] [PATCH v2 10/14] cmd: fastboot: Rework fastboot dependency
2017-09-12 19:01 [U-Boot] [PATCH v2 00/14] sunxi: convert musb to the device model and enable usb_ether Maxime Ripard
` (8 preceding siblings ...)
2017-09-12 19:01 ` [U-Boot] [PATCH v2 09/14] sunxi: imply USB_GADGET Maxime Ripard
@ 2017-09-12 19:01 ` Maxime Ripard
2017-09-13 10:43 ` Łukasz Majewski
2017-09-12 19:01 ` [U-Boot] [PATCH v2 11/14] musb: sunxi: switch to the device model Maxime Ripard
` (4 subsequent siblings)
14 siblings, 1 reply; 35+ messages in thread
From: Maxime Ripard @ 2017-09-12 19:01 UTC (permalink / raw)
To: u-boot
Fastboot need a bunch of options to be operating properly, such as the
g_dnl gadget, the fastboot command, and some options that make sense. Since
fastboot is now part of Kconfig, make sure we have them right.
That will also reduce the boilerplate in the defconfigs.
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
arch/arm/Kconfig | 2 --
cmd/fastboot/Kconfig | 4 ++++
configs/A13-OLinuXino_defconfig | 1 -
configs/A20-OLinuXino-Lime2-eMMC_defconfig | 1 -
configs/A20-OLinuXino-Lime2_defconfig | 1 -
configs/CHIP_defconfig | 1 -
configs/CHIP_pro_defconfig | 1 -
configs/Cubietruck_defconfig | 1 -
configs/Nintendo_NES_Classic_Edition_defconfig | 1 -
configs/Sinlinx_SinA33_defconfig | 1 -
configs/am335x_boneblack_defconfig | 2 --
configs/am335x_boneblack_vboot_defconfig | 2 --
configs/am335x_evm_defconfig | 2 --
configs/am335x_evm_nor_defconfig | 2 --
configs/am335x_evm_norboot_defconfig | 2 --
configs/am335x_evm_spiboot_defconfig | 2 --
configs/am335x_evm_usbspl_defconfig | 2 --
configs/am57xx_evm_defconfig | 2 --
configs/am57xx_evm_nodt_defconfig | 3 ---
configs/am57xx_hs_evm_defconfig | 2 --
configs/bcm23550_w1d_defconfig | 3 ---
configs/bcm28155_ap_defconfig | 3 ---
configs/birdland_bav335a_defconfig | 3 ---
configs/birdland_bav335b_defconfig | 3 ---
configs/cgtqmx6eval_defconfig | 3 ---
configs/chromebit_mickey_defconfig | 1 -
configs/chromebook_jerry_defconfig | 1 -
configs/chromebook_minnie_defconfig | 1 -
configs/dra7xx_evm_defconfig | 2 --
configs/dra7xx_hs_evm_defconfig | 2 --
configs/evb-rk3036_defconfig | 1 -
configs/evb-rk3229_defconfig | 1 -
configs/evb-rk3288_defconfig | 1 -
configs/fennec-rk3288_defconfig | 1 -
configs/firefly-rk3288_defconfig | 1 -
configs/kc1_defconfig | 3 ---
configs/kylin-rk3036_defconfig | 1 -
configs/miqi-rk3288_defconfig | 1 -
configs/mx6qsabrelite_defconfig | 3 ---
configs/nitrogen6dl2g_defconfig | 3 ---
configs/nitrogen6dl_defconfig | 3 ---
configs/nitrogen6q2g_defconfig | 3 ---
configs/nitrogen6q_defconfig | 3 ---
configs/nitrogen6s1g_defconfig | 3 ---
configs/nitrogen6s_defconfig | 3 ---
configs/omap3_beagle_defconfig | 3 ---
configs/omap3_logic_defconfig | 2 --
configs/parrot_r16_defconfig | 1 -
configs/phycore-rk3288_defconfig | 1 -
configs/popmetal-rk3288_defconfig | 1 -
configs/rock2_defconfig | 1 -
configs/sniper_defconfig | 3 ---
configs/tinker-rk3288_defconfig | 1 -
53 files changed, 4 insertions(+), 97 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 1eb59c591a54..519f42778a8d 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -693,7 +693,6 @@ config ARCH_SUNXI
select USB_STORAGE if DISTRO_DEFAULTS
select USB_KEYBOARD if DISTRO_DEFAULTS
select USE_TINY_PRINTF
- imply CMD_FASTBOOT
imply FASTBOOT
imply FAT_WRITE
imply PRE_CONSOLE_BUFFER
@@ -704,7 +703,6 @@ config ARCH_SUNXI
imply SPL_MMC_SUPPORT if MMC
imply SPL_POWER_SUPPORT
imply SPL_SERIAL_SUPPORT
- imply USB_FUNCTION_FASTBOOT
imply USB_GADGET
config TARGET_TS4600
diff --git a/cmd/fastboot/Kconfig b/cmd/fastboot/Kconfig
index fb0c5da94cdb..5c1186017206 100644
--- a/cmd/fastboot/Kconfig
+++ b/cmd/fastboot/Kconfig
@@ -8,6 +8,10 @@ if FASTBOOT
config USB_FUNCTION_FASTBOOT
bool "Enable USB fastboot gadget"
+ default y
+ select USB_GADGET_DOWNLOAD
+ imply ANDROID_BOOT_IMAGE
+ imply CMD_FASTBOOT
help
This enables the USB part of the fastboot gadget.
diff --git a/configs/A13-OLinuXino_defconfig b/configs/A13-OLinuXino_defconfig
index e55dbff44d36..ed8349000e22 100644
--- a/configs/A13-OLinuXino_defconfig
+++ b/configs/A13-OLinuXino_defconfig
@@ -31,4 +31,3 @@ CONFIG_AXP_ALDO3_VOLT=3300
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_MUSB_GADGET=y
CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
-CONFIG_USB_GADGET_DOWNLOAD=y
diff --git a/configs/A20-OLinuXino-Lime2-eMMC_defconfig b/configs/A20-OLinuXino-Lime2-eMMC_defconfig
index 9491708d80c6..a04037ebe7cc 100644
--- a/configs/A20-OLinuXino-Lime2-eMMC_defconfig
+++ b/configs/A20-OLinuXino-Lime2-eMMC_defconfig
@@ -33,4 +33,3 @@ CONFIG_SCSI=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_MUSB_GADGET=y
CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
-CONFIG_USB_GADGET_DOWNLOAD=y
diff --git a/configs/A20-OLinuXino-Lime2_defconfig b/configs/A20-OLinuXino-Lime2_defconfig
index 2bb8ee8c9ebd..f9388a005bcd 100644
--- a/configs/A20-OLinuXino-Lime2_defconfig
+++ b/configs/A20-OLinuXino-Lime2_defconfig
@@ -32,4 +32,3 @@ CONFIG_SCSI=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_MUSB_GADGET=y
CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
-CONFIG_USB_GADGET_DOWNLOAD=y
diff --git a/configs/CHIP_defconfig b/configs/CHIP_defconfig
index b9f70d240c3c..5acce42a60f9 100644
--- a/configs/CHIP_defconfig
+++ b/configs/CHIP_defconfig
@@ -22,5 +22,4 @@ CONFIG_AXP_ALDO4_VOLT=3300
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_MUSB_GADGET=y
CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
-CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_OF_LIBFDT_OVERLAY=y
diff --git a/configs/CHIP_pro_defconfig b/configs/CHIP_pro_defconfig
index 74f6eb10fc01..2303135449b2 100644
--- a/configs/CHIP_pro_defconfig
+++ b/configs/CHIP_pro_defconfig
@@ -27,5 +27,4 @@ CONFIG_AXP_ALDO4_VOLT=3300
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_MUSB_GADGET=y
CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
-CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_OF_LIBFDT_OVERLAY=y
diff --git a/configs/Cubietruck_defconfig b/configs/Cubietruck_defconfig
index 458e2a9d8b04..3dff02f342d7 100644
--- a/configs/Cubietruck_defconfig
+++ b/configs/Cubietruck_defconfig
@@ -32,4 +32,3 @@ CONFIG_SCSI=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_MUSB_GADGET=y
CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
-CONFIG_USB_GADGET_DOWNLOAD=y
diff --git a/configs/Nintendo_NES_Classic_Edition_defconfig b/configs/Nintendo_NES_Classic_Edition_defconfig
index e031dd8f5d5f..26fcffa02f10 100644
--- a/configs/Nintendo_NES_Classic_Edition_defconfig
+++ b/configs/Nintendo_NES_Classic_Edition_defconfig
@@ -22,4 +22,3 @@ CONFIG_AXP_DLDO1_VOLT=3300
CONFIG_AXP_ELDO2_VOLT=1800
CONFIG_USB_MUSB_GADGET=y
CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
-CONFIG_USB_GADGET_DOWNLOAD=y
diff --git a/configs/Sinlinx_SinA33_defconfig b/configs/Sinlinx_SinA33_defconfig
index 143a9b4b6c10..d726b404cc5e 100644
--- a/configs/Sinlinx_SinA33_defconfig
+++ b/configs/Sinlinx_SinA33_defconfig
@@ -27,4 +27,3 @@ CONFIG_DFU_RAM=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_MUSB_GADGET=y
CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
-CONFIG_USB_GADGET_DOWNLOAD=y
diff --git a/configs/am335x_boneblack_defconfig b/configs/am335x_boneblack_defconfig
index 85f220329e4e..e17329bc4fda 100644
--- a/configs/am335x_boneblack_defconfig
+++ b/configs/am335x_boneblack_defconfig
@@ -18,7 +18,6 @@ CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
CONFIG_AUTOBOOT_DELAY_STR="d"
CONFIG_AUTOBOOT_STOP_STR=" "
CONFIG_FASTBOOT=y
-CONFIG_USB_FUNCTION_FASTBOOT=y
# CONFIG_CMD_IMLS is not set
CONFIG_CMD_SPL=y
# CONFIG_CMD_FLASH is not set
@@ -41,7 +40,6 @@ CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
CONFIG_USB_GADGET_VENDOR_NUM=0x0451
CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
-CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_USB_ETHER=y
CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00"
CONFIG_LZO=y
diff --git a/configs/am335x_boneblack_vboot_defconfig b/configs/am335x_boneblack_vboot_defconfig
index 9ba3f7c04d73..4669a68d1471 100644
--- a/configs/am335x_boneblack_vboot_defconfig
+++ b/configs/am335x_boneblack_vboot_defconfig
@@ -21,7 +21,6 @@ CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
CONFIG_AUTOBOOT_DELAY_STR="d"
CONFIG_AUTOBOOT_STOP_STR=" "
CONFIG_FASTBOOT=y
-CONFIG_USB_FUNCTION_FASTBOOT=y
# CONFIG_CMD_IMLS is not set
CONFIG_CMD_SPL=y
# CONFIG_CMD_FLASH is not set
@@ -51,6 +50,5 @@ CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
CONFIG_USB_GADGET_VENDOR_NUM=0x0451
CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
-CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_USB_ETHER=y
CONFIG_LZO=y
diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig
index 8aa3c0de8824..e5363e78f07f 100644
--- a/configs/am335x_evm_defconfig
+++ b/configs/am335x_evm_defconfig
@@ -15,7 +15,6 @@ CONFIG_SPL_MTD_SUPPORT=y
CONFIG_SPL_MUSB_NEW_SUPPORT=y
CONFIG_SPL_OS_BOOT=y
CONFIG_FASTBOOT=y
-CONFIG_USB_FUNCTION_FASTBOOT=y
# CONFIG_CMD_IMLS is not set
CONFIG_CMD_SPL=y
CONFIG_CMD_SPL_NAND_OFS=0x00080000
@@ -53,7 +52,6 @@ CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
CONFIG_USB_GADGET_VENDOR_NUM=0x0451
CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
-CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_USB_ETHER=y
CONFIG_RSA=y
CONFIG_LZO=y
diff --git a/configs/am335x_evm_nor_defconfig b/configs/am335x_evm_nor_defconfig
index b745f2997334..9d226bc8919f 100644
--- a/configs/am335x_evm_nor_defconfig
+++ b/configs/am335x_evm_nor_defconfig
@@ -14,7 +14,6 @@ CONFIG_SPL_MTD_SUPPORT=y
CONFIG_SPL_MUSB_NEW_SUPPORT=y
CONFIG_SPL_OS_BOOT=y
CONFIG_FASTBOOT=y
-CONFIG_USB_FUNCTION_FASTBOOT=y
# CONFIG_CMD_IMLS is not set
CONFIG_CMD_SPL=y
CONFIG_CMD_SPL_NAND_OFS=0x00080000
@@ -40,7 +39,6 @@ CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
CONFIG_USB_GADGET_VENDOR_NUM=0x0451
CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
-CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_USB_ETHER=y
CONFIG_LZO=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/am335x_evm_norboot_defconfig b/configs/am335x_evm_norboot_defconfig
index 9662b6684c1f..e786565c2a17 100644
--- a/configs/am335x_evm_norboot_defconfig
+++ b/configs/am335x_evm_norboot_defconfig
@@ -12,7 +12,6 @@ CONFIG_VERSION_VARIABLE=y
CONFIG_ARCH_MISC_INIT=y
CONFIG_BOARD_EARLY_INIT_F=y
CONFIG_FASTBOOT=y
-CONFIG_USB_FUNCTION_FASTBOOT=y
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_SETEXPR is not set
CONFIG_CMD_MTDPARTS=y
@@ -34,7 +33,6 @@ CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
CONFIG_USB_GADGET_VENDOR_NUM=0x0451
CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
-CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_USB_ETHER=y
CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00"
CONFIG_LZO=y
diff --git a/configs/am335x_evm_spiboot_defconfig b/configs/am335x_evm_spiboot_defconfig
index 5e2c19066daa..0ab48d9647c0 100644
--- a/configs/am335x_evm_spiboot_defconfig
+++ b/configs/am335x_evm_spiboot_defconfig
@@ -16,7 +16,6 @@ CONFIG_SPL=y
CONFIG_SPL_STACK_R=y
CONFIG_SPL_MUSB_NEW_SUPPORT=y
CONFIG_FASTBOOT=y
-CONFIG_USB_FUNCTION_FASTBOOT=y
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_SETEXPR is not set
@@ -38,7 +37,6 @@ CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
CONFIG_USB_GADGET_VENDOR_NUM=0x0451
CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
-CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_USB_ETHER=y
CONFIG_LZO=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/am335x_evm_usbspl_defconfig b/configs/am335x_evm_usbspl_defconfig
index d6c21b8e85ee..0674ab0570e8 100644
--- a/configs/am335x_evm_usbspl_defconfig
+++ b/configs/am335x_evm_usbspl_defconfig
@@ -18,7 +18,6 @@ CONFIG_SPL_USB_GADGET_SUPPORT=y
CONFIG_SPL_USBETH_SUPPORT=y
# CONFIG_SPL_YMODEM_SUPPORT is not set
CONFIG_FASTBOOT=y
-CONFIG_USB_FUNCTION_FASTBOOT=y
# CONFIG_CMD_IMLS is not set
CONFIG_CMD_SPL=y
CONFIG_CMD_SPL_NAND_OFS=0x00080000
@@ -44,7 +43,6 @@ CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
CONFIG_USB_GADGET_VENDOR_NUM=0x0451
CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
-CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_USB_ETHER=y
CONFIG_LZO=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/am57xx_evm_defconfig b/configs/am57xx_evm_defconfig
index a9ee2e448f3c..07afb9139a77 100644
--- a/configs/am57xx_evm_defconfig
+++ b/configs/am57xx_evm_defconfig
@@ -25,7 +25,6 @@ CONFIG_SPL_DMA_SUPPORT=y
CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y
CONFIG_FASTBOOT=y
-CONFIG_USB_FUNCTION_FASTBOOT=y
CONFIG_FASTBOOT_BUF_ADDR=0x82000000
CONFIG_FASTBOOT_BUF_SIZE=0x2F000000
CONFIG_FASTBOOT_USB_DEV=1
@@ -75,4 +74,3 @@ CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
CONFIG_USB_GADGET_VENDOR_NUM=0x0451
CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
-CONFIG_USB_GADGET_DOWNLOAD=y
diff --git a/configs/am57xx_evm_nodt_defconfig b/configs/am57xx_evm_nodt_defconfig
index ae7c3464e0cb..88b8bc104d08 100644
--- a/configs/am57xx_evm_nodt_defconfig
+++ b/configs/am57xx_evm_nodt_defconfig
@@ -15,8 +15,6 @@ CONFIG_SPL_DMA_SUPPORT=y
CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y
CONFIG_FASTBOOT=y
-CONFIG_USB_FUNCTION_FASTBOOT=y
-CONFIG_CMD_FASTBOOT=y
CONFIG_FASTBOOT_BUF_ADDR=0x82000000
CONFIG_FASTBOOT_BUF_SIZE=0x2F000000
CONFIG_FASTBOOT_USB_DEV=1
@@ -65,6 +63,5 @@ CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
CONFIG_USB_GADGET_VENDOR_NUM=0x0451
CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
-CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_FAT_WRITE=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/am57xx_hs_evm_defconfig b/configs/am57xx_hs_evm_defconfig
index 1047f33237ef..dd5e86212576 100644
--- a/configs/am57xx_hs_evm_defconfig
+++ b/configs/am57xx_hs_evm_defconfig
@@ -30,7 +30,6 @@ CONFIG_SPL_SEPARATE_BSS=y
CONFIG_SPL_DMA_SUPPORT=y
CONFIG_HUSH_PARSER=y
CONFIG_FASTBOOT=y
-CONFIG_USB_FUNCTION_FASTBOOT=y
CONFIG_FASTBOOT_BUF_ADDR=0x82000000
CONFIG_FASTBOOT_BUF_SIZE=0x2F000000
CONFIG_FASTBOOT_USB_DEV=1
@@ -78,4 +77,3 @@ CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
CONFIG_USB_GADGET_VENDOR_NUM=0x0451
CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
-CONFIG_USB_GADGET_DOWNLOAD=y
diff --git a/configs/bcm23550_w1d_defconfig b/configs/bcm23550_w1d_defconfig
index 49f7e40d15d9..f7af02f61323 100644
--- a/configs/bcm23550_w1d_defconfig
+++ b/configs/bcm23550_w1d_defconfig
@@ -7,8 +7,6 @@ CONFIG_VERSION_VARIABLE=y
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_HUSH_PARSER=y
CONFIG_FASTBOOT=y
-CONFIG_USB_FUNCTION_FASTBOOT=y
-CONFIG_CMD_FASTBOOT=y
CONFIG_FASTBOOT_BUF_ADDR=0x80000000
CONFIG_FASTBOOT_BUF_SIZE=0x1D000000
CONFIG_FASTBOOT_FLASH=y
@@ -40,5 +38,4 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0x0d02
CONFIG_USB_GADGET_BCM_UDC_OTG_PHY=y
CONFIG_USB_GADGET_DWC2_OTG=y
CONFIG_USB_GADGET_DWC2_OTG_PHY_BUS_WIDTH_8=y
-CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/bcm28155_ap_defconfig b/configs/bcm28155_ap_defconfig
index 9e17b60e54e4..2d24200096e3 100644
--- a/configs/bcm28155_ap_defconfig
+++ b/configs/bcm28155_ap_defconfig
@@ -8,8 +8,6 @@ CONFIG_VERSION_VARIABLE=y
CONFIG_HUSH_PARSER=y
# CONFIG_AUTOBOOT is not set
CONFIG_FASTBOOT=y
-CONFIG_USB_FUNCTION_FASTBOOT=y
-CONFIG_CMD_FASTBOOT=y
CONFIG_FASTBOOT_BUF_ADDR=0x80000000
CONFIG_FASTBOOT_BUF_SIZE=0x7FF00000
CONFIG_FASTBOOT_FLASH=y
@@ -41,5 +39,4 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0x0d02
CONFIG_USB_GADGET_BCM_UDC_OTG_PHY=y
CONFIG_USB_GADGET_DWC2_OTG=y
CONFIG_USB_GADGET_DWC2_OTG_PHY_BUS_WIDTH_8=y
-CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/birdland_bav335a_defconfig b/configs/birdland_bav335a_defconfig
index 41b77302155f..828bbd16e6ed 100644
--- a/configs/birdland_bav335a_defconfig
+++ b/configs/birdland_bav335a_defconfig
@@ -24,8 +24,6 @@ CONFIG_SPL_POWER_SUPPORT=y
CONFIG_SPL_YMODEM_SUPPORT=y
CONFIG_HUSH_PARSER=y
CONFIG_FASTBOOT=y
-CONFIG_USB_FUNCTION_FASTBOOT=y
-CONFIG_CMD_FASTBOOT=y
CONFIG_FASTBOOT_BUF_ADDR=0x82000000
CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set
@@ -69,7 +67,6 @@ CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
CONFIG_USB_GADGET_VENDOR_NUM=0x0451
CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
-CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_FAT_WRITE=y
CONFIG_LZO=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/birdland_bav335b_defconfig b/configs/birdland_bav335b_defconfig
index 6ecf8d035478..d851575ac619 100644
--- a/configs/birdland_bav335b_defconfig
+++ b/configs/birdland_bav335b_defconfig
@@ -24,8 +24,6 @@ CONFIG_SPL_POWER_SUPPORT=y
CONFIG_SPL_YMODEM_SUPPORT=y
CONFIG_HUSH_PARSER=y
CONFIG_FASTBOOT=y
-CONFIG_USB_FUNCTION_FASTBOOT=y
-CONFIG_CMD_FASTBOOT=y
CONFIG_FASTBOOT_BUF_ADDR=0x82000000
CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set
@@ -69,7 +67,6 @@ CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
CONFIG_USB_GADGET_VENDOR_NUM=0x0451
CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
-CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_FAT_WRITE=y
CONFIG_LZO=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/cgtqmx6eval_defconfig b/configs/cgtqmx6eval_defconfig
index b17c30fcd2f6..201a33138cf2 100644
--- a/configs/cgtqmx6eval_defconfig
+++ b/configs/cgtqmx6eval_defconfig
@@ -24,8 +24,6 @@ CONFIG_SPL_I2C_SUPPORT=y
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="CGT-QMX6-Quad U-Boot > "
CONFIG_FASTBOOT=y
-CONFIG_USB_FUNCTION_FASTBOOT=y
-CONFIG_CMD_FASTBOOT=y
CONFIG_FASTBOOT_BUF_ADDR=0x12000000
CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set
@@ -61,7 +59,6 @@ CONFIG_USB_GADGET_MANUFACTURER="Congatec"
CONFIG_USB_GADGET_VENDOR_NUM=0x0525
CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_CI_UDC=y
-CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y
# CONFIG_VIDEO_SW_CURSOR is not set
diff --git a/configs/chromebit_mickey_defconfig b/configs/chromebit_mickey_defconfig
index fccff80780bc..e061b2615255 100644
--- a/configs/chromebit_mickey_defconfig
+++ b/configs/chromebit_mickey_defconfig
@@ -79,7 +79,6 @@ CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
CONFIG_USB_GADGET_VENDOR_NUM=0x2207
CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
CONFIG_USB_GADGET_DWC2_OTG=y
-CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_DM_VIDEO=y
CONFIG_DISPLAY=y
CONFIG_VIDEO_ROCKCHIP=y
diff --git a/configs/chromebook_jerry_defconfig b/configs/chromebook_jerry_defconfig
index 18790b30898f..2f6b4e5e3d30 100644
--- a/configs/chromebook_jerry_defconfig
+++ b/configs/chromebook_jerry_defconfig
@@ -80,7 +80,6 @@ CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
CONFIG_USB_GADGET_VENDOR_NUM=0x2207
CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
CONFIG_USB_GADGET_DWC2_OTG=y
-CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_DM_VIDEO=y
CONFIG_DISPLAY=y
CONFIG_VIDEO_ROCKCHIP=y
diff --git a/configs/chromebook_minnie_defconfig b/configs/chromebook_minnie_defconfig
index fdb992d59252..3b76cb47fb4d 100644
--- a/configs/chromebook_minnie_defconfig
+++ b/configs/chromebook_minnie_defconfig
@@ -79,7 +79,6 @@ CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
CONFIG_USB_GADGET_VENDOR_NUM=0x2207
CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
CONFIG_USB_GADGET_DWC2_OTG=y
-CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_DM_VIDEO=y
CONFIG_DISPLAY=y
CONFIG_VIDEO_ROCKCHIP=y
diff --git a/configs/dra7xx_evm_defconfig b/configs/dra7xx_evm_defconfig
index 4aca3a4a043a..748948ec8156 100644
--- a/configs/dra7xx_evm_defconfig
+++ b/configs/dra7xx_evm_defconfig
@@ -25,7 +25,6 @@ CONFIG_SPL_DMA_SUPPORT=y
CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y
CONFIG_FASTBOOT=y
-CONFIG_USB_FUNCTION_FASTBOOT=y
CONFIG_FASTBOOT_BUF_ADDR=0x82000000
CONFIG_FASTBOOT_BUF_SIZE=0x2F000000
CONFIG_FASTBOOT_FLASH=y
@@ -93,4 +92,3 @@ CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
CONFIG_USB_GADGET_VENDOR_NUM=0x0451
CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
-CONFIG_USB_GADGET_DOWNLOAD=y
diff --git a/configs/dra7xx_hs_evm_defconfig b/configs/dra7xx_hs_evm_defconfig
index 4d126e09f6a6..d31653e9d1c5 100644
--- a/configs/dra7xx_hs_evm_defconfig
+++ b/configs/dra7xx_hs_evm_defconfig
@@ -30,7 +30,6 @@ CONFIG_SPL_SEPARATE_BSS=y
CONFIG_SPL_DMA_SUPPORT=y
CONFIG_HUSH_PARSER=y
CONFIG_FASTBOOT=y
-CONFIG_USB_FUNCTION_FASTBOOT=y
CONFIG_FASTBOOT_BUF_ADDR=0x82000000
CONFIG_FASTBOOT_BUF_SIZE=0x2F000000
CONFIG_FASTBOOT_FLASH=y
@@ -95,4 +94,3 @@ CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
CONFIG_USB_GADGET_VENDOR_NUM=0x0451
CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
-CONFIG_USB_GADGET_DOWNLOAD=y
diff --git a/configs/evb-rk3036_defconfig b/configs/evb-rk3036_defconfig
index 9cce3351f80b..f2c4d8c54303 100644
--- a/configs/evb-rk3036_defconfig
+++ b/configs/evb-rk3036_defconfig
@@ -48,7 +48,6 @@ CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
CONFIG_USB_GADGET_VENDOR_NUM=0x2207
CONFIG_USB_GADGET_PRODUCT_NUM=0x310a
CONFIG_USB_GADGET_DWC2_OTG=y
-CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_SPL_TINY_MEMSET=y
CONFIG_CMD_DHRYSTONE=y
CONFIG_ERRNO_STR=y
diff --git a/configs/evb-rk3229_defconfig b/configs/evb-rk3229_defconfig
index 61fdacaa1340..2bc9f4a9765b 100644
--- a/configs/evb-rk3229_defconfig
+++ b/configs/evb-rk3229_defconfig
@@ -48,5 +48,4 @@ CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
CONFIG_USB_GADGET_VENDOR_NUM=0x2207
CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
CONFIG_USB_GADGET_DWC2_OTG=y
-CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_ERRNO_STR=y
diff --git a/configs/evb-rk3288_defconfig b/configs/evb-rk3288_defconfig
index 0d91cdd53ff6..d8dadd7ea97e 100644
--- a/configs/evb-rk3288_defconfig
+++ b/configs/evb-rk3288_defconfig
@@ -70,7 +70,6 @@ CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
CONFIG_USB_GADGET_VENDOR_NUM=0x2207
CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
CONFIG_USB_GADGET_DWC2_OTG=y
-CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_DM_VIDEO=y
CONFIG_DISPLAY=y
CONFIG_VIDEO_ROCKCHIP=y
diff --git a/configs/fennec-rk3288_defconfig b/configs/fennec-rk3288_defconfig
index 51420e5b66db..adc3f7aa70a8 100644
--- a/configs/fennec-rk3288_defconfig
+++ b/configs/fennec-rk3288_defconfig
@@ -73,7 +73,6 @@ CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
CONFIG_USB_GADGET_VENDOR_NUM=0x2207
CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
CONFIG_USB_GADGET_DWC2_OTG=y
-CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y
CONFIG_USB_ETHER_SMSC95XX=y
diff --git a/configs/firefly-rk3288_defconfig b/configs/firefly-rk3288_defconfig
index eb42def73fc2..3e95f0fca2b3 100644
--- a/configs/firefly-rk3288_defconfig
+++ b/configs/firefly-rk3288_defconfig
@@ -79,7 +79,6 @@ CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
CONFIG_USB_GADGET_VENDOR_NUM=0x2207
CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
CONFIG_USB_GADGET_DWC2_OTG=y
-CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y
CONFIG_USB_ETHER_SMSC95XX=y
diff --git a/configs/kc1_defconfig b/configs/kc1_defconfig
index d27a7f5abbe0..87b3eec4623c 100644
--- a/configs/kc1_defconfig
+++ b/configs/kc1_defconfig
@@ -12,8 +12,6 @@ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION=2
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="kc1 # "
CONFIG_FASTBOOT=y
-CONFIG_USB_FUNCTION_FASTBOOT=y
-CONFIG_CMD_FASTBOOT=y
CONFIG_FASTBOOT_BUF_ADDR=0x82000000
CONFIG_FASTBOOT_BUF_SIZE=0x2000000
CONFIG_FASTBOOT_FLASH=y
@@ -45,5 +43,4 @@ CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
CONFIG_USB_GADGET_VENDOR_NUM=0x0451
CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
-CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/kylin-rk3036_defconfig b/configs/kylin-rk3036_defconfig
index 0904eb14d4fc..5adf5779c728 100644
--- a/configs/kylin-rk3036_defconfig
+++ b/configs/kylin-rk3036_defconfig
@@ -48,7 +48,6 @@ CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
CONFIG_USB_GADGET_VENDOR_NUM=0x2207
CONFIG_USB_GADGET_PRODUCT_NUM=0x310a
CONFIG_USB_GADGET_DWC2_OTG=y
-CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y
CONFIG_USB_ETHER_SMSC95XX=y
diff --git a/configs/miqi-rk3288_defconfig b/configs/miqi-rk3288_defconfig
index e607ecd7dd71..e5d1b759256a 100644
--- a/configs/miqi-rk3288_defconfig
+++ b/configs/miqi-rk3288_defconfig
@@ -73,7 +73,6 @@ CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
CONFIG_USB_GADGET_VENDOR_NUM=0x2207
CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
CONFIG_USB_GADGET_DWC2_OTG=y
-CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y
CONFIG_USB_ETHER_SMSC95XX=y
diff --git a/configs/mx6qsabrelite_defconfig b/configs/mx6qsabrelite_defconfig
index 92e0a578dfde..3dfe25ebb5c0 100644
--- a/configs/mx6qsabrelite_defconfig
+++ b/configs/mx6qsabrelite_defconfig
@@ -10,8 +10,6 @@ CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_BOARD_EARLY_INIT_F=y
CONFIG_HUSH_PARSER=y
CONFIG_FASTBOOT=y
-CONFIG_USB_FUNCTION_FASTBOOT=y
-CONFIG_CMD_FASTBOOT=y
CONFIG_FASTBOOT_BUF_ADDR=0x12000000
CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set
@@ -53,7 +51,6 @@ CONFIG_USB_GADGET_MANUFACTURER="Boundary"
CONFIG_USB_GADGET_VENDOR_NUM=0x0525
CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_CI_UDC=y
-CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_USB_ETHER=y
CONFIG_USB_ETH_CDC=y
# CONFIG_VIDEO_SW_CURSOR is not set
diff --git a/configs/nitrogen6dl2g_defconfig b/configs/nitrogen6dl2g_defconfig
index a5fdb48d2452..32c6eea54618 100644
--- a/configs/nitrogen6dl2g_defconfig
+++ b/configs/nitrogen6dl2g_defconfig
@@ -10,8 +10,6 @@ CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_BOARD_EARLY_INIT_F=y
CONFIG_HUSH_PARSER=y
CONFIG_FASTBOOT=y
-CONFIG_USB_FUNCTION_FASTBOOT=y
-CONFIG_CMD_FASTBOOT=y
CONFIG_FASTBOOT_BUF_ADDR=0x12000000
CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set
@@ -50,7 +48,6 @@ CONFIG_USB_GADGET_MANUFACTURER="Boundary"
CONFIG_USB_GADGET_VENDOR_NUM=0x0525
CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_CI_UDC=y
-CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_USB_ETHER=y
CONFIG_USB_ETH_CDC=y
# CONFIG_VIDEO_SW_CURSOR is not set
diff --git a/configs/nitrogen6dl_defconfig b/configs/nitrogen6dl_defconfig
index 1803bdba888e..8ce2515d3794 100644
--- a/configs/nitrogen6dl_defconfig
+++ b/configs/nitrogen6dl_defconfig
@@ -10,8 +10,6 @@ CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_BOARD_EARLY_INIT_F=y
CONFIG_HUSH_PARSER=y
CONFIG_FASTBOOT=y
-CONFIG_USB_FUNCTION_FASTBOOT=y
-CONFIG_CMD_FASTBOOT=y
CONFIG_FASTBOOT_BUF_ADDR=0x12000000
CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set
@@ -50,7 +48,6 @@ CONFIG_USB_GADGET_MANUFACTURER="Boundary"
CONFIG_USB_GADGET_VENDOR_NUM=0x0525
CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_CI_UDC=y
-CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_USB_ETHER=y
CONFIG_USB_ETH_CDC=y
# CONFIG_VIDEO_SW_CURSOR is not set
diff --git a/configs/nitrogen6q2g_defconfig b/configs/nitrogen6q2g_defconfig
index 3c9b44023f82..1c149b5edf99 100644
--- a/configs/nitrogen6q2g_defconfig
+++ b/configs/nitrogen6q2g_defconfig
@@ -10,8 +10,6 @@ CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_BOARD_EARLY_INIT_F=y
CONFIG_HUSH_PARSER=y
CONFIG_FASTBOOT=y
-CONFIG_USB_FUNCTION_FASTBOOT=y
-CONFIG_CMD_FASTBOOT=y
CONFIG_FASTBOOT_BUF_ADDR=0x12000000
CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set
@@ -51,7 +49,6 @@ CONFIG_USB_GADGET_MANUFACTURER="Boundary"
CONFIG_USB_GADGET_VENDOR_NUM=0x0525
CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_CI_UDC=y
-CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_USB_ETHER=y
CONFIG_USB_ETH_CDC=y
# CONFIG_VIDEO_SW_CURSOR is not set
diff --git a/configs/nitrogen6q_defconfig b/configs/nitrogen6q_defconfig
index 82b05febae40..29e59fd71ea0 100644
--- a/configs/nitrogen6q_defconfig
+++ b/configs/nitrogen6q_defconfig
@@ -10,8 +10,6 @@ CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_BOARD_EARLY_INIT_F=y
CONFIG_HUSH_PARSER=y
CONFIG_FASTBOOT=y
-CONFIG_USB_FUNCTION_FASTBOOT=y
-CONFIG_CMD_FASTBOOT=y
CONFIG_FASTBOOT_BUF_ADDR=0x12000000
CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set
@@ -51,7 +49,6 @@ CONFIG_USB_GADGET_MANUFACTURER="Boundary"
CONFIG_USB_GADGET_VENDOR_NUM=0x0525
CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_CI_UDC=y
-CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_USB_ETHER=y
CONFIG_USB_ETH_CDC=y
# CONFIG_VIDEO_SW_CURSOR is not set
diff --git a/configs/nitrogen6s1g_defconfig b/configs/nitrogen6s1g_defconfig
index 3e4c20357c16..a06d6e12e358 100644
--- a/configs/nitrogen6s1g_defconfig
+++ b/configs/nitrogen6s1g_defconfig
@@ -10,8 +10,6 @@ CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_BOARD_EARLY_INIT_F=y
CONFIG_HUSH_PARSER=y
CONFIG_FASTBOOT=y
-CONFIG_USB_FUNCTION_FASTBOOT=y
-CONFIG_CMD_FASTBOOT=y
CONFIG_FASTBOOT_BUF_ADDR=0x12000000
CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set
@@ -50,7 +48,6 @@ CONFIG_USB_GADGET_MANUFACTURER="Boundary"
CONFIG_USB_GADGET_VENDOR_NUM=0x0525
CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_CI_UDC=y
-CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_USB_ETHER=y
CONFIG_USB_ETH_CDC=y
# CONFIG_VIDEO_SW_CURSOR is not set
diff --git a/configs/nitrogen6s_defconfig b/configs/nitrogen6s_defconfig
index 107cbfc9bc55..a7a54bbb5e0f 100644
--- a/configs/nitrogen6s_defconfig
+++ b/configs/nitrogen6s_defconfig
@@ -10,8 +10,6 @@ CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_BOARD_EARLY_INIT_F=y
CONFIG_HUSH_PARSER=y
CONFIG_FASTBOOT=y
-CONFIG_USB_FUNCTION_FASTBOOT=y
-CONFIG_CMD_FASTBOOT=y
CONFIG_FASTBOOT_BUF_ADDR=0x12000000
CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set
@@ -50,7 +48,6 @@ CONFIG_USB_GADGET_MANUFACTURER="Boundary"
CONFIG_USB_GADGET_VENDOR_NUM=0x0525
CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_CI_UDC=y
-CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_USB_ETHER=y
CONFIG_USB_ETH_CDC=y
# CONFIG_VIDEO_SW_CURSOR is not set
diff --git a/configs/omap3_beagle_defconfig b/configs/omap3_beagle_defconfig
index 86967b07fb9c..024e35647304 100644
--- a/configs/omap3_beagle_defconfig
+++ b/configs/omap3_beagle_defconfig
@@ -9,8 +9,6 @@ CONFIG_SPL=y
CONFIG_SPL_MTD_SUPPORT=y
CONFIG_SPL_OS_BOOT=y
CONFIG_FASTBOOT=y
-CONFIG_USB_FUNCTION_FASTBOOT=y
-CONFIG_CMD_FASTBOOT=y
CONFIG_FASTBOOT_BUF_ADDR=0x82000000
# CONFIG_CMD_IMLS is not set
CONFIG_CMD_SPL=y
@@ -51,7 +49,6 @@ CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_MANUFACTURER="TI"
CONFIG_USB_GADGET_VENDOR_NUM=0x0451
CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
-CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_USB_ETHER=y
CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y
diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig
index b1693be7edd7..4380d6c84220 100644
--- a/configs/omap3_logic_defconfig
+++ b/configs/omap3_logic_defconfig
@@ -15,7 +15,6 @@ CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="OMAP Logic # "
CONFIG_FASTBOOT=y
-CONFIG_USB_FUNCTION_FASTBOOT=y
CONFIG_FASTBOOT_BUF_ADDR=0x82000000
# CONFIG_CMD_IMI is not set
# CONFIG_CMD_IMLS is not set
@@ -48,6 +47,5 @@ CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_MANUFACTURER="TI"
CONFIG_USB_GADGET_VENDOR_NUM=0x0451
CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
-CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_USB_ETHER=y
CONFIG_BCH=y
diff --git a/configs/parrot_r16_defconfig b/configs/parrot_r16_defconfig
index b36b9efec650..6be57e604e89 100644
--- a/configs/parrot_r16_defconfig
+++ b/configs/parrot_r16_defconfig
@@ -23,4 +23,3 @@ CONFIG_FASTBOOT_FLASH_MMC_DEV=0
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_MUSB_GADGET=y
CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
-CONFIG_USB_GADGET_DOWNLOAD=y
diff --git a/configs/phycore-rk3288_defconfig b/configs/phycore-rk3288_defconfig
index ba50ea9d8665..f9a53fc920d0 100644
--- a/configs/phycore-rk3288_defconfig
+++ b/configs/phycore-rk3288_defconfig
@@ -76,7 +76,6 @@ CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
CONFIG_USB_GADGET_VENDOR_NUM=0x2207
CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
CONFIG_USB_GADGET_DWC2_OTG=y
-CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y
CONFIG_USB_ETHER_SMSC95XX=y
diff --git a/configs/popmetal-rk3288_defconfig b/configs/popmetal-rk3288_defconfig
index a8d5cbf70940..5e592e6b918b 100644
--- a/configs/popmetal-rk3288_defconfig
+++ b/configs/popmetal-rk3288_defconfig
@@ -73,7 +73,6 @@ CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
CONFIG_USB_GADGET_VENDOR_NUM=0x2207
CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
CONFIG_USB_GADGET_DWC2_OTG=y
-CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y
CONFIG_USB_ETHER_SMSC95XX=y
diff --git a/configs/rock2_defconfig b/configs/rock2_defconfig
index d0ffdc7b0e70..be28c6640c1f 100644
--- a/configs/rock2_defconfig
+++ b/configs/rock2_defconfig
@@ -71,7 +71,6 @@ CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
CONFIG_USB_GADGET_VENDOR_NUM=0x2207
CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
CONFIG_USB_GADGET_DWC2_OTG=y
-CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_DM_VIDEO=y
CONFIG_DISPLAY=y
CONFIG_VIDEO_ROCKCHIP=y
diff --git a/configs/sniper_defconfig b/configs/sniper_defconfig
index 75371c47ce8e..21254a5ad32b 100644
--- a/configs/sniper_defconfig
+++ b/configs/sniper_defconfig
@@ -13,8 +13,6 @@ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION=2
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="sniper # "
CONFIG_FASTBOOT=y
-CONFIG_USB_FUNCTION_FASTBOOT=y
-CONFIG_CMD_FASTBOOT=y
CONFIG_FASTBOOT_BUF_ADDR=0x82000000
CONFIG_FASTBOOT_BUF_SIZE=0x2000000
CONFIG_FASTBOOT_FLASH=y
@@ -46,5 +44,4 @@ CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
CONFIG_USB_GADGET_VENDOR_NUM=0x0451
CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
-CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/tinker-rk3288_defconfig b/configs/tinker-rk3288_defconfig
index 84fcd8979f20..816fc0189c1d 100644
--- a/configs/tinker-rk3288_defconfig
+++ b/configs/tinker-rk3288_defconfig
@@ -76,7 +76,6 @@ CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
CONFIG_USB_GADGET_VENDOR_NUM=0x2207
CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
CONFIG_USB_GADGET_DWC2_OTG=y
-CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y
CONFIG_USB_ETHER_SMSC95XX=y
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 35+ messages in thread
* [U-Boot] [PATCH v2 11/14] musb: sunxi: switch to the device model
2017-09-12 19:01 [U-Boot] [PATCH v2 00/14] sunxi: convert musb to the device model and enable usb_ether Maxime Ripard
` (9 preceding siblings ...)
2017-09-12 19:01 ` [U-Boot] [PATCH v2 10/14] cmd: fastboot: Rework fastboot dependency Maxime Ripard
@ 2017-09-12 19:01 ` Maxime Ripard
2017-09-13 10:46 ` Łukasz Majewski
2017-09-12 19:01 ` [U-Boot] [PATCH v2 12/14] sunxi: Register usb_ether Maxime Ripard
` (3 subsequent siblings)
14 siblings, 1 reply; 35+ messages in thread
From: Maxime Ripard @ 2017-09-12 19:01 UTC (permalink / raw)
To: u-boot
The device model was implemented so far using a hook that needed to be
called from the board support, without DT support and only for the host.
Switch to probing both in peripheral and host mode through the DT.
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
arch/arm/include/asm/arch-sunxi/usb_phy.h | 7 +---
board/sunxi/board.c | 1 +-
drivers/usb/musb-new/sunxi.c | 56 +++++++++++-------------
3 files changed, 27 insertions(+), 37 deletions(-)
diff --git a/arch/arm/include/asm/arch-sunxi/usb_phy.h b/arch/arm/include/asm/arch-sunxi/usb_phy.h
index cef6c985bc8d..5a9cacb6f4a3 100644
--- a/arch/arm/include/asm/arch-sunxi/usb_phy.h
+++ b/arch/arm/include/asm/arch-sunxi/usb_phy.h
@@ -19,10 +19,3 @@ void sunxi_usb_phy_power_off(int index);
int sunxi_usb_phy_vbus_detect(int index);
int sunxi_usb_phy_id_detect(int index);
void sunxi_usb_phy_enable_squelch_detect(int index, int enable);
-
-/* Not really phy related, but we have to declare this somewhere ... */
-#if defined(CONFIG_USB_MUSB_HOST) || defined(CONFIG_USB_MUSB_GADGET)
-void sunxi_musb_board_init(void);
-#else
-#define sunxi_musb_board_init()
-#endif
diff --git a/board/sunxi/board.c b/board/sunxi/board.c
index 70e01437c4f4..f9224360d758 100644
--- a/board/sunxi/board.c
+++ b/board/sunxi/board.c
@@ -736,7 +736,6 @@ int misc_init_r(void)
if (ret)
return ret;
#endif
- sunxi_musb_board_init();
return 0;
}
diff --git a/drivers/usb/musb-new/sunxi.c b/drivers/usb/musb-new/sunxi.c
index 5c1a902e42dc..7ee44ea91900 100644
--- a/drivers/usb/musb-new/sunxi.c
+++ b/drivers/usb/musb-new/sunxi.c
@@ -308,9 +308,6 @@ static struct musb_hdrc_platform_data musb_plat = {
.platform_ops = &sunxi_musb_ops,
};
-#ifdef CONFIG_USB_MUSB_HOST
-static int musb_usb_remove(struct udevice *dev);
-
static int musb_usb_probe(struct udevice *dev)
{
struct musb_host_data *host = dev_get_priv(dev);
@@ -319,16 +316,20 @@ static int musb_usb_probe(struct udevice *dev)
priv->desc_before_addr = true;
+#ifdef CONFIG_USB_MUSB_HOST
host->host = musb_init_controller(&musb_plat, NULL,
(void *)SUNXI_USB0_BASE);
if (!host->host)
return -EIO;
ret = musb_lowlevel_init(host);
- if (ret == 0)
- printf("MUSB OTG\n");
- else
- musb_usb_remove(dev);
+ if (!ret)
+ printf("Allwinner mUSB OTG (Host)\n");
+#else
+ ret = musb_register(&musb_plat, NULL, (void *)SUNXI_USB0_BASE);
+ if (!ret)
+ printf("Allwinner mUSB OTG (Peripheral)\n");
+#endif
return ret;
}
@@ -352,30 +353,27 @@ static int musb_usb_remove(struct udevice *dev)
return 0;
}
-U_BOOT_DRIVER(usb_musb) = {
- .name = "sunxi-musb",
- .id = UCLASS_USB,
- .probe = musb_usb_probe,
- .remove = musb_usb_remove,
- .ops = &musb_usb_ops,
- .platdata_auto_alloc_size = sizeof(struct usb_platdata),
- .priv_auto_alloc_size = sizeof(struct musb_host_data),
+static const struct udevice_id sunxi_musb_ids[] = {
+ { .compatible = "allwinner,sun4i-a10-musb" },
+ { .compatible = "allwinner,sun6i-a31-musb" },
+ { .compatible = "allwinner,sun8i-a33-musb" },
+ { .compatible = "allwinner,sun8i-h3-musb" },
+ { }
};
-#endif
-void sunxi_musb_board_init(void)
-{
+U_BOOT_DRIVER(usb_musb) = {
+ .name = "sunxi-musb",
#ifdef CONFIG_USB_MUSB_HOST
- struct udevice *dev;
-
- /*
- * Bind the driver directly for now as musb linux kernel support is
- * still pending upstream so our dts files do not have the necessary
- * nodes yet. TODO: Remove this as soon as the dts nodes are in place
- * and bind by compatible instead.
- */
- device_bind_driver(dm_root(), "sunxi-musb", "sunxi-musb", &dev);
+ .id = UCLASS_USB,
#else
- musb_register(&musb_plat, NULL, (void *)SUNXI_USB0_BASE);
+ .id = UCLASS_USB_DEV_GENERIC,
#endif
-}
+ .of_match = sunxi_musb_ids,
+ .probe = musb_usb_probe,
+ .remove = musb_usb_remove,
+#ifdef CONFIG_USB_MUSB_HOST
+ .ops = &musb_usb_ops,
+#endif
+ .platdata_auto_alloc_size = sizeof(struct usb_platdata),
+ .priv_auto_alloc_size = sizeof(struct musb_host_data),
+};
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 35+ messages in thread
* [U-Boot] [PATCH v2 12/14] sunxi: Register usb_ether
2017-09-12 19:01 [U-Boot] [PATCH v2 00/14] sunxi: convert musb to the device model and enable usb_ether Maxime Ripard
` (10 preceding siblings ...)
2017-09-12 19:01 ` [U-Boot] [PATCH v2 11/14] musb: sunxi: switch to the device model Maxime Ripard
@ 2017-09-12 19:01 ` Maxime Ripard
2017-09-13 10:46 ` Łukasz Majewski
2017-09-12 19:01 ` [U-Boot] [PATCH v2 13/14] sunxi: Imply USB_ETHER Maxime Ripard
` (2 subsequent siblings)
14 siblings, 1 reply; 35+ messages in thread
From: Maxime Ripard @ 2017-09-12 19:01 UTC (permalink / raw)
To: u-boot
Call the function to register the usb_ether gadget in the board.
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
board/sunxi/board.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/board/sunxi/board.c b/board/sunxi/board.c
index f9224360d758..610fa89056ef 100644
--- a/board/sunxi/board.c
+++ b/board/sunxi/board.c
@@ -737,6 +737,8 @@ int misc_init_r(void)
return ret;
#endif
+ usb_ether_init();
+
return 0;
}
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 35+ messages in thread
* [U-Boot] [PATCH v2 13/14] sunxi: Imply USB_ETHER
2017-09-12 19:01 [U-Boot] [PATCH v2 00/14] sunxi: convert musb to the device model and enable usb_ether Maxime Ripard
` (11 preceding siblings ...)
2017-09-12 19:01 ` [U-Boot] [PATCH v2 12/14] sunxi: Register usb_ether Maxime Ripard
@ 2017-09-12 19:01 ` Maxime Ripard
2017-09-13 10:49 ` Łukasz Majewski
2017-09-12 19:01 ` [U-Boot] [PATCH v2 14/14] sunxi: sina33: Sync the device tree with the kernel Maxime Ripard
2017-09-13 10:53 ` [U-Boot] [PATCH v2 00/14] sunxi: convert musb to the device model and enable usb_ether Łukasz Majewski
14 siblings, 1 reply; 35+ messages in thread
From: Maxime Ripard @ 2017-09-12 19:01 UTC (permalink / raw)
To: u-boot
Now that we can enable the usb_ether gadget, do it. This will be especially
useful for boards that don't have any ethernet controller, such as the ones
based on the A13 or A33.
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
arch/arm/Kconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 519f42778a8d..bce5959ef687 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -703,6 +703,7 @@ config ARCH_SUNXI
imply SPL_MMC_SUPPORT if MMC
imply SPL_POWER_SUPPORT
imply SPL_SERIAL_SUPPORT
+ imply USB_ETHER
imply USB_GADGET
config TARGET_TS4600
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 35+ messages in thread
* [U-Boot] [PATCH v2 14/14] sunxi: sina33: Sync the device tree with the kernel
2017-09-12 19:01 [U-Boot] [PATCH v2 00/14] sunxi: convert musb to the device model and enable usb_ether Maxime Ripard
` (12 preceding siblings ...)
2017-09-12 19:01 ` [U-Boot] [PATCH v2 13/14] sunxi: Imply USB_ETHER Maxime Ripard
@ 2017-09-12 19:01 ` Maxime Ripard
2017-09-13 10:52 ` Łukasz Majewski
2017-09-13 10:53 ` [U-Boot] [PATCH v2 00/14] sunxi: convert musb to the device model and enable usb_ether Łukasz Majewski
14 siblings, 1 reply; 35+ messages in thread
From: Maxime Ripard @ 2017-09-12 19:01 UTC (permalink / raw)
To: u-boot
The kernel DT of the SinA33 has evolved quite a bit. Make sure we sync it
and its upstream DTSI to be able to use the OTG. The DTs were taken from
the 4.13 kernel release.
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
arch/arm/dts/axp223.dtsi | 58 ++-
arch/arm/dts/axp22x.dtsi | 10 +-
arch/arm/dts/sun8i-a23-a33.dtsi | 446 +++++++-----------
arch/arm/dts/sun8i-a33-sinlinx-sina33.dts | 43 ++-
arch/arm/dts/sun8i-a33.dtsi | 477 +++++++++++++++----
include/dt-bindings/clock/sun8i-a23-a33-ccu.h | 127 +++++-
include/dt-bindings/reset/sun8i-a23-a33-ccu.h | 87 +++-
7 files changed, 914 insertions(+), 334 deletions(-)
create mode 100644 arch/arm/dts/axp223.dtsi
create mode 100644 include/dt-bindings/clock/sun8i-a23-a33-ccu.h
create mode 100644 include/dt-bindings/reset/sun8i-a23-a33-ccu.h
diff --git a/arch/arm/dts/axp223.dtsi b/arch/arm/dts/axp223.dtsi
new file mode 100644
index 000000000000..b91b6c1278c7
--- /dev/null
+++ b/arch/arm/dts/axp223.dtsi
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2016 Free Electrons
+ *
+ * Quentin Schulz <quentin.schulz@free-electrons.com>
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ * a) This file is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * Or, alternatively,
+ *
+ * b) Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * AXP223 Integrated Power Management Chip
+ * http://www.x-powers.com/product/AXP22X.php
+ * http://dl.linux-sunxi.org/AXP/AXP223-en.pdf
+ *
+ * The AXP223 shares most of its logic with the AXP221 but it has some
+ * differences, for the VBUS driver for example.
+ */
+
+#include "axp22x.dtsi"
+
+&usb_power_supply {
+ compatible = "x-powers,axp223-usb-power-supply";
+};
diff --git a/arch/arm/dts/axp22x.dtsi b/arch/arm/dts/axp22x.dtsi
index 458b6681e3ec..87fb08e812ec 100644
--- a/arch/arm/dts/axp22x.dtsi
+++ b/arch/arm/dts/axp22x.dtsi
@@ -52,6 +52,16 @@
interrupt-controller;
#interrupt-cells = <1>;
+ ac_power_supply: ac-power-supply {
+ compatible = "x-powers,axp221-ac-power-supply";
+ status = "disabled";
+ };
+
+ battery_power_supply: battery-power-supply {
+ compatible = "x-powers,axp221-battery-power-supply";
+ status = "disabled";
+ };
+
regulators {
/* Default work frequency for buck regulators */
x-powers,dcdc-freq = <3000>;
diff --git a/arch/arm/dts/sun8i-a23-a33.dtsi b/arch/arm/dts/sun8i-a23-a33.dtsi
index f97c38f097d1..ea50dda75adc 100644
--- a/arch/arm/dts/sun8i-a23-a33.dtsi
+++ b/arch/arm/dts/sun8i-a23-a33.dtsi
@@ -46,7 +46,8 @@
#include <dt-bindings/interrupt-controller/arm-gic.h>
-#include <dt-bindings/pinctrl/sun4i-a10.h>
+#include <dt-bindings/clock/sun8i-a23-a33-ccu.h>
+#include <dt-bindings/reset/sun8i-a23-a33-ccu.h>
/ {
interrupt-parent = <&gic>;
@@ -60,7 +61,9 @@
compatible = "allwinner,simple-framebuffer",
"simple-framebuffer";
allwinner,pipeline = "de_be0-lcd0";
- clocks = <&pll6 0>;
+ clocks = <&ccu CLK_BUS_LCD>, <&ccu CLK_BUS_DE_BE>,
+ <&ccu CLK_LCD_CH0>, <&ccu CLK_DE_BE>,
+ <&ccu CLK_DRAM_DE_BE>, <&ccu CLK_DRC>;
status = "disabled";
};
};
@@ -80,7 +83,7 @@
#address-cells = <1>;
#size-cells = <0>;
- cpu at 0 {
+ cpu0: cpu at 0 {
compatible = "arm,cortex-a7";
device_type = "cpu";
reg = <0>;
@@ -102,151 +105,16 @@
#clock-cells = <0>;
compatible = "fixed-clock";
clock-frequency = <24000000>;
+ clock-accuracy = <50000>;
clock-output-names = "osc24M";
};
- osc32k: osc32k_clk {
+ ext_osc32k: ext_osc32k_clk {
#clock-cells = <0>;
compatible = "fixed-clock";
clock-frequency = <32768>;
- clock-output-names = "osc32k";
- };
-
- pll1: clk at 01c20000 {
- #clock-cells = <0>;
- compatible = "allwinner,sun8i-a23-pll1-clk";
- reg = <0x01c20000 0x4>;
- clocks = <&osc24M>;
- clock-output-names = "pll1";
- };
-
- /* dummy clock until actually implemented */
- pll5: pll5_clk {
- #clock-cells = <0>;
- compatible = "fixed-clock";
- clock-frequency = <0>;
- clock-output-names = "pll5";
- };
-
- pll6: clk at 01c20028 {
- #clock-cells = <1>;
- compatible = "allwinner,sun6i-a31-pll6-clk";
- reg = <0x01c20028 0x4>;
- clocks = <&osc24M>;
- clock-output-names = "pll6", "pll6x2";
- };
-
- cpu: cpu_clk at 01c20050 {
- #clock-cells = <0>;
- compatible = "allwinner,sun4i-a10-cpu-clk";
- reg = <0x01c20050 0x4>;
-
- /*
- * PLL1 is listed twice here.
- * While it looks suspicious, it's actually documented
- * that way both in the datasheet and in the code from
- * Allwinner.
- */
- clocks = <&osc32k>, <&osc24M>, <&pll1>, <&pll1>;
- clock-output-names = "cpu";
- };
-
- axi: axi_clk at 01c20050 {
- #clock-cells = <0>;
- compatible = "allwinner,sun8i-a23-axi-clk";
- reg = <0x01c20050 0x4>;
- clocks = <&cpu>;
- clock-output-names = "axi";
- };
-
- ahb1: ahb1_clk at 01c20054 {
- #clock-cells = <0>;
- compatible = "allwinner,sun6i-a31-ahb1-clk";
- reg = <0x01c20054 0x4>;
- clocks = <&osc32k>, <&osc24M>, <&axi>, <&pll6 0>;
- clock-output-names = "ahb1";
- };
-
- apb1: apb1_clk at 01c20054 {
- #clock-cells = <0>;
- compatible = "allwinner,sun4i-a10-apb0-clk";
- reg = <0x01c20054 0x4>;
- clocks = <&ahb1>;
- clock-output-names = "apb1";
- };
-
- apb1_gates: clk at 01c20068 {
- #clock-cells = <1>;
- compatible = "allwinner,sun8i-a23-apb1-gates-clk";
- reg = <0x01c20068 0x4>;
- clocks = <&apb1>;
- clock-indices = <0>, <5>,
- <12>, <13>;
- clock-output-names = "apb1_codec", "apb1_pio",
- "apb1_daudio0", "apb1_daudio1";
- };
-
- apb2: clk at 01c20058 {
- #clock-cells = <0>;
- compatible = "allwinner,sun4i-a10-apb1-clk";
- reg = <0x01c20058 0x4>;
- clocks = <&osc32k>, <&osc24M>, <&pll6 0>, <&pll6 0>;
- clock-output-names = "apb2";
- };
-
- apb2_gates: clk at 01c2006c {
- #clock-cells = <1>;
- compatible = "allwinner,sun8i-a23-apb2-gates-clk";
- reg = <0x01c2006c 0x4>;
- clocks = <&apb2>;
- clock-indices = <0>, <1>,
- <2>, <16>,
- <17>, <18>,
- <19>, <20>;
- clock-output-names = "apb2_i2c0", "apb2_i2c1",
- "apb2_i2c2", "apb2_uart0",
- "apb2_uart1", "apb2_uart2",
- "apb2_uart3", "apb2_uart4";
- };
-
- mmc0_clk: clk at 01c20088 {
- #clock-cells = <1>;
- compatible = "allwinner,sun4i-a10-mmc-clk";
- reg = <0x01c20088 0x4>;
- clocks = <&osc24M>, <&pll6 0>;
- clock-output-names = "mmc0",
- "mmc0_output",
- "mmc0_sample";
- };
-
- mmc1_clk: clk at 01c2008c {
- #clock-cells = <1>;
- compatible = "allwinner,sun4i-a10-mmc-clk";
- reg = <0x01c2008c 0x4>;
- clocks = <&osc24M>, <&pll6 0>;
- clock-output-names = "mmc1",
- "mmc1_output",
- "mmc1_sample";
- };
-
- mmc2_clk: clk at 01c20090 {
- #clock-cells = <1>;
- compatible = "allwinner,sun4i-a10-mmc-clk";
- reg = <0x01c20090 0x4>;
- clocks = <&osc24M>, <&pll6 0>;
- clock-output-names = "mmc2",
- "mmc2_output",
- "mmc2_sample";
- };
-
- usb_clk: clk at 01c200cc {
- #clock-cells = <1>;
- #reset-cells = <1>;
- compatible = "allwinner,sun8i-a23-usb-clk";
- reg = <0x01c200cc 0x4>;
- clocks = <&osc24M>;
- clock-output-names = "usb_phy0", "usb_phy1", "usb_hsic",
- "usb_hsic_12M", "usb_ohci0";
+ clock-accuracy = <50000>;
+ clock-output-names = "ext-osc32k";
};
};
@@ -260,24 +128,23 @@
compatible = "allwinner,sun8i-a23-dma";
reg = <0x01c02000 0x1000>;
interrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&ahb1_gates 6>;
- resets = <&ahb1_rst 6>;
+ clocks = <&ccu CLK_BUS_DMA>;
+ resets = <&ccu RST_BUS_DMA>;
#dma-cells = <1>;
};
mmc0: mmc at 01c0f000 {
- compatible = "allwinner,sun7i-a20-mmc",
- "allwinner,sun5i-a13-mmc";
+ compatible = "allwinner,sun7i-a20-mmc";
reg = <0x01c0f000 0x1000>;
- clocks = <&ahb1_gates 8>,
- <&mmc0_clk 0>,
- <&mmc0_clk 1>,
- <&mmc0_clk 2>;
+ clocks = <&ccu CLK_BUS_MMC0>,
+ <&ccu CLK_MMC0>,
+ <&ccu CLK_MMC0_OUTPUT>,
+ <&ccu CLK_MMC0_SAMPLE>;
clock-names = "ahb",
"mmc",
"output",
"sample";
- resets = <&ahb1_rst 8>;
+ resets = <&ccu RST_BUS_MMC0>;
reset-names = "ahb";
interrupts = <GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>;
status = "disabled";
@@ -286,18 +153,17 @@
};
mmc1: mmc at 01c10000 {
- compatible = "allwinner,sun7i-a20-mmc",
- "allwinner,sun5i-a13-mmc";
+ compatible = "allwinner,sun7i-a20-mmc";
reg = <0x01c10000 0x1000>;
- clocks = <&ahb1_gates 9>,
- <&mmc1_clk 0>,
- <&mmc1_clk 1>,
- <&mmc1_clk 2>;
+ clocks = <&ccu CLK_BUS_MMC1>,
+ <&ccu CLK_MMC1>,
+ <&ccu CLK_MMC1_OUTPUT>,
+ <&ccu CLK_MMC1_SAMPLE>;
clock-names = "ahb",
"mmc",
"output",
"sample";
- resets = <&ahb1_rst 9>;
+ resets = <&ccu RST_BUS_MMC1>;
reset-names = "ahb";
interrupts = <GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH>;
status = "disabled";
@@ -306,18 +172,17 @@
};
mmc2: mmc at 01c11000 {
- compatible = "allwinner,sun7i-a20-mmc",
- "allwinner,sun5i-a13-mmc";
+ compatible = "allwinner,sun7i-a20-mmc";
reg = <0x01c11000 0x1000>;
- clocks = <&ahb1_gates 10>,
- <&mmc2_clk 0>,
- <&mmc2_clk 1>,
- <&mmc2_clk 2>;
+ clocks = <&ccu CLK_BUS_MMC2>,
+ <&ccu CLK_MMC2>,
+ <&ccu CLK_MMC2_OUTPUT>,
+ <&ccu CLK_MMC2_SAMPLE>;
clock-names = "ahb",
"mmc",
"output",
"sample";
- resets = <&ahb1_rst 10>;
+ resets = <&ccu RST_BUS_MMC2>;
reset-names = "ahb";
interrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>;
status = "disabled";
@@ -325,12 +190,55 @@
#size-cells = <0>;
};
+ nfc: nand at 01c03000 {
+ compatible = "allwinner,sun4i-a10-nand";
+ reg = <0x01c03000 0x1000>;
+ interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&ccu CLK_BUS_NAND>, <&ccu CLK_NAND>;
+ clock-names = "ahb", "mod";
+ resets = <&ccu RST_BUS_NAND>;
+ reset-names = "ahb";
+ status = "disabled";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ };
+
+ usb_otg: usb at 01c19000 {
+ /* compatible gets set in SoC specific dtsi file */
+ reg = <0x01c19000 0x0400>;
+ clocks = <&ccu CLK_BUS_OTG>;
+ resets = <&ccu RST_BUS_OTG>;
+ interrupts = <GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-names = "mc";
+ phys = <&usbphy 0>;
+ phy-names = "usb";
+ extcon = <&usbphy 0>;
+ status = "disabled";
+ };
+
+ usbphy: phy at 01c19400 {
+ /*
+ * compatible and address regions get set in
+ * SoC specific dtsi file
+ */
+ clocks = <&ccu CLK_USB_PHY0>,
+ <&ccu CLK_USB_PHY1>;
+ clock-names = "usb0_phy",
+ "usb1_phy";
+ resets = <&ccu RST_USB_PHY0>,
+ <&ccu RST_USB_PHY1>;
+ reset-names = "usb0_reset",
+ "usb1_reset";
+ status = "disabled";
+ #phy-cells = <1>;
+ };
+
ehci0: usb at 01c1a000 {
compatible = "allwinner,sun8i-a23-ehci", "generic-ehci";
reg = <0x01c1a000 0x100>;
interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&ahb1_gates 26>;
- resets = <&ahb1_rst 26>;
+ clocks = <&ccu CLK_BUS_EHCI>;
+ resets = <&ccu RST_BUS_EHCI>;
phys = <&usbphy 1>;
phy-names = "usb";
status = "disabled";
@@ -340,101 +248,100 @@
compatible = "allwinner,sun8i-a23-ohci", "generic-ohci";
reg = <0x01c1a400 0x100>;
interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&ahb1_gates 29>, <&usb_clk 16>;
- resets = <&ahb1_rst 29>;
+ clocks = <&ccu CLK_BUS_OHCI>, <&ccu CLK_USB_OHCI>;
+ resets = <&ccu RST_BUS_OHCI>;
phys = <&usbphy 1>;
phy-names = "usb";
status = "disabled";
};
+ ccu: clock at 01c20000 {
+ reg = <0x01c20000 0x400>;
+ clocks = <&osc24M>, <&rtc 0>;
+ clock-names = "hosc", "losc";
+ #clock-cells = <1>;
+ #reset-cells = <1>;
+ };
+
pio: pinctrl at 01c20800 {
/* compatible gets set in SoC specific dtsi file */
reg = <0x01c20800 0x400>;
/* interrupts get set in SoC specific dtsi file */
- clocks = <&apb1_gates 5>;
+ clocks = <&ccu CLK_BUS_PIO>, <&osc24M>, <&rtc 0>;
+ clock-names = "apb", "hosc", "losc";
gpio-controller;
interrupt-controller;
#interrupt-cells = <3>;
#gpio-cells = <3>;
uart0_pins_a: uart0 at 0 {
- allwinner,pins = "PF2", "PF4";
- allwinner,function = "uart0";
- allwinner,drive = <SUN4I_PINCTRL_10_MA>;
- allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
+ pins = "PF2", "PF4";
+ function = "uart0";
+ };
+
+ uart1_pins_a: uart1 at 0 {
+ pins = "PG6", "PG7";
+ function = "uart1";
+ };
+
+ uart1_pins_cts_rts_a: uart1-cts-rts at 0 {
+ pins = "PG8", "PG9";
+ function = "uart1";
};
mmc0_pins_a: mmc0 at 0 {
- allwinner,pins = "PF0", "PF1", "PF2",
- "PF3", "PF4", "PF5";
- allwinner,function = "mmc0";
- allwinner,drive = <SUN4I_PINCTRL_30_MA>;
- allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
+ pins = "PF0", "PF1", "PF2",
+ "PF3", "PF4", "PF5";
+ function = "mmc0";
+ drive-strength = <30>;
+ bias-pull-up;
};
mmc1_pins_a: mmc1 at 0 {
- allwinner,pins = "PG0", "PG1", "PG2",
- "PG3", "PG4", "PG5";
- allwinner,function = "mmc1";
- allwinner,drive = <SUN4I_PINCTRL_30_MA>;
- allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
+ pins = "PG0", "PG1", "PG2",
+ "PG3", "PG4", "PG5";
+ function = "mmc1";
+ drive-strength = <30>;
+ bias-pull-up;
};
mmc2_8bit_pins: mmc2_8bit {
- allwinner,pins = "PC5", "PC6", "PC8",
- "PC9", "PC10", "PC11",
- "PC12", "PC13", "PC14",
- "PC15", "PC16";
- allwinner,function = "mmc2";
- allwinner,drive = <SUN4I_PINCTRL_30_MA>;
- allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
+ pins = "PC5", "PC6", "PC8",
+ "PC9", "PC10", "PC11",
+ "PC12", "PC13", "PC14",
+ "PC15", "PC16";
+ function = "mmc2";
+ drive-strength = <30>;
+ bias-pull-up;
};
pwm0_pins: pwm0 {
- allwinner,pins = "PH0";
- allwinner,function = "pwm0";
- allwinner,drive = <SUN4I_PINCTRL_10_MA>;
- allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
+ pins = "PH0";
+ function = "pwm0";
};
i2c0_pins_a: i2c0 at 0 {
- allwinner,pins = "PH2", "PH3";
- allwinner,function = "i2c0";
- allwinner,drive = <SUN4I_PINCTRL_10_MA>;
- allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
+ pins = "PH2", "PH3";
+ function = "i2c0";
};
i2c1_pins_a: i2c1 at 0 {
- allwinner,pins = "PH4", "PH5";
- allwinner,function = "i2c1";
- allwinner,drive = <SUN4I_PINCTRL_10_MA>;
- allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
+ pins = "PH4", "PH5";
+ function = "i2c1";
};
i2c2_pins_a: i2c2 at 0 {
- allwinner,pins = "PE12", "PE13";
- allwinner,function = "i2c2";
- allwinner,drive = <SUN4I_PINCTRL_10_MA>;
- allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
+ pins = "PE12", "PE13";
+ function = "i2c2";
};
- };
-
- ahb1_rst: reset at 01c202c0 {
- #reset-cells = <1>;
- compatible = "allwinner,sun6i-a31-clock-reset";
- reg = <0x01c202c0 0xc>;
- };
- apb1_rst: reset at 01c202d0 {
- #reset-cells = <1>;
- compatible = "allwinner,sun6i-a31-clock-reset";
- reg = <0x01c202d0 0x4>;
- };
-
- apb2_rst: reset at 01c202d8 {
- #reset-cells = <1>;
- compatible = "allwinner,sun6i-a31-clock-reset";
- reg = <0x01c202d8 0x4>;
+ lcd_rgb666_pins: lcd-rgb666 at 0 {
+ pins = "PD2", "PD3", "PD4", "PD5", "PD6", "PD7",
+ "PD10", "PD11", "PD12", "PD13", "PD14", "PD15",
+ "PD18", "PD19", "PD20", "PD21", "PD22", "PD23",
+ "PD24", "PD25", "PD26", "PD27";
+ function = "lcd0";
+ };
};
timer at 01c20c00 {
@@ -472,8 +379,8 @@
interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>;
reg-shift = <2>;
reg-io-width = <4>;
- clocks = <&apb2_gates 16>;
- resets = <&apb2_rst 16>;
+ clocks = <&ccu CLK_BUS_UART0>;
+ resets = <&ccu RST_BUS_UART0>;
dmas = <&dma 6>, <&dma 6>;
dma-names = "rx", "tx";
status = "disabled";
@@ -485,8 +392,8 @@
interrupts = <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;
reg-shift = <2>;
reg-io-width = <4>;
- clocks = <&apb2_gates 17>;
- resets = <&apb2_rst 17>;
+ clocks = <&ccu CLK_BUS_UART1>;
+ resets = <&ccu RST_BUS_UART1>;
dmas = <&dma 7>, <&dma 7>;
dma-names = "rx", "tx";
status = "disabled";
@@ -498,8 +405,8 @@
interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;
reg-shift = <2>;
reg-io-width = <4>;
- clocks = <&apb2_gates 18>;
- resets = <&apb2_rst 18>;
+ clocks = <&ccu CLK_BUS_UART2>;
+ resets = <&ccu RST_BUS_UART2>;
dmas = <&dma 8>, <&dma 8>;
dma-names = "rx", "tx";
status = "disabled";
@@ -511,8 +418,8 @@
interrupts = <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;
reg-shift = <2>;
reg-io-width = <4>;
- clocks = <&apb2_gates 19>;
- resets = <&apb2_rst 19>;
+ clocks = <&ccu CLK_BUS_UART3>;
+ resets = <&ccu RST_BUS_UART3>;
dmas = <&dma 9>, <&dma 9>;
dma-names = "rx", "tx";
status = "disabled";
@@ -524,8 +431,8 @@
interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;
reg-shift = <2>;
reg-io-width = <4>;
- clocks = <&apb2_gates 20>;
- resets = <&apb2_rst 20>;
+ clocks = <&ccu CLK_BUS_UART4>;
+ resets = <&ccu RST_BUS_UART4>;
dmas = <&dma 10>, <&dma 10>;
dma-names = "rx", "tx";
status = "disabled";
@@ -535,8 +442,8 @@
compatible = "allwinner,sun6i-a31-i2c";
reg = <0x01c2ac00 0x400>;
interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&apb2_gates 0>;
- resets = <&apb2_rst 0>;
+ clocks = <&ccu CLK_BUS_I2C0>;
+ resets = <&ccu RST_BUS_I2C0>;
status = "disabled";
#address-cells = <1>;
#size-cells = <0>;
@@ -546,8 +453,8 @@
compatible = "allwinner,sun6i-a31-i2c";
reg = <0x01c2b000 0x400>;
interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&apb2_gates 1>;
- resets = <&apb2_rst 1>;
+ clocks = <&ccu CLK_BUS_I2C1>;
+ resets = <&ccu RST_BUS_I2C1>;
status = "disabled";
#address-cells = <1>;
#size-cells = <0>;
@@ -557,17 +464,44 @@
compatible = "allwinner,sun6i-a31-i2c";
reg = <0x01c2b400 0x400>;
interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&apb2_gates 2>;
- resets = <&apb2_rst 2>;
+ clocks = <&ccu CLK_BUS_I2C2>;
+ resets = <&ccu RST_BUS_I2C2>;
status = "disabled";
#address-cells = <1>;
#size-cells = <0>;
};
+ mali: gpu at 1c40000 {
+ compatible = "allwinner,sun8i-a23-mali",
+ "allwinner,sun7i-a20-mali", "arm,mali-400";
+ reg = <0x01c40000 0x10000>;
+ interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-names = "gp",
+ "gpmmu",
+ "pp0",
+ "ppmmu0",
+ "pp1",
+ "ppmmu1",
+ "pmu";
+ clocks = <&ccu CLK_BUS_GPU>, <&ccu CLK_GPU>;
+ clock-names = "bus", "core";
+ resets = <&ccu RST_BUS_GPU>;
+ #cooling-cells = <2>;
+
+ assigned-clocks = <&ccu CLK_GPU>;
+ assigned-clock-rates = <384000000>;
+ };
+
gic: interrupt-controller at 01c81000 {
compatible = "arm,cortex-a7-gic", "arm,cortex-a15-gic";
reg = <0x01c81000 0x1000>,
- <0x01c82000 0x1000>,
+ <0x01c82000 0x2000>,
<0x01c84000 0x2000>,
<0x01c86000 0x2000>;
interrupt-controller;
@@ -580,13 +514,16 @@
reg = <0x01f00000 0x54>;
interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>;
+ clock-output-names = "osc32k";
+ clocks = <&ext_osc32k>;
+ #clock-cells = <1>;
};
- nmi_intc: interrupt-controller at 01f00c0c {
- compatible = "allwinner,sun6i-a31-sc-nmi";
+ nmi_intc: interrupt-controller at 1f00c00 {
+ compatible = "allwinner,sun6i-a31-r-intc";
interrupt-controller;
#interrupt-cells = <2>;
- reg = <0x01f00c0c 0x38>;
+ reg = <0x01f00c00 0x400>;
interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
};
@@ -632,6 +569,10 @@
compatible = "allwinner,sun6i-a31-clock-reset";
#reset-cells = <1>;
};
+
+ codec_analog: codec-analog {
+ compatible = "allwinner,sun8i-a23-codec-analog";
+ };
};
cpucfg at 01f01c00 {
@@ -654,7 +595,8 @@
compatible = "allwinner,sun8i-a23-r-pinctrl";
reg = <0x01f02c00 0x400>;
interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&apb0_gates 0>;
+ clocks = <&apb0_gates 0>, <&osc24M>, <&rtc 0>;
+ clock-names = "apb", "hosc", "losc";
resets = <&apb0_rst 0>;
gpio-controller;
interrupt-controller;
@@ -664,17 +606,15 @@
#gpio-cells = <3>;
r_rsb_pins: r_rsb {
- allwinner,pins = "PL0", "PL1";
- allwinner,function = "s_rsb";
- allwinner,drive = <SUN4I_PINCTRL_20_MA>;
- allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+ pins = "PL0", "PL1";
+ function = "s_rsb";
+ drive-strength = <20>;
+ bias-pull-up;
};
r_uart_pins_a: r_uart at 0 {
- allwinner,pins = "PL2", "PL3";
- allwinner,function = "s_uart";
- allwinner,drive = <SUN4I_PINCTRL_10_MA>;
- allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
+ pins = "PL2", "PL3";
+ function = "s_uart";
};
};
diff --git a/arch/arm/dts/sun8i-a33-sinlinx-sina33.dts b/arch/arm/dts/sun8i-a33-sinlinx-sina33.dts
index fef6abc0a703..b1bc88c46c67 100644
--- a/arch/arm/dts/sun8i-a33-sinlinx-sina33.dts
+++ b/arch/arm/dts/sun8i-a33-sinlinx-sina33.dts
@@ -61,6 +61,31 @@
chosen {
stdout-path = "serial0:115200n8";
};
+
+ panel {
+ compatible = "netron-dy,e231732";
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port at 0 {
+ reg = <0>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ panel_input: endpoint at 0 {
+ reg = <0>;
+ remote-endpoint = <&tcon0_out_panel>;
+ };
+ };
+ };
+};
+
+&de {
+ status = "okay";
+};
+
+&cpu0 {
+ cpu-supply = <®_dcdc3>;
};
&ehci0 {
@@ -207,12 +232,30 @@
regulator-name = "vcc-rtc";
};
+&tcon0 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&lcd_rgb666_pins>;
+ status = "okay";
+};
+
+&tcon0_out {
+ tcon0_out_panel: endpoint at 0 {
+ reg = <0>;
+ remote-endpoint = <&panel_input>;
+ };
+};
+
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_b>;
status = "okay";
};
+&usb_otg {
+ dr_mode = "peripheral";
+ status = "okay";
+};
+
&usbphy {
status = "okay";
usb1_vbus-supply = <®_vcc5v0>; /* USB1 VBUS is always on */
diff --git a/arch/arm/dts/sun8i-a33.dtsi b/arch/arm/dts/sun8i-a33.dtsi
index 001d8402ca18..22660919bd08 100644
--- a/arch/arm/dts/sun8i-a33.dtsi
+++ b/arch/arm/dts/sun8i-a33.dtsi
@@ -43,19 +43,137 @@
*/
#include "sun8i-a23-a33.dtsi"
+#include <dt-bindings/thermal/thermal.h>
/ {
+ cpu0_opp_table: opp_table0 {
+ compatible = "operating-points-v2";
+ opp-shared;
+
+ opp-120000000 {
+ opp-hz = /bits/ 64 <120000000>;
+ opp-microvolt = <1040000>;
+ clock-latency-ns = <244144>; /* 8 32k periods */
+ };
+
+ opp-240000000 {
+ opp-hz = /bits/ 64 <240000000>;
+ opp-microvolt = <1040000>;
+ clock-latency-ns = <244144>; /* 8 32k periods */
+ };
+
+ opp-312000000 {
+ opp-hz = /bits/ 64 <312000000>;
+ opp-microvolt = <1040000>;
+ clock-latency-ns = <244144>; /* 8 32k periods */
+ };
+
+ opp-408000000 {
+ opp-hz = /bits/ 64 <408000000>;
+ opp-microvolt = <1040000>;
+ clock-latency-ns = <244144>; /* 8 32k periods */
+ };
+
+ opp-480000000 {
+ opp-hz = /bits/ 64 <480000000>;
+ opp-microvolt = <1040000>;
+ clock-latency-ns = <244144>; /* 8 32k periods */
+ };
+
+ opp-504000000 {
+ opp-hz = /bits/ 64 <504000000>;
+ opp-microvolt = <1040000>;
+ clock-latency-ns = <244144>; /* 8 32k periods */
+ };
+
+ opp-600000000 {
+ opp-hz = /bits/ 64 <600000000>;
+ opp-microvolt = <1040000>;
+ clock-latency-ns = <244144>; /* 8 32k periods */
+ };
+
+ opp-648000000 {
+ opp-hz = /bits/ 64 <648000000>;
+ opp-microvolt = <1040000>;
+ clock-latency-ns = <244144>; /* 8 32k periods */
+ };
+
+ opp-720000000 {
+ opp-hz = /bits/ 64 <720000000>;
+ opp-microvolt = <1100000>;
+ clock-latency-ns = <244144>; /* 8 32k periods */
+ };
+
+ opp-816000000 {
+ opp-hz = /bits/ 64 <816000000>;
+ opp-microvolt = <1100000>;
+ clock-latency-ns = <244144>; /* 8 32k periods */
+ };
+
+ opp-912000000 {
+ opp-hz = /bits/ 64 <912000000>;
+ opp-microvolt = <1200000>;
+ clock-latency-ns = <244144>; /* 8 32k periods */
+ };
+
+ opp-1008000000 {
+ opp-hz = /bits/ 64 <1008000000>;
+ opp-microvolt = <1200000>;
+ clock-latency-ns = <244144>; /* 8 32k periods */
+ };
+ };
+
cpus {
+ cpu at 0 {
+ clocks = <&ccu CLK_CPUX>;
+ clock-names = "cpu";
+ operating-points-v2 = <&cpu0_opp_table>;
+ #cooling-cells = <2>;
+ };
+
+ cpu at 1 {
+ operating-points-v2 = <&cpu0_opp_table>;
+ };
+
cpu at 2 {
compatible = "arm,cortex-a7";
device_type = "cpu";
reg = <2>;
+ operating-points-v2 = <&cpu0_opp_table>;
};
cpu at 3 {
compatible = "arm,cortex-a7";
device_type = "cpu";
reg = <3>;
+ operating-points-v2 = <&cpu0_opp_table>;
+ };
+ };
+
+ de: display-engine {
+ compatible = "allwinner,sun8i-a33-display-engine";
+ allwinner,pipelines = <&fe0>;
+ status = "disabled";
+ };
+
+ iio-hwmon {
+ compatible = "iio-hwmon";
+ io-channels = <&ths>;
+ };
+
+ mali_opp_table: gpu-opp-table {
+ compatible = "operating-points-v2";
+
+ opp-144000000 {
+ opp-hz = /bits/ 64 <144000000>;
+ };
+
+ opp-240000000 {
+ opp-hz = /bits/ 64 <240000000>;
+ };
+
+ opp-384000000 {
+ opp-hz = /bits/ 64 <384000000>;
};
};
@@ -63,113 +181,310 @@
reg = <0x40000000 0x80000000>;
};
- clocks {
- /* Dummy clock for pll11 (DDR1) until actually implemented */
- pll11: pll11_clk {
- #clock-cells = <0>;
- compatible = "fixed-clock";
- clock-frequency = <0>;
- clock-output-names = "pll11";
- };
-
- ahb1_gates: clk at 01c20060 {
- #clock-cells = <1>;
- compatible = "allwinner,sun8i-a33-ahb1-gates-clk";
- reg = <0x01c20060 0x8>;
- clocks = <&ahb1>;
- clock-indices = <1>, <5>,
- <6>, <8>, <9>,
- <10>, <13>, <14>,
- <19>, <20>,
- <21>, <24>, <26>,
- <29>, <32>, <36>,
- <40>, <44>, <46>,
- <52>, <53>,
- <54>, <57>,
- <58>;
- clock-output-names = "ahb1_mipidsi", "ahb1_ss",
- "ahb1_dma","ahb1_mmc0", "ahb1_mmc1",
- "ahb1_mmc2", "ahb1_nand", "ahb1_sdram",
- "ahb1_hstimer", "ahb1_spi0",
- "ahb1_spi1", "ahb1_otg", "ahb1_ehci",
- "ahb1_ohci", "ahb1_ve", "ahb1_lcd",
- "ahb1_csi", "ahb1_be", "ahb1_fe",
- "ahb1_gpu", "ahb1_msgbox",
- "ahb1_spinlock", "ahb1_drc",
- "ahb1_sat";
- };
-
- ss_clk: clk at 01c2009c {
- #clock-cells = <0>;
- compatible = "allwinner,sun4i-a10-mod0-clk";
- reg = <0x01c2009c 0x4>;
- clocks = <&osc24M>, <&pll6 0>;
- clock-output-names = "ss";
- };
-
- mbus_clk: clk at 01c2015c {
- #clock-cells = <0>;
- compatible = "allwinner,sun8i-a23-mbus-clk";
- reg = <0x01c2015c 0x4>;
- clocks = <&osc24M>, <&pll6 1>, <&pll5>, <&pll11>;
- clock-output-names = "mbus";
+ sound: sound {
+ compatible = "simple-audio-card";
+ simple-audio-card,name = "sun8i-a33-audio";
+ simple-audio-card,format = "i2s";
+ simple-audio-card,frame-master = <&link_codec>;
+ simple-audio-card,bitclock-master = <&link_codec>;
+ simple-audio-card,mclk-fs = <512>;
+ simple-audio-card,aux-devs = <&codec_analog>;
+ simple-audio-card,routing =
+ "Left DAC", "AIF1 Slot 0 Left",
+ "Right DAC", "AIF1 Slot 0 Right";
+ status = "disabled";
+
+ simple-audio-card,cpu {
+ sound-dai = <&dai>;
+ };
+
+ link_codec: simple-audio-card,codec {
+ sound-dai = <&codec>;
};
};
soc at 01c00000 {
+ tcon0: lcd-controller at 01c0c000 {
+ compatible = "allwinner,sun8i-a33-tcon";
+ reg = <0x01c0c000 0x1000>;
+ interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&ccu CLK_BUS_LCD>,
+ <&ccu CLK_LCD_CH0>;
+ clock-names = "ahb",
+ "tcon-ch0";
+ clock-output-names = "tcon-pixel-clock";
+ resets = <&ccu RST_BUS_LCD>;
+ reset-names = "lcd";
+ status = "disabled";
+
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ tcon0_in: port at 0 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ reg = <0>;
+
+ tcon0_in_drc0: endpoint at 0 {
+ reg = <0>;
+ remote-endpoint = <&drc0_out_tcon0>;
+ };
+ };
+
+ tcon0_out: port at 1 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ reg = <1>;
+ };
+ };
+ };
+
crypto: crypto-engine at 01c15000 {
compatible = "allwinner,sun4i-a10-crypto";
reg = <0x01c15000 0x1000>;
interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&ahb1_gates 5>, <&ss_clk>;
+ clocks = <&ccu CLK_BUS_SS>, <&ccu CLK_SS>;
clock-names = "ahb", "mod";
- resets = <&ahb1_rst 5>;
+ resets = <&ccu RST_BUS_SS>;
reset-names = "ahb";
};
- usb_otg: usb at 01c19000 {
- compatible = "allwinner,sun8i-a33-musb";
- reg = <0x01c19000 0x0400>;
- clocks = <&ahb1_gates 24>;
- resets = <&ahb1_rst 24>;
- interrupts = <GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>;
- interrupt-names = "mc";
- phys = <&usbphy 0>;
- phy-names = "usb";
- extcon = <&usbphy 0>;
+ dai: dai at 01c22c00 {
+ #sound-dai-cells = <0>;
+ compatible = "allwinner,sun6i-a31-i2s";
+ reg = <0x01c22c00 0x200>;
+ interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&ccu CLK_BUS_CODEC>, <&ccu CLK_AC_DIG>;
+ clock-names = "apb", "mod";
+ resets = <&ccu RST_BUS_CODEC>;
+ dmas = <&dma 15>, <&dma 15>;
+ dma-names = "rx", "tx";
+ status = "disabled";
+ };
+
+ codec: codec at 01c22e00 {
+ #sound-dai-cells = <0>;
+ compatible = "allwinner,sun8i-a33-codec";
+ reg = <0x01c22e00 0x400>;
+ interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&ccu CLK_BUS_CODEC>, <&ccu CLK_AC_DIG>;
+ clock-names = "bus", "mod";
status = "disabled";
};
- usbphy: phy at 01c19400 {
- compatible = "allwinner,sun8i-a33-usb-phy";
- reg = <0x01c19400 0x14>,
- <0x01c1a800 0x4>;
- reg-names = "phy_ctrl",
- "pmu1";
- clocks = <&usb_clk 8>,
- <&usb_clk 9>;
- clock-names = "usb0_phy",
- "usb1_phy";
- resets = <&usb_clk 0>,
- <&usb_clk 1>;
- reset-names = "usb0_reset",
- "usb1_reset";
+ ths: ths at 01c25000 {
+ compatible = "allwinner,sun8i-a33-ths";
+ reg = <0x01c25000 0x100>;
+ #thermal-sensor-cells = <0>;
+ #io-channel-cells = <0>;
+ };
+
+ fe0: display-frontend at 01e00000 {
+ compatible = "allwinner,sun8i-a33-display-frontend";
+ reg = <0x01e00000 0x20000>;
+ interrupts = <GIC_SPI 93 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&ccu CLK_BUS_DE_FE>, <&ccu CLK_DE_FE>,
+ <&ccu CLK_DRAM_DE_FE>;
+ clock-names = "ahb", "mod",
+ "ram";
+ resets = <&ccu RST_BUS_DE_FE>;
status = "disabled";
- #phy-cells = <1>;
+
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ fe0_out: port at 1 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ reg = <1>;
+
+ fe0_out_be0: endpoint at 0 {
+ reg = <0>;
+ remote-endpoint = <&be0_in_fe0>;
+ };
+ };
+ };
+ };
+
+ be0: display-backend at 01e60000 {
+ compatible = "allwinner,sun8i-a33-display-backend";
+ reg = <0x01e60000 0x10000>, <0x01e80000 0x1000>;
+ reg-names = "be", "sat";
+ interrupts = <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&ccu CLK_BUS_DE_BE>, <&ccu CLK_DE_BE>,
+ <&ccu CLK_DRAM_DE_BE>, <&ccu CLK_BUS_SAT>;
+ clock-names = "ahb", "mod",
+ "ram", "sat";
+ resets = <&ccu RST_BUS_DE_BE>, <&ccu RST_BUS_SAT>;
+ reset-names = "be", "sat";
+ assigned-clocks = <&ccu CLK_DE_BE>;
+ assigned-clock-rates = <300000000>;
+
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ be0_in: port at 0 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ reg = <0>;
+
+ be0_in_fe0: endpoint at 0 {
+ reg = <0>;
+ remote-endpoint = <&fe0_out_be0>;
+ };
+ };
+
+ be0_out: port at 1 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ reg = <1>;
+
+ be0_out_drc0: endpoint at 0 {
+ reg = <0>;
+ remote-endpoint = <&drc0_in_be0>;
+ };
+ };
+ };
+ };
+
+ drc0: drc at 01e70000 {
+ compatible = "allwinner,sun8i-a33-drc";
+ reg = <0x01e70000 0x10000>;
+ interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&ccu CLK_BUS_DRC>, <&ccu CLK_DRC>,
+ <&ccu CLK_DRAM_DRC>;
+ clock-names = "ahb", "mod", "ram";
+ resets = <&ccu RST_BUS_DRC>;
+
+ assigned-clocks = <&ccu CLK_DRC>;
+ assigned-clock-rates = <300000000>;
+
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ drc0_in: port at 0 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ reg = <0>;
+
+ drc0_in_be0: endpoint at 0 {
+ reg = <0>;
+ remote-endpoint = <&be0_out_drc0>;
+ };
+ };
+
+ drc0_out: port at 1 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ reg = <1>;
+
+ drc0_out_tcon0: endpoint at 0 {
+ reg = <0>;
+ remote-endpoint = <&tcon0_in_drc0>;
+ };
+ };
+ };
+ };
+ };
+
+ thermal-zones {
+ cpu_thermal {
+ /* milliseconds */
+ polling-delay-passive = <250>;
+ polling-delay = <1000>;
+ thermal-sensors = <&ths>;
+
+ cooling-maps {
+ map0 {
+ trip = <&cpu_alert0>;
+ cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+ };
+ map1 {
+ trip = <&cpu_alert1>;
+ cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+ };
+
+ map2 {
+ trip = <&gpu_alert0>;
+ cooling-device = <&mali 1 THERMAL_NO_LIMIT>;
+ };
+
+ map3 {
+ trip = <&gpu_alert1>;
+ cooling-device = <&mali 2 THERMAL_NO_LIMIT>;
+ };
+ };
+
+ trips {
+ cpu_alert0: cpu_alert0 {
+ /* milliCelsius */
+ temperature = <75000>;
+ hysteresis = <2000>;
+ type = "passive";
+ };
+
+ gpu_alert0: gpu_alert0 {
+ /* milliCelsius */
+ temperature = <85000>;
+ hysteresis = <2000>;
+ type = "passive";
+ };
+
+ cpu_alert1: cpu_alert1 {
+ /* milliCelsius */
+ temperature = <90000>;
+ hysteresis = <2000>;
+ type = "hot";
+ };
+
+ gpu_alert1: gpu_alert1 {
+ /* milliCelsius */
+ temperature = <95000>;
+ hysteresis = <2000>;
+ type = "hot";
+ };
+
+ cpu_crit: cpu_crit {
+ /* milliCelsius */
+ temperature = <110000>;
+ hysteresis = <2000>;
+ type = "critical";
+ };
+ };
};
};
};
+&ccu {
+ compatible = "allwinner,sun8i-a33-ccu";
+};
+
+&mali {
+ operating-points-v2 = <&mali_opp_table>;
+};
+
&pio {
compatible = "allwinner,sun8i-a33-pinctrl";
interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
uart0_pins_b: uart0 at 1 {
- allwinner,pins = "PB0", "PB1";
- allwinner,function = "uart0";
- allwinner,drive = <SUN4I_PINCTRL_10_MA>;
- allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
+ pins = "PB0", "PB1";
+ function = "uart0";
};
};
+
+&usb_otg {
+ compatible = "allwinner,sun8i-a33-musb";
+};
+
+&usbphy {
+ compatible = "allwinner,sun8i-a33-usb-phy";
+ reg = <0x01c19400 0x14>, <0x01c1a800 0x4>;
+ reg-names = "phy_ctrl", "pmu1";
+};
diff --git a/include/dt-bindings/clock/sun8i-a23-a33-ccu.h b/include/dt-bindings/clock/sun8i-a23-a33-ccu.h
new file mode 100644
index 000000000000..f8222b6b2cc3
--- /dev/null
+++ b/include/dt-bindings/clock/sun8i-a23-a33-ccu.h
@@ -0,0 +1,127 @@
+/*
+ * Copyright (C) 2016 Maxime Ripard <maxime.ripard@free-electrons.com>
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ * a) This file is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * Or, alternatively,
+ *
+ * b) Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef _DT_BINDINGS_CLK_SUN8I_A23_A33_H_
+#define _DT_BINDINGS_CLK_SUN8I_A23_A33_H_
+
+#define CLK_CPUX 18
+
+#define CLK_BUS_MIPI_DSI 23
+#define CLK_BUS_SS 24
+#define CLK_BUS_DMA 25
+#define CLK_BUS_MMC0 26
+#define CLK_BUS_MMC1 27
+#define CLK_BUS_MMC2 28
+#define CLK_BUS_NAND 29
+#define CLK_BUS_DRAM 30
+#define CLK_BUS_HSTIMER 31
+#define CLK_BUS_SPI0 32
+#define CLK_BUS_SPI1 33
+#define CLK_BUS_OTG 34
+#define CLK_BUS_EHCI 35
+#define CLK_BUS_OHCI 36
+#define CLK_BUS_VE 37
+#define CLK_BUS_LCD 38
+#define CLK_BUS_CSI 39
+#define CLK_BUS_DE_BE 40
+#define CLK_BUS_DE_FE 41
+#define CLK_BUS_GPU 42
+#define CLK_BUS_MSGBOX 43
+#define CLK_BUS_SPINLOCK 44
+#define CLK_BUS_DRC 45
+#define CLK_BUS_SAT 46
+#define CLK_BUS_CODEC 47
+#define CLK_BUS_PIO 48
+#define CLK_BUS_I2S0 49
+#define CLK_BUS_I2S1 50
+#define CLK_BUS_I2C0 51
+#define CLK_BUS_I2C1 52
+#define CLK_BUS_I2C2 53
+#define CLK_BUS_UART0 54
+#define CLK_BUS_UART1 55
+#define CLK_BUS_UART2 56
+#define CLK_BUS_UART3 57
+#define CLK_BUS_UART4 58
+#define CLK_NAND 59
+#define CLK_MMC0 60
+#define CLK_MMC0_SAMPLE 61
+#define CLK_MMC0_OUTPUT 62
+#define CLK_MMC1 63
+#define CLK_MMC1_SAMPLE 64
+#define CLK_MMC1_OUTPUT 65
+#define CLK_MMC2 66
+#define CLK_MMC2_SAMPLE 67
+#define CLK_MMC2_OUTPUT 68
+#define CLK_SS 69
+#define CLK_SPI0 70
+#define CLK_SPI1 71
+#define CLK_I2S0 72
+#define CLK_I2S1 73
+#define CLK_USB_PHY0 74
+#define CLK_USB_PHY1 75
+#define CLK_USB_HSIC 76
+#define CLK_USB_HSIC_12M 77
+#define CLK_USB_OHCI 78
+
+#define CLK_DRAM_VE 80
+#define CLK_DRAM_CSI 81
+#define CLK_DRAM_DRC 82
+#define CLK_DRAM_DE_FE 83
+#define CLK_DRAM_DE_BE 84
+#define CLK_DE_BE 85
+#define CLK_DE_FE 86
+#define CLK_LCD_CH0 87
+#define CLK_LCD_CH1 88
+#define CLK_CSI_SCLK 89
+#define CLK_CSI_MCLK 90
+#define CLK_VE 91
+#define CLK_AC_DIG 92
+#define CLK_AC_DIG_4X 93
+#define CLK_AVS 94
+
+#define CLK_DSI_SCLK 96
+#define CLK_DSI_DPHY 97
+#define CLK_DRC 98
+#define CLK_GPU 99
+#define CLK_ATS 100
+
+#endif /* _DT_BINDINGS_CLK_SUN8I_A23_A33_H_ */
diff --git a/include/dt-bindings/reset/sun8i-a23-a33-ccu.h b/include/dt-bindings/reset/sun8i-a23-a33-ccu.h
new file mode 100644
index 000000000000..6121f2b0cd0a
--- /dev/null
+++ b/include/dt-bindings/reset/sun8i-a23-a33-ccu.h
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2016 Maxime Ripard <maxime.ripard@free-electrons.com>
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ * a) This file is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * Or, alternatively,
+ *
+ * b) Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef _DT_BINDINGS_RST_SUN8I_A23_A33_H_
+#define _DT_BINDINGS_RST_SUN8I_A23_A33_H_
+
+#define RST_USB_PHY0 0
+#define RST_USB_PHY1 1
+#define RST_USB_HSIC 2
+#define RST_MBUS 3
+#define RST_BUS_MIPI_DSI 4
+#define RST_BUS_SS 5
+#define RST_BUS_DMA 6
+#define RST_BUS_MMC0 7
+#define RST_BUS_MMC1 8
+#define RST_BUS_MMC2 9
+#define RST_BUS_NAND 10
+#define RST_BUS_DRAM 11
+#define RST_BUS_HSTIMER 12
+#define RST_BUS_SPI0 13
+#define RST_BUS_SPI1 14
+#define RST_BUS_OTG 15
+#define RST_BUS_EHCI 16
+#define RST_BUS_OHCI 17
+#define RST_BUS_VE 18
+#define RST_BUS_LCD 19
+#define RST_BUS_CSI 20
+#define RST_BUS_DE_BE 21
+#define RST_BUS_DE_FE 22
+#define RST_BUS_GPU 23
+#define RST_BUS_MSGBOX 24
+#define RST_BUS_SPINLOCK 25
+#define RST_BUS_DRC 26
+#define RST_BUS_SAT 27
+#define RST_BUS_LVDS 28
+#define RST_BUS_CODEC 29
+#define RST_BUS_I2S0 30
+#define RST_BUS_I2S1 31
+#define RST_BUS_I2C0 32
+#define RST_BUS_I2C1 33
+#define RST_BUS_I2C2 34
+#define RST_BUS_UART0 35
+#define RST_BUS_UART1 36
+#define RST_BUS_UART2 37
+#define RST_BUS_UART3 38
+#define RST_BUS_UART4 39
+
+#endif /* _DT_BINDINGS_RST_SUN8I_A23_A33_H_ */
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 35+ messages in thread
* [U-Boot] [PATCH v2 02/14] usb: gadget: Document USBNET_DEVADDR
2017-09-12 19:01 ` [U-Boot] [PATCH v2 02/14] usb: gadget: Document USBNET_DEVADDR Maxime Ripard
@ 2017-09-13 4:27 ` Simon Glass
2017-09-13 10:37 ` Łukasz Majewski
1 sibling, 0 replies; 35+ messages in thread
From: Simon Glass @ 2017-09-13 4:27 UTC (permalink / raw)
To: u-boot
On 12 September 2017 at 13:01, Maxime Ripard
<maxime.ripard@free-electrons.com> wrote:
> Add an help about the USBNET_DEVADDR Kconfig option to make it clearer what
> it's about.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> ---
> drivers/usb/gadget/Kconfig | 3 +++
> 1 file changed, 3 insertions(+)
Reviewed-by: Simon Glass <sjg@chromium.org>
^ permalink raw reply [flat|nested] 35+ messages in thread
* [U-Boot] [PATCH v2 04/14] usb: gadget: Convert USB_ETHER to Kconfig
2017-09-12 19:01 ` [U-Boot] [PATCH v2 04/14] usb: gadget: Convert USB_ETHER " Maxime Ripard
@ 2017-09-13 4:27 ` Simon Glass
2017-09-13 10:39 ` Łukasz Majewski
1 sibling, 0 replies; 35+ messages in thread
From: Simon Glass @ 2017-09-13 4:27 UTC (permalink / raw)
To: u-boot
On 12 September 2017 at 13:01, Maxime Ripard
<maxime.ripard@free-electrons.com> wrote:
> The USB Ethernet gadget option has not yet been moved to Kconfig, let's
> deal with that.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> ---
> configs/am335x_baltos_defconfig | 1 +
> configs/am335x_boneblack_defconfig | 1 +
> configs/am335x_boneblack_vboot_defconfig | 1 +
> configs/am335x_evm_defconfig | 1 +
> configs/am335x_evm_nor_defconfig | 1 +
> configs/am335x_evm_norboot_defconfig | 1 +
> configs/am335x_evm_spiboot_defconfig | 1 +
> configs/am335x_evm_usbspl_defconfig | 1 +
> configs/am335x_hs_evm_defconfig | 1 +
> configs/draco_defconfig | 1 +
> configs/etamin_defconfig | 1 +
> configs/gwventana_emmc_defconfig | 1 +
> configs/gwventana_gw5904_defconfig | 1 +
> configs/gwventana_nand_defconfig | 1 +
> configs/ma5d4evk_defconfig | 1 +
> configs/mx6qsabrelite_defconfig | 1 +
> configs/nitrogen6dl2g_defconfig | 1 +
> configs/nitrogen6dl_defconfig | 1 +
> configs/nitrogen6q2g_defconfig | 1 +
> configs/nitrogen6q_defconfig | 1 +
> configs/nitrogen6s1g_defconfig | 1 +
> configs/nitrogen6s_defconfig | 1 +
> configs/novena_defconfig | 1 +
> configs/omap3_beagle_defconfig | 1 +
> configs/omap3_evm_defconfig | 1 +
> configs/omap3_logic_defconfig | 1 +
> configs/pcm051_rev1_defconfig | 1 +
> configs/pcm051_rev3_defconfig | 1 +
> configs/pxm2_defconfig | 1 +
> configs/rastaban_defconfig | 1 +
> configs/rut_defconfig | 1 +
> configs/sama5d2_ptc_nandflash_defconfig | 1 +
> configs/sama5d2_ptc_spiflash_defconfig | 1 +
> configs/sansa_fuze_plus_defconfig | 1 +
> configs/thuban_defconfig | 1 +
> configs/vinco_defconfig | 1 +
> configs/warp7_defconfig | 1 +
> configs/warp7_secure_defconfig | 1 +
> configs/xfi3_defconfig | 1 +
> drivers/usb/gadget/Kconfig | 14 ++++++++++++++
> include/configs/am335x_evm.h | 1 -
> include/configs/am3517_evm.h | 1 -
> include/configs/baltos.h | 1 -
> include/configs/gw_ventana.h | 1 -
> include/configs/h2200.h | 1 -
> include/configs/ma5d4evk.h | 1 -
> include/configs/nitrogen6x.h | 1 -
> include/configs/novena.h | 1 -
> include/configs/omap3_beagle.h | 1 -
> include/configs/omap3_evm.h | 1 -
> include/configs/omap3_logic.h | 1 -
> include/configs/pcm051.h | 1 -
> include/configs/sama5d2_ptc.h | 1 -
> include/configs/sansa_fuze_plus.h | 1 -
> include/configs/siemens-am33x-common.h | 1 -
> include/configs/tao3530.h | 2 --
> include/configs/vinco.h | 1 -
> include/configs/warp7.h | 1 -
> include/configs/xfi3.h | 1 -
> scripts/config_whitelist.txt | 1 -
> 60 files changed, 53 insertions(+), 21 deletions(-)
>
Reviewed-by: Simon Glass <sjg@chromium.org>
^ permalink raw reply [flat|nested] 35+ messages in thread
* [U-Boot] [PATCH v2 05/14] usb: gadget: usb_ether: Move the interfaces to Kconfig
2017-09-12 19:01 ` [U-Boot] [PATCH v2 05/14] usb: gadget: usb_ether: Move the interfaces " Maxime Ripard
@ 2017-09-13 4:27 ` Simon Glass
2017-09-13 10:39 ` Łukasz Majewski
1 sibling, 0 replies; 35+ messages in thread
From: Simon Glass @ 2017-09-13 4:27 UTC (permalink / raw)
To: u-boot
On 12 September 2017 at 13:01, Maxime Ripard
<maxime.ripard@free-electrons.com> wrote:
> We need to select an interface for the usb_ether gadget, and they haven't
> been converted to Kconfig yet. Add a choice to make sure we have an option
> selected, and convert all the users.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> ---
> configs/gwventana_emmc_defconfig | 1 +-
> configs/gwventana_gw5904_defconfig | 1 +-
> configs/gwventana_nand_defconfig | 1 +-
> configs/mx6qsabrelite_defconfig | 1 +-
> configs/nitrogen6dl2g_defconfig | 1 +-
> configs/nitrogen6dl_defconfig | 1 +-
> configs/nitrogen6q2g_defconfig | 1 +-
> configs/nitrogen6q_defconfig | 1 +-
> configs/nitrogen6s1g_defconfig | 1 +-
> configs/nitrogen6s_defconfig | 1 +-
> configs/novena_defconfig | 1 +-
> configs/sansa_fuze_plus_defconfig | 1 +-
> configs/warp7_defconfig | 1 +-
> configs/warp7_secure_defconfig | 1 +-
> configs/xfi3_defconfig | 1 +-
> drivers/usb/gadget/Kconfig | 28 +++++++++++++++++++++++++++-
> include/configs/am335x_evm.h | 4 +----
> include/configs/am3517_evm.h | 4 +----
> include/configs/baltos.h | 4 +----
> include/configs/gw_ventana.h | 1 +-
> include/configs/ma5d4evk.h | 1 +-
> include/configs/nitrogen6x.h | 1 +-
> include/configs/novena.h | 1 +-
> include/configs/pcm051.h | 4 +----
> include/configs/sama5d2_ptc.h | 1 +-
> include/configs/sansa_fuze_plus.h | 1 +-
> include/configs/siemens-am33x-common.h | 4 +----
> include/configs/vinco.h | 1 +-
> include/configs/warp7.h | 2 +--
> include/configs/xfi3.h | 1 +-
> scripts/config_whitelist.txt | 2 +--
> 31 files changed, 43 insertions(+), 32 deletions(-)
>
Reviewed-by: Simon Glass <sjg@chromium.org>
^ permalink raw reply [flat|nested] 35+ messages in thread
* [U-Boot] [PATCH v2 03/14] usb: gadget: Move USBNET_HOST_ADDR to Kconfig
2017-09-12 19:01 ` [U-Boot] [PATCH v2 03/14] usb: gadget: Move USBNET_HOST_ADDR to Kconfig Maxime Ripard
@ 2017-09-13 4:27 ` Simon Glass
2017-09-13 10:38 ` Łukasz Majewski
1 sibling, 0 replies; 35+ messages in thread
From: Simon Glass @ 2017-09-13 4:27 UTC (permalink / raw)
To: u-boot
On 12 September 2017 at 13:01, Maxime Ripard
<maxime.ripard@free-electrons.com> wrote:
> While the USB Ethernet device address is already defined in Kconfig, the
> host address isn't. Convert it.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> ---
> configs/am335x_baltos_defconfig | 1 +
> configs/am335x_boneblack_defconfig | 1 +
> configs/am335x_evm_norboot_defconfig | 1 +
> configs/pxm2_defconfig | 1 +
> configs/rastaban_defconfig | 1 +
> configs/warp7_defconfig | 1 +
> configs/warp7_secure_defconfig | 1 +
> drivers/usb/gadget/Kconfig | 7 +++++++
> include/configs/am335x_evm.h | 1 -
> include/configs/baltos.h | 1 -
> include/configs/h2200.h | 1 -
> include/configs/siemens-am33x-common.h | 1 -
> include/configs/warp7.h | 1 -
> scripts/config_whitelist.txt | 1 -
> 14 files changed, 14 insertions(+), 6 deletions(-)
>
Reviewed-by: Simon Glass <sjg@chromium.org>
^ permalink raw reply [flat|nested] 35+ messages in thread
* [U-Boot] [PATCH v2 01/14] usb: gadget: Move USBNET_DEVADDR option out of g_dnl
2017-09-12 19:01 ` [U-Boot] [PATCH v2 01/14] usb: gadget: Move USBNET_DEVADDR option out of g_dnl Maxime Ripard
@ 2017-09-13 10:37 ` Łukasz Majewski
0 siblings, 0 replies; 35+ messages in thread
From: Łukasz Majewski @ 2017-09-13 10:37 UTC (permalink / raw)
To: u-boot
On 09/12/2017 09:01 PM, Maxime Ripard wrote:
> The USBNET_DEVADDR has nothing to do with the USB download gadget, but
> rather with the USB Ethernet gadget. Move it out of the if statement.
>
> Reviewed-by: Simon Glass <sjg@chromium.org>
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> ---
> drivers/usb/gadget/Kconfig | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
> index 225b66bc95ff..d52626908846 100644
> --- a/drivers/usb/gadget/Kconfig
> +++ b/drivers/usb/gadget/Kconfig
> @@ -119,10 +119,10 @@ config G_DNL_VENDOR_NUM
> config G_DNL_PRODUCT_NUM
> hex "Product ID of USB device"
>
> +endif # USB_GADGET_DOWNLOAD
> +
> config USBNET_DEVADDR
> string "USB Gadget Ethernet device mac address"
> default "de:ad:be:ef:00:01"
>
> -endif # USB_GADGET_DOWNLOAD
> -
> endif # USB_GADGET
>
Acked-by: Łukasz Majewski <lukma@denx.de>
--
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-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
^ permalink raw reply [flat|nested] 35+ messages in thread
* [U-Boot] [PATCH v2 02/14] usb: gadget: Document USBNET_DEVADDR
2017-09-12 19:01 ` [U-Boot] [PATCH v2 02/14] usb: gadget: Document USBNET_DEVADDR Maxime Ripard
2017-09-13 4:27 ` Simon Glass
@ 2017-09-13 10:37 ` Łukasz Majewski
1 sibling, 0 replies; 35+ messages in thread
From: Łukasz Majewski @ 2017-09-13 10:37 UTC (permalink / raw)
To: u-boot
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="windows-1254", Size: 1084 bytes --]
On 09/12/2017 09:01 PM, Maxime Ripard wrote:
> Add an help about the USBNET_DEVADDR Kconfig option to make it clearer what
> it's about.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> ---
> drivers/usb/gadget/Kconfig | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
> index d52626908846..6dc9d177f5ad 100644
> --- a/drivers/usb/gadget/Kconfig
> +++ b/drivers/usb/gadget/Kconfig
> @@ -124,5 +124,8 @@ endif # USB_GADGET_DOWNLOAD
> config USBNET_DEVADDR
> string "USB Gadget Ethernet device mac address"
> default "de:ad:be:ef:00:01"
> + help
> + Ethernet MAC address of the device-side (ie. local board's) MAC
> + address of the usb_ether interface
>
> endif # USB_GADGET
>
Acked-by: Łukasz Majewski <lukma@denx.de>
--
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-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
^ permalink raw reply [flat|nested] 35+ messages in thread
* [U-Boot] [PATCH v2 03/14] usb: gadget: Move USBNET_HOST_ADDR to Kconfig
2017-09-12 19:01 ` [U-Boot] [PATCH v2 03/14] usb: gadget: Move USBNET_HOST_ADDR to Kconfig Maxime Ripard
2017-09-13 4:27 ` Simon Glass
@ 2017-09-13 10:38 ` Łukasz Majewski
1 sibling, 0 replies; 35+ messages in thread
From: Łukasz Majewski @ 2017-09-13 10:38 UTC (permalink / raw)
To: u-boot
On 09/12/2017 09:01 PM, Maxime Ripard wrote:
> While the USB Ethernet device address is already defined in Kconfig, the
> host address isn't. Convert it.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> ---
> configs/am335x_baltos_defconfig | 1 +
> configs/am335x_boneblack_defconfig | 1 +
> configs/am335x_evm_norboot_defconfig | 1 +
> configs/pxm2_defconfig | 1 +
> configs/rastaban_defconfig | 1 +
> configs/warp7_defconfig | 1 +
> configs/warp7_secure_defconfig | 1 +
> drivers/usb/gadget/Kconfig | 7 +++++++
> include/configs/am335x_evm.h | 1 -
> include/configs/baltos.h | 1 -
> include/configs/h2200.h | 1 -
> include/configs/siemens-am33x-common.h | 1 -
> include/configs/warp7.h | 1 -
> scripts/config_whitelist.txt | 1 -
> 14 files changed, 14 insertions(+), 6 deletions(-)
>
> diff --git a/configs/am335x_baltos_defconfig b/configs/am335x_baltos_defconfig
> index eb8338f0f10d..be057acf8634 100644
> --- a/configs/am335x_baltos_defconfig
> +++ b/configs/am335x_baltos_defconfig
> @@ -63,5 +63,6 @@ CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
> CONFIG_G_DNL_VENDOR_NUM=0x0403
> CONFIG_G_DNL_PRODUCT_NUM=0xbd00
> +CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00"
> CONFIG_FAT_WRITE=y
> CONFIG_OF_LIBFDT=y
> diff --git a/configs/am335x_boneblack_defconfig b/configs/am335x_boneblack_defconfig
> index b8526fc15ed3..719d16b145eb 100644
> --- a/configs/am335x_boneblack_defconfig
> +++ b/configs/am335x_boneblack_defconfig
> @@ -42,6 +42,7 @@ CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
> CONFIG_G_DNL_VENDOR_NUM=0x0451
> CONFIG_G_DNL_PRODUCT_NUM=0xd022
> +CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00"
> CONFIG_LZO=y
> CONFIG_OF_LIBFDT=y
> CONFIG_OF_LIBFDT_OVERLAY=y
> diff --git a/configs/am335x_evm_norboot_defconfig b/configs/am335x_evm_norboot_defconfig
> index c5e7425a7797..c9eab68c8299 100644
> --- a/configs/am335x_evm_norboot_defconfig
> +++ b/configs/am335x_evm_norboot_defconfig
> @@ -35,6 +35,7 @@ CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
> CONFIG_G_DNL_VENDOR_NUM=0x0451
> CONFIG_G_DNL_PRODUCT_NUM=0xd022
> +CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00"
> CONFIG_LZO=y
> CONFIG_OF_LIBFDT=y
> CONFIG_OF_LIBFDT_OVERLAY=y
> diff --git a/configs/pxm2_defconfig b/configs/pxm2_defconfig
> index 38370ee8d8f5..b1da71d4c7ed 100644
> --- a/configs/pxm2_defconfig
> +++ b/configs/pxm2_defconfig
> @@ -74,6 +74,7 @@ CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_G_DNL_MANUFACTURER="Siemens AG"
> CONFIG_G_DNL_VENDOR_NUM=0x0908
> CONFIG_G_DNL_PRODUCT_NUM=0x02d2
> +CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00"
> # CONFIG_VIDEO_SW_CURSOR is not set
> CONFIG_SYS_CONSOLE_BG_COL=0xff
> CONFIG_SYS_CONSOLE_FG_COL=0x00
> diff --git a/configs/rastaban_defconfig b/configs/rastaban_defconfig
> index 5acfe22b0a6d..940c4144d406 100644
> --- a/configs/rastaban_defconfig
> +++ b/configs/rastaban_defconfig
> @@ -70,3 +70,4 @@ CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_G_DNL_MANUFACTURER="Siemens AG"
> CONFIG_G_DNL_VENDOR_NUM=0x0908
> CONFIG_G_DNL_PRODUCT_NUM=0x02d2
> +CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00"
> diff --git a/configs/warp7_defconfig b/configs/warp7_defconfig
> index 99fe800317c2..f430f30bbbe5 100644
> --- a/configs/warp7_defconfig
> +++ b/configs/warp7_defconfig
> @@ -38,4 +38,5 @@ CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_G_DNL_MANUFACTURER="FSL"
> CONFIG_G_DNL_VENDOR_NUM=0x0525
> CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
> +CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00"
> CONFIG_OF_LIBFDT=y
> diff --git a/configs/warp7_secure_defconfig b/configs/warp7_secure_defconfig
> index 8beda72cd882..96e2c9e5cfde 100644
> --- a/configs/warp7_secure_defconfig
> +++ b/configs/warp7_secure_defconfig
> @@ -36,4 +36,5 @@ CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_G_DNL_MANUFACTURER="FSL"
> CONFIG_G_DNL_VENDOR_NUM=0x0525
> CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
> +CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00"
> CONFIG_OF_LIBFDT=y
> diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
> index 6dc9d177f5ad..510efd67b9a4 100644
> --- a/drivers/usb/gadget/Kconfig
> +++ b/drivers/usb/gadget/Kconfig
> @@ -128,4 +128,11 @@ config USBNET_DEVADDR
> Ethernet MAC address of the device-side (ie. local board's) MAC
> address of the usb_ether interface
>
> +config USBNET_HOST_ADDR
> + string "USB Gadget Ethernet host mac address"
> + default "de:ad:be:ef:00:00"
> + help
> + Ethernet MAC address of the host-side (ie. remote device's) MAC
> + address of the usb_ether interface
> +
> endif # USB_GADGET
> diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
> index 415ce46e0d8d..7c025c7e46c8 100644
> --- a/include/configs/am335x_evm.h
> +++ b/include/configs/am335x_evm.h
> @@ -266,7 +266,6 @@
> #ifdef CONFIG_USB_MUSB_GADGET
> #define CONFIG_USB_ETHER
> #define CONFIG_USB_ETH_RNDIS
> -#define CONFIG_USBNET_HOST_ADDR "de:ad:be:af:00:00"
> #endif /* CONFIG_USB_MUSB_GADGET */
>
> /*
> diff --git a/include/configs/baltos.h b/include/configs/baltos.h
> index 185c749d7868..535fdd4373b0 100644
> --- a/include/configs/baltos.h
> +++ b/include/configs/baltos.h
> @@ -286,7 +286,6 @@
> #ifdef CONFIG_USB_MUSB_GADGET
> #define CONFIG_USB_ETHER
> #define CONFIG_USB_ETH_RNDIS
> -#define CONFIG_USBNET_HOST_ADDR "de:ad:be:af:00:00"
> #endif /* CONFIG_USB_MUSB_GADGET */
>
> #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT)
> diff --git a/include/configs/h2200.h b/include/configs/h2200.h
> index 870014ddf475..e956e89a89d5 100644
> --- a/include/configs/h2200.h
> +++ b/include/configs/h2200.h
> @@ -127,7 +127,6 @@
> #define CONFIG_USB_ETH_SUBSET
>
> #define CONFIG_USBNET_DEV_ADDR "de:ad:be:ef:00:01"
> -#define CONFIG_USBNET_HOST_ADDR "de:ad:be:ef:00:02"
> #define CONFIG_EXTRA_ENV_SETTINGS \
> "stdin=serial\0" \
> "stdout=serial\0" \
> diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h
> index 2314a2d2ef35..2bcd77e9efc8 100644
> --- a/include/configs/siemens-am33x-common.h
> +++ b/include/configs/siemens-am33x-common.h
> @@ -181,7 +181,6 @@
> #ifdef CONFIG_USB_MUSB_GADGET
> #define CONFIG_USB_ETHER
> #define CONFIG_USB_ETH_RNDIS
> -#define CONFIG_USBNET_HOST_ADDR "de:ad:be:af:00:00"
> #endif /* CONFIG_USB_MUSB_GADGET */
>
> /* USB DRACO ID as default */
> diff --git a/include/configs/warp7.h b/include/configs/warp7.h
> index 75ae8a3e3338..9ce425156677 100644
> --- a/include/configs/warp7.h
> +++ b/include/configs/warp7.h
> @@ -139,7 +139,6 @@
> #define CONFIG_USB_ETHER
> #define CONFIG_USB_ETH_CDC
> #define CONFIG_USB_ETH_RNDIS
> -#define CONFIG_USBNET_HOST_ADDR "de:ad:be:af:00:00"
> #define CONFIG_USBNET_DEV_ADDR "de:ad:be:af:00:01"
>
> #endif
> diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
> index 9ce0c3f039ff..784e83c7c8a1 100644
> --- a/scripts/config_whitelist.txt
> +++ b/scripts/config_whitelist.txt
> @@ -4983,7 +4983,6 @@ CONFIG_USBD_SERIAL_OUT_PKTSIZE
> CONFIG_USBD_VENDORID
> CONFIG_USBID_ADDR
> CONFIG_USBNET_DEV_ADDR
> -CONFIG_USBNET_HOST_ADDR
> CONFIG_USBNET_MANUFACTURER
> CONFIG_USBTTY
> CONFIG_USB_AM35X
>
Reviewed-by: Łukasz Majewski <lukma@denx.de>
--
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-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
^ permalink raw reply [flat|nested] 35+ messages in thread
* [U-Boot] [PATCH v2 04/14] usb: gadget: Convert USB_ETHER to Kconfig
2017-09-12 19:01 ` [U-Boot] [PATCH v2 04/14] usb: gadget: Convert USB_ETHER " Maxime Ripard
2017-09-13 4:27 ` Simon Glass
@ 2017-09-13 10:39 ` Łukasz Majewski
1 sibling, 0 replies; 35+ messages in thread
From: Łukasz Majewski @ 2017-09-13 10:39 UTC (permalink / raw)
To: u-boot
On 09/12/2017 09:01 PM, Maxime Ripard wrote:
> The USB Ethernet gadget option has not yet been moved to Kconfig, let's
> deal with that.
Reviewed-by: Łukasz Majewski <lukma@denx.de>
>
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> ---
> configs/am335x_baltos_defconfig | 1 +
> configs/am335x_boneblack_defconfig | 1 +
> configs/am335x_boneblack_vboot_defconfig | 1 +
> configs/am335x_evm_defconfig | 1 +
> configs/am335x_evm_nor_defconfig | 1 +
> configs/am335x_evm_norboot_defconfig | 1 +
> configs/am335x_evm_spiboot_defconfig | 1 +
> configs/am335x_evm_usbspl_defconfig | 1 +
> configs/am335x_hs_evm_defconfig | 1 +
> configs/draco_defconfig | 1 +
> configs/etamin_defconfig | 1 +
> configs/gwventana_emmc_defconfig | 1 +
> configs/gwventana_gw5904_defconfig | 1 +
> configs/gwventana_nand_defconfig | 1 +
> configs/ma5d4evk_defconfig | 1 +
> configs/mx6qsabrelite_defconfig | 1 +
> configs/nitrogen6dl2g_defconfig | 1 +
> configs/nitrogen6dl_defconfig | 1 +
> configs/nitrogen6q2g_defconfig | 1 +
> configs/nitrogen6q_defconfig | 1 +
> configs/nitrogen6s1g_defconfig | 1 +
> configs/nitrogen6s_defconfig | 1 +
> configs/novena_defconfig | 1 +
> configs/omap3_beagle_defconfig | 1 +
> configs/omap3_evm_defconfig | 1 +
> configs/omap3_logic_defconfig | 1 +
> configs/pcm051_rev1_defconfig | 1 +
> configs/pcm051_rev3_defconfig | 1 +
> configs/pxm2_defconfig | 1 +
> configs/rastaban_defconfig | 1 +
> configs/rut_defconfig | 1 +
> configs/sama5d2_ptc_nandflash_defconfig | 1 +
> configs/sama5d2_ptc_spiflash_defconfig | 1 +
> configs/sansa_fuze_plus_defconfig | 1 +
> configs/thuban_defconfig | 1 +
> configs/vinco_defconfig | 1 +
> configs/warp7_defconfig | 1 +
> configs/warp7_secure_defconfig | 1 +
> configs/xfi3_defconfig | 1 +
> drivers/usb/gadget/Kconfig | 14 ++++++++++++++
> include/configs/am335x_evm.h | 1 -
> include/configs/am3517_evm.h | 1 -
> include/configs/baltos.h | 1 -
> include/configs/gw_ventana.h | 1 -
> include/configs/h2200.h | 1 -
> include/configs/ma5d4evk.h | 1 -
> include/configs/nitrogen6x.h | 1 -
> include/configs/novena.h | 1 -
> include/configs/omap3_beagle.h | 1 -
> include/configs/omap3_evm.h | 1 -
> include/configs/omap3_logic.h | 1 -
> include/configs/pcm051.h | 1 -
> include/configs/sama5d2_ptc.h | 1 -
> include/configs/sansa_fuze_plus.h | 1 -
> include/configs/siemens-am33x-common.h | 1 -
> include/configs/tao3530.h | 2 --
> include/configs/vinco.h | 1 -
> include/configs/warp7.h | 1 -
> include/configs/xfi3.h | 1 -
> scripts/config_whitelist.txt | 1 -
> 60 files changed, 53 insertions(+), 21 deletions(-)
>
> diff --git a/configs/am335x_baltos_defconfig b/configs/am335x_baltos_defconfig
> index be057acf8634..2f075091b27a 100644
> --- a/configs/am335x_baltos_defconfig
> +++ b/configs/am335x_baltos_defconfig
> @@ -63,6 +63,7 @@ CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
> CONFIG_G_DNL_VENDOR_NUM=0x0403
> CONFIG_G_DNL_PRODUCT_NUM=0xbd00
> +CONFIG_USB_ETHER=y
> CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00"
> CONFIG_FAT_WRITE=y
> CONFIG_OF_LIBFDT=y
> diff --git a/configs/am335x_boneblack_defconfig b/configs/am335x_boneblack_defconfig
> index 719d16b145eb..a3dd9b03b538 100644
> --- a/configs/am335x_boneblack_defconfig
> +++ b/configs/am335x_boneblack_defconfig
> @@ -42,6 +42,7 @@ CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
> CONFIG_G_DNL_VENDOR_NUM=0x0451
> CONFIG_G_DNL_PRODUCT_NUM=0xd022
> +CONFIG_USB_ETHER=y
> CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00"
> CONFIG_LZO=y
> CONFIG_OF_LIBFDT=y
> diff --git a/configs/am335x_boneblack_vboot_defconfig b/configs/am335x_boneblack_vboot_defconfig
> index 0a239bb73399..7d52382c24dc 100644
> --- a/configs/am335x_boneblack_vboot_defconfig
> +++ b/configs/am335x_boneblack_vboot_defconfig
> @@ -52,4 +52,5 @@ CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
> CONFIG_G_DNL_VENDOR_NUM=0x0451
> CONFIG_G_DNL_PRODUCT_NUM=0xd022
> +CONFIG_USB_ETHER=y
> CONFIG_LZO=y
> diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig
> index 00c1af43449d..69b2cf3e1f61 100644
> --- a/configs/am335x_evm_defconfig
> +++ b/configs/am335x_evm_defconfig
> @@ -54,6 +54,7 @@ CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
> CONFIG_G_DNL_VENDOR_NUM=0x0451
> CONFIG_G_DNL_PRODUCT_NUM=0xd022
> +CONFIG_USB_ETHER=y
> CONFIG_RSA=y
> CONFIG_LZO=y
> CONFIG_OF_LIBFDT_OVERLAY=y
> diff --git a/configs/am335x_evm_nor_defconfig b/configs/am335x_evm_nor_defconfig
> index 9f08edff4ca5..708df4284093 100644
> --- a/configs/am335x_evm_nor_defconfig
> +++ b/configs/am335x_evm_nor_defconfig
> @@ -41,6 +41,7 @@ CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
> CONFIG_G_DNL_VENDOR_NUM=0x0451
> CONFIG_G_DNL_PRODUCT_NUM=0xd022
> +CONFIG_USB_ETHER=y
> CONFIG_LZO=y
> CONFIG_OF_LIBFDT=y
> CONFIG_OF_LIBFDT_OVERLAY=y
> diff --git a/configs/am335x_evm_norboot_defconfig b/configs/am335x_evm_norboot_defconfig
> index c9eab68c8299..3f6f2798adce 100644
> --- a/configs/am335x_evm_norboot_defconfig
> +++ b/configs/am335x_evm_norboot_defconfig
> @@ -35,6 +35,7 @@ CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
> CONFIG_G_DNL_VENDOR_NUM=0x0451
> CONFIG_G_DNL_PRODUCT_NUM=0xd022
> +CONFIG_USB_ETHER=y
> CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00"
> CONFIG_LZO=y
> CONFIG_OF_LIBFDT=y
> diff --git a/configs/am335x_evm_spiboot_defconfig b/configs/am335x_evm_spiboot_defconfig
> index 501fb2b90f4d..427ca371815c 100644
> --- a/configs/am335x_evm_spiboot_defconfig
> +++ b/configs/am335x_evm_spiboot_defconfig
> @@ -39,6 +39,7 @@ CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
> CONFIG_G_DNL_VENDOR_NUM=0x0451
> CONFIG_G_DNL_PRODUCT_NUM=0xd022
> +CONFIG_USB_ETHER=y
> CONFIG_LZO=y
> CONFIG_OF_LIBFDT=y
> CONFIG_OF_LIBFDT_OVERLAY=y
> diff --git a/configs/am335x_evm_usbspl_defconfig b/configs/am335x_evm_usbspl_defconfig
> index 7c351382d96c..a4e9e8f1b27b 100644
> --- a/configs/am335x_evm_usbspl_defconfig
> +++ b/configs/am335x_evm_usbspl_defconfig
> @@ -45,6 +45,7 @@ CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
> CONFIG_G_DNL_VENDOR_NUM=0x0451
> CONFIG_G_DNL_PRODUCT_NUM=0xd022
> +CONFIG_USB_ETHER=y
> CONFIG_LZO=y
> CONFIG_OF_LIBFDT=y
> CONFIG_OF_LIBFDT_OVERLAY=y
> diff --git a/configs/am335x_hs_evm_defconfig b/configs/am335x_hs_evm_defconfig
> index acdd56b43558..552150732398 100644
> --- a/configs/am335x_hs_evm_defconfig
> +++ b/configs/am335x_hs_evm_defconfig
> @@ -58,5 +58,6 @@ CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
> CONFIG_G_DNL_VENDOR_NUM=0x0451
> CONFIG_G_DNL_PRODUCT_NUM=0xd022
> +CONFIG_USB_ETHER=y
> CONFIG_RSA=y
> CONFIG_LZO=y
> diff --git a/configs/draco_defconfig b/configs/draco_defconfig
> index f5a2c1b52621..e38030bf5913 100644
> --- a/configs/draco_defconfig
> +++ b/configs/draco_defconfig
> @@ -70,3 +70,4 @@ CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_G_DNL_MANUFACTURER="Siemens AG"
> CONFIG_G_DNL_VENDOR_NUM=0x0908
> CONFIG_G_DNL_PRODUCT_NUM=0x02d2
> +CONFIG_USB_ETHER=y
> diff --git a/configs/etamin_defconfig b/configs/etamin_defconfig
> index 148d4218c090..33ca6858abfd 100644
> --- a/configs/etamin_defconfig
> +++ b/configs/etamin_defconfig
> @@ -70,3 +70,4 @@ CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_G_DNL_MANUFACTURER="Siemens AG"
> CONFIG_G_DNL_VENDOR_NUM=0x0908
> CONFIG_G_DNL_PRODUCT_NUM=0x02d2
> +CONFIG_USB_ETHER=y
> diff --git a/configs/gwventana_emmc_defconfig b/configs/gwventana_emmc_defconfig
> index 74aa2ef56621..35d9e1ac27dc 100644
> --- a/configs/gwventana_emmc_defconfig
> +++ b/configs/gwventana_emmc_defconfig
> @@ -68,6 +68,7 @@ CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_G_DNL_MANUFACTURER="Gateworks"
> CONFIG_G_DNL_VENDOR_NUM=0x0525
> CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
> +CONFIG_USB_ETHER=y
> CONFIG_USB_HOST_ETHER=y
> CONFIG_USB_ETHER_ASIX=y
> CONFIG_USB_ETHER_SMSC95XX=y
> diff --git a/configs/gwventana_gw5904_defconfig b/configs/gwventana_gw5904_defconfig
> index 7bbdd500a78c..ca7eb5ac573e 100644
> --- a/configs/gwventana_gw5904_defconfig
> +++ b/configs/gwventana_gw5904_defconfig
> @@ -72,6 +72,7 @@ CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_G_DNL_MANUFACTURER="Gateworks"
> CONFIG_G_DNL_VENDOR_NUM=0x0525
> CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
> +CONFIG_USB_ETHER=y
> CONFIG_USB_HOST_ETHER=y
> CONFIG_USB_ETHER_ASIX=y
> CONFIG_USB_ETHER_SMSC95XX=y
> diff --git a/configs/gwventana_nand_defconfig b/configs/gwventana_nand_defconfig
> index aaedf93eeac9..cb9655574888 100644
> --- a/configs/gwventana_nand_defconfig
> +++ b/configs/gwventana_nand_defconfig
> @@ -71,6 +71,7 @@ CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_G_DNL_MANUFACTURER="Gateworks"
> CONFIG_G_DNL_VENDOR_NUM=0x0525
> CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
> +CONFIG_USB_ETHER=y
> CONFIG_USB_HOST_ETHER=y
> CONFIG_USB_ETHER_ASIX=y
> CONFIG_USB_ETHER_SMSC95XX=y
> diff --git a/configs/ma5d4evk_defconfig b/configs/ma5d4evk_defconfig
> index 0d8c109fbcf1..0655505a1321 100644
> --- a/configs/ma5d4evk_defconfig
> +++ b/configs/ma5d4evk_defconfig
> @@ -52,6 +52,7 @@ CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_G_DNL_MANUFACTURER="AriesEmbedded"
> CONFIG_G_DNL_VENDOR_NUM=0x0525
> CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
> +CONFIG_USB_ETHER=y
> CONFIG_FAT_WRITE=y
> CONFIG_OF_LIBFDT=y
> # CONFIG_EFI_LOADER is not set
> diff --git a/configs/mx6qsabrelite_defconfig b/configs/mx6qsabrelite_defconfig
> index 57aba7e6d09a..bab0d0c79f0d 100644
> --- a/configs/mx6qsabrelite_defconfig
> +++ b/configs/mx6qsabrelite_defconfig
> @@ -54,5 +54,6 @@ CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_G_DNL_MANUFACTURER="Boundary"
> CONFIG_G_DNL_VENDOR_NUM=0x0525
> CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
> +CONFIG_USB_ETHER=y
> # CONFIG_VIDEO_SW_CURSOR is not set
> CONFIG_OF_LIBFDT=y
> diff --git a/configs/nitrogen6dl2g_defconfig b/configs/nitrogen6dl2g_defconfig
> index 50e6b70bc9a0..0d19b85a30f3 100644
> --- a/configs/nitrogen6dl2g_defconfig
> +++ b/configs/nitrogen6dl2g_defconfig
> @@ -51,5 +51,6 @@ CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_G_DNL_MANUFACTURER="Boundary"
> CONFIG_G_DNL_VENDOR_NUM=0x0525
> CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
> +CONFIG_USB_ETHER=y
> # CONFIG_VIDEO_SW_CURSOR is not set
> CONFIG_OF_LIBFDT=y
> diff --git a/configs/nitrogen6dl_defconfig b/configs/nitrogen6dl_defconfig
> index 61e5ea4e21ef..a20580eb77bb 100644
> --- a/configs/nitrogen6dl_defconfig
> +++ b/configs/nitrogen6dl_defconfig
> @@ -51,5 +51,6 @@ CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_G_DNL_MANUFACTURER="Boundary"
> CONFIG_G_DNL_VENDOR_NUM=0x0525
> CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
> +CONFIG_USB_ETHER=y
> # CONFIG_VIDEO_SW_CURSOR is not set
> CONFIG_OF_LIBFDT=y
> diff --git a/configs/nitrogen6q2g_defconfig b/configs/nitrogen6q2g_defconfig
> index 9dbb7181ee23..940c74a5ece2 100644
> --- a/configs/nitrogen6q2g_defconfig
> +++ b/configs/nitrogen6q2g_defconfig
> @@ -52,5 +52,6 @@ CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_G_DNL_MANUFACTURER="Boundary"
> CONFIG_G_DNL_VENDOR_NUM=0x0525
> CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
> +CONFIG_USB_ETHER=y
> # CONFIG_VIDEO_SW_CURSOR is not set
> CONFIG_OF_LIBFDT=y
> diff --git a/configs/nitrogen6q_defconfig b/configs/nitrogen6q_defconfig
> index 5478390fd8c3..83772cb2efcf 100644
> --- a/configs/nitrogen6q_defconfig
> +++ b/configs/nitrogen6q_defconfig
> @@ -52,5 +52,6 @@ CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_G_DNL_MANUFACTURER="Boundary"
> CONFIG_G_DNL_VENDOR_NUM=0x0525
> CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
> +CONFIG_USB_ETHER=y
> # CONFIG_VIDEO_SW_CURSOR is not set
> CONFIG_OF_LIBFDT=y
> diff --git a/configs/nitrogen6s1g_defconfig b/configs/nitrogen6s1g_defconfig
> index 01881686429b..862b41a3f8c9 100644
> --- a/configs/nitrogen6s1g_defconfig
> +++ b/configs/nitrogen6s1g_defconfig
> @@ -51,5 +51,6 @@ CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_G_DNL_MANUFACTURER="Boundary"
> CONFIG_G_DNL_VENDOR_NUM=0x0525
> CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
> +CONFIG_USB_ETHER=y
> # CONFIG_VIDEO_SW_CURSOR is not set
> CONFIG_OF_LIBFDT=y
> diff --git a/configs/nitrogen6s_defconfig b/configs/nitrogen6s_defconfig
> index 51f1f91be854..e5376313b9bd 100644
> --- a/configs/nitrogen6s_defconfig
> +++ b/configs/nitrogen6s_defconfig
> @@ -51,5 +51,6 @@ CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_G_DNL_MANUFACTURER="Boundary"
> CONFIG_G_DNL_VENDOR_NUM=0x0525
> CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
> +CONFIG_USB_ETHER=y
> # CONFIG_VIDEO_SW_CURSOR is not set
> CONFIG_OF_LIBFDT=y
> diff --git a/configs/novena_defconfig b/configs/novena_defconfig
> index 2921525f9fb0..786ab2854f70 100644
> --- a/configs/novena_defconfig
> +++ b/configs/novena_defconfig
> @@ -48,6 +48,7 @@ CONFIG_USB_KEYBOARD=y
> CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y
> CONFIG_USB_GADGET=y
> CONFIG_CI_UDC=y
> +CONFIG_USB_ETHER=y
> CONFIG_USB_HOST_ETHER=y
> CONFIG_USB_ETHER_ASIX=y
> CONFIG_USB_ETHER_SMSC95XX=y
> diff --git a/configs/omap3_beagle_defconfig b/configs/omap3_beagle_defconfig
> index cf888f3491aa..8896b84ebc9a 100644
> --- a/configs/omap3_beagle_defconfig
> +++ b/configs/omap3_beagle_defconfig
> @@ -52,6 +52,7 @@ CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_G_DNL_MANUFACTURER="TI"
> CONFIG_G_DNL_VENDOR_NUM=0x0451
> CONFIG_G_DNL_PRODUCT_NUM=0xd022
> +CONFIG_USB_ETHER=y
> CONFIG_USB_HOST_ETHER=y
> CONFIG_USB_ETHER_ASIX=y
> CONFIG_USB_ETHER_MCS7830=y
> diff --git a/configs/omap3_evm_defconfig b/configs/omap3_evm_defconfig
> index 962ffa072996..8db95f167a1a 100644
> --- a/configs/omap3_evm_defconfig
> +++ b/configs/omap3_evm_defconfig
> @@ -56,6 +56,7 @@ CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
> CONFIG_G_DNL_VENDOR_NUM=0x0451
> CONFIG_G_DNL_PRODUCT_NUM=0x5678
> +CONFIG_USB_ETHER=y
> CONFIG_FAT_WRITE=y
> CONFIG_BCH=y
> CONFIG_OF_LIBFDT=y
> diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig
> index 8d0a4d48e415..3bf115e6f8c8 100644
> --- a/configs/omap3_logic_defconfig
> +++ b/configs/omap3_logic_defconfig
> @@ -49,4 +49,5 @@ CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_G_DNL_MANUFACTURER="TI"
> CONFIG_G_DNL_VENDOR_NUM=0x0451
> CONFIG_G_DNL_PRODUCT_NUM=0xd022
> +CONFIG_USB_ETHER=y
> CONFIG_BCH=y
> diff --git a/configs/pcm051_rev1_defconfig b/configs/pcm051_rev1_defconfig
> index 1683f88b690b..9b325d43ba79 100644
> --- a/configs/pcm051_rev1_defconfig
> +++ b/configs/pcm051_rev1_defconfig
> @@ -60,5 +60,6 @@ CONFIG_USB_MUSB_HOST=y
> CONFIG_USB_MUSB_GADGET=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_ETHER=y
> CONFIG_FAT_WRITE=y
> CONFIG_OF_LIBFDT=y
> diff --git a/configs/pcm051_rev3_defconfig b/configs/pcm051_rev3_defconfig
> index d082bb4af204..14211ec6835e 100644
> --- a/configs/pcm051_rev3_defconfig
> +++ b/configs/pcm051_rev3_defconfig
> @@ -60,5 +60,6 @@ CONFIG_USB_MUSB_HOST=y
> CONFIG_USB_MUSB_GADGET=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_ETHER=y
> CONFIG_FAT_WRITE=y
> CONFIG_OF_LIBFDT=y
> diff --git a/configs/pxm2_defconfig b/configs/pxm2_defconfig
> index b1da71d4c7ed..b6624f0be16c 100644
> --- a/configs/pxm2_defconfig
> +++ b/configs/pxm2_defconfig
> @@ -74,6 +74,7 @@ CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_G_DNL_MANUFACTURER="Siemens AG"
> CONFIG_G_DNL_VENDOR_NUM=0x0908
> CONFIG_G_DNL_PRODUCT_NUM=0x02d2
> +CONFIG_USB_ETHER=y
> CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00"
> # CONFIG_VIDEO_SW_CURSOR is not set
> CONFIG_SYS_CONSOLE_BG_COL=0xff
> diff --git a/configs/rastaban_defconfig b/configs/rastaban_defconfig
> index 940c4144d406..ed5f2f841b2a 100644
> --- a/configs/rastaban_defconfig
> +++ b/configs/rastaban_defconfig
> @@ -70,4 +70,5 @@ CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_G_DNL_MANUFACTURER="Siemens AG"
> CONFIG_G_DNL_VENDOR_NUM=0x0908
> CONFIG_G_DNL_PRODUCT_NUM=0x02d2
> +CONFIG_USB_ETHER=y
> CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00"
> diff --git a/configs/rut_defconfig b/configs/rut_defconfig
> index 6ec8ff35710e..1b787906baf9 100644
> --- a/configs/rut_defconfig
> +++ b/configs/rut_defconfig
> @@ -75,6 +75,7 @@ CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_G_DNL_MANUFACTURER="Siemens AG"
> CONFIG_G_DNL_VENDOR_NUM=0x0908
> CONFIG_G_DNL_PRODUCT_NUM=0x02d2
> +CONFIG_USB_ETHER=y
> # CONFIG_VIDEO_SW_CURSOR is not set
> CONFIG_SYS_CONSOLE_BG_COL=0xff
> CONFIG_SYS_CONSOLE_FG_COL=0x00
> diff --git a/configs/sama5d2_ptc_nandflash_defconfig b/configs/sama5d2_ptc_nandflash_defconfig
> index bca3ac2fcbfc..6672a5ce11f7 100644
> --- a/configs/sama5d2_ptc_nandflash_defconfig
> +++ b/configs/sama5d2_ptc_nandflash_defconfig
> @@ -30,3 +30,4 @@ CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> CONFIG_USB_GADGET_ATMEL_USBA=y
> +CONFIG_USB_ETHER=y
> diff --git a/configs/sama5d2_ptc_spiflash_defconfig b/configs/sama5d2_ptc_spiflash_defconfig
> index e4fb49f6627d..9a23a808f1b3 100644
> --- a/configs/sama5d2_ptc_spiflash_defconfig
> +++ b/configs/sama5d2_ptc_spiflash_defconfig
> @@ -31,3 +31,4 @@ CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> CONFIG_USB_GADGET_ATMEL_USBA=y
> +CONFIG_USB_ETHER=y
> diff --git a/configs/sansa_fuze_plus_defconfig b/configs/sansa_fuze_plus_defconfig
> index f6ce09c366b4..c6d50ccb8e15 100644
> --- a/configs/sansa_fuze_plus_defconfig
> +++ b/configs/sansa_fuze_plus_defconfig
> @@ -32,4 +32,5 @@ CONFIG_USB=y
> CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_GADGET=y
> CONFIG_CI_UDC=y
> +CONFIG_USB_ETHER=y
> CONFIG_OF_LIBFDT=y
> diff --git a/configs/thuban_defconfig b/configs/thuban_defconfig
> index c30e924fb56f..eb9124ce23ec 100644
> --- a/configs/thuban_defconfig
> +++ b/configs/thuban_defconfig
> @@ -70,3 +70,4 @@ CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_G_DNL_MANUFACTURER="Siemens AG"
> CONFIG_G_DNL_VENDOR_NUM=0x0908
> CONFIG_G_DNL_PRODUCT_NUM=0x02d2
> +CONFIG_USB_ETHER=y
> diff --git a/configs/vinco_defconfig b/configs/vinco_defconfig
> index 2cd4466a08e5..08aa8c52a254 100644
> --- a/configs/vinco_defconfig
> +++ b/configs/vinco_defconfig
> @@ -32,5 +32,6 @@ CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> CONFIG_USB_GADGET_ATMEL_USBA=y
> +CONFIG_USB_ETHER=y
> CONFIG_USB_HOST_ETHER=y
> CONFIG_USB_ETHER_SMSC95XX=y
> diff --git a/configs/warp7_defconfig b/configs/warp7_defconfig
> index f430f30bbbe5..8a3717facdbd 100644
> --- a/configs/warp7_defconfig
> +++ b/configs/warp7_defconfig
> @@ -38,5 +38,6 @@ CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_G_DNL_MANUFACTURER="FSL"
> CONFIG_G_DNL_VENDOR_NUM=0x0525
> CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
> +CONFIG_USB_ETHER=y
> CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00"
> CONFIG_OF_LIBFDT=y
> diff --git a/configs/warp7_secure_defconfig b/configs/warp7_secure_defconfig
> index 96e2c9e5cfde..83a06079fdc5 100644
> --- a/configs/warp7_secure_defconfig
> +++ b/configs/warp7_secure_defconfig
> @@ -36,5 +36,6 @@ CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_G_DNL_MANUFACTURER="FSL"
> CONFIG_G_DNL_VENDOR_NUM=0x0525
> CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
> +CONFIG_USB_ETHER=y
> CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00"
> CONFIG_OF_LIBFDT=y
> diff --git a/configs/xfi3_defconfig b/configs/xfi3_defconfig
> index de80da69c68b..6cc78452829c 100644
> --- a/configs/xfi3_defconfig
> +++ b/configs/xfi3_defconfig
> @@ -31,4 +31,5 @@ CONFIG_USB=y
> CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_GADGET=y
> CONFIG_CI_UDC=y
> +CONFIG_USB_ETHER=y
> CONFIG_OF_LIBFDT=y
> diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
> index 510efd67b9a4..ae3a37b3a935 100644
> --- a/drivers/usb/gadget/Kconfig
> +++ b/drivers/usb/gadget/Kconfig
> @@ -121,6 +121,18 @@ config G_DNL_PRODUCT_NUM
>
> endif # USB_GADGET_DOWNLOAD
>
> +config USB_ETHER
> + bool "USB Ethernet Gadget"
> + help
> + Creates an Ethernet network device through a USB peripheral
> + controller. This will create a network interface on both the device
> + (U-Boot) and the host (remote device) that can be used just like any
> + other nework interface.
> + It will bind on the peripheral USB controller, ignoring the USB hosts
> + controllers in the system.
> +
> +if USB_ETHER
> +
> config USBNET_DEVADDR
> string "USB Gadget Ethernet device mac address"
> default "de:ad:be:ef:00:01"
> @@ -135,4 +147,6 @@ config USBNET_HOST_ADDR
> Ethernet MAC address of the host-side (ie. remote device's) MAC
> address of the usb_ether interface
>
> +endif # USB_ETHER
> +
> endif # USB_GADGET
> diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
> index 7c025c7e46c8..9238c4bb769c 100644
> --- a/include/configs/am335x_evm.h
> +++ b/include/configs/am335x_evm.h
> @@ -264,7 +264,6 @@
> #define CONFIG_AM335X_USB1_MODE MUSB_HOST
>
> #ifdef CONFIG_USB_MUSB_GADGET
> -#define CONFIG_USB_ETHER
> #define CONFIG_USB_ETH_RNDIS
> #endif /* CONFIG_USB_MUSB_GADGET */
>
> diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h
> index 5435ca8f4ea4..d09672770134 100644
> --- a/include/configs/am3517_evm.h
> +++ b/include/configs/am3517_evm.h
> @@ -80,7 +80,6 @@
> #endif /* CONFIG_USB_MUSB_HOST */
>
> #ifdef CONFIG_USB_MUSB_GADGET
> -#define CONFIG_USB_ETHER
> #define CONFIG_USB_ETH_RNDIS
> #endif /* CONFIG_USB_MUSB_GADGET */
>
> diff --git a/include/configs/baltos.h b/include/configs/baltos.h
> index 535fdd4373b0..380a78918f29 100644
> --- a/include/configs/baltos.h
> +++ b/include/configs/baltos.h
> @@ -284,7 +284,6 @@
> #define CONFIG_AM335X_USB1_MODE MUSB_OTG
>
> #ifdef CONFIG_USB_MUSB_GADGET
> -#define CONFIG_USB_ETHER
> #define CONFIG_USB_ETH_RNDIS
> #endif /* CONFIG_USB_MUSB_GADGET */
>
> diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
> index 9c26059a068e..f4b7a061ba12 100644
> --- a/include/configs/gw_ventana.h
> +++ b/include/configs/gw_ventana.h
> @@ -146,7 +146,6 @@
> #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
> #define CONFIG_MXC_USB_FLAGS 0
> #define CONFIG_USBD_HS
> -#define CONFIG_USB_ETHER
> #define CONFIG_USB_ETH_CDC
> #define CONFIG_NETCONSOLE
>
> diff --git a/include/configs/h2200.h b/include/configs/h2200.h
> index e956e89a89d5..24ff53f6f1e9 100644
> --- a/include/configs/h2200.h
> +++ b/include/configs/h2200.h
> @@ -123,7 +123,6 @@
> "bootm ; "
>
> #define CONFIG_USB_GADGET_PXA2XX
> -#define CONFIG_USB_ETHER
> #define CONFIG_USB_ETH_SUBSET
>
> #define CONFIG_USBNET_DEV_ADDR "de:ad:be:ef:00:01"
> diff --git a/include/configs/ma5d4evk.h b/include/configs/ma5d4evk.h
> index 50b21c9d97a0..2ad4952f5eeb 100644
> --- a/include/configs/ma5d4evk.h
> +++ b/include/configs/ma5d4evk.h
> @@ -97,7 +97,6 @@
> #ifdef CONFIG_CMD_USB
>
> /* USB device */
> -#define CONFIG_USB_ETHER
> #define CONFIG_USB_ETH_RNDIS
> #define CONFIG_USBNET_MANUFACTURER "AriesEmbedded"
> #define CONFIG_USB_FUNCTION_MASS_STORAGE
> diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
> index d32d8f871a99..ca37f584f042 100644
> --- a/include/configs/nitrogen6x.h
> +++ b/include/configs/nitrogen6x.h
> @@ -19,7 +19,6 @@
>
> #define CONFIG_MISC_INIT_R
> #define CONFIG_USBD_HS
> -#define CONFIG_USB_ETHER
> #define CONFIG_USB_ETH_CDC
> #define CONFIG_NETCONSOLE
>
> diff --git a/include/configs/novena.h b/include/configs/novena.h
> index be8c6911e63a..9068ee2182e3 100644
> --- a/include/configs/novena.h
> +++ b/include/configs/novena.h
> @@ -129,7 +129,6 @@
> #define CONFIG_MXC_USB_FLAGS 0
> /* Gadget part */
> #define CONFIG_USBD_HS
> -#define CONFIG_USB_ETHER
> #define CONFIG_USB_ETH_CDC
> #define CONFIG_NETCONSOLE
> #endif
> diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
> index ee22f4fc1bb5..ff6e86e80e9e 100644
> --- a/include/configs/omap3_beagle.h
> +++ b/include/configs/omap3_beagle.h
> @@ -46,7 +46,6 @@
> #define CONFIG_USB_MUSB_OMAP2PLUS
> #define CONFIG_USB_MUSB_PIO_ONLY
> #define CONFIG_TWL4030_USB 1
> -#define CONFIG_USB_ETHER
>
> /* USB EHCI */
>
> diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
> index af99e8b5cb48..178e61e1b6f7 100644
> --- a/include/configs/omap3_evm.h
> +++ b/include/configs/omap3_evm.h
> @@ -82,7 +82,6 @@
> #define CONFIG_USB_OMAP3
> #define CONFIG_USB_MUSB_OMAP2PLUS
> #define CONFIG_USB_MUSB_PIO_ONLY
> -#define CONFIG_USB_ETHER
>
> /* USB EHCI */
> #define CONFIG_SYS_USB_FAT_BOOT_PARTITION 1
> diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h
> index 5fba35668b2d..092bb73a8464 100644
> --- a/include/configs/omap3_logic.h
> +++ b/include/configs/omap3_logic.h
> @@ -57,7 +57,6 @@
> /* USB */
> #define CONFIG_USB_MUSB_OMAP2PLUS
> #define CONFIG_USB_MUSB_PIO_ONLY
> -#define CONFIG_USB_ETHER
>
> /* TWL4030 */
> #define CONFIG_TWL4030_USB
> diff --git a/include/configs/pcm051.h b/include/configs/pcm051.h
> index f678b2944dd0..309bbd6bd36f 100644
> --- a/include/configs/pcm051.h
> +++ b/include/configs/pcm051.h
> @@ -134,7 +134,6 @@
> #define CONFIG_AM335X_USB1_MODE MUSB_HOST
>
> #ifdef CONFIG_USB_MUSB_GADGET
> -#define CONFIG_USB_ETHER
> #define CONFIG_USB_ETH_RNDIS
> #endif /* CONFIG_USB_MUSB_GADGET */
>
> diff --git a/include/configs/sama5d2_ptc.h b/include/configs/sama5d2_ptc.h
> index b04781893d48..a1a0602cdd0c 100644
> --- a/include/configs/sama5d2_ptc.h
> +++ b/include/configs/sama5d2_ptc.h
> @@ -60,7 +60,6 @@
> #endif
>
> /* USB device */
> -#define CONFIG_USB_ETHER
> #define CONFIG_USB_ETH_RNDIS
> #define CONFIG_USBNET_MANUFACTURER "Atmel SAMA5D2_PTC"
>
> diff --git a/include/configs/sansa_fuze_plus.h b/include/configs/sansa_fuze_plus.h
> index 250917b1dc05..9e33ca42270c 100644
> --- a/include/configs/sansa_fuze_plus.h
> +++ b/include/configs/sansa_fuze_plus.h
> @@ -39,7 +39,6 @@
> #define CONFIG_EHCI_MXS_PORT0
> #define CONFIG_USB_MAX_CONTROLLER_COUNT 1
>
> -#define CONFIG_USB_ETHER
> #define CONFIG_USB_ETH_CDC
> #define CONFIG_NETCONSOLE
> #endif
> diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h
> index 2bcd77e9efc8..0600984f95aa 100644
> --- a/include/configs/siemens-am33x-common.h
> +++ b/include/configs/siemens-am33x-common.h
> @@ -179,7 +179,6 @@
> #define CONFIG_AM335X_USB1_MODE MUSB_HOST
>
> #ifdef CONFIG_USB_MUSB_GADGET
> -#define CONFIG_USB_ETHER
> #define CONFIG_USB_ETH_RNDIS
> #endif /* CONFIG_USB_MUSB_GADGET */
>
> diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h
> index 11b909b7dd88..1a4b78674f01 100644
> --- a/include/configs/tao3530.h
> +++ b/include/configs/tao3530.h
> @@ -215,8 +215,6 @@
> /* USB EHCI */
> #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 162
>
> -#define CONFIG_USB_ETHER
> -
> /* Defines for SPL */
> #define CONFIG_SPL_FRAMEWORK
> #define CONFIG_SPL_NAND_SIMPLE
> diff --git a/include/configs/vinco.h b/include/configs/vinco.h
> index 490dc446d6d2..3b3ec6c8f2ad 100644
> --- a/include/configs/vinco.h
> +++ b/include/configs/vinco.h
> @@ -64,7 +64,6 @@
> #endif
>
> /* USB device */
> -#define CONFIG_USB_ETHER
> #define CONFIG_USB_ETH_RNDIS
> #define CONFIG_USBNET_MANUFACTURER "L+G VInCo"
>
> diff --git a/include/configs/warp7.h b/include/configs/warp7.h
> index 9ce425156677..05ae3542a9ad 100644
> --- a/include/configs/warp7.h
> +++ b/include/configs/warp7.h
> @@ -136,7 +136,6 @@
> #define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_16M
> #define DFU_DEFAULT_POLL_TIMEOUT 300
>
> -#define CONFIG_USB_ETHER
> #define CONFIG_USB_ETH_CDC
> #define CONFIG_USB_ETH_RNDIS
> #define CONFIG_USBNET_DEV_ADDR "de:ad:be:af:00:01"
> diff --git a/include/configs/xfi3.h b/include/configs/xfi3.h
> index 73f431681db3..7bbfd75c0cb8 100644
> --- a/include/configs/xfi3.h
> +++ b/include/configs/xfi3.h
> @@ -39,7 +39,6 @@
> #define CONFIG_EHCI_MXS_PORT0
> #define CONFIG_USB_MAX_CONTROLLER_COUNT 1
>
> -#define CONFIG_USB_ETHER
> #define CONFIG_USB_ETH_CDC
> #define CONFIG_NETCONSOLE
> #endif
> diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
> index 784e83c7c8a1..e9e716e7c80e 100644
> --- a/scripts/config_whitelist.txt
> +++ b/scripts/config_whitelist.txt
> @@ -5013,7 +5013,6 @@ CONFIG_USB_EHCI_TEGRA
> CONFIG_USB_EHCI_TXFIFO_THRESH
> CONFIG_USB_EHCI_VCT
> CONFIG_USB_EHCI_VF
> -CONFIG_USB_ETHER
> CONFIG_USB_ETH_CDC
> CONFIG_USB_ETH_QMULT
> CONFIG_USB_ETH_RNDIS
>
--
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-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
^ permalink raw reply [flat|nested] 35+ messages in thread
* [U-Boot] [PATCH v2 05/14] usb: gadget: usb_ether: Move the interfaces to Kconfig
2017-09-12 19:01 ` [U-Boot] [PATCH v2 05/14] usb: gadget: usb_ether: Move the interfaces " Maxime Ripard
2017-09-13 4:27 ` Simon Glass
@ 2017-09-13 10:39 ` Łukasz Majewski
1 sibling, 0 replies; 35+ messages in thread
From: Łukasz Majewski @ 2017-09-13 10:39 UTC (permalink / raw)
To: u-boot
On 09/12/2017 09:01 PM, Maxime Ripard wrote:
> We need to select an interface for the usb_ether gadget, and they haven't
> been converted to Kconfig yet. Add a choice to make sure we have an option
> selected, and convert all the users.
Reviewed-by: Łukasz Majewski <lukma@denx.de>
>
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> ---
> configs/gwventana_emmc_defconfig | 1 +-
> configs/gwventana_gw5904_defconfig | 1 +-
> configs/gwventana_nand_defconfig | 1 +-
> configs/mx6qsabrelite_defconfig | 1 +-
> configs/nitrogen6dl2g_defconfig | 1 +-
> configs/nitrogen6dl_defconfig | 1 +-
> configs/nitrogen6q2g_defconfig | 1 +-
> configs/nitrogen6q_defconfig | 1 +-
> configs/nitrogen6s1g_defconfig | 1 +-
> configs/nitrogen6s_defconfig | 1 +-
> configs/novena_defconfig | 1 +-
> configs/sansa_fuze_plus_defconfig | 1 +-
> configs/warp7_defconfig | 1 +-
> configs/warp7_secure_defconfig | 1 +-
> configs/xfi3_defconfig | 1 +-
> drivers/usb/gadget/Kconfig | 28 +++++++++++++++++++++++++++-
> include/configs/am335x_evm.h | 4 +----
> include/configs/am3517_evm.h | 4 +----
> include/configs/baltos.h | 4 +----
> include/configs/gw_ventana.h | 1 +-
> include/configs/ma5d4evk.h | 1 +-
> include/configs/nitrogen6x.h | 1 +-
> include/configs/novena.h | 1 +-
> include/configs/pcm051.h | 4 +----
> include/configs/sama5d2_ptc.h | 1 +-
> include/configs/sansa_fuze_plus.h | 1 +-
> include/configs/siemens-am33x-common.h | 4 +----
> include/configs/vinco.h | 1 +-
> include/configs/warp7.h | 2 +--
> include/configs/xfi3.h | 1 +-
> scripts/config_whitelist.txt | 2 +--
> 31 files changed, 43 insertions(+), 32 deletions(-)
>
> diff --git a/configs/gwventana_emmc_defconfig b/configs/gwventana_emmc_defconfig
> index 35d9e1ac27dc..03d732d8f11e 100644
> --- a/configs/gwventana_emmc_defconfig
> +++ b/configs/gwventana_emmc_defconfig
> @@ -69,6 +69,7 @@ CONFIG_G_DNL_MANUFACTURER="Gateworks"
> CONFIG_G_DNL_VENDOR_NUM=0x0525
> CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
> CONFIG_USB_ETHER=y
> +CONFIG_USB_ETH_CDC=y
> CONFIG_USB_HOST_ETHER=y
> CONFIG_USB_ETHER_ASIX=y
> CONFIG_USB_ETHER_SMSC95XX=y
> diff --git a/configs/gwventana_gw5904_defconfig b/configs/gwventana_gw5904_defconfig
> index ca7eb5ac573e..51aa13dbaca3 100644
> --- a/configs/gwventana_gw5904_defconfig
> +++ b/configs/gwventana_gw5904_defconfig
> @@ -73,6 +73,7 @@ CONFIG_G_DNL_MANUFACTURER="Gateworks"
> CONFIG_G_DNL_VENDOR_NUM=0x0525
> CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
> CONFIG_USB_ETHER=y
> +CONFIG_USB_ETH_CDC=y
> CONFIG_USB_HOST_ETHER=y
> CONFIG_USB_ETHER_ASIX=y
> CONFIG_USB_ETHER_SMSC95XX=y
> diff --git a/configs/gwventana_nand_defconfig b/configs/gwventana_nand_defconfig
> index cb9655574888..4b2e1a752935 100644
> --- a/configs/gwventana_nand_defconfig
> +++ b/configs/gwventana_nand_defconfig
> @@ -72,6 +72,7 @@ CONFIG_G_DNL_MANUFACTURER="Gateworks"
> CONFIG_G_DNL_VENDOR_NUM=0x0525
> CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
> CONFIG_USB_ETHER=y
> +CONFIG_USB_ETH_CDC=y
> CONFIG_USB_HOST_ETHER=y
> CONFIG_USB_ETHER_ASIX=y
> CONFIG_USB_ETHER_SMSC95XX=y
> diff --git a/configs/mx6qsabrelite_defconfig b/configs/mx6qsabrelite_defconfig
> index bab0d0c79f0d..f716c8fd7f77 100644
> --- a/configs/mx6qsabrelite_defconfig
> +++ b/configs/mx6qsabrelite_defconfig
> @@ -55,5 +55,6 @@ CONFIG_G_DNL_MANUFACTURER="Boundary"
> CONFIG_G_DNL_VENDOR_NUM=0x0525
> CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
> CONFIG_USB_ETHER=y
> +CONFIG_USB_ETH_CDC=y
> # CONFIG_VIDEO_SW_CURSOR is not set
> CONFIG_OF_LIBFDT=y
> diff --git a/configs/nitrogen6dl2g_defconfig b/configs/nitrogen6dl2g_defconfig
> index 0d19b85a30f3..fd4a46558129 100644
> --- a/configs/nitrogen6dl2g_defconfig
> +++ b/configs/nitrogen6dl2g_defconfig
> @@ -52,5 +52,6 @@ CONFIG_G_DNL_MANUFACTURER="Boundary"
> CONFIG_G_DNL_VENDOR_NUM=0x0525
> CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
> CONFIG_USB_ETHER=y
> +CONFIG_USB_ETH_CDC=y
> # CONFIG_VIDEO_SW_CURSOR is not set
> CONFIG_OF_LIBFDT=y
> diff --git a/configs/nitrogen6dl_defconfig b/configs/nitrogen6dl_defconfig
> index a20580eb77bb..30046e3f3a07 100644
> --- a/configs/nitrogen6dl_defconfig
> +++ b/configs/nitrogen6dl_defconfig
> @@ -52,5 +52,6 @@ CONFIG_G_DNL_MANUFACTURER="Boundary"
> CONFIG_G_DNL_VENDOR_NUM=0x0525
> CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
> CONFIG_USB_ETHER=y
> +CONFIG_USB_ETH_CDC=y
> # CONFIG_VIDEO_SW_CURSOR is not set
> CONFIG_OF_LIBFDT=y
> diff --git a/configs/nitrogen6q2g_defconfig b/configs/nitrogen6q2g_defconfig
> index 940c74a5ece2..f9160c208fe7 100644
> --- a/configs/nitrogen6q2g_defconfig
> +++ b/configs/nitrogen6q2g_defconfig
> @@ -53,5 +53,6 @@ CONFIG_G_DNL_MANUFACTURER="Boundary"
> CONFIG_G_DNL_VENDOR_NUM=0x0525
> CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
> CONFIG_USB_ETHER=y
> +CONFIG_USB_ETH_CDC=y
> # CONFIG_VIDEO_SW_CURSOR is not set
> CONFIG_OF_LIBFDT=y
> diff --git a/configs/nitrogen6q_defconfig b/configs/nitrogen6q_defconfig
> index 83772cb2efcf..8bca0e04439e 100644
> --- a/configs/nitrogen6q_defconfig
> +++ b/configs/nitrogen6q_defconfig
> @@ -53,5 +53,6 @@ CONFIG_G_DNL_MANUFACTURER="Boundary"
> CONFIG_G_DNL_VENDOR_NUM=0x0525
> CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
> CONFIG_USB_ETHER=y
> +CONFIG_USB_ETH_CDC=y
> # CONFIG_VIDEO_SW_CURSOR is not set
> CONFIG_OF_LIBFDT=y
> diff --git a/configs/nitrogen6s1g_defconfig b/configs/nitrogen6s1g_defconfig
> index 862b41a3f8c9..668fbaa37010 100644
> --- a/configs/nitrogen6s1g_defconfig
> +++ b/configs/nitrogen6s1g_defconfig
> @@ -52,5 +52,6 @@ CONFIG_G_DNL_MANUFACTURER="Boundary"
> CONFIG_G_DNL_VENDOR_NUM=0x0525
> CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
> CONFIG_USB_ETHER=y
> +CONFIG_USB_ETH_CDC=y
> # CONFIG_VIDEO_SW_CURSOR is not set
> CONFIG_OF_LIBFDT=y
> diff --git a/configs/nitrogen6s_defconfig b/configs/nitrogen6s_defconfig
> index e5376313b9bd..99106c9a1f5a 100644
> --- a/configs/nitrogen6s_defconfig
> +++ b/configs/nitrogen6s_defconfig
> @@ -52,5 +52,6 @@ CONFIG_G_DNL_MANUFACTURER="Boundary"
> CONFIG_G_DNL_VENDOR_NUM=0x0525
> CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
> CONFIG_USB_ETHER=y
> +CONFIG_USB_ETH_CDC=y
> # CONFIG_VIDEO_SW_CURSOR is not set
> CONFIG_OF_LIBFDT=y
> diff --git a/configs/novena_defconfig b/configs/novena_defconfig
> index 786ab2854f70..a7056ff13771 100644
> --- a/configs/novena_defconfig
> +++ b/configs/novena_defconfig
> @@ -49,6 +49,7 @@ CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y
> CONFIG_USB_GADGET=y
> CONFIG_CI_UDC=y
> CONFIG_USB_ETHER=y
> +CONFIG_USB_ETH_CDC=y
> CONFIG_USB_HOST_ETHER=y
> CONFIG_USB_ETHER_ASIX=y
> CONFIG_USB_ETHER_SMSC95XX=y
> diff --git a/configs/sansa_fuze_plus_defconfig b/configs/sansa_fuze_plus_defconfig
> index c6d50ccb8e15..b5443dda98a9 100644
> --- a/configs/sansa_fuze_plus_defconfig
> +++ b/configs/sansa_fuze_plus_defconfig
> @@ -33,4 +33,5 @@ CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_GADGET=y
> CONFIG_CI_UDC=y
> CONFIG_USB_ETHER=y
> +CONFIG_USB_ETH_CDC=y
> CONFIG_OF_LIBFDT=y
> diff --git a/configs/warp7_defconfig b/configs/warp7_defconfig
> index 8a3717facdbd..32cf7a4da4b4 100644
> --- a/configs/warp7_defconfig
> +++ b/configs/warp7_defconfig
> @@ -39,5 +39,6 @@ CONFIG_G_DNL_MANUFACTURER="FSL"
> CONFIG_G_DNL_VENDOR_NUM=0x0525
> CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
> CONFIG_USB_ETHER=y
> +CONFIG_USB_ETH_CDC=y
> CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00"
> CONFIG_OF_LIBFDT=y
> diff --git a/configs/warp7_secure_defconfig b/configs/warp7_secure_defconfig
> index 83a06079fdc5..99764dbd0bb1 100644
> --- a/configs/warp7_secure_defconfig
> +++ b/configs/warp7_secure_defconfig
> @@ -37,5 +37,6 @@ CONFIG_G_DNL_MANUFACTURER="FSL"
> CONFIG_G_DNL_VENDOR_NUM=0x0525
> CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
> CONFIG_USB_ETHER=y
> +CONFIG_USB_ETH_CDC=y
> CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00"
> CONFIG_OF_LIBFDT=y
> diff --git a/configs/xfi3_defconfig b/configs/xfi3_defconfig
> index 6cc78452829c..91768a4a7106 100644
> --- a/configs/xfi3_defconfig
> +++ b/configs/xfi3_defconfig
> @@ -32,4 +32,5 @@ CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_GADGET=y
> CONFIG_CI_UDC=y
> CONFIG_USB_ETHER=y
> +CONFIG_USB_ETH_CDC=y
> CONFIG_OF_LIBFDT=y
> diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
> index ae3a37b3a935..1201276be837 100644
> --- a/drivers/usb/gadget/Kconfig
> +++ b/drivers/usb/gadget/Kconfig
> @@ -133,6 +133,34 @@ config USB_ETHER
>
> if USB_ETHER
>
> +choice
> + prompt "USB Ethernet Gadget Model"
> + default USB_ETH_RNDIS
> + help
> + There is several models (protocols) to implement Ethernet over USB
> + devices. The main ones are Microsoft's RNDIS and USB's CDC-Ethernet
> + (also called CDC-ECM). RNDIS is obviously compatible with Windows,
> + while CDC-ECM is not. Most other operating systems support both, so
> + if inter-operability is a concern, RNDIS is to be preferred.
> +
> +config USB_ETH_CDC
> + bool "CDC-ECM Protocol"
> + help
> + CDC (Communications Device Class) is the standard for Ethernet over
> + USB devices. While there's several alternatives, the most widely used
> + protocol is ECM (Ethernet Control Model). However, compatibility with
> + Windows is not that great.
> +
> +config USB_ETH_RNDIS
> + bool "RNDIS Protocol"
> + help
> + The RNDIS (Remote Network Driver Interface Specification) is a
> + Microsoft proprietary protocol to create an Ethernet device over USB.
> + Windows obviously supports it, as well as all the major operating
> + systems, so it's the best option for compatibility.
> +
> +endchoice
> +
> config USBNET_DEVADDR
> string "USB Gadget Ethernet device mac address"
> default "de:ad:be:ef:00:01"
> diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
> index 9238c4bb769c..96294679bf9b 100644
> --- a/include/configs/am335x_evm.h
> +++ b/include/configs/am335x_evm.h
> @@ -263,10 +263,6 @@
> #define CONFIG_AM335X_USB1
> #define CONFIG_AM335X_USB1_MODE MUSB_HOST
>
> -#ifdef CONFIG_USB_MUSB_GADGET
> -#define CONFIG_USB_ETH_RNDIS
> -#endif /* CONFIG_USB_MUSB_GADGET */
> -
> /*
> * Disable MMC DM for SPL build and can be re-enabled after adding
> * DM support in SPL
> diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h
> index d09672770134..38bd6e35e8cd 100644
> --- a/include/configs/am3517_evm.h
> +++ b/include/configs/am3517_evm.h
> @@ -79,10 +79,6 @@
>
> #endif /* CONFIG_USB_MUSB_HOST */
>
> -#ifdef CONFIG_USB_MUSB_GADGET
> -#define CONFIG_USB_ETH_RNDIS
> -#endif /* CONFIG_USB_MUSB_GADGET */
> -
> #endif /* CONFIG_USB_MUSB_AM35X */
>
> /* I2C */
> diff --git a/include/configs/baltos.h b/include/configs/baltos.h
> index 380a78918f29..44af4d3deec8 100644
> --- a/include/configs/baltos.h
> +++ b/include/configs/baltos.h
> @@ -283,10 +283,6 @@
> #define CONFIG_AM335X_USB1
> #define CONFIG_AM335X_USB1_MODE MUSB_OTG
>
> -#ifdef CONFIG_USB_MUSB_GADGET
> -#define CONFIG_USB_ETH_RNDIS
> -#endif /* CONFIG_USB_MUSB_GADGET */
> -
> #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT)
> /* disable host part of MUSB in SPL */
> /* disable EFI partitions and partition UUID support */
> diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
> index f4b7a061ba12..2795568e8c89 100644
> --- a/include/configs/gw_ventana.h
> +++ b/include/configs/gw_ventana.h
> @@ -146,7 +146,6 @@
> #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
> #define CONFIG_MXC_USB_FLAGS 0
> #define CONFIG_USBD_HS
> -#define CONFIG_USB_ETH_CDC
> #define CONFIG_NETCONSOLE
>
> /* USB Mass Storage Gadget */
> diff --git a/include/configs/ma5d4evk.h b/include/configs/ma5d4evk.h
> index 2ad4952f5eeb..6d25d84c6eb6 100644
> --- a/include/configs/ma5d4evk.h
> +++ b/include/configs/ma5d4evk.h
> @@ -97,7 +97,6 @@
> #ifdef CONFIG_CMD_USB
>
> /* USB device */
> -#define CONFIG_USB_ETH_RNDIS
> #define CONFIG_USBNET_MANUFACTURER "AriesEmbedded"
> #define CONFIG_USB_FUNCTION_MASS_STORAGE
> #define CONFIG_SYS_DFU_DATA_BUF_SIZE (1 * 1024 * 1024)
> diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
> index ca37f584f042..6068b70d2d69 100644
> --- a/include/configs/nitrogen6x.h
> +++ b/include/configs/nitrogen6x.h
> @@ -19,7 +19,6 @@
>
> #define CONFIG_MISC_INIT_R
> #define CONFIG_USBD_HS
> -#define CONFIG_USB_ETH_CDC
> #define CONFIG_NETCONSOLE
>
> #define CONFIG_MXC_UART
> diff --git a/include/configs/novena.h b/include/configs/novena.h
> index 9068ee2182e3..4825d5bac19a 100644
> --- a/include/configs/novena.h
> +++ b/include/configs/novena.h
> @@ -129,7 +129,6 @@
> #define CONFIG_MXC_USB_FLAGS 0
> /* Gadget part */
> #define CONFIG_USBD_HS
> -#define CONFIG_USB_ETH_CDC
> #define CONFIG_NETCONSOLE
> #endif
>
> diff --git a/include/configs/pcm051.h b/include/configs/pcm051.h
> index 309bbd6bd36f..79f3f48df87e 100644
> --- a/include/configs/pcm051.h
> +++ b/include/configs/pcm051.h
> @@ -133,10 +133,6 @@
> #define CONFIG_AM335X_USB1
> #define CONFIG_AM335X_USB1_MODE MUSB_HOST
>
> -#ifdef CONFIG_USB_MUSB_GADGET
> -#define CONFIG_USB_ETH_RNDIS
> -#endif /* CONFIG_USB_MUSB_GADGET */
> -
> #define CONFIG_PHY_SMSC
>
> #endif /* ! __CONFIG_PCM051_H */
> diff --git a/include/configs/sama5d2_ptc.h b/include/configs/sama5d2_ptc.h
> index a1a0602cdd0c..543592e3a574 100644
> --- a/include/configs/sama5d2_ptc.h
> +++ b/include/configs/sama5d2_ptc.h
> @@ -60,7 +60,6 @@
> #endif
>
> /* USB device */
> -#define CONFIG_USB_ETH_RNDIS
> #define CONFIG_USBNET_MANUFACTURER "Atmel SAMA5D2_PTC"
>
> /* Ethernet Hardware */
> diff --git a/include/configs/sansa_fuze_plus.h b/include/configs/sansa_fuze_plus.h
> index 9e33ca42270c..99200140fe5e 100644
> --- a/include/configs/sansa_fuze_plus.h
> +++ b/include/configs/sansa_fuze_plus.h
> @@ -39,7 +39,6 @@
> #define CONFIG_EHCI_MXS_PORT0
> #define CONFIG_USB_MAX_CONTROLLER_COUNT 1
>
> -#define CONFIG_USB_ETH_CDC
> #define CONFIG_NETCONSOLE
> #endif
>
> diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h
> index 0600984f95aa..1997c2dd5ae4 100644
> --- a/include/configs/siemens-am33x-common.h
> +++ b/include/configs/siemens-am33x-common.h
> @@ -178,10 +178,6 @@
> #define CONFIG_AM335X_USB1
> #define CONFIG_AM335X_USB1_MODE MUSB_HOST
>
> -#ifdef CONFIG_USB_MUSB_GADGET
> -#define CONFIG_USB_ETH_RNDIS
> -#endif /* CONFIG_USB_MUSB_GADGET */
> -
> /* USB DRACO ID as default */
> #define CONFIG_USBD_HS
>
> diff --git a/include/configs/vinco.h b/include/configs/vinco.h
> index 3b3ec6c8f2ad..f5aaaa2ffe91 100644
> --- a/include/configs/vinco.h
> +++ b/include/configs/vinco.h
> @@ -64,7 +64,6 @@
> #endif
>
> /* USB device */
> -#define CONFIG_USB_ETH_RNDIS
> #define CONFIG_USBNET_MANUFACTURER "L+G VInCo"
>
> /* Ethernet Hardware */
> diff --git a/include/configs/warp7.h b/include/configs/warp7.h
> index 05ae3542a9ad..11f1bc3eab75 100644
> --- a/include/configs/warp7.h
> +++ b/include/configs/warp7.h
> @@ -136,8 +136,6 @@
> #define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_16M
> #define DFU_DEFAULT_POLL_TIMEOUT 300
>
> -#define CONFIG_USB_ETH_CDC
> -#define CONFIG_USB_ETH_RNDIS
> #define CONFIG_USBNET_DEV_ADDR "de:ad:be:af:00:01"
>
> #endif
> diff --git a/include/configs/xfi3.h b/include/configs/xfi3.h
> index 7bbfd75c0cb8..1e70a762e0d9 100644
> --- a/include/configs/xfi3.h
> +++ b/include/configs/xfi3.h
> @@ -39,7 +39,6 @@
> #define CONFIG_EHCI_MXS_PORT0
> #define CONFIG_USB_MAX_CONTROLLER_COUNT 1
>
> -#define CONFIG_USB_ETH_CDC
> #define CONFIG_NETCONSOLE
> #endif
>
> diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
> index e9e716e7c80e..bbc3d4351bbd 100644
> --- a/scripts/config_whitelist.txt
> +++ b/scripts/config_whitelist.txt
> @@ -5013,9 +5013,7 @@ CONFIG_USB_EHCI_TEGRA
> CONFIG_USB_EHCI_TXFIFO_THRESH
> CONFIG_USB_EHCI_VCT
> CONFIG_USB_EHCI_VF
> -CONFIG_USB_ETH_CDC
> CONFIG_USB_ETH_QMULT
> -CONFIG_USB_ETH_RNDIS
> CONFIG_USB_ETH_SUBSET
> CONFIG_USB_EXT2_BOOT
> CONFIG_USB_FAT_BOOT
>
--
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-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
^ permalink raw reply [flat|nested] 35+ messages in thread
* [U-Boot] [PATCH v2 08/14] sunxi: provide default USB gadget setup
2017-09-12 19:01 ` [U-Boot] [PATCH v2 08/14] sunxi: provide default USB gadget setup Maxime Ripard
@ 2017-09-13 10:42 ` Łukasz Majewski
0 siblings, 0 replies; 35+ messages in thread
From: Łukasz Majewski @ 2017-09-13 10:42 UTC (permalink / raw)
To: u-boot
On 09/12/2017 09:01 PM, Maxime Ripard wrote:
> All the Allwinner boards use the same manufacturer, VID and PID for the
> gadgets. Make them the defaults to remove some boilerplate from our
> defconfigs.
Reviewed-by: Łukasz Majewski <lukma@denx.de>
>
> Reviewed-by: Simon Glass <sjg@chromium.org>
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> ---
> configs/A13-OLinuXino_defconfig | 3 ---
> configs/A20-OLinuXino-Lime2-eMMC_defconfig | 3 ---
> configs/A20-OLinuXino-Lime2_defconfig | 3 ---
> configs/CHIP_defconfig | 3 ---
> configs/CHIP_pro_defconfig | 3 ---
> configs/Cubietruck_defconfig | 3 ---
> configs/Nintendo_NES_Classic_Edition_defconfig | 3 ---
> configs/Sinlinx_SinA33_defconfig | 3 ---
> configs/parrot_r16_defconfig | 3 ---
> drivers/usb/gadget/Kconfig | 3 +++
> 10 files changed, 3 insertions(+), 27 deletions(-)
>
> diff --git a/configs/A13-OLinuXino_defconfig b/configs/A13-OLinuXino_defconfig
> index 2574018d8213..ae790164dff7 100644
> --- a/configs/A13-OLinuXino_defconfig
> +++ b/configs/A13-OLinuXino_defconfig
> @@ -32,7 +32,4 @@ CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_MUSB_GADGET=y
> CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
> CONFIG_USB_GADGET=y
> -CONFIG_USB_GADGET_MANUFACTURER="Allwinner Technology"
> -CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a
> -CONFIG_USB_GADGET_PRODUCT_NUM=0x1010
> CONFIG_USB_GADGET_DOWNLOAD=y
> diff --git a/configs/A20-OLinuXino-Lime2-eMMC_defconfig b/configs/A20-OLinuXino-Lime2-eMMC_defconfig
> index 5663a824e71b..b136af66b71f 100644
> --- a/configs/A20-OLinuXino-Lime2-eMMC_defconfig
> +++ b/configs/A20-OLinuXino-Lime2-eMMC_defconfig
> @@ -34,7 +34,4 @@ CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_MUSB_GADGET=y
> CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
> CONFIG_USB_GADGET=y
> -CONFIG_USB_GADGET_MANUFACTURER="Allwinner Technology"
> -CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a
> -CONFIG_USB_GADGET_PRODUCT_NUM=0x1010
> CONFIG_USB_GADGET_DOWNLOAD=y
> diff --git a/configs/A20-OLinuXino-Lime2_defconfig b/configs/A20-OLinuXino-Lime2_defconfig
> index 63d013293690..ebb435f30956 100644
> --- a/configs/A20-OLinuXino-Lime2_defconfig
> +++ b/configs/A20-OLinuXino-Lime2_defconfig
> @@ -33,7 +33,4 @@ CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_MUSB_GADGET=y
> CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
> CONFIG_USB_GADGET=y
> -CONFIG_USB_GADGET_MANUFACTURER="Allwinner Technology"
> -CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a
> -CONFIG_USB_GADGET_PRODUCT_NUM=0x1010
> CONFIG_USB_GADGET_DOWNLOAD=y
> diff --git a/configs/CHIP_defconfig b/configs/CHIP_defconfig
> index 278039c05573..7d50d0533dcd 100644
> --- a/configs/CHIP_defconfig
> +++ b/configs/CHIP_defconfig
> @@ -23,8 +23,5 @@ CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_MUSB_GADGET=y
> CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
> CONFIG_USB_GADGET=y
> -CONFIG_USB_GADGET_MANUFACTURER="Allwinner Technology"
> -CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a
> -CONFIG_USB_GADGET_PRODUCT_NUM=0x1010
> CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_OF_LIBFDT_OVERLAY=y
> diff --git a/configs/CHIP_pro_defconfig b/configs/CHIP_pro_defconfig
> index edbdefc69ddf..76daf477ec87 100644
> --- a/configs/CHIP_pro_defconfig
> +++ b/configs/CHIP_pro_defconfig
> @@ -28,8 +28,5 @@ CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_MUSB_GADGET=y
> CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
> CONFIG_USB_GADGET=y
> -CONFIG_USB_GADGET_MANUFACTURER="Allwinner Technology"
> -CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a
> -CONFIG_USB_GADGET_PRODUCT_NUM=0x1010
> CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_OF_LIBFDT_OVERLAY=y
> diff --git a/configs/Cubietruck_defconfig b/configs/Cubietruck_defconfig
> index 2d1753645b0f..1b2989d364f6 100644
> --- a/configs/Cubietruck_defconfig
> +++ b/configs/Cubietruck_defconfig
> @@ -33,7 +33,4 @@ CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_MUSB_GADGET=y
> CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
> CONFIG_USB_GADGET=y
> -CONFIG_USB_GADGET_MANUFACTURER="Allwinner Technology"
> -CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a
> -CONFIG_USB_GADGET_PRODUCT_NUM=0x1010
> CONFIG_USB_GADGET_DOWNLOAD=y
> diff --git a/configs/Nintendo_NES_Classic_Edition_defconfig b/configs/Nintendo_NES_Classic_Edition_defconfig
> index 99f7d30f150d..5986764a14b9 100644
> --- a/configs/Nintendo_NES_Classic_Edition_defconfig
> +++ b/configs/Nintendo_NES_Classic_Edition_defconfig
> @@ -23,7 +23,4 @@ CONFIG_AXP_ELDO2_VOLT=1800
> CONFIG_USB_MUSB_GADGET=y
> CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
> CONFIG_USB_GADGET=y
> -CONFIG_USB_GADGET_MANUFACTURER="Allwinner Technology"
> -CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a
> -CONFIG_USB_GADGET_PRODUCT_NUM=0x1010
> CONFIG_USB_GADGET_DOWNLOAD=y
> diff --git a/configs/Sinlinx_SinA33_defconfig b/configs/Sinlinx_SinA33_defconfig
> index 8c5fc7587909..9299aedd6019 100644
> --- a/configs/Sinlinx_SinA33_defconfig
> +++ b/configs/Sinlinx_SinA33_defconfig
> @@ -28,7 +28,4 @@ CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_MUSB_GADGET=y
> CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
> CONFIG_USB_GADGET=y
> -CONFIG_USB_GADGET_MANUFACTURER="Allwinner Technology"
> -CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a
> -CONFIG_USB_GADGET_PRODUCT_NUM=0x1010
> CONFIG_USB_GADGET_DOWNLOAD=y
> diff --git a/configs/parrot_r16_defconfig b/configs/parrot_r16_defconfig
> index 4b70fc5687eb..57db9587fe77 100644
> --- a/configs/parrot_r16_defconfig
> +++ b/configs/parrot_r16_defconfig
> @@ -24,7 +24,4 @@ CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_MUSB_GADGET=y
> CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
> CONFIG_USB_GADGET=y
> -CONFIG_USB_GADGET_MANUFACTURER="Allwinner Technology"
> -CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a
> -CONFIG_USB_GADGET_PRODUCT_NUM=0x1010
> CONFIG_USB_GADGET_DOWNLOAD=y
> diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
> index ef13bd2edb66..32b9a7e9fe49 100644
> --- a/drivers/usb/gadget/Kconfig
> +++ b/drivers/usb/gadget/Kconfig
> @@ -38,12 +38,14 @@ if USB_GADGET
>
> config USB_GADGET_MANUFACTURER
> string "Vendor name of the USB device"
> + default "Allwinner Technology" if ARCH_SUNXI
> help
> Vendor name of the USB device emulated, reported to the host device.
> This is usually either the manufacturer of the device or the SoC.
>
> config USB_GADGET_VENDOR_NUM
> hex "Vendor ID of the USB device"
> + default 0x1f3a if ARCH_SUNXI
> help
> Vendor ID of the USB device emulated, reported to the host device.
> This is usually the board or SoC vendor's, unless you've registered
> @@ -51,6 +53,7 @@ config USB_GADGET_VENDOR_NUM
>
> config USB_GADGET_PRODUCT_NUM
> hex "Product ID of the USB device"
> + default 0x1010 if ARCH_SUNXI
> help
> Product ID of the USB device emulated, reported to the host device.
>
>
--
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-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
^ permalink raw reply [flat|nested] 35+ messages in thread
* [U-Boot] [PATCH v2 09/14] sunxi: imply USB_GADGET
2017-09-12 19:01 ` [U-Boot] [PATCH v2 09/14] sunxi: imply USB_GADGET Maxime Ripard
@ 2017-09-13 10:42 ` Łukasz Majewski
2017-09-22 3:20 ` Chen-Yu Tsai
1 sibling, 0 replies; 35+ messages in thread
From: Łukasz Majewski @ 2017-09-13 10:42 UTC (permalink / raw)
To: u-boot
On 09/12/2017 09:01 PM, Maxime Ripard wrote:
> A good number of our boards have USB_GADGET enabled. Imply it so that all
> the boards can benefit from it, and remove some boilerplate from our
> defconfigs.
>
> Reviewed-by: Simon Glass <sjg@chromium.org>
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> ---
> arch/arm/Kconfig | 1 +
> configs/A13-OLinuXino_defconfig | 1 -
> configs/A20-OLinuXino-Lime2-eMMC_defconfig | 1 -
> configs/A20-OLinuXino-Lime2_defconfig | 1 -
> configs/CHIP_defconfig | 1 -
> configs/CHIP_pro_defconfig | 1 -
> configs/Cubietruck_defconfig | 1 -
> configs/Nintendo_NES_Classic_Edition_defconfig | 1 -
> configs/Sinlinx_SinA33_defconfig | 1 -
> configs/parrot_r16_defconfig | 1 -
> 10 files changed, 1 insertion(+), 9 deletions(-)
>
> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> index 53eae8953e0b..1eb59c591a54 100644
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@ -705,6 +705,7 @@ config ARCH_SUNXI
> imply SPL_POWER_SUPPORT
> imply SPL_SERIAL_SUPPORT
> imply USB_FUNCTION_FASTBOOT
> + imply USB_GADGET
>
> config TARGET_TS4600
> bool "Support TS4600"
> diff --git a/configs/A13-OLinuXino_defconfig b/configs/A13-OLinuXino_defconfig
> index ae790164dff7..e55dbff44d36 100644
> --- a/configs/A13-OLinuXino_defconfig
> +++ b/configs/A13-OLinuXino_defconfig
> @@ -31,5 +31,4 @@ CONFIG_AXP_ALDO3_VOLT=3300
> CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_MUSB_GADGET=y
> CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
> -CONFIG_USB_GADGET=y
> CONFIG_USB_GADGET_DOWNLOAD=y
> diff --git a/configs/A20-OLinuXino-Lime2-eMMC_defconfig b/configs/A20-OLinuXino-Lime2-eMMC_defconfig
> index b136af66b71f..9491708d80c6 100644
> --- a/configs/A20-OLinuXino-Lime2-eMMC_defconfig
> +++ b/configs/A20-OLinuXino-Lime2-eMMC_defconfig
> @@ -33,5 +33,4 @@ CONFIG_SCSI=y
> CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_MUSB_GADGET=y
> CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
> -CONFIG_USB_GADGET=y
> CONFIG_USB_GADGET_DOWNLOAD=y
> diff --git a/configs/A20-OLinuXino-Lime2_defconfig b/configs/A20-OLinuXino-Lime2_defconfig
> index ebb435f30956..2bb8ee8c9ebd 100644
> --- a/configs/A20-OLinuXino-Lime2_defconfig
> +++ b/configs/A20-OLinuXino-Lime2_defconfig
> @@ -32,5 +32,4 @@ CONFIG_SCSI=y
> CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_MUSB_GADGET=y
> CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
> -CONFIG_USB_GADGET=y
> CONFIG_USB_GADGET_DOWNLOAD=y
> diff --git a/configs/CHIP_defconfig b/configs/CHIP_defconfig
> index 7d50d0533dcd..b9f70d240c3c 100644
> --- a/configs/CHIP_defconfig
> +++ b/configs/CHIP_defconfig
> @@ -22,6 +22,5 @@ CONFIG_AXP_ALDO4_VOLT=3300
> CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_MUSB_GADGET=y
> CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
> -CONFIG_USB_GADGET=y
> CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_OF_LIBFDT_OVERLAY=y
> diff --git a/configs/CHIP_pro_defconfig b/configs/CHIP_pro_defconfig
> index 76daf477ec87..74f6eb10fc01 100644
> --- a/configs/CHIP_pro_defconfig
> +++ b/configs/CHIP_pro_defconfig
> @@ -27,6 +27,5 @@ CONFIG_AXP_ALDO4_VOLT=3300
> CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_MUSB_GADGET=y
> CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
> -CONFIG_USB_GADGET=y
> CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_OF_LIBFDT_OVERLAY=y
> diff --git a/configs/Cubietruck_defconfig b/configs/Cubietruck_defconfig
> index 1b2989d364f6..458e2a9d8b04 100644
> --- a/configs/Cubietruck_defconfig
> +++ b/configs/Cubietruck_defconfig
> @@ -32,5 +32,4 @@ CONFIG_SCSI=y
> CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_MUSB_GADGET=y
> CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
> -CONFIG_USB_GADGET=y
> CONFIG_USB_GADGET_DOWNLOAD=y
> diff --git a/configs/Nintendo_NES_Classic_Edition_defconfig b/configs/Nintendo_NES_Classic_Edition_defconfig
> index 5986764a14b9..e031dd8f5d5f 100644
> --- a/configs/Nintendo_NES_Classic_Edition_defconfig
> +++ b/configs/Nintendo_NES_Classic_Edition_defconfig
> @@ -22,5 +22,4 @@ CONFIG_AXP_DLDO1_VOLT=3300
> CONFIG_AXP_ELDO2_VOLT=1800
> CONFIG_USB_MUSB_GADGET=y
> CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
> -CONFIG_USB_GADGET=y
> CONFIG_USB_GADGET_DOWNLOAD=y
> diff --git a/configs/Sinlinx_SinA33_defconfig b/configs/Sinlinx_SinA33_defconfig
> index 9299aedd6019..143a9b4b6c10 100644
> --- a/configs/Sinlinx_SinA33_defconfig
> +++ b/configs/Sinlinx_SinA33_defconfig
> @@ -27,5 +27,4 @@ CONFIG_DFU_RAM=y
> CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_MUSB_GADGET=y
> CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
> -CONFIG_USB_GADGET=y
> CONFIG_USB_GADGET_DOWNLOAD=y
> diff --git a/configs/parrot_r16_defconfig b/configs/parrot_r16_defconfig
> index 57db9587fe77..b36b9efec650 100644
> --- a/configs/parrot_r16_defconfig
> +++ b/configs/parrot_r16_defconfig
> @@ -23,5 +23,4 @@ CONFIG_FASTBOOT_FLASH_MMC_DEV=0
> CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_MUSB_GADGET=y
> CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
> -CONFIG_USB_GADGET=y
> CONFIG_USB_GADGET_DOWNLOAD=y
>
Reviewed-by: Łukasz Majewski <lukma@denx.de>
--
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-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
^ permalink raw reply [flat|nested] 35+ messages in thread
* [U-Boot] [PATCH v2 10/14] cmd: fastboot: Rework fastboot dependency
2017-09-12 19:01 ` [U-Boot] [PATCH v2 10/14] cmd: fastboot: Rework fastboot dependency Maxime Ripard
@ 2017-09-13 10:43 ` Łukasz Majewski
0 siblings, 0 replies; 35+ messages in thread
From: Łukasz Majewski @ 2017-09-13 10:43 UTC (permalink / raw)
To: u-boot
On 09/12/2017 09:01 PM, Maxime Ripard wrote:
> Fastboot need a bunch of options to be operating properly, such as the
> g_dnl gadget, the fastboot command, and some options that make sense. Since
> fastboot is now part of Kconfig, make sure we have them right.
>
> That will also reduce the boilerplate in the defconfigs.
>
> Reviewed-by: Simon Glass <sjg@chromium.org>
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> ---
> arch/arm/Kconfig | 2 --
> cmd/fastboot/Kconfig | 4 ++++
> configs/A13-OLinuXino_defconfig | 1 -
> configs/A20-OLinuXino-Lime2-eMMC_defconfig | 1 -
> configs/A20-OLinuXino-Lime2_defconfig | 1 -
> configs/CHIP_defconfig | 1 -
> configs/CHIP_pro_defconfig | 1 -
> configs/Cubietruck_defconfig | 1 -
> configs/Nintendo_NES_Classic_Edition_defconfig | 1 -
> configs/Sinlinx_SinA33_defconfig | 1 -
> configs/am335x_boneblack_defconfig | 2 --
> configs/am335x_boneblack_vboot_defconfig | 2 --
> configs/am335x_evm_defconfig | 2 --
> configs/am335x_evm_nor_defconfig | 2 --
> configs/am335x_evm_norboot_defconfig | 2 --
> configs/am335x_evm_spiboot_defconfig | 2 --
> configs/am335x_evm_usbspl_defconfig | 2 --
> configs/am57xx_evm_defconfig | 2 --
> configs/am57xx_evm_nodt_defconfig | 3 ---
> configs/am57xx_hs_evm_defconfig | 2 --
> configs/bcm23550_w1d_defconfig | 3 ---
> configs/bcm28155_ap_defconfig | 3 ---
> configs/birdland_bav335a_defconfig | 3 ---
> configs/birdland_bav335b_defconfig | 3 ---
> configs/cgtqmx6eval_defconfig | 3 ---
> configs/chromebit_mickey_defconfig | 1 -
> configs/chromebook_jerry_defconfig | 1 -
> configs/chromebook_minnie_defconfig | 1 -
> configs/dra7xx_evm_defconfig | 2 --
> configs/dra7xx_hs_evm_defconfig | 2 --
> configs/evb-rk3036_defconfig | 1 -
> configs/evb-rk3229_defconfig | 1 -
> configs/evb-rk3288_defconfig | 1 -
> configs/fennec-rk3288_defconfig | 1 -
> configs/firefly-rk3288_defconfig | 1 -
> configs/kc1_defconfig | 3 ---
> configs/kylin-rk3036_defconfig | 1 -
> configs/miqi-rk3288_defconfig | 1 -
> configs/mx6qsabrelite_defconfig | 3 ---
> configs/nitrogen6dl2g_defconfig | 3 ---
> configs/nitrogen6dl_defconfig | 3 ---
> configs/nitrogen6q2g_defconfig | 3 ---
> configs/nitrogen6q_defconfig | 3 ---
> configs/nitrogen6s1g_defconfig | 3 ---
> configs/nitrogen6s_defconfig | 3 ---
> configs/omap3_beagle_defconfig | 3 ---
> configs/omap3_logic_defconfig | 2 --
> configs/parrot_r16_defconfig | 1 -
> configs/phycore-rk3288_defconfig | 1 -
> configs/popmetal-rk3288_defconfig | 1 -
> configs/rock2_defconfig | 1 -
> configs/sniper_defconfig | 3 ---
> configs/tinker-rk3288_defconfig | 1 -
> 53 files changed, 4 insertions(+), 97 deletions(-)
>
> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> index 1eb59c591a54..519f42778a8d 100644
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@ -693,7 +693,6 @@ config ARCH_SUNXI
> select USB_STORAGE if DISTRO_DEFAULTS
> select USB_KEYBOARD if DISTRO_DEFAULTS
> select USE_TINY_PRINTF
> - imply CMD_FASTBOOT
> imply FASTBOOT
> imply FAT_WRITE
> imply PRE_CONSOLE_BUFFER
> @@ -704,7 +703,6 @@ config ARCH_SUNXI
> imply SPL_MMC_SUPPORT if MMC
> imply SPL_POWER_SUPPORT
> imply SPL_SERIAL_SUPPORT
> - imply USB_FUNCTION_FASTBOOT
> imply USB_GADGET
>
> config TARGET_TS4600
> diff --git a/cmd/fastboot/Kconfig b/cmd/fastboot/Kconfig
> index fb0c5da94cdb..5c1186017206 100644
> --- a/cmd/fastboot/Kconfig
> +++ b/cmd/fastboot/Kconfig
> @@ -8,6 +8,10 @@ if FASTBOOT
>
> config USB_FUNCTION_FASTBOOT
> bool "Enable USB fastboot gadget"
> + default y
> + select USB_GADGET_DOWNLOAD
> + imply ANDROID_BOOT_IMAGE
> + imply CMD_FASTBOOT
> help
> This enables the USB part of the fastboot gadget.
>
> diff --git a/configs/A13-OLinuXino_defconfig b/configs/A13-OLinuXino_defconfig
> index e55dbff44d36..ed8349000e22 100644
> --- a/configs/A13-OLinuXino_defconfig
> +++ b/configs/A13-OLinuXino_defconfig
> @@ -31,4 +31,3 @@ CONFIG_AXP_ALDO3_VOLT=3300
> CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_MUSB_GADGET=y
> CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
> -CONFIG_USB_GADGET_DOWNLOAD=y
> diff --git a/configs/A20-OLinuXino-Lime2-eMMC_defconfig b/configs/A20-OLinuXino-Lime2-eMMC_defconfig
> index 9491708d80c6..a04037ebe7cc 100644
> --- a/configs/A20-OLinuXino-Lime2-eMMC_defconfig
> +++ b/configs/A20-OLinuXino-Lime2-eMMC_defconfig
> @@ -33,4 +33,3 @@ CONFIG_SCSI=y
> CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_MUSB_GADGET=y
> CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
> -CONFIG_USB_GADGET_DOWNLOAD=y
> diff --git a/configs/A20-OLinuXino-Lime2_defconfig b/configs/A20-OLinuXino-Lime2_defconfig
> index 2bb8ee8c9ebd..f9388a005bcd 100644
> --- a/configs/A20-OLinuXino-Lime2_defconfig
> +++ b/configs/A20-OLinuXino-Lime2_defconfig
> @@ -32,4 +32,3 @@ CONFIG_SCSI=y
> CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_MUSB_GADGET=y
> CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
> -CONFIG_USB_GADGET_DOWNLOAD=y
> diff --git a/configs/CHIP_defconfig b/configs/CHIP_defconfig
> index b9f70d240c3c..5acce42a60f9 100644
> --- a/configs/CHIP_defconfig
> +++ b/configs/CHIP_defconfig
> @@ -22,5 +22,4 @@ CONFIG_AXP_ALDO4_VOLT=3300
> CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_MUSB_GADGET=y
> CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
> -CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_OF_LIBFDT_OVERLAY=y
> diff --git a/configs/CHIP_pro_defconfig b/configs/CHIP_pro_defconfig
> index 74f6eb10fc01..2303135449b2 100644
> --- a/configs/CHIP_pro_defconfig
> +++ b/configs/CHIP_pro_defconfig
> @@ -27,5 +27,4 @@ CONFIG_AXP_ALDO4_VOLT=3300
> CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_MUSB_GADGET=y
> CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
> -CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_OF_LIBFDT_OVERLAY=y
> diff --git a/configs/Cubietruck_defconfig b/configs/Cubietruck_defconfig
> index 458e2a9d8b04..3dff02f342d7 100644
> --- a/configs/Cubietruck_defconfig
> +++ b/configs/Cubietruck_defconfig
> @@ -32,4 +32,3 @@ CONFIG_SCSI=y
> CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_MUSB_GADGET=y
> CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
> -CONFIG_USB_GADGET_DOWNLOAD=y
> diff --git a/configs/Nintendo_NES_Classic_Edition_defconfig b/configs/Nintendo_NES_Classic_Edition_defconfig
> index e031dd8f5d5f..26fcffa02f10 100644
> --- a/configs/Nintendo_NES_Classic_Edition_defconfig
> +++ b/configs/Nintendo_NES_Classic_Edition_defconfig
> @@ -22,4 +22,3 @@ CONFIG_AXP_DLDO1_VOLT=3300
> CONFIG_AXP_ELDO2_VOLT=1800
> CONFIG_USB_MUSB_GADGET=y
> CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
> -CONFIG_USB_GADGET_DOWNLOAD=y
> diff --git a/configs/Sinlinx_SinA33_defconfig b/configs/Sinlinx_SinA33_defconfig
> index 143a9b4b6c10..d726b404cc5e 100644
> --- a/configs/Sinlinx_SinA33_defconfig
> +++ b/configs/Sinlinx_SinA33_defconfig
> @@ -27,4 +27,3 @@ CONFIG_DFU_RAM=y
> CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_MUSB_GADGET=y
> CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
> -CONFIG_USB_GADGET_DOWNLOAD=y
> diff --git a/configs/am335x_boneblack_defconfig b/configs/am335x_boneblack_defconfig
> index 85f220329e4e..e17329bc4fda 100644
> --- a/configs/am335x_boneblack_defconfig
> +++ b/configs/am335x_boneblack_defconfig
> @@ -18,7 +18,6 @@ CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
> CONFIG_AUTOBOOT_DELAY_STR="d"
> CONFIG_AUTOBOOT_STOP_STR=" "
> CONFIG_FASTBOOT=y
> -CONFIG_USB_FUNCTION_FASTBOOT=y
> # CONFIG_CMD_IMLS is not set
> CONFIG_CMD_SPL=y
> # CONFIG_CMD_FLASH is not set
> @@ -41,7 +40,6 @@ CONFIG_USB_GADGET=y
> CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
> CONFIG_USB_GADGET_VENDOR_NUM=0x0451
> CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
> -CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_USB_ETHER=y
> CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00"
> CONFIG_LZO=y
> diff --git a/configs/am335x_boneblack_vboot_defconfig b/configs/am335x_boneblack_vboot_defconfig
> index 9ba3f7c04d73..4669a68d1471 100644
> --- a/configs/am335x_boneblack_vboot_defconfig
> +++ b/configs/am335x_boneblack_vboot_defconfig
> @@ -21,7 +21,6 @@ CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
> CONFIG_AUTOBOOT_DELAY_STR="d"
> CONFIG_AUTOBOOT_STOP_STR=" "
> CONFIG_FASTBOOT=y
> -CONFIG_USB_FUNCTION_FASTBOOT=y
> # CONFIG_CMD_IMLS is not set
> CONFIG_CMD_SPL=y
> # CONFIG_CMD_FLASH is not set
> @@ -51,6 +50,5 @@ CONFIG_USB_GADGET=y
> CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
> CONFIG_USB_GADGET_VENDOR_NUM=0x0451
> CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
> -CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_USB_ETHER=y
> CONFIG_LZO=y
> diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig
> index 8aa3c0de8824..e5363e78f07f 100644
> --- a/configs/am335x_evm_defconfig
> +++ b/configs/am335x_evm_defconfig
> @@ -15,7 +15,6 @@ CONFIG_SPL_MTD_SUPPORT=y
> CONFIG_SPL_MUSB_NEW_SUPPORT=y
> CONFIG_SPL_OS_BOOT=y
> CONFIG_FASTBOOT=y
> -CONFIG_USB_FUNCTION_FASTBOOT=y
> # CONFIG_CMD_IMLS is not set
> CONFIG_CMD_SPL=y
> CONFIG_CMD_SPL_NAND_OFS=0x00080000
> @@ -53,7 +52,6 @@ CONFIG_USB_GADGET=y
> CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
> CONFIG_USB_GADGET_VENDOR_NUM=0x0451
> CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
> -CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_USB_ETHER=y
> CONFIG_RSA=y
> CONFIG_LZO=y
> diff --git a/configs/am335x_evm_nor_defconfig b/configs/am335x_evm_nor_defconfig
> index b745f2997334..9d226bc8919f 100644
> --- a/configs/am335x_evm_nor_defconfig
> +++ b/configs/am335x_evm_nor_defconfig
> @@ -14,7 +14,6 @@ CONFIG_SPL_MTD_SUPPORT=y
> CONFIG_SPL_MUSB_NEW_SUPPORT=y
> CONFIG_SPL_OS_BOOT=y
> CONFIG_FASTBOOT=y
> -CONFIG_USB_FUNCTION_FASTBOOT=y
> # CONFIG_CMD_IMLS is not set
> CONFIG_CMD_SPL=y
> CONFIG_CMD_SPL_NAND_OFS=0x00080000
> @@ -40,7 +39,6 @@ CONFIG_USB_GADGET=y
> CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
> CONFIG_USB_GADGET_VENDOR_NUM=0x0451
> CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
> -CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_USB_ETHER=y
> CONFIG_LZO=y
> CONFIG_OF_LIBFDT=y
> diff --git a/configs/am335x_evm_norboot_defconfig b/configs/am335x_evm_norboot_defconfig
> index 9662b6684c1f..e786565c2a17 100644
> --- a/configs/am335x_evm_norboot_defconfig
> +++ b/configs/am335x_evm_norboot_defconfig
> @@ -12,7 +12,6 @@ CONFIG_VERSION_VARIABLE=y
> CONFIG_ARCH_MISC_INIT=y
> CONFIG_BOARD_EARLY_INIT_F=y
> CONFIG_FASTBOOT=y
> -CONFIG_USB_FUNCTION_FASTBOOT=y
> # CONFIG_CMD_IMLS is not set
> # CONFIG_CMD_SETEXPR is not set
> CONFIG_CMD_MTDPARTS=y
> @@ -34,7 +33,6 @@ CONFIG_USB_GADGET=y
> CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
> CONFIG_USB_GADGET_VENDOR_NUM=0x0451
> CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
> -CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_USB_ETHER=y
> CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00"
> CONFIG_LZO=y
> diff --git a/configs/am335x_evm_spiboot_defconfig b/configs/am335x_evm_spiboot_defconfig
> index 5e2c19066daa..0ab48d9647c0 100644
> --- a/configs/am335x_evm_spiboot_defconfig
> +++ b/configs/am335x_evm_spiboot_defconfig
> @@ -16,7 +16,6 @@ CONFIG_SPL=y
> CONFIG_SPL_STACK_R=y
> CONFIG_SPL_MUSB_NEW_SUPPORT=y
> CONFIG_FASTBOOT=y
> -CONFIG_USB_FUNCTION_FASTBOOT=y
> # CONFIG_CMD_IMLS is not set
> # CONFIG_CMD_FLASH is not set
> # CONFIG_CMD_SETEXPR is not set
> @@ -38,7 +37,6 @@ CONFIG_USB_GADGET=y
> CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
> CONFIG_USB_GADGET_VENDOR_NUM=0x0451
> CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
> -CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_USB_ETHER=y
> CONFIG_LZO=y
> CONFIG_OF_LIBFDT=y
> diff --git a/configs/am335x_evm_usbspl_defconfig b/configs/am335x_evm_usbspl_defconfig
> index d6c21b8e85ee..0674ab0570e8 100644
> --- a/configs/am335x_evm_usbspl_defconfig
> +++ b/configs/am335x_evm_usbspl_defconfig
> @@ -18,7 +18,6 @@ CONFIG_SPL_USB_GADGET_SUPPORT=y
> CONFIG_SPL_USBETH_SUPPORT=y
> # CONFIG_SPL_YMODEM_SUPPORT is not set
> CONFIG_FASTBOOT=y
> -CONFIG_USB_FUNCTION_FASTBOOT=y
> # CONFIG_CMD_IMLS is not set
> CONFIG_CMD_SPL=y
> CONFIG_CMD_SPL_NAND_OFS=0x00080000
> @@ -44,7 +43,6 @@ CONFIG_USB_GADGET=y
> CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
> CONFIG_USB_GADGET_VENDOR_NUM=0x0451
> CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
> -CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_USB_ETHER=y
> CONFIG_LZO=y
> CONFIG_OF_LIBFDT=y
> diff --git a/configs/am57xx_evm_defconfig b/configs/am57xx_evm_defconfig
> index a9ee2e448f3c..07afb9139a77 100644
> --- a/configs/am57xx_evm_defconfig
> +++ b/configs/am57xx_evm_defconfig
> @@ -25,7 +25,6 @@ CONFIG_SPL_DMA_SUPPORT=y
> CONFIG_SPL_OS_BOOT=y
> CONFIG_HUSH_PARSER=y
> CONFIG_FASTBOOT=y
> -CONFIG_USB_FUNCTION_FASTBOOT=y
> CONFIG_FASTBOOT_BUF_ADDR=0x82000000
> CONFIG_FASTBOOT_BUF_SIZE=0x2F000000
> CONFIG_FASTBOOT_USB_DEV=1
> @@ -75,4 +74,3 @@ CONFIG_USB_GADGET=y
> CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
> CONFIG_USB_GADGET_VENDOR_NUM=0x0451
> CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
> -CONFIG_USB_GADGET_DOWNLOAD=y
> diff --git a/configs/am57xx_evm_nodt_defconfig b/configs/am57xx_evm_nodt_defconfig
> index ae7c3464e0cb..88b8bc104d08 100644
> --- a/configs/am57xx_evm_nodt_defconfig
> +++ b/configs/am57xx_evm_nodt_defconfig
> @@ -15,8 +15,6 @@ CONFIG_SPL_DMA_SUPPORT=y
> CONFIG_SPL_OS_BOOT=y
> CONFIG_HUSH_PARSER=y
> CONFIG_FASTBOOT=y
> -CONFIG_USB_FUNCTION_FASTBOOT=y
> -CONFIG_CMD_FASTBOOT=y
> CONFIG_FASTBOOT_BUF_ADDR=0x82000000
> CONFIG_FASTBOOT_BUF_SIZE=0x2F000000
> CONFIG_FASTBOOT_USB_DEV=1
> @@ -65,6 +63,5 @@ CONFIG_USB_GADGET=y
> CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
> CONFIG_USB_GADGET_VENDOR_NUM=0x0451
> CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
> -CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_FAT_WRITE=y
> CONFIG_OF_LIBFDT=y
> diff --git a/configs/am57xx_hs_evm_defconfig b/configs/am57xx_hs_evm_defconfig
> index 1047f33237ef..dd5e86212576 100644
> --- a/configs/am57xx_hs_evm_defconfig
> +++ b/configs/am57xx_hs_evm_defconfig
> @@ -30,7 +30,6 @@ CONFIG_SPL_SEPARATE_BSS=y
> CONFIG_SPL_DMA_SUPPORT=y
> CONFIG_HUSH_PARSER=y
> CONFIG_FASTBOOT=y
> -CONFIG_USB_FUNCTION_FASTBOOT=y
> CONFIG_FASTBOOT_BUF_ADDR=0x82000000
> CONFIG_FASTBOOT_BUF_SIZE=0x2F000000
> CONFIG_FASTBOOT_USB_DEV=1
> @@ -78,4 +77,3 @@ CONFIG_USB_GADGET=y
> CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
> CONFIG_USB_GADGET_VENDOR_NUM=0x0451
> CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
> -CONFIG_USB_GADGET_DOWNLOAD=y
> diff --git a/configs/bcm23550_w1d_defconfig b/configs/bcm23550_w1d_defconfig
> index 49f7e40d15d9..f7af02f61323 100644
> --- a/configs/bcm23550_w1d_defconfig
> +++ b/configs/bcm23550_w1d_defconfig
> @@ -7,8 +7,6 @@ CONFIG_VERSION_VARIABLE=y
> # CONFIG_DISPLAY_BOARDINFO is not set
> CONFIG_HUSH_PARSER=y
> CONFIG_FASTBOOT=y
> -CONFIG_USB_FUNCTION_FASTBOOT=y
> -CONFIG_CMD_FASTBOOT=y
> CONFIG_FASTBOOT_BUF_ADDR=0x80000000
> CONFIG_FASTBOOT_BUF_SIZE=0x1D000000
> CONFIG_FASTBOOT_FLASH=y
> @@ -40,5 +38,4 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0x0d02
> CONFIG_USB_GADGET_BCM_UDC_OTG_PHY=y
> CONFIG_USB_GADGET_DWC2_OTG=y
> CONFIG_USB_GADGET_DWC2_OTG_PHY_BUS_WIDTH_8=y
> -CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_OF_LIBFDT=y
> diff --git a/configs/bcm28155_ap_defconfig b/configs/bcm28155_ap_defconfig
> index 9e17b60e54e4..2d24200096e3 100644
> --- a/configs/bcm28155_ap_defconfig
> +++ b/configs/bcm28155_ap_defconfig
> @@ -8,8 +8,6 @@ CONFIG_VERSION_VARIABLE=y
> CONFIG_HUSH_PARSER=y
> # CONFIG_AUTOBOOT is not set
> CONFIG_FASTBOOT=y
> -CONFIG_USB_FUNCTION_FASTBOOT=y
> -CONFIG_CMD_FASTBOOT=y
> CONFIG_FASTBOOT_BUF_ADDR=0x80000000
> CONFIG_FASTBOOT_BUF_SIZE=0x7FF00000
> CONFIG_FASTBOOT_FLASH=y
> @@ -41,5 +39,4 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0x0d02
> CONFIG_USB_GADGET_BCM_UDC_OTG_PHY=y
> CONFIG_USB_GADGET_DWC2_OTG=y
> CONFIG_USB_GADGET_DWC2_OTG_PHY_BUS_WIDTH_8=y
> -CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_OF_LIBFDT=y
> diff --git a/configs/birdland_bav335a_defconfig b/configs/birdland_bav335a_defconfig
> index 41b77302155f..828bbd16e6ed 100644
> --- a/configs/birdland_bav335a_defconfig
> +++ b/configs/birdland_bav335a_defconfig
> @@ -24,8 +24,6 @@ CONFIG_SPL_POWER_SUPPORT=y
> CONFIG_SPL_YMODEM_SUPPORT=y
> CONFIG_HUSH_PARSER=y
> CONFIG_FASTBOOT=y
> -CONFIG_USB_FUNCTION_FASTBOOT=y
> -CONFIG_CMD_FASTBOOT=y
> CONFIG_FASTBOOT_BUF_ADDR=0x82000000
> CONFIG_CMD_BOOTZ=y
> # CONFIG_CMD_IMLS is not set
> @@ -69,7 +67,6 @@ CONFIG_USB_GADGET=y
> CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
> CONFIG_USB_GADGET_VENDOR_NUM=0x0451
> CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
> -CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_FAT_WRITE=y
> CONFIG_LZO=y
> CONFIG_OF_LIBFDT=y
> diff --git a/configs/birdland_bav335b_defconfig b/configs/birdland_bav335b_defconfig
> index 6ecf8d035478..d851575ac619 100644
> --- a/configs/birdland_bav335b_defconfig
> +++ b/configs/birdland_bav335b_defconfig
> @@ -24,8 +24,6 @@ CONFIG_SPL_POWER_SUPPORT=y
> CONFIG_SPL_YMODEM_SUPPORT=y
> CONFIG_HUSH_PARSER=y
> CONFIG_FASTBOOT=y
> -CONFIG_USB_FUNCTION_FASTBOOT=y
> -CONFIG_CMD_FASTBOOT=y
> CONFIG_FASTBOOT_BUF_ADDR=0x82000000
> CONFIG_CMD_BOOTZ=y
> # CONFIG_CMD_IMLS is not set
> @@ -69,7 +67,6 @@ CONFIG_USB_GADGET=y
> CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
> CONFIG_USB_GADGET_VENDOR_NUM=0x0451
> CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
> -CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_FAT_WRITE=y
> CONFIG_LZO=y
> CONFIG_OF_LIBFDT=y
> diff --git a/configs/cgtqmx6eval_defconfig b/configs/cgtqmx6eval_defconfig
> index b17c30fcd2f6..201a33138cf2 100644
> --- a/configs/cgtqmx6eval_defconfig
> +++ b/configs/cgtqmx6eval_defconfig
> @@ -24,8 +24,6 @@ CONFIG_SPL_I2C_SUPPORT=y
> CONFIG_HUSH_PARSER=y
> CONFIG_SYS_PROMPT="CGT-QMX6-Quad U-Boot > "
> CONFIG_FASTBOOT=y
> -CONFIG_USB_FUNCTION_FASTBOOT=y
> -CONFIG_CMD_FASTBOOT=y
> CONFIG_FASTBOOT_BUF_ADDR=0x12000000
> CONFIG_CMD_BOOTZ=y
> # CONFIG_CMD_IMLS is not set
> @@ -61,7 +59,6 @@ CONFIG_USB_GADGET_MANUFACTURER="Congatec"
> CONFIG_USB_GADGET_VENDOR_NUM=0x0525
> CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
> CONFIG_CI_UDC=y
> -CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_USB_HOST_ETHER=y
> CONFIG_USB_ETHER_ASIX=y
> # CONFIG_VIDEO_SW_CURSOR is not set
> diff --git a/configs/chromebit_mickey_defconfig b/configs/chromebit_mickey_defconfig
> index fccff80780bc..e061b2615255 100644
> --- a/configs/chromebit_mickey_defconfig
> +++ b/configs/chromebit_mickey_defconfig
> @@ -79,7 +79,6 @@ CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
> CONFIG_USB_GADGET_VENDOR_NUM=0x2207
> CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
> CONFIG_USB_GADGET_DWC2_OTG=y
> -CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_DM_VIDEO=y
> CONFIG_DISPLAY=y
> CONFIG_VIDEO_ROCKCHIP=y
> diff --git a/configs/chromebook_jerry_defconfig b/configs/chromebook_jerry_defconfig
> index 18790b30898f..2f6b4e5e3d30 100644
> --- a/configs/chromebook_jerry_defconfig
> +++ b/configs/chromebook_jerry_defconfig
> @@ -80,7 +80,6 @@ CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
> CONFIG_USB_GADGET_VENDOR_NUM=0x2207
> CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
> CONFIG_USB_GADGET_DWC2_OTG=y
> -CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_DM_VIDEO=y
> CONFIG_DISPLAY=y
> CONFIG_VIDEO_ROCKCHIP=y
> diff --git a/configs/chromebook_minnie_defconfig b/configs/chromebook_minnie_defconfig
> index fdb992d59252..3b76cb47fb4d 100644
> --- a/configs/chromebook_minnie_defconfig
> +++ b/configs/chromebook_minnie_defconfig
> @@ -79,7 +79,6 @@ CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
> CONFIG_USB_GADGET_VENDOR_NUM=0x2207
> CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
> CONFIG_USB_GADGET_DWC2_OTG=y
> -CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_DM_VIDEO=y
> CONFIG_DISPLAY=y
> CONFIG_VIDEO_ROCKCHIP=y
> diff --git a/configs/dra7xx_evm_defconfig b/configs/dra7xx_evm_defconfig
> index 4aca3a4a043a..748948ec8156 100644
> --- a/configs/dra7xx_evm_defconfig
> +++ b/configs/dra7xx_evm_defconfig
> @@ -25,7 +25,6 @@ CONFIG_SPL_DMA_SUPPORT=y
> CONFIG_SPL_OS_BOOT=y
> CONFIG_HUSH_PARSER=y
> CONFIG_FASTBOOT=y
> -CONFIG_USB_FUNCTION_FASTBOOT=y
> CONFIG_FASTBOOT_BUF_ADDR=0x82000000
> CONFIG_FASTBOOT_BUF_SIZE=0x2F000000
> CONFIG_FASTBOOT_FLASH=y
> @@ -93,4 +92,3 @@ CONFIG_USB_GADGET=y
> CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
> CONFIG_USB_GADGET_VENDOR_NUM=0x0451
> CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
> -CONFIG_USB_GADGET_DOWNLOAD=y
> diff --git a/configs/dra7xx_hs_evm_defconfig b/configs/dra7xx_hs_evm_defconfig
> index 4d126e09f6a6..d31653e9d1c5 100644
> --- a/configs/dra7xx_hs_evm_defconfig
> +++ b/configs/dra7xx_hs_evm_defconfig
> @@ -30,7 +30,6 @@ CONFIG_SPL_SEPARATE_BSS=y
> CONFIG_SPL_DMA_SUPPORT=y
> CONFIG_HUSH_PARSER=y
> CONFIG_FASTBOOT=y
> -CONFIG_USB_FUNCTION_FASTBOOT=y
> CONFIG_FASTBOOT_BUF_ADDR=0x82000000
> CONFIG_FASTBOOT_BUF_SIZE=0x2F000000
> CONFIG_FASTBOOT_FLASH=y
> @@ -95,4 +94,3 @@ CONFIG_USB_GADGET=y
> CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
> CONFIG_USB_GADGET_VENDOR_NUM=0x0451
> CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
> -CONFIG_USB_GADGET_DOWNLOAD=y
> diff --git a/configs/evb-rk3036_defconfig b/configs/evb-rk3036_defconfig
> index 9cce3351f80b..f2c4d8c54303 100644
> --- a/configs/evb-rk3036_defconfig
> +++ b/configs/evb-rk3036_defconfig
> @@ -48,7 +48,6 @@ CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
> CONFIG_USB_GADGET_VENDOR_NUM=0x2207
> CONFIG_USB_GADGET_PRODUCT_NUM=0x310a
> CONFIG_USB_GADGET_DWC2_OTG=y
> -CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_SPL_TINY_MEMSET=y
> CONFIG_CMD_DHRYSTONE=y
> CONFIG_ERRNO_STR=y
> diff --git a/configs/evb-rk3229_defconfig b/configs/evb-rk3229_defconfig
> index 61fdacaa1340..2bc9f4a9765b 100644
> --- a/configs/evb-rk3229_defconfig
> +++ b/configs/evb-rk3229_defconfig
> @@ -48,5 +48,4 @@ CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
> CONFIG_USB_GADGET_VENDOR_NUM=0x2207
> CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
> CONFIG_USB_GADGET_DWC2_OTG=y
> -CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_ERRNO_STR=y
> diff --git a/configs/evb-rk3288_defconfig b/configs/evb-rk3288_defconfig
> index 0d91cdd53ff6..d8dadd7ea97e 100644
> --- a/configs/evb-rk3288_defconfig
> +++ b/configs/evb-rk3288_defconfig
> @@ -70,7 +70,6 @@ CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
> CONFIG_USB_GADGET_VENDOR_NUM=0x2207
> CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
> CONFIG_USB_GADGET_DWC2_OTG=y
> -CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_DM_VIDEO=y
> CONFIG_DISPLAY=y
> CONFIG_VIDEO_ROCKCHIP=y
> diff --git a/configs/fennec-rk3288_defconfig b/configs/fennec-rk3288_defconfig
> index 51420e5b66db..adc3f7aa70a8 100644
> --- a/configs/fennec-rk3288_defconfig
> +++ b/configs/fennec-rk3288_defconfig
> @@ -73,7 +73,6 @@ CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
> CONFIG_USB_GADGET_VENDOR_NUM=0x2207
> CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
> CONFIG_USB_GADGET_DWC2_OTG=y
> -CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_USB_HOST_ETHER=y
> CONFIG_USB_ETHER_ASIX=y
> CONFIG_USB_ETHER_SMSC95XX=y
> diff --git a/configs/firefly-rk3288_defconfig b/configs/firefly-rk3288_defconfig
> index eb42def73fc2..3e95f0fca2b3 100644
> --- a/configs/firefly-rk3288_defconfig
> +++ b/configs/firefly-rk3288_defconfig
> @@ -79,7 +79,6 @@ CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
> CONFIG_USB_GADGET_VENDOR_NUM=0x2207
> CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
> CONFIG_USB_GADGET_DWC2_OTG=y
> -CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_USB_HOST_ETHER=y
> CONFIG_USB_ETHER_ASIX=y
> CONFIG_USB_ETHER_SMSC95XX=y
> diff --git a/configs/kc1_defconfig b/configs/kc1_defconfig
> index d27a7f5abbe0..87b3eec4623c 100644
> --- a/configs/kc1_defconfig
> +++ b/configs/kc1_defconfig
> @@ -12,8 +12,6 @@ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION=2
> CONFIG_HUSH_PARSER=y
> CONFIG_SYS_PROMPT="kc1 # "
> CONFIG_FASTBOOT=y
> -CONFIG_USB_FUNCTION_FASTBOOT=y
> -CONFIG_CMD_FASTBOOT=y
> CONFIG_FASTBOOT_BUF_ADDR=0x82000000
> CONFIG_FASTBOOT_BUF_SIZE=0x2000000
> CONFIG_FASTBOOT_FLASH=y
> @@ -45,5 +43,4 @@ CONFIG_USB_GADGET=y
> CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
> CONFIG_USB_GADGET_VENDOR_NUM=0x0451
> CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
> -CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_OF_LIBFDT=y
> diff --git a/configs/kylin-rk3036_defconfig b/configs/kylin-rk3036_defconfig
> index 0904eb14d4fc..5adf5779c728 100644
> --- a/configs/kylin-rk3036_defconfig
> +++ b/configs/kylin-rk3036_defconfig
> @@ -48,7 +48,6 @@ CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
> CONFIG_USB_GADGET_VENDOR_NUM=0x2207
> CONFIG_USB_GADGET_PRODUCT_NUM=0x310a
> CONFIG_USB_GADGET_DWC2_OTG=y
> -CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_USB_HOST_ETHER=y
> CONFIG_USB_ETHER_ASIX=y
> CONFIG_USB_ETHER_SMSC95XX=y
> diff --git a/configs/miqi-rk3288_defconfig b/configs/miqi-rk3288_defconfig
> index e607ecd7dd71..e5d1b759256a 100644
> --- a/configs/miqi-rk3288_defconfig
> +++ b/configs/miqi-rk3288_defconfig
> @@ -73,7 +73,6 @@ CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
> CONFIG_USB_GADGET_VENDOR_NUM=0x2207
> CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
> CONFIG_USB_GADGET_DWC2_OTG=y
> -CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_USB_HOST_ETHER=y
> CONFIG_USB_ETHER_ASIX=y
> CONFIG_USB_ETHER_SMSC95XX=y
> diff --git a/configs/mx6qsabrelite_defconfig b/configs/mx6qsabrelite_defconfig
> index 92e0a578dfde..3dfe25ebb5c0 100644
> --- a/configs/mx6qsabrelite_defconfig
> +++ b/configs/mx6qsabrelite_defconfig
> @@ -10,8 +10,6 @@ CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
> CONFIG_BOARD_EARLY_INIT_F=y
> CONFIG_HUSH_PARSER=y
> CONFIG_FASTBOOT=y
> -CONFIG_USB_FUNCTION_FASTBOOT=y
> -CONFIG_CMD_FASTBOOT=y
> CONFIG_FASTBOOT_BUF_ADDR=0x12000000
> CONFIG_CMD_BOOTZ=y
> # CONFIG_CMD_IMLS is not set
> @@ -53,7 +51,6 @@ CONFIG_USB_GADGET_MANUFACTURER="Boundary"
> CONFIG_USB_GADGET_VENDOR_NUM=0x0525
> CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
> CONFIG_CI_UDC=y
> -CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_USB_ETHER=y
> CONFIG_USB_ETH_CDC=y
> # CONFIG_VIDEO_SW_CURSOR is not set
> diff --git a/configs/nitrogen6dl2g_defconfig b/configs/nitrogen6dl2g_defconfig
> index a5fdb48d2452..32c6eea54618 100644
> --- a/configs/nitrogen6dl2g_defconfig
> +++ b/configs/nitrogen6dl2g_defconfig
> @@ -10,8 +10,6 @@ CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
> CONFIG_BOARD_EARLY_INIT_F=y
> CONFIG_HUSH_PARSER=y
> CONFIG_FASTBOOT=y
> -CONFIG_USB_FUNCTION_FASTBOOT=y
> -CONFIG_CMD_FASTBOOT=y
> CONFIG_FASTBOOT_BUF_ADDR=0x12000000
> CONFIG_CMD_BOOTZ=y
> # CONFIG_CMD_IMLS is not set
> @@ -50,7 +48,6 @@ CONFIG_USB_GADGET_MANUFACTURER="Boundary"
> CONFIG_USB_GADGET_VENDOR_NUM=0x0525
> CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
> CONFIG_CI_UDC=y
> -CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_USB_ETHER=y
> CONFIG_USB_ETH_CDC=y
> # CONFIG_VIDEO_SW_CURSOR is not set
> diff --git a/configs/nitrogen6dl_defconfig b/configs/nitrogen6dl_defconfig
> index 1803bdba888e..8ce2515d3794 100644
> --- a/configs/nitrogen6dl_defconfig
> +++ b/configs/nitrogen6dl_defconfig
> @@ -10,8 +10,6 @@ CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
> CONFIG_BOARD_EARLY_INIT_F=y
> CONFIG_HUSH_PARSER=y
> CONFIG_FASTBOOT=y
> -CONFIG_USB_FUNCTION_FASTBOOT=y
> -CONFIG_CMD_FASTBOOT=y
> CONFIG_FASTBOOT_BUF_ADDR=0x12000000
> CONFIG_CMD_BOOTZ=y
> # CONFIG_CMD_IMLS is not set
> @@ -50,7 +48,6 @@ CONFIG_USB_GADGET_MANUFACTURER="Boundary"
> CONFIG_USB_GADGET_VENDOR_NUM=0x0525
> CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
> CONFIG_CI_UDC=y
> -CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_USB_ETHER=y
> CONFIG_USB_ETH_CDC=y
> # CONFIG_VIDEO_SW_CURSOR is not set
> diff --git a/configs/nitrogen6q2g_defconfig b/configs/nitrogen6q2g_defconfig
> index 3c9b44023f82..1c149b5edf99 100644
> --- a/configs/nitrogen6q2g_defconfig
> +++ b/configs/nitrogen6q2g_defconfig
> @@ -10,8 +10,6 @@ CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
> CONFIG_BOARD_EARLY_INIT_F=y
> CONFIG_HUSH_PARSER=y
> CONFIG_FASTBOOT=y
> -CONFIG_USB_FUNCTION_FASTBOOT=y
> -CONFIG_CMD_FASTBOOT=y
> CONFIG_FASTBOOT_BUF_ADDR=0x12000000
> CONFIG_CMD_BOOTZ=y
> # CONFIG_CMD_IMLS is not set
> @@ -51,7 +49,6 @@ CONFIG_USB_GADGET_MANUFACTURER="Boundary"
> CONFIG_USB_GADGET_VENDOR_NUM=0x0525
> CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
> CONFIG_CI_UDC=y
> -CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_USB_ETHER=y
> CONFIG_USB_ETH_CDC=y
> # CONFIG_VIDEO_SW_CURSOR is not set
> diff --git a/configs/nitrogen6q_defconfig b/configs/nitrogen6q_defconfig
> index 82b05febae40..29e59fd71ea0 100644
> --- a/configs/nitrogen6q_defconfig
> +++ b/configs/nitrogen6q_defconfig
> @@ -10,8 +10,6 @@ CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
> CONFIG_BOARD_EARLY_INIT_F=y
> CONFIG_HUSH_PARSER=y
> CONFIG_FASTBOOT=y
> -CONFIG_USB_FUNCTION_FASTBOOT=y
> -CONFIG_CMD_FASTBOOT=y
> CONFIG_FASTBOOT_BUF_ADDR=0x12000000
> CONFIG_CMD_BOOTZ=y
> # CONFIG_CMD_IMLS is not set
> @@ -51,7 +49,6 @@ CONFIG_USB_GADGET_MANUFACTURER="Boundary"
> CONFIG_USB_GADGET_VENDOR_NUM=0x0525
> CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
> CONFIG_CI_UDC=y
> -CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_USB_ETHER=y
> CONFIG_USB_ETH_CDC=y
> # CONFIG_VIDEO_SW_CURSOR is not set
> diff --git a/configs/nitrogen6s1g_defconfig b/configs/nitrogen6s1g_defconfig
> index 3e4c20357c16..a06d6e12e358 100644
> --- a/configs/nitrogen6s1g_defconfig
> +++ b/configs/nitrogen6s1g_defconfig
> @@ -10,8 +10,6 @@ CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
> CONFIG_BOARD_EARLY_INIT_F=y
> CONFIG_HUSH_PARSER=y
> CONFIG_FASTBOOT=y
> -CONFIG_USB_FUNCTION_FASTBOOT=y
> -CONFIG_CMD_FASTBOOT=y
> CONFIG_FASTBOOT_BUF_ADDR=0x12000000
> CONFIG_CMD_BOOTZ=y
> # CONFIG_CMD_IMLS is not set
> @@ -50,7 +48,6 @@ CONFIG_USB_GADGET_MANUFACTURER="Boundary"
> CONFIG_USB_GADGET_VENDOR_NUM=0x0525
> CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
> CONFIG_CI_UDC=y
> -CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_USB_ETHER=y
> CONFIG_USB_ETH_CDC=y
> # CONFIG_VIDEO_SW_CURSOR is not set
> diff --git a/configs/nitrogen6s_defconfig b/configs/nitrogen6s_defconfig
> index 107cbfc9bc55..a7a54bbb5e0f 100644
> --- a/configs/nitrogen6s_defconfig
> +++ b/configs/nitrogen6s_defconfig
> @@ -10,8 +10,6 @@ CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
> CONFIG_BOARD_EARLY_INIT_F=y
> CONFIG_HUSH_PARSER=y
> CONFIG_FASTBOOT=y
> -CONFIG_USB_FUNCTION_FASTBOOT=y
> -CONFIG_CMD_FASTBOOT=y
> CONFIG_FASTBOOT_BUF_ADDR=0x12000000
> CONFIG_CMD_BOOTZ=y
> # CONFIG_CMD_IMLS is not set
> @@ -50,7 +48,6 @@ CONFIG_USB_GADGET_MANUFACTURER="Boundary"
> CONFIG_USB_GADGET_VENDOR_NUM=0x0525
> CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
> CONFIG_CI_UDC=y
> -CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_USB_ETHER=y
> CONFIG_USB_ETH_CDC=y
> # CONFIG_VIDEO_SW_CURSOR is not set
> diff --git a/configs/omap3_beagle_defconfig b/configs/omap3_beagle_defconfig
> index 86967b07fb9c..024e35647304 100644
> --- a/configs/omap3_beagle_defconfig
> +++ b/configs/omap3_beagle_defconfig
> @@ -9,8 +9,6 @@ CONFIG_SPL=y
> CONFIG_SPL_MTD_SUPPORT=y
> CONFIG_SPL_OS_BOOT=y
> CONFIG_FASTBOOT=y
> -CONFIG_USB_FUNCTION_FASTBOOT=y
> -CONFIG_CMD_FASTBOOT=y
> CONFIG_FASTBOOT_BUF_ADDR=0x82000000
> # CONFIG_CMD_IMLS is not set
> CONFIG_CMD_SPL=y
> @@ -51,7 +49,6 @@ CONFIG_USB_GADGET=y
> CONFIG_USB_GADGET_MANUFACTURER="TI"
> CONFIG_USB_GADGET_VENDOR_NUM=0x0451
> CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
> -CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_USB_ETHER=y
> CONFIG_USB_HOST_ETHER=y
> CONFIG_USB_ETHER_ASIX=y
> diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig
> index b1693be7edd7..4380d6c84220 100644
> --- a/configs/omap3_logic_defconfig
> +++ b/configs/omap3_logic_defconfig
> @@ -15,7 +15,6 @@ CONFIG_SPL_OS_BOOT=y
> CONFIG_HUSH_PARSER=y
> CONFIG_SYS_PROMPT="OMAP Logic # "
> CONFIG_FASTBOOT=y
> -CONFIG_USB_FUNCTION_FASTBOOT=y
> CONFIG_FASTBOOT_BUF_ADDR=0x82000000
> # CONFIG_CMD_IMI is not set
> # CONFIG_CMD_IMLS is not set
> @@ -48,6 +47,5 @@ CONFIG_USB_GADGET=y
> CONFIG_USB_GADGET_MANUFACTURER="TI"
> CONFIG_USB_GADGET_VENDOR_NUM=0x0451
> CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
> -CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_USB_ETHER=y
> CONFIG_BCH=y
> diff --git a/configs/parrot_r16_defconfig b/configs/parrot_r16_defconfig
> index b36b9efec650..6be57e604e89 100644
> --- a/configs/parrot_r16_defconfig
> +++ b/configs/parrot_r16_defconfig
> @@ -23,4 +23,3 @@ CONFIG_FASTBOOT_FLASH_MMC_DEV=0
> CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_MUSB_GADGET=y
> CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
> -CONFIG_USB_GADGET_DOWNLOAD=y
> diff --git a/configs/phycore-rk3288_defconfig b/configs/phycore-rk3288_defconfig
> index ba50ea9d8665..f9a53fc920d0 100644
> --- a/configs/phycore-rk3288_defconfig
> +++ b/configs/phycore-rk3288_defconfig
> @@ -76,7 +76,6 @@ CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
> CONFIG_USB_GADGET_VENDOR_NUM=0x2207
> CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
> CONFIG_USB_GADGET_DWC2_OTG=y
> -CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_USB_HOST_ETHER=y
> CONFIG_USB_ETHER_ASIX=y
> CONFIG_USB_ETHER_SMSC95XX=y
> diff --git a/configs/popmetal-rk3288_defconfig b/configs/popmetal-rk3288_defconfig
> index a8d5cbf70940..5e592e6b918b 100644
> --- a/configs/popmetal-rk3288_defconfig
> +++ b/configs/popmetal-rk3288_defconfig
> @@ -73,7 +73,6 @@ CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
> CONFIG_USB_GADGET_VENDOR_NUM=0x2207
> CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
> CONFIG_USB_GADGET_DWC2_OTG=y
> -CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_USB_HOST_ETHER=y
> CONFIG_USB_ETHER_ASIX=y
> CONFIG_USB_ETHER_SMSC95XX=y
> diff --git a/configs/rock2_defconfig b/configs/rock2_defconfig
> index d0ffdc7b0e70..be28c6640c1f 100644
> --- a/configs/rock2_defconfig
> +++ b/configs/rock2_defconfig
> @@ -71,7 +71,6 @@ CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
> CONFIG_USB_GADGET_VENDOR_NUM=0x2207
> CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
> CONFIG_USB_GADGET_DWC2_OTG=y
> -CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_DM_VIDEO=y
> CONFIG_DISPLAY=y
> CONFIG_VIDEO_ROCKCHIP=y
> diff --git a/configs/sniper_defconfig b/configs/sniper_defconfig
> index 75371c47ce8e..21254a5ad32b 100644
> --- a/configs/sniper_defconfig
> +++ b/configs/sniper_defconfig
> @@ -13,8 +13,6 @@ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION=2
> CONFIG_HUSH_PARSER=y
> CONFIG_SYS_PROMPT="sniper # "
> CONFIG_FASTBOOT=y
> -CONFIG_USB_FUNCTION_FASTBOOT=y
> -CONFIG_CMD_FASTBOOT=y
> CONFIG_FASTBOOT_BUF_ADDR=0x82000000
> CONFIG_FASTBOOT_BUF_SIZE=0x2000000
> CONFIG_FASTBOOT_FLASH=y
> @@ -46,5 +44,4 @@ CONFIG_USB_GADGET=y
> CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
> CONFIG_USB_GADGET_VENDOR_NUM=0x0451
> CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
> -CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_OF_LIBFDT=y
> diff --git a/configs/tinker-rk3288_defconfig b/configs/tinker-rk3288_defconfig
> index 84fcd8979f20..816fc0189c1d 100644
> --- a/configs/tinker-rk3288_defconfig
> +++ b/configs/tinker-rk3288_defconfig
> @@ -76,7 +76,6 @@ CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
> CONFIG_USB_GADGET_VENDOR_NUM=0x2207
> CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
> CONFIG_USB_GADGET_DWC2_OTG=y
> -CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_USB_HOST_ETHER=y
> CONFIG_USB_ETHER_ASIX=y
> CONFIG_USB_ETHER_SMSC95XX=y
>
Reviewed-by: Łukasz Majewski <lukma@denx.de>
--
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-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
^ permalink raw reply [flat|nested] 35+ messages in thread
* [U-Boot] [PATCH v2 11/14] musb: sunxi: switch to the device model
2017-09-12 19:01 ` [U-Boot] [PATCH v2 11/14] musb: sunxi: switch to the device model Maxime Ripard
@ 2017-09-13 10:46 ` Łukasz Majewski
0 siblings, 0 replies; 35+ messages in thread
From: Łukasz Majewski @ 2017-09-13 10:46 UTC (permalink / raw)
To: u-boot
On 09/12/2017 09:01 PM, Maxime Ripard wrote:
> The device model was implemented so far using a hook that needed to be
> called from the board support, without DT support and only for the host.
>
> Switch to probing both in peripheral and host mode through the DT.
>
> Reviewed-by: Simon Glass <sjg@chromium.org>
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> ---
> arch/arm/include/asm/arch-sunxi/usb_phy.h | 7 +---
> board/sunxi/board.c | 1 +-
> drivers/usb/musb-new/sunxi.c | 56 +++++++++++-------------
> 3 files changed, 27 insertions(+), 37 deletions(-)
>
> diff --git a/arch/arm/include/asm/arch-sunxi/usb_phy.h b/arch/arm/include/asm/arch-sunxi/usb_phy.h
> index cef6c985bc8d..5a9cacb6f4a3 100644
> --- a/arch/arm/include/asm/arch-sunxi/usb_phy.h
> +++ b/arch/arm/include/asm/arch-sunxi/usb_phy.h
> @@ -19,10 +19,3 @@ void sunxi_usb_phy_power_off(int index);
> int sunxi_usb_phy_vbus_detect(int index);
> int sunxi_usb_phy_id_detect(int index);
> void sunxi_usb_phy_enable_squelch_detect(int index, int enable);
> -
> -/* Not really phy related, but we have to declare this somewhere ... */
> -#if defined(CONFIG_USB_MUSB_HOST) || defined(CONFIG_USB_MUSB_GADGET)
> -void sunxi_musb_board_init(void);
> -#else
> -#define sunxi_musb_board_init()
> -#endif
> diff --git a/board/sunxi/board.c b/board/sunxi/board.c
> index 70e01437c4f4..f9224360d758 100644
> --- a/board/sunxi/board.c
> +++ b/board/sunxi/board.c
> @@ -736,7 +736,6 @@ int misc_init_r(void)
> if (ret)
> return ret;
> #endif
> - sunxi_musb_board_init();
>
> return 0;
> }
> diff --git a/drivers/usb/musb-new/sunxi.c b/drivers/usb/musb-new/sunxi.c
> index 5c1a902e42dc..7ee44ea91900 100644
> --- a/drivers/usb/musb-new/sunxi.c
> +++ b/drivers/usb/musb-new/sunxi.c
> @@ -308,9 +308,6 @@ static struct musb_hdrc_platform_data musb_plat = {
> .platform_ops = &sunxi_musb_ops,
> };
>
> -#ifdef CONFIG_USB_MUSB_HOST
> -static int musb_usb_remove(struct udevice *dev);
> -
> static int musb_usb_probe(struct udevice *dev)
> {
> struct musb_host_data *host = dev_get_priv(dev);
> @@ -319,16 +316,20 @@ static int musb_usb_probe(struct udevice *dev)
>
> priv->desc_before_addr = true;
>
> +#ifdef CONFIG_USB_MUSB_HOST
> host->host = musb_init_controller(&musb_plat, NULL,
> (void *)SUNXI_USB0_BASE);
> if (!host->host)
> return -EIO;
>
> ret = musb_lowlevel_init(host);
> - if (ret == 0)
> - printf("MUSB OTG\n");
> - else
> - musb_usb_remove(dev);
> + if (!ret)
> + printf("Allwinner mUSB OTG (Host)\n");
> +#else
> + ret = musb_register(&musb_plat, NULL, (void *)SUNXI_USB0_BASE);
> + if (!ret)
> + printf("Allwinner mUSB OTG (Peripheral)\n");
> +#endif
>
> return ret;
> }
> @@ -352,30 +353,27 @@ static int musb_usb_remove(struct udevice *dev)
> return 0;
> }
>
> -U_BOOT_DRIVER(usb_musb) = {
> - .name = "sunxi-musb",
> - .id = UCLASS_USB,
> - .probe = musb_usb_probe,
> - .remove = musb_usb_remove,
> - .ops = &musb_usb_ops,
> - .platdata_auto_alloc_size = sizeof(struct usb_platdata),
> - .priv_auto_alloc_size = sizeof(struct musb_host_data),
> +static const struct udevice_id sunxi_musb_ids[] = {
> + { .compatible = "allwinner,sun4i-a10-musb" },
> + { .compatible = "allwinner,sun6i-a31-musb" },
> + { .compatible = "allwinner,sun8i-a33-musb" },
> + { .compatible = "allwinner,sun8i-h3-musb" },
> + { }
> };
> -#endif
>
> -void sunxi_musb_board_init(void)
> -{
> +U_BOOT_DRIVER(usb_musb) = {
> + .name = "sunxi-musb",
> #ifdef CONFIG_USB_MUSB_HOST
> - struct udevice *dev;
> -
> - /*
> - * Bind the driver directly for now as musb linux kernel support is
> - * still pending upstream so our dts files do not have the necessary
> - * nodes yet. TODO: Remove this as soon as the dts nodes are in place
> - * and bind by compatible instead.
> - */
> - device_bind_driver(dm_root(), "sunxi-musb", "sunxi-musb", &dev);
> + .id = UCLASS_USB,
> #else
> - musb_register(&musb_plat, NULL, (void *)SUNXI_USB0_BASE);
> + .id = UCLASS_USB_DEV_GENERIC,
> #endif
> -}
> + .of_match = sunxi_musb_ids,
> + .probe = musb_usb_probe,
> + .remove = musb_usb_remove,
> +#ifdef CONFIG_USB_MUSB_HOST
> + .ops = &musb_usb_ops,
> +#endif
> + .platdata_auto_alloc_size = sizeof(struct usb_platdata),
> + .priv_auto_alloc_size = sizeof(struct musb_host_data),
> +};
>
Reviewed-by: Łukasz Majewski <lukma@denx.de>
--
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-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
^ permalink raw reply [flat|nested] 35+ messages in thread
* [U-Boot] [PATCH v2 12/14] sunxi: Register usb_ether
2017-09-12 19:01 ` [U-Boot] [PATCH v2 12/14] sunxi: Register usb_ether Maxime Ripard
@ 2017-09-13 10:46 ` Łukasz Majewski
0 siblings, 0 replies; 35+ messages in thread
From: Łukasz Majewski @ 2017-09-13 10:46 UTC (permalink / raw)
To: u-boot
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="windows-1254", Size: 891 bytes --]
On 09/12/2017 09:01 PM, Maxime Ripard wrote:
> Call the function to register the usb_ether gadget in the board.
>
> Reviewed-by: Simon Glass <sjg@chromium.org>
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> ---
> board/sunxi/board.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/board/sunxi/board.c b/board/sunxi/board.c
> index f9224360d758..610fa89056ef 100644
> --- a/board/sunxi/board.c
> +++ b/board/sunxi/board.c
> @@ -737,6 +737,8 @@ int misc_init_r(void)
> return ret;
> #endif
>
> + usb_ether_init();
> +
> return 0;
> }
>
>
Reviewed-by: Łukasz Majewski <lukma@denx.de>
--
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-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
^ permalink raw reply [flat|nested] 35+ messages in thread
* [U-Boot] [PATCH v2 13/14] sunxi: Imply USB_ETHER
2017-09-12 19:01 ` [U-Boot] [PATCH v2 13/14] sunxi: Imply USB_ETHER Maxime Ripard
@ 2017-09-13 10:49 ` Łukasz Majewski
0 siblings, 0 replies; 35+ messages in thread
From: Łukasz Majewski @ 2017-09-13 10:49 UTC (permalink / raw)
To: u-boot
On 09/12/2017 09:01 PM, Maxime Ripard wrote:
> Now that we can enable the usb_ether gadget, do it. This will be especially
> useful for boards that don't have any ethernet controller, such as the ones
> based on the A13 or A33.
>
> Reviewed-by: Simon Glass <sjg@chromium.org>
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> ---
> arch/arm/Kconfig | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> index 519f42778a8d..bce5959ef687 100644
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@ -703,6 +703,7 @@ config ARCH_SUNXI
> imply SPL_MMC_SUPPORT if MMC
> imply SPL_POWER_SUPPORT
> imply SPL_SERIAL_SUPPORT
> + imply USB_ETHER
> imply USB_GADGET
>
> config TARGET_TS4600
>
Reviewed-by: Łukasz Majewski <lukma@denx.de>
--
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-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
^ permalink raw reply [flat|nested] 35+ messages in thread
* [U-Boot] [PATCH v2 14/14] sunxi: sina33: Sync the device tree with the kernel
2017-09-12 19:01 ` [U-Boot] [PATCH v2 14/14] sunxi: sina33: Sync the device tree with the kernel Maxime Ripard
@ 2017-09-13 10:52 ` Łukasz Majewski
0 siblings, 0 replies; 35+ messages in thread
From: Łukasz Majewski @ 2017-09-13 10:52 UTC (permalink / raw)
To: u-boot
On 09/12/2017 09:01 PM, Maxime Ripard wrote:
> The kernel DT of the SinA33 has evolved quite a bit. Make sure we sync it
> and its upstream DTSI to be able to use the OTG. The DTs were taken from
> the 4.13 kernel release.
>
> Reviewed-by: Simon Glass <sjg@chromium.org>
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> ---
> arch/arm/dts/axp223.dtsi | 58 ++-
> arch/arm/dts/axp22x.dtsi | 10 +-
> arch/arm/dts/sun8i-a23-a33.dtsi | 446 +++++++-----------
> arch/arm/dts/sun8i-a33-sinlinx-sina33.dts | 43 ++-
> arch/arm/dts/sun8i-a33.dtsi | 477 +++++++++++++++----
> include/dt-bindings/clock/sun8i-a23-a33-ccu.h | 127 +++++-
> include/dt-bindings/reset/sun8i-a23-a33-ccu.h | 87 +++-
> 7 files changed, 914 insertions(+), 334 deletions(-)
> create mode 100644 arch/arm/dts/axp223.dtsi
> create mode 100644 include/dt-bindings/clock/sun8i-a23-a33-ccu.h
> create mode 100644 include/dt-bindings/reset/sun8i-a23-a33-ccu.h
>
> diff --git a/arch/arm/dts/axp223.dtsi b/arch/arm/dts/axp223.dtsi
> new file mode 100644
> index 000000000000..b91b6c1278c7
> --- /dev/null
> +++ b/arch/arm/dts/axp223.dtsi
> @@ -0,0 +1,58 @@
> +/*
> + * Copyright 2016 Free Electrons
> + *
> + * Quentin Schulz <quentin.schulz@free-electrons.com>
> + *
> + * This file is dual-licensed: you can use it either under the terms
> + * of the GPL or the X11 license, at your option. Note that this dual
> + * licensing only applies to this file, and not this project as a
> + * whole.
> + *
> + * a) This file is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU General Public License as
> + * published by the Free Software Foundation; either version 2 of the
> + * License, or (at your option) any later version.
> + *
> + * This file is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + *
> + * Or, alternatively,
> + *
> + * b) Permission is hereby granted, free of charge, to any person
> + * obtaining a copy of this software and associated documentation
> + * files (the "Software"), to deal in the Software without
> + * restriction, including without limitation the rights to use,
> + * copy, modify, merge, publish, distribute, sublicense, and/or
> + * sell copies of the Software, and to permit persons to whom the
> + * Software is furnished to do so, subject to the following
> + * conditions:
> + *
> + * The above copyright notice and this permission notice shall be
> + * included in all copies or substantial portions of the Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
> + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
> + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
> + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
> + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
> + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
> + * OTHER DEALINGS IN THE SOFTWARE.
> + */
> +
> +/*
> + * AXP223 Integrated Power Management Chip
> + * http://www.x-powers.com/product/AXP22X.php
> + * http://dl.linux-sunxi.org/AXP/AXP223-en.pdf
> + *
> + * The AXP223 shares most of its logic with the AXP221 but it has some
> + * differences, for the VBUS driver for example.
> + */
> +
> +#include "axp22x.dtsi"
> +
> +&usb_power_supply {
> + compatible = "x-powers,axp223-usb-power-supply";
> +};
> diff --git a/arch/arm/dts/axp22x.dtsi b/arch/arm/dts/axp22x.dtsi
> index 458b6681e3ec..87fb08e812ec 100644
> --- a/arch/arm/dts/axp22x.dtsi
> +++ b/arch/arm/dts/axp22x.dtsi
> @@ -52,6 +52,16 @@
> interrupt-controller;
> #interrupt-cells = <1>;
>
> + ac_power_supply: ac-power-supply {
> + compatible = "x-powers,axp221-ac-power-supply";
> + status = "disabled";
> + };
> +
> + battery_power_supply: battery-power-supply {
> + compatible = "x-powers,axp221-battery-power-supply";
> + status = "disabled";
> + };
> +
> regulators {
> /* Default work frequency for buck regulators */
> x-powers,dcdc-freq = <3000>;
> diff --git a/arch/arm/dts/sun8i-a23-a33.dtsi b/arch/arm/dts/sun8i-a23-a33.dtsi
> index f97c38f097d1..ea50dda75adc 100644
> --- a/arch/arm/dts/sun8i-a23-a33.dtsi
> +++ b/arch/arm/dts/sun8i-a23-a33.dtsi
> @@ -46,7 +46,8 @@
>
> #include <dt-bindings/interrupt-controller/arm-gic.h>
>
> -#include <dt-bindings/pinctrl/sun4i-a10.h>
> +#include <dt-bindings/clock/sun8i-a23-a33-ccu.h>
> +#include <dt-bindings/reset/sun8i-a23-a33-ccu.h>
>
> / {
> interrupt-parent = <&gic>;
> @@ -60,7 +61,9 @@
> compatible = "allwinner,simple-framebuffer",
> "simple-framebuffer";
> allwinner,pipeline = "de_be0-lcd0";
> - clocks = <&pll6 0>;
> + clocks = <&ccu CLK_BUS_LCD>, <&ccu CLK_BUS_DE_BE>,
> + <&ccu CLK_LCD_CH0>, <&ccu CLK_DE_BE>,
> + <&ccu CLK_DRAM_DE_BE>, <&ccu CLK_DRC>;
> status = "disabled";
> };
> };
> @@ -80,7 +83,7 @@
> #address-cells = <1>;
> #size-cells = <0>;
>
> - cpu at 0 {
> + cpu0: cpu at 0 {
> compatible = "arm,cortex-a7";
> device_type = "cpu";
> reg = <0>;
> @@ -102,151 +105,16 @@
> #clock-cells = <0>;
> compatible = "fixed-clock";
> clock-frequency = <24000000>;
> + clock-accuracy = <50000>;
> clock-output-names = "osc24M";
> };
>
> - osc32k: osc32k_clk {
> + ext_osc32k: ext_osc32k_clk {
> #clock-cells = <0>;
> compatible = "fixed-clock";
> clock-frequency = <32768>;
> - clock-output-names = "osc32k";
> - };
> -
> - pll1: clk at 01c20000 {
> - #clock-cells = <0>;
> - compatible = "allwinner,sun8i-a23-pll1-clk";
> - reg = <0x01c20000 0x4>;
> - clocks = <&osc24M>;
> - clock-output-names = "pll1";
> - };
> -
> - /* dummy clock until actually implemented */
> - pll5: pll5_clk {
> - #clock-cells = <0>;
> - compatible = "fixed-clock";
> - clock-frequency = <0>;
> - clock-output-names = "pll5";
> - };
> -
> - pll6: clk at 01c20028 {
> - #clock-cells = <1>;
> - compatible = "allwinner,sun6i-a31-pll6-clk";
> - reg = <0x01c20028 0x4>;
> - clocks = <&osc24M>;
> - clock-output-names = "pll6", "pll6x2";
> - };
> -
> - cpu: cpu_clk at 01c20050 {
> - #clock-cells = <0>;
> - compatible = "allwinner,sun4i-a10-cpu-clk";
> - reg = <0x01c20050 0x4>;
> -
> - /*
> - * PLL1 is listed twice here.
> - * While it looks suspicious, it's actually documented
> - * that way both in the datasheet and in the code from
> - * Allwinner.
> - */
> - clocks = <&osc32k>, <&osc24M>, <&pll1>, <&pll1>;
> - clock-output-names = "cpu";
> - };
> -
> - axi: axi_clk at 01c20050 {
> - #clock-cells = <0>;
> - compatible = "allwinner,sun8i-a23-axi-clk";
> - reg = <0x01c20050 0x4>;
> - clocks = <&cpu>;
> - clock-output-names = "axi";
> - };
> -
> - ahb1: ahb1_clk at 01c20054 {
> - #clock-cells = <0>;
> - compatible = "allwinner,sun6i-a31-ahb1-clk";
> - reg = <0x01c20054 0x4>;
> - clocks = <&osc32k>, <&osc24M>, <&axi>, <&pll6 0>;
> - clock-output-names = "ahb1";
> - };
> -
> - apb1: apb1_clk at 01c20054 {
> - #clock-cells = <0>;
> - compatible = "allwinner,sun4i-a10-apb0-clk";
> - reg = <0x01c20054 0x4>;
> - clocks = <&ahb1>;
> - clock-output-names = "apb1";
> - };
> -
> - apb1_gates: clk at 01c20068 {
> - #clock-cells = <1>;
> - compatible = "allwinner,sun8i-a23-apb1-gates-clk";
> - reg = <0x01c20068 0x4>;
> - clocks = <&apb1>;
> - clock-indices = <0>, <5>,
> - <12>, <13>;
> - clock-output-names = "apb1_codec", "apb1_pio",
> - "apb1_daudio0", "apb1_daudio1";
> - };
> -
> - apb2: clk at 01c20058 {
> - #clock-cells = <0>;
> - compatible = "allwinner,sun4i-a10-apb1-clk";
> - reg = <0x01c20058 0x4>;
> - clocks = <&osc32k>, <&osc24M>, <&pll6 0>, <&pll6 0>;
> - clock-output-names = "apb2";
> - };
> -
> - apb2_gates: clk at 01c2006c {
> - #clock-cells = <1>;
> - compatible = "allwinner,sun8i-a23-apb2-gates-clk";
> - reg = <0x01c2006c 0x4>;
> - clocks = <&apb2>;
> - clock-indices = <0>, <1>,
> - <2>, <16>,
> - <17>, <18>,
> - <19>, <20>;
> - clock-output-names = "apb2_i2c0", "apb2_i2c1",
> - "apb2_i2c2", "apb2_uart0",
> - "apb2_uart1", "apb2_uart2",
> - "apb2_uart3", "apb2_uart4";
> - };
> -
> - mmc0_clk: clk at 01c20088 {
> - #clock-cells = <1>;
> - compatible = "allwinner,sun4i-a10-mmc-clk";
> - reg = <0x01c20088 0x4>;
> - clocks = <&osc24M>, <&pll6 0>;
> - clock-output-names = "mmc0",
> - "mmc0_output",
> - "mmc0_sample";
> - };
> -
> - mmc1_clk: clk at 01c2008c {
> - #clock-cells = <1>;
> - compatible = "allwinner,sun4i-a10-mmc-clk";
> - reg = <0x01c2008c 0x4>;
> - clocks = <&osc24M>, <&pll6 0>;
> - clock-output-names = "mmc1",
> - "mmc1_output",
> - "mmc1_sample";
> - };
> -
> - mmc2_clk: clk at 01c20090 {
> - #clock-cells = <1>;
> - compatible = "allwinner,sun4i-a10-mmc-clk";
> - reg = <0x01c20090 0x4>;
> - clocks = <&osc24M>, <&pll6 0>;
> - clock-output-names = "mmc2",
> - "mmc2_output",
> - "mmc2_sample";
> - };
> -
> - usb_clk: clk at 01c200cc {
> - #clock-cells = <1>;
> - #reset-cells = <1>;
> - compatible = "allwinner,sun8i-a23-usb-clk";
> - reg = <0x01c200cc 0x4>;
> - clocks = <&osc24M>;
> - clock-output-names = "usb_phy0", "usb_phy1", "usb_hsic",
> - "usb_hsic_12M", "usb_ohci0";
> + clock-accuracy = <50000>;
> + clock-output-names = "ext-osc32k";
> };
> };
>
> @@ -260,24 +128,23 @@
> compatible = "allwinner,sun8i-a23-dma";
> reg = <0x01c02000 0x1000>;
> interrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>;
> - clocks = <&ahb1_gates 6>;
> - resets = <&ahb1_rst 6>;
> + clocks = <&ccu CLK_BUS_DMA>;
> + resets = <&ccu RST_BUS_DMA>;
> #dma-cells = <1>;
> };
>
> mmc0: mmc at 01c0f000 {
> - compatible = "allwinner,sun7i-a20-mmc",
> - "allwinner,sun5i-a13-mmc";
> + compatible = "allwinner,sun7i-a20-mmc";
> reg = <0x01c0f000 0x1000>;
> - clocks = <&ahb1_gates 8>,
> - <&mmc0_clk 0>,
> - <&mmc0_clk 1>,
> - <&mmc0_clk 2>;
> + clocks = <&ccu CLK_BUS_MMC0>,
> + <&ccu CLK_MMC0>,
> + <&ccu CLK_MMC0_OUTPUT>,
> + <&ccu CLK_MMC0_SAMPLE>;
> clock-names = "ahb",
> "mmc",
> "output",
> "sample";
> - resets = <&ahb1_rst 8>;
> + resets = <&ccu RST_BUS_MMC0>;
> reset-names = "ahb";
> interrupts = <GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>;
> status = "disabled";
> @@ -286,18 +153,17 @@
> };
>
> mmc1: mmc at 01c10000 {
> - compatible = "allwinner,sun7i-a20-mmc",
> - "allwinner,sun5i-a13-mmc";
> + compatible = "allwinner,sun7i-a20-mmc";
> reg = <0x01c10000 0x1000>;
> - clocks = <&ahb1_gates 9>,
> - <&mmc1_clk 0>,
> - <&mmc1_clk 1>,
> - <&mmc1_clk 2>;
> + clocks = <&ccu CLK_BUS_MMC1>,
> + <&ccu CLK_MMC1>,
> + <&ccu CLK_MMC1_OUTPUT>,
> + <&ccu CLK_MMC1_SAMPLE>;
> clock-names = "ahb",
> "mmc",
> "output",
> "sample";
> - resets = <&ahb1_rst 9>;
> + resets = <&ccu RST_BUS_MMC1>;
> reset-names = "ahb";
> interrupts = <GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH>;
> status = "disabled";
> @@ -306,18 +172,17 @@
> };
>
> mmc2: mmc at 01c11000 {
> - compatible = "allwinner,sun7i-a20-mmc",
> - "allwinner,sun5i-a13-mmc";
> + compatible = "allwinner,sun7i-a20-mmc";
> reg = <0x01c11000 0x1000>;
> - clocks = <&ahb1_gates 10>,
> - <&mmc2_clk 0>,
> - <&mmc2_clk 1>,
> - <&mmc2_clk 2>;
> + clocks = <&ccu CLK_BUS_MMC2>,
> + <&ccu CLK_MMC2>,
> + <&ccu CLK_MMC2_OUTPUT>,
> + <&ccu CLK_MMC2_SAMPLE>;
> clock-names = "ahb",
> "mmc",
> "output",
> "sample";
> - resets = <&ahb1_rst 10>;
> + resets = <&ccu RST_BUS_MMC2>;
> reset-names = "ahb";
> interrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>;
> status = "disabled";
> @@ -325,12 +190,55 @@
> #size-cells = <0>;
> };
>
> + nfc: nand at 01c03000 {
> + compatible = "allwinner,sun4i-a10-nand";
> + reg = <0x01c03000 0x1000>;
> + interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>;
> + clocks = <&ccu CLK_BUS_NAND>, <&ccu CLK_NAND>;
> + clock-names = "ahb", "mod";
> + resets = <&ccu RST_BUS_NAND>;
> + reset-names = "ahb";
> + status = "disabled";
> + #address-cells = <1>;
> + #size-cells = <0>;
> + };
> +
> + usb_otg: usb at 01c19000 {
> + /* compatible gets set in SoC specific dtsi file */
> + reg = <0x01c19000 0x0400>;
> + clocks = <&ccu CLK_BUS_OTG>;
> + resets = <&ccu RST_BUS_OTG>;
> + interrupts = <GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>;
> + interrupt-names = "mc";
> + phys = <&usbphy 0>;
> + phy-names = "usb";
> + extcon = <&usbphy 0>;
> + status = "disabled";
> + };
> +
> + usbphy: phy at 01c19400 {
> + /*
> + * compatible and address regions get set in
> + * SoC specific dtsi file
> + */
> + clocks = <&ccu CLK_USB_PHY0>,
> + <&ccu CLK_USB_PHY1>;
> + clock-names = "usb0_phy",
> + "usb1_phy";
> + resets = <&ccu RST_USB_PHY0>,
> + <&ccu RST_USB_PHY1>;
> + reset-names = "usb0_reset",
> + "usb1_reset";
> + status = "disabled";
> + #phy-cells = <1>;
> + };
> +
> ehci0: usb at 01c1a000 {
> compatible = "allwinner,sun8i-a23-ehci", "generic-ehci";
> reg = <0x01c1a000 0x100>;
> interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>;
> - clocks = <&ahb1_gates 26>;
> - resets = <&ahb1_rst 26>;
> + clocks = <&ccu CLK_BUS_EHCI>;
> + resets = <&ccu RST_BUS_EHCI>;
> phys = <&usbphy 1>;
> phy-names = "usb";
> status = "disabled";
> @@ -340,101 +248,100 @@
> compatible = "allwinner,sun8i-a23-ohci", "generic-ohci";
> reg = <0x01c1a400 0x100>;
> interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;
> - clocks = <&ahb1_gates 29>, <&usb_clk 16>;
> - resets = <&ahb1_rst 29>;
> + clocks = <&ccu CLK_BUS_OHCI>, <&ccu CLK_USB_OHCI>;
> + resets = <&ccu RST_BUS_OHCI>;
> phys = <&usbphy 1>;
> phy-names = "usb";
> status = "disabled";
> };
>
> + ccu: clock at 01c20000 {
> + reg = <0x01c20000 0x400>;
> + clocks = <&osc24M>, <&rtc 0>;
> + clock-names = "hosc", "losc";
> + #clock-cells = <1>;
> + #reset-cells = <1>;
> + };
> +
> pio: pinctrl at 01c20800 {
> /* compatible gets set in SoC specific dtsi file */
> reg = <0x01c20800 0x400>;
> /* interrupts get set in SoC specific dtsi file */
> - clocks = <&apb1_gates 5>;
> + clocks = <&ccu CLK_BUS_PIO>, <&osc24M>, <&rtc 0>;
> + clock-names = "apb", "hosc", "losc";
> gpio-controller;
> interrupt-controller;
> #interrupt-cells = <3>;
> #gpio-cells = <3>;
>
> uart0_pins_a: uart0 at 0 {
> - allwinner,pins = "PF2", "PF4";
> - allwinner,function = "uart0";
> - allwinner,drive = <SUN4I_PINCTRL_10_MA>;
> - allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
> + pins = "PF2", "PF4";
> + function = "uart0";
> + };
> +
> + uart1_pins_a: uart1 at 0 {
> + pins = "PG6", "PG7";
> + function = "uart1";
> + };
> +
> + uart1_pins_cts_rts_a: uart1-cts-rts at 0 {
> + pins = "PG8", "PG9";
> + function = "uart1";
> };
>
> mmc0_pins_a: mmc0 at 0 {
> - allwinner,pins = "PF0", "PF1", "PF2",
> - "PF3", "PF4", "PF5";
> - allwinner,function = "mmc0";
> - allwinner,drive = <SUN4I_PINCTRL_30_MA>;
> - allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
> + pins = "PF0", "PF1", "PF2",
> + "PF3", "PF4", "PF5";
> + function = "mmc0";
> + drive-strength = <30>;
> + bias-pull-up;
> };
>
> mmc1_pins_a: mmc1 at 0 {
> - allwinner,pins = "PG0", "PG1", "PG2",
> - "PG3", "PG4", "PG5";
> - allwinner,function = "mmc1";
> - allwinner,drive = <SUN4I_PINCTRL_30_MA>;
> - allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
> + pins = "PG0", "PG1", "PG2",
> + "PG3", "PG4", "PG5";
> + function = "mmc1";
> + drive-strength = <30>;
> + bias-pull-up;
> };
>
> mmc2_8bit_pins: mmc2_8bit {
> - allwinner,pins = "PC5", "PC6", "PC8",
> - "PC9", "PC10", "PC11",
> - "PC12", "PC13", "PC14",
> - "PC15", "PC16";
> - allwinner,function = "mmc2";
> - allwinner,drive = <SUN4I_PINCTRL_30_MA>;
> - allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
> + pins = "PC5", "PC6", "PC8",
> + "PC9", "PC10", "PC11",
> + "PC12", "PC13", "PC14",
> + "PC15", "PC16";
> + function = "mmc2";
> + drive-strength = <30>;
> + bias-pull-up;
> };
>
> pwm0_pins: pwm0 {
> - allwinner,pins = "PH0";
> - allwinner,function = "pwm0";
> - allwinner,drive = <SUN4I_PINCTRL_10_MA>;
> - allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
> + pins = "PH0";
> + function = "pwm0";
> };
>
> i2c0_pins_a: i2c0 at 0 {
> - allwinner,pins = "PH2", "PH3";
> - allwinner,function = "i2c0";
> - allwinner,drive = <SUN4I_PINCTRL_10_MA>;
> - allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
> + pins = "PH2", "PH3";
> + function = "i2c0";
> };
>
> i2c1_pins_a: i2c1 at 0 {
> - allwinner,pins = "PH4", "PH5";
> - allwinner,function = "i2c1";
> - allwinner,drive = <SUN4I_PINCTRL_10_MA>;
> - allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
> + pins = "PH4", "PH5";
> + function = "i2c1";
> };
>
> i2c2_pins_a: i2c2 at 0 {
> - allwinner,pins = "PE12", "PE13";
> - allwinner,function = "i2c2";
> - allwinner,drive = <SUN4I_PINCTRL_10_MA>;
> - allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
> + pins = "PE12", "PE13";
> + function = "i2c2";
> };
> - };
> -
> - ahb1_rst: reset at 01c202c0 {
> - #reset-cells = <1>;
> - compatible = "allwinner,sun6i-a31-clock-reset";
> - reg = <0x01c202c0 0xc>;
> - };
>
> - apb1_rst: reset at 01c202d0 {
> - #reset-cells = <1>;
> - compatible = "allwinner,sun6i-a31-clock-reset";
> - reg = <0x01c202d0 0x4>;
> - };
> -
> - apb2_rst: reset at 01c202d8 {
> - #reset-cells = <1>;
> - compatible = "allwinner,sun6i-a31-clock-reset";
> - reg = <0x01c202d8 0x4>;
> + lcd_rgb666_pins: lcd-rgb666 at 0 {
> + pins = "PD2", "PD3", "PD4", "PD5", "PD6", "PD7",
> + "PD10", "PD11", "PD12", "PD13", "PD14", "PD15",
> + "PD18", "PD19", "PD20", "PD21", "PD22", "PD23",
> + "PD24", "PD25", "PD26", "PD27";
> + function = "lcd0";
> + };
> };
>
> timer at 01c20c00 {
> @@ -472,8 +379,8 @@
> interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>;
> reg-shift = <2>;
> reg-io-width = <4>;
> - clocks = <&apb2_gates 16>;
> - resets = <&apb2_rst 16>;
> + clocks = <&ccu CLK_BUS_UART0>;
> + resets = <&ccu RST_BUS_UART0>;
> dmas = <&dma 6>, <&dma 6>;
> dma-names = "rx", "tx";
> status = "disabled";
> @@ -485,8 +392,8 @@
> interrupts = <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;
> reg-shift = <2>;
> reg-io-width = <4>;
> - clocks = <&apb2_gates 17>;
> - resets = <&apb2_rst 17>;
> + clocks = <&ccu CLK_BUS_UART1>;
> + resets = <&ccu RST_BUS_UART1>;
> dmas = <&dma 7>, <&dma 7>;
> dma-names = "rx", "tx";
> status = "disabled";
> @@ -498,8 +405,8 @@
> interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;
> reg-shift = <2>;
> reg-io-width = <4>;
> - clocks = <&apb2_gates 18>;
> - resets = <&apb2_rst 18>;
> + clocks = <&ccu CLK_BUS_UART2>;
> + resets = <&ccu RST_BUS_UART2>;
> dmas = <&dma 8>, <&dma 8>;
> dma-names = "rx", "tx";
> status = "disabled";
> @@ -511,8 +418,8 @@
> interrupts = <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;
> reg-shift = <2>;
> reg-io-width = <4>;
> - clocks = <&apb2_gates 19>;
> - resets = <&apb2_rst 19>;
> + clocks = <&ccu CLK_BUS_UART3>;
> + resets = <&ccu RST_BUS_UART3>;
> dmas = <&dma 9>, <&dma 9>;
> dma-names = "rx", "tx";
> status = "disabled";
> @@ -524,8 +431,8 @@
> interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;
> reg-shift = <2>;
> reg-io-width = <4>;
> - clocks = <&apb2_gates 20>;
> - resets = <&apb2_rst 20>;
> + clocks = <&ccu CLK_BUS_UART4>;
> + resets = <&ccu RST_BUS_UART4>;
> dmas = <&dma 10>, <&dma 10>;
> dma-names = "rx", "tx";
> status = "disabled";
> @@ -535,8 +442,8 @@
> compatible = "allwinner,sun6i-a31-i2c";
> reg = <0x01c2ac00 0x400>;
> interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>;
> - clocks = <&apb2_gates 0>;
> - resets = <&apb2_rst 0>;
> + clocks = <&ccu CLK_BUS_I2C0>;
> + resets = <&ccu RST_BUS_I2C0>;
> status = "disabled";
> #address-cells = <1>;
> #size-cells = <0>;
> @@ -546,8 +453,8 @@
> compatible = "allwinner,sun6i-a31-i2c";
> reg = <0x01c2b000 0x400>;
> interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
> - clocks = <&apb2_gates 1>;
> - resets = <&apb2_rst 1>;
> + clocks = <&ccu CLK_BUS_I2C1>;
> + resets = <&ccu RST_BUS_I2C1>;
> status = "disabled";
> #address-cells = <1>;
> #size-cells = <0>;
> @@ -557,17 +464,44 @@
> compatible = "allwinner,sun6i-a31-i2c";
> reg = <0x01c2b400 0x400>;
> interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
> - clocks = <&apb2_gates 2>;
> - resets = <&apb2_rst 2>;
> + clocks = <&ccu CLK_BUS_I2C2>;
> + resets = <&ccu RST_BUS_I2C2>;
> status = "disabled";
> #address-cells = <1>;
> #size-cells = <0>;
> };
>
> + mali: gpu at 1c40000 {
> + compatible = "allwinner,sun8i-a23-mali",
> + "allwinner,sun7i-a20-mali", "arm,mali-400";
> + reg = <0x01c40000 0x10000>;
> + interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>,
> + <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>,
> + <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>,
> + <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>,
> + <GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH>,
> + <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>,
> + <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>;
> + interrupt-names = "gp",
> + "gpmmu",
> + "pp0",
> + "ppmmu0",
> + "pp1",
> + "ppmmu1",
> + "pmu";
> + clocks = <&ccu CLK_BUS_GPU>, <&ccu CLK_GPU>;
> + clock-names = "bus", "core";
> + resets = <&ccu RST_BUS_GPU>;
> + #cooling-cells = <2>;
> +
> + assigned-clocks = <&ccu CLK_GPU>;
> + assigned-clock-rates = <384000000>;
> + };
> +
> gic: interrupt-controller at 01c81000 {
> compatible = "arm,cortex-a7-gic", "arm,cortex-a15-gic";
> reg = <0x01c81000 0x1000>,
> - <0x01c82000 0x1000>,
> + <0x01c82000 0x2000>,
> <0x01c84000 0x2000>,
> <0x01c86000 0x2000>;
> interrupt-controller;
> @@ -580,13 +514,16 @@
> reg = <0x01f00000 0x54>;
> interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>,
> <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>;
> + clock-output-names = "osc32k";
> + clocks = <&ext_osc32k>;
> + #clock-cells = <1>;
> };
>
> - nmi_intc: interrupt-controller at 01f00c0c {
> - compatible = "allwinner,sun6i-a31-sc-nmi";
> + nmi_intc: interrupt-controller at 1f00c00 {
> + compatible = "allwinner,sun6i-a31-r-intc";
> interrupt-controller;
> #interrupt-cells = <2>;
> - reg = <0x01f00c0c 0x38>;
> + reg = <0x01f00c00 0x400>;
> interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
> };
>
> @@ -632,6 +569,10 @@
> compatible = "allwinner,sun6i-a31-clock-reset";
> #reset-cells = <1>;
> };
> +
> + codec_analog: codec-analog {
> + compatible = "allwinner,sun8i-a23-codec-analog";
> + };
> };
>
> cpucfg at 01f01c00 {
> @@ -654,7 +595,8 @@
> compatible = "allwinner,sun8i-a23-r-pinctrl";
> reg = <0x01f02c00 0x400>;
> interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;
> - clocks = <&apb0_gates 0>;
> + clocks = <&apb0_gates 0>, <&osc24M>, <&rtc 0>;
> + clock-names = "apb", "hosc", "losc";
> resets = <&apb0_rst 0>;
> gpio-controller;
> interrupt-controller;
> @@ -664,17 +606,15 @@
> #gpio-cells = <3>;
>
> r_rsb_pins: r_rsb {
> - allwinner,pins = "PL0", "PL1";
> - allwinner,function = "s_rsb";
> - allwinner,drive = <SUN4I_PINCTRL_20_MA>;
> - allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
> + pins = "PL0", "PL1";
> + function = "s_rsb";
> + drive-strength = <20>;
> + bias-pull-up;
> };
>
> r_uart_pins_a: r_uart at 0 {
> - allwinner,pins = "PL2", "PL3";
> - allwinner,function = "s_uart";
> - allwinner,drive = <SUN4I_PINCTRL_10_MA>;
> - allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
> + pins = "PL2", "PL3";
> + function = "s_uart";
> };
> };
>
> diff --git a/arch/arm/dts/sun8i-a33-sinlinx-sina33.dts b/arch/arm/dts/sun8i-a33-sinlinx-sina33.dts
> index fef6abc0a703..b1bc88c46c67 100644
> --- a/arch/arm/dts/sun8i-a33-sinlinx-sina33.dts
> +++ b/arch/arm/dts/sun8i-a33-sinlinx-sina33.dts
> @@ -61,6 +61,31 @@
> chosen {
> stdout-path = "serial0:115200n8";
> };
> +
> + panel {
> + compatible = "netron-dy,e231732";
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + port at 0 {
> + reg = <0>;
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + panel_input: endpoint at 0 {
> + reg = <0>;
> + remote-endpoint = <&tcon0_out_panel>;
> + };
> + };
> + };
> +};
> +
> +&de {
> + status = "okay";
> +};
> +
> +&cpu0 {
> + cpu-supply = <®_dcdc3>;
> };
>
> &ehci0 {
> @@ -207,12 +232,30 @@
> regulator-name = "vcc-rtc";
> };
>
> +&tcon0 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&lcd_rgb666_pins>;
> + status = "okay";
> +};
> +
> +&tcon0_out {
> + tcon0_out_panel: endpoint at 0 {
> + reg = <0>;
> + remote-endpoint = <&panel_input>;
> + };
> +};
> +
> &uart0 {
> pinctrl-names = "default";
> pinctrl-0 = <&uart0_pins_b>;
> status = "okay";
> };
>
> +&usb_otg {
> + dr_mode = "peripheral";
> + status = "okay";
> +};
> +
> &usbphy {
> status = "okay";
> usb1_vbus-supply = <®_vcc5v0>; /* USB1 VBUS is always on */
> diff --git a/arch/arm/dts/sun8i-a33.dtsi b/arch/arm/dts/sun8i-a33.dtsi
> index 001d8402ca18..22660919bd08 100644
> --- a/arch/arm/dts/sun8i-a33.dtsi
> +++ b/arch/arm/dts/sun8i-a33.dtsi
> @@ -43,19 +43,137 @@
> */
>
> #include "sun8i-a23-a33.dtsi"
> +#include <dt-bindings/thermal/thermal.h>
>
> / {
> + cpu0_opp_table: opp_table0 {
> + compatible = "operating-points-v2";
> + opp-shared;
> +
> + opp-120000000 {
> + opp-hz = /bits/ 64 <120000000>;
> + opp-microvolt = <1040000>;
> + clock-latency-ns = <244144>; /* 8 32k periods */
> + };
> +
> + opp-240000000 {
> + opp-hz = /bits/ 64 <240000000>;
> + opp-microvolt = <1040000>;
> + clock-latency-ns = <244144>; /* 8 32k periods */
> + };
> +
> + opp-312000000 {
> + opp-hz = /bits/ 64 <312000000>;
> + opp-microvolt = <1040000>;
> + clock-latency-ns = <244144>; /* 8 32k periods */
> + };
> +
> + opp-408000000 {
> + opp-hz = /bits/ 64 <408000000>;
> + opp-microvolt = <1040000>;
> + clock-latency-ns = <244144>; /* 8 32k periods */
> + };
> +
> + opp-480000000 {
> + opp-hz = /bits/ 64 <480000000>;
> + opp-microvolt = <1040000>;
> + clock-latency-ns = <244144>; /* 8 32k periods */
> + };
> +
> + opp-504000000 {
> + opp-hz = /bits/ 64 <504000000>;
> + opp-microvolt = <1040000>;
> + clock-latency-ns = <244144>; /* 8 32k periods */
> + };
> +
> + opp-600000000 {
> + opp-hz = /bits/ 64 <600000000>;
> + opp-microvolt = <1040000>;
> + clock-latency-ns = <244144>; /* 8 32k periods */
> + };
> +
> + opp-648000000 {
> + opp-hz = /bits/ 64 <648000000>;
> + opp-microvolt = <1040000>;
> + clock-latency-ns = <244144>; /* 8 32k periods */
> + };
> +
> + opp-720000000 {
> + opp-hz = /bits/ 64 <720000000>;
> + opp-microvolt = <1100000>;
> + clock-latency-ns = <244144>; /* 8 32k periods */
> + };
> +
> + opp-816000000 {
> + opp-hz = /bits/ 64 <816000000>;
> + opp-microvolt = <1100000>;
> + clock-latency-ns = <244144>; /* 8 32k periods */
> + };
> +
> + opp-912000000 {
> + opp-hz = /bits/ 64 <912000000>;
> + opp-microvolt = <1200000>;
> + clock-latency-ns = <244144>; /* 8 32k periods */
> + };
> +
> + opp-1008000000 {
> + opp-hz = /bits/ 64 <1008000000>;
> + opp-microvolt = <1200000>;
> + clock-latency-ns = <244144>; /* 8 32k periods */
> + };
> + };
> +
> cpus {
> + cpu at 0 {
> + clocks = <&ccu CLK_CPUX>;
> + clock-names = "cpu";
> + operating-points-v2 = <&cpu0_opp_table>;
> + #cooling-cells = <2>;
> + };
> +
> + cpu at 1 {
> + operating-points-v2 = <&cpu0_opp_table>;
> + };
> +
> cpu at 2 {
> compatible = "arm,cortex-a7";
> device_type = "cpu";
> reg = <2>;
> + operating-points-v2 = <&cpu0_opp_table>;
> };
>
> cpu at 3 {
> compatible = "arm,cortex-a7";
> device_type = "cpu";
> reg = <3>;
> + operating-points-v2 = <&cpu0_opp_table>;
> + };
> + };
> +
> + de: display-engine {
> + compatible = "allwinner,sun8i-a33-display-engine";
> + allwinner,pipelines = <&fe0>;
> + status = "disabled";
> + };
> +
> + iio-hwmon {
> + compatible = "iio-hwmon";
> + io-channels = <&ths>;
> + };
> +
> + mali_opp_table: gpu-opp-table {
> + compatible = "operating-points-v2";
> +
> + opp-144000000 {
> + opp-hz = /bits/ 64 <144000000>;
> + };
> +
> + opp-240000000 {
> + opp-hz = /bits/ 64 <240000000>;
> + };
> +
> + opp-384000000 {
> + opp-hz = /bits/ 64 <384000000>;
> };
> };
>
> @@ -63,113 +181,310 @@
> reg = <0x40000000 0x80000000>;
> };
>
> - clocks {
> - /* Dummy clock for pll11 (DDR1) until actually implemented */
> - pll11: pll11_clk {
> - #clock-cells = <0>;
> - compatible = "fixed-clock";
> - clock-frequency = <0>;
> - clock-output-names = "pll11";
> - };
> -
> - ahb1_gates: clk at 01c20060 {
> - #clock-cells = <1>;
> - compatible = "allwinner,sun8i-a33-ahb1-gates-clk";
> - reg = <0x01c20060 0x8>;
> - clocks = <&ahb1>;
> - clock-indices = <1>, <5>,
> - <6>, <8>, <9>,
> - <10>, <13>, <14>,
> - <19>, <20>,
> - <21>, <24>, <26>,
> - <29>, <32>, <36>,
> - <40>, <44>, <46>,
> - <52>, <53>,
> - <54>, <57>,
> - <58>;
> - clock-output-names = "ahb1_mipidsi", "ahb1_ss",
> - "ahb1_dma","ahb1_mmc0", "ahb1_mmc1",
> - "ahb1_mmc2", "ahb1_nand", "ahb1_sdram",
> - "ahb1_hstimer", "ahb1_spi0",
> - "ahb1_spi1", "ahb1_otg", "ahb1_ehci",
> - "ahb1_ohci", "ahb1_ve", "ahb1_lcd",
> - "ahb1_csi", "ahb1_be", "ahb1_fe",
> - "ahb1_gpu", "ahb1_msgbox",
> - "ahb1_spinlock", "ahb1_drc",
> - "ahb1_sat";
> - };
> -
> - ss_clk: clk at 01c2009c {
> - #clock-cells = <0>;
> - compatible = "allwinner,sun4i-a10-mod0-clk";
> - reg = <0x01c2009c 0x4>;
> - clocks = <&osc24M>, <&pll6 0>;
> - clock-output-names = "ss";
> - };
> -
> - mbus_clk: clk at 01c2015c {
> - #clock-cells = <0>;
> - compatible = "allwinner,sun8i-a23-mbus-clk";
> - reg = <0x01c2015c 0x4>;
> - clocks = <&osc24M>, <&pll6 1>, <&pll5>, <&pll11>;
> - clock-output-names = "mbus";
> + sound: sound {
> + compatible = "simple-audio-card";
> + simple-audio-card,name = "sun8i-a33-audio";
> + simple-audio-card,format = "i2s";
> + simple-audio-card,frame-master = <&link_codec>;
> + simple-audio-card,bitclock-master = <&link_codec>;
> + simple-audio-card,mclk-fs = <512>;
> + simple-audio-card,aux-devs = <&codec_analog>;
> + simple-audio-card,routing =
> + "Left DAC", "AIF1 Slot 0 Left",
> + "Right DAC", "AIF1 Slot 0 Right";
> + status = "disabled";
> +
> + simple-audio-card,cpu {
> + sound-dai = <&dai>;
> + };
> +
> + link_codec: simple-audio-card,codec {
> + sound-dai = <&codec>;
> };
> };
>
> soc at 01c00000 {
> + tcon0: lcd-controller at 01c0c000 {
> + compatible = "allwinner,sun8i-a33-tcon";
> + reg = <0x01c0c000 0x1000>;
> + interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
> + clocks = <&ccu CLK_BUS_LCD>,
> + <&ccu CLK_LCD_CH0>;
> + clock-names = "ahb",
> + "tcon-ch0";
> + clock-output-names = "tcon-pixel-clock";
> + resets = <&ccu RST_BUS_LCD>;
> + reset-names = "lcd";
> + status = "disabled";
> +
> + ports {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + tcon0_in: port at 0 {
> + #address-cells = <1>;
> + #size-cells = <0>;
> + reg = <0>;
> +
> + tcon0_in_drc0: endpoint at 0 {
> + reg = <0>;
> + remote-endpoint = <&drc0_out_tcon0>;
> + };
> + };
> +
> + tcon0_out: port at 1 {
> + #address-cells = <1>;
> + #size-cells = <0>;
> + reg = <1>;
> + };
> + };
> + };
> +
> crypto: crypto-engine at 01c15000 {
> compatible = "allwinner,sun4i-a10-crypto";
> reg = <0x01c15000 0x1000>;
> interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>;
> - clocks = <&ahb1_gates 5>, <&ss_clk>;
> + clocks = <&ccu CLK_BUS_SS>, <&ccu CLK_SS>;
> clock-names = "ahb", "mod";
> - resets = <&ahb1_rst 5>;
> + resets = <&ccu RST_BUS_SS>;
> reset-names = "ahb";
> };
>
> - usb_otg: usb at 01c19000 {
> - compatible = "allwinner,sun8i-a33-musb";
> - reg = <0x01c19000 0x0400>;
> - clocks = <&ahb1_gates 24>;
> - resets = <&ahb1_rst 24>;
> - interrupts = <GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>;
> - interrupt-names = "mc";
> - phys = <&usbphy 0>;
> - phy-names = "usb";
> - extcon = <&usbphy 0>;
> + dai: dai at 01c22c00 {
> + #sound-dai-cells = <0>;
> + compatible = "allwinner,sun6i-a31-i2s";
> + reg = <0x01c22c00 0x200>;
> + interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;
> + clocks = <&ccu CLK_BUS_CODEC>, <&ccu CLK_AC_DIG>;
> + clock-names = "apb", "mod";
> + resets = <&ccu RST_BUS_CODEC>;
> + dmas = <&dma 15>, <&dma 15>;
> + dma-names = "rx", "tx";
> + status = "disabled";
> + };
> +
> + codec: codec at 01c22e00 {
> + #sound-dai-cells = <0>;
> + compatible = "allwinner,sun8i-a33-codec";
> + reg = <0x01c22e00 0x400>;
> + interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;
> + clocks = <&ccu CLK_BUS_CODEC>, <&ccu CLK_AC_DIG>;
> + clock-names = "bus", "mod";
> status = "disabled";
> };
>
> - usbphy: phy at 01c19400 {
> - compatible = "allwinner,sun8i-a33-usb-phy";
> - reg = <0x01c19400 0x14>,
> - <0x01c1a800 0x4>;
> - reg-names = "phy_ctrl",
> - "pmu1";
> - clocks = <&usb_clk 8>,
> - <&usb_clk 9>;
> - clock-names = "usb0_phy",
> - "usb1_phy";
> - resets = <&usb_clk 0>,
> - <&usb_clk 1>;
> - reset-names = "usb0_reset",
> - "usb1_reset";
> + ths: ths at 01c25000 {
> + compatible = "allwinner,sun8i-a33-ths";
> + reg = <0x01c25000 0x100>;
> + #thermal-sensor-cells = <0>;
> + #io-channel-cells = <0>;
> + };
> +
> + fe0: display-frontend at 01e00000 {
> + compatible = "allwinner,sun8i-a33-display-frontend";
> + reg = <0x01e00000 0x20000>;
> + interrupts = <GIC_SPI 93 IRQ_TYPE_LEVEL_HIGH>;
> + clocks = <&ccu CLK_BUS_DE_FE>, <&ccu CLK_DE_FE>,
> + <&ccu CLK_DRAM_DE_FE>;
> + clock-names = "ahb", "mod",
> + "ram";
> + resets = <&ccu RST_BUS_DE_FE>;
> status = "disabled";
> - #phy-cells = <1>;
> +
> + ports {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + fe0_out: port at 1 {
> + #address-cells = <1>;
> + #size-cells = <0>;
> + reg = <1>;
> +
> + fe0_out_be0: endpoint at 0 {
> + reg = <0>;
> + remote-endpoint = <&be0_in_fe0>;
> + };
> + };
> + };
> + };
> +
> + be0: display-backend at 01e60000 {
> + compatible = "allwinner,sun8i-a33-display-backend";
> + reg = <0x01e60000 0x10000>, <0x01e80000 0x1000>;
> + reg-names = "be", "sat";
> + interrupts = <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>;
> + clocks = <&ccu CLK_BUS_DE_BE>, <&ccu CLK_DE_BE>,
> + <&ccu CLK_DRAM_DE_BE>, <&ccu CLK_BUS_SAT>;
> + clock-names = "ahb", "mod",
> + "ram", "sat";
> + resets = <&ccu RST_BUS_DE_BE>, <&ccu RST_BUS_SAT>;
> + reset-names = "be", "sat";
> + assigned-clocks = <&ccu CLK_DE_BE>;
> + assigned-clock-rates = <300000000>;
> +
> + ports {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + be0_in: port at 0 {
> + #address-cells = <1>;
> + #size-cells = <0>;
> + reg = <0>;
> +
> + be0_in_fe0: endpoint at 0 {
> + reg = <0>;
> + remote-endpoint = <&fe0_out_be0>;
> + };
> + };
> +
> + be0_out: port at 1 {
> + #address-cells = <1>;
> + #size-cells = <0>;
> + reg = <1>;
> +
> + be0_out_drc0: endpoint at 0 {
> + reg = <0>;
> + remote-endpoint = <&drc0_in_be0>;
> + };
> + };
> + };
> + };
> +
> + drc0: drc at 01e70000 {
> + compatible = "allwinner,sun8i-a33-drc";
> + reg = <0x01e70000 0x10000>;
> + interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>;
> + clocks = <&ccu CLK_BUS_DRC>, <&ccu CLK_DRC>,
> + <&ccu CLK_DRAM_DRC>;
> + clock-names = "ahb", "mod", "ram";
> + resets = <&ccu RST_BUS_DRC>;
> +
> + assigned-clocks = <&ccu CLK_DRC>;
> + assigned-clock-rates = <300000000>;
> +
> + ports {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + drc0_in: port at 0 {
> + #address-cells = <1>;
> + #size-cells = <0>;
> + reg = <0>;
> +
> + drc0_in_be0: endpoint at 0 {
> + reg = <0>;
> + remote-endpoint = <&be0_out_drc0>;
> + };
> + };
> +
> + drc0_out: port at 1 {
> + #address-cells = <1>;
> + #size-cells = <0>;
> + reg = <1>;
> +
> + drc0_out_tcon0: endpoint at 0 {
> + reg = <0>;
> + remote-endpoint = <&tcon0_in_drc0>;
> + };
> + };
> + };
> + };
> + };
> +
> + thermal-zones {
> + cpu_thermal {
> + /* milliseconds */
> + polling-delay-passive = <250>;
> + polling-delay = <1000>;
> + thermal-sensors = <&ths>;
> +
> + cooling-maps {
> + map0 {
> + trip = <&cpu_alert0>;
> + cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
> + };
> + map1 {
> + trip = <&cpu_alert1>;
> + cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
> + };
> +
> + map2 {
> + trip = <&gpu_alert0>;
> + cooling-device = <&mali 1 THERMAL_NO_LIMIT>;
> + };
> +
> + map3 {
> + trip = <&gpu_alert1>;
> + cooling-device = <&mali 2 THERMAL_NO_LIMIT>;
> + };
> + };
> +
> + trips {
> + cpu_alert0: cpu_alert0 {
> + /* milliCelsius */
> + temperature = <75000>;
> + hysteresis = <2000>;
> + type = "passive";
> + };
> +
> + gpu_alert0: gpu_alert0 {
> + /* milliCelsius */
> + temperature = <85000>;
> + hysteresis = <2000>;
> + type = "passive";
> + };
> +
> + cpu_alert1: cpu_alert1 {
> + /* milliCelsius */
> + temperature = <90000>;
> + hysteresis = <2000>;
> + type = "hot";
> + };
> +
> + gpu_alert1: gpu_alert1 {
> + /* milliCelsius */
> + temperature = <95000>;
> + hysteresis = <2000>;
> + type = "hot";
> + };
> +
> + cpu_crit: cpu_crit {
> + /* milliCelsius */
> + temperature = <110000>;
> + hysteresis = <2000>;
> + type = "critical";
> + };
> + };
> };
> };
> };
>
> +&ccu {
> + compatible = "allwinner,sun8i-a33-ccu";
> +};
> +
> +&mali {
> + operating-points-v2 = <&mali_opp_table>;
> +};
> +
> &pio {
> compatible = "allwinner,sun8i-a33-pinctrl";
> interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>,
> <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
>
> uart0_pins_b: uart0 at 1 {
> - allwinner,pins = "PB0", "PB1";
> - allwinner,function = "uart0";
> - allwinner,drive = <SUN4I_PINCTRL_10_MA>;
> - allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
> + pins = "PB0", "PB1";
> + function = "uart0";
> };
>
> };
> +
> +&usb_otg {
> + compatible = "allwinner,sun8i-a33-musb";
> +};
> +
> +&usbphy {
> + compatible = "allwinner,sun8i-a33-usb-phy";
> + reg = <0x01c19400 0x14>, <0x01c1a800 0x4>;
> + reg-names = "phy_ctrl", "pmu1";
> +};
> diff --git a/include/dt-bindings/clock/sun8i-a23-a33-ccu.h b/include/dt-bindings/clock/sun8i-a23-a33-ccu.h
> new file mode 100644
> index 000000000000..f8222b6b2cc3
> --- /dev/null
> +++ b/include/dt-bindings/clock/sun8i-a23-a33-ccu.h
> @@ -0,0 +1,127 @@
> +/*
> + * Copyright (C) 2016 Maxime Ripard <maxime.ripard@free-electrons.com>
> + *
> + * This file is dual-licensed: you can use it either under the terms
> + * of the GPL or the X11 license, at your option. Note that this dual
> + * licensing only applies to this file, and not this project as a
> + * whole.
> + *
> + * a) This file is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU General Public License as
> + * published by the Free Software Foundation; either version 2 of the
> + * License, or (at your option) any later version.
> + *
> + * This file is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + *
> + * Or, alternatively,
> + *
> + * b) Permission is hereby granted, free of charge, to any person
> + * obtaining a copy of this software and associated documentation
> + * files (the "Software"), to deal in the Software without
> + * restriction, including without limitation the rights to use,
> + * copy, modify, merge, publish, distribute, sublicense, and/or
> + * sell copies of the Software, and to permit persons to whom the
> + * Software is furnished to do so, subject to the following
> + * conditions:
> + *
> + * The above copyright notice and this permission notice shall be
> + * included in all copies or substantial portions of the Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
> + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
> + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
> + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
> + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
> + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
> + * OTHER DEALINGS IN THE SOFTWARE.
> + */
> +
> +#ifndef _DT_BINDINGS_CLK_SUN8I_A23_A33_H_
> +#define _DT_BINDINGS_CLK_SUN8I_A23_A33_H_
> +
> +#define CLK_CPUX 18
> +
> +#define CLK_BUS_MIPI_DSI 23
> +#define CLK_BUS_SS 24
> +#define CLK_BUS_DMA 25
> +#define CLK_BUS_MMC0 26
> +#define CLK_BUS_MMC1 27
> +#define CLK_BUS_MMC2 28
> +#define CLK_BUS_NAND 29
> +#define CLK_BUS_DRAM 30
> +#define CLK_BUS_HSTIMER 31
> +#define CLK_BUS_SPI0 32
> +#define CLK_BUS_SPI1 33
> +#define CLK_BUS_OTG 34
> +#define CLK_BUS_EHCI 35
> +#define CLK_BUS_OHCI 36
> +#define CLK_BUS_VE 37
> +#define CLK_BUS_LCD 38
> +#define CLK_BUS_CSI 39
> +#define CLK_BUS_DE_BE 40
> +#define CLK_BUS_DE_FE 41
> +#define CLK_BUS_GPU 42
> +#define CLK_BUS_MSGBOX 43
> +#define CLK_BUS_SPINLOCK 44
> +#define CLK_BUS_DRC 45
> +#define CLK_BUS_SAT 46
> +#define CLK_BUS_CODEC 47
> +#define CLK_BUS_PIO 48
> +#define CLK_BUS_I2S0 49
> +#define CLK_BUS_I2S1 50
> +#define CLK_BUS_I2C0 51
> +#define CLK_BUS_I2C1 52
> +#define CLK_BUS_I2C2 53
> +#define CLK_BUS_UART0 54
> +#define CLK_BUS_UART1 55
> +#define CLK_BUS_UART2 56
> +#define CLK_BUS_UART3 57
> +#define CLK_BUS_UART4 58
> +#define CLK_NAND 59
> +#define CLK_MMC0 60
> +#define CLK_MMC0_SAMPLE 61
> +#define CLK_MMC0_OUTPUT 62
> +#define CLK_MMC1 63
> +#define CLK_MMC1_SAMPLE 64
> +#define CLK_MMC1_OUTPUT 65
> +#define CLK_MMC2 66
> +#define CLK_MMC2_SAMPLE 67
> +#define CLK_MMC2_OUTPUT 68
> +#define CLK_SS 69
> +#define CLK_SPI0 70
> +#define CLK_SPI1 71
> +#define CLK_I2S0 72
> +#define CLK_I2S1 73
> +#define CLK_USB_PHY0 74
> +#define CLK_USB_PHY1 75
> +#define CLK_USB_HSIC 76
> +#define CLK_USB_HSIC_12M 77
> +#define CLK_USB_OHCI 78
> +
> +#define CLK_DRAM_VE 80
> +#define CLK_DRAM_CSI 81
> +#define CLK_DRAM_DRC 82
> +#define CLK_DRAM_DE_FE 83
> +#define CLK_DRAM_DE_BE 84
> +#define CLK_DE_BE 85
> +#define CLK_DE_FE 86
> +#define CLK_LCD_CH0 87
> +#define CLK_LCD_CH1 88
> +#define CLK_CSI_SCLK 89
> +#define CLK_CSI_MCLK 90
> +#define CLK_VE 91
> +#define CLK_AC_DIG 92
> +#define CLK_AC_DIG_4X 93
> +#define CLK_AVS 94
> +
> +#define CLK_DSI_SCLK 96
> +#define CLK_DSI_DPHY 97
> +#define CLK_DRC 98
> +#define CLK_GPU 99
> +#define CLK_ATS 100
> +
> +#endif /* _DT_BINDINGS_CLK_SUN8I_A23_A33_H_ */
> diff --git a/include/dt-bindings/reset/sun8i-a23-a33-ccu.h b/include/dt-bindings/reset/sun8i-a23-a33-ccu.h
> new file mode 100644
> index 000000000000..6121f2b0cd0a
> --- /dev/null
> +++ b/include/dt-bindings/reset/sun8i-a23-a33-ccu.h
> @@ -0,0 +1,87 @@
> +/*
> + * Copyright (C) 2016 Maxime Ripard <maxime.ripard@free-electrons.com>
> + *
> + * This file is dual-licensed: you can use it either under the terms
> + * of the GPL or the X11 license, at your option. Note that this dual
> + * licensing only applies to this file, and not this project as a
> + * whole.
> + *
> + * a) This file is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU General Public License as
> + * published by the Free Software Foundation; either version 2 of the
> + * License, or (at your option) any later version.
> + *
> + * This file is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + *
> + * Or, alternatively,
> + *
> + * b) Permission is hereby granted, free of charge, to any person
> + * obtaining a copy of this software and associated documentation
> + * files (the "Software"), to deal in the Software without
> + * restriction, including without limitation the rights to use,
> + * copy, modify, merge, publish, distribute, sublicense, and/or
> + * sell copies of the Software, and to permit persons to whom the
> + * Software is furnished to do so, subject to the following
> + * conditions:
> + *
> + * The above copyright notice and this permission notice shall be
> + * included in all copies or substantial portions of the Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
> + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
> + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
> + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
> + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
> + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
> + * OTHER DEALINGS IN THE SOFTWARE.
> + */
Shouldn't we use the SPDX license header?
Tom what is the policy for importing dts[i] files from Linux kernel?
> +
> +#ifndef _DT_BINDINGS_RST_SUN8I_A23_A33_H_
> +#define _DT_BINDINGS_RST_SUN8I_A23_A33_H_
> +
> +#define RST_USB_PHY0 0
> +#define RST_USB_PHY1 1
> +#define RST_USB_HSIC 2
> +#define RST_MBUS 3
> +#define RST_BUS_MIPI_DSI 4
> +#define RST_BUS_SS 5
> +#define RST_BUS_DMA 6
> +#define RST_BUS_MMC0 7
> +#define RST_BUS_MMC1 8
> +#define RST_BUS_MMC2 9
> +#define RST_BUS_NAND 10
> +#define RST_BUS_DRAM 11
> +#define RST_BUS_HSTIMER 12
> +#define RST_BUS_SPI0 13
> +#define RST_BUS_SPI1 14
> +#define RST_BUS_OTG 15
> +#define RST_BUS_EHCI 16
> +#define RST_BUS_OHCI 17
> +#define RST_BUS_VE 18
> +#define RST_BUS_LCD 19
> +#define RST_BUS_CSI 20
> +#define RST_BUS_DE_BE 21
> +#define RST_BUS_DE_FE 22
> +#define RST_BUS_GPU 23
> +#define RST_BUS_MSGBOX 24
> +#define RST_BUS_SPINLOCK 25
> +#define RST_BUS_DRC 26
> +#define RST_BUS_SAT 27
> +#define RST_BUS_LVDS 28
> +#define RST_BUS_CODEC 29
> +#define RST_BUS_I2S0 30
> +#define RST_BUS_I2S1 31
> +#define RST_BUS_I2C0 32
> +#define RST_BUS_I2C1 33
> +#define RST_BUS_I2C2 34
> +#define RST_BUS_UART0 35
> +#define RST_BUS_UART1 36
> +#define RST_BUS_UART2 37
> +#define RST_BUS_UART3 38
> +#define RST_BUS_UART4 39
> +
> +#endif /* _DT_BINDINGS_RST_SUN8I_A23_A33_H_ */
>
Reviewed-by: Łukasz Majewski <lukma@denx.de>
--
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-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
^ permalink raw reply [flat|nested] 35+ messages in thread
* [U-Boot] [PATCH v2 00/14] sunxi: convert musb to the device model and enable usb_ether
2017-09-12 19:01 [U-Boot] [PATCH v2 00/14] sunxi: convert musb to the device model and enable usb_ether Maxime Ripard
` (13 preceding siblings ...)
2017-09-12 19:01 ` [U-Boot] [PATCH v2 14/14] sunxi: sina33: Sync the device tree with the kernel Maxime Ripard
@ 2017-09-13 10:53 ` Łukasz Majewski
2017-09-13 11:45 ` Maxime Ripard
14 siblings, 1 reply; 35+ messages in thread
From: Łukasz Majewski @ 2017-09-13 10:53 UTC (permalink / raw)
To: u-boot
Hi Maxime,
> Hi,
>
> This serie aims at fixing an issue we had to carry out of tree patches
> for for a few years.
>
> The issue is this: a significant number of Allwinner boards don't have
> an Ethernet connection, while an Ethernet connection is pretty useful
> for example during development to do some PXE/NFS boot.
>
> However, we needed to have DM_ETH enabled for the boards that use our
> Ethernet controller drivers that rely on it. It meant having to use
> the newly introduced DM_ETH support in the usb_ether gadget, but our
> musb peripheral wasn't converted to the device model, and therefore
> not usable with it.
>
> The other alternative was to use the old-style usb_ether driver, which
> worked fine but were disabling the Ethernet controller driver.
>
> Thus, none were good, upstreamable solution.
>
> Fix this properly by adding support for the musb in peripheral mode in
> the device model. While we're doing so, I also took the occasion to
> move a number of configuration options to Kconfig, and rework the
> dependencies between them to ease the selection of related options
> while trying to avoid as much as possible the combinations that are
> not valid.
>
> This was tested on a Sinlinx SinA33 that is wired as a peripheral-only
> mUSB.
>
> Let me know what you think,
Thanks for your effort. I've ack'ed gadget relevant commits, so I think
that this series should go through the sunxi tree.
Best regards,
Łukasz
> Maxime
>
> Changes from v1:
> - Rebased on v2017.09
> - Added some help on a number of options introduced
> - Added the various tags collected
>
> Maxime Ripard (14):
> usb: gadget: Move USBNET_DEVADDR option out of g_dnl
> usb: gadget: Document USBNET_DEVADDR
> usb: gadget: Move USBNET_HOST_ADDR to Kconfig
> usb: gadget: Convert USB_ETHER to Kconfig
> usb: gadget: usb_ether: Move the interfaces to Kconfig
> usb: gadget: Make g_dnl USB settings common
> usb: gadget: usb_ether: Move settings to common
> sunxi: provide default USB gadget setup
> sunxi: imply USB_GADGET
> cmd: fastboot: Rework fastboot dependency
> musb: sunxi: switch to the device model
> sunxi: Register usb_ether
> sunxi: Imply USB_ETHER
> sunxi: sina33: Sync the device tree with the kernel
>
> arch/arm/Kconfig | 4 +-
> arch/arm/dts/axp223.dtsi | 58 ++-
> arch/arm/dts/axp22x.dtsi | 10 +-
> arch/arm/dts/sun8i-a23-a33.dtsi | 446 ++++++---------
> arch/arm/dts/sun8i-a33-sinlinx-sina33.dts | 43 +-
> arch/arm/dts/sun8i-a33.dtsi | 477 +++++++++++++---
> arch/arm/include/asm/arch-sunxi/usb_phy.h | 7 +-
> board/samsung/common/gadget.c | 4 +-
> board/siemens/common/factoryset.c | 4 +-
> board/sunxi/board.c | 3 +-
> cmd/fastboot/Kconfig | 4 +-
> configs/A13-OLinuXino_defconfig | 5 +-
> configs/A20-OLinuXino-Lime2-eMMC_defconfig | 5 +-
> configs/A20-OLinuXino-Lime2_defconfig | 5 +-
> configs/CHIP_defconfig | 5 +-
> configs/CHIP_pro_defconfig | 5 +-
> configs/Cubietruck_defconfig | 5 +-
> configs/Nintendo_NES_Classic_Edition_defconfig | 5 +-
> configs/Sinlinx_SinA33_defconfig | 5 +-
> configs/am335x_baltos_defconfig | 8 +-
> configs/am335x_boneblack_defconfig | 10 +-
> configs/am335x_boneblack_vboot_defconfig | 9 +-
> configs/am335x_evm_defconfig | 9 +-
> configs/am335x_evm_nor_defconfig | 9 +-
> configs/am335x_evm_norboot_defconfig | 10 +-
> configs/am335x_evm_spiboot_defconfig | 9 +-
> configs/am335x_evm_usbspl_defconfig | 9 +-
> configs/am335x_hs_evm_defconfig | 7 +-
> configs/am43xx_evm_defconfig | 6 +-
> configs/am43xx_evm_ethboot_defconfig | 6 +-
> configs/am43xx_evm_qspiboot_defconfig | 6 +-
> configs/am43xx_evm_usbhost_boot_defconfig | 6 +-
> configs/am43xx_hs_evm_defconfig | 6 +-
> configs/am57xx_evm_defconfig | 8 +-
> configs/am57xx_evm_nodt_defconfig | 9 +-
> configs/am57xx_hs_evm_defconfig | 8 +-
> configs/apalis-tk1_defconfig | 6 +-
> configs/apalis_imx6_defconfig | 6 +-
> configs/apalis_imx6_nospl_com_defconfig | 6 +-
> configs/apalis_imx6_nospl_it_defconfig | 6 +-
> configs/apalis_t30_defconfig | 6 +-
> configs/bcm11130_defconfig | 6 +-
> configs/bcm11130_nand_defconfig | 6 +-
> configs/bcm23550_w1d_defconfig | 9 +-
> configs/bcm28155_ap_defconfig | 9 +-
> configs/bcm28155_w1d_defconfig | 6 +-
> configs/beaver_defconfig | 6 +-
> configs/birdland_bav335a_defconfig | 9 +-
> configs/birdland_bav335b_defconfig | 9 +-
> configs/cei-tk1-som_defconfig | 6 +-
> configs/cgtqmx6eval_defconfig | 9 +-
> configs/chromebit_mickey_defconfig | 7 +-
> configs/chromebook_jerry_defconfig | 7 +-
> configs/chromebook_minnie_defconfig | 7 +-
> configs/colibri_imx6_defconfig | 6 +-
> configs/colibri_imx6_nospl_defconfig | 6 +-
> configs/colibri_imx7_defconfig | 6 +-
> configs/colibri_t20_defconfig | 6 +-
> configs/colibri_t30_defconfig | 6 +-
> configs/colibri_vf_defconfig | 6 +-
> configs/corvus_defconfig | 6 +-
> configs/dalmore_defconfig | 6 +-
> configs/dms-ba16-1g_defconfig | 6 +-
> configs/dms-ba16_defconfig | 6 +-
> configs/dra7xx_evm_defconfig | 8 +-
> configs/dra7xx_hs_evm_defconfig | 8 +-
> configs/draco_defconfig | 7 +-
> configs/e2220-1170_defconfig | 6 +-
> configs/edison_defconfig | 6 +-
> configs/etamin_defconfig | 7 +-
> configs/evb-rk3036_defconfig | 7 +-
> configs/evb-rk3229_defconfig | 7 +-
> configs/evb-rk3288_defconfig | 7 +-
> configs/evb-rk3328_defconfig | 6 +-
> configs/fennec-rk3288_defconfig | 7 +-
> configs/firefly-rk3288_defconfig | 7 +-
> configs/gwventana_emmc_defconfig | 8 +-
> configs/gwventana_gw5904_defconfig | 8 +-
> configs/gwventana_nand_defconfig | 8 +-
> configs/jetson-tk1_defconfig | 6 +-
> configs/kc1_defconfig | 9 +-
> configs/kylin-rk3036_defconfig | 7 +-
> configs/ma5d4evk_defconfig | 7 +-
> configs/miqi-rk3288_defconfig | 7 +-
> configs/mx6qsabrelite_defconfig | 11 +-
> configs/mx6sabreauto_defconfig | 6 +-
> configs/mx6sabresd_defconfig | 6 +-
> configs/mx7dsabresd_defconfig | 6 +-
> configs/mx7dsabresd_secure_defconfig | 6 +-
> configs/nitrogen6dl2g_defconfig | 11 +-
> configs/nitrogen6dl_defconfig | 11 +-
> configs/nitrogen6q2g_defconfig | 11 +-
> configs/nitrogen6q_defconfig | 11 +-
> configs/nitrogen6s1g_defconfig | 11 +-
> configs/nitrogen6s_defconfig | 11 +-
> configs/novena_defconfig | 2 +-
> configs/nyan-big_defconfig | 6 +-
> configs/odroid-xu3_defconfig | 6 +-
> configs/odroid_defconfig | 6 +-
> configs/omap3_beagle_defconfig | 10 +-
> configs/omap3_evm_defconfig | 7 +-
> configs/omap3_logic_defconfig | 9 +-
> configs/omap5_uevm_defconfig | 6 +-
> configs/opos6uldev_defconfig | 6 +-
> configs/origen_defconfig | 6 +-
> configs/p2371-0000_defconfig | 6 +-
> configs/p2371-2180_defconfig | 6 +-
> configs/p2571_defconfig | 6 +-
> configs/parrot_r16_defconfig | 5 +-
> configs/pcm051_rev1_defconfig | 1 +-
> configs/pcm051_rev3_defconfig | 1 +-
> configs/phycore-rk3288_defconfig | 7 +-
> configs/pico-imx6ul_defconfig | 6 +-
> configs/pico-imx7d_defconfig | 6 +-
> configs/popmetal-rk3288_defconfig | 7 +-
> configs/pxm2_defconfig | 8 +-
> configs/rastaban_defconfig | 8 +-
> configs/rock2_defconfig | 7 +-
> configs/rut_defconfig | 7 +-
> configs/s5p_goni_defconfig | 6 +-
> configs/s5pc210_universal_defconfig | 6 +-
> configs/sama5d2_ptc_nandflash_defconfig | 2 +-
> configs/sama5d2_ptc_spiflash_defconfig | 2 +-
> configs/sansa_fuze_plus_defconfig | 2 +-
> configs/smartweb_defconfig | 6 +-
> configs/sniper_defconfig | 9 +-
> configs/socfpga_arria5_defconfig | 6 +-
> configs/socfpga_cyclone5_defconfig | 6 +-
> configs/socfpga_de0_nano_soc_defconfig | 6 +-
> configs/socfpga_de10_nano_defconfig | 6 +-
> configs/socfpga_mcvevk_defconfig | 6 +-
> configs/socfpga_sockit_defconfig | 6 +-
> configs/socfpga_socrates_defconfig | 6 +-
> configs/socfpga_vining_fpga_defconfig | 6 +-
> configs/taurus_defconfig | 6 +-
> configs/tbs2910_defconfig | 6 +-
> configs/thuban_defconfig | 7 +-
> configs/tinker-rk3288_defconfig | 7 +-
> configs/topic_miami_defconfig | 6 +-
> configs/topic_miamilite_defconfig | 6 +-
> configs/topic_miamiplus_defconfig | 6 +-
> configs/trats2_defconfig | 6 +-
> configs/trats_defconfig | 6 +-
> configs/venice2_defconfig | 6 +-
> configs/vinco_defconfig | 2 +-
> configs/warp7_defconfig | 9 +-
> configs/warp7_secure_defconfig | 9 +-
> configs/warp_defconfig | 6 +-
> configs/xfi3_defconfig | 2 +-
> configs/xilinx_zynqmp_ep_defconfig | 6 +-
> configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 6 +-
> configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 6 +-
> configs/xilinx_zynqmp_zcu102_revA_defconfig | 6 +-
> configs/xilinx_zynqmp_zcu102_revB_defconfig | 6 +-
> configs/zynq_microzed_defconfig | 6 +-
> configs/zynq_picozed_defconfig | 6 +-
> configs/zynq_z_turn_defconfig | 6 +-
> configs/zynq_zc702_defconfig | 6 +-
> configs/zynq_zc706_defconfig | 6 +-
> configs/zynq_zed_defconfig | 6 +-
> configs/zynq_zybo_defconfig | 6 +-
> doc/README.android-fastboot | 8 +-
> drivers/usb/gadget/Kconfig | 78 ++-
> drivers/usb/gadget/ether.c | 16 +-
> drivers/usb/gadget/g_dnl.c | 12 +-
> drivers/usb/musb-new/sunxi.c | 56 +--
> include/configs/am335x_evm.h | 6 +-
> include/configs/am3517_evm.h | 5 +-
> include/configs/am43xx_evm.h | 6 +-
> include/configs/baltos.h | 6 +-
> include/configs/gw_ventana.h | 2 +-
> include/configs/h2200.h | 2 +-
> include/configs/ma5d4evk.h | 3 +-
> include/configs/nitrogen6x.h | 2 +-
> include/configs/novena.h | 2 +-
> include/configs/odroid_xu3.h | 2 +-
> include/configs/omap3_beagle.h | 1 +-
> include/configs/omap3_evm.h | 1 +-
> include/configs/omap3_logic.h | 1 +-
> include/configs/pcm051.h | 5 +-
> include/configs/sama5d2_ptc.h | 3 +-
> include/configs/sansa_fuze_plus.h | 2 +-
> include/configs/siemens-am33x-common.h | 6 +-
> include/configs/tao3530.h | 2 +-
> include/configs/vinco.h | 3 +-
> include/configs/warp7.h | 4 +-
> include/configs/xfi3.h | 2 +-
> include/dt-bindings/clock/sun8i-a23-a33-ccu.h | 127 ++++-
> include/dt-bindings/reset/sun8i-a23-a33-ccu.h | 87 +++-
> scripts/config_whitelist.txt | 5 +-
> 190 files changed, 1509 insertions(+), 999 deletions(-)
> create mode 100644 arch/arm/dts/axp223.dtsi
> create mode 100644 include/dt-bindings/clock/sun8i-a23-a33-ccu.h
> create mode 100644 include/dt-bindings/reset/sun8i-a23-a33-ccu.h
>
> base-commit: c98ac3487e413c71e5d36322ef3324b21c6f60f9
>
--
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-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
^ permalink raw reply [flat|nested] 35+ messages in thread
* [U-Boot] [PATCH v2 00/14] sunxi: convert musb to the device model and enable usb_ether
2017-09-13 10:53 ` [U-Boot] [PATCH v2 00/14] sunxi: convert musb to the device model and enable usb_ether Łukasz Majewski
@ 2017-09-13 11:45 ` Maxime Ripard
0 siblings, 0 replies; 35+ messages in thread
From: Maxime Ripard @ 2017-09-13 11:45 UTC (permalink / raw)
To: u-boot
Hi Łukasz,
On Wed, Sep 13, 2017 at 12:53:25PM +0200, Łukasz Majewski wrote:
> Hi Maxime,
> > Hi,
> >
> > This serie aims at fixing an issue we had to carry out of tree patches
> > for for a few years.
> >
> > The issue is this: a significant number of Allwinner boards don't have
> > an Ethernet connection, while an Ethernet connection is pretty useful
> > for example during development to do some PXE/NFS boot.
> >
> > However, we needed to have DM_ETH enabled for the boards that use our
> > Ethernet controller drivers that rely on it. It meant having to use
> > the newly introduced DM_ETH support in the usb_ether gadget, but our
> > musb peripheral wasn't converted to the device model, and therefore
> > not usable with it.
> >
> > The other alternative was to use the old-style usb_ether driver, which
> > worked fine but were disabling the Ethernet controller driver.
> >
> > Thus, none were good, upstreamable solution.
> >
> > Fix this properly by adding support for the musb in peripheral mode in
> > the device model. While we're doing so, I also took the occasion to
> > move a number of configuration options to Kconfig, and rework the
> > dependencies between them to ease the selection of related options
> > while trying to avoid as much as possible the combinations that are
> > not valid.
> >
> > This was tested on a Sinlinx SinA33 that is wired as a peripheral-only
> > mUSB.
> >
> > Let me know what you think,
>
> Thanks for your effort. I've ack'ed gadget relevant commits, so I think that
> this series should go through the sunxi tree.
I just applied them to the sunxi/master branch, with both Simon's and
your tags added.
(Jagan, if it's not the right branch, please tell me. I'm still
getting used to the u-boot way of managing branches).
Thanks!
Maxime
--
Maxime Ripard, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 801 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170913/36e96abe/attachment.sig>
^ permalink raw reply [flat|nested] 35+ messages in thread
* [U-Boot] [PATCH v2 09/14] sunxi: imply USB_GADGET
2017-09-12 19:01 ` [U-Boot] [PATCH v2 09/14] sunxi: imply USB_GADGET Maxime Ripard
2017-09-13 10:42 ` Łukasz Majewski
@ 2017-09-22 3:20 ` Chen-Yu Tsai
2017-09-22 7:53 ` Maxime Ripard
1 sibling, 1 reply; 35+ messages in thread
From: Chen-Yu Tsai @ 2017-09-22 3:20 UTC (permalink / raw)
To: u-boot
On Wed, Sep 13, 2017 at 3:01 AM, Maxime Ripard
<maxime.ripard@free-electrons.com> wrote:
> A good number of our boards have USB_GADGET enabled. Imply it so that all
> the boards can benefit from it, and remove some boilerplate from our
> defconfigs.
>
> Reviewed-by: Simon Glass <sjg@chromium.org>
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
This breaks builds using defconfigs where USB_MUSB_GADGET is not set.
Perhaps a better solution would be to imply USB_GADGET from USB_MUSB_GADGET?
Kconfig complains about recursive dependencies if I do
imply USB_GADGET if USB_MUSB_GADGET
under ARCH_SUNXI though.
ChenYu
^ permalink raw reply [flat|nested] 35+ messages in thread
* [U-Boot] [PATCH v2 09/14] sunxi: imply USB_GADGET
2017-09-22 3:20 ` Chen-Yu Tsai
@ 2017-09-22 7:53 ` Maxime Ripard
0 siblings, 0 replies; 35+ messages in thread
From: Maxime Ripard @ 2017-09-22 7:53 UTC (permalink / raw)
To: u-boot
Hi,
On Fri, Sep 22, 2017 at 03:20:33AM +0000, Chen-Yu Tsai wrote:
> On Wed, Sep 13, 2017 at 3:01 AM, Maxime Ripard
> <maxime.ripard@free-electrons.com> wrote:
> > A good number of our boards have USB_GADGET enabled. Imply it so that all
> > the boards can benefit from it, and remove some boilerplate from our
> > defconfigs.
> >
> > Reviewed-by: Simon Glass <sjg@chromium.org>
> > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
>
> This breaks builds using defconfigs where USB_MUSB_GADGET is not set.
> Perhaps a better solution would be to imply USB_GADGET from USB_MUSB_GADGET?
> Kconfig complains about recursive dependencies if I do
>
> imply USB_GADGET if USB_MUSB_GADGET
>
> under ARCH_SUNXI though.
Thanks, I just pushed a fix for it.
Maxime
--
Maxime Ripard, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 801 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170922/de7477e2/attachment.sig>
^ permalink raw reply [flat|nested] 35+ messages in thread
end of thread, other threads:[~2017-09-22 7:53 UTC | newest]
Thread overview: 35+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-09-12 19:01 [U-Boot] [PATCH v2 00/14] sunxi: convert musb to the device model and enable usb_ether Maxime Ripard
2017-09-12 19:01 ` [U-Boot] [PATCH v2 01/14] usb: gadget: Move USBNET_DEVADDR option out of g_dnl Maxime Ripard
2017-09-13 10:37 ` Łukasz Majewski
2017-09-12 19:01 ` [U-Boot] [PATCH v2 02/14] usb: gadget: Document USBNET_DEVADDR Maxime Ripard
2017-09-13 4:27 ` Simon Glass
2017-09-13 10:37 ` Łukasz Majewski
2017-09-12 19:01 ` [U-Boot] [PATCH v2 03/14] usb: gadget: Move USBNET_HOST_ADDR to Kconfig Maxime Ripard
2017-09-13 4:27 ` Simon Glass
2017-09-13 10:38 ` Łukasz Majewski
2017-09-12 19:01 ` [U-Boot] [PATCH v2 04/14] usb: gadget: Convert USB_ETHER " Maxime Ripard
2017-09-13 4:27 ` Simon Glass
2017-09-13 10:39 ` Łukasz Majewski
2017-09-12 19:01 ` [U-Boot] [PATCH v2 05/14] usb: gadget: usb_ether: Move the interfaces " Maxime Ripard
2017-09-13 4:27 ` Simon Glass
2017-09-13 10:39 ` Łukasz Majewski
2017-09-12 19:01 ` [U-Boot] [PATCH v2 06/14] usb: gadget: Make g_dnl USB settings common Maxime Ripard
2017-09-12 19:01 ` [U-Boot] [PATCH v2 07/14] usb: gadget: usb_ether: Move settings to common Maxime Ripard
2017-09-12 19:01 ` [U-Boot] [PATCH v2 08/14] sunxi: provide default USB gadget setup Maxime Ripard
2017-09-13 10:42 ` Łukasz Majewski
2017-09-12 19:01 ` [U-Boot] [PATCH v2 09/14] sunxi: imply USB_GADGET Maxime Ripard
2017-09-13 10:42 ` Łukasz Majewski
2017-09-22 3:20 ` Chen-Yu Tsai
2017-09-22 7:53 ` Maxime Ripard
2017-09-12 19:01 ` [U-Boot] [PATCH v2 10/14] cmd: fastboot: Rework fastboot dependency Maxime Ripard
2017-09-13 10:43 ` Łukasz Majewski
2017-09-12 19:01 ` [U-Boot] [PATCH v2 11/14] musb: sunxi: switch to the device model Maxime Ripard
2017-09-13 10:46 ` Łukasz Majewski
2017-09-12 19:01 ` [U-Boot] [PATCH v2 12/14] sunxi: Register usb_ether Maxime Ripard
2017-09-13 10:46 ` Łukasz Majewski
2017-09-12 19:01 ` [U-Boot] [PATCH v2 13/14] sunxi: Imply USB_ETHER Maxime Ripard
2017-09-13 10:49 ` Łukasz Majewski
2017-09-12 19:01 ` [U-Boot] [PATCH v2 14/14] sunxi: sina33: Sync the device tree with the kernel Maxime Ripard
2017-09-13 10:52 ` Łukasz Majewski
2017-09-13 10:53 ` [U-Boot] [PATCH v2 00/14] sunxi: convert musb to the device model and enable usb_ether Łukasz Majewski
2017-09-13 11:45 ` Maxime Ripard
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.