mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2026-05-04 20:26:13 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

u-boot-dfu-20260316

Browse Source 
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
 -----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCgAdFiEELulCp7Yfar5TE60AGQ0dtGZOGTUFAmm30KoACgkQGQ0dtGZO
 GTWrJQf/WhaPujo6FMhEMNhJuaZ6ASYwvxAE4L0MJ+cUv4TeF9N3hq22LJllnqIV
 yIOQUtxcQaTpw/aBR4KFDAuDu91CsdVnWtkC8FgBup104LvDkoSsTHgBtpFE4Bdj
 h+kYd5t4Se22M/c4sOPBqJNyLwIB1EZBq/JqfVuJ0rBp3GW9tdnSnJM6bDk7zsr9
 lBd6ZFUh/vMy3HmITxKz0/JRDpAcxlkUzZg/EVzVWe1MNxaDifJ7Sg4WecX6dfWQ
 qPewn4L398IUvr6RFs1XcjORbuaHOYIFP5jN0MhXvmm0QTelwIX+OzX5RHxWhhhA
 lQpcP2kyOxKGLdenLd/jbStBq1SwvQ==
 =BDza
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Tom Rini 2026-03-16 08:22:58 -06:00
commit 071e914b4a
6 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/include/asm/bootm.h
View File

@ -8,8 +8,6 @@
#ifndef ARM_BOOTM_H
#define ARM_BOOTM_H
extern void udc_disconnect(void);
#ifdef CONFIG_SUPPORT_PASSING_ATAGS
# define BOOTM_ENABLE_TAGS 1
#else

2
common/spl/spl_dfu.c
View File

@ -64,7 +64,7 @@ static int dfu_over_pcie(void)
hdr.deviceid = CONFIG_SPL_PCI_DFU_DEVICE_ID;
hdr.vendorid = CONFIG_SPL_PCI_DFU_VENDOR_ID;
hdr.baseclass_code = PCI_BASE_CLASS_MEMORY;
hdr.subclass_code = PCI_CLASS_MEMORY_RAM;
hdr.subclass_code = PCI_CLASS_MEMORY_RAM & 0xff;
ret = pci_ep_write_header(dev, fn, &hdr);
if (ret) {

2
drivers/dfu/Kconfig
View File

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

2
drivers/usb/gadget/ci_udc.c
View File

@ -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 */

9
include/usb.h
View File

@ -208,15 +208,6 @@ void *poll_int_queue(struct usb_device *dev, struct int_queue *queue);
#define USB_UHCI_VEND_ID 0x8086
#define USB_UHCI_DEV_ID 0x7112
/*
* PXA25x can only act as USB device. There are drivers
* which works with USB CDC gadgets implementations.
* Some of them have common routines which can be used
* in boards init functions e.g. udc_disconnect() used for
* forced device disconnection from host.
*/
extern void udc_disconnect(void);
/*
* board-specific hardware initialization, called by
* usb drivers and u-boot commands

1
include/usb/udc.h
View File

@ -39,7 +39,6 @@ int udc_endpoint_write(struct usb_endpoint_instance *endpoint);
void udc_setup_ep(struct usb_device_instance *device, unsigned int ep,
struct usb_endpoint_instance *endpoint);
void udc_connect(void);
void udc_disconnect(void);
void udc_enable(struct usb_device_instance *device);
void udc_disable(void);
void udc_startup_events(struct usb_device_instance *device);