firmware-utils/mkzynfw: don't use next_offset twice (closes #7273)

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

diff --git a/tools/firmware-utils/src/mkfwimage.c b/tools/firmware-utils/src/mkfwimage.c
index e726bef..ff84d83 100644 (file)
--- a/tools/firmware-utils/src/mkfwimage.c
+++ b/tools/firmware-utils/src/mkfwimage.c
@@ -55,13 +55,13 @@ fw_layout_t fw_layout_data[] = {
                .name           =       "RS",
                .kern_start     =       0xbf030000,
                .kern_entry     =       0x80060000,
                .name           =       "RS",
                .kern_start     =       0xbf030000,
                .kern_entry     =       0x80060000,

-               .firmware_max_length=   0x00640000,
+               .firmware_max_length=   0x00B00000,

        },
        {
                .name           =       "RSPRO",
                .kern_start     =       0xbf030000,
                .kern_entry     =       0x80060000,
        },
        {
                .name           =       "RSPRO",
                .kern_start     =       0xbf030000,
                .kern_entry     =       0x80060000,

-               .firmware_max_length=   0x00640000,
+               .firmware_max_length=   0x00B00000,

        },
        {
                .name           =       "LS-SR71",
        },
        {
                .name           =       "LS-SR71",


@@ -75,6 +75,12 @@ fw_layout_t fw_layout_data[] = {
                .kern_entry     =       0x80041000,
                .firmware_max_length=   0x006C0000,
        },
                .kern_entry     =       0x80041000,
                .firmware_max_length=   0x006C0000,
        },

+       {
+               .name           =       "XM",
+               .kern_start     =       0x9f050000,
+               .kern_entry     =       0x80002000,
+               .firmware_max_length=   0x006A0000,
+       },

        {       .name           =       "",
        },
 };
        {       .name           =       "",
        },
 };


@@ -179,7 +185,7 @@ static void usage(const char* progname)
             "\t-o <output file>\t - firmware output file, default: %s\n"
             "\t-k <kernel file>\t\t - kernel file\n"
             "\t-r <rootfs file>\t\t - rootfs file\n"
             "\t-o <output file>\t - firmware output file, default: %s\n"
             "\t-k <kernel file>\t\t - kernel file\n"
             "\t-r <rootfs file>\t\t - rootfs file\n"

-            "\t-B <board name>\t\t - choose firmware layout for specified board (XS2, XS5, RS)\n"
+            "\t-B <board name>\t\t - choose firmware layout for specified board (XS2, XS5, RS, XM)\n"

             "\t-h\t\t\t - this help\n", VERSION,
             progname, DEFAULT_VERSION, DEFAULT_OUTPUT_FILE);
 }
             "\t-h\t\t\t - this help\n", VERSION,
             progname, DEFAULT_VERSION, DEFAULT_OUTPUT_FILE);
 }