projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '2020-01-07-master-imports'
[oweals/u-boot.git]
/
cmd
/
mtdparts.c
diff --git
a/cmd/mtdparts.c
b/cmd/mtdparts.c
index 46155cabf66c30eaa5245c2dacd7a9f00e0fd953..b40c2afadda2b60c3be134b384b0cc68cab20645 100644
(file)
--- a/
cmd/mtdparts.c
+++ b/
cmd/mtdparts.c
@@
-1233,11
+1233,11
@@
static uint64_t net_part_size(struct mtd_info *mtd, struct part_info *part)
{
uint64_t i, net_size = 0;
{
uint64_t i, net_size = 0;
- if (!mtd->block_isbad)
+ if (!mtd->
_
block_isbad)
return part->size;
for (i = 0; i < part->size; i += mtd->erasesize) {
return part->size;
for (i = 0; i < part->size; i += mtd->erasesize) {
- if (!mtd->block_isbad(mtd, part->offset + i))
+ if (!mtd->
_
block_isbad(mtd, part->offset + i))
net_size += mtd->erasesize;
}
net_size += mtd->erasesize;
}
@@
-1274,7
+1274,7
@@
static void print_partition_table(void)
part = list_entry(pentry, struct part_info, link);
net_size = net_part_size(mtd, part);
size_note = part->size == net_size ? " " : " (!)";
part = list_entry(pentry, struct part_info, link);
net_size = net_part_size(mtd, part);
size_note = part->size == net_size ? " " : " (!)";
- printf("%2d: %-20s0x%08
x\t0x%08x%s\t0x%08
x\t%d\n",
+ printf("%2d: %-20s0x%08
llx\t0x%08x%s\t0x%08ll
x\t%d\n",
part_num, part->name, part->size,
net_size, size_note, part->offset,
part->mask_flags);
part_num, part->name, part->size,
net_size, size_note, part->offset,
part->mask_flags);