diff options
| -rw-r--r-- | arch/arm/include/asm/bootm.h | 2 | ||||
| -rw-r--r-- | common/spl/spl_dfu.c | 2 | ||||
| -rw-r--r-- | drivers/dfu/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/usb/gadget/ci_udc.c | 2 | ||||
| -rw-r--r-- | include/usb.h | 9 | ||||
| -rw-r--r-- | include/usb/udc.h | 1 |
6 files changed, 3 insertions, 15 deletions
diff --git a/arch/arm/include/asm/bootm.h b/arch/arm/include/asm/bootm.h index 439e43c2d01..762f00e6900 100644 --- a/arch/arm/include/asm/bootm.h +++ b/arch/arm/include/asm/bootm.h @@ -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 diff --git a/common/spl/spl_dfu.c b/common/spl/spl_dfu.c index b09f82790c9..7d21bb4d16a 100644 --- a/common/spl/spl_dfu.c +++ b/common/spl/spl_dfu.c @@ -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) { 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 */ diff --git a/include/usb.h b/include/usb.h index be37ed272e1..dab23753f0c 100644 --- a/include/usb.h +++ b/include/usb.h @@ -209,15 +209,6 @@ void *poll_int_queue(struct usb_device *dev, struct int_queue *queue); #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 * diff --git a/include/usb/udc.h b/include/usb/udc.h index 749b3a3f015..c5e431813be 100644 --- a/include/usb/udc.h +++ b/include/usb/udc.h @@ -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); |