tplink-safeloader: fix alphabetical order
authorSander Vanheule <sander@svanheule.net>
Fri, 29 Apr 2022 18:19:36 +0000 (20:19 +0200)
committerSander Vanheule <sander@svanheule.net>
Fri, 29 Apr 2022 18:19:36 +0000 (20:19 +0200)
DECO-M4R-V1 was added after EAP615-WALL, but that's not how the alphabet
is sorted. Move it in between 'ARCHER' and 'EAP'.

Reported-by: Ole Kristian Lona <ole.kristian@lona.name>
Signed-off-by: Sander Vanheule <sander@svanheule.net>
src/tplink-safeloader.c

index fc46124d48fe9d3d2d33d5eae9099a0ae2cfa484..1c08a33d9fe84bcee887e568c8154adbc2d7d141 100644 (file)
@@ -1518,6 +1518,53 @@ static struct device_info boards[] = {
                .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",
@@ -1780,53 +1827,6 @@ static struct device_info boards[] = {
                .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",