KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix padding between end of the kernel and beginning of the rootfs in imagetag (#5108)

Browse source 
SVN-Revision: 15801
This commit is contained in:
Florian Fainelli 2009-05-12 13:20:36 +00:00
parent f27feec22f
commit e5a836693e
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
tools/firmware-utils/src/imagetag.c
View file

@ -153,7 +153,7 @@ int tagfile(const char *kernel, const char *rootfs, const char *bin,
struct imagetag tag; struct imagetag tag;
struct kernelhdr khdr; struct kernelhdr khdr;
FILE *kernelfile = NULL, *rootfsfile = NULL, *binfile; FILE *kernelfile = NULL, *rootfsfile = NULL, *binfile;
size_t kerneloff, kernellen, rootfsoff, rootfslen, read, imagelen; size_t kerneloff, kernellen, rootfsoff, rootfslen, read, imagelen, rootfsoffpadlen;
uint8_t readbuf[1024]; uint8_t readbuf[1024];
uint32_t crc = IMAGETAG_CRC_START; uint32_t crc = IMAGETAG_CRC_START;
const uint32_t deadcode = htonl(DEADCODE); const uint32_t deadcode = htonl(DEADCODE);
@ -203,6 +203,7 @@ int tagfile(const char *kernel, const char *rootfs, const char *bin,
rootfslen = getlen(rootfsfile); rootfslen = getlen(rootfsfile);
rootfslen = (rootfslen % flash_bs) > 0 ? (((rootfslen / flash_bs) + 1) * flash_bs) : rootfslen; rootfslen = (rootfslen % flash_bs) > 0 ? (((rootfslen / flash_bs) + 1) * flash_bs) : rootfslen;
imagelen = rootfsoff + rootfslen - kerneloff + sizeof(deadcode); imagelen = rootfsoff + rootfslen - kerneloff + sizeof(deadcode);
rootfsoffpadlen = rootfsoff - (kerneloff + kernellen);
/* Seek to the start of the kernel */ /* Seek to the start of the kernel */
fseek(binfile, kerneloff - fwaddr, SEEK_SET); fseek(binfile, kerneloff - fwaddr, SEEK_SET);
@ -260,7 +261,7 @@ int tagfile(const char *kernel, const char *rootfs, const char *bin,
if (kernelfile) { if (kernelfile) {
sprintf(tag.kernel.address, "%lu", kerneloff); sprintf(tag.kernel.address, "%lu", kerneloff);
sprintf(tag.kernel.len, "%lu", kernellen); sprintf(tag.kernel.len, "%lu", kernellen + rootfsoffpadlen);
} }
if (rootfsfile) { if (rootfsfile) {