/*
- * Copyright (C) 2006,2007 Gabor Juhos
+ * $Id$
*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
+ * Copyright (C) 2006,2007 Gabor Juhos <juhosg at openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*
*/
#define CPX_BOARD(_did, _flash, _mod, _name, _desc) \
BOARD(VENID_COMPEX, _did, VENID_COMPEX, _did, _flash, _mod, _name, _desc)
+#define ALIGN(x,y) ((x)+((y)-1)) & ~((y)-1)
+
char *progname;
char *ofname = NULL;
get_crc(uint8_t *p, uint32_t len)
{
uint32_t crc;
-
+
crc = 0;
update_crc(p ,len , &crc);
return crc;
{
char *err = NULL;
uint32_t t;
-
+
errno=0;
t = strtoul(arg, &err, 0);
if (errno || (err==arg) || ((err != NULL) && *err)) {
if (errno || (err==arg) || ((err != NULL) && *err) || (t >= 0x10000)) {
return -1;
}
-
+
*val = t & 0xFFFF;
return 0;
}
board = NULL;
for (tmp = boards; tmp->model != NULL; tmp++){
- if (strcmp(model, tmp->model) == 0) {
+ if (strcasecmp(model, tmp->model) == 0) {
board = tmp;
break;
}
uint32_t readlen = sizeof(buf);
int res = -1;
size_t len;
-
+
if ((ff->flags & BLOCK_FLAG_HAVEHDR) == 0) {
res = 0;
goto out;
}
-
+
errno = 0;
f = fopen(ff->name,"r");
if (errno) {
errmsg(1,"unable to open file %s", ff->name);
goto out;
}
-
+
ff->crc = 0;
len = ff->size;
while (len > 0) {
}
res = 0;
-
+
out_close:
fclose(f);
out:
}
-inline int
+int
write_out_desc(FILE *outfile, struct mylo_fw_blockdesc *desc, uint32_t *crc)
{
return write_out_data(outfile, (uint8_t *)desc,
}
+int
+write_out_padding(FILE *outfile, size_t len, uint8_t padc, uint32_t *crc)
+{
+ uint8_t buff[512];
+ size_t buflen = sizeof(buff);
+
+ memset(buff, padc, buflen);
+
+ while (len > 0) {
+ if (len < buflen)
+ buflen = len;
+
+ if (write_out_data(outfile, buff, buflen, crc))
+ return -1;
+
+ len -= buflen;
+ }
+
+ return 0;
+}
+
+
int
write_out_file(FILE *outfile, struct fw_block *block, uint32_t *crc)
{
size_t len;
errno = 0;
-
+
if (block->name == NULL) {
return 0;
}
-
+
if ((block->flags & BLOCK_FLAG_HAVEHDR) != 0) {
struct mylo_partition_header ph;
-
+
if (get_file_crc(block) != 0)
return -1;
-
+
ph.crc = HOST_TO_LE32(block->crc);
ph.len = HOST_TO_LE32(block->size);
-
+
if (write_out_data(outfile, (uint8_t *)&ph, sizeof(ph), crc) != 0)
return -1;
}
-
+
f = fopen(block->name,"r");
if (errno) {
errmsg(1,"unable to open file: %s", block->name);
if (len < buflen)
buflen = len;
- // read data from source file
+ /* read data from source file */
errno = 0;
fread(buff, buflen, 1, f);
if (errno != 0) {
if (write_out_data(outfile, buff, buflen, crc) != 0)
return -1;
-
+
len -= buflen;
}
fclose(f);
-
+
+ /* align next block on a 4 byte boundary */
+ len = ALIGN(len,4) - block->size;
+ if (write_out_padding(outfile, len, 0xFF, crc))
+ return -1;
+
dbgmsg(1,"file %s written out", block->name);
return 0;
}
{
struct mylo_fw_blockdesc desc;
struct fw_block *b;
+ uint32_t dlen;
int i;
/*
*/
for (i = 0; i < fw_num_blocks; i++) {
b = &fw_blocks[i];
+
+ /* detect block size */
+ dlen = b->size;
+ if ((b->flags & BLOCK_FLAG_HAVEHDR) != 0) {
+ dlen += sizeof(struct mylo_partition_header);
+ }
+
+ /* round up to 4 bytes */
+ dlen = ALIGN(dlen, 4);
+
+ /* setup the descriptor */
desc.type = HOST_TO_LE32(FW_DESC_TYPE_USED);
desc.addr = HOST_TO_LE32(b->addr);
+ desc.dlen = HOST_TO_LE32(dlen);
desc.blen = HOST_TO_LE32(b->blocklen);
- if ((b->flags & BLOCK_FLAG_HAVEHDR) != 0) {
- desc.dlen = HOST_TO_LE32(b->size +
- sizeof(struct mylo_partition_header));
- } else {
- desc.dlen = HOST_TO_LE32(b->size);
- }
+
if (write_out_desc(outfile, &desc, crc) != 0)
return -1;
}
errmsg(0,"option %c requires an argument\n", c);
return -1;
}
-
+
return 0;
}
errmsg(0,"invalid firmware flags: %s", arg);
goto err_out;
}
-
+
dbgmsg(1, "firmware flags set to %X bytes", fw_header.flags);
return 0;
errmsg(0,"invalid flash size: %s", arg);
goto err_out;
}
-
+
dbgmsg(1, "flash size set to %d bytes", flash_size);
return 0;
errmsg(0,"invalid block length: %s", p);
goto err_out;
}
-
+
if (argc < 3) {
dbgmsg(1,"empty block %s", arg);
goto success;
}
-
+
/* processing flags */
p = argv[2];
if (is_empty_arg(p) == 0) {
errmsg(0,"file name missing in %s", arg);
goto err_out;
}
-
+
b->name = strdup(p);
if (b->name == NULL) {
errmsg(0,"not enough memory");
goto err_out;
}
-
+
success:
return 0;
-
+
err_out:
return -1;
}
errmsg(0, "too many partitions specified");
goto err_out;
}
-
+
part = &fw_partitions[fw_num_partitions++];
argc = parse_arg(arg, buf, argv);
p = argv[4];
if (is_empty_arg(p) == 0) {
struct fw_block *b;
-
+
if (fw_num_blocks == MAX_FW_BLOCKS) {
errmsg(0,"too many blocks specified", p);
goto err_out;
parse_opt_board(char ch, char *arg)
{
struct cpx_board *board;
-
+
if (required_arg(ch, arg)) {
goto err_out;
}
-
+
board = find_board(arg);
if (board == NULL){
errmsg(0,"invalid/unknown board specified: %s", arg);
goto err_out;
}
-
+
fw_header.vid = board->vid;
fw_header.did = board->did;
fw_header.svid = board->svid;
fw_header.sdid = board->sdid;
-
+
flash_size = board->flash_size;
return 0;
-
+
err_out:
return -1;
}
FILE *outfile;
uint32_t crc;
-
+
progname=basename(argv[0]);
-
+
memset(&fw_header, 0, sizeof(fw_header));
-
+
/* init header defaults */
fw_header.vid = VENID_COMPEX;
fw_header.did = DEVID_COMPEX_WP54G;
goto out;
}
}
-
+
if (optind == argc) {
errmsg(0, "no output file specified");
goto out;
}
ofname = argv[optind++];
-
+
if (optind < argc) {
errmsg(0, "invalid option: %s", argv[optind]);
goto out;
}
-
+
if (flash_size == 0) {
errmsg(0, "no flash size specified");
goto out;
}
-
+
if (process_files() != 0) {
goto out;
}
if (write_out_header(outfile, &crc) != 0)
goto out_flush;
-
+
if (write_out_blocks(outfile, &crc) != 0)
goto out_flush;
projects / openwrt.git / blobdiff