X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/b568891277757ff8767d10da336b8446ef7fd203..b1c9efe5ed8b148c1c6f62d067860aa09c371b90:/tools/firmware-utils/src/mkzynfw.c diff --git a/tools/firmware-utils/src/mkzynfw.c b/tools/firmware-utils/src/mkzynfw.c index f8c71599d..36c176f43 100644 --- a/tools/firmware-utils/src/mkzynfw.c +++ b/tools/firmware-utils/src/mkzynfw.c @@ -1,8 +1,7 @@ /* - * $Id$ * - * Copyright (C) 2007 OpenWrt.org - * Copyright (C) 2007 Gabor Juhos + * Copyright (C) 2007-2008 OpenWrt.org + * Copyright (C) 2007-2008 Gabor Juhos * * This code was based on the information of the ZyXEL's firmware * image format written by Kolja Waschk, can be found at: @@ -95,7 +94,8 @@ struct board_info { uint32_t flash_base; /* flash base address */ uint32_t flash_size; /* board flash size */ uint32_t code_start; /* code start address */ - uint32_t fw_offs; /* offset of the firmware within the flash */ + uint32_t romio_offs; /* offset of the firmware within the flash */ + uint32_t bootext_size; /* maximum size of bootext block */ }; /* @@ -121,11 +121,15 @@ int num_blocks = 0; #define ATHEROS_FLASH_BASE 0xBFC00000 #define ATHEROS_CODE_START 0x80e00000 -#define BOARD(n, d, v, m, fb, fs, cs, fo) { \ - .name = (n), .desc=(d), \ - .vendor = (v), .model = (m), \ - .flash_base = (fb), .flash_size = (fs)<<20, \ - .code_start = (cs), .fw_offs = (fo) \ +#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), \ + .flash_base = (fb), .flash_size = (fs)<<20, \ + .code_start = (cs), .romio_offs = (fo), \ + .bootext_size = BOOTEXT_DEF_SIZE \ } #define ADMBOARD1(n, d, m, fs) BOARD(n, d, ZYNOS_VENDOR_ID_ZYXEL, m, \ @@ -140,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 @@ -164,6 +177,18 @@ static struct board_info boards[] = { ADMBOARD1("P-335U", "ZyXEL Prestige 335U", ZYNOS_MODEL_P_335U, 4), ADMBOARD1("P-335WT", "ZyXEL Prestige 335WT", ZYNOS_MODEL_P_335WT, 4), + { + .name = "P-2602HW-D1A", + .desc = "ZyXEL P-2602HW-D1A", + .vendor = ZYNOS_VENDOR_ID_ZYXEL, + .model = ZYNOS_MODEL_P_2602HW_D1A, + .flash_base = AR7_FLASH_BASE, + .flash_size = 4*1024*1024, + .code_start = 0x94008000, + .romio_offs = 0x20000, + .bootext_size = BOOTEXT_DEF_SIZE, + }, + #if 0 /* * Texas Instruments AR7 based boards @@ -193,7 +218,8 @@ static struct board_info boards[] = { .flash_base = AR7_FLASH_BASE, .flash_size = 8*1024*1024, .code_start = 0x94014000, - .fw_offs = 0x40000, + .romio_offs = 0x40000, + .bootext_size = BOOTEXT_DEF_SIZE, }, /* @@ -201,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} }; @@ -549,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); } @@ -610,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) { @@ -683,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)); @@ -690,11 +761,13 @@ write_out_image(FILE *outfile) hdr.type = OBJECT_TYPE_BOOTEXT; hdr.flags = ROMBIN_FLAG_OCSUM; + offset = board->romio_offs; + res = write_out_header(outfile, &hdr); if (res) return res; - offset = sizeof(hdr); + offset += sizeof(hdr); csum_init(&css); res = write_out_block(outfile, bootext_block, &css); @@ -702,42 +775,81 @@ write_out_image(FILE *outfile) return res; offset += bootext_block->file_size; + if (offset > (board->romio_offs + board->bootext_size)) { + ERR("bootext file '%s' is too big", bootext_block->file_name); + return -1; + } - padlen = ALIGN(offset,MMAP_ALIGN) - offset; + padlen = ALIGN(offset, MMAP_ALIGN) - offset; res = write_out_padding(outfile, padlen, 0xFF, &css); if (res) return res; offset += padlen; - mmap.addr = board->flash_base + board->fw_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); - hdr.ocsum = csum_get(&css); - for (i=0; i < num_blocks; i++) { + if ((offset - board->romio_offs) < board->bootext_size) { + padlen = board->romio_offs + board->bootext_size - offset; + res = write_out_padding(outfile, padlen, 0xFF, &css); + if (res) + return res; + offset += padlen; + + DBG(2, "bootext end at %08x", offset); + } + + for (i = 0; i < num_blocks; i++) { block = &blocks[i]; if (block->type == BLOCK_TYPE_BOOTEXT) continue; - padlen = ALIGN(offset,block->align) - offset; - res = write_out_padding(outfile, padlen, 0xFF, NULL); + padlen = ALIGN(offset, block->align) - offset; + 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; @@ -853,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++]; @@ -887,12 +999,13 @@ calc_block_offsets(int type, uint32_t *offset) continue; next_offs = ALIGN(*offset, block->align); - avail = board->flash_size - board->fw_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; @@ -921,7 +1034,7 @@ process_blocks(void) return res; } - offset = board->fw_offs + bootext_block->file_size; + offset = board->romio_offs + bootext_block->file_size; res = calc_block_offsets(BLOCK_TYPE_RAW, &offset); return res; @@ -989,7 +1102,6 @@ main(int argc, char *argv[]) goto out; } - if (process_blocks() != 0) { goto out; }