uint32_t size;
};
+/** Partition trailing padding definitions
+ * Values 0x00 to 0xff are reserved to indicate the padding value
+ * Values from 0x100 are reserved to indicate other behaviour */
+enum partition_trail_value {
+ PART_TRAIL_00 = 0x00,
+ PART_TRAIL_FF = 0xff,
+ PART_TRAIL_MAX = 0xff,
+ PART_TRAIL_NONE = 0x100
+};
+
/** Firmware layout description */
struct device_info {
const char *id;
const char *vendor;
const char *support_list;
- char support_trail;
+ enum partition_trail_value part_trail;
const char *soft_ver;
uint32_t soft_ver_compat_level;
struct flash_partition_entry partitions[MAX_PARTITIONS+1];
const char *last_sysupgrade_partition;
};
+struct __attribute__((__packed__)) meta_header {
+ uint32_t length;
+ uint32_t zero;
+};
+
/** The content of the soft-version structure */
struct __attribute__((__packed__)) soft_version {
- uint32_t data_len;
- uint32_t zero;
uint8_t pad1;
uint8_t version_major;
uint8_t version_minor;
uint8_t month;
uint8_t day;
uint32_t rev;
+ uint32_t compat_level;
};
"CPE220(TP-LINK|UN|N300-2):1.1\r\n"
"CPE220(TP-LINK|US|N300-2):1.1\r\n"
"CPE220(TP-LINK|EU|N300-2):1.1\r\n",
- .support_trail = '\xff',
+ .part_trail = 0xff,
.soft_ver = NULL,
.partitions = {
{"default-mac", 0x30000, 0x00020},
{"product-info", 0x31100, 0x00100},
{"signature", 0x32000, 0x00400},
- {"os-image", 0x40000, 0x300000},
- {"file-system", 0x340000, 0x470000},
+ {"firmware", 0x40000, 0x770000},
{"soft-version", 0x7b0000, 0x00100},
{"support-list", 0x7b1000, 0x00400},
{"user-config", 0x7c0000, 0x10000},
"CPE210(TP-LINK|UN|N300-2):2.0\r\n"
"CPE210(TP-LINK|EU|N300-2):2.0\r\n"
"CPE210(TP-LINK|US|N300-2):2.0\r\n",
- .support_trail = '\xff',
+ .part_trail = 0xff,
.soft_ver = NULL,
.partitions = {
"CPE210(TP-LINK|EU|N300-2|45550000):3.20\r\n"
"CPE210(TP-LINK|UN|N300-2|00000000):3.20\r\n"
"CPE210(TP-LINK|US|N300-2|55530000):3.20\r\n",
- .support_trail = '\xff',
+ .part_trail = 0xff,
.soft_ver = NULL,
.partitions = {
"CPE220(TP-LINK|UN|N300-2):2.0\r\n"
"CPE220(TP-LINK|EU|N300-2):2.0\r\n"
"CPE220(TP-LINK|US|N300-2):2.0\r\n",
- .support_trail = '\xff',
+ .part_trail = 0xff,
.soft_ver = NULL,
.partitions = {
{"default-mac", 0x30000, 0x00020},
{"product-info", 0x31100, 0x00100},
{"signature", 0x32000, 0x00400},
- {"os-image", 0x40000, 0x300000},
- {"file-system", 0x340000, 0x470000},
+ {"firmware", 0x40000, 0x770000},
{"soft-version", 0x7b0000, 0x00100},
{"support-list", 0x7b1000, 0x00400},
{"user-config", 0x7c0000, 0x10000},
"CPE220(TP-LINK|UN|N300-2):3.0\r\n"
"CPE220(TP-LINK|EU|N300-2):3.0\r\n"
"CPE220(TP-LINK|US|N300-2):3.0\r\n",
- .support_trail = '\xff',
+ .part_trail = 0xff,
.soft_ver = NULL,
.partitions = {
"CPE520(TP-LINK|UN|N300-5):1.1\r\n"
"CPE520(TP-LINK|US|N300-5):1.1\r\n"
"CPE520(TP-LINK|EU|N300-5):1.1\r\n",
- .support_trail = '\xff',
+ .part_trail = 0xff,
.soft_ver = NULL,
.partitions = {
{"default-mac", 0x30000, 0x00020},
{"product-info", 0x31100, 0x00100},
{"signature", 0x32000, 0x00400},
- {"os-image", 0x40000, 0x300000},
- {"file-system", 0x340000, 0x470000},
+ {"firmware", 0x40000, 0x770000},
{"soft-version", 0x7b0000, 0x00100},
{"support-list", 0x7b1000, 0x00400},
{"user-config", 0x7c0000, 0x10000},
"CPE510(TP-LINK|UN|N300-5):2.0\r\n"
"CPE510(TP-LINK|EU|N300-5):2.0\r\n"
"CPE510(TP-LINK|US|N300-5):2.0\r\n",
- .support_trail = '\xff',
+ .part_trail = 0xff,
.soft_ver = NULL,
.partitions = {
{"default-mac", 0x30000, 0x00020},
{"product-info", 0x31100, 0x00100},
{"signature", 0x32000, 0x00400},
- {"os-image", 0x40000, 0x300000},
- {"file-system", 0x340000, 0x470000},
+ {"firmware", 0x40000, 0x770000},
{"soft-version", 0x7b0000, 0x00100},
{"support-list", 0x7b1000, 0x00400},
{"user-config", 0x7c0000, 0x10000},
"CPE510(TP-LINK|US|N300-5|55530000):3.0\r\n"
"CPE510(TP-LINK|UN|N300-5):3.0\r\n"
"CPE510(TP-LINK|EU|N300-5):3.0\r\n"
- "CPE510(TP-LINK|US|N300-5):3.0\r\n",
- .support_trail = '\xff',
+ "CPE510(TP-LINK|US|N300-5):3.0\r\n"
+ "CPE510(TP-LINK|UN|N300-5|00000000):3.20\r\n"
+ "CPE510(TP-LINK|US|N300-5|55530000):3.20\r\n"
+ "CPE510(TP-LINK|EU|N300-5|45550000):3.20\r\n",
+ .part_trail = 0xff,
.soft_ver = NULL,
.partitions = {
{"default-mac", 0x30000, 0x00020},
{"product-info", 0x31100, 0x00100},
{"signature", 0x32000, 0x00400},
- {"os-image", 0x40000, 0x300000},
- {"file-system", 0x340000, 0x470000},
+ {"firmware", 0x40000, 0x770000},
{"soft-version", 0x7b0000, 0x00100},
{"support-list", 0x7b1000, 0x00400},
{"user-config", 0x7c0000, 0x10000},
"CPE610(TP-LINK|UN|N300-5):1.0\r\n"
"CPE610(TP-LINK|EU|N300-5):1.0\r\n"
"CPE610(TP-LINK|US|N300-5):1.0\r\n",
- .support_trail = '\xff',
+ .part_trail = 0xff,
.soft_ver = NULL,
.partitions = {
{"default-mac", 0x30000, 0x00020},
{"product-info", 0x31100, 0x00100},
{"signature", 0x32000, 0x00400},
- {"os-image", 0x40000, 0x300000},
- {"file-system", 0x340000, 0x470000},
+ {"firmware", 0x40000, 0x770000},
{"soft-version", 0x7b0000, 0x00100},
{"support-list", 0x7b1000, 0x00400},
{"user-config", 0x7c0000, 0x10000},
"CPE610(TP-LINK|UN|N300-5):2.0\r\n"
"CPE610(TP-LINK|EU|N300-5):2.0\r\n"
"CPE610(TP-LINK|US|N300-5):2.0\r\n",
- .support_trail = '\xff',
+ .part_trail = 0xff,
.soft_ver = NULL,
.partitions = {
{"default-mac", 0x30000, 0x00020},
{"product-info", 0x31100, 0x00100},
{"signature", 0x32000, 0x00400},
- {"os-image", 0x40000, 0x300000},
- {"file-system", 0x340000, 0x470000},
+ {"firmware", 0x40000, 0x770000},
{"soft-version", 0x7b0000, 0x00100},
{"support-list", 0x7b1000, 0x00400},
{"user-config", 0x7c0000, 0x10000},
"WBS210(TP-LINK|UN|N300-2):1.20\r\n"
"WBS210(TP-LINK|US|N300-2):1.20\r\n"
"WBS210(TP-LINK|EU|N300-2):1.20\r\n",
- .support_trail = '\xff',
+ .part_trail = 0xff,
.soft_ver = NULL,
.partitions = {
{"default-mac", 0x30000, 0x00020},
{"product-info", 0x31100, 0x00100},
{"signature", 0x32000, 0x00400},
- {"os-image", 0x40000, 0x300000},
- {"file-system", 0x340000, 0x470000},
+ {"firmware", 0x40000, 0x770000},
{"soft-version", 0x7b0000, 0x00100},
{"support-list", 0x7b1000, 0x00400},
{"user-config", 0x7c0000, 0x10000},
"WBS210(TP-LINK|UN|N300-2|00000000):2.0\r\n"
"WBS210(TP-LINK|US|N300-2|55530000):2.0\r\n"
"WBS210(TP-LINK|EU|N300-2|45550000):2.0\r\n",
- .support_trail = '\xff',
+ .part_trail = 0xff,
.soft_ver = NULL,
.partitions = {
{"default-mac", 0x30000, 0x00020},
{"product-info", 0x31100, 0x00100},
{"signature", 0x32000, 0x00400},
- {"os-image", 0x40000, 0x300000},
- {"file-system", 0x340000, 0x470000},
+ {"firmware", 0x40000, 0x770000},
{"soft-version", 0x7b0000, 0x00100},
{"support-list", 0x7b1000, 0x00400},
{"user-config", 0x7c0000, 0x10000},
"WBS510(TP-LINK|US|N300-5):1.20\r\n"
"WBS510(TP-LINK|EU|N300-5):1.20\r\n"
"WBS510(TP-LINK|CA|N300-5):1.20\r\n",
- .support_trail = '\xff',
+ .part_trail = 0xff,
.soft_ver = NULL,
.partitions = {
{"default-mac", 0x30000, 0x00020},
{"product-info", 0x31100, 0x00100},
{"signature", 0x32000, 0x00400},
- {"os-image", 0x40000, 0x300000},
- {"file-system", 0x340000, 0x470000},
+ {"firmware", 0x40000, 0x770000},
{"soft-version", 0x7b0000, 0x00100},
{"support-list", 0x7b1000, 0x00400},
{"user-config", 0x7c0000, 0x10000},
"WBS510(TP-LINK|US|N300-5|55530000):2.0\r\n"
"WBS510(TP-LINK|EU|N300-5|45550000):2.0\r\n"
"WBS510(TP-LINK|CA|N300-5|43410000):2.0\r\n",
- .support_trail = '\xff',
+ .part_trail = 0xff,
.soft_ver = NULL,
.partitions = {
{"default-mac", 0x30000, 0x00020},
{"product-info", 0x31100, 0x00100},
{"signature", 0x32000, 0x00400},
- {"os-image", 0x40000, 0x300000},
- {"file-system", 0x340000, 0x470000},
+ {"firmware", 0x40000, 0x770000},
{"soft-version", 0x7b0000, 0x00100},
{"support-list", 0x7b1000, 0x00400},
{"user-config", 0x7c0000, 0x10000},
.last_sysupgrade_partition = "support-list",
},
+ /** Firmware layout for the AD7200 */
+ {
+ .id = "AD7200",
+ .vendor = "",
+ .support_list =
+ "SupportList:\r\n"
+ "{product_name:AD7200,product_ver:1.0.0,special_id:00000000}\r\n",
+ .part_trail = 0x00,
+ .soft_ver = NULL,
+
+ .partitions = {
+ {"SBL1", 0x00000, 0x20000},
+ {"MIBIB", 0x20000, 0x20000},
+ {"SBL2", 0x40000, 0x20000},
+ {"SBL3", 0x60000, 0x30000},
+ {"DDRCONFIG", 0x90000, 0x10000},
+ {"SSD", 0xa0000, 0x10000},
+ {"TZ", 0xb0000, 0x30000},
+ {"RPM", 0xe0000, 0x20000},
+ {"fs-uboot", 0x100000, 0x70000},
+ {"uboot-env", 0x170000, 0x40000},
+ {"radio", 0x1b0000, 0x40000},
+ {"os-image", 0x1f0000, 0x400000},
+ {"file-system", 0x5f0000, 0x1900000},
+ {"default-mac", 0x1ef0000, 0x00200},
+ {"pin", 0x1ef0200, 0x00200},
+ {"device-id", 0x1ef0400, 0x00200},
+ {"product-info", 0x1ef0600, 0x0fa00},
+ {"partition-table", 0x1f00000, 0x10000},
+ {"soft-version", 0x1f10000, 0x10000},
+ {"support-list", 0x1f20000, 0x10000},
+ {"profile", 0x1f30000, 0x10000},
+ {"default-config", 0x1f40000, 0x10000},
+ {"user-config", 0x1f50000, 0x40000},
+ {"qos-db", 0x1f90000, 0x40000},
+ {"usb-config", 0x1fd0000, 0x10000},
+ {"log", 0x1fe0000, 0x20000},
+ {NULL, 0, 0}
+ },
+
+ .first_sysupgrade_partition = "os-image",
+ .last_sysupgrade_partition = "file-system"
+ },
+
/** Firmware layout for the C2600 */
{
.id = "C2600",
.support_list =
"SupportList:\r\n"
"{product_name:Archer C2600,product_ver:1.0.0,special_id:00000000}\r\n",
- .support_trail = '\x00',
+ .part_trail = 0x00,
.soft_ver = NULL,
/**
"{product_name:Archer A7,product_ver:5.0.0,special_id:55530000}\n"
"{product_name:Archer A7,product_ver:5.0.0,special_id:43410000}\n"
"{product_name:Archer A7,product_ver:5.0.0,special_id:4A500000}\n"
- "{product_name:Archer A7,product_ver:5.0.0,special_id:54570000}\n",
- .support_trail = '\x00',
+ "{product_name:Archer A7,product_ver:5.0.0,special_id:54570000}\n"
+ "{product_name:Archer A7,product_ver:5.0.0,special_id:52550000}\n",
+ .part_trail = 0x00,
.soft_ver = "soft_ver:1.0.0\n",
/* We're using a dynamic kernel/rootfs split here */
"{product_name:ArcherC2,product_ver:3.0.0,special_id:00000000}\n"
"{product_name:ArcherC2,product_ver:3.0.0,special_id:55530000}\n"
"{product_name:ArcherC2,product_ver:3.0.0,special_id:45550000}\n",
- .support_trail = '\x00',
+ .part_trail = 0x00,
.soft_ver = "soft_ver:3.0.1\n",
/** We're using a dynamic kernel/rootfs split here */
"{product_name:ArcherC25,product_ver:1.0.0,special_id:00000000}\n"
"{product_name:ArcherC25,product_ver:1.0.0,special_id:55530000}\n"
"{product_name:ArcherC25,product_ver:1.0.0,special_id:45550000}\n",
- .support_trail = '\x00',
+ .part_trail = 0x00,
.soft_ver = "soft_ver:1.0.0\n",
/* We're using a dynamic kernel/rootfs split here */
"{product_name:Archer C58,product_ver:1.0.0,special_id:00000000}\r\n"
"{product_name:Archer C58,product_ver:1.0.0,special_id:45550000}\r\n"
"{product_name:Archer C58,product_ver:1.0.0,special_id:55530000}\r\n",
- .support_trail = '\x00',
+ .part_trail = 0x00,
.soft_ver = "soft_ver:1.0.0\n",
.partitions = {
"{product_name:Archer C59,product_ver:1.0.0,special_id:45550000}\r\n"
"{product_name:Archer C59,product_ver:1.0.0,special_id:52550000}\r\n"
"{product_name:Archer C59,product_ver:1.0.0,special_id:55530000}\r\n",
- .support_trail = '\x00',
+ .part_trail = 0x00,
.soft_ver = "soft_ver:1.0.0\n",
/* We're using a dynamic kernel/rootfs split here */
"{product_name:Archer C59,product_ver:2.0.0,special_id:00000000}\r\n"
"{product_name:Archer C59,product_ver:2.0.0,special_id:45550000}\r\n"
"{product_name:Archer C59,product_ver:2.0.0,special_id:55530000}\r\n",
- .support_trail = '\x00',
+ .part_trail = 0x00,
.soft_ver = "soft_ver:2.0.0 Build 20161206 rel.7303\n",
/** We're using a dynamic kernel/rootfs split here */
"{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",
- .support_trail = '\x00',
+ .part_trail = 0x00,
.soft_ver = "soft_ver:1.9.1\n",
.partitions = {
"{product_name:Archer A6,product_ver:2.0.0,special_id:55530000}\n"
"{product_name:Archer A6,product_ver:2.0.0,special_id:54570000}\n"
"{product_name:Archer C6,product_ver:2.0.0,special_id:55530000}\n",
- .support_trail = '\x00',
+ .part_trail = 0x00,
.soft_ver = "soft_ver:1.9.1\n",
.partitions = {
.first_sysupgrade_partition = "os-image",
.last_sysupgrade_partition = "file-system",
},
+ /** Firmware layout for the Archer A6 v3 */
+ {
+ .id = "ARCHER-A6-V3",
+ .vendor = "",
+ .support_list =
+ "SupportList:\n"
+ "{product_name:Archer A6,product_ver:3.0.0,special_id:55530000}\n"
+ "{product_name:Archer A6,product_ver:3.0.0,special_id:54570000}\n",
+ .part_trail = 0x00,
+ .soft_ver = "soft_ver:1.0.5\n",
+
+ .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",
+ },
+ /** Firmware layout for the Archer C6U v1 */
+ {
+ .id = "ARCHER-C6U-V1",
+ .vendor = "",
+ .support_list =
+ "SupportList:\n"
+ "{product_name:Archer C6U,product_ver:1.0.0,special_id:45550000}\n",
+ .part_trail = 0x00,
+ .soft_ver = "soft_ver:1.0.2\n",
+ .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, 0x0c000},
+ {"certificate", 0xfcc000, 0x04000},
+ {"ap-config", 0xfd0000, 0x08000},
+ {"router-config", 0xfd8000, 0x08000},
+ {"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",
+ },
/** Firmware layout for the C60v1 */
{
.id = "ARCHER-C60-V1",
"{product_name:Archer C60,product_ver:1.0.0,special_id:00000000}\r\n"
"{product_name:Archer C60,product_ver:1.0.0,special_id:45550000}\r\n"
"{product_name:Archer C60,product_ver:1.0.0,special_id:55530000}\r\n",
- .support_trail = '\x00',
+ .part_trail = 0x00,
.soft_ver = "soft_ver:1.0.0\n",
.partitions = {
"{product_name:Archer C60,product_ver:2.0.0,special_id:42520000}\r\n"
"{product_name:Archer C60,product_ver:2.0.0,special_id:45550000}\r\n"
"{product_name:Archer C60,product_ver:2.0.0,special_id:55530000}\r\n",
- .support_trail = '\x00',
+ .part_trail = 0x00,
.soft_ver = "soft_ver:2.0.0\n",
.partitions = {
"{product_name:Archer C60,product_ver:3.0.0,special_id:42520000}\r\n"
"{product_name:Archer C60,product_ver:3.0.0,special_id:45550000}\r\n"
"{product_name:Archer C60,product_ver:3.0.0,special_id:55530000}\r\n",
- .support_trail = '\x00',
+ .part_trail = 0x00,
.soft_ver = "soft_ver:3.0.0\n",
.partitions = {
"{product_name:ArcherC5,product_ver:2.0.0,special_id:00000000}\r\n"
"{product_name:ArcherC5,product_ver:2.0.0,special_id:55530000}\r\n"
"{product_name:ArcherC5,product_ver:2.0.0,special_id:4A500000}\r\n", /* JP version */
- .support_trail = '\x00',
+ .part_trail = 0x00,
.soft_ver = NULL,
.partitions = {
"{product_name:Archer C7,product_ver:4.0.0,special_id:54570000}\n"
"{product_name:Archer C7,product_ver:4.0.0,special_id:55530000}\n"
"{product_name:Archer C7,product_ver:4.0.0,special_id:43410000}\n",
- .support_trail = '\x00',
+ .part_trail = 0x00,
.soft_ver = "soft_ver:1.0.0\n",
/* We're using a dynamic kernel/rootfs split here */
"{product_name:Archer C7,product_ver:5.0.0,special_id:52550000}\n"
"{product_name:Archer C7,product_ver:5.0.0,special_id:4B520000}\n",
- .support_trail = '\x00',
- .soft_ver = "soft_ver:1.0.0\n",
+ .part_trail = 0x00,
+ .soft_ver = "soft_ver:7.0.0\n",
/* We're using a dynamic kernel/rootfs split here */
.partitions = {
"{product_name:ArcherC9,"
"product_ver:1.0.0,"
"special_id:00000000}\n",
- .support_trail = '\x00',
+ .part_trail = 0x00,
.soft_ver = NULL,
.partitions = {
.support_list =
"SupportList:\r\n"
"EAP120(TP-LINK|UN|N300-2):1.0\r\n",
- .support_trail = '\xff',
+ .part_trail = 0xff,
.soft_ver = NULL,
.partitions = {
.support_list =
"SupportList:\r\n"
"EAP225-Outdoor(TP-Link|UN|AC1200-D):1.0\r\n",
- .support_trail = '\xff',
+ .part_trail = PART_TRAIL_NONE,
.soft_ver = NULL,
.soft_ver_compat_level = 1,
.support_list =
"SupportList:\r\n"
"EAP225(TP-Link|UN|AC1350-D):3.0\r\n",
- .support_trail = '\xff',
+ .part_trail = PART_TRAIL_NONE,
.soft_ver = NULL,
.soft_ver_compat_level = 1,
.support_list =
"SupportList:\r\n"
"EAP225-Wall(TP-Link|UN|AC1200-D):2.0\r\n",
- .support_trail = '\xff',
+ .part_trail = PART_TRAIL_NONE,
.soft_ver = NULL,
.soft_ver_compat_level = 1,
.last_sysupgrade_partition = "file-system"
},
+ /** Firmware layout for the EAP235-Wall v1 */
+ {
+ .id = "EAP235-WALL-V1",
+ .support_list =
+ "SupportList:\r\n"
+ "EAP235-Wall(TP-Link|UN|AC1200-D):1.0\r\n",
+ .part_trail = PART_TRAIL_NONE,
+ .soft_ver = NULL,
+ .soft_ver_compat_level = 1,
+
+ .partitions = {
+ {"fs-uboot", 0x00000, 0x80000},
+ {"partition-table", 0x80000, 0x02000},
+ {"default-mac", 0x90000, 0x01000},
+ {"support-list", 0x91000, 0x00100},
+ {"product-info", 0x91100, 0x00400},
+ {"soft-version", 0x92000, 0x00100},
+ {"firmware", 0xa0000, 0xd20000},
+ {"user-config", 0xdc0000, 0x30000},
+ {"mutil-log", 0xf30000, 0x80000},
+ {"oops", 0xfb0000, 0x40000},
+ {"radio", 0xff0000, 0x10000},
+ {NULL, 0, 0}
+ },
+
+ .first_sysupgrade_partition = "os-image",
+ .last_sysupgrade_partition = "file-system"
+ },
+
/** Firmware layout for the EAP245 v1 */
{
.id = "EAP245-V1",
.support_list =
"SupportList:\r\n"
"EAP245(TP-LINK|UN|AC1750-D):1.0\r\n",
- .support_trail = '\xff',
+ .part_trail = PART_TRAIL_NONE,
.soft_ver = NULL,
.partitions = {
.support_list =
"SupportList:\r\n"
"EAP245(TP-Link|UN|AC1750-D):3.0\r\n",
- .support_trail = '\xff',
+ .part_trail = PART_TRAIL_NONE,
.soft_ver = NULL,
.soft_ver_compat_level = 1,
"{product_name:TL-WA850RE,product_ver:2.0.0,special_id:43410000}\n"
"{product_name:TL-WA850RE,product_ver:2.0.0,special_id:41550000}\n"
"{product_name:TL-WA850RE,product_ver:2.0.0,special_id:52550000}\n",
- .support_trail = '\x00',
+ .part_trail = 0x00,
.soft_ver = NULL,
/**
"{product_name:TL-WA855RE,product_ver:1.0.0,special_id:43410000}\n"
"{product_name:TL-WA855RE,product_ver:1.0.0,special_id:41550000}\n"
"{product_name:TL-WA855RE,product_ver:1.0.0,special_id:52550000}\n",
- .support_trail = '\x00',
+ .part_trail = 0x00,
.soft_ver = NULL,
.partitions = {
.support_list =
"SupportList:\n"
"{product_name:TL-WPA8630P,product_ver:2.0.0,special_id:45550000}\n",
- .support_trail = '\x00',
+ .part_trail = 0x00,
.soft_ver = NULL,
.partitions = {
"{product_name:TL-WPA8630P,product_ver:2.0.0,special_id:41550000}\n"
"{product_name:TL-WPA8630P,product_ver:2.0.0,special_id:44450000}\n"
"{product_name:TL-WPA8630P,product_ver:2.1.0,special_id:41550000}\n",
- .support_trail = '\x00',
+ .part_trail = 0x00,
.soft_ver = NULL,
.partitions = {
.support_list =
"SupportList:\n"
"{product_name:TL-WPA8630P,product_ver:2.1.0,special_id:45550000}\n",
- .support_trail = '\x00',
+ .part_trail = 0x00,
.soft_ver = NULL,
.partitions = {
"SupportList:\n"
"{product_name:TL-WR1043N,product_ver:5.0.0,special_id:45550000}\n"
"{product_name:TL-WR1043N,product_ver:5.0.0,special_id:55530000}\n",
- .support_trail = '\x00',
+ .part_trail = 0x00,
.soft_ver = "soft_ver:1.0.0\n",
.partitions = {
{"factory-boot", 0x00000, 0x20000},
.support_list =
"SupportList:\n"
"{product_name:TL-WR1043ND,product_ver:4.0.0,special_id:45550000}\n",
- .support_trail = '\x00',
+ .part_trail = 0x00,
.soft_ver = NULL,
/* We're using a dynamic kernel/rootfs split here */
"SupportList:\n"
"{product_name:TL-WR902AC,product_ver:1.0.0,special_id:45550000}\n"
"{product_name:TL-WR902AC,product_ver:1.0.0,special_id:55530000}\n",
- .support_trail = '\x00',
+ .part_trail = 0x00,
.soft_ver = NULL,
/**
"SupportList:\r\n"
"{product_name:TL-WR942N,product_ver:1.0.0,special_id:00000000}\r\n"
"{product_name:TL-WR942N,product_ver:1.0.0,special_id:52550000}\r\n",
- .support_trail = '\x00',
+ .part_trail = 0x00,
.soft_ver = NULL,
.partitions = {
"{product_name:RE200,product_ver:2.0.0,special_id:52550000}\n"
"{product_name:RE200,product_ver:2.0.0,special_id:54570000}\n"
"{product_name:RE200,product_ver:2.0.0,special_id:55530000}\n",
- .support_trail = '\x00',
+ .part_trail = 0x00,
.soft_ver = NULL,
.partitions = {
"{product_name:RE200,product_ver:3.0.0,special_id:52550000}\n"
"{product_name:RE200,product_ver:3.0.0,special_id:54570000}\n"
"{product_name:RE200,product_ver:3.0.0,special_id:55530000}\n",
- .support_trail = '\x00',
+ .part_trail = 0x00,
.soft_ver = NULL,
.partitions = {
"{product_name:RE200,product_ver:4.0.0,special_id:45530000}\n"
"{product_name:RE200,product_ver:4.0.0,special_id:49440000}\n"
"{product_name:RE200,product_ver:4.0.0,special_id:45470000}\n",
- .support_trail = '\x00',
+ .part_trail = 0x00,
.soft_ver = "soft_ver:1.1.0\n",
.partitions = {
"{product_name:RE220,product_ver:2.0.0,special_id:52550000}\n"
"{product_name:RE220,product_ver:2.0.0,special_id:54570000}\n"
"{product_name:RE220,product_ver:2.0.0,special_id:55530000}\n",
- .support_trail = '\x00',
+ .part_trail = 0x00,
.soft_ver = NULL,
.partitions = {
"{product_name:RE305,product_ver:1.0.0,special_id:4b520000}\n"
"{product_name:RE305,product_ver:1.0.0,special_id:41550000}\n"
"{product_name:RE305,product_ver:1.0.0,special_id:43410000}\n",
- .support_trail = '\x00',
+ .part_trail = 0x00,
.soft_ver = NULL,
.partitions = {
"{product_name:RE350,product_ver:1.0.0,special_id:43410000}\n"
"{product_name:RE350,product_ver:1.0.0,special_id:4b520000}\n"
"{product_name:RE350,product_ver:1.0.0,special_id:4a500000}\n",
- .support_trail = '\x00',
+ .part_trail = 0x00,
.soft_ver = NULL,
/** We're using a dynamic kernel/rootfs split here */
.support_list =
"SupportList:\n"
"{product_name:RE350K,product_ver:1.0.0,special_id:00000000,product_region:US}\n",
- .support_trail = '\x00',
+ .part_trail = 0x00,
.soft_ver = NULL,
/** We're using a dynamic kernel/rootfs split here */
"{product_name:RE355,product_ver:1.0.0,special_id:41550000}\r\n"
"{product_name:RE355,product_ver:1.0.0,special_id:4B520000}\r\n"
"{product_name:RE355,product_ver:1.0.0,special_id:55534100}\r\n",
- .support_trail = '\x00',
+ .part_trail = 0x00,
.soft_ver = NULL,
/* We're using a dynamic kernel/rootfs split here */
"{product_name:RE450,product_ver:1.0.0,special_id:41550000}\r\n"
"{product_name:RE450,product_ver:1.0.0,special_id:4B520000}\r\n"
"{product_name:RE450,product_ver:1.0.0,special_id:55534100}\r\n",
- .support_trail = '\x00',
+ .part_trail = 0x00,
.soft_ver = NULL,
/** We're using a dynamic kernel/rootfs split here */
"{product_name:RE450,product_ver:2.0.0,special_id:41530000}\r\n"
"{product_name:RE450,product_ver:2.0.0,special_id:4B520000}\r\n"
"{product_name:RE450,product_ver:2.0.0,special_id:42520000}\r\n",
- .support_trail = '\x00',
+ .part_trail = 0x00,
.soft_ver = NULL,
/* We're using a dynamic kernel/rootfs split here */
"{product_name:RE450,product_ver:3.0.0,special_id:41530000}\r\n"
"{product_name:RE450,product_ver:3.0.0,special_id:4B520000}\r\n"
"{product_name:RE450,product_ver:3.0.0,special_id:42520000}\r\n",
- .support_trail = '\x00',
+ .part_trail = 0x00,
.soft_ver = NULL,
/* We're using a dynamic kernel/rootfs split here */
"{product_name:RE500,product_ver:1.0.0,special_id:43410000}\r\n"
"{product_name:RE500,product_ver:1.0.0,special_id:41550000}\r\n"
"{product_name:RE500,product_ver:1.0.0,special_id:41530000}\r\n",
- .support_trail = '\x00',
+ .part_trail = 0x00,
.soft_ver = NULL,
/* We're using a dynamic kernel/rootfs split here */
"{product_name:RE650,product_ver:1.0.0,special_id:43410000}\r\n"
"{product_name:RE650,product_ver:1.0.0,special_id:41550000}\r\n"
"{product_name:RE650,product_ver:1.0.0,special_id:41530000}\r\n",
- .support_trail = '\x00',
+ .part_trail = 0x00,
.soft_ver = NULL,
/* We're using a dynamic kernel/rootfs split here */
buf[3] = val;
}
+static inline bool meta_partition_should_pad(enum partition_trail_value pv)
+{
+ return (pv >= 0) && (pv <= PART_TRAIL_MAX);
+}
+
+/** Allocate a padded meta partition with a correctly initialised header
+ * If the `data` pointer is NULL, then the required space is only allocated,
+ * otherwise `data_len` bytes will be copied from `data` into the partition
+ * entry. */
+static struct image_partition_entry init_meta_partition_entry(
+ const char *name, const void *data, uint32_t data_len,
+ enum partition_trail_value pad_value)
+{
+ uint32_t total_len = sizeof(struct meta_header) + data_len;
+ if (meta_partition_should_pad(pad_value))
+ total_len += 1;
+
+ struct image_partition_entry entry = {
+ .name = name,
+ .size = total_len,
+ .data = malloc(total_len)
+ };
+ if (!entry.data)
+ error(1, errno, "failed to allocate meta partition entry");
+
+ struct meta_header *header = (struct meta_header *)entry.data;
+ header->length = htonl(data_len);
+ header->zero = 0;
+
+ if (data)
+ memcpy(entry.data+sizeof(*header), data, data_len);
+
+ if (meta_partition_should_pad(pad_value))
+ entry.data[total_len - 1] = (uint8_t) pad_value;
+
+ return entry;
+}
+
/** Allocates a new image partition */
static struct image_partition_entry alloc_image_partition(const char *name, size_t len) {
struct image_partition_entry entry = {name, len, malloc(len)};
/** Generates the soft-version partition */
-static struct image_partition_entry make_soft_version(struct device_info *info, uint32_t rev) {
- size_t part_len = sizeof(struct soft_version);
- if (info->soft_ver_compat_level > 0)
- part_len += sizeof(uint32_t);
-
- struct image_partition_entry entry =
- alloc_image_partition("soft-version", part_len+1);
- struct soft_version *s = (struct soft_version *)entry.data;
+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) {
+ uint32_t len = strlen(info->soft_ver) + 1;
+ return init_meta_partition_entry("soft-version",
+ info->soft_ver, len, info->part_trail);
+ }
time_t t;
struct tm *tm = gmtime(&t);
- /* Partition contents size, minus 8 byte header and trailing byte */
- s->data_len = htonl(entry.size-9);
- s->zero = 0;
- s->pad1 = 0xff;
-
- s->version_major = 0;
- s->version_minor = 0;
- s->version_patch = 0;
-
- s->year_hi = bcd((1900+tm->tm_year)/100);
- s->year_lo = bcd(tm->tm_year%100);
- s->month = bcd(tm->tm_mon+1);
- s->day = bcd(tm->tm_mday);
- s->rev = htonl(rev);
-
- if (info->soft_ver_compat_level > 0)
- *(uint32_t *)(entry.data + sizeof(struct soft_version)) =
- htonl(info->soft_ver_compat_level);
-
- entry.data[entry.size-1] = 0xff;
-
- return entry;
-}
+ struct soft_version s = {
+ .pad1 = 0xff,
-static struct image_partition_entry make_soft_version_from_string(const char *soft_ver) {
- /** String length _including_ the terminating zero byte */
- uint32_t ver_len = strlen(soft_ver) + 1;
- /** Partition contains 64 bit header, the version string, and one additional null byte */
- size_t partition_len = 2*sizeof(uint32_t) + ver_len + 1;
- struct image_partition_entry entry = alloc_image_partition("soft-version", partition_len);
+ .version_major = 0,
+ .version_minor = 0,
+ .version_patch = 0,
- uint32_t *len = (uint32_t *)entry.data;
- len[0] = htonl(ver_len);
- len[1] = 0;
- memcpy(&len[2], soft_ver, ver_len);
+ .year_hi = bcd((1900+tm->tm_year)/100),
+ .year_lo = bcd(tm->tm_year%100),
+ .month = bcd(tm->tm_mon+1),
+ .day = bcd(tm->tm_mday),
- entry.data[partition_len - 1] = 0;
+ .compat_level = htonl(info->soft_ver_compat_level)
+ };
- return entry;
+ if (info->soft_ver_compat_level == 0)
+ return init_meta_partition_entry("soft-version", &s,
+ (uint8_t *)(&s.compat_level) - (uint8_t *)(&s),
+ info->part_trail);
+ else
+ return init_meta_partition_entry("soft-version", &s,
+ sizeof(s), info->part_trail);
}
/** Generates the support-list partition */
-static struct image_partition_entry make_support_list(struct device_info *info) {
- size_t len = strlen(info->support_list);
- struct image_partition_entry entry = alloc_image_partition("support-list", len + 9);
-
- put32(entry.data, len);
- memset(entry.data+4, 0, 4);
- memcpy(entry.data+8, info->support_list, len);
- entry.data[len+8] = info->support_trail;
+static struct image_partition_entry make_support_list(
+ const struct device_info *info)
+{
+ uint32_t len = strlen(info->support_list);
+ return init_meta_partition_entry("support-list", info->support_list,
+ len, info->part_trail);
+}
- return entry;
+/** Partition with extra-para data */
+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,
+ info->part_trail);
}
/** Creates a new image partition with an arbitrary name from a file */
return entry;
}
-/** Creates a new image partition from arbitrary data */
-static struct image_partition_entry put_data(const char *part_name, const char *datain, size_t len) {
-
- struct image_partition_entry entry = alloc_image_partition(part_name, len);
-
- memcpy(entry.data, datain, len);
-
- return entry;
-}
-
/**
Copies a list of image partitions into an image buffer and generates the image partition table while doing so
}
parts[0] = make_partition_table(info->partitions);
- if (info->soft_ver)
- parts[1] = make_soft_version_from_string(info->soft_ver);
- else
- parts[1] = make_soft_version(info, rev);
-
+ 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);
/* Some devices need the extra-para partition to accept the firmware */
- if (strcasecmp(info->id, "ARCHER-C2-V3") == 0 ||
+ if (strcasecmp(info->id, "ARCHER-A6-V3") == 0 ||
+ strcasecmp(info->id, "ARCHER-A7-V5") == 0 ||
+ strcasecmp(info->id, "ARCHER-C2-V3") == 0 ||
+ strcasecmp(info->id, "ARCHER-C7-V4") == 0 ||
+ strcasecmp(info->id, "ARCHER-C7-V5") == 0 ||
strcasecmp(info->id, "ARCHER-C25-V1") == 0 ||
strcasecmp(info->id, "ARCHER-C59-V2") == 0 ||
strcasecmp(info->id, "ARCHER-C60-V2") == 0 ||
strcasecmp(info->id, "ARCHER-C60-V3") == 0 ||
+ strcasecmp(info->id, "ARCHER-C6U-V1") == 0 ||
strcasecmp(info->id, "TLWR1043NV5") == 0) {
- const char mdat[11] = {0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00};
- parts[5] = put_data("extra-para", mdat, 11);
- } else if (strcasecmp(info->id, "ARCHER-A7-V5") == 0 || strcasecmp(info->id, "ARCHER-C7-V4") == 0 || strcasecmp(info->id, "ARCHER-C7-V5") == 0) {
- const char mdat[11] = {0x01, 0x00, 0x00, 0x02, 0x00, 0x00, 0xca, 0x00, 0x01, 0x00, 0x00};
- parts[5] = put_data("extra-para", mdat, 11);
+ const uint8_t extra_para[2] = {0x01, 0x00};
+ parts[5] = make_extra_para(info, extra_para,
+ sizeof(extra_para));
} else if (strcasecmp(info->id, "ARCHER-C6-V2") == 0) {
- const char mdat[11] = {0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00};
- parts[5] = put_data("extra-para", mdat, 11);
- } else if (strcasecmp(info->id, "ARCHER-C6-V2-US") == 0) {
- const char mdat[11] = {0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00};
- parts[5] = put_data("extra-para", mdat, 11);
- } else if (strcasecmp(info->id, "EAP245-V3") == 0) {
- const char mdat[10] = {0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01};
- parts[5] = put_data("extra-para", mdat, 10);
+ const uint8_t extra_para[2] = {0x00, 0x01};
+ parts[5] = make_extra_para(info, extra_para,
+ sizeof(extra_para));
+ } else if (strcasecmp(info->id, "ARCHER-C6-V2-US") == 0 ||
+ strcasecmp(info->id, "EAP245-V3") == 0) {
+ const uint8_t extra_para[2] = {0x01, 0x01};
+ parts[5] = make_extra_para(info, extra_para,
+ sizeof(extra_para));
}
size_t len;
projects / openwrt / openwrt.git / blobdiff