KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

airlink generation fix, thanks st9_

Browse source 
SVN-Revision: 6764
This commit is contained in:
Florian Fainelli 2007-03-30 21:51:48 +00:00
parent 3debff019c
commit 263d62cf19
1 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
tools/firmware-utils/src/airlink.c
View file

@ -100,7 +100,7 @@ u32 header[] = {
0x00000000, 0x00000005, 0x00000000, 0x00000000 0x00000000, 0x00000005, 0x00000000, 0x00000000
}; };
static int JFFS2 = 0; static int JFFS2 = 0x20;
int generate_image(char *kname, char *fsname, char *fname, int EHDR) int generate_image(char *kname, char *fsname, char *fname, int EHDR)
{ {
@ -108,7 +108,6 @@ int generate_image(char *kname, char *fsname, char *fname, int EHDR)
u32 lenk, lens; u32 lenk, lens;
uchar *bk, *bs; uchar *bk, *bs;
int fkd, ffd, fsd; int fkd, ffd, fsd;
int pad = 0x1f;
fkd = open(kname, O_RDONLY); fkd = open(kname, O_RDONLY);
ffd = creat(fname, 0x644); ffd = creat(fname, 0x644);
if ((fkd < 0) || (ffd < 0)) if ((fkd < 0) || (ffd < 0))
@ -135,12 +134,10 @@ int generate_image(char *kname, char *fsname, char *fname, int EHDR)
else else
write(ffd, header + 2, 0x20); write(ffd, header + 2, 0x20);
write(ffd, bk, lenk); write(ffd, bk, lenk);
if (fsname && JFFS2)
pad = 0xffff;
printf("Padding header+kernel - 0x%x + 0x%x = 0x%x\n", printf("Padding header+kernel - 0x%x + 0x%x = 0x%x\n",
lenk + 0x20, ((lenk + 0x20) | pad) + 1 - lenk - 0x20, lenk, ((lenk - 1 + JFFS2) / JFFS2) * JFFS2 - lenk,
((lenk + 0x20) | pad) + 1); ((lenk - 1 + JFFS2) / JFFS2) * JFFS2);
for (i = 0; i < ((lenk + 0x20) | pad) + 1 - lenk - 0x20; i++) for (i = 0; i < ((lenk - 1 + JFFS2) / JFFS2) * JFFS2 - lenk; i++)
write(ffd, header, 1); write(ffd, header, 1);
if (fsname) { if (fsname) {
write(ffd, bs, lens); write(ffd, bs, lens);
@ -169,13 +166,13 @@ void usage(char *prog)
printf("Usage: %s [-b 0/1] image_filename \n", prog); printf("Usage: %s [-b 0/1] image_filename \n", prog);
printf(" update checksums for firmware file\n"); printf(" update checksums for firmware file\n");
printf printf
("Usage: %s [-b 0/1] [-j] [-e] kernel filesystem image_filename \n", ("Usage: %s [-b 0/1] [-j erasesize_in_kibytes] [-e] kernel filesystem image_filename \n",
prog); prog);
printf(" generate firmware file and update checksums\n"); printf(" generate firmware file and update checksums\n");
printf("--------------------------------------------------\n"); printf("--------------------------------------------------\n");
printf(" -e - generate header for web upload\n"); printf(" -e - generate header for web upload\n");
printf(" -j - generate header for jffs2 filesystem\n");
printf(" -b 0/1 - clear/update bootloader checksum\n"); printf(" -b 0/1 - clear/update bootloader checksum\n");
printf(" -j erasesize_in_kibytes - generate header for jffs2 filesystem\n");
} }
int main(int argc, char **argv) int main(int argc, char **argv)
@ -187,7 +184,7 @@ int main(int argc, char **argv)
extern char *optarg; extern char *optarg;
extern int optind, optopt; extern int optind, optopt;
while ((c = getopt(argc, argv, "b:e:j")) != -1) { while ((c = getopt(argc, argv, "b:ej:")) != -1) {
switch (c) { switch (c) {
case 'b': case 'b':
if (optarg[0] == '1') if (optarg[0] == '1')
@ -197,7 +194,8 @@ int main(int argc, char **argv)
EHDR = 1; EHDR = 1;
break; break;
case 'j': case 'j':
JFFS2 = 1; sscanf(optarg, "%i", &JFFS2);
JFFS2 *= 1024;
break; break;
case '?': case '?':
fprintf(stderr, "\nError: unknown arg %c\n\n\n", fprintf(stderr, "\nError: unknown arg %c\n\n\n",