/** A flash partition table entry */
struct flash_partition_entry {
- char *name;
+ const char *name;
uint32_t base;
uint32_t size;
};
+/** Flash partition names table entry */
+struct factory_partition_names {
+ const char *partition_table;
+ const char *soft_ver;
+ const char *os_image;
+ const char *support_list;
+ const char *file_system;
+ const char *extra_para;
+};
+
/** Partition trailing padding definitions
* Values 0x00 to 0xff are reserved to indicate the padding value
* Values from 0x100 are reserved to indicate other behaviour */
struct flash_partition_entry partitions[MAX_PARTITIONS+1];
const char *first_sysupgrade_partition;
const char *last_sysupgrade_partition;
+ struct factory_partition_names partition_names;
};
#define SOFT_VER_TEXT(_t) {.type = SOFT_VER_TYPE_TEXT, .text = _t}
.vendor = "",
.support_list =
"SupportList:\r\n"
+ "{product_name:Archer A6,product_ver:2.0.0,special_id:45550000}\r\n"
"{product_name:Archer C6,product_ver:2.0.0,special_id:45550000}\r\n"
"{product_name:Archer C6,product_ver:2.0.0,special_id:52550000}\r\n"
"{product_name:Archer C6,product_ver:2.0.0,special_id:4A500000}\r\n",
.last_sysupgrade_partition = "file-system"
},
+ /** Firmware layout for the Deco M4R v1 and v2 */
+ {
+ .id = "DECO-M4R-V1",
+ .vendor = "",
+ .support_list =
+ "SupportList:\n"
+ "{product_name:M4R,product_ver:1.0.0,special_id:55530000}\n"
+ "{product_name:M4R,product_ver:1.0.0,special_id:45550000}\n"
+ "{product_name:M4R,product_ver:1.0.0,special_id:43410000}\n"
+ "{product_name:M4R,product_ver:1.0.0,special_id:4A500000}\n"
+ "{product_name:M4R,product_ver:1.0.0,special_id:41550000}\n"
+ "{product_name:M4R,product_ver:1.0.0,special_id:4B520000}\n"
+ "{product_name:M4R,product_ver:1.0.0,special_id:49440000}\n"
+ "{product_name:M4R,product_ver:2.0.0,special_id:55530000}\n"
+ "{product_name:M4R,product_ver:2.0.0,special_id:45550000}\n"
+ "{product_name:M4R,product_ver:2.0.0,special_id:43410000}\n"
+ "{product_name:M4R,product_ver:2.0.0,special_id:4A500000}\n"
+ "{product_name:M4R,product_ver:2.0.0,special_id:41550000}\n"
+ "{product_name:M4R,product_ver:2.0.0,special_id:4B520000}\n"
+ "{product_name:M4R,product_ver:2.0.0,special_id:54570000}\n"
+ "{product_name:M4R,product_ver:2.0.0,special_id:42340000}\n"
+ "{product_name:M4R,product_ver:2.0.0,special_id:49440000}\n",
+ .part_trail = 0x00,
+ .soft_ver = SOFT_VER_DEFAULT,
+
+ .partitions = {
+ {"fs-uboot", 0x00000, 0x80000},
+ {"firmware", 0x80000, 0xe00000},
+ {"product-info", 0xe80000, 0x05000},
+ {"default-mac", 0xe85000, 0x01000},
+ {"device-id", 0xe86000, 0x01000},
+ {"support-list", 0xe87000, 0x10000},
+ {"user-config", 0xea7000, 0x10000},
+ {"device-config", 0xeb7000, 0x10000},
+ {"group-info", 0xec7000, 0x10000},
+ {"partition-table", 0xed7000, 0x02000},
+ {"soft-version", 0xed9000, 0x10000},
+ {"profile", 0xee9000, 0x10000},
+ {"default-config", 0xef9000, 0x10000},
+ {"url-sig", 0xfe0000, 0x10000},
+ {"radio", 0xff0000, 0x10000},
+ {NULL, 0, 0}
+ },
+ .first_sysupgrade_partition = "os-image",
+ .last_sysupgrade_partition = "file-system",
+ },
+
/** Firmware layout for the EAP120 */
{
.id = "EAP120",
.last_sysupgrade_partition = "file-system"
},
- /** Firmware layout for the EAP225 v3 */
+ /** Firmware layout for the EAP225 v3
+ * Also compatible with:
+ * - EAP225 v3.20
+ * - EAP225 v4
+ * - EAP225-Outdoor v1
+ * - EAP225-Outdoor v3
+ * */
{
.id = "EAP225-V3",
.support_list =
"SupportList:\r\n"
- "EAP225(TP-Link|UN|AC1350-D):3.0\r\n",
+ "EAP225(TP-Link|UN|AC1350-D):3.0\r\n"
+ "EAP225(TP-Link|UN|AC1350-D):3.20\r\n"
+ "EAP225(TP-Link|UN|AC1350-D):4.0\r\n"
+ "EAP225(TP-Link|UN|AC1350-D):4.0 CA\r\n"
+ "EAP225-Outdoor(TP-Link|UN|AC1350-D):1.0\r\n"
+ "EAP225-Outdoor(TP-Link|UN|AC1350-D):3.0\r\n"
+ "EAP225-Outdoor(TP-Link|UN|AC1350-D):3.0 CA,JP\r\n",
.part_trail = PART_TRAIL_NONE,
.soft_ver = SOFT_VER_DEFAULT,
.soft_ver_compat_level = 1,
.last_sysupgrade_partition = "file-system"
},
- /** Firmware layout for the Deco M4R v1 and v2 */
- {
- .id = "DECO-M4R-V1",
- .vendor = "",
- .support_list =
- "SupportList:\n"
- "{product_name:M4R,product_ver:1.0.0,special_id:55530000}\n"
- "{product_name:M4R,product_ver:1.0.0,special_id:45550000}\n"
- "{product_name:M4R,product_ver:1.0.0,special_id:43410000}\n"
- "{product_name:M4R,product_ver:1.0.0,special_id:4A500000}\n"
- "{product_name:M4R,product_ver:1.0.0,special_id:41550000}\n"
- "{product_name:M4R,product_ver:1.0.0,special_id:4B520000}\n"
- "{product_name:M4R,product_ver:1.0.0,special_id:49440000}\n"
- "{product_name:M4R,product_ver:2.0.0,special_id:55530000}\n"
- "{product_name:M4R,product_ver:2.0.0,special_id:45550000}\n"
- "{product_name:M4R,product_ver:2.0.0,special_id:43410000}\n"
- "{product_name:M4R,product_ver:2.0.0,special_id:4A500000}\n"
- "{product_name:M4R,product_ver:2.0.0,special_id:41550000}\n"
- "{product_name:M4R,product_ver:2.0.0,special_id:4B520000}\n"
- "{product_name:M4R,product_ver:2.0.0,special_id:54570000}\n"
- "{product_name:M4R,product_ver:2.0.0,special_id:42340000}\n"
- "{product_name:M4R,product_ver:2.0.0,special_id:49440000}\n",
- .part_trail = 0x00,
- .soft_ver = SOFT_VER_DEFAULT,
-
- .partitions = {
- {"fs-uboot", 0x00000, 0x80000},
- {"firmware", 0x80000, 0xe00000},
- {"product-info", 0xe80000, 0x05000},
- {"default-mac", 0xe85000, 0x01000},
- {"device-id", 0xe86000, 0x01000},
- {"support-list", 0xe87000, 0x10000},
- {"user-config", 0xea7000, 0x10000},
- {"device-config", 0xeb7000, 0x10000},
- {"group-info", 0xec7000, 0x10000},
- {"partition-table", 0xed7000, 0x02000},
- {"soft-version", 0xed9000, 0x10000},
- {"profile", 0xee9000, 0x10000},
- {"default-config", 0xef9000, 0x10000},
- {"url-sig", 0xfe0000, 0x10000},
- {"radio", 0xff0000, 0x10000},
- {NULL, 0, 0}
- },
- .first_sysupgrade_partition = "os-image",
- .last_sysupgrade_partition = "file-system",
- },
-
/** Firmware layout for the TL-WA1201 v2 */
{
.id = "TL-WA1201-V2",
.last_sysupgrade_partition = "file-system"
},
+ /** Firmware layout for the Mercusys MR70X */
+ {
+ .id = "MR70X",
+ .vendor = "",
+ .support_list =
+ "SupportList:\n"
+ "{product_name:MR70X,product_ver:1.0.0,special_id:45550000}\n"
+ "{product_name:MR70X,product_ver:1.0.0,special_id:4A500000}\n"
+ "{product_name:MR70X,product_ver:1.0.0,special_id:55530000}\n",
+ .part_trail = 0x00,
+ .soft_ver = SOFT_VER_DEFAULT,
+
+ .partitions = {
+ {"fs-uboot", 0x00000, 0x40000},
+ {"firmware", 0x40000, 0xf60000},
+ {"default-mac", 0xfa0000, 0x00200},
+ {"pin", 0xfa0200, 0x00100},
+ {"device-id", 0xfa0300, 0x00100},
+ {"product-info", 0xfa0400, 0x0fc00},
+ {"default-config", 0xfb0000, 0x08000},
+ {"ap-def-config", 0xfb8000, 0x08000},
+ {"user-config", 0xfc0000, 0x0a000},
+ {"ag-config", 0xfca000, 0x04000},
+ {"certificate", 0xfce000, 0x02000},
+ {"ap-config", 0xfd0000, 0x06000},
+ {"router-config", 0xfd6000, 0x06000},
+ {"favicon", 0xfdc000, 0x02000},
+ {"logo", 0xfde000, 0x02000},
+ {"partition-table", 0xfe0000, 0x00800},
+ {"soft-version", 0xfe0800, 0x00100},
+ {"support-list", 0xfe0900, 0x00200},
+ {"profile", 0xfe0b00, 0x03000},
+ {"extra-para", 0xfe3b00, 0x00100},
+ {"radio", 0xff0000, 0x10000},
+ {NULL, 0, 0}
+ },
+
+ .first_sysupgrade_partition = "os-image",
+ .last_sysupgrade_partition = "file-system"
+ },
{}
};
return entry;
}
+/** Sets up default partition names whenever custom names aren't specified */
+static void set_partition_names(struct device_info *info)
+{
+ if (!info->partition_names.partition_table)
+ info->partition_names.partition_table = "partition-table";
+ if (!info->partition_names.soft_ver)
+ info->partition_names.soft_ver = "soft-version";
+ if (!info->partition_names.os_image)
+ info->partition_names.os_image = "os-image";
+ if (!info->partition_names.support_list)
+ info->partition_names.support_list = "support-list";
+ if (!info->partition_names.file_system)
+ info->partition_names.file_system = "file-system";
+ if (!info->partition_names.extra_para)
+ info->partition_names.extra_para = "extra-para";
+}
+
/** Frees an image partition */
static void free_image_partition(struct image_partition_entry entry) {
free(entry.data);
}
/** Generates the partition-table partition */
-static struct image_partition_entry make_partition_table(const struct flash_partition_entry *p) {
- struct image_partition_entry entry = alloc_image_partition("partition-table", 0x800);
+static struct image_partition_entry make_partition_table(const struct device_info *p)
+{
+ struct image_partition_entry entry = alloc_image_partition(p->partition_names.partition_table, 0x800);
char *s = (char *)entry.data, *end = (char *)(s+entry.size);
*(s++) = 0x00;
size_t i;
- for (i = 0; p[i].name; i++) {
+ for (i = 0; p->partitions[i].name; i++) {
size_t len = end-s;
- size_t w = snprintf(s, len, "partition %s base 0x%05x size 0x%05x\n", p[i].name, p[i].base, p[i].size);
+ size_t w = snprintf(s, len, "partition %s base 0x%05x size 0x%05x\n",
+ p->partitions[i].name, p->partitions[i].base, p->partitions[i].size);
if (w > len-1)
error(1, 0, "flash partition table overflow?");
/** Generates the soft-version partition */
-static struct image_partition_entry make_soft_version(
- const struct device_info *info, uint32_t rev)
+static struct image_partition_entry make_soft_version(const struct device_info *info, uint32_t rev)
{
/** If an info string is provided, use this instead of
* the structured data, and include the null-termination */
if (info->soft_ver.type == SOFT_VER_TYPE_TEXT) {
uint32_t len = strlen(info->soft_ver.text) + 1;
- return init_meta_partition_entry("soft-version",
+ return init_meta_partition_entry(info->partition_names.soft_ver,
info->soft_ver.text, len, info->part_trail);
}
};
if (info->soft_ver_compat_level == 0)
- return init_meta_partition_entry("soft-version", &s,
+ return init_meta_partition_entry(info->partition_names.soft_ver, &s,
(uint8_t *)(&s.compat_level) - (uint8_t *)(&s),
info->part_trail);
else
- return init_meta_partition_entry("soft-version", &s,
+ return init_meta_partition_entry(info->partition_names.soft_ver, &s,
sizeof(s), info->part_trail);
}
const struct device_info *info)
{
uint32_t len = strlen(info->support_list);
- return init_meta_partition_entry("support-list", info->support_list,
+ return init_meta_partition_entry(info->partition_names.support_list, info->support_list,
len, info->part_trail);
}
static struct image_partition_entry make_extra_para(
const struct device_info *info, const uint8_t *extra_para, size_t len)
{
- return init_meta_partition_entry("extra-para", extra_para, len,
+ return init_meta_partition_entry(info->partition_names.extra_para, extra_para, len,
info->part_trail);
}
struct flash_partition_entry *file_system_partition = NULL;
size_t firmware_partition_index = 0;
+ set_partition_names(info);
+
for (i = 0; info->partitions[i].name; i++) {
if (!strcmp(info->partitions[i].name, "firmware"))
{
for (i = MAX_PARTITIONS-1; i >= firmware_partition_index + 1; i--)
info->partitions[i+1] = info->partitions[i];
- file_system_partition->name = "file-system";
+ file_system_partition->name = info->partition_names.file_system;
+
file_system_partition->base = firmware_partition->base + kernel.st_size;
/* Align partition start to erase blocks for factory images only */
file_system_partition->size = firmware_partition->size - file_system_partition->base;
- os_image_partition->name = "os-image";
+ os_image_partition->name = info->partition_names.os_image;
+
os_image_partition->size = kernel.st_size;
}
- parts[0] = make_partition_table(info->partitions);
+ parts[0] = make_partition_table(info);
parts[1] = make_soft_version(info, rev);
parts[2] = make_support_list(info);
- parts[3] = read_file("os-image", kernel_image, false, NULL);
- parts[4] = read_file("file-system", rootfs_image, add_jffs2_eof, file_system_partition);
+ parts[3] = read_file(info->partition_names.os_image, kernel_image, false, NULL);
+ parts[4] = read_file(info->partition_names.file_system, rootfs_image, add_jffs2_eof, file_system_partition);
+
/* Some devices need the extra-para partition to accept the firmware */
if (strcasecmp(info->id, "ARCHER-A6-V3") == 0 ||
strcasecmp(info->id, "ARCHER-C60-V3") == 0 ||
strcasecmp(info->id, "ARCHER-C6U-V1") == 0 ||
strcasecmp(info->id, "ARCHER-C6-V3") == 0 ||
+ strcasecmp(info->id, "MR70X") == 0 ||
strcasecmp(info->id, "TLWR1043NV5") == 0) {
const uint8_t extra_para[2] = {0x01, 0x00};
parts[5] = make_extra_para(info, extra_para,
char buf[128];
size_t length;
size_t bytes;
+ size_t max_length = sizeof(buf) - 1;
if (fseek(fp, 0x1014 + e->base + sizeof(struct meta_header), SEEK_SET))
error(1, errno, "Can not seek in the firmware");
printf("\n[Support list]\n");
for (length = e->size - sizeof(struct meta_header); length; length -= bytes) {
- bytes = fread(buf, 1, length > sizeof(buf) ? sizeof(buf) : length, fp);
+ bytes = fread(buf, 1, length > max_length ? max_length: length, fp);
if (bytes <= 0)
error(1, errno, "Can not read fwup-ptn data from the firmware");
- puts(buf);
+ buf[bytes] = '\0';
+ printf(buf);
}
+ printf("\n");
}
e = find_partition(pointers, MAX_PARTITIONS, "partition-table", NULL);
projects / project / firmware-utils.git / blobdiff