From: Florian Fainelli Date: Tue, 17 Mar 2009 19:05:09 +0000 (+0000) Subject: fix a bug which prevented imagetag from correctly initializing the version and magic2... X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1c9c725184317e5f47ef5f6b59afcecc16bed9f5;p=librecmc%2Flibrecmc.git fix a bug which prevented imagetag from correctly initializing the version and magic2, use the broadcom default magics, which allows uploading through web interfaces SVN-Revision: 14925 --- diff --git a/tools/firmware-utils/src/imagetag.c b/tools/firmware-utils/src/imagetag.c index b50ee2eddc..f04f662c62 100644 --- a/tools/firmware-utils/src/imagetag.c +++ b/tools/firmware-utils/src/imagetag.c @@ -15,8 +15,8 @@ #include #include -#define IMAGETAG_MAGIC1 "OpenWRT BCM963xx" -#define IMAGETAG_MAGIC2 "V1" +#define IMAGETAG_MAGIC1 "Broadcom Corporatio" +#define IMAGETAG_MAGIC2 "ver. 2.0" #define IMAGETAG_VER "6" #define IMAGETAG_DEFAULT_LOADADDR 0x80010000 #define IMAGETAG_CRC_START 0xFFFFFFFF @@ -239,7 +239,7 @@ int tagfile(const char *kernel, const char *rootfs, const char *bin, int main(int argc, char **argv) { int c; - char *kernel, *rootfs, *bin, *boardid, *chipid, *magic2, *ver; + char *kernel, *rootfs, *bin, *boardid, *chipid, *magic2 = NULL, *ver = NULL; uint32_t flashstart, fwoffset, loadaddr, entry; uint32_t fwaddr, flash_bs;