projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Disable xfs on avr32, it has been failing the build for at least a month
[openwrt.git]
/
tools
/
firmware-utils
/
src
/
mkzynfw.c
diff --git
a/tools/firmware-utils/src/mkzynfw.c
b/tools/firmware-utils/src/mkzynfw.c
index
f3343df
..
36c176f
100644
(file)
--- a/
tools/firmware-utils/src/mkzynfw.c
+++ b/
tools/firmware-utils/src/mkzynfw.c
@@
-999,12
+999,13
@@
calc_block_offsets(int type, uint32_t *offset)
continue;
next_offs = ALIGN(*offset, block->align);
continue;
next_offs = ALIGN(*offset, block->align);
- avail = board->flash_size -
board->romio_offs -
next_offs;
+ avail = board->flash_size - next_offs;
if (block->file_size > avail) {
ERR("file %s is too big, offset = %u, size=%u,"
if (block->file_size > avail) {
ERR("file %s is too big, offset = %u, size=%u,"
- " align = %u", block->file_name,
+ " a
vail = %u, a
lign = %u", block->file_name,
(unsigned)next_offs,
(unsigned)block->file_size,
(unsigned)next_offs,
(unsigned)block->file_size,
+ (unsigned)avail,
(unsigned)block->align);
res = -1;
break;
(unsigned)block->align);
res = -1;
break;
This page took
0.020941 seconds
and
4
git commands to generate.