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

firmware-utils mktplinkfw: print amount of exceeding bytes

Browse source 
This is very useful for trimming images towards 4 MiB flash size.

Signed-off-by: Stephan Maka <stephan@spaceboyz.net>

SVN-Revision: 46469
This commit is contained in:
John Crispin 2015-07-24 09:11:24 +00:00
parent 38991bf90b
commit a77a9f520c
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
tools/firmware-utils/src/mktplinkfw.c
View file

@ -591,6 +591,7 @@ static int read_to_buf(struct file_info *fdata, char *buf)
static int check_options(void) static int check_options(void)
{ {
int ret; int ret;
int exceed_bytes;
if (inspect_info.file_name) { if (inspect_info.file_name) {
ret = get_file_stat(&inspect_info); ret = get_file_stat(&inspect_info);
@ -664,10 +665,10 @@ static int check_options(void)
kernel_len = kernel_info.file_size; kernel_len = kernel_info.file_size;
if (combined) { if (combined) {
if (kernel_info.file_size > exceed_bytes = kernel_info.file_size - (fw_max_len - sizeof(struct fw_header));
fw_max_len - sizeof(struct fw_header)) { if (exceed_bytes > 0) {
if (!ignore_size) { if (!ignore_size) {
ERR("kernel image is too big"); ERR("kernel image is too big by %i bytes", exceed_bytes);
return -1; return -1;
} }
layout->fw_max_len = sizeof(struct fw_header) + layout->fw_max_len = sizeof(struct fw_header) +
@ -691,20 +692,20 @@ static int check_options(void)
DBG("kernel length aligned to %u", kernel_len); DBG("kernel length aligned to %u", kernel_len);
if (kernel_len + rootfs_info.file_size > exceed_bytes = kernel_len + rootfs_info.file_size - (fw_max_len - sizeof(struct fw_header));
fw_max_len - sizeof(struct fw_header)) { if (exceed_bytes > 0) {
ERR("images are too big"); ERR("images are too big by %i bytes", exceed_bytes);
return -1; return -1;
} }
} else { } else {
if (kernel_info.file_size > exceed_bytes = kernel_info.file_size - (rootfs_ofs - sizeof(struct fw_header));
rootfs_ofs - sizeof(struct fw_header)) { if (exceed_bytes > 0) {
ERR("kernel image is too big"); ERR("kernel image is too big");
return -1; return -1;
} }
if (rootfs_info.file_size > exceed_bytes = rootfs_info.file_size - (fw_max_len - rootfs_ofs);
(fw_max_len - rootfs_ofs)) { if (exceed_bytes > 0) {
ERR("rootfs image is too big"); ERR("rootfs image is too big");
return -1; return -1;
} }