EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix a bug which prevented imagetag from correctly initializing the version and magic2, use the broadcom default magics, which allows uploading through web interfaces

Browse Source 
SVN-Revision: 14925
This commit is contained in:
Florian Fainelli 2009-03-17 19:05:09 +00:00
parent d63a050292
commit 1c9c725184
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/firmware-utils/src/imagetag.c
View File

@ -15,8 +15,8 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <netinet/in.h> #include <netinet/in.h>
#define IMAGETAG_MAGIC1 "OpenWRT BCM963xx" #define IMAGETAG_MAGIC1 "Broadcom Corporatio"
#define IMAGETAG_MAGIC2 "V1" #define IMAGETAG_MAGIC2 "ver. 2.0"
#define IMAGETAG_VER "6" #define IMAGETAG_VER "6"
#define IMAGETAG_DEFAULT_LOADADDR 0x80010000 #define IMAGETAG_DEFAULT_LOADADDR 0x80010000
#define IMAGETAG_CRC_START 0xFFFFFFFF #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 main(int argc, char **argv)
{ {
int c; 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 flashstart, fwoffset, loadaddr, entry;
uint32_t fwaddr, flash_bs; uint32_t fwaddr, flash_bs;