qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-24 07:22:25 +02:00
Code

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

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15801 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
florian 2009-05-12 13:20:36 +00:00
parent c0d013dd1b
commit 3da5c74ed8
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 kernelhdr khdr;
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];
uint32_t crc = IMAGETAG_CRC_START;
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 = (rootfslen % flash_bs) > 0 ? (((rootfslen / flash_bs) + 1) * flash_bs) : rootfslen;
imagelen = rootfsoff + rootfslen - kerneloff + sizeof(deadcode);
rootfsoffpadlen = rootfsoff - (kerneloff + kernellen);
/* Seek to the start of the kernel */
fseek(binfile, kerneloff - fwaddr, SEEK_SET);
@ -260,7 +261,7 @@ int tagfile(const char *kernel, const char *rootfs, const char *bin,
if (kernelfile) {
sprintf(tag.kernel.address, "%lu", kerneloff);
sprintf(tag.kernel.len, "%lu", kernellen);
sprintf(tag.kernel.len, "%lu", kernellen + rootfsoffpadlen);
}
if (rootfsfile) {