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

firmware-utils/mkmylofw: WP543 support

Browse source 
SVN-Revision: 12552
This commit is contained in:
Gabor Juhos 2008-09-08 12:39:33 +00:00
parent 5437cc1f7c
commit 90904e3704
2 changed files with 47 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
tools/firmware-utils/src/mkmylofw.c
View file

@ -1,7 +1,5 @@
/* /*
* $Id$ * Copyright (C) 2006-2008 Gabor Juhos <juhosg@openwrt.org>
*
* Copyright (C) 2006,2007 Gabor Juhos <juhosg at openwrt.org>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -72,15 +70,24 @@ struct cpx_board {
uint16_t svid; /* sub vendor id */ uint16_t svid; /* sub vendor id */
uint16_t sdid; /* sub device id */ uint16_t sdid; /* sub device id */
uint32_t flash_size; /* size of flash */ uint32_t flash_size; /* size of flash */
uint32_t part_offset; /* offset of the partition_table */
uint32_t part_size; /* size of the partition_table */
}; };
#define BOARD(_vid, _did, _svid, _sdid, _flash, _mod, _name, _desc) { \ #define BOARD(_vid, _did, _svid, _sdid, _flash, _mod, _name, _desc, _po, _ps) { \
.model = _mod, .name = _name, .desc = _desc, \ .model = _mod, .name = _name, .desc = _desc, \
.vid = _vid, .did = _did, .svid = _svid, .sdid = _sdid, \ .vid = _vid, .did = _did, .svid = _svid, .sdid = _sdid, \
.flash_size = (_flash << 20) } .flash_size = (_flash << 20), \
.part_offset = _po, .part_size = _ps }
#define CPX_BOARD(_did, _flash, _mod, _name, _desc) \ #define CPX_BOARD(_did, _flash, _mod, _name, _desc, _po, _ps) \
BOARD(VENID_COMPEX, _did, VENID_COMPEX, _did, _flash, _mod, _name, _desc) BOARD(VENID_COMPEX, _did, VENID_COMPEX, _did, _flash, _mod, _name, _desc, _po, _ps)
#define CPX_BOARD_ADM(_did, _flash, _mod, _name, _desc) \
CPX_BOARD(_did, _flash, _mod, _name, _desc, 0x10000, 0x10000)
#define CPX_BOARD_AR71XX(_did, _flash, _mod, _name, _desc) \
CPX_BOARD(_did, _flash, _mod, _name, _desc, 0x20000, 0x8000)
#define ALIGN(x,y) ((x)+((y)-1)) & ~((y)-1) #define ALIGN(x,y) ((x)+((y)-1)) & ~((y)-1)
@ -95,44 +102,48 @@ int verblevel = 0;
struct mylo_fw_header fw_header; struct mylo_fw_header fw_header;
struct mylo_partition fw_partitions[MYLO_MAX_PARTITIONS]; struct mylo_partition fw_partitions[MYLO_MAX_PARTITIONS];
struct fw_block fw_blocks[MAX_FW_BLOCKS]; struct fw_block fw_blocks[MAX_FW_BLOCKS];
struct cpx_board *board;
struct cpx_board boards[] = { struct cpx_board boards[] = {
CPX_BOARD(DEVID_COMPEX_NP18A, 4, CPX_BOARD_ADM(DEVID_COMPEX_NP18A, 4,
"NP18A", "Compex NetPassage 18A", "NP18A", "Compex NetPassage 18A",
"Dualband Wireless A+G Internet Gateway"), "Dualband Wireless A+G Internet Gateway"),
CPX_BOARD(DEVID_COMPEX_NP26G8M, 2, CPX_BOARD_ADM(DEVID_COMPEX_NP26G8M, 2,
"NP26G8M", "Compex NetPassage 26G (8M)", "NP26G8M", "Compex NetPassage 26G (8M)",
"Wireless-G Broadband Multimedia Gateway"), "Wireless-G Broadband Multimedia Gateway"),
CPX_BOARD(DEVID_COMPEX_NP26G16M, 4, CPX_BOARD_ADM(DEVID_COMPEX_NP26G16M, 4,
"NP26G16M", "Compex NetPassage 26G (16M)", "NP26G16M", "Compex NetPassage 26G (16M)",
"Wireless-G Broadband Multimedia Gateway"), "Wireless-G Broadband Multimedia Gateway"),
CPX_BOARD(DEVID_COMPEX_NP27G, 4, CPX_BOARD_ADM(DEVID_COMPEX_NP27G, 4,
"NP27G", "Compex NetPassage 27G", "NP27G", "Compex NetPassage 27G",
"Wireless-G 54Mbps eXtended Range Router"), "Wireless-G 54Mbps eXtended Range Router"),
CPX_BOARD(DEVID_COMPEX_NP28G, 4, CPX_BOARD_ADM(DEVID_COMPEX_NP28G, 4,
"NP28G", "Compex NetPassage 28G", "NP28G", "Compex NetPassage 28G",
"Wireless 108Mbps Super-G XR Multimedia Router with 4 USB Ports"), "Wireless 108Mbps Super-G XR Multimedia Router with 4 USB Ports"),
CPX_BOARD(DEVID_COMPEX_NP28GHS, 4, CPX_BOARD_ADM(DEVID_COMPEX_NP28GHS, 4,
"NP28GHS", "Compex NetPassage 28G (HotSpot)", "NP28GHS", "Compex NetPassage 28G (HotSpot)",
"HotSpot Solution"), "HotSpot Solution"),
CPX_BOARD(DEVID_COMPEX_WP18, 4, CPX_BOARD_ADM(DEVID_COMPEX_WP18, 4,
"WP18", "Compex NetPassage WP18", "WP18", "Compex NetPassage WP18",
"Wireless-G 54Mbps A+G Dualband Access Point"), "Wireless-G 54Mbps A+G Dualband Access Point"),
CPX_BOARD(DEVID_COMPEX_WP54G, 4, CPX_BOARD_ADM(DEVID_COMPEX_WP54G, 4,
"WP54G", "Compex WP54G", "WP54G", "Compex WP54G",
"Wireless-G 54Mbps XR Access Point"), "Wireless-G 54Mbps XR Access Point"),
CPX_BOARD(DEVID_COMPEX_WP54Gv1C, 2, CPX_BOARD_ADM(DEVID_COMPEX_WP54Gv1C, 2,
"WP54Gv1C", "Compex WP54G rev.1C", "WP54Gv1C", "Compex WP54G rev.1C",
"Wireless-G 54Mbps XR Access Point"), "Wireless-G 54Mbps XR Access Point"),
CPX_BOARD(DEVID_COMPEX_WP54AG, 4, CPX_BOARD_ADM(DEVID_COMPEX_WP54AG, 4,
"WP54AG", "Compex WP54AG", "WP54AG", "Compex WP54AG",
"Wireless-AG 54Mbps XR Access Point"), "Wireless-AG 54Mbps XR Access Point"),
CPX_BOARD(DEVID_COMPEX_WPP54G, 4, CPX_BOARD_ADM(DEVID_COMPEX_WPP54G, 4,
"WPP54G", "Compex WPP54G", "WPP54G", "Compex WPP54G",
"Outdoor Access Point"), "Outdoor Access Point"),
CPX_BOARD(DEVID_COMPEX_WPP54AG, 4, CPX_BOARD_ADM(DEVID_COMPEX_WPP54AG, 4,
"WPP54AG", "Compex WPP54AG", "WPP54AG", "Compex WPP54AG",
"Outdoor Access Point"), "Outdoor Access Point"),
CPX_BOARD_AR71XX(DEVID_COMPEX_WP543, 2,
"WP543", "Compex WP543",
"BareBoard"),
{.model = NULL} {.model = NULL}
}; };
@ -213,6 +224,7 @@ usage(int status)
" a: this is the active partition. The bootloader loads\n" " a: this is the active partition. The bootloader loads\n"
" the firmware from this partition.\n" " the firmware from this partition.\n"
" h: the partition data have a header.\n" " h: the partition data have a header.\n"
" l: the partition data uses LZMA compression.\n"
" p: the bootloader loads data from this partition to\n" " p: the bootloader loads data from this partition to\n"
" the RAM before decompress it.\n" " the RAM before decompress it.\n"
" -h show this screen\n" " -h show this screen\n"
@ -624,11 +636,10 @@ write_out_blocks(FILE *outfile, uint32_t *crc)
* for the partition table * for the partition table
*/ */
if (fw_num_partitions > 0) { if (fw_num_partitions > 0) {
desc.type = HOST_TO_LE32(FW_DESC_TYPE_USED); desc.type = HOST_TO_LE32(FW_DESC_TYPE_USED);
desc.addr = HOST_TO_LE32(0x10000); desc.addr = HOST_TO_LE32(board->part_offset);
desc.dlen = HOST_TO_LE32(sizeof(struct mylo_partition_table)); desc.dlen = HOST_TO_LE32(sizeof(struct mylo_partition_table));
desc.blen = HOST_TO_LE32(0x10000); desc.blen = HOST_TO_LE32(board->part_size);
if (write_out_desc(outfile, &desc, crc) != 0) if (write_out_desc(outfile, &desc, crc) != 0)
return -1; return -1;
@ -1014,6 +1025,9 @@ parse_opt_partition(char ch, char *arg)
case 'p': case 'p':
part->flags |= PARTITION_FLAG_PRELOAD; part->flags |= PARTITION_FLAG_PRELOAD;
break; break;
case 'l':
part->flags |= PARTITION_FLAG_LZMA;
break;
case 'h': case 'h':
part->flags |= PARTITION_FLAG_HAVEHDR; part->flags |= PARTITION_FLAG_HAVEHDR;
break; break;
@ -1068,8 +1082,6 @@ err_out:
int int
parse_opt_board(char ch, char *arg) parse_opt_board(char ch, char *arg)
{ {
struct cpx_board *board;
if (required_arg(ch, arg)) { if (required_arg(ch, arg)) {
goto err_out; goto err_out;
} }
@ -1189,6 +1201,11 @@ main(int argc, char *argv[])
goto out; goto out;
} }
if (!board) {
errmsg(0, "no board specified");
goto out;
}
if (flash_size == 0) { if (flash_size == 0) {
errmsg(0, "no flash size specified"); errmsg(0, "no flash size specified");
goto out; goto out;

6
tools/firmware-utils/src/myloader.h
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2006,2007 Gabor Juhos * Copyright (C) 2006-2008 Gabor Juhos <juhosg@openwrt.org>
* *
* This program is free software; you can redistribute it and/or modify it * This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the * under the terms of the GNU General Public License as published by the
@ -56,6 +56,9 @@
#define DEVID_COMPEX_WPP54AG 0x0550 #define DEVID_COMPEX_WPP54AG 0x0550
#define DEVID_COMPEX_WPP54G 0x0555 #define DEVID_COMPEX_WPP54G 0x0555
/* Devices based on the Atheros AR71xx */
#define DEVID_COMPEX_WP543 0x0640
/* Devices based on the IXP422 */ /* Devices based on the IXP422 */
#define DEVID_COMPEX_WP18 0x047E #define DEVID_COMPEX_WP18 0x047E
#define DEVID_COMPEX_NP18A 0x0489 #define DEVID_COMPEX_NP18A 0x0489
@ -108,6 +111,7 @@ struct mylo_partition {
#define PARTIIION_FLAG_RAMLOAD 0x1000 /* FIXME: load this partition into the RAM? */ #define PARTIIION_FLAG_RAMLOAD 0x1000 /* FIXME: load this partition into the RAM? */
#define PARTITION_FLAG_PRELOAD 0x0800 /* the partition data preloaded to RAM #define PARTITION_FLAG_PRELOAD 0x0800 /* the partition data preloaded to RAM
* before decompression */ * before decompression */
#define PARTITION_FLAG_LZMA 0x0100 /* the partition data compressed with LZMA */
#define PARTITION_FLAG_HAVEHDR 0x0002 /* the partition data have a header */ #define PARTITION_FLAG_HAVEHDR 0x0002 /* the partition data have a header */
#define PARTITION_TYPE_FREE 0 #define PARTITION_TYPE_FREE 0