X-Git-Url: https://git.archive.openwrt.org/?p=openwrt.git;a=blobdiff_plain;f=tools%2Ffirmware-utils%2Fsrc%2Fmktplinkfw.c;h=7127932d71ba89ef620aed29390a6ef794012dee;hp=aea7e3595a3bd12445b2120676dc240d9f56374e;hb=HEAD;hpb=fb9f9cdc813406041715d4c692f2b18cfd418cee diff --git a/tools/firmware-utils/src/mktplinkfw.c b/tools/firmware-utils/src/mktplinkfw.c index aea7e3595a..7127932d71 100644 --- a/tools/firmware-utils/src/mktplinkfw.c +++ b/tools/firmware-utils/src/mktplinkfw.c @@ -22,28 +22,16 @@ #include #include +#include +#include + #include "md5.h" -#if (__BYTE_ORDER == __BIG_ENDIAN) -# define HOST_TO_BE32(x) (x) -# define BE32_TO_HOST(x) (x) -#else -# define HOST_TO_BE32(x) bswap_32(x) -# define BE32_TO_HOST(x) bswap_32(x) -#endif +#define ALIGN(x,a) ({ typeof(a) __a = (a); (((x) + __a - 1) & ~(__a - 1)); }) +#define ARRAY_SIZE(a) (sizeof((a)) / sizeof((a)[0])) #define HEADER_VERSION_V1 0x01000000 -#define HWID_TL_MR3220_V1 0x32200001 -#define HWID_TL_MR3420_V1 0x34200001 -#define HWID_TL_WA901ND_V1 0x09010001 -#define HWID_TL_WR741ND_V1 0x07410001 -#define HWID_TL_WR841N_V1_5 0x08410002 -#define HWID_TL_WR841ND_V3 0x08410003 -#define HWID_TL_WR841ND_V5 0x08410005 -#define HWID_TL_WR841ND_V7 0x08410007 -#define HWID_TL_WR941ND_V2 0x09410002 -#define HWID_TL_WR941ND_V4 0x09410004 -#define HWID_TL_WR1043ND_V1 0x10430001 +#define HEADER_VERSION_V2 0x02000000 #define MD5SUM_LEN 16 @@ -58,7 +46,7 @@ struct fw_header { char fw_version[36]; uint32_t hw_id; /* hardware id */ uint32_t hw_rev; /* hardware revision */ - uint32_t unk1; + uint32_t region; /* region code */ uint8_t md5sum1[MD5SUM_LEN]; uint32_t unk2; uint8_t md5sum2[MD5SUM_LEN]; @@ -72,13 +60,14 @@ struct fw_header { uint32_t rootfs_len; /* rootfs data length */ uint32_t boot_ofs; /* bootloader data offset */ uint32_t boot_len; /* bootloader data length */ - uint8_t pad[360]; + uint16_t ver_hi; + uint16_t ver_mid; + uint16_t ver_lo; + uint8_t pad[354]; } __attribute__ ((packed)); -struct board_info { +struct flash_layout { char *id; - uint32_t hw_id; - uint32_t hw_rev; uint32_t fw_max_len; uint32_t kernel_la; uint32_t kernel_ep; @@ -92,125 +81,103 @@ static char *ofname; static char *progname; static char *vendor = "TP-LINK Technologies"; static char *version = "ver. 1.0"; - -static char *board_id; -static struct board_info *board; +static char *fw_ver = "0.0.0"; +static uint32_t hdr_ver = HEADER_VERSION_V1; + +static char *layout_id; +static struct flash_layout *layout; +static char *opt_hw_id; +static uint32_t hw_id; +static char *opt_hw_rev; +static uint32_t hw_rev; +static uint32_t opt_hdr_ver = 1; +static char *country; +static uint32_t region; +static int fw_ver_lo; +static int fw_ver_mid; +static int fw_ver_hi; static struct file_info kernel_info; static uint32_t kernel_la = 0; static uint32_t kernel_ep = 0; +static uint32_t kernel_len = 0; static struct file_info rootfs_info; static uint32_t rootfs_ofs = 0; +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; +static uint32_t reserved_space; static struct file_info inspect_info; static int extract = 0; -char md5salt_normal[MD5SUM_LEN] = { +static const char md5salt_normal[MD5SUM_LEN] = { 0xdc, 0xd7, 0x3a, 0xa5, 0xc3, 0x95, 0x98, 0xfb, 0xdd, 0xf9, 0xe7, 0xf4, 0x0e, 0xae, 0x47, 0x38, }; -char md5salt_boot[MD5SUM_LEN] = { +static const char md5salt_boot[MD5SUM_LEN] = { 0x8c, 0xef, 0x33, 0x5b, 0xd5, 0xc5, 0xce, 0xfa, 0xa7, 0x9c, 0x28, 0xda, 0xb2, 0xe9, 0x0f, 0x42, }; -static struct board_info boards[] = { +static struct flash_layout layouts[] = { { - .id = "TL-MR3220v1", - .hw_id = HWID_TL_MR3220_V1, - .hw_rev = 1, - .fw_max_len = 0x3c0000, - .kernel_la = 0x80060000, - .kernel_ep = 0x80060000, - .rootfs_ofs = 0x140000, - }, { - .id = "TL-MR3420v1", - .hw_id = HWID_TL_MR3420_V1, - .hw_rev = 1, - .fw_max_len = 0x3c0000, - .kernel_la = 0x80060000, - .kernel_ep = 0x80060000, - .rootfs_ofs = 0x140000, - }, { - .id = "TL-WA901NDv1", - .hw_id = HWID_TL_WA901ND_V1, - .hw_rev = 1, + .id = "4M", .fw_max_len = 0x3c0000, .kernel_la = 0x80060000, .kernel_ep = 0x80060000, .rootfs_ofs = 0x140000, }, { - .id = "TL-WR741NDv1", - .hw_id = HWID_TL_WR741ND_V1, - .hw_rev = 1, + .id = "4Mlzma", .fw_max_len = 0x3c0000, .kernel_la = 0x80060000, .kernel_ep = 0x80060000, - .rootfs_ofs = 0x140000, + .rootfs_ofs = 0x100000, }, { - .id = "TL-WR841Nv1.5", - .hw_id = HWID_TL_WR841N_V1_5, - .hw_rev = 2, - .fw_max_len = 0x3c0000, - .kernel_la = 0x80060000, - .kernel_ep = 0x80060000, - .rootfs_ofs = 0x140000, - }, { - .id = "TL-WR841NDv3", - .hw_id = HWID_TL_WR841ND_V3, - .hw_rev = 3, - .fw_max_len = 0x3c0000, + .id = "8M", + .fw_max_len = 0x7c0000, .kernel_la = 0x80060000, .kernel_ep = 0x80060000, .rootfs_ofs = 0x140000, }, { - .id = "TL-WR841NDv5", - .hw_id = HWID_TL_WR841ND_V5, - .hw_rev = 1, - .fw_max_len = 0x3c0000, + .id = "8Mlzma", + .fw_max_len = 0x7c0000, .kernel_la = 0x80060000, .kernel_ep = 0x80060000, - .rootfs_ofs = 0x140000, + .rootfs_ofs = 0x100000, }, { - .id = "TL-WR841NDv7", - .hw_id = HWID_TL_WR841ND_V7, - .hw_rev = 1, - .fw_max_len = 0x3c0000, + .id = "16M", + .fw_max_len = 0xf80000, .kernel_la = 0x80060000, .kernel_ep = 0x80060000, .rootfs_ofs = 0x140000, }, { - .id = "TL-WR941NDv2", - .hw_id = HWID_TL_WR941ND_V2, - .hw_rev = 2, - .fw_max_len = 0x3c0000, + .id = "16Mlzma", + .fw_max_len = 0xf80000, .kernel_la = 0x80060000, .kernel_ep = 0x80060000, - .rootfs_ofs = 0x140000, + .rootfs_ofs = 0x100000, }, { - .id = "TL-WR941NDv4", - .hw_id = HWID_TL_WR941ND_V4, - .hw_rev = 1, - .fw_max_len = 0x3c0000, - .kernel_la = 0x80060000, - .kernel_ep = 0x80060000, - .rootfs_ofs = 0x140000, - }, { - .id = "TL-WR1043NDv1", - .hw_id = HWID_TL_WR1043ND_V1, - .hw_rev = 1, - .fw_max_len = 0x7c0000, - .kernel_la = 0x80060000, - .kernel_ep = 0x80060000, - .rootfs_ofs = 0x140000, + .id = "16Mppc", + .fw_max_len = 0xf80000, + .kernel_la = 0x00000000 , + .kernel_ep = 0xc0000000, + .rootfs_ofs = 0x2a0000, }, { /* terminating entry */ } }; +static const char *const regions[] = { + "UN", /* universal */ + "US", +}; + /* * Message macros */ @@ -223,7 +190,7 @@ static struct board_info boards[] = { #define ERRS(fmt, ...) do { \ int save = errno; \ fflush(0); \ - fprintf(stderr, "[%s] *** error: " fmt "\n", \ + fprintf(stderr, "[%s] *** error: " fmt ": %s\n", \ progname, ## __VA_ARGS__, strerror(save)); \ } while (0) @@ -231,15 +198,15 @@ static struct board_info boards[] = { fprintf(stderr, "[%s] " fmt "\n", progname, ## __VA_ARGS__ ); \ } while (0) -static struct board_info *find_board(char *id) +static struct flash_layout *find_layout(const char *id) { - struct board_info *ret; - struct board_info *board; + struct flash_layout *ret; + struct flash_layout *l; ret = NULL; - for (board = boards; board->id != NULL; board++){ - if (strcasecmp(id, board->id) == 0) { - ret = board; + for (l = layouts; l->id != NULL; l++){ + if (strcasecmp(id, l->id) == 0) { + ret = l; break; } }; @@ -247,48 +214,59 @@ static struct board_info *find_board(char *id) return ret; } -static struct board_info *find_board_by_hwid(uint32_t hw_id) -{ - struct board_info *board; +static uint32_t find_region(const char *country) { + uint32_t i; - for (board = boards; board->id != NULL; board++) { - if (hw_id == board->hw_id) - return board; - }; + for (i = 0; i < ARRAY_SIZE(regions); i++) { + if (strcasecmp(regions[i], country) == 0) + return i; + } - return NULL; + return -1; } +static const char * get_region_country(uint32_t region) { + if (region < ARRAY_SIZE(regions)) + return regions[region]; + else + return "unknown"; +} static void usage(int status) { - FILE *stream = (status != EXIT_SUCCESS) ? stderr : stdout; - struct board_info *board; - - fprintf(stream, "Usage: %s [OPTIONS...]\n", progname); - fprintf(stream, + fprintf(stderr, "Usage: %s [OPTIONS...]\n", progname); + fprintf(stderr, "\n" "Options:\n" -" -B create image for the board specified with \n" " -c use combined kernel image\n" " -E overwrite kernel entry point with (hexval prefixed with 0x)\n" " -L overwrite kernel load address with (hexval prefixed with 0x)\n" +" -H use hardware id specified with \n" +" -W use hardware revision specified with \n" +" -C set region code to \n" +" -F use flash layout specified with \n" " -k read kernel image from the file \n" " -r read rootfs image from the file \n" +" -a align the rootfs start on an bytes boundary\n" " -R overwrite rootfs offset with (hexval prefixed with 0x)\n" " -o write output to the 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 set image vendor to \n" " -V set image version to \n" +" -v set firmware version to \n" +" -m set header version to \n" " -i inspect given firmware file \n" " -x extract kernel and rootfs while inspecting (requires -i)\n" +" -X reserve bytes in the firmware image (hexval prefixed with 0x)\n" " -h show this screen\n" ); exit(status); } -static int get_md5(char *data, int size, char *md5) +static void get_md5(const char *data, int size, uint8_t *md5) { MD5_CTX ctx; @@ -315,7 +293,7 @@ static int get_file_stat(struct file_info *fdata) return 0; } -static int read_to_buf(struct file_info *fdata, char *buf) +static int read_to_buf(const struct file_info *fdata, char *buf) { FILE *f; int ret = EXIT_FAILURE; @@ -344,6 +322,7 @@ static int read_to_buf(struct file_info *fdata, char *buf) static int check_options(void) { int ret; + int exceed_bytes; if (inspect_info.file_name) { ret = get_file_stat(&inspect_info); @@ -356,22 +335,53 @@ static int check_options(void) return -1; } - if (board_id == NULL) { - ERR("no board specified"); + if (opt_hw_id == NULL) { + ERR("hardware id not specified"); + return -1; + } + hw_id = strtoul(opt_hw_id, NULL, 0); + + if (layout_id == NULL) { + ERR("flash layout is not specified"); return -1; } - board = find_board(board_id); - if (board == NULL) { - ERR("unknown/unsupported board id \"%s\"", board_id); + if (opt_hw_rev) + hw_rev = strtoul(opt_hw_rev, NULL, 0); + else + hw_rev = 1; + + if (country) { + region = find_region(country); + if (region == (uint32_t)-1) { + char *end; + region = strtoul(country, &end, 0); + if (*end) { + ERR("unknown region code \"%s\"", country); + return -1; + } + } + } + + layout = find_layout(layout_id); + if (layout == NULL) { + ERR("unknown flash layout \"%s\"", layout_id); return -1; } + if (!kernel_la) - kernel_la = board->kernel_la; + kernel_la = layout->kernel_la; if (!kernel_ep) - kernel_ep = board->kernel_ep; + kernel_ep = layout->kernel_ep; if (!rootfs_ofs) - rootfs_ofs = board->rootfs_ofs; + rootfs_ofs = layout->rootfs_ofs; + + if (reserved_space > layout->fw_max_len) { + ERR("reserved space is not valid"); + return -1; + } + + fw_max_len = layout->fw_max_len - reserved_space; if (kernel_info.file_name == NULL) { ERR("no kernel image specified"); @@ -382,18 +392,20 @@ static int check_options(void) if (ret) return ret; + kernel_len = kernel_info.file_size; + if (combined) { - if (kernel_info.file_size > - board->fw_max_len - sizeof(struct fw_header)) { - ERR("kernel image is too big"); - return -1; + exceed_bytes = kernel_info.file_size - (fw_max_len - sizeof(struct fw_header)); + if (exceed_bytes > 0) { + if (!ignore_size) { + ERR("kernel image is too big by %i bytes", exceed_bytes); + return -1; + } + layout->fw_max_len = sizeof(struct fw_header) + + kernel_info.file_size + + reserved_space; } } else { - if (kernel_info.file_size > - rootfs_ofs - sizeof(struct fw_header)) { - ERR("kernel image is too big"); - return -1; - } if (rootfs_info.file_name == NULL) { ERR("no rootfs image specified"); return -1; @@ -403,10 +415,30 @@ static int check_options(void) if (ret) return ret; - if (rootfs_info.file_size > - (board->fw_max_len - rootfs_ofs)) { - ERR("rootfs image is too big"); - return -1; + if (rootfs_align) { + kernel_len += sizeof(struct fw_header); + kernel_len = ALIGN(kernel_len, rootfs_align); + kernel_len -= sizeof(struct fw_header); + + DBG("kernel length aligned to %u", kernel_len); + + exceed_bytes = kernel_len + rootfs_info.file_size - (fw_max_len - sizeof(struct fw_header)); + if (exceed_bytes > 0) { + ERR("images are too big by %i bytes", exceed_bytes); + return -1; + } + } else { + exceed_bytes = kernel_info.file_size - (rootfs_ofs - sizeof(struct fw_header)); + if (exceed_bytes > 0) { + ERR("kernel image is too big by %i bytes", exceed_bytes); + return -1; + } + + exceed_bytes = rootfs_info.file_size - (fw_max_len - rootfs_ofs); + if (exceed_bytes > 0) { + ERR("rootfs image is too big by %i bytes", exceed_bytes); + return -1; + } } } @@ -415,6 +447,21 @@ static int check_options(void) return -1; } + ret = sscanf(fw_ver, "%d.%d.%d", &fw_ver_hi, &fw_ver_mid, &fw_ver_lo); + if (ret != 3) { + ERR("invalid firmware version '%s'", fw_ver); + return -1; + } + + if (opt_hdr_ver == 1) { + hdr_ver = HEADER_VERSION_V1; + } else if (opt_hdr_ver == 2) { + hdr_ver = HEADER_VERSION_V2; + } else { + ERR("invalid header version '%u'", opt_hdr_ver); + return -1; + } + return 0; } @@ -424,31 +471,70 @@ static void fill_header(char *buf, int len) memset(hdr, 0, sizeof(struct fw_header)); - hdr->version = HOST_TO_BE32(HEADER_VERSION_V1); + hdr->version = htonl(hdr_ver); strncpy(hdr->vendor_name, vendor, sizeof(hdr->vendor_name)); strncpy(hdr->fw_version, version, sizeof(hdr->fw_version)); - hdr->hw_id = HOST_TO_BE32(board->hw_id); - hdr->hw_rev = HOST_TO_BE32(board->hw_rev); + hdr->hw_id = htonl(hw_id); + hdr->hw_rev = htonl(hw_rev); + hdr->region = htonl(region); if (boot_info.file_size == 0) memcpy(hdr->md5sum1, md5salt_normal, sizeof(hdr->md5sum1)); else memcpy(hdr->md5sum1, md5salt_boot, sizeof(hdr->md5sum1)); - hdr->kernel_la = HOST_TO_BE32(kernel_la); - hdr->kernel_ep = HOST_TO_BE32(kernel_ep); - hdr->fw_length = HOST_TO_BE32(board->fw_max_len); - hdr->kernel_ofs = HOST_TO_BE32(sizeof(struct fw_header)); - hdr->kernel_len = HOST_TO_BE32(kernel_info.file_size); + hdr->kernel_la = htonl(kernel_la); + hdr->kernel_ep = htonl(kernel_ep); + hdr->fw_length = htonl(layout->fw_max_len); + hdr->kernel_ofs = htonl(sizeof(struct fw_header)); + hdr->kernel_len = htonl(kernel_len); if (!combined) { - hdr->rootfs_ofs = HOST_TO_BE32(rootfs_ofs); - hdr->rootfs_len = HOST_TO_BE32(rootfs_info.file_size); + hdr->rootfs_ofs = htonl(rootfs_ofs); + hdr->rootfs_len = htonl(rootfs_info.file_size); } + hdr->ver_hi = htons(fw_ver_hi); + hdr->ver_mid = htons(fw_ver_mid); + hdr->ver_lo = htons(fw_ver_lo); + get_md5(buf, len, hdr->md5sum1); } -static int write_fw(char *data, int len) +static int pad_jffs2(char *buf, int currlen) +{ + int len; + uint32_t pad_mask; + + len = currlen; + pad_mask = (64 * 1024); + while ((len < layout->fw_max_len) && (pad_mask != 0)) { + uint32_t mask; + int i; + + for (i = 10; i < 32; i++) { + mask = 1 << i; + if (pad_mask & mask) + break; + } + + len = ALIGN(len, mask); + + for (i = 10; i < 32; i++) { + mask = 1 << i; + if ((len & (mask - 1)) == 0) + pad_mask &= ~mask; + } + + for (i = 0; i < sizeof(jffs2_eof_mark); i++) + buf[len + i] = jffs2_eof_mark[i]; + + len += sizeof(jffs2_eof_mark); + } + + return len; +} + +static int write_fw(const char *data, int len) { FILE *f; int ret = EXIT_FAILURE; @@ -488,7 +574,7 @@ static int build_fw(void) int ret = EXIT_FAILURE; int writelen = 0; - buflen = board->fw_max_len; + buflen = layout->fw_max_len; buf = malloc(buflen); if (!buf) { @@ -502,15 +588,25 @@ static int build_fw(void) if (ret) goto out_free_buf; - writelen = kernel_info.file_size; + writelen = sizeof(struct fw_header) + kernel_len; if (!combined) { - p = buf + rootfs_ofs; + if (rootfs_align) + p = buf + writelen; + else + p = buf + rootfs_ofs; + ret = read_to_buf(&rootfs_info, p); if (ret) goto out_free_buf; - writelen = rootfs_ofs + rootfs_info.file_size; + if (rootfs_align) + writelen += rootfs_info.file_size; + else + writelen = rootfs_ofs + rootfs_info.file_size; + + if (add_jffs2_eof) + writelen = pad_jffs2(buf, writelen); } if (!strip_padding) @@ -530,61 +626,27 @@ static int build_fw(void) } /* Helper functions to inspect_fw() representing different output formats */ -static inline void inspect_fw_pstr(char *label, char *str) +static inline void inspect_fw_pstr(const char *label, const char *str) { printf("%-23s: %s\n", label, str); } -static inline void inspect_fw_phex(char *label, uint32_t val) +static inline void inspect_fw_phex(const char *label, uint32_t val) { printf("%-23s: 0x%08x\n", label, val); } -static inline void inspect_fw_phexpost(char *label, - uint32_t val, char *post) +static inline void inspect_fw_phexpost(const char *label, uint32_t val, const char *post) { printf("%-23s: 0x%08x (%s)\n", label, val, post); } -static inline void inspect_fw_phexdef(char *label, - uint32_t val, uint32_t defval) -{ - printf("%-23s: 0x%08x ", label, val); - - if (val == defval) - printf("(== OpenWrt default)\n"); - else - printf("(OpenWrt default: 0x%08x)\n", defval); -} - -static inline void inspect_fw_phexexp(char *label, - uint32_t val, uint32_t expval) -{ - printf("%-23s: 0x%08x ", label, val); - - if (val == expval) - printf("(ok)\n"); - else - printf("(expected: 0x%08x)\n", expval); -} - -static inline void inspect_fw_phexdec(char *label, uint32_t val) +static inline void inspect_fw_phexdec(const char *label, uint32_t val) { printf("%-23s: 0x%08x / %8u bytes\n", label, val, val); } -static inline void inspect_fw_phexdecdef(char *label, - uint32_t val, uint32_t defval) -{ - printf("%-23s: 0x%08x / %8u bytes ", label, val, val); - - if (val == defval) - printf("(== OpenWrt default)\n"); - else - printf("(OpenWrt default: 0x%08x)\n", defval); -} - -static inline void inspect_fw_pmd5sum(char *label, uint8_t *val, char *text) +static inline void inspect_fw_pmd5sum(const char *label, const uint8_t *val, const char *text) { int i; @@ -599,7 +661,6 @@ static int inspect_fw(void) char *buf; struct fw_header *hdr; uint8_t md5sum[MD5SUM_LEN]; - struct board_info *board; int ret = EXIT_FAILURE; buf = malloc(inspect_info.file_size); @@ -616,18 +677,16 @@ static int inspect_fw(void) inspect_fw_pstr("File name", inspect_info.file_name); inspect_fw_phexdec("File size", inspect_info.file_size); - if (BE32_TO_HOST(hdr->version) != HEADER_VERSION_V1) { - ERR("file does not seem to have V1 header!\n"); + if ((ntohl(hdr->version) != HEADER_VERSION_V1) && + (ntohl(hdr->version) != HEADER_VERSION_V2)) { + ERR("file does not seem to have V1/V2 header!\n"); goto out_free_buf; } inspect_fw_phexdec("Version 1 Header size", sizeof(struct fw_header)); - if (BE32_TO_HOST(hdr->unk1) != 0) - inspect_fw_phexdec("Unknown value 1", hdr->unk1); - memcpy(md5sum, hdr->md5sum1, sizeof(md5sum)); - if (BE32_TO_HOST(hdr->boot_len) == 0) + if (ntohl(hdr->boot_len) == 0) memcpy(hdr->md5sum1, md5salt_normal, sizeof(md5sum)); else memcpy(hdr->md5sum1, md5salt_boot, sizeof(md5sum)); @@ -639,62 +698,41 @@ static int inspect_fw(void) } else { inspect_fw_pmd5sum("Header MD5Sum1", md5sum, "(ok)"); } - if (BE32_TO_HOST(hdr->unk2) != 0) + if (ntohl(hdr->unk2) != 0) inspect_fw_phexdec("Unknown value 2", hdr->unk2); inspect_fw_pmd5sum("Header MD5Sum2", hdr->md5sum2, "(purpose yet unknown, unchecked here)"); - if (BE32_TO_HOST(hdr->unk3) != 0) + if (ntohl(hdr->unk3) != 0) inspect_fw_phexdec("Unknown value 3", hdr->unk3); printf("\n"); inspect_fw_pstr("Vendor name", hdr->vendor_name); inspect_fw_pstr("Firmware version", hdr->fw_version); - board = find_board_by_hwid(BE32_TO_HOST(hdr->hw_id)); - if (board) { - inspect_fw_phexpost("Hardware ID", - BE32_TO_HOST(hdr->hw_id), board->id); - inspect_fw_phexexp("Hardware Revision", - BE32_TO_HOST(hdr->hw_rev), board->hw_rev); - } else { - inspect_fw_phexpost("Hardware ID", - BE32_TO_HOST(hdr->hw_id), "unknown"); - inspect_fw_phex("Hardware Revision", - BE32_TO_HOST(hdr->hw_rev)); - } + inspect_fw_phex("Hardware ID", ntohl(hdr->hw_id)); + inspect_fw_phex("Hardware Revision", ntohl(hdr->hw_rev)); + inspect_fw_phexpost("Region code", ntohl(hdr->region), get_region_country(ntohl(hdr->region))); printf("\n"); inspect_fw_phexdec("Kernel data offset", - BE32_TO_HOST(hdr->kernel_ofs)); + ntohl(hdr->kernel_ofs)); inspect_fw_phexdec("Kernel data length", - BE32_TO_HOST(hdr->kernel_len)); - if (board) { - inspect_fw_phexdef("Kernel load address", - BE32_TO_HOST(hdr->kernel_la), - board->kernel_la); - inspect_fw_phexdef("Kernel entry point", - BE32_TO_HOST(hdr->kernel_ep), - board->kernel_ep); - inspect_fw_phexdecdef("Rootfs data offset", - BE32_TO_HOST(hdr->rootfs_ofs), - board->rootfs_ofs); - } else { - inspect_fw_phex("Kernel load address", - BE32_TO_HOST(hdr->kernel_la)); - inspect_fw_phex("Kernel entry point", - BE32_TO_HOST(hdr->kernel_ep)); - inspect_fw_phexdec("Rootfs data offset", - BE32_TO_HOST(hdr->rootfs_ofs)); - } + ntohl(hdr->kernel_len)); + inspect_fw_phex("Kernel load address", + ntohl(hdr->kernel_la)); + inspect_fw_phex("Kernel entry point", + ntohl(hdr->kernel_ep)); + inspect_fw_phexdec("Rootfs data offset", + ntohl(hdr->rootfs_ofs)); inspect_fw_phexdec("Rootfs data length", - BE32_TO_HOST(hdr->rootfs_len)); + ntohl(hdr->rootfs_len)); inspect_fw_phexdec("Boot loader data offset", - BE32_TO_HOST(hdr->boot_ofs)); + ntohl(hdr->boot_ofs)); inspect_fw_phexdec("Boot loader data length", - BE32_TO_HOST(hdr->boot_len)); + ntohl(hdr->boot_len)); inspect_fw_phexdec("Total firmware length", - BE32_TO_HOST(hdr->fw_length)); + ntohl(hdr->fw_length)); if (extract) { FILE *fp; @@ -707,8 +745,8 @@ static int inspect_fw(void) printf("Extracting kernel to \"%s\"...\n", filename); fp = fopen(filename, "w"); if (fp) { - if (!fwrite(buf + BE32_TO_HOST(hdr->kernel_ofs), - BE32_TO_HOST(hdr->kernel_len), 1, fp)) { + if (!fwrite(buf + ntohl(hdr->kernel_ofs), + ntohl(hdr->kernel_len), 1, fp)) { ERR("error in fwrite(): %s", strerror(errno)); } fclose(fp); @@ -722,8 +760,8 @@ static int inspect_fw(void) printf("Extracting rootfs to \"%s\"...\n", filename); fp = fopen(filename, "w"); if (fp) { - if (!fwrite(buf + BE32_TO_HOST(hdr->rootfs_ofs), - BE32_TO_HOST(hdr->rootfs_len), 1, fp)) { + if (!fwrite(buf + ntohl(hdr->rootfs_ofs), + ntohl(hdr->rootfs_len), 1, fp)) { ERR("error in fwrite(): %s", strerror(errno)); } fclose(fp); @@ -742,32 +780,47 @@ static int inspect_fw(void) int main(int argc, char *argv[]) { int ret = EXIT_FAILURE; - int err; - - FILE *outfile; progname = basename(argv[0]); while ( 1 ) { int c; - c = getopt(argc, argv, "B:E:L:V:N:ci:k:r:R:o:xhs"); + c = getopt(argc, argv, "a:H:E:F:L:m:V:N:W:C:ci:k:r:R:o:xX:hsSjv:"); if (c == -1) break; switch (c) { - case 'B': - board_id = optarg; + case 'a': + sscanf(optarg, "0x%x", &rootfs_align); + break; + case 'H': + opt_hw_id = optarg; break; case 'E': sscanf(optarg, "0x%x", &kernel_ep); break; + case 'F': + layout_id = optarg; + break; + case 'W': + opt_hw_rev = optarg; + break; + case 'C': + country = optarg; + break; case 'L': sscanf(optarg, "0x%x", &kernel_la); break; + case 'm': + sscanf(optarg, "%u", &opt_hdr_ver); + break; case 'V': version = optarg; break; + case 'v': + fw_ver = optarg; + break; case 'N': vendor = optarg; break; @@ -789,15 +842,24 @@ 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; + case 'j': + add_jffs2_eof = 1; + break; case 'x': extract = 1; break; case 'h': usage(EXIT_SUCCESS); break; + case 'X': + sscanf(optarg, "0x%x", &reserved_space); + break; default: usage(EXIT_FAILURE); break; @@ -816,4 +878,3 @@ int main(int argc, char *argv[]) out: return ret; } -