From a11a5b8ad9d7bfd37e7abbbaecc536f86eabc2d2 Mon Sep 17 00:00:00 2001 From: Bin Meng Date: Wed, 9 Aug 2017 00:21:54 -0700 Subject: usb: ehci: Convert CONFIG_USB_EHCI_PCI to Kconfig This converts CONFIG_USB_EHCI_PCI to a Kconfig option, and updates all boards that use it. Signed-off-by: Bin Meng diff --git a/configs/MPC8544DS_defconfig b/configs/MPC8544DS_defconfig index 3e75de7..457dfb1 100644 --- a/configs/MPC8544DS_defconfig +++ b/configs/MPC8544DS_defconfig @@ -28,5 +28,6 @@ CONFIG_RTL8139=y CONFIG_SCSI=y CONFIG_SYS_NS16550=y CONFIG_USB=y +CONFIG_USB_EHCI_PCI=y CONFIG_USB_STORAGE=y CONFIG_OF_LIBFDT=y diff --git a/configs/MPC8572DS_36BIT_defconfig b/configs/MPC8572DS_36BIT_defconfig index 4a3a7e0..1c4ab11 100644 --- a/configs/MPC8572DS_36BIT_defconfig +++ b/configs/MPC8572DS_36BIT_defconfig @@ -27,5 +27,6 @@ CONFIG_PHY_GIGE=y CONFIG_E1000=y CONFIG_SYS_NS16550=y CONFIG_USB=y +CONFIG_USB_EHCI_PCI=y CONFIG_USB_STORAGE=y CONFIG_OF_LIBFDT=y diff --git a/configs/MPC8572DS_defconfig b/configs/MPC8572DS_defconfig index 9af509f..8881713 100644 --- a/configs/MPC8572DS_defconfig +++ b/configs/MPC8572DS_defconfig @@ -26,5 +26,6 @@ CONFIG_PHY_GIGE=y CONFIG_E1000=y CONFIG_SYS_NS16550=y CONFIG_USB=y +CONFIG_USB_EHCI_PCI=y CONFIG_USB_STORAGE=y CONFIG_OF_LIBFDT=y diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index 67ad72b..eb035a4 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig @@ -142,6 +142,12 @@ config USB_EHCI_MSM This driver supports combination of Chipidea USB controller and Synapsys USB PHY in host mode only. +config USB_EHCI_PCI + bool "Support for PCI-based EHCI USB controller" + default y if X86 + help + Enables support for the PCI-based EHCI controller. + config USB_EHCI_RCAR_GEN3 bool "Support for Renesas RCar M3/H3 EHCI USB controller" depends on RCAR_GEN3 diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h index e8a6fdf..77c3910 100644 --- a/include/configs/MPC8544DS.h +++ b/include/configs/MPC8544DS.h @@ -347,7 +347,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); */ #ifdef CONFIG_USB_EHCI_HCD -#define CONFIG_USB_EHCI_PCI #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_PCI_EHCI_DEVICE 0 #endif diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h index 1959fa5..218d212 100644 --- a/include/configs/MPC8572DS.h +++ b/include/configs/MPC8572DS.h @@ -545,7 +545,6 @@ */ #ifdef CONFIG_USB_EHCI_HCD -#define CONFIG_USB_EHCI_PCI #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_PCI_EHCI_DEVICE 0 #endif diff --git a/include/configs/efi-x86.h b/include/configs/efi-x86.h index fa26363..43935bf 100644 --- a/include/configs/efi-x86.h +++ b/include/configs/efi-x86.h @@ -12,7 +12,6 @@ #undef CONFIG_TPM_TIS_BASE_ADDRESS #undef CONFIG_SCSI_AHCI -#undef CONFIG_USB_EHCI_PCI #define CONFIG_STD_DEVICES_SETTINGS "stdin=usbkbd,vga,serial\0" \ "stdout=vga,serial\0" \ diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index 687f8df..49fcbc5 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -118,7 +118,6 @@ /*----------------------------------------------------------------------- * USB configuration */ -#define CONFIG_USB_EHCI_PCI #define CONFIG_SYS_USB_EVENT_POLL #define CONFIG_USB_HOST_ETHER diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 6c628c8..0a751e4 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -5026,7 +5026,6 @@ CONFIG_USB_EHCI_KIRKWOOD CONFIG_USB_EHCI_MX5 CONFIG_USB_EHCI_MXC CONFIG_USB_EHCI_MXS -CONFIG_USB_EHCI_PCI CONFIG_USB_EHCI_RMOBILE CONFIG_USB_EHCI_SPEAR CONFIG_USB_EHCI_SUNXI -- cgit v0.10.2 From d331084298002e5cc0a54abb5855be1fc69153c3 Mon Sep 17 00:00:00 2001 From: Peter Chubb Date: Thu, 8 Sep 2016 20:51:57 +0000 Subject: Fix fastboot boot address Fastboot loads an image at CONFIG_FASTBOOT_BUF_ADDR, but currently tells do_bootm() to look for an image at $loadaddr. This breaks if CONFIG_FASTBOOT_BUF_ADDR is different from the current user-set loadaddr. Instead, tell do_bootm() to pick up the image where it was laoded. Signed-off-by: Peter Chubb Reviewed-by: Tom Rini Acked-by: Steve Rae diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c index d05b74b..aecee7f 100644 --- a/drivers/usb/gadget/f_fastboot.c +++ b/drivers/usb/gadget/f_fastboot.c @@ -561,7 +561,7 @@ static void do_bootm_on_complete(struct usb_ep *ep, struct usb_request *req) puts("Booting kernel..\n"); - sprintf(boot_addr_start, "0x%lx", load_addr); + sprintf(boot_addr_start, "0x%lx", CONFIG_FASTBOOT_BUF_ADDR); do_bootm(NULL, 0, 2, bootm_args); /* This only happens if image is somehow faulty so we start over */ -- cgit v0.10.2 From 7715dea48b5d17f6394d1a02c60a84278df71391 Mon Sep 17 00:00:00 2001 From: John Keeping Date: Mon, 19 Sep 2016 10:59:40 +0100 Subject: fastboot: avoid printing invalid data There is no guarantee that commands are null-terminated in the USB request buffer, so limit the length of data that is printed. Signed-off-by: John Keeping Tested-by: Steve Rae diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c index aecee7f..199621d 100644 --- a/drivers/usb/gadget/f_fastboot.c +++ b/drivers/usb/gadget/f_fastboot.c @@ -718,7 +718,7 @@ static void rx_handler_command(struct usb_ep *ep, struct usb_request *req) } if (!func_cb) { - error("unknown command: %s", cmdbuf); + error("unknown command: %.*s", req->actual, cmdbuf); fastboot_tx_write_str("FAILunknown command"); } else { if (req->actual < req->length) { -- cgit v0.10.2 From 2341c80cd261291aff2c58b70bacc053ecca9d1d Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Sat, 10 Jun 2017 09:15:37 -0400 Subject: common/fb_mmc.c: Fix warnings about casts When building the flash zImage code on aarch64 we see warnings about pointer size casts. Use uintptr_t instead to correct these. Cc: Sam Protsenko Signed-off-by: Tom Rini Reviewed-By: Sam Protsenko diff --git a/common/fb_mmc.c b/common/fb_mmc.c index 5065ad5..2a8ba15 100644 --- a/common/fb_mmc.c +++ b/common/fb_mmc.c @@ -162,7 +162,7 @@ static int fb_mmc_update_zimage(struct blk_desc *dev_desc, void *download_buffer, unsigned int download_bytes) { - u32 hdr_addr; /* boot image header address */ + uintptr_t hdr_addr; /* boot image header address */ struct andr_img_hdr *hdr; /* boot image header */ lbaint_t hdr_sectors; /* boot image header sectors */ u8 *ramdisk_buffer; @@ -185,7 +185,7 @@ static int fb_mmc_update_zimage(struct blk_desc *dev_desc, } /* Put boot image header in fastboot buffer after downloaded zImage */ - hdr_addr = (u32)download_buffer + ALIGN(download_bytes, PAGE_SIZE); + hdr_addr = (uintptr_t)download_buffer + ALIGN(download_bytes, PAGE_SIZE); hdr = (struct andr_img_hdr *)hdr_addr; /* Read boot image header */ -- cgit v0.10.2 From 6bafa5a4bd7c4d85f86178aee8adb6040d8df4a3 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Mon, 14 Aug 2017 21:00:44 -0400 Subject: fb_mmc.c: Correct blk_dread() return value checks The function blk_dread will return -ENOSYS on failure or on success the number of blocks read, which must be the number asked to read (otherwise it failed somewhere). Correct this check. Cc: Lukasz Majewski Signed-off-by: Tom Rini diff --git a/common/fb_mmc.c b/common/fb_mmc.c index 2a8ba15..26d60b8 100644 --- a/common/fb_mmc.c +++ b/common/fb_mmc.c @@ -132,7 +132,7 @@ static lbaint_t fb_mmc_get_boot_header(struct blk_desc *dev_desc, /* Read the boot image header */ res = blk_dread(dev_desc, info->start, hdr_sectors, (void *)hdr); - if (res == 0) { + if (res != hdr_sectors) { error("cannot read header from boot partition"); fastboot_fail("cannot read header from boot partition"); return 0; @@ -215,7 +215,7 @@ static int fb_mmc_update_zimage(struct blk_desc *dev_desc, ramdisk_buffer = (u8 *)hdr + (hdr_sectors * info.blksz); res = blk_dread(dev_desc, ramdisk_sector_start, ramdisk_sectors, ramdisk_buffer); - if (res == 0) { + if (res != ramdisk_sectors) { error("cannot read ramdisk from boot partition"); fastboot_fail("cannot read ramdisk from boot partition"); return -1; -- cgit v0.10.2 From 5bf4475f1d7726541edec0060c6461fbb37db02d Mon Sep 17 00:00:00 2001 From: Lukasz Majewski Date: Thu, 17 Aug 2017 23:10:49 +0200 Subject: doc: license: Add license header to the README.dfutftp file Signed-off-by: Lukasz Majewski diff --git a/doc/README.dfutftp b/doc/README.dfutftp index 0257f0d..66901e1 100644 --- a/doc/README.dfutftp +++ b/doc/README.dfutftp @@ -1,3 +1,11 @@ +# +# Copyright (C) 2015 +# +# Lukasz Majewski +# +# +# SPDX-License-Identifier: GPL-2.0+ + Device Firmware Upgrade (DFU) - extension to use TFTP ===================================================== -- cgit v0.10.2