summaryrefslogtreecommitdiffstats
path: root/tools/firmware-utils
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-03-10 17:41:50 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-03-10 17:41:50 +0000
commit18274ae3338d9d17261eb24fd1f15ddb2e2c85e8 (patch)
treeb488cb2ee1f6b911a6aa2d2aa356d64808e05174 /tools/firmware-utils
parent05d28bc8eb200d91f3d7d3d9aa2333b7ccb698f7 (diff)
mktplinkfw: add option to strip padding from the end of the image
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20120 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'tools/firmware-utils')
-rw-r--r--tools/firmware-utils/src/mktplinkfw.c18
1 files changed, 15 insertions, 3 deletions
diff --git a/tools/firmware-utils/src/mktplinkfw.c b/tools/firmware-utils/src/mktplinkfw.c
index ad422d709..cfb03f881 100644
--- a/tools/firmware-utils/src/mktplinkfw.c
+++ b/tools/firmware-utils/src/mktplinkfw.c
@@ -95,6 +95,7 @@ static struct file_info kernel_info;
static struct file_info rootfs_info;
static struct file_info boot_info;
static int combined;
+static int strip_padding;
char md5salt_normal[MD5SUM_LEN] = {
0xdc, 0xd7, 0x3a, 0xa5, 0xc3, 0x95, 0x98, 0xfb,
@@ -218,6 +219,7 @@ static void usage(int status)
" -k <file> read kernel image from the file <file>\n"
" -r <file> read rootfs image from the file <file>\n"
" -o <file> write output to the file <file>\n"
+" -s strip padding from the end of the image\n"
" -N <vendor> set image vendor to <vendor>\n"
" -V <version> set image version to <version>\n"
" -h show this screen\n"
@@ -407,6 +409,7 @@ static int build_fw(void)
char *buf;
char *p;
int ret = EXIT_FAILURE;
+ int writelen = 0;
buflen = board->fw_max_len;
@@ -422,16 +425,22 @@ static int build_fw(void)
if (ret)
goto out_free_buf;
+ writelen = kernel_info.file_size;
+
if (!combined) {
p = buf + board->rootfs_ofs;
ret = read_to_buf(&rootfs_info, p);
if (ret)
goto out_free_buf;
+
+ writelen = board->rootfs_ofs + rootfs_info.file_size;
}
- fill_header(buf, buflen);
+ if (!strip_padding)
+ writelen = buflen;
- ret = write_fw(buf, buflen);
+ fill_header(buf, writelen);
+ ret = write_fw(buf, writelen);
if (ret)
goto out_free_buf;
@@ -455,7 +464,7 @@ int main(int argc, char *argv[])
while ( 1 ) {
int c;
- c = getopt(argc, argv, "B:V:N:ck:r:o:h");
+ c = getopt(argc, argv, "B:V:N:ck:r:o:hs");
if (c == -1)
break;
@@ -481,6 +490,9 @@ int main(int argc, char *argv[])
case 'o':
ofname = optarg;
break;
+ case 's':
+ strip_padding = 1;
+ break;
case 'h':
usage(EXIT_SUCCESS);
break;