aboutsummaryrefslogtreecommitdiffstats
path: root/tools/firmware-utils/src
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-05-08 14:02:33 +0000
committerFelix Fietkau <nbd@openwrt.org>2015-05-08 14:02:33 +0000
commita13e2d0e5ca05e4402baadf208caf545c434f967 (patch)
treea01bd52fe0f2a523fdc90f5018cc7801315d4af7 /tools/firmware-utils/src
parent5b14d96deda3cb7fb156ce852679ea017bff70b0 (diff)
downloadupstream-a13e2d0e5ca05e4402baadf208caf545c434f967.tar.gz
upstream-a13e2d0e5ca05e4402baadf208caf545c434f967.tar.bz2
upstream-a13e2d0e5ca05e4402baadf208caf545c434f967.zip
mktplinkfw: add flag to ignore size limit (used for initramfs images)
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 45644
Diffstat (limited to 'tools/firmware-utils/src')
-rw-r--r--tools/firmware-utils/src/mktplinkfw.c16
1 files changed, 13 insertions, 3 deletions
diff --git a/tools/firmware-utils/src/mktplinkfw.c b/tools/firmware-utils/src/mktplinkfw.c
index 4817e58f02..80db8f8c25 100644
--- a/tools/firmware-utils/src/mktplinkfw.c
+++ b/tools/firmware-utils/src/mktplinkfw.c
@@ -148,6 +148,7 @@ static uint32_t rootfs_align;
static struct file_info boot_info;
static int combined;
static int strip_padding;
+static int ignore_size;
static int add_jffs2_eof;
static unsigned char jffs2_eof_mark[4] = {0xde, 0xad, 0xc0, 0xde};
static uint32_t fw_max_len;
@@ -501,6 +502,7 @@ static void usage(int status)
" -R <offset> overwrite rootfs offset with <offset> (hexval prefixed with 0x)\n"
" -o <file> write output to the file <file>\n"
" -s strip padding from the end of the image\n"
+" -S ignore firmware size limit (only for combined images)\n"
" -j add jffs2 end-of-filesystem markers\n"
" -N <vendor> set image vendor to <vendor>\n"
" -V <version> set image version to <version>\n"
@@ -645,8 +647,13 @@ static int check_options(void)
if (combined) {
if (kernel_info.file_size >
fw_max_len - sizeof(struct fw_header)) {
- ERR("kernel image is too big");
- return -1;
+ if (!ignore_size) {
+ ERR("kernel image is too big");
+ return -1;
+ }
+ layout->fw_max_len = sizeof(struct fw_header) +
+ kernel_info.file_size +
+ reserved_space;
}
} else {
if (rootfs_info.file_name == NULL) {
@@ -1081,7 +1088,7 @@ int main(int argc, char *argv[])
while ( 1 ) {
int c;
- c = getopt(argc, argv, "a:B:H:E:F:L:V:N:W:ci:k:r:R:o:xX:hsjv:");
+ c = getopt(argc, argv, "a:B:H:E:F:L:V:N:W:ci:k:r:R:o:xX:hsSjv:");
if (c == -1)
break;
@@ -1134,6 +1141,9 @@ int main(int argc, char *argv[])
case 's':
strip_padding = 1;
break;
+ case 'S':
+ ignore_size = 1;
+ break;
case 'i':
inspect_info.file_name = optarg;
break;