diff options
| author | Florian Fainelli <florian@openwrt.org> | 2009-03-17 19:05:09 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2009-03-17 19:05:09 +0000 |
| commit | 187b0d99d150b3dcd2ab5d71be6d2500280f63a1 (patch) | |
| tree | b24105cab67e47e8e0895e1ab099f97a5e3e72eb /tools/firmware-utils/src | |
| parent | ef33a3c7f8d0eece4f93ac18f297ca269aacaaa0 (diff) | |
| download | upstream-187b0d99d150b3dcd2ab5d71be6d2500280f63a1.tar.gz upstream-187b0d99d150b3dcd2ab5d71be6d2500280f63a1.tar.bz2 upstream-187b0d99d150b3dcd2ab5d71be6d2500280f63a1.zip | |
[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
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14925 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'tools/firmware-utils/src')
| -rw-r--r-- | tools/firmware-utils/src/imagetag.c | 6 |
1 files changed, 3 insertions, 3 deletions
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; |