mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-25 09:17:42 +02:00
[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
This commit is contained in:
parent
114410cc27
commit
9f0874620d
@ -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;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user