Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OS
U-Boot.Mirror
提交
09b6a6dd
U
U-Boot.Mirror
项目概览
OS
/
U-Boot.Mirror
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
U
U-Boot.Mirror
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
09b6a6dd
编写于
8月 21, 2017
作者:
T
Tom Rini
浏览文件
操作
浏览文件
下载
差异文件
Merge
git://git.denx.de/u-boot-usb
上级
8197d928
5bf4475f
变更
12
显示空白变更内容
内联
并排
Showing
12 changed file
with
23 addition
and
11 deletion
+23
-11
common/fb_mmc.c
common/fb_mmc.c
+4
-4
configs/MPC8544DS_defconfig
configs/MPC8544DS_defconfig
+1
-0
configs/MPC8572DS_36BIT_defconfig
configs/MPC8572DS_36BIT_defconfig
+1
-0
configs/MPC8572DS_defconfig
configs/MPC8572DS_defconfig
+1
-0
doc/README.dfutftp
doc/README.dfutftp
+8
-0
drivers/usb/gadget/f_fastboot.c
drivers/usb/gadget/f_fastboot.c
+2
-2
drivers/usb/host/Kconfig
drivers/usb/host/Kconfig
+6
-0
include/configs/MPC8544DS.h
include/configs/MPC8544DS.h
+0
-1
include/configs/MPC8572DS.h
include/configs/MPC8572DS.h
+0
-1
include/configs/efi-x86.h
include/configs/efi-x86.h
+0
-1
include/configs/x86-common.h
include/configs/x86-common.h
+0
-1
scripts/config_whitelist.txt
scripts/config_whitelist.txt
+0
-1
未找到文件。
common/fb_mmc.c
浏览文件 @
09b6a6dd
...
...
@@ -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
)
{
u
32
hdr_addr
;
/* boot image header address */
u
intptr_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
=
(
u
32
)
download_buffer
+
ALIGN
(
download_bytes
,
PAGE_SIZE
);
hdr_addr
=
(
u
intptr_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
;
...
...
configs/MPC8544DS_defconfig
浏览文件 @
09b6a6dd
...
...
@@ -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
configs/MPC8572DS_36BIT_defconfig
浏览文件 @
09b6a6dd
...
...
@@ -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
configs/MPC8572DS_defconfig
浏览文件 @
09b6a6dd
...
...
@@ -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
doc/README.dfutftp
浏览文件 @
09b6a6dd
#
# Copyright (C) 2015
#
# Lukasz Majewski <l.majewski@majess.pl>
#
#
# SPDX-License-Identifier: GPL-2.0+
Device Firmware Upgrade (DFU) - extension to use TFTP
=====================================================
...
...
drivers/usb/gadget/f_fastboot.c
浏览文件 @
09b6a6dd
...
...
@@ -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
)
{
...
...
drivers/usb/host/Kconfig
浏览文件 @
09b6a6dd
...
...
@@ -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
...
...
include/configs/MPC8544DS.h
浏览文件 @
09b6a6dd
...
...
@@ -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
...
...
include/configs/MPC8572DS.h
浏览文件 @
09b6a6dd
...
...
@@ -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
...
...
include/configs/efi-x86.h
浏览文件 @
09b6a6dd
...
...
@@ -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" \
...
...
include/configs/x86-common.h
浏览文件 @
09b6a6dd
...
...
@@ -118,7 +118,6 @@
/*-----------------------------------------------------------------------
* USB configuration
*/
#define CONFIG_USB_EHCI_PCI
#define CONFIG_SYS_USB_EVENT_POLL
#define CONFIG_USB_HOST_ETHER
...
...
scripts/config_whitelist.txt
浏览文件 @
09b6a6dd
...
...
@@ -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
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录