diff options
| author | Tom Rini <[email protected]> | 2026-03-16 08:22:58 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2026-03-16 08:22:58 -0600 |
| commit | 071e914b4aa139c9c411efda3fe1ffaebda5c76e (patch) | |
| tree | f65e043c2ea417b4a30ad98b9a3e28061bedbb2e /drivers | |
| parent | fab3b667b4128fae2d94752bb03088f84dafcf89 (diff) | |
| parent | 4b77b07811c2fb48b4a65ae14c387540ae6b8998 (diff) | |
Merge tag 'u-boot-dfu-20260316' of https://source.denx.de/u-boot/custodians/u-boot-dfu into next
u-boot-dfu-20260316
DFU:
* Make DFU_WRITE_ALT symbol available outside of DFU
* Fix PCI subclass_code warning in spl_dfu
Usb Gadget:
* Mark udc_disconnect() as static
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/dfu/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/usb/gadget/ci_udc.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/dfu/Kconfig b/drivers/dfu/Kconfig index 2cf4289b448..962bda40ad2 100644 --- a/drivers/dfu/Kconfig +++ b/drivers/dfu/Kconfig @@ -13,10 +13,10 @@ config DFU_OVER_TFTP bool depends on NET -if DFU config DFU_WRITE_ALT bool +if DFU config DFU_TFTP bool "DFU via TFTP" depends on NETDEVICES diff --git a/drivers/usb/gadget/ci_udc.c b/drivers/usb/gadget/ci_udc.c index 046bb335ecb..4729570c525 100644 --- a/drivers/usb/gadget/ci_udc.c +++ b/drivers/usb/gadget/ci_udc.c @@ -990,7 +990,7 @@ int dm_usb_gadget_handle_interrupts(struct udevice *dev) return value; } -void udc_disconnect(void) +static void udc_disconnect(void) { struct ci_udc *udc = (struct ci_udc *)controller.ctrl->hcor; /* disable pullup */ |