aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--target/linux/brcm47xx/image/Makefile2
-rw-r--r--tools/firmware-utils/src/trx.c8
2 files changed, 6 insertions, 4 deletions
diff --git a/target/linux/brcm47xx/image/Makefile b/target/linux/brcm47xx/image/Makefile
index 69a31e7554..f534f5f284 100644
--- a/target/linux/brcm47xx/image/Makefile
+++ b/target/linux/brcm47xx/image/Makefile
@@ -56,7 +56,7 @@ define trxalign/jffs2-64k
-a 0x10000 -f $(KDIR)/root.$(1)
endef
define trxalign/squashfs
--a 1024 -f $(KDIR)/root.$(1) $(if $(2),-f $(2)) -a 0x10000 -A $(KDIR)/fs_mark
+-a 1024 -f $(KDIR)/root.$(1) $(if $(2),-f $(2)) -a 0x10000 -F $(KDIR)/fs_mark
endef
define Image/Build/trxV2
diff --git a/tools/firmware-utils/src/trx.c b/tools/firmware-utils/src/trx.c
index 7a64cfd1a9..9697ad79dc 100644
--- a/tools/firmware-utils/src/trx.c
+++ b/tools/firmware-utils/src/trx.c
@@ -98,7 +98,7 @@ int main(int argc, char **argv)
int c, i, append = 0;
size_t n;
ssize_t n2;
- uint32_t cur_len;
+ uint32_t cur_len, fsmark=0;
unsigned long maxlen = TRX_MAX_LEN;
struct trx_header *p;
char trx_version = 1;
@@ -131,6 +131,8 @@ int main(int argc, char **argv)
cur_len += 4;
}
break;
+ case 'F':
+ fsmark = cur_len;
case 'A':
append = 1;
/* fall through */
@@ -269,10 +271,10 @@ int main(int argc, char **argv)
}
p->crc32 = crc32buf((char *) &p->flag_version,
- cur_len - offsetof(struct trx_header, flag_version));
+ (fsmark)?fsmark:cur_len - offsetof(struct trx_header, flag_version));
p->crc32 = STORE32_LE(p->crc32);
- p->len = STORE32_LE(cur_len);
+ p->len = (fsmark)?fsmark:cur_len - offsetof(struct trx_header, flag_version);
/* restore TRXv2 bin-header */
if (trx_version == 2) {