Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OS
U-Boot.Mirror
提交
57288e3d
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,发现更多精彩内容 >>
提交
57288e3d
编写于
9月 06, 2016
作者:
T
Tom Rini
浏览文件
操作
浏览文件
下载
差异文件
Merge
git://git.denx.de/u-boot-nand-flash
上级
0068dd68
8b7d5124
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
8 addition
and
7 deletion
+8
-7
cmd/nand.c
cmd/nand.c
+4
-4
drivers/dfu/dfu_nand.c
drivers/dfu/dfu_nand.c
+2
-2
drivers/mtd/nand/omap_gpmc.c
drivers/mtd/nand/omap_gpmc.c
+1
-1
drivers/mtd/nand/pxa3xx_nand.c
drivers/mtd/nand/pxa3xx_nand.c
+1
-0
未找到文件。
cmd/nand.c
浏览文件 @
57288e3d
...
...
@@ -191,7 +191,7 @@ int do_nand_env_oob(cmd_tbl_t *cmdtp, int argc, char *const argv[])
struct
mtd_info
*
mtd
=
nand_info
[
0
];
char
*
cmd
=
argv
[
1
];
if
(
CONFIG_SYS_MAX_NAND_DEVICE
==
0
||
!
mtd
->
name
)
{
if
(
CONFIG_SYS_MAX_NAND_DEVICE
==
0
||
!
mtd
)
{
puts
(
"no devices available
\n
"
);
return
1
;
}
...
...
@@ -398,7 +398,7 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
putc
(
'\n'
);
for
(
i
=
0
;
i
<
CONFIG_SYS_MAX_NAND_DEVICE
;
i
++
)
{
if
(
nand_info
[
i
]
->
name
)
if
(
nand_info
[
i
])
nand_print_and_set_info
(
i
);
}
return
0
;
...
...
@@ -433,7 +433,7 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
* for another device is to be used.
*/
if
(
dev
<
0
||
dev
>=
CONFIG_SYS_MAX_NAND_DEVICE
||
!
nand_info
[
dev
]
->
name
)
{
!
nand_info
[
dev
])
{
puts
(
"
\n
no devices available
\n
"
);
return
1
;
}
...
...
@@ -991,7 +991,7 @@ usage:
idx
=
simple_strtoul
(
boot_device
,
NULL
,
16
);
if
(
idx
<
0
||
idx
>=
CONFIG_SYS_MAX_NAND_DEVICE
||
!
nand_info
[
idx
]
->
name
)
{
if
(
idx
<
0
||
idx
>=
CONFIG_SYS_MAX_NAND_DEVICE
||
!
nand_info
[
idx
])
{
printf
(
"
\n
** Device %d not available
\n
"
,
idx
);
bootstage_error
(
BOOTSTAGE_ID_NAND_AVAILABLE
);
return
1
;
...
...
drivers/dfu/dfu_nand.c
浏览文件 @
57288e3d
...
...
@@ -39,7 +39,7 @@ static int nand_block_op(enum dfu_op op, struct dfu_entity *dfu,
if
(
nand_curr_device
<
0
||
nand_curr_device
>=
CONFIG_SYS_MAX_NAND_DEVICE
||
!
nand_info
[
nand_curr_device
]
->
name
)
{
!
nand_info
[
nand_curr_device
])
{
printf
(
"%s: invalid nand device
\n
"
,
__func__
);
return
-
1
;
}
...
...
@@ -148,7 +148,7 @@ static int dfu_flush_medium_nand(struct dfu_entity *dfu)
if
(
nand_curr_device
<
0
||
nand_curr_device
>=
CONFIG_SYS_MAX_NAND_DEVICE
||
!
nand_info
[
nand_curr_device
]
->
name
)
{
!
nand_info
[
nand_curr_device
])
{
printf
(
"%s: invalid nand device
\n
"
,
__func__
);
return
-
1
;
}
...
...
drivers/mtd/nand/omap_gpmc.c
浏览文件 @
57288e3d
...
...
@@ -899,7 +899,7 @@ int __maybe_unused omap_nand_switch_ecc(uint32_t hardware, uint32_t eccstrength)
if
(
nand_curr_device
<
0
||
nand_curr_device
>=
CONFIG_SYS_MAX_NAND_DEVICE
||
!
nand_info
[
nand_curr_device
]
->
name
)
{
!
nand_info
[
nand_curr_device
])
{
printf
(
"nand: error: no NAND devices found
\n
"
);
return
-
ENODEV
;
}
...
...
drivers/mtd/nand/pxa3xx_nand.c
浏览文件 @
57288e3d
...
...
@@ -1496,6 +1496,7 @@ static int alloc_nand_resource(struct pxa3xx_nand_info *info)
host
->
read_id_bytes
=
4
;
mtd
->
owner
=
THIS_MODULE
;
nand_set_controller_data
(
chip
,
host
);
chip
->
ecc
.
read_page
=
pxa3xx_nand_read_page_hwecc
;
chip
->
ecc
.
write_page
=
pxa3xx_nand_write_page_hwecc
;
chip
->
controller
=
&
info
->
controller
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录