From: Florian Fainelli <florian@openwrt.org>
Date: Tue, 17 Mar 2009 19:05:09 +0000 (+0000)
Subject: [tools] fix a bug which prevented imagetag from correctly initializing the version... 
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=2478d16e5857056d67ea545544b35e407a76b03f;hp=4ab3a6a86fe6971b2d28948d3e18f932c3e9cfd1

[tools] 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 <sys/stat.h>
 #include <netinet/in.h>
 
-#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;