Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OS
U-Boot.Mirror
提交
dc013d46
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,发现更多精彩内容 >>
提交
dc013d46
编写于
3月 12, 2006
作者:
W
Wolfgang Denk
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add loads of ntohl() in image header handling
Patch by Steven Scholz, 10 Jun 2005
上级
8ff0208d
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
20 addition
and
17 deletion
+20
-17
CHANGELOG
CHANGELOG
+3
-0
common/cmd_bootm.c
common/cmd_bootm.c
+9
-9
common/cmd_doc.c
common/cmd_doc.c
+1
-1
common/cmd_fdc.c
common/cmd_fdc.c
+2
-2
common/cmd_nand.c
common/cmd_nand.c
+1
-1
common/lynxkdi.c
common/lynxkdi.c
+4
-4
未找到文件。
CHANGELOG
浏览文件 @
dc013d46
...
...
@@ -2,6 +2,9 @@
Changes since U-Boot 1.1.4:
======================================================================
* Add loads of ntohl() in image header handling
Patch by Steven Scholz, 10 Jun 2005
* Switch MPC86xADS and MPC885ADS boards to use cpuclk environment
variable to set clock
Patch by Yuli Barcohen, 05 Jun 2005
...
...
common/cmd_bootm.c
浏览文件 @
dc013d46
...
...
@@ -606,7 +606,7 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag,
#endif
/* CONFIG_MPC5xxx */
}
kernel
=
(
void
(
*
)(
bd_t
*
,
ulong
,
ulong
,
ulong
,
ulong
))
hdr
->
ih_ep
;
kernel
=
(
void
(
*
)(
bd_t
*
,
ulong
,
ulong
,
ulong
,
ulong
))
ntohl
(
hdr
->
ih_ep
)
;
/*
* Check if there is an initrd image
...
...
@@ -621,7 +621,7 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag,
/* Copy header so we can blank CRC field for re-calculation */
memmove
(
&
header
,
(
char
*
)
addr
,
sizeof
(
image_header_t
));
if
(
hdr
->
ih_magic
!=
IH_MAGIC
)
{
if
(
ntohl
(
hdr
->
ih_magic
)
!=
IH_MAGIC
)
{
puts
(
"Bad Magic Number
\n
"
);
SHOW_BOOT_PROGRESS
(
-
10
);
do_reset
(
cmdtp
,
flag
,
argc
,
argv
);
...
...
@@ -630,7 +630,7 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag,
data
=
(
ulong
)
&
header
;
len
=
sizeof
(
image_header_t
);
checksum
=
hdr
->
ih_hcrc
;
checksum
=
ntohl
(
hdr
->
ih_hcrc
)
;
hdr
->
ih_hcrc
=
0
;
if
(
crc32
(
0
,
(
uchar
*
)
data
,
len
)
!=
checksum
)
{
...
...
@@ -644,7 +644,7 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag,
print_image_hdr
(
hdr
);
data
=
addr
+
sizeof
(
image_header_t
);
len
=
hdr
->
ih_size
;
len
=
ntohl
(
hdr
->
ih_size
)
;
if
(
verify
)
{
ulong
csum
=
0
;
...
...
@@ -670,7 +670,7 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag,
csum
=
crc32
(
0
,
(
uchar
*
)
data
,
len
);
#endif
/* CONFIG_HW_WATCHDOG || CONFIG_WATCHDOG */
if
(
csum
!=
hdr
->
ih_dcrc
)
{
if
(
csum
!=
ntohl
(
hdr
->
ih_dcrc
)
)
{
puts
(
"Bad Data CRC
\n
"
);
SHOW_BOOT_PROGRESS
(
-
12
);
do_reset
(
cmdtp
,
flag
,
argc
,
argv
);
...
...
@@ -902,7 +902,7 @@ do_bootm_netbsd (cmd_tbl_t *cmdtp, int flag,
cmdline
=
""
;
}
loader
=
(
void
(
*
)(
bd_t
*
,
image_header_t
*
,
char
*
,
char
*
))
hdr
->
ih_ep
;
loader
=
(
void
(
*
)(
bd_t
*
,
image_header_t
*
,
char
*
,
char
*
))
ntohl
(
hdr
->
ih_ep
)
;
printf
(
"## Transferring control to NetBSD stage-2 loader (at address %08lx) ...
\n
"
,
(
ulong
)
loader
);
...
...
@@ -1364,7 +1364,7 @@ do_bootm_rtems (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
image_header_t
*
hdr
=
&
header
;
void
(
*
entry_point
)(
bd_t
*
);
entry_point
=
(
void
(
*
)(
bd_t
*
))
hdr
->
ih_ep
;
entry_point
=
(
void
(
*
)(
bd_t
*
))
ntohl
(
hdr
->
ih_ep
)
;
printf
(
"## Transferring control to RTEMS (at address %08lx) ...
\n
"
,
(
ulong
)
entry_point
);
...
...
@@ -1387,7 +1387,7 @@ do_bootm_vxworks (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
image_header_t
*
hdr
=
&
header
;
char
str
[
80
];
sprintf
(
str
,
"%x"
,
hdr
->
ih_ep
);
/* write entry-point into string */
sprintf
(
str
,
"%x"
,
ntohl
(
hdr
->
ih_ep
)
);
/* write entry-point into string */
setenv
(
"loadaddr"
,
str
);
do_bootvx
(
cmdtp
,
0
,
0
,
NULL
);
}
...
...
@@ -1400,7 +1400,7 @@ do_bootm_qnxelf (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
char
*
local_args
[
2
];
char
str
[
16
];
sprintf
(
str
,
"%x"
,
hdr
->
ih_ep
);
/* write entry-point into string */
sprintf
(
str
,
"%x"
,
ntohl
(
hdr
->
ih_ep
)
);
/* write entry-point into string */
local_args
[
0
]
=
argv
[
0
];
local_args
[
1
]
=
str
;
/* and provide it via the arguments */
do_bootelf
(
cmdtp
,
0
,
2
,
local_args
);
...
...
common/cmd_doc.c
浏览文件 @
dc013d46
...
...
@@ -250,7 +250,7 @@ int do_docboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
print_image_hdr
(
hdr
);
cnt
=
(
hdr
->
ih_size
+
sizeof
(
image_header_t
));
cnt
=
(
ntohl
(
hdr
->
ih_size
)
+
sizeof
(
image_header_t
));
cnt
-=
SECTORSIZE
;
}
else
{
puts
(
"
\n
** Bad Magic Number **
\n
"
);
...
...
common/cmd_fdc.c
浏览文件 @
dc013d46
...
...
@@ -836,13 +836,13 @@ int do_fdcboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
return
1
;
}
hdr
=
(
image_header_t
*
)
addr
;
if
(
hdr
->
ih_magic
!=
IH_MAGIC
)
{
if
(
ntohl
(
hdr
->
ih_magic
)
!=
IH_MAGIC
)
{
printf
(
"Bad Magic Number
\n
"
);
return
1
;
}
print_image_hdr
(
hdr
);
imsize
=
hdr
->
ih_size
+
sizeof
(
image_header_t
);
imsize
=
ntohl
(
hdr
->
ih_size
)
+
sizeof
(
image_header_t
);
nrofblk
=
imsize
/
512
;
if
((
imsize
%
512
)
>
0
)
nrofblk
++
;
...
...
common/cmd_nand.c
浏览文件 @
dc013d46
...
...
@@ -717,7 +717,7 @@ int do_nandboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
cnt
=
(
ntohl
(
hdr
->
ih_size
)
+
sizeof
(
image_header_t
));
cnt
-=
SECTORSIZE
;
}
else
{
printf
(
"
\n
** Bad Magic Number 0x%x **
\n
"
,
hdr
->
ih_magic
);
printf
(
"
\n
** Bad Magic Number 0x%x **
\n
"
,
ntohl
(
hdr
->
ih_magic
)
);
SHOW_BOOT_PROGRESS
(
-
1
);
return
1
;
}
...
...
common/lynxkdi.c
浏览文件 @
dc013d46
...
...
@@ -23,11 +23,11 @@
#if defined(CONFIG_MPC8260) || defined(CONFIG_440EP) || defined(CONFIG_440GR)
void
lynxkdi_boot
(
image_header_t
*
hdr
)
{
void
(
*
lynxkdi
)(
void
)
=
(
void
(
*
)(
void
))
hdr
->
ih_ep
;
void
(
*
lynxkdi
)(
void
)
=
(
void
(
*
)(
void
))
ntohl
(
hdr
->
ih_ep
)
;
lynxos_bootparms_t
*
parms
=
(
lynxos_bootparms_t
*
)
0x0020
;
bd_t
*
kbd
;
DECLARE_GLOBAL_DATA_PTR
;
u32
*
psz
=
(
u32
*
)(
hdr
->
ih_load
+
0x0204
);
u32
*
psz
=
(
u32
*
)(
ntohl
(
hdr
->
ih_load
)
+
0x0204
);
memset
(
parms
,
0
,
sizeof
(
*
parms
));
kbd
=
gd
->
bd
;
...
...
@@ -39,9 +39,9 @@ void lynxkdi_boot ( image_header_t *hdr )
/* Do a simple check for Bluecat so we can pass the
* kernel command line parameters.
*/
if
(
le32_to_cpu
(
*
psz
)
==
hdr
->
ih_size
){
if
(
le32_to_cpu
(
*
psz
)
==
ntohl
(
hdr
->
ih_size
)
){
/* FIXME: NOT SURE HERE ! */
char
*
args
;
char
*
cmdline
=
(
char
*
)(
hdr
->
ih_load
+
0x020c
);
char
*
cmdline
=
(
char
*
)(
ntohl
(
hdr
->
ih_load
)
+
0x020c
);
int
len
;
printf
(
"Booting Bluecat KDI ...
\n
"
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录