Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
Rk3576 Downstream U-Boot
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Nicolas Frattaroli
Rk3576 Downstream U-Boot
Commits
f81c3d72
Commit
f81c3d72
authored
15 years ago
by
Wolfgang Denk
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' of /home/wd/git/u-boot/custodians
parents
b644006e
269610f6
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
drivers/mtd/nand/nand_util.c
+4
-0
4 additions, 0 deletions
drivers/mtd/nand/nand_util.c
nand_spl/nand_boot_fsl_elbc.c
+1
-1
1 addition, 1 deletion
nand_spl/nand_boot_fsl_elbc.c
with
5 additions
and
1 deletion
drivers/mtd/nand/nand_util.c
+
4
−
0
View file @
f81c3d72
...
...
@@ -508,6 +508,8 @@ int nand_write_skip_bad(nand_info_t *nand, loff_t offset, size_t *length,
size_t
block_offset
=
offset
&
(
nand
->
erasesize
-
1
);
size_t
write_size
;
WATCHDOG_RESET
();
if
(
nand_block_isbad
(
nand
,
offset
&
~
(
nand
->
erasesize
-
1
)))
{
printf
(
"Skip bad block 0x%08llx
\n
"
,
offset
&
~
(
nand
->
erasesize
-
1
));
...
...
@@ -578,6 +580,8 @@ int nand_read_skip_bad(nand_info_t *nand, loff_t offset, size_t *length,
size_t
block_offset
=
offset
&
(
nand
->
erasesize
-
1
);
size_t
read_length
;
WATCHDOG_RESET
();
if
(
nand_block_isbad
(
nand
,
offset
&
~
(
nand
->
erasesize
-
1
)))
{
printf
(
"Skipping bad block 0x%08llx
\n
"
,
offset
&
~
(
nand
->
erasesize
-
1
));
...
...
This diff is collapsed.
Click to expand it.
nand_spl/nand_boot_fsl_elbc.c
+
1
−
1
View file @
f81c3d72
...
...
@@ -120,7 +120,7 @@ static void nand_load(unsigned int offs, int uboot_size, uchar *dst)
pos
+=
page_size
;
offs
+=
page_size
;
}
while
(
offs
&
(
block_size
-
1
));
}
while
(
(
offs
&
(
block_size
-
1
))
&&
(
pos
<
uboot_size
))
;
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment