#include <limits.h>
#include "fw.h"
+typedef struct fw_layout_data {
+ char name[PATH_MAX];
+ u_int32_t kern_start;
+ u_int32_t kern_entry;
+ u_int32_t firmware_max_length;
+} fw_layout_t;
+
+fw_layout_t fw_layout_data[] = {
+ {
+ .name = "XS2",
+ .kern_start = 0xbfc30000,
+ .kern_entry = 0x80041000,
+ .firmware_max_length= 0x00390000,
+ },
+ {
+ .name = "XS5",
+ .kern_start = 0xbe030000,
+ .kern_entry = 0x80041000,
+ .firmware_max_length= 0x00390000,
+ },
+ {
+ .name = "RS",
+ .kern_start = 0xbf030000,
+ .kern_entry = 0x80060000,
+ .firmware_max_length= 0x00B00000,
+ },
+ {
+ .name = "RSPRO",
+ .kern_start = 0xbf030000,
+ .kern_entry = 0x80060000,
+ .firmware_max_length= 0x00F00000,
+ },
+ {
+ .name = "LS-SR71",
+ .kern_start = 0xbf030000,
+ .kern_entry = 0x80060000,
+ .firmware_max_length= 0x00640000,
+ },
+ {
+ .name = "XS2-8",
+ .kern_start = 0xa8030000,
+ .kern_entry = 0x80041000,
+ .firmware_max_length= 0x006C0000,
+ },
+ {
+ .name = "XM",
+ .kern_start = 0x9f050000,
+ .kern_entry = 0x80002000,
+ .firmware_max_length= 0x00760000,
+ },
+ {
+ .name = "UBDEV01",
+ .kern_start = 0x9f050000,
+ .kern_entry = 0x80002000,
+ .firmware_max_length= 0x006A0000,
+ },
+ { .name = "",
+ },
+};
+
typedef struct part_data {
char partition_name[64];
int partition_index;
#define DEFAULT_OUTPUT_FILE "firmware-image.bin"
#define DEFAULT_VERSION "UNKNOWN"
-#define OPTIONS "hv:o:r:k:s:"
-
-#define FIRMWARE_MAX_LENGTH (0x390000)
-#define partition_startaddr (0xBFC30000)
-static int debug = 0;
+#define OPTIONS "B:hv:m:o:r:k:"
typedef struct image_info {
+ char magic[16];
char version[256];
char outputfile[PATH_MAX];
u_int32_t part_count;
part_data_t parts[MAX_SECTIONS];
} image_info_t;
-static void write_header(void* mem, const char* version)
+static void write_header(void* mem, const char *magic, const char* version)
{
header_t* header = mem;
memset(header, 0, sizeof(header_t));
- memcpy(header->magic, MAGIC_HEADER, MAGIC_LENGTH);
+ memcpy(header->magic, magic, MAGIC_LENGTH);
strncpy(header->version, version, sizeof(header->version));
header->crc = htonl(crc32(0L, (unsigned char *)header,
sizeof(header_t) - 2 * sizeof(u_int32_t)));
"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-m <magic>\t - firmware magic, default: %s\n"
"\t-k <kernel file>\t\t - kernel file\n"
"\t-r <rootfs file>\t\t - rootfs file\n"
+ "\t-B <board name>\t\t - choose firmware layout for specified board (XS2, XS5, RS, XM)\n"
"\t-h\t\t\t - this help\n", VERSION,
- progname, DEFAULT_VERSION, DEFAULT_OUTPUT_FILE);
+ progname, DEFAULT_VERSION, DEFAULT_OUTPUT_FILE, MAGIC_HEADER);
}
static void print_image_info(const image_info_t* im)
return (ret);
}
-static int create_image_layout(const char* kernelfile, const char* rootfsfile, image_info_t* im)
+static int create_image_layout(const char* kernelfile, const char* rootfsfile, char* board_name, image_info_t* im)
{
part_data_t* kernel = &im->parts[0];
part_data_t* rootfs = &im->parts[1];
+ fw_layout_t* p;
+
+ p = &fw_layout_data[0];
+ while (*p->name && (strcmp(p->name, board_name) != 0))
+ p++;
+ if (!*p->name) {
+ printf("BUG! Unable to find default fw layout!\n");
+ exit(-1);
+ }
+
+ printf("board = %s\n", p->name);
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;
+ kernel->partition_baseaddr = p->kern_start;
+ if ( (kernel->partition_length = filelength(kernelfile)) == (u_int32_t)-1) return (-1);
+ kernel->partition_memaddr = p->kern_entry;
+ kernel->partition_entryaddr = p->kern_entry;
strncpy(kernel->filename, kernelfile, sizeof(kernel->filename));
- if (filelength(rootfsfile) + kernel->partition_length > FIRMWARE_MAX_LENGTH)
+ if (filelength(rootfsfile) + kernel->partition_length > p->firmware_max_length)
return (-2);
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_baseaddr = kernel->partition_baseaddr + kernel->partition_length;
+ rootfs->partition_length = p->firmware_max_length - kernel->partition_length;
rootfs->partition_memaddr = 0x00000000;
rootfs->partition_entryaddr = 0x00000000;
strncpy(rootfs->filename, rootfsfile, sizeof(rootfs->filename));
+ printf("kernel: %d 0x%08x\n", kernel->partition_length, kernel->partition_baseaddr);
+ printf("root: %d 0x%08x\n", rootfs->partition_length, rootfs->partition_baseaddr);
im->part_count = 2;
return 0;
}
// write header
- write_header(mem, im->version);
+ write_header(mem, im->magic, im->version);
ptr = mem + sizeof(header_t);
// write all parts
for (i = 0; i < im->part_count; ++i)
{
char kernelfile[PATH_MAX];
char rootfsfile[PATH_MAX];
+ char board_name[PATH_MAX];
int o, rc;
image_info_t im;
memset(&im, 0, sizeof(im));
memset(kernelfile, 0, sizeof(kernelfile));
memset(rootfsfile, 0, sizeof(rootfsfile));
+ memset(board_name, 0, sizeof(board_name));
strcpy(im.outputfile, DEFAULT_OUTPUT_FILE);
strcpy(im.version, DEFAULT_VERSION);
+ strncpy(im.magic, MAGIC_HEADER, sizeof(im.magic));
while ((o = getopt(argc, argv, OPTIONS)) != -1)
{
if (optarg)
strncpy(im.outputfile, optarg, sizeof(im.outputfile));
break;
+ case 'm':
+ if (optarg)
+ strncpy(im.magic, optarg, sizeof(im.magic));
+ break;
case 'h':
usage(argv[0]);
return -1;
if (optarg)
strncpy(rootfsfile, optarg, sizeof(rootfsfile));
break;
- case 's':
+ case 'B':
if (optarg)
- #undef partition_startaddr
- #define partition_startaddr (optarg)
+ strncpy(board_name, optarg, sizeof(board_name));
break;
}
}
+ if (strlen(board_name) == 0)
+ strcpy(board_name, "XS2"); /* default to XS2 */
if (strlen(kernelfile) == 0)
{
return -2;
}
- if ((rc = create_image_layout(kernelfile, rootfsfile, &im)) != 0)
+ if ((rc = create_image_layout(kernelfile, rootfsfile, board_name, &im)) != 0)
{
ERROR("Failed creating firmware layout description - error code: %d\n", rc);
return -3;
projects / openwrt.git / blobdiff