X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/af97f0b8dcf1a64d2a49c41eaa4e534eff510939..e12cd3d5ae4c09dbf49d20c29cff8f2183946c73:/tools/firmware-utils/src/mkzynfw.c?ds=inline diff --git a/tools/firmware-utils/src/mkzynfw.c b/tools/firmware-utils/src/mkzynfw.c index 6beb00745..36c176f43 100644 --- a/tools/firmware-utils/src/mkzynfw.c +++ b/tools/firmware-utils/src/mkzynfw.c @@ -1,5 +1,4 @@ /* - * $Id$ * * Copyright (C) 2007-2008 OpenWrt.org * Copyright (C) 2007-2008 Gabor Juhos @@ -122,6 +121,9 @@ int num_blocks = 0; #define ATHEROS_FLASH_BASE 0xBFC00000 #define ATHEROS_CODE_START 0x80e00000 +#define AR71XX_FLASH_BASE 0xBFC00000 +#define AR71XX_CODE_START 0x81E00000 + #define BOARD(n, d, v, m, fb, fs, cs, fo) { \ .name = (n), .desc=(d), \ .vendor = (v), .model = (m), \ @@ -142,6 +144,15 @@ int num_blocks = 0; #define ATHEROSBOARD1(n, d, m, fs) BOARD(n, d, ZYNOS_VENDOR_ID_ZYXEL, m, \ ATHEROS_FLASH_BASE, fs, ATHEROS_CODE_START, 0x30000) +#define AR71XXBOARD1(n, d, m, fs) { \ + .name = (n), .desc=(d), \ + .vendor = (ZYNOS_VENDOR_ID_ZYXEL), .model = (m), \ + .flash_base = (AR71XX_FLASH_BASE), .flash_size = (fs)<<20, \ + .code_start = (AR71XX_CODE_START), .romio_offs = (0x40000), \ + .bootext_size = 0x30000 \ + } + + static struct board_info boards[] = { /* * Infineon/ADMtek ADM5120 based boards @@ -216,6 +227,11 @@ static struct board_info boards[] = { */ ATHEROSBOARD1("NBG-318S", "ZyXEL NBG-318S", ZYNOS_MODEL_NBG_318S, 4), + /* + * Atheros ar71xx based boards + */ + AR71XXBOARD1("NBG-460N", "ZyXEL NBG-460N", ZYNOS_MODEL_NBG_460N, 4), + {.name = NULL} }; @@ -564,6 +580,15 @@ write_out_header(FILE *outfile, struct zyn_rombin_hdr *hdr) t.ccsum = HOST_TO_BE16(hdr->ccsum); t.mmap_addr = HOST_TO_BE32(hdr->mmap_addr); + DBG(2, "hdr.addr = 0x%08x", hdr->addr); + DBG(2, "hdr.type = 0x%02x", hdr->type); + DBG(2, "hdr.osize = 0x%08x", hdr->osize); + DBG(2, "hdr.csize = 0x%08x", hdr->csize); + DBG(2, "hdr.flags = 0x%02x", hdr->flags); + DBG(2, "hdr.ocsum = 0x%04x", hdr->ocsum); + DBG(2, "hdr.ccsum = 0x%04x", hdr->ccsum); + DBG(2, "hdr.mmap_addr = 0x%08x", hdr->mmap_addr); + return write_out_data(outfile, (uint8_t *)&t, sizeof(t), NULL); } @@ -625,6 +650,35 @@ block_stat_file(struct fw_block *block) } +int +read_magic(uint16_t *magic) +{ + FILE *f; + int res; + + errno = 0; + f = fopen(bootext_block->file_name,"r"); + if (errno) { + ERRS("unable to open file: %s", bootext_block->file_name); + return -1; + } + + errno = 0; + fread(magic, 2, 1, f); + if (errno != 0) { + ERRS("unable to read from file: %s", bootext_block->file_name); + res = -1; + goto err; + } + + res = 0; + +err: + fclose(f); + return res; +} + + int write_out_file(FILE *outfile, char *name, size_t len, struct csum_state *css) { @@ -698,6 +752,8 @@ write_out_image(FILE *outfile) int i, res; uint32_t offset; uint32_t padlen; + uint16_t csum; + uint16_t t; /* setup header fields */ memset(&hdr, 0, sizeof(hdr)); @@ -731,19 +787,16 @@ write_out_image(FILE *outfile) offset += padlen; - mmap.addr = board->flash_base + board->romio_offs + offset; - hdr.mmap_addr = mmap.addr; + mmap.addr = board->flash_base + offset; res = write_out_mmap(outfile, &mmap, &css); if (res) return res; offset += MMAP_DATA_SIZE; - hdr.osize = offset - sizeof(hdr) - board->romio_offs; - hdr.ocsum = csum_get(&css); if ((offset - board->romio_offs) < board->bootext_size) { padlen = board->romio_offs + board->bootext_size - offset; - res = write_out_padding(outfile, padlen, 0xFF, NULL); + res = write_out_padding(outfile, padlen, 0xFF, &css); if (res) return res; offset += padlen; @@ -758,17 +811,45 @@ write_out_image(FILE *outfile) continue; padlen = ALIGN(offset, block->align) - offset; - res = write_out_padding(outfile, padlen, 0xFF, NULL); + res = write_out_padding(outfile, padlen, 0xFF, &css); if (res) return res; offset += padlen; - res = write_out_block(outfile, block, NULL); + res = write_out_block(outfile, block, &css); if (res) return res; offset += block->file_size; } + padlen = ALIGN(offset, 4) - offset; + res = write_out_padding(outfile, padlen, 0xFF, &css); + if (res) + return res; + offset += padlen; + + csum = csum_get(&css); + hdr.mmap_addr = mmap.addr; + hdr.osize = 2; + + res = read_magic(&hdr.ocsum); + if (res) + return res; + hdr.ocsum = BE16_TO_HOST(hdr.ocsum); + + if (csum <= hdr.ocsum) + t = hdr.ocsum - csum; + else + t = hdr.ocsum - csum - 1; + + DBG(2, "ocsum=%04x, csum=%04x, fix=%04x", hdr.ocsum, csum, t); + + t = HOST_TO_BE16(t); + res = write_out_data(outfile, (uint8_t *)&t, 2, NULL); + if (res) + return res; + + res = write_out_header(outfile, &hdr); return res; @@ -884,7 +965,7 @@ parse_opt_block(char ch, char *arg) } } - if(block->type == BLOCK_TYPE_BOOTEXT) + if (block->type == BLOCK_TYPE_BOOTEXT) return 0; p = argv[i++]; @@ -918,12 +999,13 @@ calc_block_offsets(int type, uint32_t *offset) continue; next_offs = ALIGN(*offset, block->align); - avail = board->flash_size - board->romio_offs - next_offs; - if (next_offs + block->file_size > avail) { + avail = board->flash_size - next_offs; + if (block->file_size > avail) { ERR("file %s is too big, offset = %u, size=%u," - " align = %u", block->file_name, + " avail = %u, align = %u", block->file_name, (unsigned)next_offs, (unsigned)block->file_size, + (unsigned)avail, (unsigned)block->align); res = -1; break;