Use mkfwimage from athero.openwrt.net with modification for XS2 devices. Add back in ubiquiti image generation.
SVN-Revision: 11920
This commit is contained in:
Travis Kemen
parent
0425daa86d
commit
14622d5a08
2 changed files with 80 additions and 73 deletions
|
|
@ -22,6 +22,16 @@ endef
|
|||
define Image/Build
|
||||
$(call Image/Build/$(1))
|
||||
dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/openwrt-$(BOARD)-root.$(1) bs=128k conv=sync
|
||||
|
||||
$(STAGING_DIR_HOST)/bin/mkfwimage -k $(BIN_DIR)/openwrt-$(BOARD)-vmlinux.lzma \
|
||||
-r $(BIN_DIR)/openwrt-$(BOARD)-root.$(1) \
|
||||
-v XS2.ar2316.OpenWRT \
|
||||
-o $(BIN_DIR)/openwrt-$(BOARD)-ubnt2-$(1).bin
|
||||
$(STAGING_DIR_HOST)/bin/mkfwimage -k $(BIN_DIR)/openwrt-$(BOARD)-vmlinux.lzma \
|
||||
-r $(BIN_DIR)/openwrt-$(BOARD)-root.$(1) \
|
||||
-v XS5.ar2313.OpenWRT \
|
||||
-o $(BIN_DIR)/openwrt-$(BOARD)-ubnt5-$(1).bin \
|
||||
-s 0xBE030000
|
||||
endef
|
||||
|
||||
$(eval $(call BuildImage))
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
/*
|
||||
* Copyright (C) 2007 Ubiquiti Networks, Inc.
|
||||
* Copyright (C) 2008 Lukas Kuna <ValXdater@seznam.cz>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License as
|
||||
|
|
@ -27,14 +28,14 @@
|
|||
#include <netinet/in.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <limits.h>
|
||||
|
||||
#include <linux/limits.h>
|
||||
#include "fw.h"
|
||||
|
||||
typedef struct part_data {
|
||||
char partition_name[64];
|
||||
int partition_index;
|
||||
u_int32_t partition_baseaddr;
|
||||
u_int32_t partition_startaddr;
|
||||
u_int32_t partition_memaddr;
|
||||
u_int32_t partition_entryaddr;
|
||||
u_int32_t partition_length;
|
||||
|
|
@ -47,8 +48,10 @@ typedef struct part_data {
|
|||
#define DEFAULT_OUTPUT_FILE "firmware-image.bin"
|
||||
#define DEFAULT_VERSION "UNKNOWN"
|
||||
|
||||
#define OPTIONS "hv:o:i:"
|
||||
#define OPTIONS "hv:o:r:k:"
|
||||
|
||||
#define FIRMWARE_MAX_LENGTH (0x390000)
|
||||
#define partition_startaddr (0xBFC30000)
|
||||
static int debug = 0;
|
||||
|
||||
typedef struct image_info {
|
||||
|
|
@ -128,7 +131,8 @@ static void usage(const char* progname)
|
|||
"Usage: %s [options]\n"
|
||||
"\t-v <version string>\t - firmware version information, default: %s\n"
|
||||
"\t-o <output file>\t - firmware output file, default: %s\n"
|
||||
"\t-i <input file>\t\t - firmware layout file, default: none\n"
|
||||
"\t-k <kernel file>\t\t - kernel file\n"
|
||||
"\t-r <rootfs file>\t\t - rootfs file\n"
|
||||
"\t-h\t\t\t - this help\n", VERSION,
|
||||
progname, DEFAULT_VERSION, DEFAULT_OUTPUT_FILE);
|
||||
}
|
||||
|
|
@ -154,70 +158,46 @@ static void print_image_info(const image_info_t* im)
|
|||
|
||||
|
||||
|
||||
/**
|
||||
* Image layout file format:
|
||||
*
|
||||
* <partition name>\t<partition index>\t<partition size>\t<data file name>
|
||||
*
|
||||
*/
|
||||
static int parse_image_layout(const char* layoutfile, image_info_t* im)
|
||||
static u_int32_t filelength(const char* file)
|
||||
{
|
||||
int fd = 0;
|
||||
char line[1028];
|
||||
FILE* f;
|
||||
FILE *p;
|
||||
int ret = -1;
|
||||
|
||||
im->part_count = 0;
|
||||
if ( (p = fopen(file, "rb") ) == NULL) return (-1);
|
||||
|
||||
fd = open(layoutfile, O_RDONLY);
|
||||
if (fd < 0) {
|
||||
ERROR("Could not open file '%s'\n", layoutfile);
|
||||
return -1;
|
||||
fseek(p, 0, SEEK_END);
|
||||
ret = ftell(p);
|
||||
|
||||
fclose (p);
|
||||
|
||||
return (ret);
|
||||
}
|
||||
|
||||
f = fdopen(fd, "r");
|
||||
if (f == NULL) {
|
||||
close(fd);
|
||||
return -2;
|
||||
}
|
||||
|
||||
while (!feof(f))
|
||||
static int create_image_layout(const char* kernelfile, const char* rootfsfile, image_info_t* im)
|
||||
{
|
||||
char name[32];
|
||||
u_int32_t index;
|
||||
u_int32_t baseaddr;
|
||||
u_int32_t size;
|
||||
u_int32_t memaddr;
|
||||
u_int32_t entryaddr;
|
||||
char file[PATH_MAX];
|
||||
u_int32_t c;
|
||||
part_data_t* d;
|
||||
part_data_t* kernel = &im->parts[0];
|
||||
part_data_t* rootfs = &im->parts[1];
|
||||
|
||||
if (fgets(line, sizeof(line), f) == NULL)
|
||||
break;
|
||||
strcpy(kernel->partition_name, "kernel");
|
||||
kernel->partition_index = 1;
|
||||
kernel->partition_baseaddr = partition_startaddr;
|
||||
if ( (kernel->partition_length = filelength(kernelfile)) < 0) return (-1);
|
||||
kernel->partition_memaddr = 0x80041000;
|
||||
kernel->partition_entryaddr = 0x80041000;
|
||||
strncpy(kernel->filename, kernelfile, sizeof(kernel->filename));
|
||||
|
||||
// TODO: very inconvenient format, use smarter parsing someday
|
||||
if ((c = sscanf(line, "%32[^\t]\t%X\t%X\t%X\t%X\t%X\t%128[^\t\n]", name, &index, &baseaddr, &size, &memaddr, &entryaddr, file)) != 7)
|
||||
continue;
|
||||
if (filelength(rootfsfile) + kernel->partition_length > FIRMWARE_MAX_LENGTH)
|
||||
return (-2);
|
||||
|
||||
DEBUG("%s\t\t0x%02X\t0x%08X\t0x%08X\t0x%08X\t0x%08X\t%s\n", name, index, baseaddr, size, memaddr, entryaddr, file);
|
||||
strcpy(rootfs->partition_name, "rootfs");
|
||||
rootfs->partition_index = 2;
|
||||
rootfs->partition_baseaddr = partition_startaddr + kernel->partition_length;
|
||||
rootfs->partition_length = FIRMWARE_MAX_LENGTH - kernel->partition_length;
|
||||
rootfs->partition_memaddr = 0x00000000;
|
||||
rootfs->partition_entryaddr = 0x00000000;
|
||||
strncpy(rootfs->filename, rootfsfile, sizeof(rootfs->filename));
|
||||
|
||||
c = im->part_count;
|
||||
if (c == MAX_SECTIONS)
|
||||
break;
|
||||
|
||||
d = &im->parts[c];
|
||||
strncpy(d->partition_name, name, sizeof(d->partition_name));
|
||||
d->partition_index = index;
|
||||
d->partition_baseaddr = baseaddr;
|
||||
d->partition_length = size;
|
||||
d->partition_memaddr = memaddr;
|
||||
d->partition_entryaddr = entryaddr;
|
||||
strncpy(d->filename, file, sizeof(d->filename));
|
||||
|
||||
im->part_count++;
|
||||
}
|
||||
|
||||
fclose(f);
|
||||
im->part_count = 2;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -331,12 +311,14 @@ static int build_image(image_info_t* im)
|
|||
|
||||
int main(int argc, char* argv[])
|
||||
{
|
||||
char inputfile[PATH_MAX];
|
||||
char kernelfile[PATH_MAX];
|
||||
char rootfsfile[PATH_MAX];
|
||||
int o, rc;
|
||||
image_info_t im;
|
||||
|
||||
memset(&im, 0, sizeof(im));
|
||||
memset(inputfile, 0, sizeof(inputfile));
|
||||
memset(kernelfile, 0, sizeof(kernelfile));
|
||||
memset(rootfsfile, 0, sizeof(rootfsfile));
|
||||
|
||||
strcpy(im.outputfile, DEFAULT_OUTPUT_FILE);
|
||||
strcpy(im.version, DEFAULT_VERSION);
|
||||
|
|
@ -352,27 +334,42 @@ int main(int argc, char* argv[])
|
|||
if (optarg)
|
||||
strncpy(im.outputfile, optarg, sizeof(im.outputfile));
|
||||
break;
|
||||
case 'i':
|
||||
if (optarg)
|
||||
strncpy(inputfile, optarg, sizeof(inputfile));
|
||||
break;
|
||||
case 'h':
|
||||
usage(argv[0]);
|
||||
return -1;
|
||||
case 'k':
|
||||
if (optarg)
|
||||
strncpy(kernelfile, optarg, sizeof(kernelfile));
|
||||
break;
|
||||
case 'r':
|
||||
if (optarg)
|
||||
strncpy(rootfsfile, optarg, sizeof(rootfsfile));
|
||||
break;
|
||||
case 's':
|
||||
if (optarg)
|
||||
#undef partition_startaddr
|
||||
#define partition_startaddr (optarg)
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (strlen(inputfile) == 0)
|
||||
if (strlen(kernelfile) == 0)
|
||||
{
|
||||
ERROR("Input file is not specified, cannot continue\n");
|
||||
ERROR("Kernel file is not specified, cannot continue\n");
|
||||
usage(argv[0]);
|
||||
return -2;
|
||||
}
|
||||
|
||||
if ((rc = parse_image_layout(inputfile, &im)) != 0)
|
||||
if (strlen(rootfsfile) == 0)
|
||||
{
|
||||
ERROR("Failed parsing firmware layout file '%s' - error code: %d\n",
|
||||
inputfile, rc);
|
||||
ERROR("Root FS file is not specified, cannot continue\n");
|
||||
usage(argv[0]);
|
||||
return -2;
|
||||
}
|
||||
|
||||
if ((rc = create_image_layout(kernelfile, rootfsfile, &im)) != 0)
|
||||
{
|
||||
ERROR("Failed creating firmware layout description - error code: %d\n", rc);
|
||||
return -3;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue