hak5
/
wifipineapple-openwrt
mirror of https://github.com/hak5/wifipineapple-openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mktplinkfw: add flag to ignore size limit (used for initramfs images) 

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45644 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
Felix Fietkau 2015-05-08 14:02:33 +00:00
parent 777b521ad5
commit f4f30d7130
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tools/firmware-utils/src/mktplinkfw.c
View File

@ -148,6 +148,7 @@ static uint32_t rootfs_align;
static struct file_info boot_info; static struct file_info boot_info;
static int combined; static int combined;
static int strip_padding; static int strip_padding;
static int ignore_size;
static int add_jffs2_eof; static int add_jffs2_eof;
static unsigned char jffs2_eof_mark[4] = {0xde, 0xad, 0xc0, 0xde}; static unsigned char jffs2_eof_mark[4] = {0xde, 0xad, 0xc0, 0xde};
static uint32_t fw_max_len; 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" " -R <offset> overwrite rootfs offset with <offset> (hexval prefixed with 0x)\n"
" -o <file> write output to the file <file>\n" " -o <file> write output to the file <file>\n"
" -s strip padding from the end of the image\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" " -j add jffs2 end-of-filesystem markers\n"
" -N <vendor> set image vendor to <vendor>\n" " -N <vendor> set image vendor to <vendor>\n"
" -V <version> set image version to <version>\n" " -V <version> set image version to <version>\n"
@ -645,8 +647,13 @@ static int check_options(void)
if (combined) { if (combined) {
if (kernel_info.file_size > if (kernel_info.file_size >
fw_max_len - sizeof(struct fw_header)) { fw_max_len - sizeof(struct fw_header)) {
ERR("kernel image is too big"); if (!ignore_size) {
return -1; ERR("kernel image is too big");
return -1;
}
layout->fw_max_len = sizeof(struct fw_header) +
kernel_info.file_size +
reserved_space;
} }
} else { } else {
if (rootfs_info.file_name == NULL) { if (rootfs_info.file_name == NULL) {
@ -1081,7 +1088,7 @@ int main(int argc, char *argv[])
while ( 1 ) { while ( 1 ) {
int c; 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) if (c == -1)
break; break;
@ -1134,6 +1141,9 @@ int main(int argc, char *argv[])
case 's': case 's':
strip_padding = 1; strip_padding = 1;
break; break;
case 'S':
ignore_size = 1;
break;
case 'i': case 'i':
inspect_info.file_name = optarg; inspect_info.file_name = optarg;
break; break;