Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OS
U-Boot.Mirror
提交
b9eaeae1
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,发现更多精彩内容 >>
提交
b9eaeae1
编写于
6月 05, 2017
作者:
T
Tom Rini
浏览文件
操作
浏览文件
下载
差异文件
Merge
git://git.denx.de/u-boot-usb
上级
ad701b1c
2cb7b900
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
171 addition
and
1 deletion
+171
-1
common/fb_mmc.c
common/fb_mmc.c
+168
-0
drivers/dfu/dfu_sf.c
drivers/dfu/dfu_sf.c
+2
-1
drivers/usb/host/ehci-pci.c
drivers/usb/host/ehci-pci.c
+1
-0
未找到文件。
common/fb_mmc.c
浏览文件 @
b9eaeae1
...
@@ -13,6 +13,8 @@
...
@@ -13,6 +13,8 @@
#include <part.h>
#include <part.h>
#include <mmc.h>
#include <mmc.h>
#include <div64.h>
#include <div64.h>
#include <linux/compat.h>
#include <android_image.h>
/*
/*
* FIXME: Ensure we always set these names via Kconfig once xxx_PARTITION is
* FIXME: Ensure we always set these names via Kconfig once xxx_PARTITION is
...
@@ -27,6 +29,8 @@
...
@@ -27,6 +29,8 @@
#define CONFIG_FASTBOOT_MBR_NAME "mbr"
#define CONFIG_FASTBOOT_MBR_NAME "mbr"
#endif
#endif
#define BOOT_PARTITION_NAME "boot"
struct
fb_mmc_sparse
{
struct
fb_mmc_sparse
{
struct
blk_desc
*
dev_desc
;
struct
blk_desc
*
dev_desc
;
};
};
...
@@ -99,6 +103,163 @@ static void write_raw_image(struct blk_desc *dev_desc, disk_partition_t *info,
...
@@ -99,6 +103,163 @@ static void write_raw_image(struct blk_desc *dev_desc, disk_partition_t *info,
fastboot_okay
(
""
);
fastboot_okay
(
""
);
}
}
#ifdef CONFIG_ANDROID_BOOT_IMAGE
/**
* Read Android boot image header from boot partition.
*
* @param[in] dev_desc MMC device descriptor
* @param[in] info Boot partition info
* @param[out] hdr Where to store read boot image header
*
* @return Boot image header sectors count or 0 on error
*/
static
lbaint_t
fb_mmc_get_boot_header
(
struct
blk_desc
*
dev_desc
,
disk_partition_t
*
info
,
struct
andr_img_hdr
*
hdr
)
{
ulong
sector_size
;
/* boot partition sector size */
lbaint_t
hdr_sectors
;
/* boot image header sectors count */
int
res
;
/* Calculate boot image sectors count */
sector_size
=
info
->
blksz
;
hdr_sectors
=
DIV_ROUND_UP
(
sizeof
(
struct
andr_img_hdr
),
sector_size
);
if
(
hdr_sectors
==
0
)
{
error
(
"invalid number of boot sectors: 0"
);
fastboot_fail
(
"invalid number of boot sectors: 0"
);
return
0
;
}
/* Read the boot image header */
res
=
blk_dread
(
dev_desc
,
info
->
start
,
hdr_sectors
,
(
void
*
)
hdr
);
if
(
res
==
0
)
{
error
(
"cannot read header from boot partition"
);
fastboot_fail
(
"cannot read header from boot partition"
);
return
0
;
}
/* Check boot header magic string */
res
=
android_image_check_header
(
hdr
);
if
(
res
!=
0
)
{
error
(
"bad boot image magic"
);
fastboot_fail
(
"boot partition not initialized"
);
return
0
;
}
return
hdr_sectors
;
}
/**
* Write downloaded zImage to boot partition and repack it properly.
*
* @param dev_desc MMC device descriptor
* @param download_buffer Address to fastboot buffer with zImage in it
* @param download_bytes Size of fastboot buffer, in bytes
*
* @return 0 on success or -1 on error
*/
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 */
struct
andr_img_hdr
*
hdr
;
/* boot image header */
lbaint_t
hdr_sectors
;
/* boot image header sectors */
u8
*
ramdisk_buffer
;
u32
ramdisk_sector_start
;
u32
ramdisk_sectors
;
u32
kernel_sector_start
;
u32
kernel_sectors
;
u32
sectors_per_page
;
disk_partition_t
info
;
int
res
;
puts
(
"Flashing zImage
\n
"
);
/* Get boot partition info */
res
=
part_get_info_by_name
(
dev_desc
,
BOOT_PARTITION_NAME
,
&
info
);
if
(
res
<
0
)
{
error
(
"cannot find boot partition"
);
fastboot_fail
(
"cannot find boot partition"
);
return
-
1
;
}
/* Put boot image header in fastboot buffer after downloaded zImage */
hdr_addr
=
(
u32
)
download_buffer
+
ALIGN
(
download_bytes
,
PAGE_SIZE
);
hdr
=
(
struct
andr_img_hdr
*
)
hdr_addr
;
/* Read boot image header */
hdr_sectors
=
fb_mmc_get_boot_header
(
dev_desc
,
&
info
,
hdr
);
if
(
hdr_sectors
==
0
)
{
error
(
"unable to read boot image header"
);
fastboot_fail
(
"unable to read boot image header"
);
return
-
1
;
}
/* Check if boot image has second stage in it (we don't support it) */
if
(
hdr
->
second_size
>
0
)
{
error
(
"moving second stage is not supported yet"
);
fastboot_fail
(
"moving second stage is not supported yet"
);
return
-
1
;
}
/* Extract ramdisk location */
sectors_per_page
=
hdr
->
page_size
/
info
.
blksz
;
ramdisk_sector_start
=
info
.
start
+
sectors_per_page
;
ramdisk_sector_start
+=
DIV_ROUND_UP
(
hdr
->
kernel_size
,
hdr
->
page_size
)
*
sectors_per_page
;
ramdisk_sectors
=
DIV_ROUND_UP
(
hdr
->
ramdisk_size
,
hdr
->
page_size
)
*
sectors_per_page
;
/* Read ramdisk and put it in fastboot buffer after boot image header */
ramdisk_buffer
=
(
u8
*
)
hdr
+
(
hdr_sectors
*
info
.
blksz
);
res
=
blk_dread
(
dev_desc
,
ramdisk_sector_start
,
ramdisk_sectors
,
ramdisk_buffer
);
if
(
res
==
0
)
{
error
(
"cannot read ramdisk from boot partition"
);
fastboot_fail
(
"cannot read ramdisk from boot partition"
);
return
-
1
;
}
/* Write new kernel size to boot image header */
hdr
->
kernel_size
=
download_bytes
;
res
=
blk_dwrite
(
dev_desc
,
info
.
start
,
hdr_sectors
,
(
void
*
)
hdr
);
if
(
res
==
0
)
{
error
(
"cannot writeback boot image header"
);
fastboot_fail
(
"cannot write back boot image header"
);
return
-
1
;
}
/* Write the new downloaded kernel */
kernel_sector_start
=
info
.
start
+
sectors_per_page
;
kernel_sectors
=
DIV_ROUND_UP
(
hdr
->
kernel_size
,
hdr
->
page_size
)
*
sectors_per_page
;
res
=
blk_dwrite
(
dev_desc
,
kernel_sector_start
,
kernel_sectors
,
download_buffer
);
if
(
res
==
0
)
{
error
(
"cannot write new kernel"
);
fastboot_fail
(
"cannot write new kernel"
);
return
-
1
;
}
/* Write the saved ramdisk back */
ramdisk_sector_start
=
info
.
start
+
sectors_per_page
;
ramdisk_sector_start
+=
DIV_ROUND_UP
(
hdr
->
kernel_size
,
hdr
->
page_size
)
*
sectors_per_page
;
res
=
blk_dwrite
(
dev_desc
,
ramdisk_sector_start
,
ramdisk_sectors
,
ramdisk_buffer
);
if
(
res
==
0
)
{
error
(
"cannot write back original ramdisk"
);
fastboot_fail
(
"cannot write back original ramdisk"
);
return
-
1
;
}
puts
(
"........ zImage was updated in boot partition
\n
"
);
fastboot_okay
(
""
);
return
0
;
}
#endif
void
fb_mmc_flash_write
(
const
char
*
cmd
,
void
*
download_buffer
,
void
fb_mmc_flash_write
(
const
char
*
cmd
,
void
*
download_buffer
,
unsigned
int
download_bytes
)
unsigned
int
download_bytes
)
{
{
...
@@ -153,6 +314,13 @@ void fb_mmc_flash_write(const char *cmd, void *download_buffer,
...
@@ -153,6 +314,13 @@ void fb_mmc_flash_write(const char *cmd, void *download_buffer,
}
}
#endif
#endif
#ifdef CONFIG_ANDROID_BOOT_IMAGE
if
(
strncasecmp
(
cmd
,
"zimage"
,
6
)
==
0
)
{
fb_mmc_update_zimage
(
dev_desc
,
download_buffer
,
download_bytes
);
return
;
}
#endif
if
(
part_get_info_by_name_or_alias
(
dev_desc
,
cmd
,
&
info
)
<
0
)
{
if
(
part_get_info_by_name_or_alias
(
dev_desc
,
cmd
,
&
info
)
<
0
)
{
error
(
"cannot find partition: '%s'
\n
"
,
cmd
);
error
(
"cannot find partition: '%s'
\n
"
,
cmd
);
fastboot_fail
(
"cannot find partition"
);
fastboot_fail
(
"cannot find partition"
);
...
...
drivers/dfu/dfu_sf.c
浏览文件 @
b9eaeae1
...
@@ -20,7 +20,8 @@ static long dfu_get_medium_size_sf(struct dfu_entity *dfu)
...
@@ -20,7 +20,8 @@ static long dfu_get_medium_size_sf(struct dfu_entity *dfu)
static
int
dfu_read_medium_sf
(
struct
dfu_entity
*
dfu
,
u64
offset
,
void
*
buf
,
static
int
dfu_read_medium_sf
(
struct
dfu_entity
*
dfu
,
u64
offset
,
void
*
buf
,
long
*
len
)
long
*
len
)
{
{
return
spi_flash_read
(
dfu
->
data
.
sf
.
dev
,
offset
,
*
len
,
buf
);
return
spi_flash_read
(
dfu
->
data
.
sf
.
dev
,
dfu
->
data
.
sf
.
start
+
offset
,
*
len
,
buf
);
}
}
static
u64
find_sector
(
struct
dfu_entity
*
dfu
,
u64
start
,
u64
offset
)
static
u64
find_sector
(
struct
dfu_entity
*
dfu
,
u64
start
,
u64
offset
)
...
...
drivers/usb/host/ehci-pci.c
浏览文件 @
b9eaeae1
...
@@ -10,6 +10,7 @@
...
@@ -10,6 +10,7 @@
#include <errno.h>
#include <errno.h>
#include <pci.h>
#include <pci.h>
#include <usb.h>
#include <usb.h>
#include <asm/io.h>
#include "ehci.h"
#include "ehci.h"
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录