kernel: update ssb and bcma to linux-next next-20110627

[openwrt.git] / tools / firmware-utils / src / mkcsysimg.c

diff --git a/tools/firmware-utils/src/mkcsysimg.c b/tools/firmware-utils/src/mkcsysimg.c
index cf25bdb..4f2352a 100644 (file)
--- a/tools/firmware-utils/src/mkcsysimg.c
+++ b/tools/firmware-utils/src/mkcsysimg.c
@@ -1,7 +1,6 @@
 /*
 /*

- *  $Id$

  *
  *

- *  Copyright (C) 2007 Gabor Juhos <juhosg at openwrt.org>
+ *  Copyright (C) 2007-2009 Gabor Juhos <juhosg@openwrt.org>

  *
  *  This program was based on the code found in various Linux
  *  source tarballs released by Edimax for it's devices.
  *
  *  This program was based on the code found in various Linux
  *  source tarballs released by Edimax for it's devices.


@@ -182,6 +181,9 @@ static struct board_info boards[] = {
        /* Conceptronic products */
        BOARD_ADM("C54BSR4", "Conceptronic C54BSR4", 2, SIG_C54BSR4),
 
        /* Conceptronic products */
        BOARD_ADM("C54BSR4", "Conceptronic C54BSR4", 2, SIG_C54BSR4),
 

+       /* OSBRiDGE products */
+       BOARD_ADM("5GXi", "OSBDRiDGE 5GXi", 2, SIG_5GXI),
+

        {.model = NULL}
 };
 
        {.model = NULL}
 };
 


@@ -575,7 +577,7 @@ block_writeout_hdr(FILE *outfile, struct csys_block *block)
        /* setup header fields */
        memcpy(hdr.sig, block->sig, 4);
        hdr.addr = HOST_TO_LE32(block->addr);
        /* setup header fields */
        memcpy(hdr.sig, block->sig, 4);
        hdr.addr = HOST_TO_LE32(block->addr);

-       hdr.size = HOST_TO_LE32(block->align-block->size_hdr);
+       hdr.size = HOST_TO_LE32(block->size - block->size_hdr - block->size_csum);

 
        DBG(1,"writing header for block");
        res = write_out_data(outfile, (uint8_t *)&hdr, sizeof(hdr),NULL);
 
        DBG(1,"writing header for block");
        res = write_out_data(outfile, (uint8_t *)&hdr, sizeof(hdr),NULL);