* [PATCH 2/4] usb: Move SPL_USB_STORAGE Kconfig symbol to drivers/usb/
2023-05-06 14:42 [PATCH 1/4] usb: Move SPL_USB_HOST Kconfig symbol to drivers/usb/ Marek Vasut
@ 2023-05-06 14:42 ` Marek Vasut
2023-05-16 20:21 ` Tom Rini
2023-05-06 14:42 ` [PATCH 3/4] usb: Move SPL_USB_GADGET and related Kconfig symbols " Marek Vasut
` (2 subsequent siblings)
3 siblings, 1 reply; 8+ messages in thread
From: Marek Vasut @ 2023-05-06 14:42 UTC (permalink / raw)
To: u-boot
Cc: Marek Vasut, Andrew Davis, Chris Packham, Jim Liu,
Lukasz Majewski, Samuel Holland, Simon Glass, Stefan Roese,
Tom Rini, Weijie Gao
To avoid piling up all the various Kconfig symbols in one place, i.e.
common/spl/Kconfig, move the USB Kconfig symbols into drivers/usb/ .
This commit moves SPL_USB_STORAGE and matching SYS_USB_FAT_BOOT_PARTITION .
Signed-off-by: Marek Vasut <marex@denx.de>
---
Cc: Andrew Davis <afd@ti.com>
Cc: Chris Packham <judge.packham@gmail.com>
Cc: Jim Liu <jim.t90615@gmail.com>
Cc: Lukasz Majewski <lukma@denx.de>
Cc: Samuel Holland <samuel@sholland.org>
Cc: Simon Glass <sjg@chromium.org>
Cc: Stefan Roese <sr@denx.de>
Cc: Tom Rini <trini@konsulko.com>
Cc: Weijie Gao <weijie.gao@mediatek.com>
---
common/spl/Kconfig | 17 -----------------
drivers/usb/Kconfig | 22 ++++++++++++++++++++++
2 files changed, 22 insertions(+), 17 deletions(-)
diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index 03d0fd90e09..5ad29af21cb 100644
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -1345,23 +1345,6 @@ config SPL_THERMAL
automatic power-off when the temperature gets too high or low. Other
devices may be discrete but connected on a suitable bus.
-config SPL_USB_STORAGE
- bool "Support loading from USB"
- depends on SPL_USB_HOST
- help
- Enable support for USB devices in SPL. This allows use of USB
- devices such as hard drives and flash drivers for loading U-Boot.
- The actual drivers are enabled separately using the normal U-Boot
- config options. This enables loading from USB using a configured
- device.
-
-config SYS_USB_FAT_BOOT_PARTITION
- int "Partition on USB to use to load U-Boot from"
- depends on SPL_USB_STORAGE
- default 1
- help
- Partition on the USB storage device to load U-Boot from
-
config SPL_USB_GADGET
bool "Suppport USB Gadget drivers"
help
diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index 94fb32d107c..a972d87c7ad 100644
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -126,6 +126,28 @@ config USB_HUB_DEBOUNCE_TIMEOUT
value = 1s because some usb device needs around 1.5s to be initialized
and a 2s value should solve detection issue on problematic USB keys.
+if SPL_USB_HOST
+
+comment "USB peripherals in SPL"
+
+config SPL_USB_STORAGE
+ bool "Support loading from USB"
+ help
+ Enable support for USB devices in SPL. This allows use of USB
+ devices such as hard drives and flash drivers for loading U-Boot.
+ The actual drivers are enabled separately using the normal U-Boot
+ config options. This enables loading from USB using a configured
+ device.
+
+config SYS_USB_FAT_BOOT_PARTITION
+ int "Partition on USB to use to load U-Boot from"
+ depends on SPL_USB_STORAGE
+ default 1
+ help
+ Partition on the USB storage device to load U-Boot from.
+
+endif
+
if USB_KEYBOARD
config USB_KEYBOARD_FN_KEYS
--
2.39.2
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH 2/4] usb: Move SPL_USB_STORAGE Kconfig symbol to drivers/usb/
2023-05-06 14:42 ` [PATCH 2/4] usb: Move SPL_USB_STORAGE " Marek Vasut
@ 2023-05-16 20:21 ` Tom Rini
0 siblings, 0 replies; 8+ messages in thread
From: Tom Rini @ 2023-05-16 20:21 UTC (permalink / raw)
To: Marek Vasut
Cc: u-boot, Andrew Davis, Chris Packham, Jim Liu, Lukasz Majewski,
Samuel Holland, Simon Glass, Stefan Roese, Weijie Gao
[-- Attachment #1: Type: text/plain, Size: 396 bytes --]
On Sat, May 06, 2023 at 04:42:38PM +0200, Marek Vasut wrote:
> To avoid piling up all the various Kconfig symbols in one place, i.e.
> common/spl/Kconfig, move the USB Kconfig symbols into drivers/usb/ .
> This commit moves SPL_USB_STORAGE and matching SYS_USB_FAT_BOOT_PARTITION .
>
> Signed-off-by: Marek Vasut <marex@denx.de>
Reviewed-by: Tom Rini <trini@konsulko.com>
--
Tom
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 3/4] usb: Move SPL_USB_GADGET and related Kconfig symbols to drivers/usb/
2023-05-06 14:42 [PATCH 1/4] usb: Move SPL_USB_HOST Kconfig symbol to drivers/usb/ Marek Vasut
2023-05-06 14:42 ` [PATCH 2/4] usb: Move SPL_USB_STORAGE " Marek Vasut
@ 2023-05-06 14:42 ` Marek Vasut
2023-05-16 20:21 ` Tom Rini
2023-05-06 14:42 ` [PATCH 4/4] usb: gadget: Add and use matching SPL USB ethernet gadget Kconfig symbols Marek Vasut
2023-05-16 20:21 ` [PATCH 1/4] usb: Move SPL_USB_HOST Kconfig symbol to drivers/usb/ Tom Rini
3 siblings, 1 reply; 8+ messages in thread
From: Marek Vasut @ 2023-05-06 14:42 UTC (permalink / raw)
To: u-boot
Cc: Marek Vasut, Andrew Davis, Chris Packham, Jim Liu,
Lukasz Majewski, Samuel Holland, Simon Glass, Stefan Roese,
Tom Rini, Weijie Gao
To avoid piling up all the various Kconfig symbols in one place, i.e.
common/spl/Kconfig, move the USB Kconfig symbols into drivers/usb/ .
This commit moves SPL_USB_GADGET and related symbols. Fix typo and
rename SPL_USB_GADGET to "USB Gadget Support in SPL" .
Update the gadget Makefile to match the symbol changes.
Signed-off-by: Marek Vasut <marex@denx.de>
---
Cc: Andrew Davis <afd@ti.com>
Cc: Chris Packham <judge.packham@gmail.com>
Cc: Jim Liu <jim.t90615@gmail.com>
Cc: Lukasz Majewski <lukma@denx.de>
Cc: Samuel Holland <samuel@sholland.org>
Cc: Simon Glass <sjg@chromium.org>
Cc: Stefan Roese <sr@denx.de>
Cc: Tom Rini <trini@konsulko.com>
Cc: Weijie Gao <weijie.gao@mediatek.com>
---
common/spl/Kconfig | 63 ------------------------------------
drivers/usb/gadget/Kconfig | 64 +++++++++++++++++++++++++++++++++++++
drivers/usb/gadget/Makefile | 5 ++-
3 files changed, 66 insertions(+), 66 deletions(-)
diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index 5ad29af21cb..6774ba5b42e 100644
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -1345,69 +1345,6 @@ config SPL_THERMAL
automatic power-off when the temperature gets too high or low. Other
devices may be discrete but connected on a suitable bus.
-config SPL_USB_GADGET
- bool "Suppport USB Gadget drivers"
- help
- Enable USB Gadget API which allows to enable USB device functions
- in SPL.
-
-if SPL_USB_GADGET
-
-config SPL_USB_ETHER
- bool "Support USB Ethernet drivers"
- depends on SPL_NET
- help
- Enable access to the USB network subsystem and associated
- drivers in SPL. This permits SPL to load U-Boot over a
- USB-connected Ethernet link (such as a USB Ethernet dongle) rather
- than from an onboard peripheral. Environment support is required
- since the network stack uses a number of environment variables.
- See also SPL_NET and SPL_ETH.
-
-config SPL_DFU
- bool "Support DFU (Device Firmware Upgrade)"
- select SPL_HASH
- select SPL_DFU_NO_RESET
- depends on SPL_RAM_SUPPORT
- help
- This feature enables the DFU (Device Firmware Upgrade) in SPL with
- RAM memory device support. The ROM code will load and execute
- the SPL built with dfu. The user can load binaries (u-boot/kernel) to
- selected device partition from host-pc using dfu-utils.
- This feature is useful to flash the binaries to factory or bare-metal
- boards using USB interface.
-
-choice
- bool "DFU device selection"
- depends on SPL_DFU
-
-config SPL_DFU_RAM
- bool "RAM device"
- depends on SPL_DFU && SPL_RAM_SUPPORT
- help
- select RAM/DDR memory device for loading binary images
- (u-boot/kernel) to the selected device partition using
- DFU and execute the u-boot/kernel from RAM.
-
-endchoice
-
-config SPL_USB_SDP_SUPPORT
- bool "Support SDP (Serial Download Protocol)"
- depends on SPL_SERIAL
- help
- Enable Serial Download Protocol (SDP) device support in SPL. This
- 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 SPL_SDP_USB_DEV
- int "SDP USB controller index"
- default 0
- depends on SPL_USB_SDP_SUPPORT
- help
- Some boards have USB controller other than 0. Define this option
- so it can be used in compiled environment.
-endif
-
config SPL_WATCHDOG
bool "Support watchdog drivers"
imply SPL_WDT if !HW_WATCHDOG
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index 941f97c96d0..6f85089a9bf 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -36,6 +36,12 @@ menuconfig USB_GADGET
peripheral/device side bus controller, and a "gadget driver" for
your peripheral protocol.
+config SPL_USB_GADGET
+ bool "USB Gadget Support in SPL"
+ help
+ Enable USB Gadget API which allows to enable USB device functions
+ in SPL.
+
if USB_GADGET
config USB_GADGET_MANUFACTURER
@@ -265,3 +271,61 @@ config USBNET_HOST_ADDR
endif # USB_ETHER
endif # USB_GADGET
+
+if SPL_USB_GADGET
+
+config SPL_USB_ETHER
+ bool "Support USB Ethernet drivers in SPL"
+ depends on SPL_NET
+ help
+ Enable access to the USB network subsystem and associated
+ drivers in SPL. This permits SPL to load U-Boot over a
+ USB-connected Ethernet link (such as a USB Ethernet dongle) rather
+ than from an onboard peripheral. Environment support is required
+ since the network stack uses a number of environment variables.
+ See also SPL_NET and SPL_ETH.
+
+config SPL_DFU
+ bool "Support DFU (Device Firmware Upgrade) in SPL"
+ select SPL_HASH
+ select SPL_DFU_NO_RESET
+ depends on SPL_RAM_SUPPORT
+ help
+ This feature enables the DFU (Device Firmware Upgrade) in SPL with
+ RAM memory device support. The ROM code will load and execute
+ the SPL built with dfu. The user can load binaries (u-boot/kernel) to
+ selected device partition from host-pc using dfu-utils.
+ This feature is useful to flash the binaries to factory or bare-metal
+ boards using USB interface.
+
+choice
+ bool "DFU device selection in SPL"
+ depends on SPL_DFU
+
+config SPL_DFU_RAM
+ bool "RAM device"
+ depends on SPL_DFU && SPL_RAM_SUPPORT
+ help
+ select RAM/DDR memory device for loading binary images
+ (u-boot/kernel) to the selected device partition using
+ DFU and execute the u-boot/kernel from RAM.
+
+endchoice
+
+config SPL_USB_SDP_SUPPORT
+ bool "Support SDP (Serial Download Protocol) in SPL"
+ depends on SPL_SERIAL
+ help
+ Enable Serial Download Protocol (SDP) device support in SPL. This
+ 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 SPL_SDP_USB_DEV
+ int "SDP USB controller index in SPL"
+ default 0
+ depends on SPL_USB_SDP_SUPPORT
+ help
+ Some boards have USB controller other than 0. Define this option
+ so it can be used in compiled environment.
+
+endif # SPL_USB_GADGET
diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile
index 6cfe0f3a041..a9edeb9f396 100644
--- a/drivers/usb/gadget/Makefile
+++ b/drivers/usb/gadget/Makefile
@@ -3,8 +3,8 @@
# (C) Copyright 2000-2007
# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
-obj-$(CONFIG_USB_GADGET) += epautoconf.o config.o usbstring.o
-obj-$(CONFIG_USB_ETHER) += epautoconf.o config.o usbstring.o
+obj-$(CONFIG_$(SPL_TPL_)USB_GADGET) += epautoconf.o config.o usbstring.o
+obj-$(CONFIG_$(SPL_TPL_)USB_ETHER) += epautoconf.o config.o usbstring.o ether.o
ifdef CONFIG_SPL_BUILD
obj-$(CONFIG_SPL_USB_GADGET) += g_dnl.o
@@ -34,7 +34,6 @@ endif
obj-$(CONFIG_CI_UDC) += ci_udc.o
-obj-$(CONFIG_USB_ETHER) += ether.o
obj-$(CONFIG_USB_ETH_RNDIS) += rndis.o
# Devices not related to the new gadget layer depend on CONFIG_USB_DEVICE
--
2.39.2
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 3/4] usb: Move SPL_USB_GADGET and related Kconfig symbols to drivers/usb/
2023-05-06 14:42 ` [PATCH 3/4] usb: Move SPL_USB_GADGET and related Kconfig symbols " Marek Vasut
@ 2023-05-16 20:21 ` Tom Rini
0 siblings, 0 replies; 8+ messages in thread
From: Tom Rini @ 2023-05-16 20:21 UTC (permalink / raw)
To: Marek Vasut
Cc: u-boot, Andrew Davis, Chris Packham, Jim Liu, Lukasz Majewski,
Samuel Holland, Simon Glass, Stefan Roese, Weijie Gao
[-- Attachment #1: Type: text/plain, Size: 508 bytes --]
On Sat, May 06, 2023 at 04:42:39PM +0200, Marek Vasut wrote:
> To avoid piling up all the various Kconfig symbols in one place, i.e.
> common/spl/Kconfig, move the USB Kconfig symbols into drivers/usb/ .
> This commit moves SPL_USB_GADGET and related symbols. Fix typo and
> rename SPL_USB_GADGET to "USB Gadget Support in SPL" .
>
> Update the gadget Makefile to match the symbol changes.
>
> Signed-off-by: Marek Vasut <marex@denx.de>
Reviewed-by: Tom Rini <trini@konsulko.com>
--
Tom
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 4/4] usb: gadget: Add and use matching SPL USB ethernet gadget Kconfig symbols
2023-05-06 14:42 [PATCH 1/4] usb: Move SPL_USB_HOST Kconfig symbol to drivers/usb/ Marek Vasut
2023-05-06 14:42 ` [PATCH 2/4] usb: Move SPL_USB_STORAGE " Marek Vasut
2023-05-06 14:42 ` [PATCH 3/4] usb: Move SPL_USB_GADGET and related Kconfig symbols " Marek Vasut
@ 2023-05-06 14:42 ` Marek Vasut
2023-05-16 20:21 ` Tom Rini
2023-05-16 20:21 ` [PATCH 1/4] usb: Move SPL_USB_HOST Kconfig symbol to drivers/usb/ Tom Rini
3 siblings, 1 reply; 8+ messages in thread
From: Marek Vasut @ 2023-05-06 14:42 UTC (permalink / raw)
To: u-boot
Cc: Marek Vasut, Andrew Davis, Chris Packham, Jim Liu,
Lukasz Majewski, Samuel Holland, Simon Glass, Stefan Roese,
Tom Rini, Weijie Gao
Define SPL_USB_ETH_RNDIS symbol to make it possible to select USB
gadget ethernet support in SPL and U-Boot separately in Kconfig .
Make use of the new symbols in gadget Makefile and move the rndis.o
just below the now merged USB_ETHER symbol in Makefile.
Signed-off-by: Marek Vasut <marex@denx.de>
---
Cc: Andrew Davis <afd@ti.com>
Cc: Chris Packham <judge.packham@gmail.com>
Cc: Jim Liu <jim.t90615@gmail.com>
Cc: Lukasz Majewski <lukma@denx.de>
Cc: Samuel Holland <samuel@sholland.org>
Cc: Simon Glass <sjg@chromium.org>
Cc: Stefan Roese <sr@denx.de>
Cc: Tom Rini <trini@konsulko.com>
Cc: Weijie Gao <weijie.gao@mediatek.com>
---
drivers/usb/gadget/Kconfig | 24 ++++++++++++++++++++++++
drivers/usb/gadget/Makefile | 3 +--
2 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index 6f85089a9bf..1cfe6022842 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -285,6 +285,30 @@ config SPL_USB_ETHER
since the network stack uses a number of environment variables.
See also SPL_NET and SPL_ETH.
+if SPL_USB_ETHER
+
+choice
+ prompt "USB Ethernet Gadget Model in SPL"
+ default SPL_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 SPL_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
+
+endif # SPL_USB_ETHER
+
config SPL_DFU
bool "Support DFU (Device Firmware Upgrade) in SPL"
select SPL_HASH
diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile
index a9edeb9f396..6abcce0d9c7 100644
--- a/drivers/usb/gadget/Makefile
+++ b/drivers/usb/gadget/Makefile
@@ -5,6 +5,7 @@
obj-$(CONFIG_$(SPL_TPL_)USB_GADGET) += epautoconf.o config.o usbstring.o
obj-$(CONFIG_$(SPL_TPL_)USB_ETHER) += epautoconf.o config.o usbstring.o ether.o
+obj-$(CONFIG_$(SPL_TPL_)USB_ETH_RNDIS) += rndis.o
ifdef CONFIG_SPL_BUILD
obj-$(CONFIG_SPL_USB_GADGET) += g_dnl.o
@@ -34,8 +35,6 @@ endif
obj-$(CONFIG_CI_UDC) += ci_udc.o
-obj-$(CONFIG_USB_ETH_RNDIS) += rndis.o
-
# Devices not related to the new gadget layer depend on CONFIG_USB_DEVICE
# This is really only N900 and USBTTY now.
obj-$(CONFIG_USB_DEVICE) += core.o ep0.o
--
2.39.2
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 4/4] usb: gadget: Add and use matching SPL USB ethernet gadget Kconfig symbols
2023-05-06 14:42 ` [PATCH 4/4] usb: gadget: Add and use matching SPL USB ethernet gadget Kconfig symbols Marek Vasut
@ 2023-05-16 20:21 ` Tom Rini
0 siblings, 0 replies; 8+ messages in thread
From: Tom Rini @ 2023-05-16 20:21 UTC (permalink / raw)
To: Marek Vasut
Cc: u-boot, Andrew Davis, Chris Packham, Jim Liu, Lukasz Majewski,
Samuel Holland, Simon Glass, Stefan Roese, Weijie Gao
[-- Attachment #1: Type: text/plain, Size: 440 bytes --]
On Sat, May 06, 2023 at 04:42:40PM +0200, Marek Vasut wrote:
> Define SPL_USB_ETH_RNDIS symbol to make it possible to select USB
> gadget ethernet support in SPL and U-Boot separately in Kconfig .
> Make use of the new symbols in gadget Makefile and move the rndis.o
> just below the now merged USB_ETHER symbol in Makefile.
>
> Signed-off-by: Marek Vasut <marex@denx.de>
Reviewed-by: Tom Rini <trini@konsulko.com>
--
Tom
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/4] usb: Move SPL_USB_HOST Kconfig symbol to drivers/usb/
2023-05-06 14:42 [PATCH 1/4] usb: Move SPL_USB_HOST Kconfig symbol to drivers/usb/ Marek Vasut
` (2 preceding siblings ...)
2023-05-06 14:42 ` [PATCH 4/4] usb: gadget: Add and use matching SPL USB ethernet gadget Kconfig symbols Marek Vasut
@ 2023-05-16 20:21 ` Tom Rini
3 siblings, 0 replies; 8+ messages in thread
From: Tom Rini @ 2023-05-16 20:21 UTC (permalink / raw)
To: Marek Vasut
Cc: u-boot, Andrew Davis, Chris Packham, Jim Liu, Lukasz Majewski,
Samuel Holland, Simon Glass, Stefan Roese, Weijie Gao
[-- Attachment #1: Type: text/plain, Size: 412 bytes --]
On Sat, May 06, 2023 at 04:42:37PM +0200, Marek Vasut wrote:
> To avoid piling up all the various Kconfig symbols in one place, i.e.
> common/spl/Kconfig, move the USB Kconfig symbols into drivers/usb/ .
> This commit moves SPL_USB_HOST and updates help text of both USB_HOST
> and SPL_USB_HOST .
>
> Signed-off-by: Marek Vasut <marex@denx.de>
Reviewed-by: Tom Rini <trini@konsulko.com>
--
Tom
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread