Răsfoiți Sursa

mostly revert commit r22396

CFE does not boot images generated with these checksums because of
wrong checksum.

After flashing then with tftp to my Asus wl500-GPv1 the following messages
are show:
Null Rescue Flag.
Boot program checksum is invalid
Hello!! Enter Rescue Mode: (Check error)

SVN-Revision: 22418
Hauke Mehrtens 15 ani în urmă
părinte
comite
da7493d8f9
2 a modificat fișierele cu 2 adăugiri și 2 ștergeri
  1. 1 1
      target/linux/brcm47xx/image/Makefile
  2. 1 1
      tools/firmware-utils/src/trx.c

+ 1 - 1
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 -F $(KDIR)/fs_mark
+-a 1024 -f $(KDIR)/root.$(1) $(if $(2),-f $(2)) -a 0x10000 -A $(KDIR)/fs_mark
 endef
 
 define Image/Build/trxV2

+ 1 - 1
tools/firmware-utils/src/trx.c

@@ -276,7 +276,7 @@ int main(int argc, char **argv)
 						(fsmark)?fsmark:cur_len - offsetof(struct trx_header, flag_version));
 	p->crc32 = STORE32_LE(p->crc32);
 
-	p->len = (fsmark)?fsmark:cur_len - offsetof(struct trx_header, flag_version);
+	p->len = STORE32_LE((fsmark) ? fsmark : cur_len);
 	p->len = STORE32_LE(p->len);
 
 	/* restore TRXv2 bin-header */