mirror of
https://github.com/AsahiLinux/u-boot
synced 2025-02-16 14:08:45 +00:00
Merge git://git.denx.de/u-boot-usb
This commit is contained in:
commit
09b6a6dd01
12 changed files with 23 additions and 11 deletions
|
@ -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;
|
||||
|
@ -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 */
|
||||
|
@ -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;
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -1,3 +1,11 @@
|
|||
#
|
||||
# Copyright (C) 2015
|
||||
#
|
||||
# Lukasz Majewski <l.majewski@majess.pl>
|
||||
#
|
||||
#
|
||||
# SPDX-License-Identifier: GPL-2.0+
|
||||
|
||||
Device Firmware Upgrade (DFU) - extension to use TFTP
|
||||
=====================================================
|
||||
|
||||
|
|
|
@ -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 */
|
||||
|
@ -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) {
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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" \
|
||||
|
|
|
@ -118,7 +118,6 @@
|
|||
/*-----------------------------------------------------------------------
|
||||
* USB configuration
|
||||
*/
|
||||
#define CONFIG_USB_EHCI_PCI
|
||||
#define CONFIG_SYS_USB_EVENT_POLL
|
||||
|
||||
#define CONFIG_USB_HOST_ETHER
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Reference in a new issue