From: Moritz Warning <moritzwarning@web.de>
Date: Sun, 24 May 2020 21:46:04 +0000 (+0200)
Subject: update example database for snapshot
X-Git-Tag: v2.2.1~19
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a5606dd8473c9a64eebae6efbafeb97a60c8c6d5;p=web%2Ffirmware-selector-openwrt-org.git

update example database for snapshot
---

diff --git a/misc/names-SNAPSHOT.json b/misc/names-SNAPSHOT.json
index c65e63e..27aa659 100644
--- a/misc/names-SNAPSHOT.json
+++ b/misc/names-SNAPSHOT.json
@@ -10,16 +10,6 @@
       ],
       "target": "lantiq/xway"
     },
-    "7Links PX-4885 4M": {
-      "id": "7links_px-4885-4m",
-      "images": [
-        {
-          "name": "openwrt-ramips-rt305x-7links_px-4885-4m-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        }
-      ],
-      "target": "ramips/rt305x"
-    },
     "7Links PX-4885 8M": {
       "id": "7links_px-4885-8m",
       "images": [
@@ -50,6 +40,16 @@
       ],
       "target": "ath79/generic"
     },
+    "8devices Habanero DVK": {
+      "id": "8dev_habanero-dvk",
+      "images": [
+        {
+          "name": "openwrt-ipq40xx-generic-8dev_habanero-dvk-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
+        }
+      ],
+      "target": "ipq40xx/generic"
+    },
     "8devices Jalapeno": {
       "id": "8dev_jalapeno",
       "images": [
@@ -64,53 +64,53 @@
       ],
       "target": "ipq40xx/generic"
     },
-    "A5-V11": {
-      "id": "unbranded_a5-v11",
+    "ADB P.DG A4001N": {
+      "id": "adb_a4001n",
       "images": [
         {
-          "name": "openwrt-ramips-rt305x-unbranded_a5-v11-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
-        {
-          "name": "openwrt-ramips-rt305x-unbranded_a5-v11-squashfs-factory.bin",
-          "type": "factory"
+          "name": "openwrt-bcm63xx-smp-adb_a4001n-squashfs-cfe.bin",
+          "type": "cfe"
         }
       ],
-      "target": "ramips/rt305x"
+      "target": "bcm63xx/smp"
     },
-    "ADB P.DG A4001N": {
-      "id": "A4001N",
+    "ADB P.DG A4001N A-000-1A1-AX": {
+      "id": "adb_pdg-a4001n-a-000-1a1-ax",
       "images": [
         {
-          "name": "openwrt-brcm63xx-smp-A4001N-squashfs-cfe.bin",
+          "name": "openwrt-bcm63xx-smp-adb_pdg-a4001n-a-000-1a1-ax-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
+        },
+        {
+          "name": "openwrt-bcm63xx-smp-adb_pdg-a4001n-a-000-1a1-ax-squashfs-cfe.bin",
           "type": "cfe"
         }
       ],
-      "target": "brcm63xx/smp"
+      "target": "bcm63xx/smp"
     },
     "ADB P.DG A4001N1": {
-      "id": "A4001N1",
+      "id": "adb_a4001n1",
       "images": [
         {
-          "name": "openwrt-brcm63xx-smp-A4001N1-squashfs-cfe.bin",
+          "name": "openwrt-bcm63xx-smp-adb_a4001n1-squashfs-cfe.bin",
           "type": "cfe"
         },
         {
-          "name": "openwrt-brcm63xx-smp-A4001N1-squashfs-sysupgrade.bin",
+          "name": "openwrt-bcm63xx-smp-adb_a4001n1-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
         }
       ],
-      "target": "brcm63xx/smp"
+      "target": "bcm63xx/smp"
     },
     "ADB P.DG AV4202N": {
-      "id": "AV4202N",
+      "id": "adb_av4202n",
       "images": [
         {
-          "name": "openwrt-brcm63xx-smp-AV4202N-squashfs-cfe.bin",
+          "name": "openwrt-bcm63xx-smp-adb_av4202n-squashfs-cfe.bin",
           "type": "cfe"
         }
       ],
-      "target": "brcm63xx/smp"
+      "target": "bcm63xx/smp"
     },
     "ADSLR G7": {
       "id": "adslr_g7",
@@ -240,11 +240,11 @@
       "id": "asus-rt-ac53u",
       "images": [
         {
-          "name": "openwrt-brcm47xx-mips74k-asus-rt-ac53u-squashfs.trx",
+          "name": "openwrt-bcm47xx-mips74k-asus-rt-ac53u-squashfs.trx",
           "type": "trx"
         }
       ],
-      "target": "brcm47xx/mips74k"
+      "target": "bcm47xx/mips74k"
     },
     "ASUS RT-AC56U": {
       "id": "asus-rt-ac56u",
@@ -279,13 +279,13 @@
     "ASUS RT-AC65P": {
       "id": "asus_rt-ac65p",
       "images": [
-        {
-          "name": "openwrt-ramips-mt7621-asus_rt-ac65p-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-ramips-mt7621-asus_rt-ac65p-squashfs-factory.bin",
           "type": "factory"
+        },
+        {
+          "name": "openwrt-ramips-mt7621-asus_rt-ac65p-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ramips/mt7621"
@@ -303,13 +303,13 @@
     "ASUS RT-AC85P": {
       "id": "asus_rt-ac85p",
       "images": [
-        {
-          "name": "openwrt-ramips-mt7621-asus_rt-ac85p-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-ramips-mt7621-asus_rt-ac85p-squashfs-factory.bin",
           "type": "factory"
+        },
+        {
+          "name": "openwrt-ramips-mt7621-asus_rt-ac85p-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ramips/mt7621"
@@ -328,131 +328,131 @@
       "id": "asus-rt-n10",
       "images": [
         {
-          "name": "openwrt-brcm47xx-mips74k-asus-rt-n10-squashfs.trx",
+          "name": "openwrt-bcm47xx-mips74k-asus-rt-n10-squashfs.trx",
           "type": "trx"
         }
       ],
-      "target": "brcm47xx/mips74k"
+      "target": "bcm47xx/mips74k"
     },
     "ASUS RT-N10P v1": {
       "id": "asus-rt-n10p",
       "images": [
         {
-          "name": "openwrt-brcm47xx-mips74k-asus-rt-n10p-squashfs.trx",
+          "name": "openwrt-bcm47xx-mips74k-asus-rt-n10p-squashfs.trx",
           "type": "trx"
         }
       ],
-      "target": "brcm47xx/mips74k"
+      "target": "bcm47xx/mips74k"
     },
     "ASUS RT-N10P v2": {
       "id": "asus-rt-n10p-v2",
       "images": [
         {
-          "name": "openwrt-brcm47xx-mips74k-asus-rt-n10p-v2-squashfs.trx",
+          "name": "openwrt-bcm47xx-mips74k-asus-rt-n10p-v2-squashfs.trx",
           "type": "trx"
         }
       ],
-      "target": "brcm47xx/mips74k"
+      "target": "bcm47xx/mips74k"
     },
     "ASUS RT-N10U A": {
       "id": "asus-rt-n10u",
       "images": [
         {
-          "name": "openwrt-brcm47xx-mips74k-asus-rt-n10u-squashfs.trx",
+          "name": "openwrt-bcm47xx-mips74k-asus-rt-n10u-squashfs.trx",
           "type": "trx"
         }
       ],
-      "target": "brcm47xx/mips74k"
+      "target": "bcm47xx/mips74k"
     },
     "ASUS RT-N10U B": {
       "id": "asus-rt-n10u-b",
       "images": [
         {
-          "name": "openwrt-brcm47xx-mips74k-asus-rt-n10u-b-squashfs.trx",
+          "name": "openwrt-bcm47xx-mips74k-asus-rt-n10u-b-squashfs.trx",
           "type": "trx"
         }
       ],
-      "target": "brcm47xx/mips74k"
+      "target": "bcm47xx/mips74k"
     },
     "ASUS RT-N12 A1": {
       "id": "asus-rt-n12",
       "images": [
         {
-          "name": "openwrt-brcm47xx-mips74k-asus-rt-n12-squashfs.trx",
+          "name": "openwrt-bcm47xx-mips74k-asus-rt-n12-squashfs.trx",
           "type": "trx"
         }
       ],
-      "target": "brcm47xx/mips74k"
+      "target": "bcm47xx/mips74k"
     },
     "ASUS RT-N12 B1": {
       "id": "asus-rt-n12-b1",
       "images": [
         {
-          "name": "openwrt-brcm47xx-mips74k-asus-rt-n12-b1-squashfs.trx",
+          "name": "openwrt-bcm47xx-mips74k-asus-rt-n12-b1-squashfs.trx",
           "type": "trx"
         }
       ],
-      "target": "brcm47xx/mips74k"
+      "target": "bcm47xx/mips74k"
     },
     "ASUS RT-N12 C1": {
       "id": "asus-rt-n12-c1",
       "images": [
         {
-          "name": "openwrt-brcm47xx-mips74k-asus-rt-n12-c1-squashfs.trx",
+          "name": "openwrt-bcm47xx-mips74k-asus-rt-n12-c1-squashfs.trx",
           "type": "trx"
         }
       ],
-      "target": "brcm47xx/mips74k"
+      "target": "bcm47xx/mips74k"
     },
     "ASUS RT-N12 D1": {
       "id": "asus-rt-n12-d1",
       "images": [
         {
-          "name": "openwrt-brcm47xx-mips74k-asus-rt-n12-d1-squashfs.trx",
+          "name": "openwrt-bcm47xx-mips74k-asus-rt-n12-d1-squashfs.trx",
           "type": "trx"
         }
       ],
-      "target": "brcm47xx/mips74k"
+      "target": "bcm47xx/mips74k"
     },
     "ASUS RT-N12HP": {
       "id": "asus-rt-n12hp",
       "images": [
         {
-          "name": "openwrt-brcm47xx-mips74k-asus-rt-n12hp-squashfs.trx",
+          "name": "openwrt-bcm47xx-mips74k-asus-rt-n12hp-squashfs.trx",
           "type": "trx"
         }
       ],
-      "target": "brcm47xx/mips74k"
+      "target": "bcm47xx/mips74k"
     },
     "ASUS RT-N14UHP": {
       "id": "asus-rt-n14uhp",
       "images": [
         {
-          "name": "openwrt-brcm47xx-mips74k-asus-rt-n14uhp-squashfs.trx",
+          "name": "openwrt-bcm47xx-mips74k-asus-rt-n14uhp-squashfs.trx",
           "type": "trx"
         }
       ],
-      "target": "brcm47xx/mips74k"
+      "target": "bcm47xx/mips74k"
     },
     "ASUS RT-N15U": {
       "id": "asus-rt-n15u",
       "images": [
         {
-          "name": "openwrt-brcm47xx-mips74k-asus-rt-n15u-squashfs.trx",
+          "name": "openwrt-bcm47xx-mips74k-asus-rt-n15u-squashfs.trx",
           "type": "trx"
         }
       ],
-      "target": "brcm47xx/mips74k"
+      "target": "bcm47xx/mips74k"
     },
     "ASUS RT-N16": {
       "id": "asus-rt-n16",
       "images": [
         {
-          "name": "openwrt-brcm47xx-mips74k-asus-rt-n16-squashfs.trx",
+          "name": "openwrt-bcm47xx-mips74k-asus-rt-n16-squashfs.trx",
           "type": "trx"
         }
       ],
-      "target": "brcm47xx/mips74k"
+      "target": "bcm47xx/mips74k"
     },
     "ASUS RT-N18U": {
       "id": "asus-rt-n18u",
@@ -468,143 +468,143 @@
       "id": "asus-rt-n53",
       "images": [
         {
-          "name": "openwrt-brcm47xx-mips74k-asus-rt-n53-squashfs.trx",
+          "name": "openwrt-bcm47xx-mips74k-asus-rt-n53-squashfs.trx",
           "type": "trx"
         }
       ],
-      "target": "brcm47xx/mips74k"
+      "target": "bcm47xx/mips74k"
     },
     "ASUS RT-N66U": {
       "id": "asus-rt-n66u",
       "images": [
         {
-          "name": "openwrt-brcm47xx-mips74k-asus-rt-n66u-squashfs.trx",
+          "name": "openwrt-bcm47xx-mips74k-asus-rt-n66u-squashfs.trx",
           "type": "trx"
         }
       ],
-      "target": "brcm47xx/mips74k"
+      "target": "bcm47xx/mips74k"
     },
     "ASUS RT-N66W": {
       "id": "asus-rt-n66w",
       "images": [
         {
-          "name": "openwrt-brcm47xx-mips74k-asus-rt-n66w-squashfs.trx",
+          "name": "openwrt-bcm47xx-mips74k-asus-rt-n66w-squashfs.trx",
           "type": "trx"
         }
       ],
-      "target": "brcm47xx/mips74k"
+      "target": "bcm47xx/mips74k"
     },
     "ASUS WL-300g": {
       "id": "asus-wl-300g",
       "images": [
         {
-          "name": "openwrt-brcm47xx-legacy-asus-wl-300g-squashfs.trx",
+          "name": "openwrt-bcm47xx-legacy-asus-wl-300g-squashfs.trx",
           "type": "trx"
         }
       ],
-      "target": "brcm47xx/legacy"
+      "target": "bcm47xx/legacy"
     },
     "ASUS WL-320gP": {
       "id": "asus-wl-320gp",
       "images": [
         {
-          "name": "openwrt-brcm47xx-legacy-asus-wl-320gp-squashfs.trx",
+          "name": "openwrt-bcm47xx-legacy-asus-wl-320gp-squashfs.trx",
           "type": "trx"
         }
       ],
-      "target": "brcm47xx/legacy"
+      "target": "bcm47xx/legacy"
     },
     "ASUS WL-330gE": {
       "id": "asus-wl-330ge",
       "images": [
         {
-          "name": "openwrt-brcm47xx-legacy-asus-wl-330ge-squashfs.trx",
+          "name": "openwrt-bcm47xx-legacy-asus-wl-330ge-squashfs.trx",
           "type": "trx"
         }
       ],
-      "target": "brcm47xx/legacy"
+      "target": "bcm47xx/legacy"
     },
     "ASUS WL-500W": {
       "id": "asus-wl-500w",
       "images": [
         {
-          "name": "openwrt-brcm47xx-legacy-asus-wl-500w-squashfs.trx",
+          "name": "openwrt-bcm47xx-legacy-asus-wl-500w-squashfs.trx",
           "type": "trx"
         }
       ],
-      "target": "brcm47xx/legacy"
+      "target": "bcm47xx/legacy"
     },
     "ASUS WL-500g Deluxe": {
       "id": "asus-wl-500gd",
       "images": [
         {
-          "name": "openwrt-brcm47xx-legacy-asus-wl-500gd-squashfs.trx",
+          "name": "openwrt-bcm47xx-legacy-asus-wl-500gd-squashfs.trx",
           "type": "trx"
         }
       ],
-      "target": "brcm47xx/legacy"
+      "target": "bcm47xx/legacy"
     },
     "ASUS WL-500gP v1": {
       "id": "asus-wl-500gp-v1",
       "images": [
         {
-          "name": "openwrt-brcm47xx-legacy-asus-wl-500gp-v1-squashfs.trx",
+          "name": "openwrt-bcm47xx-legacy-asus-wl-500gp-v1-squashfs.trx",
           "type": "trx"
         }
       ],
-      "target": "brcm47xx/legacy"
+      "target": "bcm47xx/legacy"
     },
     "ASUS WL-500gP v2": {
       "id": "asus-wl-500gp-v2",
       "images": [
         {
-          "name": "openwrt-brcm47xx-legacy-asus-wl-500gp-v2-squashfs.trx",
+          "name": "openwrt-bcm47xx-legacy-asus-wl-500gp-v2-squashfs.trx",
           "type": "trx"
         }
       ],
-      "target": "brcm47xx/legacy"
+      "target": "bcm47xx/legacy"
     },
     "ASUS WL-520gU": {
       "id": "asus-wl-520gu",
       "images": [
         {
-          "name": "openwrt-brcm47xx-legacy-asus-wl-520gu-squashfs.trx",
+          "name": "openwrt-bcm47xx-legacy-asus-wl-520gu-squashfs.trx",
           "type": "trx"
         }
       ],
-      "target": "brcm47xx/legacy"
+      "target": "bcm47xx/legacy"
     },
     "ASUS WL-550gE": {
       "id": "asus-wl-550ge",
       "images": [
         {
-          "name": "openwrt-brcm47xx-legacy-asus-wl-550ge-squashfs.trx",
+          "name": "openwrt-bcm47xx-legacy-asus-wl-550ge-squashfs.trx",
           "type": "trx"
         }
       ],
-      "target": "brcm47xx/legacy"
+      "target": "bcm47xx/legacy"
     },
     "ASUS WL-HDD25": {
       "id": "asus-wl-hdd25",
       "images": [
         {
-          "name": "openwrt-brcm47xx-legacy-asus-wl-hdd25-squashfs.trx",
+          "name": "openwrt-bcm47xx-legacy-asus-wl-hdd25-squashfs.trx",
           "type": "trx"
         }
       ],
-      "target": "brcm47xx/legacy"
+      "target": "bcm47xx/legacy"
     },
     "AVM FRITZ!Box 3370 Rev. 2 (Hynix NAND)": {
       "id": "avm_fritz3370-rev2-hynix",
       "images": [
-        {
-          "name": "openwrt-lantiq-xrx200-avm_fritz3370-rev2-hynix-squashfs-eva-kernel.bin",
-          "type": "eva-kernel"
-        },
         {
           "name": "openwrt-lantiq-xrx200-avm_fritz3370-rev2-hynix-squashfs-eva-filesystem.bin",
           "type": "eva-filesystem"
         },
+        {
+          "name": "openwrt-lantiq-xrx200-avm_fritz3370-rev2-hynix-squashfs-eva-kernel.bin",
+          "type": "eva-kernel"
+        },
         {
           "name": "openwrt-lantiq-xrx200-avm_fritz3370-rev2-hynix-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
@@ -616,16 +616,16 @@
       "id": "avm_fritz3370-rev2-micron",
       "images": [
         {
-          "name": "openwrt-lantiq-xrx200-avm_fritz3370-rev2-micron-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
+          "name": "openwrt-lantiq-xrx200-avm_fritz3370-rev2-micron-squashfs-eva-filesystem.bin",
+          "type": "eva-filesystem"
         },
         {
           "name": "openwrt-lantiq-xrx200-avm_fritz3370-rev2-micron-squashfs-eva-kernel.bin",
           "type": "eva-kernel"
         },
         {
-          "name": "openwrt-lantiq-xrx200-avm_fritz3370-rev2-micron-squashfs-eva-filesystem.bin",
-          "type": "eva-filesystem"
+          "name": "openwrt-lantiq-xrx200-avm_fritz3370-rev2-micron-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "lantiq/xrx200"
@@ -684,6 +684,16 @@
       ],
       "target": "lantiq/xrx200"
     },
+    "AVM FRITZ!Box 7360 v2": {
+      "id": "avm_fritz7360-v2",
+      "images": [
+        {
+          "name": "openwrt-lantiq-xrx200-avm_fritz7360-v2-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
+        }
+      ],
+      "target": "lantiq/xrx200"
+    },
     "AVM FRITZ!Box 7362 SL": {
       "id": "avm_fritz7362sl",
       "images": [
@@ -734,6 +744,16 @@
       ],
       "target": "ipq40xx/generic"
     },
+    "AVM FRITZ!WLAN Repeater 1750E": {
+      "id": "avm_fritz1750e",
+      "images": [
+        {
+          "name": "openwrt-ath79-generic-avm_fritz1750e-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
+        }
+      ],
+      "target": "ath79/generic"
+    },
     "AVM FRITZ!WLAN Repeater 300E": {
       "id": "avm_fritz300e",
       "images": [
@@ -744,6 +764,16 @@
       ],
       "target": "ath79/generic"
     },
+    "AVM FRITZ!WLAN Repeater 450E": {
+      "id": "avm_fritz450e",
+      "images": [
+        {
+          "name": "openwrt-ath79-generic-avm_fritz450e-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
+        }
+      ],
+      "target": "ath79/generic"
+    },
     "AXIMCom MR-102N": {
       "id": "aximcom_mr-102n",
       "images": [
@@ -765,14 +795,14 @@
       "target": "ramips/rt305x"
     },
     "Actiontec R1000H": {
-      "id": "R1000H",
+      "id": "actiontec_r1000h",
       "images": [
         {
-          "name": "openwrt-brcm63xx-smp-R1000H-squashfs-cfe.bin",
+          "name": "openwrt-bcm63xx-smp-actiontec_r1000h-squashfs-cfe.bin",
           "type": "cfe"
         }
       ],
-      "target": "brcm63xx/smp"
+      "target": "bcm63xx/smp"
     },
     "Adtran/Bluesocket BSAP-1800 v2": {
       "id": "adtran_bsap1800-v2",
@@ -781,13 +811,13 @@
           "name": "openwrt-ath79-generic-adtran_bsap1800-v2-squashfs-kernel.bin",
           "type": "kernel"
         },
-        {
-          "name": "openwrt-ath79-generic-adtran_bsap1800-v2-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-ath79-generic-adtran_bsap1800-v2-squashfs-rootfs.bin",
           "type": "rootfs"
+        },
+        {
+          "name": "openwrt-ath79-generic-adtran_bsap1800-v2-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ath79/generic"
@@ -795,6 +825,10 @@
     "Adtran/Bluesocket BSAP-1840": {
       "id": "adtran_bsap1840",
       "images": [
+        {
+          "name": "openwrt-ath79-generic-adtran_bsap1840-squashfs-rootfs.bin",
+          "type": "rootfs"
+        },
         {
           "name": "openwrt-ath79-generic-adtran_bsap1840-squashfs-kernel.bin",
           "type": "kernel"
@@ -802,10 +836,6 @@
         {
           "name": "openwrt-ath79-generic-adtran_bsap1840-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
-        },
-        {
-          "name": "openwrt-ath79-generic-adtran_bsap1840-squashfs-rootfs.bin",
-          "type": "rootfs"
         }
       ],
       "target": "ath79/generic"
@@ -813,13 +843,13 @@
     "Aerohive HiveAP 121": {
       "id": "aerohive_hiveap-121",
       "images": [
-        {
-          "name": "openwrt-ath79-nand-aerohive_hiveap-121-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-ath79-nand-aerohive_hiveap-121-squashfs-factory.bin",
           "type": "factory"
+        },
+        {
+          "name": "openwrt-ath79-nand-aerohive_hiveap-121-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ath79/nand"
@@ -827,13 +857,13 @@
     "Aerohive HiveAP-330": {
       "id": "aerohive_hiveap-330",
       "images": [
-        {
-          "name": "openwrt-mpc85xx-p1020-aerohive_hiveap-330-squashfs-fdt.bin",
-          "type": "fdt"
-        },
         {
           "name": "openwrt-mpc85xx-p1020-aerohive_hiveap-330-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
+        },
+        {
+          "name": "openwrt-mpc85xx-p1020-aerohive_hiveap-330-squashfs-fdt.bin",
+          "type": "fdt"
         }
       ],
       "target": "mpc85xx/p1020"
@@ -848,71 +878,37 @@
       ],
       "target": "ramips/mt7620"
     },
-    "AirLive Air3GII": {
-      "id": "airlive_air3gii",
-      "images": [
-        {
-          "name": "openwrt-ramips-rt305x-airlive_air3gii-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        }
-      ],
-      "target": "ramips/rt305x"
-    },
-    "Airlink AR670W": {
-      "id": "airlink101_ar670w",
-      "images": [
-        {
-          "name": "openwrt-ramips-rt288x-airlink101_ar670w-squashfs-factory.bin",
-          "type": "factory"
-        },
-        {
-          "name": "openwrt-ramips-rt288x-airlink101_ar670w-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        }
-      ],
-      "target": "ramips/rt288x"
-    },
-    "Airlink AR725W": {
-      "id": "airlink101_ar725w",
-      "images": [
-        {
-          "name": "openwrt-ramips-rt288x-airlink101_ar725w-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        }
-      ],
-      "target": "ramips/rt288x"
-    },
-    "Akition myCloud mini": {
+    "Akitio MyCloud Mini": {
       "id": "akitio_mycloud",
       "images": [
         {
-          "name": "openwrt-oxnas-ox820-akitio_mycloud-ubifs-ubinized.bin",
+          "name": "openwrt-oxnas-ox820-akitio_mycloud-squashfs-ubinized.bin",
           "type": "ubinized"
         },
         {
           "name": "openwrt-oxnas-ox820-akitio_mycloud-ubifs-sysupgrade.tar",
           "type": "sysupgrade"
         },
-        {
-          "name": "openwrt-oxnas-ox820-akitio_mycloud-squashfs-ubinized.bin",
-          "type": "ubinized"
-        },
         {
           "name": "openwrt-oxnas-ox820-akitio_mycloud-squashfs-sysupgrade.tar",
           "type": "sysupgrade"
+        },
+        {
+          "name": "openwrt-oxnas-ox820-akitio_mycloud-ubifs-ubinized.bin",
+          "type": "ubinized"
         }
       ],
       "target": "oxnas/ox820"
     },
     "Alcatel RG100A": {
-      "id": "RG100A",
+      "id": "alcatel_rg100a",
       "images": [
         {
-          "name": "openwrt-brcm63xx-smp-RG100A-squashfs-cfe.bin",
+          "name": "openwrt-bcm63xx-smp-alcatel_rg100a-squashfs-cfe.bin",
           "type": "cfe"
         }
       ],
-      "target": "brcm63xx/smp"
+      "target": "bcm63xx/smp"
     },
     "Alice/O2 IAD 4421": {
       "id": "arcadyan_arv7506pw11",
@@ -934,16 +930,6 @@
       ],
       "target": "ramips/rt305x"
     },
-    "Allnet ALL0256N 4M": {
-      "id": "allnet_all0256n-4m",
-      "images": [
-        {
-          "name": "openwrt-ramips-rt305x-allnet_all0256n-4m-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        }
-      ],
-      "target": "ramips/rt305x"
-    },
     "Allnet ALL0256N 8M": {
       "id": "allnet_all0256n-8m",
       "images": [
@@ -1184,6 +1170,16 @@
       ],
       "target": "ipq40xx/generic"
     },
+    "Aruba AP-365": {
+      "id": "aruba_ap-365",
+      "images": [
+        {
+          "name": "openwrt-ipq40xx-generic-aruba_ap-365-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
+        }
+      ],
+      "target": "ipq40xx/generic"
+    },
     "AsiaRF AP7621-001": {
       "id": "asiarf_ap7621-001",
       "images": [
@@ -1204,26 +1200,6 @@
       ],
       "target": "ramips/mt7621"
     },
-    "AsiaRF AWAPN2403": {
-      "id": "asiarf_awapn2403",
-      "images": [
-        {
-          "name": "openwrt-ramips-rt305x-asiarf_awapn2403-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        }
-      ],
-      "target": "ramips/rt305x"
-    },
-    "AsiaRF AWM002-EVB 4M": {
-      "id": "asiarf_awm002-evb-4m",
-      "images": [
-        {
-          "name": "openwrt-ramips-rt305x-asiarf_awm002-evb-4m-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        }
-      ],
-      "target": "ramips/rt305x"
-    },
     "AsiaRF AWM002-EVB/AWM003-EVB 8M": {
       "id": "asiarf_awm002-evb-8m",
       "images": [
@@ -1294,25 +1270,15 @@
       ],
       "target": "ramips/mt7620"
     },
-    "Asus RT-G32 B1": {
-      "id": "asus_rt-g32-b1",
-      "images": [
-        {
-          "name": "openwrt-ramips-rt305x-asus_rt-g32-b1-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        }
-      ],
-      "target": "ramips/rt305x"
-    },
-    "Asus RT-N10+": {
-      "id": "asus_rt-n10-plus",
+    "Asus RT-AC54U": {
+      "id": "asus_rt-ac54u",
       "images": [
         {
-          "name": "openwrt-ramips-rt305x-asus_rt-n10-plus-squashfs-sysupgrade.bin",
+          "name": "openwrt-ramips-mt7620-asus_rt-ac54u-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
         }
       ],
-      "target": "ramips/rt305x"
+      "target": "ramips/mt7620"
     },
     "Asus RT-N11P/RT-N12+/RT-N12Eb1": {
       "id": "asus_rt-n12p",
@@ -1344,16 +1310,6 @@
       ],
       "target": "ramips/mt7620"
     },
-    "Asus RT-N15": {
-      "id": "asus_rt-n15",
-      "images": [
-        {
-          "name": "openwrt-ramips-rt288x-asus_rt-n15-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        }
-      ],
-      "target": "ramips/rt288x"
-    },
     "Asus RT-N56U": {
       "id": "asus_rt-n56u",
       "images": [
@@ -1364,70 +1320,24 @@
       ],
       "target": "ramips/rt3883"
     },
-    "Asus WL-330N": {
-      "id": "asus_wl-330n",
-      "images": [
-        {
-          "name": "openwrt-ramips-rt305x-asus_wl-330n-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        }
-      ],
-      "target": "ramips/rt305x"
-    },
-    "Asus WL-330N3G": {
-      "id": "asus_wl-330n3g",
-      "images": [
-        {
-          "name": "openwrt-ramips-rt305x-asus_wl-330n3g-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        }
-      ],
-      "target": "ramips/rt305x"
-    },
-    "Atheros Generic AR2xxx board": {
-      "id": "generic",
-      "images": [
-        {
-          "name": "openwrt-ath25-generic-kernel.elf",
-          "type": "kernel"
-        },
-        {
-          "name": "openwrt-ath25-generic-squashfs-rootfs.bin",
-          "type": "rootfs"
-        },
-        {
-          "name": "openwrt-ath25-generic-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
-        {
-          "name": "openwrt-ath25-generic-kernel.gz",
-          "type": "kernel"
-        },
-        {
-          "name": "openwrt-ath25-generic-kernel.lzma",
-          "type": "kernel"
-        }
-      ],
-      "target": "ath25/"
-    },
     "Atmel AT91SAM9263-EK": {
       "id": "at91sam9263ek",
       "images": [
         {
-          "name": "openwrt-at91-sam9x-at91sam9263ek-ubifs-root.ubi",
+          "name": "openwrt-at91-sam9x-at91sam9263ek-squashfs-root.ubi",
           "type": "root"
         },
         {
           "name": "openwrt-at91-sam9x-at91sam9263ek-ubifs-zImage",
           "type": "zImage"
         },
-        {
-          "name": "openwrt-at91-sam9x-at91sam9263ek-squashfs-root.ubi",
-          "type": "root"
-        },
         {
           "name": "openwrt-at91-sam9x-at91sam9263ek-squashfs-zImage",
           "type": "zImage"
+        },
+        {
+          "name": "openwrt-at91-sam9x-at91sam9263ek-ubifs-root.ubi",
+          "type": "root"
         }
       ],
       "target": "at91/sam9x"
@@ -1436,11 +1346,11 @@
       "id": "at91sam9g15ek",
       "images": [
         {
-          "name": "openwrt-at91-sam9x-at91sam9g15ek-ubifs-root.ubi",
+          "name": "openwrt-at91-sam9x-at91sam9g15ek-squashfs-root.ubi",
           "type": "root"
         },
         {
-          "name": "openwrt-at91-sam9x-at91sam9g15ek-squashfs-root.ubi",
+          "name": "openwrt-at91-sam9x-at91sam9g15ek-ubifs-root.ubi",
           "type": "root"
         }
       ],
@@ -1450,11 +1360,11 @@
       "id": "at91sam9g20ek",
       "images": [
         {
-          "name": "openwrt-at91-sam9x-at91sam9g20ek-ubifs-root.ubi",
-          "type": "root"
+          "name": "openwrt-at91-sam9x-at91sam9g20ek-ubifs-zImage",
+          "type": "zImage"
         },
         {
-          "name": "openwrt-at91-sam9x-at91sam9g20ek-ubifs-zImage",
+          "name": "openwrt-at91-sam9x-at91sam9g20ek-squashfs-zImage",
           "type": "zImage"
         },
         {
@@ -1462,8 +1372,8 @@
           "type": "root"
         },
         {
-          "name": "openwrt-at91-sam9x-at91sam9g20ek-squashfs-zImage",
-          "type": "zImage"
+          "name": "openwrt-at91-sam9x-at91sam9g20ek-ubifs-root.ubi",
+          "type": "root"
         }
       ],
       "target": "at91/sam9x"
@@ -1471,6 +1381,14 @@
     "Atmel AT91SAM9G20-EK 2MMC": {
       "id": "at91sam9g20ek_2mmc",
       "images": [
+        {
+          "name": "openwrt-at91-sam9x-at91sam9g20ek_2mmc-ubifs-zImage",
+          "type": "zImage"
+        },
+        {
+          "name": "openwrt-at91-sam9x-at91sam9g20ek_2mmc-squashfs-zImage",
+          "type": "zImage"
+        },
         {
           "name": "openwrt-at91-sam9x-at91sam9g20ek_2mmc-squashfs-root.ubi",
           "type": "root"
@@ -1486,11 +1404,11 @@
       "id": "at91sam9g25ek",
       "images": [
         {
-          "name": "openwrt-at91-sam9x-at91sam9g25ek-ubifs-root.ubi",
+          "name": "openwrt-at91-sam9x-at91sam9g25ek-squashfs-root.ubi",
           "type": "root"
         },
         {
-          "name": "openwrt-at91-sam9x-at91sam9g25ek-squashfs-root.ubi",
+          "name": "openwrt-at91-sam9x-at91sam9g25ek-ubifs-root.ubi",
           "type": "root"
         }
       ],
@@ -1500,11 +1418,11 @@
       "id": "at91sam9g35ek",
       "images": [
         {
-          "name": "openwrt-at91-sam9x-at91sam9g35ek-ubifs-root.ubi",
+          "name": "openwrt-at91-sam9x-at91sam9g35ek-squashfs-root.ubi",
           "type": "root"
         },
         {
-          "name": "openwrt-at91-sam9x-at91sam9g35ek-squashfs-root.ubi",
+          "name": "openwrt-at91-sam9x-at91sam9g35ek-ubifs-root.ubi",
           "type": "root"
         }
       ],
@@ -1528,24 +1446,24 @@
       "id": "at91sam9x25ek",
       "images": [
         {
-          "name": "openwrt-at91-sam9x-at91sam9x25ek-ubifs-root.ubi",
-          "type": "root"
+          "name": "openwrt-at91-sam9x-at91sam9x25ek-squashfs-zImage",
+          "type": "zImage"
         },
         {
-          "name": "openwrt-at91-sam9x-at91sam9x25ek-ubifs-zImage",
-          "type": "zImage"
+          "name": "openwrt-at91-sam9x-at91sam9x25ek-squashfs-root.ubi",
+          "type": "root"
         },
         {
           "name": "openwrt-at91-sam9x-at91sam9x25ek-ext4-sdcard.img.gz",
           "type": "sdcard"
         },
         {
-          "name": "openwrt-at91-sam9x-at91sam9x25ek-squashfs-root.ubi",
-          "type": "root"
+          "name": "openwrt-at91-sam9x-at91sam9x25ek-ubifs-zImage",
+          "type": "zImage"
         },
         {
-          "name": "openwrt-at91-sam9x-at91sam9x25ek-squashfs-zImage",
-          "type": "zImage"
+          "name": "openwrt-at91-sam9x-at91sam9x25ek-ubifs-root.ubi",
+          "type": "root"
         }
       ],
       "target": "at91/sam9x"
@@ -1557,6 +1475,10 @@
           "name": "openwrt-at91-sam9x-at91sam9x35ek-ubifs-root.ubi",
           "type": "root"
         },
+        {
+          "name": "openwrt-at91-sam9x-at91sam9x35ek-squashfs-zImage",
+          "type": "zImage"
+        },
         {
           "name": "openwrt-at91-sam9x-at91sam9x35ek-ubifs-zImage",
           "type": "zImage"
@@ -1568,10 +1490,6 @@
         {
           "name": "openwrt-at91-sam9x-at91sam9x35ek-squashfs-root.ubi",
           "type": "root"
-        },
-        {
-          "name": "openwrt-at91-sam9x-at91sam9x35ek-squashfs-zImage",
-          "type": "zImage"
         }
       ],
       "target": "at91/sam9x"
@@ -1594,7 +1512,7 @@
           "type": "sdcard"
         }
       ],
-      "target": "zynq/"
+      "target": "zynq/generic"
     },
     "Aztech HW550-3G": {
       "id": "aztech_hw550-3g",
@@ -1617,14 +1535,14 @@
       "target": "ramips/mt7620"
     },
     "BT Home Hub 2.0 A": {
-      "id": "HomeHub2A",
+      "id": "bt_home-hub-2-a",
       "images": [
         {
-          "name": "openwrt-brcm63xx-smp-HomeHub2A-squashfs-cfe.bin",
+          "name": "openwrt-bcm63xx-smp-bt_home-hub-2-a-squashfs-cfe.bin",
           "type": "cfe"
         }
       ],
-      "target": "brcm63xx/smp"
+      "target": "bcm63xx/smp"
     },
     "BT Openreach ECI VDSL Modem V-2FUb/I": {
       "id": "alphanetworks_asl56026",
@@ -1650,15 +1568,15 @@
       "id": "ti_omap3-beagle",
       "images": [
         {
-          "name": "openwrt-omap-ti_omap3-beagle-ext4-sdcard.img.gz",
+          "name": "openwrt-omap-ti_omap3-beagle-squashfs-sdcard.img.gz",
           "type": "sdcard"
         },
         {
-          "name": "openwrt-omap-ti_omap3-beagle-squashfs-sdcard.img.gz",
+          "name": "openwrt-omap-ti_omap3-beagle-ext4-sdcard.img.gz",
           "type": "sdcard"
         }
       ],
-      "target": "omap/"
+      "target": "omap/generic"
     },
     "Belkin F5D8235 V1": {
       "id": "belkin_f5d8235-v1",
@@ -1700,6 +1618,26 @@
       ],
       "target": "ramips/rt3883"
     },
+    "Bpi Banana Pi R2": {
+      "id": "bpi_bananapi-r2",
+      "images": [
+        {
+          "name": "openwrt-mediatek-mt7623-bpi_bananapi-r2-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
+        }
+      ],
+      "target": "mediatek/mt7623"
+    },
+    "Bpi Banana Pi R64": {
+      "id": "bpi_bananapi-r64",
+      "images": [
+        {
+          "name": "openwrt-mediatek-mt7622-bpi_bananapi-r64-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
+        }
+      ],
+      "target": "mediatek/mt7622"
+    },
     "British Telecom Home Hub 2 Type B": {
       "id": "bt_homehub-v2b",
       "images": [
@@ -1733,6 +1671,14 @@
     "Buffalo BHR-4GRV": {
       "id": "buffalo_bhr-4grv",
       "images": [
+        {
+          "name": "openwrt-ath79-generic-buffalo_bhr-4grv-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
+        },
+        {
+          "name": "openwrt-ath79-generic-buffalo_bhr-4grv-squashfs-tftp.bin",
+          "type": "tftp"
+        },
         {
           "name": "openwrt-ath79-generic-buffalo_bhr-4grv-squashfs-factory.bin",
           "type": "factory"
@@ -1750,6 +1696,16 @@
       ],
       "target": "ath79/generic"
     },
+    "Buffalo LinkStation LS421DE": {
+      "id": "buffalo_ls421de",
+      "images": [
+        {
+          "name": "openwrt-mvebu-cortexa9-buffalo_ls421de-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
+        }
+      ],
+      "target": "mvebu/cortexa9"
+    },
     "Buffalo WBMR-300HPD": {
       "id": "buffalo_wbmr-300hpd",
       "images": [
@@ -1783,13 +1739,13 @@
     "Buffalo WCR-1166DS": {
       "id": "buffalo_wcr-1166ds",
       "images": [
-        {
-          "name": "openwrt-ramips-mt76x8-buffalo_wcr-1166ds-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-ramips-mt76x8-buffalo_wcr-1166ds-squashfs-factory.bin",
           "type": "factory"
+        },
+        {
+          "name": "openwrt-ramips-mt76x8-buffalo_wcr-1166ds-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ramips/mt76x8"
@@ -1824,48 +1780,6 @@
       ],
       "target": "ramips/mt7620"
     },
-    "Buffalo WHR-G300N": {
-      "id": "buffalo_whr-g300n",
-      "images": [
-        {
-          "name": "openwrt-ramips-rt305x-buffalo_whr-g300n-squashfs-tftp.bin",
-          "type": "tftp"
-        },
-        {
-          "name": "openwrt-ramips-rt305x-buffalo_whr-g300n-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        }
-      ],
-      "target": "ramips/rt305x"
-    },
-    "Buffalo WHR-G301N": {
-      "id": "buffalo_whr-g301n",
-      "images": [
-        {
-          "name": "openwrt-ath79-tiny-buffalo_whr-g301n-squashfs-tftp.bin",
-          "type": "tftp"
-        },
-        {
-          "name": "openwrt-ath79-tiny-buffalo_whr-g301n-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
-        {
-          "name": "openwrt-ath79-tiny-buffalo_whr-g301n-squashfs-factory.bin",
-          "type": "factory"
-        }
-      ],
-      "target": "ath79/tiny"
-    },
-    "Buffalo WLI-TX4-AG300N": {
-      "id": "buffalo_wli-tx4-ag300n",
-      "images": [
-        {
-          "name": "openwrt-ramips-rt288x-buffalo_wli-tx4-ag300n-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        }
-      ],
-      "target": "ramips/rt288x"
-    },
     "Buffalo WMR-300": {
       "id": "buffalo_wmr-300",
       "images": [
@@ -1886,6 +1800,16 @@
       ],
       "target": "ramips/mt7621"
     },
+    "Buffalo WSR-2533DHPL": {
+      "id": "buffalo_wsr-2533dhpl",
+      "images": [
+        {
+          "name": "openwrt-ramips-mt7621-buffalo_wsr-2533dhpl-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
+        }
+      ],
+      "target": "ramips/mt7621"
+    },
     "Buffalo WSR-600DHP": {
       "id": "buffalo_wsr-600dhp",
       "images": [
@@ -1939,14 +1863,14 @@
     "Buffalo WZR-900DHP": {
       "id": "buffalo-wzr-900dhp",
       "images": [
-        {
-          "name": "openwrt-bcm53xx-generic-buffalo-wzr-900dhp-squashfs.trx",
-          "type": "trx"
-        },
         {
           "name": "openwrt-bcm53xx-generic-buffalo-wzr-900dhp-squashfs.factory-DHP-EU.bin",
           "type": "factory-DHP-EU"
         },
+        {
+          "name": "openwrt-bcm53xx-generic-buffalo-wzr-900dhp-squashfs.trx",
+          "type": "trx"
+        },
         {
           "name": "openwrt-bcm53xx-generic-buffalo-wzr-900dhp-squashfs.factory-DHP2-JP.bin",
           "type": "factory-DHP2-JP"
@@ -1954,23 +1878,9 @@
       ],
       "target": "bcm53xx/generic"
     },
-    "Buffalo WZR-AGL300NH": {
-      "id": "buffalo_wzr-agl300nh",
-      "images": [
-        {
-          "name": "openwrt-ramips-rt288x-buffalo_wzr-agl300nh-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        }
-      ],
-      "target": "ramips/rt288x"
-    },
     "Buffalo WZR-HP-AG300H": {
       "id": "buffalo_wzr-hp-ag300h",
       "images": [
-        {
-          "name": "openwrt-ath79-generic-buffalo_wzr-hp-ag300h-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-ath79-generic-buffalo_wzr-hp-ag300h-squashfs-factory.bin",
           "type": "factory"
@@ -1978,6 +1888,10 @@
         {
           "name": "openwrt-ath79-generic-buffalo_wzr-hp-ag300h-squashfs-tftp.bin",
           "type": "tftp"
+        },
+        {
+          "name": "openwrt-ath79-generic-buffalo_wzr-hp-ag300h-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ath79/generic"
@@ -2003,14 +1917,14 @@
     "Buffalo WZR-HP-G450H/WZR-450HP": {
       "id": "buffalo_wzr-hp-g450h",
       "images": [
-        {
-          "name": "openwrt-ath79-generic-buffalo_wzr-hp-g450h-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-ath79-generic-buffalo_wzr-hp-g450h-squashfs-factory.bin",
           "type": "factory"
         },
+        {
+          "name": "openwrt-ath79-generic-buffalo_wzr-hp-g450h-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
+        },
         {
           "name": "openwrt-ath79-generic-buffalo_wzr-hp-g450h-squashfs-tftp.bin",
           "type": "tftp"
@@ -2068,6 +1982,26 @@
       ],
       "target": "ath79/generic"
     },
+    "COMFAST CF-E560AC": {
+      "id": "comfast_cf-e560ac",
+      "images": [
+        {
+          "name": "openwrt-ath79-generic-comfast_cf-e560ac-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
+        }
+      ],
+      "target": "ath79/generic"
+    },
+    "COMFAST CF-EW72": {
+      "id": "comfast_cf-ew72",
+      "images": [
+        {
+          "name": "openwrt-ath79-generic-comfast_cf-ew72-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
+        }
+      ],
+      "target": "ath79/generic"
+    },
     "COMFAST CF-WR650AC v1": {
       "id": "comfast_cf-wr650ac-v1",
       "images": [
@@ -2088,16 +2022,26 @@
       ],
       "target": "ath79/generic"
     },
+    "COMFAST CF-WR752AC v1": {
+      "id": "comfast_cf-wr752ac-v1",
+      "images": [
+        {
+          "name": "openwrt-ath79-generic-comfast_cf-wr752ac-v1-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
+        }
+      ],
+      "target": "ath79/generic"
+    },
     "CZ.NIC Turris Omnia": {
       "id": "cznic_turris-omnia",
       "images": [
-        {
-          "name": "omnia-medkit-openwrt-mvebu-cortexa9-cznic_turris-omnia-initramfs.tar.gz",
-          "type": "omnia-medkit-openwrt-mvebu-cortexa9-cznic_turris-omnia-initramfs"
-        },
         {
           "name": "openwrt-mvebu-cortexa9-cznic_turris-omnia-sysupgrade.img.gz",
           "type": "openwrt-mvebu-cortexa9-cznic_turris-omnia-sysupgrade"
+        },
+        {
+          "name": "omnia-medkit-openwrt-mvebu-cortexa9-cznic_turris-omnia-initramfs.tar.gz",
+          "type": "omnia-medkit-openwrt-mvebu-cortexa9-cznic_turris-omnia-initramfs"
         }
       ],
       "target": "mvebu/cortexa9"
@@ -2106,11 +2050,11 @@
       "id": "lmu5000",
       "images": [
         {
-          "name": "openwrt-at91-sam9x-lmu5000-squashfs-factory.bin",
+          "name": "openwrt-at91-sam9x-lmu5000-ubifs-factory.bin",
           "type": "factory"
         },
         {
-          "name": "openwrt-at91-sam9x-lmu5000-ubifs-factory.bin",
+          "name": "openwrt-at91-sam9x-lmu5000-squashfs-factory.bin",
           "type": "factory"
         }
       ],
@@ -2120,11 +2064,11 @@
       "id": "tny_a9260",
       "images": [
         {
-          "name": "openwrt-at91-sam9x-tny_a9260-ubifs-factory.bin",
+          "name": "openwrt-at91-sam9x-tny_a9260-squashfs-factory.bin",
           "type": "factory"
         },
         {
-          "name": "openwrt-at91-sam9x-tny_a9260-squashfs-factory.bin",
+          "name": "openwrt-at91-sam9x-tny_a9260-ubifs-factory.bin",
           "type": "factory"
         }
       ],
@@ -2162,11 +2106,11 @@
       "id": "usb_a9260",
       "images": [
         {
-          "name": "openwrt-at91-sam9x-usb_a9260-ubifs-factory.bin",
+          "name": "openwrt-at91-sam9x-usb_a9260-squashfs-factory.bin",
           "type": "factory"
         },
         {
-          "name": "openwrt-at91-sam9x-usb_a9260-squashfs-factory.bin",
+          "name": "openwrt-at91-sam9x-usb_a9260-ubifs-factory.bin",
           "type": "factory"
         }
       ],
@@ -2176,11 +2120,11 @@
       "id": "usb_a9263",
       "images": [
         {
-          "name": "openwrt-at91-sam9x-usb_a9263-ubifs-factory.bin",
+          "name": "openwrt-at91-sam9x-usb_a9263-squashfs-factory.bin",
           "type": "factory"
         },
         {
-          "name": "openwrt-at91-sam9x-usb_a9263-squashfs-factory.bin",
+          "name": "openwrt-at91-sam9x-usb_a9263-ubifs-factory.bin",
           "type": "factory"
         }
       ],
@@ -2190,16 +2134,30 @@
       "id": "usb_a9g20",
       "images": [
         {
-          "name": "openwrt-at91-sam9x-usb_a9g20-ubifs-factory.bin",
+          "name": "openwrt-at91-sam9x-usb_a9g20-squashfs-factory.bin",
           "type": "factory"
         },
         {
-          "name": "openwrt-at91-sam9x-usb_a9g20-squashfs-factory.bin",
+          "name": "openwrt-at91-sam9x-usb_a9g20-ubifs-factory.bin",
           "type": "factory"
         }
       ],
       "target": "at91/sam9x"
     },
+    "Cell C RTL30VW": {
+      "id": "cellc_rtl30vw",
+      "images": [
+        {
+          "name": "openwrt-ipq40xx-generic-cellc_rtl30vw-squashfs-nand-sysupgrade.bin",
+          "type": "nand-sysupgrade"
+        },
+        {
+          "name": "openwrt-ipq40xx-generic-cellc_rtl30vw-squashfs-nand-factory.bin",
+          "type": "nand-factory"
+        }
+      ],
+      "target": "ipq40xx/generic"
+    },
     "Cisco Meraki MR24": {
       "id": "meraki_mr24",
       "images": [
@@ -2242,7 +2200,7 @@
           "type": "factory"
         }
       ],
-      "target": "kirkwood/"
+      "target": "kirkwood/generic"
     },
     "Cloud Engines PogoPlug Pro (with mPCIe)": {
       "id": "cloudengines_pogoplugpro",
@@ -2251,14 +2209,14 @@
           "name": "openwrt-oxnas-ox820-cloudengines_pogoplugpro-ubifs-ubinized.bin",
           "type": "ubinized"
         },
-        {
-          "name": "openwrt-oxnas-ox820-cloudengines_pogoplugpro-ubifs-sysupgrade.tar",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-oxnas-ox820-cloudengines_pogoplugpro-squashfs-ubinized.bin",
           "type": "ubinized"
         },
+        {
+          "name": "openwrt-oxnas-ox820-cloudengines_pogoplugpro-ubifs-sysupgrade.tar",
+          "type": "sysupgrade"
+        },
         {
           "name": "openwrt-oxnas-ox820-cloudengines_pogoplugpro-squashfs-sysupgrade.tar",
           "type": "sysupgrade"
@@ -2269,6 +2227,10 @@
     "Cloud Engines PogoPlug Series V3 (without mPCIe)": {
       "id": "cloudengines_pogoplug-series-3",
       "images": [
+        {
+          "name": "openwrt-oxnas-ox820-cloudengines_pogoplug-series-3-squashfs-ubinized.bin",
+          "type": "ubinized"
+        },
         {
           "name": "openwrt-oxnas-ox820-cloudengines_pogoplug-series-3-ubifs-ubinized.bin",
           "type": "ubinized"
@@ -2277,10 +2239,6 @@
           "name": "openwrt-oxnas-ox820-cloudengines_pogoplug-series-3-ubifs-sysupgrade.tar",
           "type": "sysupgrade"
         },
-        {
-          "name": "openwrt-oxnas-ox820-cloudengines_pogoplug-series-3-squashfs-ubinized.bin",
-          "type": "ubinized"
-        },
         {
           "name": "openwrt-oxnas-ox820-cloudengines_pogoplug-series-3-squashfs-sysupgrade.tar",
           "type": "sysupgrade"
@@ -2291,30 +2249,30 @@
     "Cloud Engines Pogoplug E02": {
       "id": "cloudengines_pogoe02",
       "images": [
-        {
-          "name": "openwrt-kirkwood-cloudengines_pogoe02-squashfs-factory.bin",
-          "type": "factory"
-        },
         {
           "name": "openwrt-kirkwood-cloudengines_pogoe02-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
+        },
+        {
+          "name": "openwrt-kirkwood-cloudengines_pogoe02-squashfs-factory.bin",
+          "type": "factory"
         }
       ],
-      "target": "kirkwood/"
+      "target": "kirkwood/generic"
     },
     "Cloud Engines Pogoplug V4": {
       "id": "cloudengines_pogoplugv4",
       "images": [
-        {
-          "name": "openwrt-kirkwood-cloudengines_pogoplugv4-squashfs-factory.bin",
-          "type": "factory"
-        },
         {
           "name": "openwrt-kirkwood-cloudengines_pogoplugv4-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
+        },
+        {
+          "name": "openwrt-kirkwood-cloudengines_pogoplugv4-squashfs-factory.bin",
+          "type": "factory"
         }
       ],
-      "target": "kirkwood/"
+      "target": "kirkwood/generic"
     },
     "Comfast CF-WR800N": {
       "id": "comfast_cf-wr800n",
@@ -2346,6 +2304,10 @@
         {
           "name": "openwrt-ipq40xx-generic-compex_wpj428-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
+        },
+        {
+          "name": "openwrt-ipq40xx-generic-compex_wpj428-squashfs-cpximg-6a04.bin",
+          "type": "cpximg-6a04"
         }
       ],
       "target": "ipq40xx/generic"
@@ -2376,103 +2338,131 @@
           "type": "sdcard"
         }
       ],
-      "target": "tegra/"
+      "target": "tegra/generic"
     },
     "Comtrend AR-5315u": {
-      "id": "AR5315u",
+      "id": "comtrend_ar-5315u",
       "images": [
         {
-          "name": "openwrt-brcm63xx-smp-AR5315u-squashfs-cfe.bin",
-          "type": "cfe"
+          "name": "openwrt-bcm63xx-smp-comtrend_ar-5315u-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         },
         {
-          "name": "openwrt-brcm63xx-smp-AR5315u-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
+          "name": "openwrt-bcm63xx-smp-comtrend_ar-5315u-squashfs-cfe.bin",
+          "type": "cfe"
         }
       ],
-      "target": "brcm63xx/smp"
+      "target": "bcm63xx/smp"
     },
     "Comtrend AR-5381u": {
-      "id": "AR5381u",
+      "id": "comtrend_ar-5381u",
       "images": [
         {
-          "name": "openwrt-brcm63xx-smp-AR5381u-squashfs-sysupgrade.bin",
+          "name": "openwrt-bcm63xx-smp-comtrend_ar-5381u-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
         },
         {
-          "name": "openwrt-brcm63xx-smp-AR5381u-squashfs-cfe.bin",
+          "name": "openwrt-bcm63xx-smp-comtrend_ar-5381u-squashfs-cfe.bin",
           "type": "cfe"
         }
       ],
-      "target": "brcm63xx/smp"
+      "target": "bcm63xx/smp"
     },
     "Comtrend AR-5387un": {
-      "id": "AR5387un",
+      "id": "comtrend_ar-5387un",
       "images": [
         {
-          "name": "openwrt-brcm63xx-smp-AR5387un-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
+          "name": "openwrt-bcm63xx-smp-comtrend_ar-5387un-squashfs-cfe.bin",
+          "type": "cfe"
         },
         {
-          "name": "openwrt-brcm63xx-smp-AR5387un-squashfs-cfe.bin",
-          "type": "cfe"
+          "name": "openwrt-bcm63xx-smp-comtrend_ar-5387un-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
-      "target": "brcm63xx/smp"
+      "target": "bcm63xx/smp"
     },
     "Comtrend CT-6373": {
-      "id": "CT-6373",
+      "id": "comtrend_ct-6373",
+      "images": [
+        {
+          "name": "openwrt-bcm63xx-smp-comtrend_ct-6373-squashfs-cfe.bin",
+          "type": "cfe"
+        }
+      ],
+      "target": "bcm63xx/smp"
+    },
+    "Comtrend VG-8050": {
+      "id": "comtrend_vg-8050",
       "images": [
         {
-          "name": "openwrt-brcm63xx-smp-CT-6373-squashfs-cfe.bin",
+          "name": "openwrt-bcm63xx-smp-comtrend_vg-8050-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
+        },
+        {
+          "name": "openwrt-bcm63xx-smp-comtrend_vg-8050-squashfs-cfe.bin",
           "type": "cfe"
         }
       ],
-      "target": "brcm63xx/smp"
+      "target": "bcm63xx/smp"
     },
     "Comtrend VR-3025u": {
-      "id": "VR-3025u",
+      "id": "comtrend_vr-3025u",
       "images": [
         {
-          "name": "openwrt-brcm63xx-smp-VR-3025u-squashfs-sysupgrade.bin",
+          "name": "openwrt-bcm63xx-smp-comtrend_vr-3025u-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
         },
         {
-          "name": "openwrt-brcm63xx-smp-VR-3025u-squashfs-cfe.bin",
+          "name": "openwrt-bcm63xx-smp-comtrend_vr-3025u-squashfs-cfe.bin",
           "type": "cfe"
         }
       ],
-      "target": "brcm63xx/smp"
+      "target": "bcm63xx/smp"
     },
     "Comtrend VR-3025un": {
-      "id": "VR-3025un",
+      "id": "comtrend_vr-3025un",
       "images": [
         {
-          "name": "openwrt-brcm63xx-smp-VR-3025un-squashfs-cfe.bin",
+          "name": "openwrt-bcm63xx-smp-comtrend_vr-3025un-squashfs-cfe.bin",
           "type": "cfe"
         }
       ],
-      "target": "brcm63xx/smp"
+      "target": "bcm63xx/smp"
     },
     "Comtrend VR-3026e": {
-      "id": "VR-3026e",
+      "id": "comtrend_vr-3026e",
+      "images": [
+        {
+          "name": "openwrt-bcm63xx-smp-comtrend_vr-3026e-squashfs-cfe.bin",
+          "type": "cfe"
+        }
+      ],
+      "target": "bcm63xx/smp"
+    },
+    "Comtrend VR-3032u": {
+      "id": "comtrend_vr-3032u",
       "images": [
         {
-          "name": "openwrt-brcm63xx-smp-VR-3026e-squashfs-cfe.bin",
+          "name": "openwrt-bcm63xx-smp-comtrend_vr-3032u-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
+        },
+        {
+          "name": "openwrt-bcm63xx-smp-comtrend_vr-3032u-squashfs-cfe.bin",
           "type": "cfe"
         }
       ],
-      "target": "brcm63xx/smp"
+      "target": "bcm63xx/smp"
     },
     "Comtrend WAP-5813n": {
-      "id": "WAP-5813n",
+      "id": "comtrend_wap-5813n",
       "images": [
         {
-          "name": "openwrt-brcm63xx-smp-WAP-5813n-squashfs-cfe.bin",
+          "name": "openwrt-bcm63xx-smp-comtrend_wap-5813n-squashfs-cfe.bin",
           "type": "cfe"
         }
       ],
-      "target": "brcm63xx/smp"
+      "target": "bcm63xx/smp"
     },
     "CreativeBox v1": {
       "id": "xzwifi_creativebox-v1",
@@ -2502,11 +2492,11 @@
       "id": "cubietech_a10-cubieboard",
       "images": [
         {
-          "name": "openwrt-sunxi-cortexa8-cubietech_a10-cubieboard-squashfs-sdcard.img.gz",
+          "name": "openwrt-sunxi-cortexa8-cubietech_a10-cubieboard-ext4-sdcard.img.gz",
           "type": "sdcard"
         },
         {
-          "name": "openwrt-sunxi-cortexa8-cubietech_a10-cubieboard-ext4-sdcard.img.gz",
+          "name": "openwrt-sunxi-cortexa8-cubietech_a10-cubieboard-squashfs-sdcard.img.gz",
           "type": "sdcard"
         }
       ],
@@ -2543,13 +2533,13 @@
     "Cudy WR1000": {
       "id": "cudy_wr1000",
       "images": [
-        {
-          "name": "openwrt-ramips-mt76x8-cudy_wr1000-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-ramips-mt76x8-cudy_wr1000-squashfs-factory.bin",
           "type": "factory"
+        },
+        {
+          "name": "openwrt-ramips-mt76x8-cudy_wr1000-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ramips/mt76x8"
@@ -2572,30 +2562,16 @@
       ],
       "target": "ramips/rt305x"
     },
-    "D-Link DAP-1522 A1": {
-      "id": "dlink_dap-1522-a1",
-      "images": [
-        {
-          "name": "openwrt-ramips-rt288x-dlink_dap-1522-a1-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
-        {
-          "name": "openwrt-ramips-rt288x-dlink_dap-1522-a1-squashfs-factory.bin",
-          "type": "factory"
-        }
-      ],
-      "target": "ramips/rt288x"
-    },
     "D-Link DAP-2610": {
       "id": "dlink_dap-2610",
       "images": [
-        {
-          "name": "openwrt-ipq40xx-generic-dlink_dap-2610-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-ipq40xx-generic-dlink_dap-2610-squashfs-factory.bin",
           "type": "factory"
+        },
+        {
+          "name": "openwrt-ipq40xx-generic-dlink_dap-2610-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ipq40xx/generic"
@@ -2603,30 +2579,16 @@
     "D-Link DCH-M225": {
       "id": "dlink_dch-m225",
       "images": [
-        {
-          "name": "openwrt-ramips-mt7620-dlink_dch-m225-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-ramips-mt7620-dlink_dch-m225-squashfs-factory.bin",
           "type": "factory"
-        }
-      ],
-      "target": "ramips/mt7620"
-    },
-    "D-Link DIR-300 B1": {
-      "id": "dlink_dir-300-b1",
-      "images": [
-        {
-          "name": "openwrt-ramips-rt305x-dlink_dir-300-b1-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
         },
         {
-          "name": "openwrt-ramips-rt305x-dlink_dir-300-b1-squashfs-factory.bin",
-          "type": "factory"
+          "name": "openwrt-ramips-mt7620-dlink_dch-m225-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
-      "target": "ramips/rt305x"
+      "target": "ramips/mt7620"
     },
     "D-Link DIR-300 B7": {
       "id": "dlink_dir-300-b7",
@@ -2661,72 +2623,16 @@
     "D-Link DIR-510L": {
       "id": "dlink_dir-510l",
       "images": [
-        {
-          "name": "openwrt-ramips-mt7620-dlink_dir-510l-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-ramips-mt7620-dlink_dir-510l-squashfs-factory.bin",
           "type": "factory"
-        }
-      ],
-      "target": "ramips/mt7620"
-    },
-    "D-Link DIR-600 B1/B2": {
-      "id": "dlink_dir-600-b1",
-      "images": [
-        {
-          "name": "openwrt-ramips-rt305x-dlink_dir-600-b1-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
-        {
-          "name": "openwrt-ramips-rt305x-dlink_dir-600-b1-squashfs-factory.bin",
-          "type": "factory"
-        }
-      ],
-      "target": "ramips/rt305x"
-    },
-    "D-Link DIR-610 A1": {
-      "id": "dlink_dir-610-a1",
-      "images": [
-        {
-          "name": "openwrt-ramips-rt305x-dlink_dir-610-a1-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
-        {
-          "name": "openwrt-ramips-rt305x-dlink_dir-610-a1-squashfs-factory.bin",
-          "type": "factory"
-        }
-      ],
-      "target": "ramips/rt305x"
-    },
-    "D-Link DIR-615 D": {
-      "id": "dlink_dir-615-d",
-      "images": [
-        {
-          "name": "openwrt-ramips-rt305x-dlink_dir-615-d-squashfs-factory.bin",
-          "type": "factory"
         },
         {
-          "name": "openwrt-ramips-rt305x-dlink_dir-615-d-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        }
-      ],
-      "target": "ramips/rt305x"
-    },
-    "D-Link DIR-615 H1": {
-      "id": "dlink_dir-615-h1",
-      "images": [
-        {
-          "name": "openwrt-ramips-rt305x-dlink_dir-615-h1-squashfs-sysupgrade.bin",
+          "name": "openwrt-ramips-mt7620-dlink_dir-510l-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
-        },
-        {
-          "name": "openwrt-ramips-rt305x-dlink_dir-615-h1-squashfs-factory.bin",
-          "type": "factory"
         }
       ],
-      "target": "ramips/rt305x"
+      "target": "ramips/mt7620"
     },
     "D-Link DIR-620 A1": {
       "id": "dlink_dir-620-a1",
@@ -2751,13 +2657,13 @@
     "D-Link DIR-645": {
       "id": "dlink_dir-645",
       "images": [
-        {
-          "name": "openwrt-ramips-rt3883-dlink_dir-645-squashfs-factory.bin",
-          "type": "factory"
-        },
         {
           "name": "openwrt-ramips-rt3883-dlink_dir-645-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
+        },
+        {
+          "name": "openwrt-ramips-rt3883-dlink_dir-645-squashfs-factory.bin",
+          "type": "factory"
         }
       ],
       "target": "ramips/rt3883"
@@ -2765,16 +2671,16 @@
     "D-Link DIR-685 Xtreme N Storage Router": {
       "id": "dlink_dir-685",
       "images": [
-        {
-          "name": "openwrt-gemini-dlink_dir-685-squashfs-factory.bin",
-          "type": "factory"
-        },
         {
           "name": "openwrt-gemini-dlink_dir-685-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
+        },
+        {
+          "name": "openwrt-gemini-dlink_dir-685-squashfs-factory.bin",
+          "type": "factory"
         }
       ],
-      "target": "gemini/"
+      "target": "gemini/generic"
     },
     "D-Link DIR-810L": {
       "id": "dlink_dir-810l",
@@ -2813,13 +2719,13 @@
     "D-Link DIR-835 A1": {
       "id": "dlink_dir-835-a1",
       "images": [
-        {
-          "name": "openwrt-ath79-generic-dlink_dir-835-a1-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-ath79-generic-dlink_dir-835-a1-squashfs-factory.bin",
           "type": "factory"
+        },
+        {
+          "name": "openwrt-ath79-generic-dlink_dir-835-a1-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ath79/generic"
@@ -2827,13 +2733,13 @@
     "D-Link DIR-842 C1": {
       "id": "dlink_dir-842-c1",
       "images": [
-        {
-          "name": "openwrt-ath79-generic-dlink_dir-842-c1-squashfs-factory.bin",
-          "type": "factory"
-        },
         {
           "name": "openwrt-ath79-generic-dlink_dir-842-c1-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
+        },
+        {
+          "name": "openwrt-ath79-generic-dlink_dir-842-c1-squashfs-factory.bin",
+          "type": "factory"
         }
       ],
       "target": "ath79/generic"
@@ -2841,13 +2747,13 @@
     "D-Link DIR-842 C2": {
       "id": "dlink_dir-842-c2",
       "images": [
-        {
-          "name": "openwrt-ath79-generic-dlink_dir-842-c2-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-ath79-generic-dlink_dir-842-c2-squashfs-factory.bin",
           "type": "factory"
+        },
+        {
+          "name": "openwrt-ath79-generic-dlink_dir-842-c2-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ath79/generic"
@@ -2855,13 +2761,13 @@
     "D-Link DIR-842 C3": {
       "id": "dlink_dir-842-c3",
       "images": [
-        {
-          "name": "openwrt-ath79-generic-dlink_dir-842-c3-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-ath79-generic-dlink_dir-842-c3-squashfs-factory.bin",
           "type": "factory"
+        },
+        {
+          "name": "openwrt-ath79-generic-dlink_dir-842-c3-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ath79/generic"
@@ -2883,13 +2789,13 @@
     "D-Link DIR-860L B1": {
       "id": "dlink_dir-860l-b1",
       "images": [
-        {
-          "name": "openwrt-ramips-mt7621-dlink_dir-860l-b1-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-ramips-mt7621-dlink_dir-860l-b1-squashfs-factory.bin",
           "type": "factory"
+        },
+        {
+          "name": "openwrt-ramips-mt7621-dlink_dir-860l-b1-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ramips/mt7621"
@@ -2912,136 +2818,96 @@
           "type": "factory"
         }
       ],
-      "target": "gemini/"
+      "target": "gemini/generic"
     },
     "D-Link DSL-2650U": {
-      "id": "DSL2650U",
-      "images": [
-        {
-          "name": "openwrt-brcm63xx-smp-DSL2650U-squashfs-cfe.bin",
-          "type": "cfe"
-        }
-      ],
-      "target": "brcm63xx/smp"
-    },
-    "D-Link DSL-2740B C2": {
-      "id": "DSL274XB-C2",
-      "images": [
-        {
-          "name": "openwrt-brcm63xx-smp-DSL274XB-C2-squashfs-cfe.bin",
-          "type": "cfe"
-        }
-      ],
-      "target": "brcm63xx/smp"
-    },
-    "D-Link DSL-2740B C3": {
-      "id": "DSL274XB-C3",
+      "id": "d-link_dsl-2650u",
       "images": [
         {
-          "name": "openwrt-brcm63xx-smp-DSL274XB-C3-squashfs-cfe.bin",
+          "name": "openwrt-bcm63xx-smp-d-link_dsl-2650u-squashfs-cfe.bin",
           "type": "cfe"
         }
       ],
-      "target": "brcm63xx/smp"
+      "target": "bcm63xx/smp"
     },
     "D-Link DSL-2740B F1": {
-      "id": "DSL274XB-F1",
+      "id": "d-link_dsl-274xb-f1",
       "images": [
         {
-          "name": "openwrt-brcm63xx-smp-DSL274XB-F1-squashfs-cfe-EU.bin",
+          "name": "openwrt-bcm63xx-smp-d-link_dsl-274xb-f1-squashfs-cfe-EU.bin",
           "type": "cfe-EU"
         },
         {
-          "name": "openwrt-brcm63xx-smp-DSL274XB-F1-squashfs-cfe-AU.bin",
+          "name": "openwrt-bcm63xx-smp-d-link_dsl-274xb-f1-squashfs-cfe-AU.bin",
           "type": "cfe-AU"
         }
       ],
-      "target": "brcm63xx/smp"
-    },
-    "D-Link DSL-2741B C2": {
-      "id": "DSL274XB-C2",
-      "images": [
-        {
-          "name": "openwrt-brcm63xx-smp-DSL274XB-C2-squashfs-cfe.bin",
-          "type": "cfe"
-        }
-      ],
-      "target": "brcm63xx/smp"
-    },
-    "D-Link DSL-2741B C3": {
-      "id": "DSL274XB-C3",
-      "images": [
-        {
-          "name": "openwrt-brcm63xx-smp-DSL274XB-C3-squashfs-cfe.bin",
-          "type": "cfe"
-        }
-      ],
-      "target": "brcm63xx/smp"
+      "target": "bcm63xx/smp"
     },
     "D-Link DSL-2741B F1": {
-      "id": "DSL274XB-F1",
+      "id": "d-link_dsl-274xb-f1",
       "images": [
         {
-          "name": "openwrt-brcm63xx-smp-DSL274XB-F1-squashfs-cfe-EU.bin",
+          "name": "openwrt-bcm63xx-smp-d-link_dsl-274xb-f1-squashfs-cfe-EU.bin",
           "type": "cfe-EU"
         },
         {
-          "name": "openwrt-brcm63xx-smp-DSL274XB-F1-squashfs-cfe-AU.bin",
+          "name": "openwrt-bcm63xx-smp-d-link_dsl-274xb-f1-squashfs-cfe-AU.bin",
           "type": "cfe-AU"
         }
       ],
-      "target": "brcm63xx/smp"
+      "target": "bcm63xx/smp"
     },
     "D-Link DSL-2750B D1": {
-      "id": "DSL275XB-D1",
+      "id": "d-link_dsl-275xb-d1",
       "images": [
         {
-          "name": "openwrt-brcm63xx-smp-DSL275XB-D1-squashfs-cfe.bin",
+          "name": "openwrt-bcm63xx-smp-d-link_dsl-275xb-d1-squashfs-cfe.bin",
           "type": "cfe"
         }
       ],
-      "target": "brcm63xx/smp"
+      "target": "bcm63xx/smp"
     },
     "D-Link DSL-2751 D1": {
-      "id": "DSL275XB-D1",
+      "id": "d-link_dsl-275xb-d1",
       "images": [
         {
-          "name": "openwrt-brcm63xx-smp-DSL275XB-D1-squashfs-cfe.bin",
+          "name": "openwrt-bcm63xx-smp-d-link_dsl-275xb-d1-squashfs-cfe.bin",
           "type": "cfe"
         }
       ],
-      "target": "brcm63xx/smp"
+      "target": "bcm63xx/smp"
     },
     "D-Link DVA-G3810BN/TL": {
-      "id": "DVAG3810BN",
+      "id": "d-link_dva-g3810bn-tl",
       "images": [
         {
-          "name": "openwrt-brcm63xx-smp-DVAG3810BN-squashfs-cfe.bin",
+          "name": "openwrt-bcm63xx-smp-d-link_dva-g3810bn-tl-squashfs-cfe.bin",
           "type": "cfe"
         }
       ],
-      "target": "brcm63xx/smp"
+      "target": "bcm63xx/smp"
     },
     "D-Link DWL-3150": {
       "id": "dlink-dwl-3150",
       "images": [
         {
-          "name": "openwrt-brcm47xx-legacy-dlink-dwl-3150-squashfs.bin",
+          "name": "openwrt-bcm47xx-legacy-dlink-dwl-3150-squashfs.bin",
           "type": "bin"
         }
       ],
-      "target": "brcm47xx/legacy"
+      "target": "bcm47xx/legacy"
     },
     "D-Link DWR-116 A1/A2": {
       "id": "dlink_dwr-116-a1",
       "images": [
-        {
-          "name": "openwrt-ramips-mt7620-dlink_dwr-116-a1-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-ramips-mt7620-dlink_dwr-116-a1-squashfs-factory.bin",
           "type": "factory"
+        },
+        {
+          "name": "openwrt-ramips-mt7620-dlink_dwr-116-a1-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ramips/mt7620"
@@ -3077,13 +2943,13 @@
     "D-Link DWR-512 B": {
       "id": "dlink_dwr-512-b",
       "images": [
-        {
-          "name": "openwrt-ramips-rt305x-dlink_dwr-512-b-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-ramips-rt305x-dlink_dwr-512-b-squashfs-factory.bin",
           "type": "factory"
+        },
+        {
+          "name": "openwrt-ramips-rt305x-dlink_dwr-512-b-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ramips/rt305x"
@@ -3105,13 +2971,13 @@
     "D-Link DWR-921 C3": {
       "id": "dlink_dwr-921-c3",
       "images": [
-        {
-          "name": "openwrt-ramips-mt7620-dlink_dwr-921-c3-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-ramips-mt7620-dlink_dwr-921-c3-squashfs-factory.bin",
           "type": "factory"
+        },
+        {
+          "name": "openwrt-ramips-mt7620-dlink_dwr-921-c3-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ramips/mt7620"
@@ -3130,6 +2996,30 @@
       ],
       "target": "ramips/mt7620"
     },
+    "D-Link DWR-960": {
+      "id": "dlink_dwr-960",
+      "images": [
+        {
+          "name": "openwrt-ramips-mt7620-dlink_dwr-960-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
+        },
+        {
+          "name": "openwrt-ramips-mt7620-dlink_dwr-960-squashfs-factory.bin",
+          "type": "factory"
+        }
+      ],
+      "target": "ramips/mt7620"
+    },
+    "Devolo Magic 2 WiFi": {
+      "id": "devolo_magic-2-wifi",
+      "images": [
+        {
+          "name": "openwrt-ath79-generic-devolo_magic-2-wifi-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
+        }
+      ],
+      "target": "ath79/generic"
+    },
     "Digilent Zybo": {
       "id": "digilent_zynq-zybo",
       "images": [
@@ -3138,7 +3028,7 @@
           "type": "sdcard"
         }
       ],
-      "target": "zynq/"
+      "target": "zynq/generic"
     },
     "Digilent Zybo Z7": {
       "id": "digilent_zynq-zybo-z7",
@@ -3148,7 +3038,21 @@
           "type": "sdcard"
         }
       ],
-      "target": "zynq/"
+      "target": "zynq/generic"
+    },
+    "DomyWifi DW33D": {
+      "id": "domywifi_dw33d",
+      "images": [
+        {
+          "name": "openwrt-ath79-nand-domywifi_dw33d-squashfs-factory.bin",
+          "type": "factory"
+        },
+        {
+          "name": "openwrt-ath79-nand-domywifi_dw33d-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
+        }
+      ],
+      "target": "ath79/nand"
     },
     "Dovado Tiny AC": {
       "id": "dovado_tiny-ac",
@@ -3197,13 +3101,13 @@
     "ELECOM WRC-1900GST": {
       "id": "elecom_wrc-1900gst",
       "images": [
-        {
-          "name": "openwrt-ramips-mt7621-elecom_wrc-1900gst-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-ramips-mt7621-elecom_wrc-1900gst-squashfs-factory.bin",
           "type": "factory"
+        },
+        {
+          "name": "openwrt-ramips-mt7621-elecom_wrc-1900gst-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ramips/mt7621"
@@ -3211,13 +3115,13 @@
     "ELECOM WRC-2533GST": {
       "id": "elecom_wrc-2533gst",
       "images": [
-        {
-          "name": "openwrt-ramips-mt7621-elecom_wrc-2533gst-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-ramips-mt7621-elecom_wrc-2533gst-squashfs-factory.bin",
           "type": "factory"
+        },
+        {
+          "name": "openwrt-ramips-mt7621-elecom_wrc-2533gst-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ramips/mt7621"
@@ -3252,26 +3156,6 @@
       ],
       "target": "ramips/rt305x"
     },
-    "Edimax 3g-6200n": {
-      "id": "edimax_3g-6200n",
-      "images": [
-        {
-          "name": "openwrt-ramips-rt305x-edimax_3g-6200n-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        }
-      ],
-      "target": "ramips/rt305x"
-    },
-    "Edimax 3g-6200nl": {
-      "id": "edimax_3g-6200nl",
-      "images": [
-        {
-          "name": "openwrt-ramips-rt305x-edimax_3g-6200nl-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        }
-      ],
-      "target": "ramips/rt305x"
-    },
     "Edimax BR-6475nD": {
       "id": "edimax_br-6475nd",
       "images": [
@@ -3328,6 +3212,10 @@
         {
           "name": "openwrt-ramips-mt7621-edimax_rg21s-squashfs-factory.bin",
           "type": "factory"
+        },
+        {
+          "name": "openwrt-ramips-mt7621-edimax_rg21s-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ramips/mt7621"
@@ -3350,11 +3238,11 @@
       "id": "edimax-ps1208-mfg",
       "images": [
         {
-          "name": "openwrt-brcm47xx-legacy-edimax-ps1208-mfg-squashfs.bin",
+          "name": "openwrt-bcm47xx-legacy-edimax-ps1208-mfg-squashfs.bin",
           "type": "bin"
         }
       ],
-      "target": "brcm47xx/legacy"
+      "target": "bcm47xx/legacy"
     },
     "Edimax RA21S": {
       "id": "edimax_ra21s",
@@ -3370,14 +3258,24 @@
       ],
       "target": "ramips/mt7621"
     },
-    "Elecom WRH-300CR": {
-      "id": "elecom_wrh-300cr",
+    "Elecom WRC-2533GENT": {
+      "id": "elecom-wrc-2533gent",
       "images": [
         {
-          "name": "openwrt-ramips-mt7620-elecom_wrh-300cr-squashfs-sysupgrade.bin",
+          "name": "openwrt-mediatek-mt7622-elecom-wrc-2533gent-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
-        },
-        {
+        }
+      ],
+      "target": "mediatek/mt7622"
+    },
+    "Elecom WRH-300CR": {
+      "id": "elecom_wrh-300cr",
+      "images": [
+        {
+          "name": "openwrt-ramips-mt7620-elecom_wrh-300cr-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
+        },
+        {
           "name": "openwrt-ramips-mt7620-elecom_wrh-300cr-squashfs-factory.bin",
           "type": "factory"
         }
@@ -3404,6 +3302,20 @@
       ],
       "target": "ipq40xx/generic"
     },
+    "EnGenius EAP2200": {
+      "id": "engenius_eap2200",
+      "images": [
+        {
+          "name": "openwrt-ipq40xx-generic-engenius_eap2200-squashfs-nand-factory.ubi",
+          "type": "nand-factory"
+        },
+        {
+          "name": "openwrt-ipq40xx-generic-engenius_eap2200-squashfs-nand-sysupgrade.bin",
+          "type": "nand-sysupgrade"
+        }
+      ],
+      "target": "ipq40xx/generic"
+    },
     "EnGenius ECB1750": {
       "id": "engenius_ecb1750",
       "images": [
@@ -3460,16 +3372,6 @@
       ],
       "target": "ath79/generic"
     },
-    "EnGenius ESR-9753": {
-      "id": "engenius_esr-9753",
-      "images": [
-        {
-          "name": "openwrt-ramips-rt305x-engenius_esr-9753-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        }
-      ],
-      "target": "ramips/rt305x"
-    },
     "EnGenius ESR600": {
       "id": "engenius_esr600",
       "images": [
@@ -3494,6 +3396,16 @@
       ],
       "target": "ath79/generic"
     },
+    "Enterasys WS-AP3705i": {
+      "id": "enterasys_ws-ap3705i",
+      "images": [
+        {
+          "name": "openwrt-ath79-generic-enterasys_ws-ap3705i-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
+        }
+      ],
+      "target": "ath79/generic"
+    },
     "Enterasys WS-AP3710i": {
       "id": "enterasys_ws-ap3710i",
       "images": [
@@ -3552,11 +3464,11 @@
       "id": "friendlyarm_nanopi-m1-plus",
       "images": [
         {
-          "name": "openwrt-sunxi-cortexa7-friendlyarm_nanopi-m1-plus-squashfs-sdcard.img.gz",
+          "name": "openwrt-sunxi-cortexa7-friendlyarm_nanopi-m1-plus-ext4-sdcard.img.gz",
           "type": "sdcard"
         },
         {
-          "name": "openwrt-sunxi-cortexa7-friendlyarm_nanopi-m1-plus-ext4-sdcard.img.gz",
+          "name": "openwrt-sunxi-cortexa7-friendlyarm_nanopi-m1-plus-squashfs-sdcard.img.gz",
           "type": "sdcard"
         }
       ],
@@ -3566,11 +3478,11 @@
       "id": "friendlyarm_nanopi-neo",
       "images": [
         {
-          "name": "openwrt-sunxi-cortexa7-friendlyarm_nanopi-neo-squashfs-sdcard.img.gz",
+          "name": "openwrt-sunxi-cortexa7-friendlyarm_nanopi-neo-ext4-sdcard.img.gz",
           "type": "sdcard"
         },
         {
-          "name": "openwrt-sunxi-cortexa7-friendlyarm_nanopi-neo-ext4-sdcard.img.gz",
+          "name": "openwrt-sunxi-cortexa7-friendlyarm_nanopi-neo-squashfs-sdcard.img.gz",
           "type": "sdcard"
         }
       ],
@@ -3590,33 +3502,25 @@
       ],
       "target": "sunxi/cortexa7"
     },
-    "FriendlyARM NanoPi NEO Plus2": {
-      "id": "friendlyarm_nanopi-neo-plus2",
+    "GL.iNet 6408": {
+      "id": "glinet_6408",
       "images": [
         {
-          "name": "openwrt-sunxi-cortexa53-friendlyarm_nanopi-neo-plus2-squashfs-sdcard.img.gz",
-          "type": "sdcard"
-        },
-        {
-          "name": "openwrt-sunxi-cortexa53-friendlyarm_nanopi-neo-plus2-ext4-sdcard.img.gz",
-          "type": "sdcard"
+          "name": "openwrt-ath79-generic-glinet_6408-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
-      "target": "sunxi/cortexa53"
+      "target": "ath79/generic"
     },
-    "FriendlyARM NanoPi NEO2": {
-      "id": "friendlyarm_nanopi-neo2",
+    "GL.iNet 6416": {
+      "id": "glinet_6416",
       "images": [
         {
-          "name": "openwrt-sunxi-cortexa53-friendlyarm_nanopi-neo2-squashfs-sdcard.img.gz",
-          "type": "sdcard"
-        },
-        {
-          "name": "openwrt-sunxi-cortexa53-friendlyarm_nanopi-neo2-ext4-sdcard.img.gz",
-          "type": "sdcard"
+          "name": "openwrt-ath79-generic-glinet_6416-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
-      "target": "sunxi/cortexa53"
+      "target": "ath79/generic"
     },
     "GL.iNet GL-AR150": {
       "id": "glinet_gl-ar150",
@@ -3695,13 +3599,13 @@
     "GL.iNet GL-AR750S NOR/NAND": {
       "id": "glinet_gl-ar750s-nor-nand",
       "images": [
-        {
-          "name": "openwrt-ath79-nand-glinet_gl-ar750s-nor-nand-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-ath79-nand-glinet_gl-ar750s-nor-nand-squashfs-factory.img",
           "type": "factory"
+        },
+        {
+          "name": "openwrt-ath79-nand-glinet_gl-ar750s-nor-nand-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ath79/nand"
@@ -3756,6 +3660,20 @@
       ],
       "target": "ramips/mt7620"
     },
+    "GL.iNet GL-MV1000": {
+      "id": "glinet_gl-mv1000",
+      "images": [
+        {
+          "name": "openwrt-mvebu-cortexa53-glinet_gl-mv1000-squashfs-sdcard.img.gz",
+          "type": "sdcard"
+        },
+        {
+          "name": "openwrt-mvebu-cortexa53-glinet_gl-mv1000-ext4-sdcard.img.gz",
+          "type": "sdcard"
+        }
+      ],
+      "target": "mvebu/cortexa53"
+    },
     "GL.iNet GL-X750": {
       "id": "glinet_gl-x750",
       "images": [
@@ -3776,169 +3694,159 @@
       ],
       "target": "ramips/mt76x8"
     },
-    "Gateworks Ventana family large NAND flash": {
-      "id": "ventana",
+    "GL.iNet microuter-N300": {
+      "id": "glinet_microuter-n300",
       "images": [
         {
-          "name": "openwrt-imx6-ventana-large-squashfs-nand.ubi",
-          "type": "nand"
+          "name": "openwrt-ramips-mt76x8-glinet_microuter-n300-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
-      "target": "imx6/"
+      "target": "ramips/mt76x8"
     },
-    "Gateworks Ventana family normal NAND flash": {
+    "Gateworks Ventana family large NAND flash": {
       "id": "ventana",
       "images": [
         {
-          "name": "openwrt-imx6-ventana-squashfs-nand.ubi",
+          "name": "openwrt-imx6-ventana-large-squashfs-nand.ubi",
           "type": "nand"
         },
         {
           "name": "openwrt-imx6-ventana-squashfs-bootfs.tar.gz",
           "type": "bootfs"
+        },
+        {
+          "name": "openwrt-imx6-ventana-squashfs-nand.ubi",
+          "type": "nand"
+        }
+      ],
+      "target": "imx6/generic"
+    },
+    "GeHua GHL-R-001": {
+      "id": "gehua_ghl-r-001",
+      "images": [
+        {
+          "name": "openwrt-ramips-mt7621-gehua_ghl-r-001-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
-      "target": "imx6/"
+      "target": "ramips/mt7621"
     },
     "Generic 963281TAN": {
-      "id": "963281TAN-generic",
+      "id": "brcm_bcm963281tan",
       "images": [
         {
-          "name": "openwrt-brcm63xx-smp-963281TAN-generic-squashfs-cfe-4M.bin",
+          "name": "openwrt-bcm63xx-smp-brcm_bcm963281tan-squashfs-cfe-4M.bin",
           "type": "cfe-4M"
         },
         {
-          "name": "openwrt-brcm63xx-smp-963281TAN-generic-squashfs-cfe-8M.bin",
-          "type": "cfe-8M"
+          "name": "openwrt-bcm63xx-smp-brcm_bcm963281tan-squashfs-cfe-16M.bin",
+          "type": "cfe-16M"
         },
         {
-          "name": "openwrt-brcm63xx-smp-963281TAN-generic-squashfs-cfe-16M.bin",
-          "type": "cfe-16M"
+          "name": "openwrt-bcm63xx-smp-brcm_bcm963281tan-squashfs-cfe-8M.bin",
+          "type": "cfe-8M"
         }
       ],
-      "target": "brcm63xx/smp"
+      "target": "bcm63xx/smp"
     },
     "Generic 96328avng": {
-      "id": "96328avng-generic",
+      "id": "brcm_bcm96328avng",
       "images": [
         {
-          "name": "openwrt-brcm63xx-smp-96328avng-generic-squashfs-cfe-4M.bin",
-          "type": "cfe-4M"
+          "name": "openwrt-bcm63xx-smp-brcm_bcm96328avng-squashfs-cfe-16M.bin",
+          "type": "cfe-16M"
         },
         {
-          "name": "openwrt-brcm63xx-smp-96328avng-generic-squashfs-cfe-8M.bin",
+          "name": "openwrt-bcm63xx-smp-brcm_bcm96328avng-squashfs-cfe-8M.bin",
           "type": "cfe-8M"
         },
         {
-          "name": "openwrt-brcm63xx-smp-96328avng-generic-squashfs-cfe-16M.bin",
-          "type": "cfe-16M"
+          "name": "openwrt-bcm63xx-smp-brcm_bcm96328avng-squashfs-cfe-4M.bin",
+          "type": "cfe-4M"
         }
       ],
-      "target": "brcm63xx/smp"
+      "target": "bcm63xx/smp"
     },
     "Generic 96338GW": {
-      "id": "96338GW-generic",
+      "id": "brcm_bcm96338gw",
       "images": [
         {
-          "name": "openwrt-brcm63xx-smp-96338GW-generic-squashfs-cfe.bin",
+          "name": "openwrt-bcm63xx-smp-brcm_bcm96338gw-squashfs-cfe.bin",
           "type": "cfe"
         }
       ],
-      "target": "brcm63xx/smp"
+      "target": "bcm63xx/smp"
     },
-    "Generic 96338W": {
-      "id": "96338W-generic",
+    "Generic 96358VW": {
+      "id": "brcm_bcm96358vw",
       "images": [
         {
-          "name": "openwrt-brcm63xx-smp-96338W-generic-squashfs-cfe.bin",
+          "name": "openwrt-bcm63xx-smp-brcm_bcm96358vw-squashfs-cfe.bin",
           "type": "cfe"
         }
       ],
-      "target": "brcm63xx/smp"
+      "target": "bcm63xx/smp"
     },
-    "Generic 96348GW": {
-      "id": "96348GW-generic",
+    "Generic 96358VW2": {
+      "id": "brcm_bcm96358vw2",
       "images": [
         {
-          "name": "openwrt-brcm63xx-smp-96348GW-generic-squashfs-cfe.bin",
+          "name": "openwrt-bcm63xx-smp-brcm_bcm96358vw2-squashfs-cfe.bin",
           "type": "cfe"
-        },
-        {
-          "name": "openwrt-brcm63xx-smp-96348GW-generic-squashfs-cfe-bc221.bin",
-          "type": "cfe-bc221"
         }
       ],
-      "target": "brcm63xx/smp"
+      "target": "bcm63xx/smp"
     },
-    "Generic 96348GW-10": {
-      "id": "96348GW-10-generic",
+    "Generic 96368MVNgr": {
+      "id": "brcm_bcm96368mvngr",
       "images": [
         {
-          "name": "openwrt-brcm63xx-smp-96348GW-10-generic-squashfs-cfe.bin",
+          "name": "openwrt-bcm63xx-smp-brcm_bcm96368mvngr-squashfs-cfe.bin",
           "type": "cfe"
         }
       ],
-      "target": "brcm63xx/smp"
+      "target": "bcm63xx/smp"
     },
-    "Generic 96348GW-11": {
-      "id": "96348GW-11-generic",
+    "Generic 96368MVWG": {
+      "id": "brcm_bcm96368mvwg",
       "images": [
         {
-          "name": "openwrt-brcm63xx-smp-96348GW-11-generic-squashfs-cfe.bin",
+          "name": "openwrt-bcm63xx-smp-brcm_bcm96368mvwg-squashfs-cfe.bin",
           "type": "cfe"
         }
       ],
-      "target": "brcm63xx/smp"
+      "target": "bcm63xx/smp"
     },
-    "Generic 96348R": {
-      "id": "96348R-generic",
+    "Generic x86/legacy": {
+      "id": "generic",
       "images": [
         {
-          "name": "openwrt-brcm63xx-smp-96348R-generic-squashfs-cfe.bin",
-          "type": "cfe"
-        }
-      ],
-      "target": "brcm63xx/smp"
-    },
-    "Generic 96358VW": {
-      "id": "96358VW-generic",
-      "images": [
+          "name": "openwrt-x86-legacy-generic-ext4-combined-efi.img.gz",
+          "type": "combined-efi"
+        },
         {
-          "name": "openwrt-brcm63xx-smp-96358VW-generic-squashfs-cfe.bin",
-          "type": "cfe"
-        }
-      ],
-      "target": "brcm63xx/smp"
-    },
-    "Generic 96358VW2": {
-      "id": "96358VW2-generic",
-      "images": [
+          "name": "openwrt-x86-legacy-generic-ext4-rootfs.img.gz",
+          "type": "rootfs"
+        },
         {
-          "name": "openwrt-brcm63xx-smp-96358VW2-generic-squashfs-cfe.bin",
-          "type": "cfe"
-        }
-      ],
-      "target": "brcm63xx/smp"
-    },
-    "Generic 96368MVNgr": {
-      "id": "96368MVNgr-generic",
-      "images": [
+          "name": "openwrt-x86-legacy-generic-squashfs-combined.img.gz",
+          "type": "combined"
+        },
         {
-          "name": "openwrt-brcm63xx-smp-96368MVNgr-generic-squashfs-cfe.bin",
-          "type": "cfe"
-        }
-      ],
-      "target": "brcm63xx/smp"
-    },
-    "Generic 96368MVWG": {
-      "id": "96368MVWG-generic",
-      "images": [
+          "name": "openwrt-x86-legacy-generic-ext4-combined.img.gz",
+          "type": "combined"
+        },
         {
-          "name": "openwrt-brcm63xx-smp-96368MVWG-generic-squashfs-cfe.bin",
-          "type": "cfe"
+          "name": "openwrt-x86-legacy-generic-squashfs-combined-efi.img.gz",
+          "type": "combined-efi"
+        },
+        {
+          "name": "openwrt-x86-legacy-generic-squashfs-rootfs.img.gz",
+          "type": "rootfs"
         }
       ],
-      "target": "brcm63xx/smp"
+      "target": "x86/legacy"
     },
     "Globalscale Mirabox": {
       "id": "globalscale_mirabox",
@@ -3970,16 +3878,6 @@
       ],
       "target": "ramips/mt7621"
     },
-    "HAME MPR A1": {
-      "id": "hame_mpr-a1",
-      "images": [
-        {
-          "name": "openwrt-ramips-rt305x-hame_mpr-a1-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        }
-      ],
-      "target": "ramips/rt305x"
-    },
     "HAME MPR A2": {
       "id": "hame_mpr-a2",
       "images": [
@@ -4044,20 +3942,6 @@
       ],
       "target": "ramips/mt7620"
     },
-    "Hi-Link HLK-RM04": {
-      "id": "hilink_hlk-rm04",
-      "images": [
-        {
-          "name": "openwrt-ramips-rt305x-hilink_hlk-rm04-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
-        {
-          "name": "openwrt-ramips-rt305x-hilink_hlk-rm04-squashfs-factory.bin",
-          "type": "factory"
-        }
-      ],
-      "target": "ramips/rt305x"
-    },
     "HiWiFi HC5661": {
       "id": "hiwifi_hc5661",
       "images": [
@@ -4118,31 +4002,35 @@
       ],
       "target": "ramips/mt76x8"
     },
-    "HooToo HT-TM02": {
-      "id": "hootoo_ht-tm02",
+    "HiWiFi HC5962": {
+      "id": "hiwifi_hc5962",
       "images": [
         {
-          "name": "openwrt-ramips-rt305x-hootoo_ht-tm02-squashfs-sysupgrade.bin",
+          "name": "openwrt-ramips-mt7621-hiwifi_hc5962-squashfs-factory.bin",
+          "type": "factory"
+        },
+        {
+          "name": "openwrt-ramips-mt7621-hiwifi_hc5962-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
         }
       ],
-      "target": "ramips/rt305x"
+      "target": "ramips/mt7621"
     },
-    "HuaWei HG255D": {
-      "id": "huawei_hg255d",
+    "HooToo HT-TM02": {
+      "id": "hootoo_ht-tm02",
       "images": [
         {
-          "name": "openwrt-ramips-rt305x-huawei_hg255d-squashfs-sysupgrade.bin",
+          "name": "openwrt-ramips-rt305x-hootoo_ht-tm02-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
         }
       ],
       "target": "ramips/rt305x"
     },
-    "Huawei D105": {
-      "id": "huawei_d105",
+    "HuaWei HG255D": {
+      "id": "huawei_hg255d",
       "images": [
         {
-          "name": "openwrt-ramips-rt305x-huawei_d105-squashfs-sysupgrade.bin",
+          "name": "openwrt-ramips-rt305x-huawei_hg255d-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
         }
       ],
@@ -4152,85 +4040,89 @@
       "id": "huawei-e970",
       "images": [
         {
-          "name": "openwrt-brcm47xx-legacy-huawei-e970-squashfs.bin",
+          "name": "openwrt-bcm47xx-legacy-huawei-e970-squashfs.bin",
           "type": "bin"
         }
       ],
-      "target": "brcm47xx/legacy"
-    },
-    "Huawei EchoLife HG520v": {
-      "id": "HG520v",
-      "images": [
-        {
-          "name": "openwrt-brcm63xx-smp-HG520v-squashfs-cfe.bin",
-          "type": "cfe"
-        }
-      ],
-      "target": "brcm63xx/smp"
+      "target": "bcm47xx/legacy"
     },
     "Huawei EchoLife HG553": {
-      "id": "HG553",
+      "id": "huawei_echolife-hg553",
       "images": [
         {
-          "name": "openwrt-brcm63xx-smp-HG553-squashfs-cfe.bin",
+          "name": "openwrt-bcm63xx-smp-huawei_echolife-hg553-squashfs-cfe.bin",
           "type": "cfe"
         }
       ],
-      "target": "brcm63xx/smp"
+      "target": "bcm63xx/smp"
     },
     "Huawei EchoLife HG556a A": {
-      "id": "HG556a-A",
+      "id": "huawei_echolife-hg556a-a",
       "images": [
         {
-          "name": "openwrt-brcm63xx-smp-HG556a-A-squashfs-cfe.bin",
+          "name": "openwrt-bcm63xx-smp-huawei_echolife-hg556a-a-squashfs-cfe.bin",
           "type": "cfe"
         }
       ],
-      "target": "brcm63xx/smp"
+      "target": "bcm63xx/smp"
     },
     "Huawei EchoLife HG556a B": {
-      "id": "HG556a-B",
+      "id": "huawei_echolife-hg556a-b",
       "images": [
         {
-          "name": "openwrt-brcm63xx-smp-HG556a-B-squashfs-cfe.bin",
+          "name": "openwrt-bcm63xx-smp-huawei_echolife-hg556a-b-squashfs-cfe.bin",
           "type": "cfe"
         }
       ],
-      "target": "brcm63xx/smp"
+      "target": "bcm63xx/smp"
     },
     "Huawei EchoLife HG556a C": {
-      "id": "HG556a-C",
+      "id": "huawei_echolife-hg556a-c",
       "images": [
         {
-          "name": "openwrt-brcm63xx-smp-HG556a-C-squashfs-cfe.bin",
+          "name": "openwrt-bcm63xx-smp-huawei_echolife-hg556a-c-squashfs-cfe.bin",
           "type": "cfe"
         }
       ],
-      "target": "brcm63xx/smp"
+      "target": "bcm63xx/smp"
     },
     "Huawei EchoLife HG622": {
-      "id": "HG622",
+      "id": "huawei_echolife-hg622",
       "images": [
         {
-          "name": "openwrt-brcm63xx-smp-HG622-squashfs-cfe.bin",
+          "name": "openwrt-bcm63xx-smp-huawei_echolife-hg622-squashfs-cfe.bin",
           "type": "cfe"
         },
         {
-          "name": "openwrt-brcm63xx-smp-HG622-squashfs-sysupgrade.bin",
+          "name": "openwrt-bcm63xx-smp-huawei_echolife-hg622-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
         }
       ],
-      "target": "brcm63xx/smp"
+      "target": "bcm63xx/smp"
     },
     "Huawei EchoLife HG655b": {
-      "id": "HG655b",
+      "id": "huawei_echolife-hg655b",
       "images": [
         {
-          "name": "openwrt-brcm63xx-smp-HG655b-squashfs-cfe.bin",
+          "name": "openwrt-bcm63xx-smp-huawei_echolife-hg655b-squashfs-cfe.bin",
           "type": "cfe"
         }
       ],
-      "target": "brcm63xx/smp"
+      "target": "bcm63xx/smp"
+    },
+    "Huawei HG253s v2": {
+      "id": "huawei_hg253s-v2",
+      "images": [
+        {
+          "name": "openwrt-bcm63xx-smp-huawei_hg253s-v2-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
+        },
+        {
+          "name": "openwrt-bcm63xx-smp-huawei_hg253s-v2-squashfs-flash.bin",
+          "type": "flash"
+        }
+      ],
+      "target": "bcm63xx/smp"
     },
     "I-O DATA ETG3-R": {
       "id": "iodata_etg3-r",
@@ -4276,6 +4168,10 @@
         {
           "name": "openwrt-ath79-generic-iodata_wn-ac1600dgr-squashfs-factory.bin",
           "type": "factory"
+        },
+        {
+          "name": "openwrt-ath79-generic-iodata_wn-ac1600dgr-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ath79/generic"
@@ -4286,6 +4182,10 @@
         {
           "name": "openwrt-ath79-generic-iodata_wn-ac1600dgr2-squashfs-dgr2-dgr3-factory.bin",
           "type": "dgr2-dgr3-factory"
+        },
+        {
+          "name": "openwrt-ath79-generic-iodata_wn-ac1600dgr2-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ath79/generic"
@@ -4328,6 +4228,36 @@
       ],
       "target": "ramips/mt7621"
     },
+    "I-O DATA WN-AX1167GR2": {
+      "id": "iodata_wn-ax1167gr2",
+      "images": [
+        {
+          "name": "openwrt-ramips-mt7621-iodata_wn-ax1167gr2-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
+        }
+      ],
+      "target": "ramips/mt7621"
+    },
+    "I-O DATA WN-AX2033GR": {
+      "id": "iodata_wn-ax2033gr",
+      "images": [
+        {
+          "name": "openwrt-ramips-mt7621-iodata_wn-ax2033gr-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
+        }
+      ],
+      "target": "ramips/mt7621"
+    },
+    "I-O DATA WN-DX1167R": {
+      "id": "iodata_wn-dx1167r",
+      "images": [
+        {
+          "name": "openwrt-ramips-mt7621-iodata_wn-dx1167r-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
+        }
+      ],
+      "target": "ramips/mt7621"
+    },
     "I-O DATA WN-GX300GR": {
       "id": "iodata_wn-gx300gr",
       "images": [
@@ -4344,6 +4274,10 @@
         {
           "name": "openwrt-ramips-mt7621-iodata_wnpr2600g-squashfs-factory.bin",
           "type": "factory"
+        },
+        {
+          "name": "openwrt-ramips-mt7621-iodata_wnpr2600g-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ramips/mt7621"
@@ -4356,65 +4290,65 @@
           "type": "factory"
         }
       ],
-      "target": "gemini/"
+      "target": "gemini/generic"
     },
     "Image with LZMA compressed kernel matching CFE decompressor": {
       "id": "standard-noloader-nodictionarylzma",
       "images": [
         {
-          "name": "openwrt-brcm47xx-mips74k-standard-noloader-nodictionarylzma-squashfs.trx",
+          "name": "openwrt-bcm47xx-mips74k-standard-noloader-nodictionarylzma-squashfs.trx",
           "type": "trx"
         }
       ],
-      "target": "brcm47xx/mips74k"
+      "target": "bcm47xx/mips74k"
     },
     "Image with LZMA loader and LZMA compressed kernel": {
       "id": "standard",
       "images": [
         {
-          "name": "openwrt-brcm47xx-mips74k-standard-squashfs.trx",
+          "name": "openwrt-bcm47xx-mips74k-standard-squashfs.trx",
           "type": "trx"
         }
       ],
-      "target": "brcm47xx/mips74k"
+      "target": "bcm47xx/mips74k"
     },
     "Image with gzipped kernel": {
       "id": "standard-noloader-gz",
       "images": [
         {
-          "name": "openwrt-brcm47xx-legacy-standard-noloader-gz-squashfs.trx",
+          "name": "openwrt-bcm47xx-legacy-standard-noloader-gz-squashfs.trx",
           "type": "trx"
         }
       ],
-      "target": "brcm47xx/legacy"
+      "target": "bcm47xx/legacy"
     },
     "Imagination Technologies Creator Ci40 (VL-62899)": {
       "id": "marduk",
       "images": [
-        {
-          "name": "openwrt-pistachio-marduk-squashfs-sysupgrade.tar",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-pistachio-marduk-squashfs-factory.ubi",
           "type": "factory"
+        },
+        {
+          "name": "openwrt-pistachio-marduk-squashfs-sysupgrade.tar",
+          "type": "sysupgrade"
         }
       ],
-      "target": "pistachio/"
+      "target": "pistachio/generic"
     },
     "Imagination Technologies Marduk board": {
       "id": "marduk",
       "images": [
-        {
-          "name": "openwrt-pistachio-marduk-squashfs-sysupgrade.tar",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-pistachio-marduk-squashfs-factory.ubi",
           "type": "factory"
+        },
+        {
+          "name": "openwrt-pistachio-marduk-squashfs-sysupgrade.tar",
+          "type": "sysupgrade"
         }
       ],
-      "target": "pistachio/"
+      "target": "pistachio/generic"
     },
     "Intenso Memory 2 Move": {
       "id": "intenso_memory2move",
@@ -4429,89 +4363,47 @@
     "Iomega Iconnect": {
       "id": "iom_iconnect-1.1",
       "images": [
-        {
-          "name": "openwrt-kirkwood-iom_iconnect-1.1-squashfs-factory.bin",
-          "type": "factory"
-        },
         {
           "name": "openwrt-kirkwood-iom_iconnect-1.1-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
+        },
+        {
+          "name": "openwrt-kirkwood-iom_iconnect-1.1-squashfs-factory.bin",
+          "type": "factory"
         }
       ],
-      "target": "kirkwood/"
+      "target": "kirkwood/generic"
     },
     "Iomega StorCenter ix2-200": {
-      "id": "iom_ix2_200",
+      "id": "iom_ix2-200",
       "images": [
         {
-          "name": "openwrt-kirkwood-iom_ix2_200-squashfs-factory.bin",
+          "name": "openwrt-kirkwood-iom_ix2-200-squashfs-factory.bin",
           "type": "factory"
         },
         {
-          "name": "openwrt-kirkwood-iom_ix2_200-squashfs-sysupgrade.bin",
+          "name": "openwrt-kirkwood-iom_ix2-200-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
         }
       ],
-      "target": "kirkwood/"
+      "target": "kirkwood/generic"
     },
     "JCG JHR-AC876M": {
       "id": "jcg_jhr-ac876m",
       "images": [
-        {
-          "name": "openwrt-ramips-mt7621-jcg_jhr-ac876m-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-ramips-mt7621-jcg_jhr-ac876m-squashfs-factory.bin",
           "type": "factory"
+        },
+        {
+          "name": "openwrt-ramips-mt7621-jcg_jhr-ac876m-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ramips/mt7621"
     },
-    "JCG JHR-N805R": {
-      "id": "jcg_jhr-n805r",
-      "images": [
-        {
-          "name": "openwrt-ramips-rt305x-jcg_jhr-n805r-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
-        {
-          "name": "openwrt-ramips-rt305x-jcg_jhr-n805r-squashfs-factory.bin",
-          "type": "factory"
-        }
-      ],
-      "target": "ramips/rt305x"
-    },
-    "JCG JHR-N825R": {
-      "id": "jcg_jhr-n825r",
-      "images": [
-        {
-          "name": "openwrt-ramips-rt305x-jcg_jhr-n825r-squashfs-factory.bin",
-          "type": "factory"
-        },
-        {
-          "name": "openwrt-ramips-rt305x-jcg_jhr-n825r-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        }
-      ],
-      "target": "ramips/rt305x"
-    },
-    "JCG JHR-N926R": {
-      "id": "jcg_jhr-n926r",
-      "images": [
-        {
-          "name": "openwrt-ramips-rt305x-jcg_jhr-n926r-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
-        {
-          "name": "openwrt-ramips-rt305x-jcg_jhr-n926r-squashfs-factory.bin",
-          "type": "factory"
-        }
-      ],
-      "target": "ramips/rt305x"
-    },
-    "KPN Experiabox 8 BRN": {
-      "id": "arcadyan_vgv7519-brn",
+    "KPN Experiabox 8 BRN": {
+      "id": "arcadyan_vgv7519-brn",
       "images": [
         {
           "name": "openwrt-lantiq-xrx200-arcadyan_vgv7519-brn-squashfs-factory.bin",
@@ -4584,15 +4476,25 @@
       ],
       "target": "ramips/mt7620"
     },
+    "LB-Link BL-W1200": {
+      "id": "lb-link_bl-w1200",
+      "images": [
+        {
+          "name": "openwrt-ramips-mt7620-lb-link_bl-w1200-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
+        }
+      ],
+      "target": "ramips/mt7620"
+    },
     "Laird WB45N": {
       "id": "wb45n",
       "images": [
         {
-          "name": "openwrt-at91-sam9x-wb45n-ubifs-root.ubi",
+          "name": "openwrt-at91-sam9x-wb45n-squashfs-root.ubi",
           "type": "root"
         },
         {
-          "name": "openwrt-at91-sam9x-wb45n-squashfs-root.ubi",
+          "name": "openwrt-at91-sam9x-wb45n-ubifs-root.ubi",
           "type": "root"
         }
       ],
@@ -4745,13 +4647,13 @@
     "Lantiq VR9 EASY80920 NAND": {
       "id": "lantiq_easy80920-nand",
       "images": [
-        {
-          "name": "openwrt-lantiq-xrx200-lantiq_easy80920-nand-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-lantiq-xrx200-lantiq_easy80920-nand-squashfs-fullimage.bin",
           "type": "fullimage"
+        },
+        {
+          "name": "openwrt-lantiq-xrx200-lantiq_easy80920-nand-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "lantiq/xrx200"
@@ -4794,26 +4696,6 @@
       ],
       "target": "sunxi/cortexa7"
     },
-    "LeMaker Banana Pi R2": {
-      "id": "lemaker_bananapi-bpi-r2",
-      "images": [
-        {
-          "name": "openwrt-mediatek-mt7623-lemaker_bananapi-bpi-r2-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        }
-      ],
-      "target": "mediatek/mt7623"
-    },
-    "LeMaker Banana Pi R64": {
-      "id": "lemaker_bananapi-bpi-r64",
-      "images": [
-        {
-          "name": "openwrt-mediatek-mt7622-lemaker_bananapi-bpi-r64-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        }
-      ],
-      "target": "mediatek/mt7622"
-    },
     "LeMaker Banana Pro": {
       "id": "lemaker_bananapro",
       "images": [
@@ -4862,11 +4744,11 @@
       "id": "linksprite_a10-pcduino",
       "images": [
         {
-          "name": "openwrt-sunxi-cortexa8-linksprite_a10-pcduino-squashfs-sdcard.img.gz",
+          "name": "openwrt-sunxi-cortexa8-linksprite_a10-pcduino-ext4-sdcard.img.gz",
           "type": "sdcard"
         },
         {
-          "name": "openwrt-sunxi-cortexa8-linksprite_a10-pcduino-ext4-sdcard.img.gz",
+          "name": "openwrt-sunxi-cortexa8-linksprite_a10-pcduino-squashfs-sdcard.img.gz",
           "type": "sdcard"
         }
       ],
@@ -4876,11 +4758,11 @@
       "id": "linksprite_pcduino3",
       "images": [
         {
-          "name": "openwrt-sunxi-cortexa7-linksprite_pcduino3-squashfs-sdcard.img.gz",
+          "name": "openwrt-sunxi-cortexa7-linksprite_pcduino3-ext4-sdcard.img.gz",
           "type": "sdcard"
         },
         {
-          "name": "openwrt-sunxi-cortexa7-linksprite_pcduino3-ext4-sdcard.img.gz",
+          "name": "openwrt-sunxi-cortexa7-linksprite_pcduino3-squashfs-sdcard.img.gz",
           "type": "sdcard"
         }
       ],
@@ -4889,13 +4771,13 @@
     "Linksys Caiman": {
       "id": "linksys_wrt1200ac",
       "images": [
-        {
-          "name": "openwrt-mvebu-cortexa9-linksys_wrt1200ac-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-mvebu-cortexa9-linksys_wrt1200ac-squashfs-factory.img",
           "type": "factory"
+        },
+        {
+          "name": "openwrt-mvebu-cortexa9-linksys_wrt1200ac-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "mvebu/cortexa9"
@@ -4918,51 +4800,51 @@
       "id": "linksys-e1000",
       "images": [
         {
-          "name": "openwrt-brcm47xx-mips74k-linksys-e1000-squashfs.bin",
+          "name": "openwrt-bcm47xx-mips74k-linksys-e1000-squashfs.bin",
           "type": "bin"
         }
       ],
-      "target": "brcm47xx/mips74k"
+      "target": "bcm47xx/mips74k"
     },
     "Linksys E1200 v1": {
       "id": "linksys-e1200-v1",
       "images": [
         {
-          "name": "openwrt-brcm47xx-mips74k-linksys-e1200-v1-squashfs.bin",
+          "name": "openwrt-bcm47xx-mips74k-linksys-e1200-v1-squashfs.bin",
           "type": "bin"
         }
       ],
-      "target": "brcm47xx/mips74k"
+      "target": "bcm47xx/mips74k"
     },
     "Linksys E1200 v2": {
       "id": "linksys-e1200-v2",
       "images": [
         {
-          "name": "openwrt-brcm47xx-mips74k-linksys-e1200-v2-squashfs.bin",
+          "name": "openwrt-bcm47xx-mips74k-linksys-e1200-v2-squashfs.bin",
           "type": "bin"
         }
       ],
-      "target": "brcm47xx/mips74k"
+      "target": "bcm47xx/mips74k"
     },
     "Linksys E1500 v1": {
       "id": "linksys-e1500-v1",
       "images": [
         {
-          "name": "openwrt-brcm47xx-mips74k-linksys-e1500-v1-squashfs.bin",
+          "name": "openwrt-bcm47xx-mips74k-linksys-e1500-v1-squashfs.bin",
           "type": "bin"
         }
       ],
-      "target": "brcm47xx/mips74k"
+      "target": "bcm47xx/mips74k"
     },
     "Linksys E1550 v1": {
       "id": "linksys-e1550-v1",
       "images": [
         {
-          "name": "openwrt-brcm47xx-mips74k-linksys-e1550-v1-squashfs.bin",
+          "name": "openwrt-bcm47xx-mips74k-linksys-e1550-v1-squashfs.bin",
           "type": "bin"
         }
       ],
-      "target": "brcm47xx/mips74k"
+      "target": "bcm47xx/mips74k"
     },
     "Linksys E1700": {
       "id": "linksys_e1700",
@@ -4982,119 +4864,105 @@
       "id": "linksys-e2000-v1",
       "images": [
         {
-          "name": "openwrt-brcm47xx-mips74k-linksys-e2000-v1-squashfs.bin",
+          "name": "openwrt-bcm47xx-mips74k-linksys-e2000-v1-squashfs.bin",
           "type": "bin"
         }
       ],
-      "target": "brcm47xx/mips74k"
+      "target": "bcm47xx/mips74k"
     },
     "Linksys E2500 v1": {
       "id": "linksys-e2500-v1",
       "images": [
         {
-          "name": "openwrt-brcm47xx-mips74k-linksys-e2500-v1-squashfs.bin",
+          "name": "openwrt-bcm47xx-mips74k-linksys-e2500-v1-squashfs.bin",
           "type": "bin"
         }
       ],
-      "target": "brcm47xx/mips74k"
+      "target": "bcm47xx/mips74k"
     },
     "Linksys E2500 v2": {
       "id": "linksys-e2500-v2",
       "images": [
         {
-          "name": "openwrt-brcm47xx-mips74k-linksys-e2500-v2-squashfs.bin",
+          "name": "openwrt-bcm47xx-mips74k-linksys-e2500-v2-squashfs.bin",
           "type": "bin"
         }
       ],
-      "target": "brcm47xx/mips74k"
+      "target": "bcm47xx/mips74k"
     },
     "Linksys E2500 v2.1": {
       "id": "linksys-e2500-v2.1",
       "images": [
         {
-          "name": "openwrt-brcm47xx-mips74k-linksys-e2500-v2.1-squashfs.bin",
+          "name": "openwrt-bcm47xx-mips74k-linksys-e2500-v2.1-squashfs.bin",
           "type": "bin"
         }
       ],
-      "target": "brcm47xx/mips74k"
+      "target": "bcm47xx/mips74k"
     },
     "Linksys E2500 v3": {
       "id": "linksys-e2500-v3",
       "images": [
         {
-          "name": "openwrt-brcm47xx-mips74k-linksys-e2500-v3-squashfs.bin",
+          "name": "openwrt-bcm47xx-mips74k-linksys-e2500-v3-squashfs.bin",
           "type": "bin"
         }
       ],
-      "target": "brcm47xx/mips74k"
+      "target": "bcm47xx/mips74k"
     },
     "Linksys E3000 v1": {
       "id": "linksys-e3000-v1",
       "images": [
         {
-          "name": "openwrt-brcm47xx-generic-linksys-e3000-v1-squashfs.bin",
+          "name": "openwrt-bcm47xx-generic-linksys-e3000-v1-squashfs.bin",
           "type": "bin"
         }
       ],
-      "target": "brcm47xx/generic"
+      "target": "bcm47xx/generic"
     },
     "Linksys E3200 v1": {
       "id": "linksys-e3200-v1",
       "images": [
         {
-          "name": "openwrt-brcm47xx-mips74k-linksys-e3200-v1-squashfs.bin",
+          "name": "openwrt-bcm47xx-mips74k-linksys-e3200-v1-squashfs.bin",
           "type": "bin"
         }
       ],
-      "target": "brcm47xx/mips74k"
+      "target": "bcm47xx/mips74k"
     },
     "Linksys E4200 v1": {
       "id": "linksys-e4200-v1",
       "images": [
         {
-          "name": "openwrt-brcm47xx-mips74k-linksys-e4200-v1-squashfs.bin",
+          "name": "openwrt-bcm47xx-mips74k-linksys-e4200-v1-squashfs.bin",
           "type": "bin"
         }
       ],
-      "target": "brcm47xx/mips74k"
+      "target": "bcm47xx/mips74k"
     },
     "Linksys E4200v2 / EA4500 (Viper)": {
       "id": "linksys_viper",
       "images": [
-        {
-          "name": "openwrt-kirkwood-linksys_viper-squashfs-factory.bin",
-          "type": "factory"
-        },
         {
           "name": "openwrt-kirkwood-linksys_viper-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
+        },
+        {
+          "name": "openwrt-kirkwood-linksys_viper-squashfs-factory.bin",
+          "type": "factory"
         }
       ],
-      "target": "kirkwood/"
+      "target": "kirkwood/generic"
     },
     "Linksys E900 v1": {
       "id": "linksys-e900-v1",
       "images": [
         {
-          "name": "openwrt-brcm47xx-mips74k-linksys-e900-v1-squashfs.bin",
+          "name": "openwrt-bcm47xx-mips74k-linksys-e900-v1-squashfs.bin",
           "type": "bin"
         }
       ],
-      "target": "brcm47xx/mips74k"
-    },
-    "Linksys EA3500 (Audi)": {
-      "id": "linksys_audi",
-      "images": [
-        {
-          "name": "openwrt-kirkwood-linksys_audi-squashfs-factory.bin",
-          "type": "factory"
-        },
-        {
-          "name": "openwrt-kirkwood-linksys_audi-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        }
-      ],
-      "target": "kirkwood/"
+      "target": "bcm47xx/mips74k"
     },
     "Linksys EA6350 v3": {
       "id": "linksys_ea6350v3",
@@ -5120,16 +4988,30 @@
       ],
       "target": "bcm53xx/generic"
     },
-    "Linksys EA8300": {
-      "id": "linksys_ea8300",
+    "Linksys EA7500 v2": {
+      "id": "linksys_ea7500-v2",
       "images": [
         {
-          "name": "openwrt-ipq40xx-generic-linksys_ea8300-squashfs-sysupgrade.bin",
+          "name": "openwrt-ramips-mt7621-linksys_ea7500-v2-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
         },
+        {
+          "name": "openwrt-ramips-mt7621-linksys_ea7500-v2-squashfs-factory.bin",
+          "type": "factory"
+        }
+      ],
+      "target": "ramips/mt7621"
+    },
+    "Linksys EA8300": {
+      "id": "linksys_ea8300",
+      "images": [
         {
           "name": "openwrt-ipq40xx-generic-linksys_ea8300-squashfs-factory.bin",
           "type": "factory"
+        },
+        {
+          "name": "openwrt-ipq40xx-generic-linksys_ea8300-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ipq40xx/generic"
@@ -5175,13 +5057,13 @@
     "Linksys Rango": {
       "id": "linksys_wrt3200acm",
       "images": [
-        {
-          "name": "openwrt-mvebu-cortexa9-linksys_wrt3200acm-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-mvebu-cortexa9-linksys_wrt3200acm-squashfs-factory.img",
           "type": "factory"
+        },
+        {
+          "name": "openwrt-mvebu-cortexa9-linksys_wrt3200acm-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "mvebu/cortexa9"
@@ -5217,13 +5099,13 @@
     "Linksys WRT1200AC": {
       "id": "linksys_wrt1200ac",
       "images": [
-        {
-          "name": "openwrt-mvebu-cortexa9-linksys_wrt1200ac-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-mvebu-cortexa9-linksys_wrt1200ac-squashfs-factory.img",
           "type": "factory"
+        },
+        {
+          "name": "openwrt-mvebu-cortexa9-linksys_wrt1200ac-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "mvebu/cortexa9"
@@ -5232,31 +5114,31 @@
       "id": "linksys-wrt150n",
       "images": [
         {
-          "name": "openwrt-brcm47xx-legacy-linksys-wrt150n-squashfs.bin",
+          "name": "openwrt-bcm47xx-legacy-linksys-wrt150n-squashfs.bin",
           "type": "bin"
         }
       ],
-      "target": "brcm47xx/legacy"
+      "target": "bcm47xx/legacy"
     },
     "Linksys WRT160N v1": {
       "id": "linksys-wrt160n-v1",
       "images": [
         {
-          "name": "openwrt-brcm47xx-legacy-linksys-wrt160n-v1-squashfs.bin",
+          "name": "openwrt-bcm47xx-legacy-linksys-wrt160n-v1-squashfs.bin",
           "type": "bin"
         }
       ],
-      "target": "brcm47xx/legacy"
+      "target": "bcm47xx/legacy"
     },
     "Linksys WRT160N v3": {
       "id": "linksys-wrt160n-v3",
       "images": [
         {
-          "name": "openwrt-brcm47xx-mips74k-linksys-wrt160n-v3-squashfs.bin",
+          "name": "openwrt-bcm47xx-mips74k-linksys-wrt160n-v3-squashfs.bin",
           "type": "bin"
         }
       ],
-      "target": "brcm47xx/mips74k"
+      "target": "bcm47xx/mips74k"
     },
     "Linksys WRT1900AC v1": {
       "id": "linksys_wrt1900ac",
@@ -5318,56 +5200,56 @@
       "id": "linksys-wrt300n-v1",
       "images": [
         {
-          "name": "openwrt-brcm47xx-legacy-linksys-wrt300n-v1-squashfs.bin",
+          "name": "openwrt-bcm47xx-legacy-linksys-wrt300n-v1-squashfs.bin",
           "type": "bin"
         },
         {
-          "name": "openwrt-brcm47xx-legacy-linksys-wrt300n-v1-squashfs.trx",
+          "name": "openwrt-bcm47xx-legacy-linksys-wrt300n-v1-squashfs.trx",
           "type": "trx"
         }
       ],
-      "target": "brcm47xx/legacy"
+      "target": "bcm47xx/legacy"
     },
     "Linksys WRT300N v1.1": {
       "id": "linksys-wrt300n-v1.1",
       "images": [
         {
-          "name": "openwrt-brcm47xx-generic-linksys-wrt300n-v1.1-squashfs.bin",
+          "name": "openwrt-bcm47xx-generic-linksys-wrt300n-v1.1-squashfs.bin",
           "type": "bin"
         }
       ],
-      "target": "brcm47xx/generic"
+      "target": "bcm47xx/generic"
     },
     "Linksys WRT310N v1": {
       "id": "linksys-wrt310n-v1",
       "images": [
         {
-          "name": "openwrt-brcm47xx-generic-linksys-wrt310n-v1-squashfs.bin",
+          "name": "openwrt-bcm47xx-generic-linksys-wrt310n-v1-squashfs.bin",
           "type": "bin"
         }
       ],
-      "target": "brcm47xx/generic"
+      "target": "bcm47xx/generic"
     },
     "Linksys WRT310N v2": {
       "id": "linksys-wrt310n-v2",
       "images": [
         {
-          "name": "openwrt-brcm47xx-mips74k-linksys-wrt310n-v2-squashfs.bin",
+          "name": "openwrt-bcm47xx-mips74k-linksys-wrt310n-v2-squashfs.bin",
           "type": "bin"
         }
       ],
-      "target": "brcm47xx/mips74k"
+      "target": "bcm47xx/mips74k"
     },
     "Linksys WRT3200ACM": {
       "id": "linksys_wrt3200acm",
       "images": [
-        {
-          "name": "openwrt-mvebu-cortexa9-linksys_wrt3200acm-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-mvebu-cortexa9-linksys_wrt3200acm-squashfs-factory.img",
           "type": "factory"
+        },
+        {
+          "name": "openwrt-mvebu-cortexa9-linksys_wrt3200acm-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "mvebu/cortexa9"
@@ -5376,11 +5258,11 @@
       "id": "linksys-wrt320n-v1",
       "images": [
         {
-          "name": "openwrt-brcm47xx-mips74k-linksys-wrt320n-v1-squashfs.bin",
+          "name": "openwrt-bcm47xx-mips74k-linksys-wrt320n-v1-squashfs.bin",
           "type": "bin"
         }
       ],
-      "target": "brcm47xx/mips74k"
+      "target": "bcm47xx/mips74k"
     },
     "Linksys WRT32X": {
       "id": "linksys_wrt32x",
@@ -5400,115 +5282,115 @@
       "id": "linksys-wrt350n-v1",
       "images": [
         {
-          "name": "openwrt-brcm47xx-generic-linksys-wrt350n-v1-squashfs.bin",
+          "name": "openwrt-bcm47xx-generic-linksys-wrt350n-v1-squashfs.bin",
           "type": "bin"
         }
       ],
-      "target": "brcm47xx/generic"
+      "target": "bcm47xx/generic"
     },
     "Linksys WRT54G": {
       "id": "linksys-wrt54g",
       "images": [
         {
-          "name": "openwrt-brcm47xx-legacy-linksys-wrt54g-squashfs.bin",
+          "name": "openwrt-bcm47xx-legacy-linksys-wrt54g-squashfs.bin",
           "type": "bin"
         }
       ],
-      "target": "brcm47xx/legacy"
+      "target": "bcm47xx/legacy"
     },
     "Linksys WRT54G-TM v1": {
       "id": "linksys-wrt54gs",
       "images": [
         {
-          "name": "openwrt-brcm47xx-legacy-linksys-wrt54gs-squashfs.bin",
+          "name": "openwrt-bcm47xx-legacy-linksys-wrt54gs-squashfs.bin",
           "type": "bin"
         }
       ],
-      "target": "brcm47xx/legacy"
+      "target": "bcm47xx/legacy"
     },
     "Linksys WRT54G3G": {
       "id": "linksys-wrt54g3g",
       "images": [
         {
-          "name": "openwrt-brcm47xx-legacy-linksys-wrt54g3g-squashfs.bin",
+          "name": "openwrt-bcm47xx-legacy-linksys-wrt54g3g-squashfs.bin",
           "type": "bin"
         }
       ],
-      "target": "brcm47xx/legacy"
+      "target": "bcm47xx/legacy"
     },
     "Linksys WRT54G3G-EM": {
       "id": "linksys-wrt54g3g-em",
       "images": [
         {
-          "name": "openwrt-brcm47xx-legacy-linksys-wrt54g3g-em-squashfs.bin",
+          "name": "openwrt-bcm47xx-legacy-linksys-wrt54g3g-em-squashfs.bin",
           "type": "bin"
         }
       ],
-      "target": "brcm47xx/legacy"
+      "target": "bcm47xx/legacy"
     },
     "Linksys WRT54G3GV2-VF": {
       "id": "linksys-wrt54g3gv2-vf",
       "images": [
         {
-          "name": "openwrt-brcm47xx-legacy-linksys-wrt54g3gv2-vf-squashfs.noheader.bin",
-          "type": "noheader"
+          "name": "openwrt-bcm47xx-legacy-linksys-wrt54g3gv2-vf-squashfs.bin",
+          "type": "bin"
         },
         {
-          "name": "openwrt-brcm47xx-legacy-linksys-wrt54g3gv2-vf-squashfs.bin",
-          "type": "bin"
+          "name": "openwrt-bcm47xx-legacy-linksys-wrt54g3gv2-vf-squashfs.noheader.bin",
+          "type": "noheader"
         }
       ],
-      "target": "brcm47xx/legacy"
+      "target": "bcm47xx/legacy"
     },
     "Linksys WRT54GS v1/v2/v3": {
       "id": "linksys-wrt54gs",
       "images": [
         {
-          "name": "openwrt-brcm47xx-legacy-linksys-wrt54gs-squashfs.bin",
+          "name": "openwrt-bcm47xx-legacy-linksys-wrt54gs-squashfs.bin",
           "type": "bin"
         }
       ],
-      "target": "brcm47xx/legacy"
+      "target": "bcm47xx/legacy"
     },
     "Linksys WRT54GS v4": {
       "id": "linksys-wrt54gs-v4",
       "images": [
         {
-          "name": "openwrt-brcm47xx-legacy-linksys-wrt54gs-v4-squashfs.bin",
+          "name": "openwrt-bcm47xx-legacy-linksys-wrt54gs-v4-squashfs.bin",
           "type": "bin"
         }
       ],
-      "target": "brcm47xx/legacy"
+      "target": "bcm47xx/legacy"
     },
     "Linksys WRT610N v1": {
       "id": "linksys-wrt610n-v1",
       "images": [
         {
-          "name": "openwrt-brcm47xx-generic-linksys-wrt610n-v1-squashfs.bin",
+          "name": "openwrt-bcm47xx-generic-linksys-wrt610n-v1-squashfs.bin",
           "type": "bin"
         }
       ],
-      "target": "brcm47xx/generic"
+      "target": "bcm47xx/generic"
     },
     "Linksys WRT610N v2": {
       "id": "linksys-wrt610n-v2",
       "images": [
         {
-          "name": "openwrt-brcm47xx-generic-linksys-wrt610n-v2-squashfs.bin",
+          "name": "openwrt-bcm47xx-generic-linksys-wrt610n-v2-squashfs.bin",
           "type": "bin"
         }
       ],
-      "target": "brcm47xx/generic"
+      "target": "bcm47xx/generic"
     },
     "Linksys WRTSL54GS": {
       "id": "linksys-wrtsl54gs",
       "images": [
         {
-          "name": "openwrt-brcm47xx-legacy-linksys-wrtsl54gs-squashfs.bin",
+          "name": "openwrt-bcm47xx-legacy-linksys-wrtsl54gs-squashfs.bin",
           "type": "bin"
         }
       ],
-      "target": "brcm47xx/legacy"
+      "target": "bcm47xx/legacy"
     },
     "Loewe WMDR-143N": {
       "id": "loewe_wmdr-143n",
@@ -5520,6 +5402,46 @@
       ],
       "target": "ramips/rt3883"
     },
+    "Luxul ABR-4500": {
+      "id": "luxul-abr-4500",
+      "images": [
+        {
+          "name": "openwrt-bcm53xx-generic-luxul-abr-4500-squashfs.lxl",
+          "type": "lxl"
+        }
+      ],
+      "target": "bcm53xx/generic"
+    },
+    "Luxul XAP-1610": {
+      "id": "luxul-xap-1610",
+      "images": [
+        {
+          "name": "openwrt-bcm53xx-generic-luxul-xap-1610-squashfs.lxl",
+          "type": "lxl"
+        }
+      ],
+      "target": "bcm53xx/generic"
+    },
+    "Luxul XBR-4500": {
+      "id": "luxul-xbr-4500",
+      "images": [
+        {
+          "name": "openwrt-bcm53xx-generic-luxul-xbr-4500-squashfs.lxl",
+          "type": "lxl"
+        }
+      ],
+      "target": "bcm53xx/generic"
+    },
+    "Luxul XWR-3150": {
+      "id": "luxul-xwr-3150",
+      "images": [
+        {
+          "name": "openwrt-bcm53xx-generic-luxul-xwr-3150-squashfs.lxl",
+          "type": "lxl"
+        }
+      ],
+      "target": "bcm53xx/generic"
+    },
     "MQmaker WiTi": {
       "id": "mqmaker_witi",
       "images": [
@@ -5564,11 +5486,11 @@
       "id": "globalscale_espressobin",
       "images": [
         {
-          "name": "openwrt-mvebu-cortexa53-globalscale_espressobin-squashfs-sdcard.img.gz",
+          "name": "openwrt-mvebu-cortexa53-globalscale_espressobin-ext4-sdcard.img.gz",
           "type": "sdcard"
         },
         {
-          "name": "openwrt-mvebu-cortexa53-globalscale_espressobin-ext4-sdcard.img.gz",
+          "name": "openwrt-mvebu-cortexa53-globalscale_espressobin-squashfs-sdcard.img.gz",
           "type": "sdcard"
         }
       ],
@@ -5592,11 +5514,11 @@
       "id": "globalscale_espressobin-v7-emmc",
       "images": [
         {
-          "name": "openwrt-mvebu-cortexa53-globalscale_espressobin-v7-emmc-ext4-sdcard.img.gz",
+          "name": "openwrt-mvebu-cortexa53-globalscale_espressobin-v7-emmc-squashfs-sdcard.img.gz",
           "type": "sdcard"
         },
         {
-          "name": "openwrt-mvebu-cortexa53-globalscale_espressobin-v7-emmc-squashfs-sdcard.img.gz",
+          "name": "openwrt-mvebu-cortexa53-globalscale_espressobin-v7-emmc-ext4-sdcard.img.gz",
           "type": "sdcard"
         }
       ],
@@ -5633,13 +5555,13 @@
     "Marvell Armada 385 Development Board AP (DB-88F6820-AP)": {
       "id": "marvell_a385-db-ap",
       "images": [
-        {
-          "name": "openwrt-mvebu-cortexa9-marvell_a385-db-ap-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-mvebu-cortexa9-marvell_a385-db-ap-squashfs-factory.img",
           "type": "factory"
+        },
+        {
+          "name": "openwrt-mvebu-cortexa9-marvell_a385-db-ap-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "mvebu/cortexa9"
@@ -5658,11 +5580,11 @@
       "id": "marvell_armada7040-db",
       "images": [
         {
-          "name": "openwrt-mvebu-cortexa72-marvell_armada7040-db-squashfs-sdcard.img.gz",
+          "name": "openwrt-mvebu-cortexa72-marvell_armada7040-db-ext4-sdcard.img.gz",
           "type": "sdcard"
         },
         {
-          "name": "openwrt-mvebu-cortexa72-marvell_armada7040-db-ext4-sdcard.img.gz",
+          "name": "openwrt-mvebu-cortexa72-marvell_armada7040-db-squashfs-sdcard.img.gz",
           "type": "sdcard"
         }
       ],
@@ -5672,11 +5594,11 @@
       "id": "marvell_armada8040-db",
       "images": [
         {
-          "name": "openwrt-mvebu-cortexa72-marvell_armada8040-db-squashfs-sdcard.img.gz",
+          "name": "openwrt-mvebu-cortexa72-marvell_armada8040-db-ext4-sdcard.img.gz",
           "type": "sdcard"
         },
         {
-          "name": "openwrt-mvebu-cortexa72-marvell_armada8040-db-ext4-sdcard.img.gz",
+          "name": "openwrt-mvebu-cortexa72-marvell_armada8040-db-squashfs-sdcard.img.gz",
           "type": "sdcard"
         }
       ],
@@ -5706,11 +5628,11 @@
       "id": "globalscale_espressobin",
       "images": [
         {
-          "name": "openwrt-mvebu-cortexa53-globalscale_espressobin-squashfs-sdcard.img.gz",
+          "name": "openwrt-mvebu-cortexa53-globalscale_espressobin-ext4-sdcard.img.gz",
           "type": "sdcard"
         },
         {
-          "name": "openwrt-mvebu-cortexa53-globalscale_espressobin-ext4-sdcard.img.gz",
+          "name": "openwrt-mvebu-cortexa53-globalscale_espressobin-squashfs-sdcard.img.gz",
           "type": "sdcard"
         }
       ],
@@ -5734,11 +5656,11 @@
       "id": "globalscale_espressobin-v7-emmc",
       "images": [
         {
-          "name": "openwrt-mvebu-cortexa53-globalscale_espressobin-v7-emmc-ext4-sdcard.img.gz",
+          "name": "openwrt-mvebu-cortexa53-globalscale_espressobin-v7-emmc-squashfs-sdcard.img.gz",
           "type": "sdcard"
         },
         {
-          "name": "openwrt-mvebu-cortexa53-globalscale_espressobin-v7-emmc-squashfs-sdcard.img.gz",
+          "name": "openwrt-mvebu-cortexa53-globalscale_espressobin-v7-emmc-ext4-sdcard.img.gz",
           "type": "sdcard"
         }
       ],
@@ -5828,26 +5750,16 @@
       ],
       "target": "ramips/mt76x8"
     },
-    "MediaTek MT7629 Lynx reference board": {
-      "id": "mediatek_mt7629-lynx-rfb",
+    "MediaTek MT7629 rfb AP": {
+      "id": "mediatek_mt7629-rfb",
       "images": [
         {
-          "name": "openwrt-mediatek-mt7629-mediatek_mt7629-lynx-rfb-squashfs-sysupgrade.bin",
+          "name": "openwrt-mediatek-mt7629-mediatek_mt7629-rfb-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
         }
       ],
       "target": "mediatek/mt7629"
     },
-    "MediaTek MTK7622 Lynx rfb1 AP": {
-      "id": "mediatek_mt7622-lynx-rfb1",
-      "images": [
-        {
-          "name": "openwrt-mediatek-mt7622-mediatek_mt7622-lynx-rfb1-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        }
-      ],
-      "target": "mediatek/mt7622"
-    },
     "MediaTek MTK7622 rfb1 AP": {
       "id": "mediatek_mt7622-rfb1",
       "images": [
@@ -5872,11 +5784,11 @@
       "id": "mele_m9",
       "images": [
         {
-          "name": "openwrt-sunxi-cortexa7-mele_m9-squashfs-sdcard.img.gz",
+          "name": "openwrt-sunxi-cortexa7-mele_m9-ext4-sdcard.img.gz",
           "type": "sdcard"
         },
         {
-          "name": "openwrt-sunxi-cortexa7-mele_m9-ext4-sdcard.img.gz",
+          "name": "openwrt-sunxi-cortexa7-mele_m9-squashfs-sdcard.img.gz",
           "type": "sdcard"
         }
       ],
@@ -5906,20 +5818,24 @@
       "id": "at91-sama5d2_ptc_ek",
       "images": [
         {
-          "name": "openwrt-at91-sama5-at91-sama5d2_ptc_ek-ubifs-zImage",
+          "name": "openwrt-at91-sama5-at91-sama5d2_ptc_ek-squashfs-zImage",
           "type": "zImage"
         },
         {
           "name": "openwrt-at91-sama5-at91-sama5d2_ptc_ek-squashfs-root.ubi",
           "type": "root"
         },
-        {
-          "name": "openwrt-at91-sama5-at91-sama5d2_ptc_ek-ubifs-root.ubi",
-          "type": "root"
-        },
         {
           "name": "openwrt-at91-sama5-at91-sama5d2_ptc_ek-ext4-sdcard.img.gz",
           "type": "sdcard"
+        },
+        {
+          "name": "openwrt-at91-sama5-at91-sama5d2_ptc_ek-ubifs-zImage",
+          "type": "zImage"
+        },
+        {
+          "name": "openwrt-at91-sama5-at91-sama5d2_ptc_ek-ubifs-root.ubi",
+          "type": "root"
         }
       ],
       "target": "at91/sama5"
@@ -5935,14 +5851,14 @@
           "name": "openwrt-at91-sama5-at91-sama5d2_xplained-ubifs-zImage",
           "type": "zImage"
         },
-        {
-          "name": "openwrt-at91-sama5-at91-sama5d2_xplained-ext4-sdcard.img.gz",
-          "type": "sdcard"
-        },
         {
           "name": "openwrt-at91-sama5-at91-sama5d2_xplained-squashfs-root.ubi",
           "type": "root"
         },
+        {
+          "name": "openwrt-at91-sama5-at91-sama5d2_xplained-ext4-sdcard.img.gz",
+          "type": "sdcard"
+        },
         {
           "name": "openwrt-at91-sama5-at91-sama5d2_xplained-squashfs-zImage",
           "type": "zImage"
@@ -5954,20 +5870,24 @@
       "id": "at91-sama5d27_som1_ek",
       "images": [
         {
-          "name": "openwrt-at91-sama5-at91-sama5d27_som1_ek-ubifs-root.ubi",
+          "name": "openwrt-at91-sama5-at91-sama5d27_som1_ek-squashfs-root.ubi",
           "type": "root"
         },
+        {
+          "name": "openwrt-at91-sama5-at91-sama5d27_som1_ek-squashfs-zImage",
+          "type": "zImage"
+        },
         {
           "name": "openwrt-at91-sama5-at91-sama5d27_som1_ek-ext4-sdcard.img.gz",
           "type": "sdcard"
         },
         {
-          "name": "openwrt-at91-sama5-at91-sama5d27_som1_ek-squashfs-root.ubi",
-          "type": "root"
+          "name": "openwrt-at91-sama5-at91-sama5d27_som1_ek-ubifs-zImage",
+          "type": "zImage"
         },
         {
-          "name": "openwrt-at91-sama5-at91-sama5d27_som1_ek-squashfs-zImage",
-          "type": "zImage"
+          "name": "openwrt-at91-sama5-at91-sama5d27_som1_ek-ubifs-root.ubi",
+          "type": "root"
         }
       ],
       "target": "at91/sama5"
@@ -5976,31 +5896,35 @@
       "id": "at91-sama5d3_xplained",
       "images": [
         {
-          "name": "openwrt-at91-sama5-at91-sama5d3_xplained-ubifs-root.ubi",
+          "name": "openwrt-at91-sama5-at91-sama5d3_xplained-ext4-sdcard.img.gz",
+          "type": "sdcard"
+        },
+        {
+          "name": "openwrt-at91-sama5-at91-sama5d3_xplained-squashfs-root.ubi",
           "type": "root"
         },
         {
           "name": "openwrt-at91-sama5-at91-sama5d3_xplained-ubifs-zImage",
           "type": "zImage"
         },
-        {
-          "name": "openwrt-at91-sama5-at91-sama5d3_xplained-squashfs-root.ubi",
-          "type": "root"
-        },
         {
           "name": "openwrt-at91-sama5-at91-sama5d3_xplained-squashfs-zImage",
           "type": "zImage"
         },
         {
-          "name": "openwrt-at91-sama5-at91-sama5d3_xplained-ext4-sdcard.img.gz",
-          "type": "sdcard"
-        }
+          "name": "openwrt-at91-sama5-at91-sama5d3_xplained-ubifs-root.ubi",
+          "type": "root"
+        }
       ],
       "target": "at91/sama5"
     },
     "Microchip SAMA5D4 Xplained": {
       "id": "at91-sama5d4_xplained",
       "images": [
+        {
+          "name": "openwrt-at91-sama5-at91-sama5d4_xplained-squashfs-zImage",
+          "type": "zImage"
+        },
         {
           "name": "openwrt-at91-sama5-at91-sama5d4_xplained-ubifs-root.ubi",
           "type": "root"
@@ -6013,10 +5937,6 @@
           "name": "openwrt-at91-sama5-at91-sama5d4_xplained-squashfs-root.ubi",
           "type": "root"
         },
-        {
-          "name": "openwrt-at91-sama5-at91-sama5d4_xplained-squashfs-zImage",
-          "type": "zImage"
-        },
         {
           "name": "openwrt-at91-sama5-at91-sama5d4_xplained-ext4-sdcard.img.gz",
           "type": "sdcard"
@@ -6042,33 +5962,43 @@
           "type": "sysupgrade"
         }
       ],
-      "target": "rb532/"
+      "target": "rb532/generic"
     },
-    "MikroTik RouterBOARD M11G": {
-      "id": "mikrotik_rbm11g",
+    "MikroTik RouterBOARD 750Gr3": {
+      "id": "mikrotik_routerboard-750gr3",
       "images": [
         {
-          "name": "openwrt-ramips-mt7621-mikrotik_rbm11g-squashfs-sysupgrade.bin",
+          "name": "openwrt-ramips-mt7621-mikrotik_routerboard-750gr3-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
         }
       ],
       "target": "ramips/mt7621"
     },
-    "MikroTik RouterBOARD M33G": {
-      "id": "mikrotik_rbm33g",
+    "MikroTik RouterBOARD 922UAGS-5HPacD": {
+      "id": "mikrotik_routerboard-922uags-5hpacd",
+      "images": [
+        {
+          "name": "openwrt-ath79-mikrotik-mikrotik_routerboard-922uags-5hpacd-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
+        }
+      ],
+      "target": "ath79/mikrotik"
+    },
+    "MikroTik RouterBOARD M11G": {
+      "id": "mikrotik_routerboard-m11g",
       "images": [
         {
-          "name": "openwrt-ramips-mt7621-mikrotik_rbm33g-squashfs-sysupgrade.bin",
+          "name": "openwrt-ramips-mt7621-mikrotik_routerboard-m11g-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
         }
       ],
       "target": "ramips/mt7621"
     },
-    "MikroTik RouterBOARD RB750G r3": {
-      "id": "mikrotik_rb750gr3",
+    "MikroTik RouterBOARD M33G": {
+      "id": "mikrotik_routerboard-m33g",
       "images": [
         {
-          "name": "openwrt-ramips-mt7621-mikrotik_rb750gr3-squashfs-sysupgrade.bin",
+          "name": "openwrt-ramips-mt7621-mikrotik_routerboard-m33g-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
         }
       ],
@@ -6078,21 +6008,21 @@
       "id": "mikrotik_routerboard-wap-g-5hact2hnd",
       "images": [
         {
-          "name": "openwrt-ath79-generic-mikrotik_routerboard-wap-g-5hact2hnd-squashfs-sysupgrade.bin",
+          "name": "openwrt-ath79-mikrotik-mikrotik_routerboard-wap-g-5hact2hnd-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
         }
       ],
-      "target": "ath79/generic"
+      "target": "ath79/mikrotik"
     },
     "MitraStar STG-212": {
       "id": "mitrastar_stg-212",
       "images": [
         {
-          "name": "openwrt-oxnas-ox820-mitrastar_stg-212-ubifs-ubinized.bin",
-          "type": "ubinized"
+          "name": "openwrt-oxnas-ox820-mitrastar_stg-212-ubifs-sysupgrade.tar",
+          "type": "sysupgrade"
         },
         {
-          "name": "openwrt-oxnas-ox820-mitrastar_stg-212-ubifs-sysupgrade.tar",
+          "name": "openwrt-oxnas-ox820-mitrastar_stg-212-squashfs-sysupgrade.tar",
           "type": "sysupgrade"
         },
         {
@@ -6100,8 +6030,8 @@
           "type": "ubinized"
         },
         {
-          "name": "openwrt-oxnas-ox820-mitrastar_stg-212-squashfs-sysupgrade.tar",
-          "type": "sysupgrade"
+          "name": "openwrt-oxnas-ox820-mitrastar_stg-212-ubifs-ubinized.bin",
+          "type": "ubinized"
         }
       ],
       "target": "oxnas/ox820"
@@ -6116,46 +6046,60 @@
       ],
       "target": "ramips/rt305x"
     },
+    "MobiPromo CM520-79F": {
+      "id": "mobipromo_cm520-79f",
+      "images": [
+        {
+          "name": "openwrt-ipq40xx-generic-mobipromo_cm520-79f-squashfs-nand-sysupgrade.bin",
+          "type": "nand-sysupgrade"
+        },
+        {
+          "name": "openwrt-ipq40xx-generic-mobipromo_cm520-79f-squashfs-nand-factory.ubi",
+          "type": "nand-factory"
+        }
+      ],
+      "target": "ipq40xx/generic"
+    },
     "Motorola WA840G": {
       "id": "motorola-wa840g",
       "images": [
         {
-          "name": "openwrt-brcm47xx-legacy-motorola-wa840g-squashfs.bin",
+          "name": "openwrt-bcm47xx-legacy-motorola-wa840g-squashfs.bin",
           "type": "bin"
         }
       ],
-      "target": "brcm47xx/legacy"
+      "target": "bcm47xx/legacy"
     },
     "Motorola WE800G": {
       "id": "motorola-we800g",
       "images": [
         {
-          "name": "openwrt-brcm47xx-legacy-motorola-we800g-squashfs.bin",
+          "name": "openwrt-bcm47xx-legacy-motorola-we800g-squashfs.bin",
           "type": "bin"
         }
       ],
-      "target": "brcm47xx/legacy"
+      "target": "bcm47xx/legacy"
     },
     "Motorola WR850G": {
       "id": "motorola-wr850g",
       "images": [
         {
-          "name": "openwrt-brcm47xx-legacy-motorola-wr850g-squashfs.bin",
+          "name": "openwrt-bcm47xx-legacy-motorola-wr850g-squashfs.bin",
           "type": "bin"
         }
       ],
-      "target": "brcm47xx/legacy"
+      "target": "bcm47xx/legacy"
     },
     "NEC Aterm WG1200CR": {
       "id": "nec_wg1200cr",
       "images": [
-        {
-          "name": "openwrt-ath79-generic-nec_wg1200cr-squashfs-factory.bin",
-          "type": "factory"
-        },
         {
           "name": "openwrt-ath79-generic-nec_wg1200cr-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
+        },
+        {
+          "name": "openwrt-ath79-generic-nec_wg1200cr-squashfs-factory.bin",
+          "type": "factory"
         }
       ],
       "target": "ath79/generic"
@@ -6219,13 +6163,13 @@
           "name": "openwrt-lantiq-xway-netgear_dgn3500-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
         },
-        {
-          "name": "openwrt-lantiq-xway-netgear_dgn3500-squashfs-factory-na.img",
-          "type": "factory-na"
-        },
         {
           "name": "openwrt-lantiq-xway-netgear_dgn3500-squashfs-factory.img",
           "type": "factory"
+        },
+        {
+          "name": "openwrt-lantiq-xway-netgear_dgn3500-squashfs-factory-na.img",
+          "type": "factory-na"
         }
       ],
       "target": "lantiq/xway"
@@ -6245,85 +6189,85 @@
       "target": "lantiq/xway"
     },
     "NETGEAR DGND3700 v1": {
-      "id": "DGND3700v1",
+      "id": "netgear_dgnd3700-v1",
       "images": [
         {
-          "name": "openwrt-brcm63xx-smp-DGND3700v1-squashfs-factory.chk",
+          "name": "openwrt-bcm63xx-smp-netgear_dgnd3700-v1-squashfs-factory.chk",
           "type": "factory"
         },
         {
-          "name": "openwrt-brcm63xx-smp-DGND3700v1-squashfs-sysupgrade.bin",
+          "name": "openwrt-bcm63xx-smp-netgear_dgnd3700-v1-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
         }
       ],
-      "target": "brcm63xx/smp"
+      "target": "bcm63xx/smp"
     },
-    "NETGEAR DGND3800B": {
-      "id": "DGND3800B",
+    "NETGEAR DGND3700 v2": {
+      "id": "netgear_dgnd3700-v2",
       "images": [
         {
-          "name": "openwrt-brcm63xx-smp-DGND3800B-squashfs-factory.chk",
-          "type": "factory"
+          "name": "openwrt-bcm63xx-smp-netgear_dgnd3700-v2-squashfs-cfe.bin",
+          "type": "cfe"
         },
         {
-          "name": "openwrt-brcm63xx-smp-DGND3800B-squashfs-sysupgrade.bin",
+          "name": "openwrt-bcm63xx-smp-netgear_dgnd3700-v2-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
         }
       ],
-      "target": "brcm63xx/smp"
+      "target": "bcm63xx/smp"
     },
-    "NETGEAR DM200": {
-      "id": "netgear_dm200",
+    "NETGEAR DGND3800B": {
+      "id": "netgear_dgnd3800b",
       "images": [
         {
-          "name": "openwrt-lantiq-xrx200-netgear_dm200-squashfs-sysupgrade.bin",
+          "name": "openwrt-bcm63xx-smp-netgear_dgnd3800b-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
         },
         {
-          "name": "openwrt-lantiq-xrx200-netgear_dm200-squashfs-factory.img",
+          "name": "openwrt-bcm63xx-smp-netgear_dgnd3800b-squashfs-factory.chk",
           "type": "factory"
         }
       ],
-      "target": "lantiq/xrx200"
+      "target": "bcm63xx/smp"
     },
-    "NETGEAR EVG2000": {
-      "id": "EVG2000",
+    "NETGEAR DM200": {
+      "id": "netgear_dm200",
       "images": [
         {
-          "name": "openwrt-brcm63xx-smp-EVG2000-squashfs-factory.chk",
+          "name": "openwrt-lantiq-xrx200-netgear_dm200-squashfs-factory.img",
           "type": "factory"
         },
         {
-          "name": "openwrt-brcm63xx-smp-EVG2000-squashfs-sysupgrade.bin",
+          "name": "openwrt-lantiq-xrx200-netgear_dm200-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
         }
       ],
-      "target": "brcm63xx/smp"
+      "target": "lantiq/xrx200"
     },
-    "NETGEAR EX2700": {
-      "id": "netgear_ex2700",
+    "NETGEAR EVG2000": {
+      "id": "netgear_evg2000",
       "images": [
         {
-          "name": "openwrt-ramips-mt7620-netgear_ex2700-squashfs-factory.bin",
-          "type": "factory"
+          "name": "openwrt-bcm63xx-smp-netgear_evg2000-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         },
         {
-          "name": "openwrt-ramips-mt7620-netgear_ex2700-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
+          "name": "openwrt-bcm63xx-smp-netgear_evg2000-squashfs-factory.chk",
+          "type": "factory"
         }
       ],
-      "target": "ramips/mt7620"
+      "target": "bcm63xx/smp"
     },
     "NETGEAR EX3700/EX3800": {
       "id": "netgear_ex3700",
       "images": [
-        {
-          "name": "openwrt-ramips-mt7620-netgear_ex3700-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-ramips-mt7620-netgear_ex3700-squashfs-factory.chk",
           "type": "factory"
+        },
+        {
+          "name": "openwrt-ramips-mt7620-netgear_ex3700-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ramips/mt7620"
@@ -6345,13 +6289,13 @@
     "NETGEAR EX6150": {
       "id": "netgear_ex6150",
       "images": [
-        {
-          "name": "openwrt-ramips-mt7621-netgear_ex6150-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-ramips-mt7621-netgear_ex6150-squashfs-factory.chk",
           "type": "factory"
+        },
+        {
+          "name": "openwrt-ramips-mt7621-netgear_ex6150-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ramips/mt7621"
@@ -6359,13 +6303,13 @@
     "NETGEAR EX6400": {
       "id": "netgear_ex6400",
       "images": [
-        {
-          "name": "openwrt-ath79-generic-netgear_ex6400-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-ath79-generic-netgear_ex6400-squashfs-factory.img",
           "type": "factory"
+        },
+        {
+          "name": "openwrt-ath79-generic-netgear_ex6400-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ath79/generic"
@@ -6384,6 +6328,28 @@
       ],
       "target": "ath79/generic"
     },
+    "NETGEAR Nighthawk AC2400 v1": {
+      "id": "netgear_r6700-v2",
+      "images": [
+        {
+          "name": "openwrt-ramips-mt7621-netgear_r6700-v2-squashfs-rootfs.bin",
+          "type": "rootfs"
+        },
+        {
+          "name": "openwrt-ramips-mt7621-netgear_r6700-v2-squashfs-kernel.bin",
+          "type": "kernel"
+        },
+        {
+          "name": "openwrt-ramips-mt7621-netgear_r6700-v2-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
+        },
+        {
+          "name": "openwrt-ramips-mt7621-netgear_r6700-v2-squashfs-factory.img",
+          "type": "factory"
+        }
+      ],
+      "target": "ramips/mt7621"
+    },
     "NETGEAR Nighthawk X4 D7800": {
       "id": "netgear_d7800",
       "images": [
@@ -6457,6 +6423,10 @@
     "NETGEAR R6220": {
       "id": "netgear_r6220",
       "images": [
+        {
+          "name": "openwrt-ramips-mt7621-netgear_r6220-squashfs-factory.img",
+          "type": "factory"
+        },
         {
           "name": "openwrt-ramips-mt7621-netgear_r6220-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
@@ -6465,10 +6435,6 @@
           "name": "openwrt-ramips-mt7621-netgear_r6220-squashfs-kernel.bin",
           "type": "kernel"
         },
-        {
-          "name": "openwrt-ramips-mt7621-netgear_r6220-squashfs-factory.img",
-          "type": "factory"
-        },
         {
           "name": "openwrt-ramips-mt7621-netgear_r6220-squashfs-rootfs.bin",
           "type": "rootfs"
@@ -6489,13 +6455,21 @@
     "NETGEAR R6260": {
       "id": "netgear_r6260",
       "images": [
+        {
+          "name": "openwrt-ramips-mt7621-netgear_r6260-squashfs-factory.img",
+          "type": "factory"
+        },
         {
           "name": "openwrt-ramips-mt7621-netgear_r6260-squashfs-kernel.bin",
           "type": "kernel"
         },
         {
-          "name": "openwrt-ramips-mt7621-netgear_r6260-squashfs-factory.img",
-          "type": "factory"
+          "name": "openwrt-ramips-mt7621-netgear_r6260-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
+        },
+        {
+          "name": "openwrt-ramips-mt7621-netgear_r6260-squashfs-rootfs.bin",
+          "type": "rootfs"
         }
       ],
       "target": "ramips/mt7621"
@@ -6513,36 +6487,72 @@
     "NETGEAR R6350": {
       "id": "netgear_r6350",
       "images": [
+        {
+          "name": "openwrt-ramips-mt7621-netgear_r6350-squashfs-rootfs.bin",
+          "type": "rootfs"
+        },
+        {
+          "name": "openwrt-ramips-mt7621-netgear_r6350-squashfs-factory.img",
+          "type": "factory"
+        },
+        {
+          "name": "openwrt-ramips-mt7621-netgear_r6350-squashfs-kernel.bin",
+          "type": "kernel"
+        },
         {
           "name": "openwrt-ramips-mt7621-netgear_r6350-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
+        }
+      ],
+      "target": "ramips/mt7621"
+    },
+    "NETGEAR R6700 v2": {
+      "id": "netgear_r6700-v2",
+      "images": [
+        {
+          "name": "openwrt-ramips-mt7621-netgear_r6700-v2-squashfs-rootfs.bin",
+          "type": "rootfs"
         },
         {
-          "name": "openwrt-ramips-mt7621-netgear_r6350-squashfs-kernel.bin",
+          "name": "openwrt-ramips-mt7621-netgear_r6700-v2-squashfs-kernel.bin",
           "type": "kernel"
         },
         {
-          "name": "openwrt-ramips-mt7621-netgear_r6350-squashfs-factory.img",
-          "type": "factory"
+          "name": "openwrt-ramips-mt7621-netgear_r6700-v2-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         },
         {
-          "name": "openwrt-ramips-mt7621-netgear_r6350-squashfs-rootfs.bin",
-          "type": "rootfs"
+          "name": "openwrt-ramips-mt7621-netgear_r6700-v2-squashfs-factory.img",
+          "type": "factory"
         }
       ],
       "target": "ramips/mt7621"
     },
-    "NETGEAR R6850": {
-      "id": "netgear_r6850",
+    "NETGEAR R6800": {
+      "id": "netgear_r6800",
       "images": [
         {
-          "name": "openwrt-ramips-mt7621-netgear_r6850-squashfs-kernel.bin",
+          "name": "openwrt-ramips-mt7621-netgear_r6800-squashfs-kernel.bin",
           "type": "kernel"
         },
         {
-          "name": "openwrt-ramips-mt7621-netgear_r6850-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
+          "name": "openwrt-ramips-mt7621-netgear_r6800-squashfs-rootfs.bin",
+          "type": "rootfs"
+        },
+        {
+          "name": "openwrt-ramips-mt7621-netgear_r6800-squashfs-factory.img",
+          "type": "factory"
         },
+        {
+          "name": "openwrt-ramips-mt7621-netgear_r6800-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
+        }
+      ],
+      "target": "ramips/mt7621"
+    },
+    "NETGEAR R6850": {
+      "id": "netgear_r6850",
+      "images": [
         {
           "name": "openwrt-ramips-mt7621-netgear_r6850-squashfs-factory.img",
           "type": "factory"
@@ -6550,6 +6560,14 @@
         {
           "name": "openwrt-ramips-mt7621-netgear_r6850-squashfs-rootfs.bin",
           "type": "rootfs"
+        },
+        {
+          "name": "openwrt-ramips-mt7621-netgear_r6850-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
+        },
+        {
+          "name": "openwrt-ramips-mt7621-netgear_r6850-squashfs-kernel.bin",
+          "type": "kernel"
         }
       ],
       "target": "ramips/mt7621"
@@ -6564,6 +6582,28 @@
       ],
       "target": "bcm53xx/generic"
     },
+    "NETGEAR R7200 v1": {
+      "id": "netgear_r6700-v2",
+      "images": [
+        {
+          "name": "openwrt-ramips-mt7621-netgear_r6700-v2-squashfs-rootfs.bin",
+          "type": "rootfs"
+        },
+        {
+          "name": "openwrt-ramips-mt7621-netgear_r6700-v2-squashfs-kernel.bin",
+          "type": "kernel"
+        },
+        {
+          "name": "openwrt-ramips-mt7621-netgear_r6700-v2-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
+        },
+        {
+          "name": "openwrt-ramips-mt7621-netgear_r6700-v2-squashfs-factory.img",
+          "type": "factory"
+        }
+      ],
+      "target": "ramips/mt7621"
+    },
     "NETGEAR R7900": {
       "id": "netgear-r7900",
       "images": [
@@ -6588,93 +6628,75 @@
       "id": "netgear-wgr614-v10",
       "images": [
         {
-          "name": "openwrt-brcm47xx-mips74k-netgear-wgr614-v10-squashfs.chk",
+          "name": "openwrt-bcm47xx-mips74k-netgear-wgr614-v10-squashfs.chk",
           "type": "chk"
         }
       ],
-      "target": "brcm47xx/mips74k"
+      "target": "bcm47xx/mips74k"
     },
     "NETGEAR WGR614 v10 (NA)": {
       "id": "netgear-wgr614-v10-na",
       "images": [
         {
-          "name": "openwrt-brcm47xx-mips74k-netgear-wgr614-v10-na-squashfs.chk",
+          "name": "openwrt-bcm47xx-mips74k-netgear-wgr614-v10-na-squashfs.chk",
           "type": "chk"
         }
       ],
-      "target": "brcm47xx/mips74k"
+      "target": "bcm47xx/mips74k"
     },
     "NETGEAR WGR614 v8": {
       "id": "netgear-wgr614-v8",
       "images": [
         {
-          "name": "openwrt-brcm47xx-legacy-netgear-wgr614-v8-squashfs.chk",
+          "name": "openwrt-bcm47xx-legacy-netgear-wgr614-v8-squashfs.chk",
           "type": "chk"
         }
       ],
-      "target": "brcm47xx/legacy"
+      "target": "bcm47xx/legacy"
     },
     "NETGEAR WGT634U": {
       "id": "netgear-wgt634u",
       "images": [
         {
-          "name": "openwrt-brcm47xx-legacy-netgear-wgt634u-squashfs.bin",
+          "name": "openwrt-bcm47xx-legacy-netgear-wgt634u-squashfs.bin",
           "type": "bin"
         }
       ],
-      "target": "brcm47xx/legacy"
+      "target": "bcm47xx/legacy"
     },
     "NETGEAR WN2500RP v1": {
       "id": "netgear-wn2500rp-v1",
       "images": [
         {
-          "name": "openwrt-brcm47xx-mips74k-netgear-wn2500rp-v1-squashfs.chk",
+          "name": "openwrt-bcm47xx-mips74k-netgear-wn2500rp-v1-squashfs.chk",
           "type": "chk"
         }
       ],
-      "target": "brcm47xx/mips74k"
+      "target": "bcm47xx/mips74k"
     },
     "NETGEAR WN3000RP": {
       "id": "netgear-wn3000rp",
       "images": [
         {
-          "name": "openwrt-brcm47xx-mips74k-netgear-wn3000rp-squashfs.chk",
+          "name": "openwrt-bcm47xx-mips74k-netgear-wn3000rp-squashfs.chk",
           "type": "chk"
         }
       ],
-      "target": "brcm47xx/mips74k"
+      "target": "bcm47xx/mips74k"
     },
     "NETGEAR WN3000RP v3": {
       "id": "netgear_wn3000rp-v3",
       "images": [
-        {
-          "name": "openwrt-ramips-mt7620-netgear_wn3000rp-v3-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-ramips-mt7620-netgear_wn3000rp-v3-squashfs-factory.bin",
           "type": "factory"
-        }
-      ],
-      "target": "ramips/mt7620"
-    },
-    "NETGEAR WNCE2001": {
-      "id": "netgear_wnce2001",
-      "images": [
-        {
-          "name": "openwrt-ramips-rt305x-netgear_wnce2001-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
-        {
-          "name": "openwrt-ramips-rt305x-netgear_wnce2001-squashfs-factory.bin",
-          "type": "factory"
         },
         {
-          "name": "openwrt-ramips-rt305x-netgear_wnce2001-squashfs-factory-NA.bin",
-          "type": "factory-NA"
+          "name": "openwrt-ramips-mt7620-netgear_wn3000rp-v3-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
-      "target": "ramips/rt305x"
+      "target": "ramips/mt7620"
     },
     "NETGEAR WNDAP620 (Premium Wireless-N)": {
       "id": "netgear_wndap620",
@@ -6708,53 +6730,53 @@
       "id": "netgear-wndr3300-v1",
       "images": [
         {
-          "name": "openwrt-brcm47xx-legacy-netgear-wndr3300-v1-squashfs.chk",
+          "name": "openwrt-bcm47xx-legacy-netgear-wndr3300-v1-squashfs.chk",
           "type": "chk"
         }
       ],
-      "target": "brcm47xx/legacy"
+      "target": "bcm47xx/legacy"
     },
     "NETGEAR WNDR3400 v1": {
       "id": "netgear-wndr3400-v1",
       "images": [
         {
-          "name": "openwrt-brcm47xx-mips74k-netgear-wndr3400-v1-squashfs.chk",
+          "name": "openwrt-bcm47xx-mips74k-netgear-wndr3400-v1-squashfs.chk",
           "type": "chk"
         }
       ],
-      "target": "brcm47xx/mips74k"
+      "target": "bcm47xx/mips74k"
     },
     "NETGEAR WNDR3400 v2": {
       "id": "netgear-wndr3400-v2",
       "images": [
         {
-          "name": "openwrt-brcm47xx-mips74k-netgear-wndr3400-v2-squashfs.chk",
+          "name": "openwrt-bcm47xx-mips74k-netgear-wndr3400-v2-squashfs.chk",
           "type": "chk"
         }
       ],
-      "target": "brcm47xx/mips74k"
+      "target": "bcm47xx/mips74k"
     },
     "NETGEAR WNDR3400 v3": {
       "id": "netgear-wndr3400-v3",
       "images": [
         {
-          "name": "openwrt-brcm47xx-mips74k-netgear-wndr3400-v3-squashfs.chk",
+          "name": "openwrt-bcm47xx-mips74k-netgear-wndr3400-v3-squashfs.chk",
           "type": "chk"
         }
       ],
-      "target": "brcm47xx/mips74k"
+      "target": "bcm47xx/mips74k"
     },
     "NETGEAR WNDR3700 v1": {
       "id": "netgear_wndr3700",
       "images": [
-        {
-          "name": "openwrt-ath79-generic-netgear_wndr3700-squashfs-factory.img",
-          "type": "factory"
-        },
         {
           "name": "openwrt-ath79-generic-netgear_wndr3700-squashfs-factory-NA.img",
           "type": "factory-NA"
         },
+        {
+          "name": "openwrt-ath79-generic-netgear_wndr3700-squashfs-factory.img",
+          "type": "factory"
+        },
         {
           "name": "openwrt-ath79-generic-netgear_wndr3700-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
@@ -6763,15 +6785,15 @@
       "target": "ath79/generic"
     },
     "NETGEAR WNDR3700 v2": {
-      "id": "netgear_wndr3700v2",
+      "id": "netgear_wndr3700-v2",
       "images": [
         {
-          "name": "openwrt-ath79-generic-netgear_wndr3700v2-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
+          "name": "openwrt-ath79-generic-netgear_wndr3700-v2-squashfs-factory.img",
+          "type": "factory"
         },
         {
-          "name": "openwrt-ath79-generic-netgear_wndr3700v2-squashfs-factory.img",
-          "type": "factory"
+          "name": "openwrt-ath79-generic-netgear_wndr3700-v2-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ath79/generic"
@@ -6780,11 +6802,11 @@
       "id": "netgear-wndr3700-v3",
       "images": [
         {
-          "name": "openwrt-brcm47xx-mips74k-netgear-wndr3700-v3-squashfs.chk",
+          "name": "openwrt-bcm47xx-mips74k-netgear-wndr3700-v3-squashfs.chk",
           "type": "chk"
         }
       ],
-      "target": "brcm47xx/mips74k"
+      "target": "bcm47xx/mips74k"
     },
     "NETGEAR WNDR3700 v4": {
       "id": "netgear_wndr3700-v4",
@@ -6803,13 +6825,13 @@
     "NETGEAR WNDR3700 v5": {
       "id": "netgear_wndr3700-v5",
       "images": [
-        {
-          "name": "openwrt-ramips-mt7621-netgear_wndr3700-v5-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-ramips-mt7621-netgear_wndr3700-v5-squashfs-factory.img",
           "type": "factory"
+        },
+        {
+          "name": "openwrt-ramips-mt7621-netgear_wndr3700-v5-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ramips/mt7621"
@@ -6831,13 +6853,13 @@
     "NETGEAR WNDR3800CH": {
       "id": "netgear_wndr3800ch",
       "images": [
-        {
-          "name": "openwrt-ath79-generic-netgear_wndr3800ch-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-ath79-generic-netgear_wndr3800ch-squashfs-factory.img",
           "type": "factory"
+        },
+        {
+          "name": "openwrt-ath79-generic-netgear_wndr3800ch-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ath79/generic"
@@ -6846,22 +6868,22 @@
       "id": "netgear-wndr4000",
       "images": [
         {
-          "name": "openwrt-brcm47xx-mips74k-netgear-wndr4000-squashfs.chk",
+          "name": "openwrt-bcm47xx-mips74k-netgear-wndr4000-squashfs.chk",
           "type": "chk"
         }
       ],
-      "target": "brcm47xx/mips74k"
+      "target": "bcm47xx/mips74k"
     },
     "NETGEAR WNDR4300": {
       "id": "netgear_wndr4300",
       "images": [
-        {
-          "name": "openwrt-ath79-nand-netgear_wndr4300-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-ath79-nand-netgear_wndr4300-squashfs-factory.img",
           "type": "factory"
+        },
+        {
+          "name": "openwrt-ath79-nand-netgear_wndr4300-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ath79/nand"
@@ -6869,13 +6891,13 @@
     "NETGEAR WNDR4300 v2": {
       "id": "netgear_wndr4300-v2",
       "images": [
-        {
-          "name": "openwrt-ath79-nand-netgear_wndr4300-v2-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-ath79-nand-netgear_wndr4300-v2-squashfs-factory.img",
           "type": "factory"
+        },
+        {
+          "name": "openwrt-ath79-nand-netgear_wndr4300-v2-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ath79/nand"
@@ -6897,13 +6919,13 @@
     "NETGEAR WNR1000 v2": {
       "id": "netgear_wnr1000-v2",
       "images": [
-        {
-          "name": "openwrt-ath79-tiny-netgear_wnr1000-v2-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-ath79-tiny-netgear_wnr1000-v2-squashfs-factory.img",
           "type": "factory"
+        },
+        {
+          "name": "openwrt-ath79-tiny-netgear_wnr1000-v2-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ath79/tiny"
@@ -6912,36 +6934,36 @@
       "id": "netgear-wnr1000-v3",
       "images": [
         {
-          "name": "openwrt-brcm47xx-mips74k-netgear-wnr1000-v3-squashfs.chk",
+          "name": "openwrt-bcm47xx-mips74k-netgear-wnr1000-v3-squashfs.chk",
           "type": "chk"
         }
       ],
-      "target": "brcm47xx/mips74k"
+      "target": "bcm47xx/mips74k"
     },
     "NETGEAR WNR2000 v2": {
       "id": "netgear-wnr2000v2",
       "images": [
         {
-          "name": "openwrt-brcm47xx-mips74k-netgear-wnr2000v2-squashfs.chk",
+          "name": "openwrt-bcm47xx-mips74k-netgear-wnr2000v2-squashfs.chk",
           "type": "chk"
         }
       ],
-      "target": "brcm47xx/mips74k"
+      "target": "bcm47xx/mips74k"
     },
     "NETGEAR WNR2000 v3": {
       "id": "netgear_wnr2000-v3",
       "images": [
         {
-          "name": "openwrt-ath79-tiny-netgear_wnr2000-v3-squashfs-factory.img",
-          "type": "factory"
+          "name": "openwrt-ath79-tiny-netgear_wnr2000-v3-squashfs-factory-NA.img",
+          "type": "factory-NA"
         },
         {
           "name": "openwrt-ath79-tiny-netgear_wnr2000-v3-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
         },
         {
-          "name": "openwrt-ath79-tiny-netgear_wnr2000-v3-squashfs-factory-NA.img",
-          "type": "factory-NA"
+          "name": "openwrt-ath79-tiny-netgear_wnr2000-v3-squashfs-factory.img",
+          "type": "factory"
         }
       ],
       "target": "ath79/tiny"
@@ -6949,13 +6971,13 @@
     "NETGEAR WNR2200 16M": {
       "id": "netgear_wnr2200-16m",
       "images": [
-        {
-          "name": "openwrt-ath79-generic-netgear_wnr2200-16m-squashfs-factory.img",
-          "type": "factory"
-        },
         {
           "name": "openwrt-ath79-generic-netgear_wnr2200-16m-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
+        },
+        {
+          "name": "openwrt-ath79-generic-netgear_wnr2200-16m-squashfs-factory.img",
+          "type": "factory"
         }
       ],
       "target": "ath79/generic"
@@ -6981,13 +7003,13 @@
     "NETGEAR WNR2200 CN/RU": {
       "id": "netgear_wnr2200-16m",
       "images": [
-        {
-          "name": "openwrt-ath79-generic-netgear_wnr2200-16m-squashfs-factory.img",
-          "type": "factory"
-        },
         {
           "name": "openwrt-ath79-generic-netgear_wnr2200-16m-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
+        },
+        {
+          "name": "openwrt-ath79-generic-netgear_wnr2200-16m-squashfs-factory.img",
+          "type": "factory"
         }
       ],
       "target": "ath79/generic"
@@ -6996,52 +7018,52 @@
       "id": "netgear-wnr3500-v2",
       "images": [
         {
-          "name": "openwrt-brcm47xx-mips74k-netgear-wnr3500-v2-squashfs.chk",
+          "name": "openwrt-bcm47xx-mips74k-netgear-wnr3500-v2-squashfs.chk",
           "type": "chk"
         }
       ],
-      "target": "brcm47xx/mips74k"
+      "target": "bcm47xx/mips74k"
     },
     "NETGEAR WNR3500L v1 (NA)": {
       "id": "netgear-wnr3500l-v1-na",
       "images": [
         {
-          "name": "openwrt-brcm47xx-mips74k-netgear-wnr3500l-v1-na-squashfs.chk",
+          "name": "openwrt-bcm47xx-mips74k-netgear-wnr3500l-v1-na-squashfs.chk",
           "type": "chk"
         }
       ],
-      "target": "brcm47xx/mips74k"
+      "target": "bcm47xx/mips74k"
     },
     "NETGEAR WNR3500L v1 (ROW)": {
       "id": "netgear-wnr3500l-v1",
       "images": [
         {
-          "name": "openwrt-brcm47xx-mips74k-netgear-wnr3500l-v1-squashfs.chk",
+          "name": "openwrt-bcm47xx-mips74k-netgear-wnr3500l-v1-squashfs.chk",
           "type": "chk"
         }
       ],
-      "target": "brcm47xx/mips74k"
+      "target": "bcm47xx/mips74k"
     },
     "NETGEAR WNR3500L v2": {
       "id": "netgear-wnr3500l-v2",
       "images": [
         {
-          "name": "openwrt-brcm47xx-mips74k-netgear-wnr3500l-v2-squashfs.chk",
+          "name": "openwrt-bcm47xx-mips74k-netgear-wnr3500l-v2-squashfs.chk",
           "type": "chk"
         }
       ],
-      "target": "brcm47xx/mips74k"
+      "target": "bcm47xx/mips74k"
     },
     "NETGEAR WNR612 v2": {
       "id": "netgear_wnr612-v2",
       "images": [
-        {
-          "name": "openwrt-ath79-tiny-netgear_wnr612-v2-squashfs-factory.img",
-          "type": "factory"
-        },
         {
           "name": "openwrt-ath79-tiny-netgear_wnr612-v2-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
+        },
+        {
+          "name": "openwrt-ath79-tiny-netgear_wnr612-v2-squashfs-factory.img",
+          "type": "factory"
         }
       ],
       "target": "ath79/tiny"
@@ -7050,71 +7072,35 @@
       "id": "netgear-wnr834b-v2",
       "images": [
         {
-          "name": "openwrt-brcm47xx-legacy-netgear-wnr834b-v2-squashfs.chk",
+          "name": "openwrt-bcm47xx-legacy-netgear-wnr834b-v2-squashfs.chk",
           "type": "chk"
         }
       ],
-      "target": "brcm47xx/legacy"
+      "target": "bcm47xx/legacy"
     },
-    "NETIS WF-2881": {
-      "id": "netis_wf-2881",
+    "NETIS WF2770": {
+      "id": "netis_wf2770",
       "images": [
         {
-          "name": "openwrt-ramips-mt7621-netis_wf-2881-squashfs-sysupgrade.bin",
+          "name": "openwrt-ramips-mt7620-netis_wf2770-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
         }
       ],
-      "target": "ramips/mt7621"
-    },
-    "NXP LS1012A-RDB": {
-      "id": "ls1012ardb",
-      "images": [
-        {
-          "name": "openwrt-layerscape-armv8_64b-ls1012ardb-ubifs-firmware.bin",
-          "type": "firmware"
-        }
-      ],
-      "target": "layerscape/armv8_64b"
-    },
-    "NXP LS1043A-RDB Default": {
-      "id": "ls1043ardb",
-      "images": [
-        {
-          "name": "openwrt-layerscape-armv8_64b-ls1043ardb-squashfs-firmware.bin",
-          "type": "firmware"
-        }
-      ],
-      "target": "layerscape/armv8_64b"
-    },
-    "NXP LS1046A-RDB Default": {
-      "id": "ls1046ardb",
-      "images": [
-        {
-          "name": "openwrt-layerscape-armv8_64b-ls1046ardb-ubifs-firmware.bin",
-          "type": "firmware"
-        }
-      ],
-      "target": "layerscape/armv8_64b"
+      "target": "ramips/mt7620"
     },
-    "NXP LS1088A-RDB Default": {
-      "id": "ls1088ardb",
+    "NETIS WF2881": {
+      "id": "netis_wf2881",
       "images": [
         {
-          "name": "openwrt-layerscape-armv8_64b-ls1088ardb-ubifs-firmware.bin",
-          "type": "firmware"
-        }
-      ],
-      "target": "layerscape/armv8_64b"
-    },
-    "NXP LS2088ARDB": {
-      "id": "ls2088ardb",
-      "images": [
+          "name": "openwrt-ramips-mt7621-netis_wf2881-squashfs-factory.bin",
+          "type": "factory"
+        },
         {
-          "name": "openwrt-layerscape-armv8_64b-ls2088ardb-squashfs-firmware.bin",
-          "type": "firmware"
+          "name": "openwrt-ramips-mt7621-netis_wf2881-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
-      "target": "layerscape/armv8_64b"
+      "target": "ramips/mt7621"
     },
     "NXP TWR-LS1021A Default": {
       "id": "ls1021atwr",
@@ -7126,16 +7112,6 @@
       ],
       "target": "layerscape/armv7"
     },
-    "Netcore NW718": {
-      "id": "netcore_nw718",
-      "images": [
-        {
-          "name": "openwrt-ramips-rt305x-netcore_nw718-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        }
-      ],
-      "target": "ramips/rt305x"
-    },
     "Netgear EX6100 v2": {
       "id": "netgear_ex6100v2",
       "images": [
@@ -7153,13 +7129,13 @@
     "Netgear EX6150 v2": {
       "id": "netgear_ex6150v2",
       "images": [
-        {
-          "name": "openwrt-ipq40xx-generic-netgear_ex6150v2-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-ipq40xx-generic-netgear_ex6150v2-squashfs-factory.img",
           "type": "factory"
+        },
+        {
+          "name": "openwrt-ipq40xx-generic-netgear_ex6150v2-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ipq40xx/generic"
@@ -7194,58 +7170,30 @@
       ],
       "target": "ramips/rt305x"
     },
-    "Nexx WT1520 4M": {
-      "id": "nexx_wt1520-4m",
-      "images": [
-        {
-          "name": "openwrt-ramips-rt305x-nexx_wt1520-4m-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
-        {
-          "name": "openwrt-ramips-rt305x-nexx_wt1520-4m-squashfs-factory.bin",
-          "type": "factory"
-        }
-      ],
-      "target": "ramips/rt305x"
-    },
     "Nexx WT1520 8M": {
       "id": "nexx_wt1520-8m",
       "images": [
-        {
-          "name": "openwrt-ramips-rt305x-nexx_wt1520-8m-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-ramips-rt305x-nexx_wt1520-8m-squashfs-factory.bin",
           "type": "factory"
-        }
-      ],
-      "target": "ramips/rt305x"
-    },
-    "Nexx WT3020 4M": {
-      "id": "nexx_wt3020-4m",
-      "images": [
-        {
-          "name": "openwrt-ramips-mt7620-nexx_wt3020-4m-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
         },
         {
-          "name": "openwrt-ramips-mt7620-nexx_wt3020-4m-squashfs-factory.bin",
-          "type": "factory"
+          "name": "openwrt-ramips-rt305x-nexx_wt1520-8m-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
-      "target": "ramips/mt7620"
+      "target": "ramips/rt305x"
     },
     "Nexx WT3020 8M": {
       "id": "nexx_wt3020-8m",
       "images": [
-        {
-          "name": "openwrt-ramips-mt7620-nexx_wt3020-8m-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-ramips-mt7620-nexx_wt3020-8m-squashfs-factory.bin",
           "type": "factory"
+        },
+        {
+          "name": "openwrt-ramips-mt7620-nexx_wt3020-8m-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ramips/mt7620"
@@ -7271,29 +7219,29 @@
       "target": "ramips/rt305x"
     },
     "NuCom R5010UN v2": {
-      "id": "R5010UNv2",
+      "id": "nucom_r5010un-v2",
       "images": [
         {
-          "name": "openwrt-brcm63xx-smp-R5010UNv2-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
+          "name": "openwrt-bcm63xx-smp-nucom_r5010un-v2-squashfs-cfe.bin",
+          "type": "cfe"
         },
         {
-          "name": "openwrt-brcm63xx-smp-R5010UNv2-squashfs-cfe.bin",
-          "type": "cfe"
+          "name": "openwrt-bcm63xx-smp-nucom_r5010un-v2-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
-      "target": "brcm63xx/smp"
+      "target": "bcm63xx/smp"
     },
     "OCEDO Panda": {
       "id": "ocedo_panda",
       "images": [
-        {
-          "name": "openwrt-mpc85xx-p1020-ocedo_panda-squashfs-fdt.bin",
-          "type": "fdt"
-        },
         {
           "name": "openwrt-mpc85xx-p1020-ocedo_panda-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
+        },
+        {
+          "name": "openwrt-mpc85xx-p1020-ocedo_panda-squashfs-fdt.bin",
+          "type": "fdt"
         }
       ],
       "target": "mpc85xx/p1020"
@@ -7319,18 +7267,18 @@
       "target": "ramips/rt305x"
     },
     "Observa VH4032N": {
-      "id": "VH4032N",
+      "id": "observa_vh4032n",
       "images": [
         {
-          "name": "openwrt-brcm63xx-smp-VH4032N-squashfs-sysupgrade.bin",
+          "name": "openwrt-bcm63xx-smp-observa_vh4032n-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
         },
         {
-          "name": "openwrt-brcm63xx-smp-VH4032N-squashfs-cfe.bin",
+          "name": "openwrt-bcm63xx-smp-observa_vh4032n-squashfs-cfe.bin",
           "type": "cfe"
         }
       ],
-      "target": "brcm63xx/smp"
+      "target": "bcm63xx/smp"
     },
     "Ocedo Koala": {
       "id": "ocedo_koala",
@@ -7376,11 +7324,11 @@
       "id": "olimex_a10-olinuxino-lime",
       "images": [
         {
-          "name": "openwrt-sunxi-cortexa8-olimex_a10-olinuxino-lime-ext4-sdcard.img.gz",
+          "name": "openwrt-sunxi-cortexa8-olimex_a10-olinuxino-lime-squashfs-sdcard.img.gz",
           "type": "sdcard"
         },
         {
-          "name": "openwrt-sunxi-cortexa8-olimex_a10-olinuxino-lime-squashfs-sdcard.img.gz",
+          "name": "openwrt-sunxi-cortexa8-olimex_a10-olinuxino-lime-ext4-sdcard.img.gz",
           "type": "sdcard"
         }
       ],
@@ -7404,11 +7352,11 @@
       "id": "olimex_a13-olimex-som",
       "images": [
         {
-          "name": "openwrt-sunxi-cortexa8-olimex_a13-olimex-som-squashfs-sdcard.img.gz",
+          "name": "openwrt-sunxi-cortexa8-olimex_a13-olimex-som-ext4-sdcard.img.gz",
           "type": "sdcard"
         },
         {
-          "name": "openwrt-sunxi-cortexa8-olimex_a13-olimex-som-ext4-sdcard.img.gz",
+          "name": "openwrt-sunxi-cortexa8-olimex_a13-olimex-som-squashfs-sdcard.img.gz",
           "type": "sdcard"
         }
       ],
@@ -7418,11 +7366,11 @@
       "id": "olimex_a20-olinuxino-lime",
       "images": [
         {
-          "name": "openwrt-sunxi-cortexa7-olimex_a20-olinuxino-lime-squashfs-sdcard.img.gz",
+          "name": "openwrt-sunxi-cortexa7-olimex_a20-olinuxino-lime-ext4-sdcard.img.gz",
           "type": "sdcard"
         },
         {
-          "name": "openwrt-sunxi-cortexa7-olimex_a20-olinuxino-lime-ext4-sdcard.img.gz",
+          "name": "openwrt-sunxi-cortexa7-olimex_a20-olinuxino-lime-squashfs-sdcard.img.gz",
           "type": "sdcard"
         }
       ],
@@ -7503,13 +7451,13 @@
     "On Networks N150R": {
       "id": "on_n150r",
       "images": [
-        {
-          "name": "openwrt-ath79-tiny-on_n150r-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-ath79-tiny-on_n150r-squashfs-factory.img",
           "type": "factory"
+        },
+        {
+          "name": "openwrt-ath79-tiny-on_n150r-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ath79/tiny"
@@ -7551,13 +7499,13 @@
     "OpenMesh A62": {
       "id": "openmesh_a62",
       "images": [
-        {
-          "name": "openwrt-ipq40xx-generic-openmesh_a62-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-ipq40xx-generic-openmesh_a62-squashfs-factory.bin",
           "type": "factory"
+        },
+        {
+          "name": "openwrt-ipq40xx-generic-openmesh_a62-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ipq40xx/generic"
@@ -7595,13 +7543,13 @@
     "PISEN Cloud Easy Power (WMM003N)": {
       "id": "pisen_wmm003n",
       "images": [
-        {
-          "name": "openwrt-ath79-generic-pisen_wmm003n-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-ath79-generic-pisen_wmm003n-squashfs-factory.bin",
           "type": "factory"
+        },
+        {
+          "name": "openwrt-ath79-generic-pisen_wmm003n-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ath79/generic"
@@ -7609,13 +7557,13 @@
     "PISEN TS-D084": {
       "id": "pisen_ts-d084",
       "images": [
-        {
-          "name": "openwrt-ath79-generic-pisen_ts-d084-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-ath79-generic-pisen_ts-d084-squashfs-factory.bin",
           "type": "factory"
+        },
+        {
+          "name": "openwrt-ath79-generic-pisen_ts-d084-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ath79/generic"
@@ -7623,13 +7571,13 @@
     "PISEN WMB001N": {
       "id": "pisen_wmb001n",
       "images": [
-        {
-          "name": "openwrt-ath79-generic-pisen_wmb001n-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-ath79-generic-pisen_wmb001n-squashfs-factory.bin",
           "type": "factory"
+        },
+        {
+          "name": "openwrt-ath79-generic-pisen_wmb001n-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ath79/generic"
@@ -7648,15 +7596,15 @@
       "id": "ti_omap4-panda",
       "images": [
         {
-          "name": "openwrt-omap-ti_omap4-panda-ext4-sdcard.img.gz",
+          "name": "openwrt-omap-ti_omap4-panda-squashfs-sdcard.img.gz",
           "type": "sdcard"
         },
         {
-          "name": "openwrt-omap-ti_omap4-panda-squashfs-sdcard.img.gz",
+          "name": "openwrt-omap-ti_omap4-panda-ext4-sdcard.img.gz",
           "type": "sdcard"
         }
       ],
-      "target": "omap/"
+      "target": "omap/generic"
     },
     "PandoraBox PBR-D1": {
       "id": "d-team_pbr-d1",
@@ -7678,16 +7626,6 @@
       ],
       "target": "ramips/mt7621"
     },
-    "Petatel PSR-680W Wireless 3G Router": {
-      "id": "petatel_psr-680w",
-      "images": [
-        {
-          "name": "openwrt-ramips-rt305x-petatel_psr-680w-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        }
-      ],
-      "target": "ramips/rt305x"
-    },
     "Phicomm K2G": {
       "id": "phicomm_k2g",
       "images": [
@@ -7758,73 +7696,59 @@
       ],
       "target": "ramips/mt7620"
     },
-    "Pine64 Pine64+": {
-      "id": "pine64_pine64-plus",
-      "images": [
-        {
-          "name": "openwrt-sunxi-cortexa53-pine64_pine64-plus-ext4-sdcard.img.gz",
-          "type": "sdcard"
-        },
-        {
-          "name": "openwrt-sunxi-cortexa53-pine64_pine64-plus-squashfs-sdcard.img.gz",
-          "type": "sdcard"
-        }
-      ],
-      "target": "sunxi/cortexa53"
-    },
-    "Pine64 SoPine": {
-      "id": "pine64_sopine-baseboard",
+    "Pine64 RockPro64": {
+      "id": "pine64_rockpro64",
       "images": [
         {
-          "name": "openwrt-sunxi-cortexa53-pine64_sopine-baseboard-ext4-sdcard.img.gz",
-          "type": "sdcard"
+          "name": "openwrt-rockchip-armv8-pine64_rockpro64-squashfs-sysupgrade.img.gz",
+          "type": "sysupgrade"
         },
         {
-          "name": "openwrt-sunxi-cortexa53-pine64_sopine-baseboard-squashfs-sdcard.img.gz",
-          "type": "sdcard"
+          "name": "openwrt-rockchip-armv8-pine64_rockpro64-ext4-sysupgrade.img.gz",
+          "type": "sysupgrade"
         }
       ],
-      "target": "sunxi/cortexa53"
+      "target": "rockchip/armv8"
     },
     "Pirelli A226G": {
-      "id": "A226G",
+      "id": "pirelli_a226g",
       "images": [
         {
-          "name": "openwrt-brcm63xx-smp-A226G-squashfs-cfe.bin",
+          "name": "openwrt-bcm63xx-smp-pirelli_a226g-squashfs-cfe.bin",
           "type": "cfe"
         }
       ],
-      "target": "brcm63xx/smp"
+      "target": "bcm63xx/smp"
     },
     "Pirelli A226M": {
-      "id": "A226M",
+      "id": "pirelli_a226m",
       "images": [
         {
-          "name": "openwrt-brcm63xx-smp-A226M-squashfs-cfe.bin",
+          "name": "openwrt-bcm63xx-smp-pirelli_a226m-squashfs-cfe.bin",
           "type": "cfe"
         }
       ],
-      "target": "brcm63xx/smp"
+      "target": "bcm63xx/smp"
     },
     "Pirelli A226M-FWB": {
-      "id": "A226M-FWB",
+      "id": "pirelli_a226m-fwb",
       "images": [
         {
-          "name": "openwrt-brcm63xx-smp-A226M-FWB-squashfs-cfe.bin",
+          "name": "openwrt-bcm63xx-smp-pirelli_a226m-fwb-squashfs-cfe.bin",
           "type": "cfe"
         }
       ],
-      "target": "brcm63xx/smp"
+      "target": "bcm63xx/smp"
     },
     "Pirelli Alice Gate VoIP 2 Plus Wi-Fi AGPF-S0": {
-      "id": "AGPF-S0",
+      "id": "pirelli_agpf-s0",
       "images": [
         {
-          "name": "openwrt-brcm63xx-smp-AGPF-S0-squashfs-cfe.bin",
+          "name": "openwrt-bcm63xx-smp-pirelli_agpf-s0-squashfs-cfe.bin",
           "type": "cfe"
         }
       ],
-      "target": "brcm63xx/smp"
+      "target": "bcm63xx/smp"
     },
     "Planex CS-QR10": {
       "id": "planex_cs-qr10",
@@ -7856,16 +7780,6 @@
       ],
       "target": "ramips/mt7620"
     },
-    "Planex MZK-DP150N": {
-      "id": "planex_mzk-dp150n",
-      "images": [
-        {
-          "name": "openwrt-ramips-rt305x-planex_mzk-dp150n-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        }
-      ],
-      "target": "ramips/rt305x"
-    },
     "Planex MZK-EX300NP": {
       "id": "planex_mzk-ex300np",
       "images": [
@@ -7886,20 +7800,6 @@
       ],
       "target": "ramips/mt7620"
     },
-    "Planex MZK-W300NH2": {
-      "id": "planex_mzk-w300nh2",
-      "images": [
-        {
-          "name": "openwrt-ramips-rt305x-planex_mzk-w300nh2-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
-        {
-          "name": "openwrt-ramips-rt305x-planex_mzk-w300nh2-squashfs-factory.bin",
-          "type": "factory"
-        }
-      ],
-      "target": "ramips/rt305x"
-    },
     "Planex MZK-WDPR": {
       "id": "planex_mzk-wdpr",
       "images": [
@@ -7944,71 +7844,43 @@
       ],
       "target": "ramips/rt305x"
     },
-    "Poray M3": {
-      "id": "poray_m3",
+    "Poray M4 8M": {
+      "id": "poray_m4-8m",
       "images": [
         {
-          "name": "openwrt-ramips-rt305x-poray_m3-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
+          "name": "openwrt-ramips-rt305x-poray_m4-8m-squashfs-factory.bin",
+          "type": "factory"
         },
         {
-          "name": "openwrt-ramips-rt305x-poray_m3-squashfs-factory.bin",
-          "type": "factory"
+          "name": "openwrt-ramips-rt305x-poray_m4-8m-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ramips/rt305x"
     },
-    "Poray M4 4M": {
-      "id": "poray_m4-4m",
+    "Poray X5/X6": {
+      "id": "poray_x5",
       "images": [
         {
-          "name": "openwrt-ramips-rt305x-poray_m4-4m-squashfs-sysupgrade.bin",
+          "name": "openwrt-ramips-rt305x-poray_x5-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
         },
         {
-          "name": "openwrt-ramips-rt305x-poray_m4-4m-squashfs-factory.bin",
+          "name": "openwrt-ramips-rt305x-poray_x5-squashfs-factory.bin",
           "type": "factory"
         }
       ],
       "target": "ramips/rt305x"
     },
-    "Poray M4 8M": {
-      "id": "poray_m4-8m",
+    "Poray X8": {
+      "id": "poray_x8",
       "images": [
         {
-          "name": "openwrt-ramips-rt305x-poray_m4-8m-squashfs-sysupgrade.bin",
+          "name": "openwrt-ramips-rt305x-poray_x8-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
         },
         {
-          "name": "openwrt-ramips-rt305x-poray_m4-8m-squashfs-factory.bin",
-          "type": "factory"
-        }
-      ],
-      "target": "ramips/rt305x"
-    },
-    "Poray X5/X6": {
-      "id": "poray_x5",
-      "images": [
-        {
-          "name": "openwrt-ramips-rt305x-poray_x5-squashfs-factory.bin",
-          "type": "factory"
-        },
-        {
-          "name": "openwrt-ramips-rt305x-poray_x5-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        }
-      ],
-      "target": "ramips/rt305x"
-    },
-    "Poray X8": {
-      "id": "poray_x8",
-      "images": [
-        {
-          "name": "openwrt-ramips-rt305x-poray_x8-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
-        {
-          "name": "openwrt-ramips-rt305x-poray_x8-squashfs-factory.bin",
+          "name": "openwrt-ramips-rt305x-poray_x8-squashfs-factory.bin",
           "type": "factory"
         }
       ],
@@ -8057,13 +7929,13 @@
     "Qihoo C301": {
       "id": "qihoo_c301",
       "images": [
-        {
-          "name": "openwrt-ath79-generic-qihoo_c301-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-ath79-generic-qihoo_c301-squashfs-factory.bin",
           "type": "factory"
+        },
+        {
+          "name": "openwrt-ath79-generic-qihoo_c301-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ath79/generic"
@@ -8085,13 +7957,13 @@
     "Qualcomm AP148 standard": {
       "id": "qcom_ipq8064-ap148",
       "images": [
-        {
-          "name": "openwrt-ipq806x-generic-qcom_ipq8064-ap148-squashfs-nand-factory.bin",
-          "type": "nand-factory"
-        },
         {
           "name": "openwrt-ipq806x-generic-qcom_ipq8064-ap148-squashfs-nand-sysupgrade.bin",
           "type": "nand-sysupgrade"
+        },
+        {
+          "name": "openwrt-ipq806x-generic-qcom_ipq8064-ap148-squashfs-nand-factory.bin",
+          "type": "nand-factory"
         }
       ],
       "target": "ipq806x/generic"
@@ -8099,13 +7971,13 @@
     "Qualcomm AP161": {
       "id": "qcom_ipq8064-ap161",
       "images": [
-        {
-          "name": "openwrt-ipq806x-generic-qcom_ipq8064-ap161-squashfs-nand-factory.bin",
-          "type": "nand-factory"
-        },
         {
           "name": "openwrt-ipq806x-generic-qcom_ipq8064-ap161-squashfs-nand-sysupgrade.bin",
           "type": "nand-sysupgrade"
+        },
+        {
+          "name": "openwrt-ipq806x-generic-qcom_ipq8064-ap161-squashfs-nand-factory.bin",
+          "type": "nand-factory"
         }
       ],
       "target": "ipq806x/generic"
@@ -8123,13 +7995,13 @@
     "Qualcomm Atheros AP-DK04.1 C1": {
       "id": "qcom_ap-dk04.1-c1",
       "images": [
-        {
-          "name": "openwrt-ipq40xx-generic-qcom_ap-dk04.1-c1-squashfs-nand-sysupgrade.bin",
-          "type": "nand-sysupgrade"
-        },
         {
           "name": "openwrt-ipq40xx-generic-qcom_ap-dk04.1-c1-squashfs-nand-factory.ubi",
           "type": "nand-factory"
+        },
+        {
+          "name": "openwrt-ipq40xx-generic-qcom_ap-dk04.1-c1-squashfs-nand-sysupgrade.bin",
+          "type": "nand-sysupgrade"
         }
       ],
       "target": "ipq40xx/generic"
@@ -8170,7 +8042,7 @@
           "type": "sysupgrade"
         }
       ],
-      "target": "kirkwood/"
+      "target": "kirkwood/generic"
     },
     "Raidsonic NAS IB-4220-B": {
       "id": "raidsonic_ib-4220-b",
@@ -8180,7 +8052,7 @@
           "type": "factory"
         }
       ],
-      "target": "gemini/"
+      "target": "gemini/generic"
     },
     "Rakwireless RAK633": {
       "id": "rakwireless_rak633",
@@ -8192,36 +8064,6 @@
       ],
       "target": "ramips/mt76x8"
     },
-    "Ralink AP-RT3052-V22RW-2X2": {
-      "id": "ralink_v22rw-2x2",
-      "images": [
-        {
-          "name": "openwrt-ramips-rt305x-ralink_v22rw-2x2-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        }
-      ],
-      "target": "ramips/rt305x"
-    },
-    "Ralink V11ST-FE": {
-      "id": "ralink_v11st-fe",
-      "images": [
-        {
-          "name": "openwrt-ramips-rt288x-ralink_v11st-fe-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        }
-      ],
-      "target": "ramips/rt288x"
-    },
-    "Ralink WR512-3GN 4M": {
-      "id": "unbranded_wr512-3gn-4m",
-      "images": [
-        {
-          "name": "openwrt-ramips-rt305x-unbranded_wr512-3gn-4m-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        }
-      ],
-      "target": "ramips/rt305x"
-    },
     "Ralink WR512-3GN 8M": {
       "id": "unbranded_wr512-3gn-8m",
       "images": [
@@ -8236,85 +8078,89 @@
       "id": "rpi-3",
       "images": [
         {
-          "name": "openwrt-brcm2708-bcm2710-rpi-3-squashfs-factory.img.gz",
+          "name": "openwrt-bcm27xx-bcm2710-rpi-3-ext4-factory.img.gz",
           "type": "factory"
         },
         {
-          "name": "openwrt-brcm2708-bcm2710-rpi-3-ext4-factory.img.gz",
+          "name": "openwrt-bcm27xx-bcm2710-rpi-3-squashfs-factory.img.gz",
           "type": "factory"
         },
         {
-          "name": "openwrt-brcm2708-bcm2710-rpi-3-squashfs-sysupgrade.img.gz",
+          "name": "openwrt-bcm27xx-bcm2710-rpi-3-ext4-sysupgrade.img.gz",
+          "type": "sysupgrade"
+        },
+        {
+          "name": "openwrt-bcm27xx-bcm2710-rpi-3-squashfs-sysupgrade.img.gz",
           "type": "sysupgrade"
         }
       ],
-      "target": "brcm2708/bcm2710"
+      "target": "bcm27xx/bcm2710"
     },
     "Raspberry Pi 2B/3B/3B+/3CM/4B": {
       "id": "rpi-2",
       "images": [
         {
-          "name": "openwrt-brcm2708-bcm2709-rpi-2-ext4-factory.img.gz",
+          "name": "openwrt-bcm27xx-bcm2709-rpi-2-squashfs-factory.img.gz",
           "type": "factory"
         },
         {
-          "name": "openwrt-brcm2708-bcm2709-rpi-2-ext4-sysupgrade.img.gz",
-          "type": "sysupgrade"
+          "name": "openwrt-bcm27xx-bcm2709-rpi-2-ext4-factory.img.gz",
+          "type": "factory"
         },
         {
-          "name": "openwrt-brcm2708-bcm2709-rpi-2-squashfs-factory.img.gz",
-          "type": "factory"
+          "name": "openwrt-bcm27xx-bcm2709-rpi-2-squashfs-sysupgrade.img.gz",
+          "type": "sysupgrade"
         },
         {
-          "name": "openwrt-brcm2708-bcm2709-rpi-2-squashfs-sysupgrade.img.gz",
+          "name": "openwrt-bcm27xx-bcm2709-rpi-2-ext4-sysupgrade.img.gz",
           "type": "sysupgrade"
         }
       ],
-      "target": "brcm2708/bcm2709"
+      "target": "bcm27xx/bcm2709"
     },
     "Raspberry Pi 4B": {
       "id": "rpi-4",
       "images": [
         {
-          "name": "openwrt-brcm2708-bcm2711-rpi-4-squashfs-factory.img.gz",
-          "type": "factory"
-        },
-        {
-          "name": "openwrt-brcm2708-bcm2711-rpi-4-squashfs-sysupgrade.img.gz",
+          "name": "openwrt-bcm27xx-bcm2711-rpi-4-ext4-sysupgrade.img.gz",
           "type": "sysupgrade"
         },
         {
-          "name": "openwrt-brcm2708-bcm2711-rpi-4-ext4-factory.img.gz",
+          "name": "openwrt-bcm27xx-bcm2711-rpi-4-squashfs-factory.img.gz",
           "type": "factory"
         },
         {
-          "name": "openwrt-brcm2708-bcm2711-rpi-4-ext4-sysupgrade.img.gz",
+          "name": "openwrt-bcm27xx-bcm2711-rpi-4-squashfs-sysupgrade.img.gz",
           "type": "sysupgrade"
+        },
+        {
+          "name": "openwrt-bcm27xx-bcm2711-rpi-4-ext4-factory.img.gz",
+          "type": "factory"
         }
       ],
-      "target": "brcm2708/bcm2711"
+      "target": "bcm27xx/bcm2711"
     },
     "Raspberry Pi B/B+/CM/Zero/ZeroW": {
       "id": "rpi",
       "images": [
         {
-          "name": "openwrt-brcm2708-bcm2708-rpi-ext4-factory.img.gz",
+          "name": "openwrt-bcm27xx-bcm2708-rpi-ext4-factory.img.gz",
           "type": "factory"
         },
         {
-          "name": "openwrt-brcm2708-bcm2708-rpi-ext4-sysupgrade.img.gz",
-          "type": "sysupgrade"
+          "name": "openwrt-bcm27xx-bcm2708-rpi-squashfs-factory.img.gz",
+          "type": "factory"
         },
         {
-          "name": "openwrt-brcm2708-bcm2708-rpi-squashfs-factory.img.gz",
-          "type": "factory"
+          "name": "openwrt-bcm27xx-bcm2708-rpi-squashfs-sysupgrade.img.gz",
+          "type": "sysupgrade"
         },
         {
-          "name": "openwrt-brcm2708-bcm2708-rpi-squashfs-sysupgrade.img.gz",
+          "name": "openwrt-bcm27xx-bcm2708-rpi-ext4-sysupgrade.img.gz",
           "type": "sysupgrade"
         }
       ],
-      "target": "brcm2708/bcm2708"
+      "target": "bcm27xx/bcm2708"
     },
     "Ravpower WD03": {
       "id": "ravpower_wd03",
@@ -8336,45 +8182,45 @@
       ],
       "target": "ath79/generic"
     },
-    "SFR Neufbox4 Foxconn": {
-      "id": "NEUFBOX4-FXC",
+    "SFR Neufbox 4 Foxconn": {
+      "id": "sfr_neufbox-4-foxconn-r1",
       "images": [
         {
-          "name": "openwrt-brcm63xx-smp-NEUFBOX4-FXC-squashfs-cfe.bin",
+          "name": "openwrt-bcm63xx-smp-sfr_neufbox-4-foxconn-r1-squashfs-cfe.bin",
           "type": "cfe"
         }
       ],
-      "target": "brcm63xx/smp"
+      "target": "bcm63xx/smp"
     },
-    "SFR Neufbox4 Sercomm": {
-      "id": "NEUFBOX4-SER",
+    "SFR Neufbox 4 Sercomm": {
+      "id": "sfr_neufbox-4-sercomm-r0",
       "images": [
         {
-          "name": "openwrt-brcm63xx-smp-NEUFBOX4-SER-squashfs-cfe.bin",
+          "name": "openwrt-bcm63xx-smp-sfr_neufbox-4-sercomm-r0-squashfs-cfe.bin",
           "type": "cfe"
         }
       ],
-      "target": "brcm63xx/smp"
+      "target": "bcm63xx/smp"
     },
-    "SFR Neufbox6": {
-      "id": "NEUFBOX6",
+    "SFR Neufbox 6": {
+      "id": "sfr_neufbox-6-sercomm-r0",
       "images": [
         {
-          "name": "openwrt-brcm63xx-smp-NEUFBOX6-squashfs-cfe.bin",
+          "name": "openwrt-bcm63xx-smp-sfr_neufbox-6-sercomm-r0-squashfs-cfe.bin",
           "type": "cfe"
         }
       ],
-      "target": "brcm63xx/smp"
+      "target": "bcm63xx/smp"
     },
     "SKY SR102": {
-      "id": "SR102",
+      "id": "sky_sr102",
       "images": [
         {
-          "name": "openwrt-brcm63xx-smp-SR102-squashfs-cfe.bin",
+          "name": "openwrt-bcm63xx-smp-sky_sr102-squashfs-cfe.bin",
           "type": "cfe"
         }
       ],
-      "target": "brcm63xx/smp"
+      "target": "bcm63xx/smp"
     },
     "STORYLiNK SAP-G3200U3": {
       "id": "storylink_sap-g3200u3",
@@ -8387,34 +8233,34 @@
       "target": "ramips/mt7621"
     },
     "Sagemcom F@st 2504N": {
-      "id": "FAST2504n",
+      "id": "sagem_fast-2504n",
       "images": [
         {
-          "name": "openwrt-brcm63xx-smp-FAST2504n-squashfs-cfe.bin",
+          "name": "openwrt-bcm63xx-smp-sagem_fast-2504n-squashfs-cfe.bin",
           "type": "cfe"
         }
       ],
-      "target": "brcm63xx/smp"
+      "target": "bcm63xx/smp"
     },
     "Sagemcom F@st 2704 V2": {
-      "id": "FAST2704V2",
+      "id": "sagem_fast-2704-v2",
       "images": [
         {
-          "name": "openwrt-brcm63xx-smp-FAST2704V2-squashfs-cfe.bin",
+          "name": "openwrt-bcm63xx-smp-sagem_fast-2704-v2-squashfs-cfe.bin",
           "type": "cfe"
         }
       ],
-      "target": "brcm63xx/smp"
+      "target": "bcm63xx/smp"
     },
     "Sagemcom F@st 2704N": {
-      "id": "FAST2704N",
+      "id": "sagem_fast-2704n",
       "images": [
         {
-          "name": "openwrt-brcm63xx-smp-FAST2704N-squashfs-cfe.bin",
+          "name": "openwrt-bcm63xx-smp-sagem_fast-2704n-squashfs-cfe.bin",
           "type": "cfe"
         }
       ],
-      "target": "brcm63xx/smp"
+      "target": "bcm63xx/smp"
     },
     "SamKnows Whitebox 8": {
       "id": "samknows_whitebox-v8",
@@ -8429,13 +8275,13 @@
     "Samsung CY-SWR1100": {
       "id": "samsung_cy-swr1100",
       "images": [
-        {
-          "name": "openwrt-ramips-rt3883-samsung_cy-swr1100-squashfs-factory.bin",
-          "type": "factory"
-        },
         {
           "name": "openwrt-ramips-rt3883-samsung_cy-swr1100-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
+        },
+        {
+          "name": "openwrt-ramips-rt3883-samsung_cy-swr1100-squashfs-factory.bin",
+          "type": "factory"
         }
       ],
       "target": "ramips/rt3883"
@@ -8453,16 +8299,16 @@
     "Seagate FreeAgent Dockstar": {
       "id": "seagate_dockstar",
       "images": [
-        {
-          "name": "openwrt-kirkwood-seagate_dockstar-squashfs-factory.bin",
-          "type": "factory"
-        },
         {
           "name": "openwrt-kirkwood-seagate_dockstar-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
+        },
+        {
+          "name": "openwrt-kirkwood-seagate_dockstar-squashfs-factory.bin",
+          "type": "factory"
         }
       ],
-      "target": "kirkwood/"
+      "target": "kirkwood/generic"
     },
     "Seagate GoFlexHome": {
       "id": "seagate_goflexhome",
@@ -8476,7 +8322,7 @@
           "type": "sysupgrade"
         }
       ],
-      "target": "kirkwood/"
+      "target": "kirkwood/generic"
     },
     "Seagate GoFlexNet": {
       "id": "seagate_goflexnet",
@@ -8490,17 +8336,31 @@
           "type": "sysupgrade"
         }
       ],
-      "target": "kirkwood/"
+      "target": "kirkwood/generic"
+    },
+    "Sercomm AD1018": {
+      "id": "sercomm_ad1018",
+      "images": [
+        {
+          "name": "openwrt-bcm63xx-smp-sercomm_ad1018-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
+        },
+        {
+          "name": "openwrt-bcm63xx-smp-sercomm_ad1018-squashfs-cfe.bin",
+          "type": "cfe"
+        }
+      ],
+      "target": "bcm63xx/smp"
     },
     "Sercomm AD1018 SPI flash mod": {
-      "id": "AD1018-SPI_flash",
+      "id": "sercomm_ad1018-nor",
       "images": [
         {
-          "name": "openwrt-brcm63xx-smp-AD1018-SPI_flash-squashfs-cfe.bin",
+          "name": "openwrt-bcm63xx-smp-sercomm_ad1018-nor-squashfs-cfe.bin",
           "type": "cfe"
         }
       ],
-      "target": "brcm63xx/smp"
+      "target": "bcm63xx/smp"
     },
     "Sercomm NA930": {
       "id": "sercomm_na930",
@@ -8515,10 +8375,6 @@
     "Shuttle KD20": {
       "id": "shuttle_kd20",
       "images": [
-        {
-          "name": "openwrt-oxnas-ox820-shuttle_kd20-ubifs-ubinized.bin",
-          "type": "ubinized"
-        },
         {
           "name": "openwrt-oxnas-ox820-shuttle_kd20-ubifs-sysupgrade.tar",
           "type": "sysupgrade"
@@ -8530,6 +8386,10 @@
         {
           "name": "openwrt-oxnas-ox820-shuttle_kd20-squashfs-sysupgrade.tar",
           "type": "sysupgrade"
+        },
+        {
+          "name": "openwrt-oxnas-ox820-shuttle_kd20-ubifs-ubinized.bin",
+          "type": "ubinized"
         }
       ],
       "target": "oxnas/ox820"
@@ -8544,6 +8404,16 @@
       ],
       "target": "lantiq/xway"
     },
+    "Siemens WS-AP3610": {
+      "id": "siemens_ws-ap3610",
+      "images": [
+        {
+          "name": "openwrt-ath79-generic-siemens_ws-ap3610-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
+        }
+      ],
+      "target": "ath79/generic"
+    },
     "Sinovoip Banana Pi M2+": {
       "id": "sinovoip_bananapi-m2-plus",
       "images": [
@@ -8558,16 +8428,6 @@
       ],
       "target": "sunxi/cortexa7"
     },
-    "Sitecom WL-351 v1": {
-      "id": "sitecom_wl-351",
-      "images": [
-        {
-          "name": "openwrt-ramips-rt305x-sitecom_wl-351-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        }
-      ],
-      "target": "ramips/rt305x"
-    },
     "Sitecom WLR-6000": {
       "id": "sitecom_wlr-6000",
       "images": [
@@ -8585,36 +8445,54 @@
     "Sitecom WLR-7100 v1 002": {
       "id": "sitecom_wlr-7100",
       "images": [
+        {
+          "name": "openwrt-ath79-generic-sitecom_wlr-7100-squashfs-factory.dlf",
+          "type": "factory"
+        },
         {
           "name": "openwrt-ath79-generic-sitecom_wlr-7100-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
+        }
+      ],
+      "target": "ath79/generic"
+    },
+    "Sitecom WLR-8100": {
+      "id": "sitecom_wlr-8100",
+      "images": [
+        {
+          "name": "openwrt-ath79-generic-sitecom_wlr-8100-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         },
         {
-          "name": "openwrt-ath79-generic-sitecom_wlr-7100-squashfs-factory.dlf",
+          "name": "openwrt-ath79-generic-sitecom_wlr-8100-squashfs-factory.dlf",
           "type": "factory"
         }
       ],
       "target": "ath79/generic"
     },
-    "Skylab SKW92A": {
-      "id": "skylab_skw92a",
+    "Sitecom X8 AC1750": {
+      "id": "sitecom_wlr-8100",
       "images": [
         {
-          "name": "openwrt-ramips-mt76x8-skylab_skw92a-squashfs-sysupgrade.bin",
+          "name": "openwrt-ath79-generic-sitecom_wlr-8100-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
+        },
+        {
+          "name": "openwrt-ath79-generic-sitecom_wlr-8100-squashfs-factory.dlf",
+          "type": "factory"
         }
       ],
-      "target": "ramips/mt76x8"
+      "target": "ath79/generic"
     },
-    "Skyline SL-R7205 Wireless 3G Router": {
-      "id": "skyline_sl-r7205",
+    "Skylab SKW92A": {
+      "id": "skylab_skw92a",
       "images": [
         {
-          "name": "openwrt-ramips-rt305x-skyline_sl-r7205-squashfs-sysupgrade.bin",
+          "name": "openwrt-ramips-mt76x8-skylab_skw92a-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
         }
       ],
-      "target": "ramips/rt305x"
+      "target": "ramips/mt76x8"
     },
     "SmartRG SR400ac": {
       "id": "smartrg-sr400ac",
@@ -8630,11 +8508,11 @@
       "id": "marvell_macchiatobin",
       "images": [
         {
-          "name": "openwrt-mvebu-cortexa72-marvell_macchiatobin-squashfs-sdcard.img.gz",
+          "name": "openwrt-mvebu-cortexa72-marvell_macchiatobin-ext4-sdcard.img.gz",
           "type": "sdcard"
         },
         {
-          "name": "openwrt-mvebu-cortexa72-marvell_macchiatobin-ext4-sdcard.img.gz",
+          "name": "openwrt-mvebu-cortexa72-marvell_macchiatobin-squashfs-sdcard.img.gz",
           "type": "sdcard"
         }
       ],
@@ -8668,17 +8546,17 @@
           "type": "combined"
         }
       ],
-      "target": "imx6/"
+      "target": "imx6/generic"
     },
     "SolidRun MACCHIATObin": {
       "id": "marvell_macchiatobin",
       "images": [
         {
-          "name": "openwrt-mvebu-cortexa72-marvell_macchiatobin-squashfs-sdcard.img.gz",
+          "name": "openwrt-mvebu-cortexa72-marvell_macchiatobin-ext4-sdcard.img.gz",
           "type": "sdcard"
         },
         {
-          "name": "openwrt-mvebu-cortexa72-marvell_macchiatobin-ext4-sdcard.img.gz",
+          "name": "openwrt-mvebu-cortexa72-marvell_macchiatobin-squashfs-sdcard.img.gz",
           "type": "sdcard"
         }
       ],
@@ -8694,16 +8572,6 @@
       ],
       "target": "mpc85xx/generic"
     },
-    "Sparklan WCR-150GN": {
-      "id": "sparklan_wcr-150gn",
-      "images": [
-        {
-          "name": "openwrt-ramips-rt305x-sparklan_wcr-150gn-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        }
-      ],
-      "target": "ramips/rt305x"
-    },
     "StorLink SL93512r": {
       "id": "storlink_sl93512r",
       "images": [
@@ -8712,21 +8580,31 @@
           "type": "factory"
         }
       ],
-      "target": "gemini/"
+      "target": "gemini/generic"
     },
     "T-Com Speedport W 303V": {
-      "id": "SPW303V",
+      "id": "t-com_speedport-w-303v",
       "images": [
         {
-          "name": "openwrt-brcm63xx-smp-SPW303V-squashfs-factory.bin",
+          "name": "openwrt-bcm63xx-smp-t-com_speedport-w-303v-squashfs-factory.bin",
           "type": "factory"
         },
         {
-          "name": "openwrt-brcm63xx-smp-SPW303V-squashfs-sysupgrade.bin",
+          "name": "openwrt-bcm63xx-smp-t-com_speedport-w-303v-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
+        }
+      ],
+      "target": "bcm63xx/smp"
+    },
+    "TOTOLINK A3": {
+      "id": "totolink_a3",
+      "images": [
+        {
+          "name": "openwrt-ramips-mt76x8-totolink_a3-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
         }
       ],
-      "target": "brcm63xx/smp"
+      "target": "ramips/mt76x8"
     },
     "TOTOLINK A7000R": {
       "id": "totolink_a7000r",
@@ -8748,26 +8626,6 @@
       ],
       "target": "ramips/mt76x8"
     },
-    "TP-LINK Archer C5 v2": {
-      "id": "tplink-archer-c5-v2",
-      "images": [
-        {
-          "name": "openwrt-bcm53xx-generic-tplink-archer-c5-v2-squashfs.bin",
-          "type": "bin"
-        }
-      ],
-      "target": "bcm53xx/generic"
-    },
-    "TP-LINK Archer C9 v1": {
-      "id": "tplink-archer-c9-v1",
-      "images": [
-        {
-          "name": "openwrt-bcm53xx-generic-tplink-archer-c9-v1-squashfs.bin",
-          "type": "bin"
-        }
-      ],
-      "target": "bcm53xx/generic"
-    },
     "TP-Link Archer A6 v2 (US/TW)": {
       "id": "tplink_archer-c6-v2-us",
       "images": [
@@ -8799,13 +8657,13 @@
     "TP-Link Archer C2 v1": {
       "id": "tplink_archer-c2-v1",
       "images": [
-        {
-          "name": "openwrt-ramips-mt7620-tplink_archer-c2-v1-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-ramips-mt7620-tplink_archer-c2-v1-squashfs-factory.bin",
           "type": "factory"
+        },
+        {
+          "name": "openwrt-ramips-mt7620-tplink_archer-c2-v1-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ramips/mt7620"
@@ -8827,13 +8685,13 @@
     "TP-Link Archer C20 v1": {
       "id": "tplink_archer-c20-v1",
       "images": [
-        {
-          "name": "openwrt-ramips-mt7620-tplink_archer-c20-v1-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-ramips-mt7620-tplink_archer-c20-v1-squashfs-factory.bin",
           "type": "factory"
+        },
+        {
+          "name": "openwrt-ramips-mt7620-tplink_archer-c20-v1-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ramips/mt7620"
@@ -8841,13 +8699,13 @@
     "TP-Link Archer C20 v4": {
       "id": "tplink_archer-c20-v4",
       "images": [
-        {
-          "name": "openwrt-ramips-mt76x8-tplink_archer-c20-v4-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-ramips-mt76x8-tplink_archer-c20-v4-squashfs-tftp-recovery.bin",
           "type": "tftp-recovery"
+        },
+        {
+          "name": "openwrt-ramips-mt76x8-tplink_archer-c20-v4-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ramips/mt76x8"
@@ -8865,13 +8723,13 @@
     "TP-Link Archer C20i": {
       "id": "tplink_archer-c20i",
       "images": [
-        {
-          "name": "openwrt-ramips-mt7620-tplink_archer-c20i-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-ramips-mt7620-tplink_archer-c20i-squashfs-factory.bin",
           "type": "factory"
+        },
+        {
+          "name": "openwrt-ramips-mt7620-tplink_archer-c20i-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ramips/mt7620"
@@ -8879,13 +8737,13 @@
     "TP-Link Archer C25 v1": {
       "id": "tplink_archer-c25-v1",
       "images": [
-        {
-          "name": "openwrt-ath79-generic-tplink_archer-c25-v1-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-ath79-generic-tplink_archer-c25-v1-squashfs-factory.bin",
           "type": "factory"
+        },
+        {
+          "name": "openwrt-ath79-generic-tplink_archer-c25-v1-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ath79/generic"
@@ -8907,13 +8765,13 @@
     "TP-Link Archer C5 v1": {
       "id": "tplink_archer-c5-v1",
       "images": [
-        {
-          "name": "openwrt-ath79-generic-tplink_archer-c5-v1-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-ath79-generic-tplink_archer-c5-v1-squashfs-factory.bin",
           "type": "factory"
+        },
+        {
+          "name": "openwrt-ath79-generic-tplink_archer-c5-v1-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ath79/generic"
@@ -8978,8 +8836,12 @@
       "id": "tplink_archer-c59-v1",
       "images": [
         {
-          "name": "openwrt-ath79-generic-tplink_archer-c59-v1-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
+          "name": "openwrt-ath79-generic-tplink_archer-c59-v1-squashfs-factory.bin",
+          "type": "factory"
+        },
+        {
+          "name": "openwrt-ath79-generic-tplink_archer-c59-v1-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ath79/generic"
@@ -9001,13 +8863,13 @@
     "TP-Link Archer C6 v2 (EU/RU/JP)": {
       "id": "tplink_archer-c6-v2",
       "images": [
-        {
-          "name": "openwrt-ath79-generic-tplink_archer-c6-v2-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-ath79-generic-tplink_archer-c6-v2-squashfs-factory.bin",
           "type": "factory"
+        },
+        {
+          "name": "openwrt-ath79-generic-tplink_archer-c6-v2-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ath79/generic"
@@ -9054,6 +8916,20 @@
       ],
       "target": "ath79/generic"
     },
+    "TP-Link Archer C60 v3": {
+      "id": "tplink_archer-c60-v3",
+      "images": [
+        {
+          "name": "openwrt-ath79-generic-tplink_archer-c60-v3-squashfs-factory.bin",
+          "type": "factory"
+        },
+        {
+          "name": "openwrt-ath79-generic-tplink_archer-c60-v3-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
+        }
+      ],
+      "target": "ath79/generic"
+    },
     "TP-Link Archer C7 v1": {
       "id": "tplink_archer-c7-v1",
       "images": [
@@ -9071,21 +8947,21 @@
     "TP-Link Archer C7 v2": {
       "id": "tplink_archer-c7-v2",
       "images": [
-        {
-          "name": "openwrt-ath79-generic-tplink_archer-c7-v2-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-ath79-generic-tplink_archer-c7-v2-squashfs-factory.bin",
           "type": "factory"
         },
+        {
+          "name": "openwrt-ath79-generic-tplink_archer-c7-v2-squashfs-factory-eu.bin",
+          "type": "factory-eu"
+        },
         {
           "name": "openwrt-ath79-generic-tplink_archer-c7-v2-squashfs-factory-us.bin",
           "type": "factory-us"
         },
         {
-          "name": "openwrt-ath79-generic-tplink_archer-c7-v2-squashfs-factory-eu.bin",
-          "type": "factory-eu"
+          "name": "openwrt-ath79-generic-tplink_archer-c7-v2-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ath79/generic"
@@ -9128,6 +9004,26 @@
       ],
       "target": "ath79/generic"
     },
+    "TP-Link Archer D7 v1": {
+      "id": "tplink_archer-d7-v1",
+      "images": [
+        {
+          "name": "openwrt-ath79-generic-tplink_archer-d7-v1-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
+        }
+      ],
+      "target": "ath79/generic"
+    },
+    "TP-Link Archer D7b v1": {
+      "id": "tplink_archer-d7b-v1",
+      "images": [
+        {
+          "name": "openwrt-ath79-generic-tplink_archer-d7b-v1-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
+        }
+      ],
+      "target": "ath79/generic"
+    },
     "TP-Link Archer MR200": {
       "id": "tplink_archer-mr200",
       "images": [
@@ -9185,13 +9081,13 @@
     "TP-Link CPE210 v2": {
       "id": "tplink_cpe210-v2",
       "images": [
-        {
-          "name": "openwrt-ath79-generic-tplink_cpe210-v2-squashfs-factory.bin",
-          "type": "factory"
-        },
         {
           "name": "openwrt-ath79-generic-tplink_cpe210-v2-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
+        },
+        {
+          "name": "openwrt-ath79-generic-tplink_cpe210-v2-squashfs-factory.bin",
+          "type": "factory"
         }
       ],
       "target": "ath79/generic"
@@ -9227,13 +9123,13 @@
     "TP-Link CPE220 v3": {
       "id": "tplink_cpe220-v3",
       "images": [
-        {
-          "name": "openwrt-ath79-generic-tplink_cpe220-v3-squashfs-factory.bin",
-          "type": "factory"
-        },
         {
           "name": "openwrt-ath79-generic-tplink_cpe220-v3-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
+        },
+        {
+          "name": "openwrt-ath79-generic-tplink_cpe220-v3-squashfs-factory.bin",
+          "type": "factory"
         }
       ],
       "target": "ath79/generic"
@@ -9241,13 +9137,13 @@
     "TP-Link CPE510 v1": {
       "id": "tplink_cpe510-v1",
       "images": [
-        {
-          "name": "openwrt-ath79-generic-tplink_cpe510-v1-squashfs-factory.bin",
-          "type": "factory"
-        },
         {
           "name": "openwrt-ath79-generic-tplink_cpe510-v1-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
+        },
+        {
+          "name": "openwrt-ath79-generic-tplink_cpe510-v1-squashfs-factory.bin",
+          "type": "factory"
         }
       ],
       "target": "ath79/generic"
@@ -9255,13 +9151,13 @@
     "TP-Link CPE510 v2": {
       "id": "tplink_cpe510-v2",
       "images": [
-        {
-          "name": "openwrt-ath79-generic-tplink_cpe510-v2-squashfs-factory.bin",
-          "type": "factory"
-        },
         {
           "name": "openwrt-ath79-generic-tplink_cpe510-v2-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
+        },
+        {
+          "name": "openwrt-ath79-generic-tplink_cpe510-v2-squashfs-factory.bin",
+          "type": "factory"
         }
       ],
       "target": "ath79/generic"
@@ -9297,13 +9193,41 @@
     "TP-Link RE200 v1": {
       "id": "tplink_re200-v1",
       "images": [
+        {
+          "name": "openwrt-ramips-mt7620-tplink_re200-v1-squashfs-factory.bin",
+          "type": "factory"
+        },
         {
           "name": "openwrt-ramips-mt7620-tplink_re200-v1-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
+        }
+      ],
+      "target": "ramips/mt7620"
+    },
+    "TP-Link RE200 v2": {
+      "id": "tplink_re200-v2",
+      "images": [
+        {
+          "name": "openwrt-ramips-mt76x8-tplink_re200-v2-squashfs-factory.bin",
+          "type": "factory"
         },
         {
-          "name": "openwrt-ramips-mt7620-tplink_re200-v1-squashfs-factory.bin",
+          "name": "openwrt-ramips-mt76x8-tplink_re200-v2-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
+        }
+      ],
+      "target": "ramips/mt76x8"
+    },
+    "TP-Link RE210 v1": {
+      "id": "tplink_re210-v1",
+      "images": [
+        {
+          "name": "openwrt-ramips-mt7620-tplink_re210-v1-squashfs-factory.bin",
           "type": "factory"
+        },
+        {
+          "name": "openwrt-ramips-mt7620-tplink_re210-v1-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ramips/mt7620"
@@ -9311,13 +9235,13 @@
     "TP-Link RE305 v1": {
       "id": "tplink_re305-v1",
       "images": [
-        {
-          "name": "openwrt-ramips-mt76x8-tplink_re305-v1-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-ramips-mt76x8-tplink_re305-v1-squashfs-factory.bin",
           "type": "factory"
+        },
+        {
+          "name": "openwrt-ramips-mt76x8-tplink_re305-v1-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ramips/mt76x8"
@@ -9353,13 +9277,13 @@
     "TP-Link RE355 v1": {
       "id": "tplink_re355-v1",
       "images": [
-        {
-          "name": "openwrt-ath79-generic-tplink_re355-v1-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-ath79-generic-tplink_re355-v1-squashfs-factory.bin",
           "type": "factory"
+        },
+        {
+          "name": "openwrt-ath79-generic-tplink_re355-v1-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ath79/generic"
@@ -9367,13 +9291,13 @@
     "TP-Link RE450 v1": {
       "id": "tplink_re450-v1",
       "images": [
-        {
-          "name": "openwrt-ath79-generic-tplink_re450-v1-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-ath79-generic-tplink_re450-v1-squashfs-factory.bin",
           "type": "factory"
+        },
+        {
+          "name": "openwrt-ath79-generic-tplink_re450-v1-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ath79/generic"
@@ -9381,13 +9305,13 @@
     "TP-Link RE450 v2": {
       "id": "tplink_re450-v2",
       "images": [
-        {
-          "name": "openwrt-ath79-generic-tplink_re450-v2-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-ath79-generic-tplink_re450-v2-squashfs-factory.bin",
           "type": "factory"
+        },
+        {
+          "name": "openwrt-ath79-generic-tplink_re450-v2-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ath79/generic"
@@ -9457,13 +9381,13 @@
     "TP-Link TL-MR6400 v1": {
       "id": "tplink_tl-mr6400-v1",
       "images": [
-        {
-          "name": "openwrt-ath79-generic-tplink_tl-mr6400-v1-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-ath79-generic-tplink_tl-mr6400-v1-squashfs-factory.bin",
           "type": "factory"
+        },
+        {
+          "name": "openwrt-ath79-generic-tplink_tl-mr6400-v1-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ath79/generic"
@@ -9471,44 +9395,16 @@
     "TP-Link TL-WA801ND v5": {
       "id": "tplink_tl-wa801nd-v5",
       "images": [
-        {
-          "name": "openwrt-ramips-mt76x8-tplink_tl-wa801nd-v5-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-ramips-mt76x8-tplink_tl-wa801nd-v5-squashfs-tftp-recovery.bin",
           "type": "tftp-recovery"
-        }
-      ],
-      "target": "ramips/mt76x8"
-    },
-    "TP-Link TL-WA850RE v1": {
-      "id": "tplink_tl-wa850re-v1",
-      "images": [
-        {
-          "name": "openwrt-ath79-tiny-tplink_tl-wa850re-v1-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
         },
         {
-          "name": "openwrt-ath79-tiny-tplink_tl-wa850re-v1-squashfs-factory.bin",
-          "type": "factory"
-        }
-      ],
-      "target": "ath79/tiny"
-    },
-    "TP-Link TL-WA901ND v2": {
-      "id": "tplink_tl-wa901nd-v2",
-      "images": [
-        {
-          "name": "openwrt-ath79-tiny-tplink_tl-wa901nd-v2-squashfs-sysupgrade.bin",
+          "name": "openwrt-ramips-mt76x8-tplink_tl-wa801nd-v5-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
-        },
-        {
-          "name": "openwrt-ath79-tiny-tplink_tl-wa901nd-v2-squashfs-factory.bin",
-          "type": "factory"
         }
       ],
-      "target": "ath79/tiny"
+      "target": "ramips/mt76x8"
     },
     "TP-Link TL-WDR3500 v1": {
       "id": "tplink_tl-wdr3500-v1",
@@ -9541,13 +9437,13 @@
     "TP-Link TL-WDR4300 v1": {
       "id": "tplink_tl-wdr4300-v1",
       "images": [
-        {
-          "name": "openwrt-ath79-generic-tplink_tl-wdr4300-v1-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-ath79-generic-tplink_tl-wdr4300-v1-squashfs-factory.bin",
           "type": "factory"
+        },
+        {
+          "name": "openwrt-ath79-generic-tplink_tl-wdr4300-v1-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ath79/generic"
@@ -9555,13 +9451,27 @@
     "TP-Link TL-WDR4300 v1 (IL)": {
       "id": "tplink_tl-wdr4300-v1-il",
       "images": [
+        {
+          "name": "openwrt-ath79-generic-tplink_tl-wdr4300-v1-il-squashfs-factory.bin",
+          "type": "factory"
+        },
         {
           "name": "openwrt-ath79-generic-tplink_tl-wdr4300-v1-il-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
-        },
+        }
+      ],
+      "target": "ath79/generic"
+    },
+    "TP-Link TL-WDR4310 v1": {
+      "id": "tplink_tl-wdr4310-v1",
+      "images": [
         {
-          "name": "openwrt-ath79-generic-tplink_tl-wdr4300-v1-il-squashfs-factory.bin",
+          "name": "openwrt-ath79-generic-tplink_tl-wdr4310-v1-squashfs-factory.bin",
           "type": "factory"
+        },
+        {
+          "name": "openwrt-ath79-generic-tplink_tl-wdr4310-v1-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ath79/generic"
@@ -9597,13 +9507,13 @@
     "TP-Link TL-WR1043N v5": {
       "id": "tplink_tl-wr1043n-v5",
       "images": [
-        {
-          "name": "openwrt-ath79-generic-tplink_tl-wr1043n-v5-squashfs-factory.bin",
-          "type": "factory"
-        },
         {
           "name": "openwrt-ath79-generic-tplink_tl-wr1043n-v5-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
+        },
+        {
+          "name": "openwrt-ath79-generic-tplink_tl-wr1043n-v5-squashfs-factory.bin",
+          "type": "factory"
         }
       ],
       "target": "ath79/generic"
@@ -9611,13 +9521,13 @@
     "TP-Link TL-WR1043N/ND v1": {
       "id": "tplink_tl-wr1043nd-v1",
       "images": [
-        {
-          "name": "openwrt-ath79-generic-tplink_tl-wr1043nd-v1-squashfs-factory.bin",
-          "type": "factory"
-        },
         {
           "name": "openwrt-ath79-generic-tplink_tl-wr1043nd-v1-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
+        },
+        {
+          "name": "openwrt-ath79-generic-tplink_tl-wr1043nd-v1-squashfs-factory.bin",
+          "type": "factory"
         }
       ],
       "target": "ath79/generic"
@@ -9639,13 +9549,13 @@
     "TP-Link TL-WR1043N/ND v3": {
       "id": "tplink_tl-wr1043nd-v3",
       "images": [
-        {
-          "name": "openwrt-ath79-generic-tplink_tl-wr1043nd-v3-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-ath79-generic-tplink_tl-wr1043nd-v3-squashfs-factory.bin",
           "type": "factory"
+        },
+        {
+          "name": "openwrt-ath79-generic-tplink_tl-wr1043nd-v3-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ath79/generic"
@@ -9667,13 +9577,13 @@
     "TP-Link TL-WR1045ND v2": {
       "id": "tplink_tl-wr1045nd-v2",
       "images": [
-        {
-          "name": "openwrt-ath79-generic-tplink_tl-wr1045nd-v2-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-ath79-generic-tplink_tl-wr1045nd-v2-squashfs-factory.bin",
           "type": "factory"
+        },
+        {
+          "name": "openwrt-ath79-generic-tplink_tl-wr1045nd-v2-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ath79/generic"
@@ -9681,13 +9591,13 @@
     "TP-Link TL-WR2543N/ND v1": {
       "id": "tplink_tl-wr2543-v1",
       "images": [
-        {
-          "name": "openwrt-ath79-generic-tplink_tl-wr2543-v1-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-ath79-generic-tplink_tl-wr2543-v1-squashfs-factory.bin",
           "type": "factory"
+        },
+        {
+          "name": "openwrt-ath79-generic-tplink_tl-wr2543-v1-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ath79/generic"
@@ -9706,137 +9616,53 @@
       ],
       "target": "ath79/generic"
     },
-    "TP-Link TL-WR740N v1/v2": {
-      "id": "tplink_tl-wr740n-v1",
+    "TP-Link TL-WR802N v4": {
+      "id": "tplink_tl-wr802n-v4",
       "images": [
         {
-          "name": "openwrt-ath79-tiny-tplink_tl-wr740n-v1-squashfs-sysupgrade.bin",
+          "name": "openwrt-ramips-mt76x8-tplink_tl-wr802n-v4-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
         },
         {
-          "name": "openwrt-ath79-tiny-tplink_tl-wr740n-v1-squashfs-factory.bin",
-          "type": "factory"
+          "name": "openwrt-ramips-mt76x8-tplink_tl-wr802n-v4-squashfs-tftp-recovery.bin",
+          "type": "tftp-recovery"
         }
       ],
-      "target": "ath79/tiny"
+      "target": "ramips/mt76x8"
     },
-    "TP-Link TL-WR740N v3": {
-      "id": "tplink_tl-wr740n-v3",
+    "TP-Link TL-WR810N v1": {
+      "id": "tplink_tl-wr810n-v1",
       "images": [
         {
-          "name": "openwrt-ath79-tiny-tplink_tl-wr740n-v3-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
+          "name": "openwrt-ath79-generic-tplink_tl-wr810n-v1-squashfs-factory.bin",
+          "type": "factory"
         },
         {
-          "name": "openwrt-ath79-tiny-tplink_tl-wr740n-v3-squashfs-factory.bin",
-          "type": "factory"
+          "name": "openwrt-ath79-generic-tplink_tl-wr810n-v1-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
-      "target": "ath79/tiny"
+      "target": "ath79/generic"
     },
-    "TP-Link TL-WR740N v4": {
-      "id": "tplink_tl-wr740n-v4",
+    "TP-Link TL-WR810N v2": {
+      "id": "tplink_tl-wr810n-v2",
       "images": [
         {
-          "name": "openwrt-ath79-tiny-tplink_tl-wr740n-v4-squashfs-factory.bin",
+          "name": "openwrt-ath79-generic-tplink_tl-wr810n-v2-squashfs-factory.bin",
           "type": "factory"
         },
         {
-          "name": "openwrt-ath79-tiny-tplink_tl-wr740n-v4-squashfs-sysupgrade.bin",
+          "name": "openwrt-ath79-generic-tplink_tl-wr810n-v2-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
         }
       ],
-      "target": "ath79/tiny"
+      "target": "ath79/generic"
     },
-    "TP-Link TL-WR741N/ND v1/v2": {
-      "id": "tplink_tl-wr741-v1",
+    "TP-Link TL-WR840N v4": {
+      "id": "tplink_tl-wr840n-v4",
       "images": [
         {
-          "name": "openwrt-ath79-tiny-tplink_tl-wr741-v1-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
-        {
-          "name": "openwrt-ath79-tiny-tplink_tl-wr741-v1-squashfs-factory.bin",
-          "type": "factory"
-        }
-      ],
-      "target": "ath79/tiny"
-    },
-    "TP-Link TL-WR741N/ND v4": {
-      "id": "tplink_tl-wr741nd-v4",
-      "images": [
-        {
-          "name": "openwrt-ath79-tiny-tplink_tl-wr741nd-v4-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
-        {
-          "name": "openwrt-ath79-tiny-tplink_tl-wr741nd-v4-squashfs-factory.bin",
-          "type": "factory"
-        }
-      ],
-      "target": "ath79/tiny"
-    },
-    "TP-Link TL-WR743ND v1": {
-      "id": "tplink_tl-wr743nd-v1",
-      "images": [
-        {
-          "name": "openwrt-ath79-tiny-tplink_tl-wr743nd-v1-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
-        {
-          "name": "openwrt-ath79-tiny-tplink_tl-wr743nd-v1-squashfs-factory.bin",
-          "type": "factory"
-        }
-      ],
-      "target": "ath79/tiny"
-    },
-    "TP-Link TL-WR802N v4": {
-      "id": "tplink_tl-wr802n-v4",
-      "images": [
-        {
-          "name": "openwrt-ramips-mt76x8-tplink_tl-wr802n-v4-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
-        {
-          "name": "openwrt-ramips-mt76x8-tplink_tl-wr802n-v4-squashfs-tftp-recovery.bin",
-          "type": "tftp-recovery"
-        }
-      ],
-      "target": "ramips/mt76x8"
-    },
-    "TP-Link TL-WR810N v1": {
-      "id": "tplink_tl-wr810n-v1",
-      "images": [
-        {
-          "name": "openwrt-ath79-generic-tplink_tl-wr810n-v1-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
-        {
-          "name": "openwrt-ath79-generic-tplink_tl-wr810n-v1-squashfs-factory.bin",
-          "type": "factory"
-        }
-      ],
-      "target": "ath79/generic"
-    },
-    "TP-Link TL-WR810N v2": {
-      "id": "tplink_tl-wr810n-v2",
-      "images": [
-        {
-          "name": "openwrt-ath79-generic-tplink_tl-wr810n-v2-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
-        {
-          "name": "openwrt-ath79-generic-tplink_tl-wr810n-v2-squashfs-factory.bin",
-          "type": "factory"
-        }
-      ],
-      "target": "ath79/generic"
-    },
-    "TP-Link TL-WR840N v4": {
-      "id": "tplink_tl-wr840n-v4",
-      "images": [
-        {
-          "name": "openwrt-ramips-mt76x8-tplink_tl-wr840n-v4-squashfs-sysupgrade.bin",
+          "name": "openwrt-ramips-mt76x8-tplink_tl-wr840n-v4-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
         },
         {
@@ -9846,168 +9672,30 @@
       ],
       "target": "ramips/mt76x8"
     },
-    "TP-Link TL-WR840N v5": {
-      "id": "tplink_tl-wr840n-v5",
-      "images": [
-        {
-          "name": "openwrt-ramips-mt76x8-tplink_tl-wr840n-v5-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        }
-      ],
-      "target": "ramips/mt76x8"
-    },
     "TP-Link TL-WR841N v13": {
       "id": "tplink_tl-wr841n-v13",
       "images": [
-        {
-          "name": "openwrt-ramips-mt76x8-tplink_tl-wr841n-v13-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-ramips-mt76x8-tplink_tl-wr841n-v13-squashfs-tftp-recovery.bin",
           "type": "tftp-recovery"
-        }
-      ],
-      "target": "ramips/mt76x8"
-    },
-    "TP-Link TL-WR841N v14": {
-      "id": "tplink_tl-wr841n-v14",
-      "images": [
-        {
-          "name": "openwrt-ramips-mt76x8-tplink_tl-wr841n-v14-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
-        {
-          "name": "openwrt-ramips-mt76x8-tplink_tl-wr841n-v14-squashfs-tftp-recovery.bin",
-          "type": "tftp-recovery"
-        }
-      ],
-      "target": "ramips/mt76x8"
-    },
-    "TP-Link TL-WR841N/ND v10": {
-      "id": "tplink_tl-wr841-v10",
-      "images": [
-        {
-          "name": "openwrt-ath79-tiny-tplink_tl-wr841-v10-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
         },
         {
-          "name": "openwrt-ath79-tiny-tplink_tl-wr841-v10-squashfs-factory.bin",
-          "type": "factory"
-        }
-      ],
-      "target": "ath79/tiny"
-    },
-    "TP-Link TL-WR841N/ND v11": {
-      "id": "tplink_tl-wr841-v11",
-      "images": [
-        {
-          "name": "openwrt-ath79-tiny-tplink_tl-wr841-v11-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
-        {
-          "name": "openwrt-ath79-tiny-tplink_tl-wr841-v11-squashfs-factory.bin",
-          "type": "factory"
-        },
-        {
-          "name": "openwrt-ath79-tiny-tplink_tl-wr841-v11-squashfs-factory-us.bin",
-          "type": "factory-us"
-        },
-        {
-          "name": "openwrt-ath79-tiny-tplink_tl-wr841-v11-squashfs-factory-eu.bin",
-          "type": "factory-eu"
-        }
-      ],
-      "target": "ath79/tiny"
-    },
-    "TP-Link TL-WR841N/ND v12": {
-      "id": "tplink_tl-wr841-v12",
-      "images": [
-        {
-          "name": "openwrt-ath79-tiny-tplink_tl-wr841-v12-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
-        {
-          "name": "openwrt-ath79-tiny-tplink_tl-wr841-v12-squashfs-factory.bin",
-          "type": "factory"
-        },
-        {
-          "name": "openwrt-ath79-tiny-tplink_tl-wr841-v12-squashfs-factory-us.bin",
-          "type": "factory-us"
-        },
-        {
-          "name": "openwrt-ath79-tiny-tplink_tl-wr841-v12-squashfs-factory-eu.bin",
-          "type": "factory-eu"
-        }
-      ],
-      "target": "ath79/tiny"
-    },
-    "TP-Link TL-WR841N/ND v5/v6": {
-      "id": "tplink_tl-wr841-v5",
-      "images": [
-        {
-          "name": "openwrt-ath79-tiny-tplink_tl-wr841-v5-squashfs-factory.bin",
-          "type": "factory"
-        },
-        {
-          "name": "openwrt-ath79-tiny-tplink_tl-wr841-v5-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        }
-      ],
-      "target": "ath79/tiny"
-    },
-    "TP-Link TL-WR841N/ND v7": {
-      "id": "tplink_tl-wr841-v7",
-      "images": [
-        {
-          "name": "openwrt-ath79-tiny-tplink_tl-wr841-v7-squashfs-factory.bin",
-          "type": "factory"
-        },
-        {
-          "name": "openwrt-ath79-tiny-tplink_tl-wr841-v7-squashfs-sysupgrade.bin",
+          "name": "openwrt-ramips-mt76x8-tplink_tl-wr841n-v13-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
         }
       ],
-      "target": "ath79/tiny"
+      "target": "ramips/mt76x8"
     },
-    "TP-Link TL-WR841N/ND v8": {
-      "id": "tplink_tl-wr841-v8",
+    "TP-Link TL-WR842N v3": {
+      "id": "tplink_tl-wr842n-v3",
       "images": [
         {
-          "name": "openwrt-ath79-tiny-tplink_tl-wr841-v8-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
-        {
-          "name": "openwrt-ath79-tiny-tplink_tl-wr841-v8-squashfs-factory.bin",
+          "name": "openwrt-ath79-generic-tplink_tl-wr842n-v3-squashfs-factory.bin",
           "type": "factory"
-        }
-      ],
-      "target": "ath79/tiny"
-    },
-    "TP-Link TL-WR841N/ND v9": {
-      "id": "tplink_tl-wr841-v9",
-      "images": [
-        {
-          "name": "openwrt-ath79-tiny-tplink_tl-wr841-v9-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
         },
-        {
-          "name": "openwrt-ath79-tiny-tplink_tl-wr841-v9-squashfs-factory.bin",
-          "type": "factory"
-        }
-      ],
-      "target": "ath79/tiny"
-    },
-    "TP-Link TL-WR842N v3": {
-      "id": "tplink_tl-wr842n-v3",
-      "images": [
         {
           "name": "openwrt-ath79-generic-tplink_tl-wr842n-v3-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
-        },
-        {
-          "name": "openwrt-ath79-generic-tplink_tl-wr842n-v3-squashfs-factory.bin",
-          "type": "factory"
         }
       ],
       "target": "ath79/generic"
@@ -10015,13 +9703,13 @@
     "TP-Link TL-WR842N v5": {
       "id": "tplink_tl-wr842n-v5",
       "images": [
-        {
-          "name": "openwrt-ramips-mt76x8-tplink_tl-wr842n-v5-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-ramips-mt76x8-tplink_tl-wr842n-v5-squashfs-tftp-recovery.bin",
           "type": "tftp-recovery"
+        },
+        {
+          "name": "openwrt-ramips-mt76x8-tplink_tl-wr842n-v5-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ramips/mt76x8"
@@ -10029,13 +9717,13 @@
     "TP-Link TL-WR842N/ND v1": {
       "id": "tplink_tl-wr842n-v1",
       "images": [
-        {
-          "name": "openwrt-ath79-generic-tplink_tl-wr842n-v1-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-ath79-generic-tplink_tl-wr842n-v1-squashfs-factory.bin",
           "type": "factory"
+        },
+        {
+          "name": "openwrt-ath79-generic-tplink_tl-wr842n-v1-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ath79/generic"
@@ -10057,13 +9745,13 @@
     "TP-Link TL-WR902AC v1": {
       "id": "tplink_tl-wr902ac-v1",
       "images": [
-        {
-          "name": "openwrt-ath79-generic-tplink_tl-wr902ac-v1-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-ath79-generic-tplink_tl-wr902ac-v1-squashfs-factory.bin",
           "type": "factory"
+        },
+        {
+          "name": "openwrt-ath79-generic-tplink_tl-wr902ac-v1-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ath79/generic"
@@ -10082,140 +9770,16 @@
       ],
       "target": "ramips/mt76x8"
     },
-    "TP-Link TL-WR940N v3": {
-      "id": "tplink_tl-wr940n-v3",
-      "images": [
-        {
-          "name": "openwrt-ath79-tiny-tplink_tl-wr940n-v3-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
-        {
-          "name": "openwrt-ath79-tiny-tplink_tl-wr940n-v3-squashfs-factory.bin",
-          "type": "factory"
-        }
-      ],
-      "target": "ath79/tiny"
-    },
-    "TP-Link TL-WR940N v4": {
-      "id": "tplink_tl-wr940n-v4",
-      "images": [
-        {
-          "name": "openwrt-ath79-tiny-tplink_tl-wr940n-v4-squashfs-factory.bin",
-          "type": "factory"
-        },
-        {
-          "name": "openwrt-ath79-tiny-tplink_tl-wr940n-v4-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
-        {
-          "name": "openwrt-ath79-tiny-tplink_tl-wr940n-v4-squashfs-factory-us.bin",
-          "type": "factory-us"
-        },
-        {
-          "name": "openwrt-ath79-tiny-tplink_tl-wr940n-v4-squashfs-factory-eu.bin",
-          "type": "factory-eu"
-        },
-        {
-          "name": "openwrt-ath79-tiny-tplink_tl-wr940n-v4-squashfs-factory-br.bin",
-          "type": "factory-br"
-        }
-      ],
-      "target": "ath79/tiny"
-    },
-    "TP-Link TL-WR941N v2/v3": {
-      "id": "tplink_tl-wr941-v2",
-      "images": [
-        {
-          "name": "openwrt-ath79-tiny-tplink_tl-wr941-v2-squashfs-factory.bin",
-          "type": "factory"
-        },
-        {
-          "name": "openwrt-ath79-tiny-tplink_tl-wr941-v2-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        }
-      ],
-      "target": "ath79/tiny"
-    },
-    "TP-Link TL-WR941N v4": {
-      "id": "tplink_tl-wr941-v4",
-      "images": [
-        {
-          "name": "openwrt-ath79-tiny-tplink_tl-wr941-v4-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
-        {
-          "name": "openwrt-ath79-tiny-tplink_tl-wr941-v4-squashfs-factory.bin",
-          "type": "factory"
-        }
-      ],
-      "target": "ath79/tiny"
-    },
-    "TP-Link TL-WR941N v7 (CN)": {
-      "id": "tplink_tl-wr941n-v7-cn",
-      "images": [
-        {
-          "name": "openwrt-ath79-tiny-tplink_tl-wr941n-v7-cn-squashfs-factory.bin",
-          "type": "factory"
-        },
-        {
-          "name": "openwrt-ath79-tiny-tplink_tl-wr941n-v7-cn-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        }
-      ],
-      "target": "ath79/tiny"
-    },
-    "TP-Link TL-WR941ND v2/v3": {
-      "id": "tplink_tl-wr941-v2",
-      "images": [
-        {
-          "name": "openwrt-ath79-tiny-tplink_tl-wr941-v2-squashfs-factory.bin",
-          "type": "factory"
-        },
-        {
-          "name": "openwrt-ath79-tiny-tplink_tl-wr941-v2-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        }
-      ],
-      "target": "ath79/tiny"
-    },
-    "TP-Link TL-WR941ND v4": {
-      "id": "tplink_tl-wr941-v4",
-      "images": [
-        {
-          "name": "openwrt-ath79-tiny-tplink_tl-wr941-v4-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
-        {
-          "name": "openwrt-ath79-tiny-tplink_tl-wr941-v4-squashfs-factory.bin",
-          "type": "factory"
-        }
-      ],
-      "target": "ath79/tiny"
-    },
-    "TP-Link TL-WR941ND v6": {
-      "id": "tplink_tl-wr941nd-v6",
+    "TP-Link WBS210 v2": {
+      "id": "tplink_wbs210-v2",
       "images": [
         {
-          "name": "openwrt-ath79-tiny-tplink_tl-wr941nd-v6-squashfs-sysupgrade.bin",
+          "name": "openwrt-ath79-generic-tplink_wbs210-v2-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
         },
-        {
-          "name": "openwrt-ath79-tiny-tplink_tl-wr941nd-v6-squashfs-factory.bin",
-          "type": "factory"
-        }
-      ],
-      "target": "ath79/tiny"
-    },
-    "TP-Link WBS210 v2": {
-      "id": "tplink_wbs210-v2",
-      "images": [
         {
           "name": "openwrt-ath79-generic-tplink_wbs210-v2-squashfs-factory.bin",
           "type": "factory"
-        },
-        {
-          "name": "openwrt-ath79-generic-tplink_wbs210-v2-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
         }
       ],
       "target": "ath79/generic"
@@ -10223,13 +9787,13 @@
     "TP-Link WBS510 v1": {
       "id": "tplink_wbs510-v1",
       "images": [
-        {
-          "name": "openwrt-ath79-generic-tplink_wbs510-v1-squashfs-factory.bin",
-          "type": "factory"
-        },
         {
           "name": "openwrt-ath79-generic-tplink_wbs510-v1-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
+        },
+        {
+          "name": "openwrt-ath79-generic-tplink_wbs510-v1-squashfs-factory.bin",
+          "type": "factory"
         }
       ],
       "target": "ath79/generic"
@@ -10248,26 +9812,16 @@
       ],
       "target": "ath79/generic"
     },
-    "TRENDnet TEW-638APB v2": {
-      "id": "trendnet_tew-638apb-v2",
-      "images": [
-        {
-          "name": "openwrt-ramips-rt305x-trendnet_tew-638apb-v2-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        }
-      ],
-      "target": "ramips/rt305x"
-    },
     "TRENDnet TEW-691GR": {
       "id": "trendnet_tew-691gr",
       "images": [
-        {
-          "name": "openwrt-ramips-rt3883-trendnet_tew-691gr-squashfs-factory.bin",
-          "type": "factory"
-        },
         {
           "name": "openwrt-ramips-rt3883-trendnet_tew-691gr-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
+        },
+        {
+          "name": "openwrt-ramips-rt3883-trendnet_tew-691gr-squashfs-factory.bin",
+          "type": "factory"
         }
       ],
       "target": "ramips/rt3883"
@@ -10275,13 +9829,13 @@
     "TRENDnet TEW-692GR": {
       "id": "trendnet_tew-692gr",
       "images": [
-        {
-          "name": "openwrt-ramips-rt3883-trendnet_tew-692gr-squashfs-factory.bin",
-          "type": "factory"
-        },
         {
           "name": "openwrt-ramips-rt3883-trendnet_tew-692gr-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
+        },
+        {
+          "name": "openwrt-ramips-rt3883-trendnet_tew-692gr-squashfs-factory.bin",
+          "type": "factory"
         }
       ],
       "target": "ramips/rt3883"
@@ -10306,26 +9860,6 @@
       ],
       "target": "ramips/mt76x8"
     },
-    "Tecom GW6000": {
-      "id": "GW6000",
-      "images": [
-        {
-          "name": "openwrt-brcm63xx-smp-GW6000-squashfs-cfe.bin",
-          "type": "cfe"
-        }
-      ],
-      "target": "brcm63xx/smp"
-    },
-    "Tecom GW6200": {
-      "id": "GW6200",
-      "images": [
-        {
-          "name": "openwrt-brcm63xx-smp-GW6200-squashfs-cfe.bin",
-          "type": "cfe"
-        }
-      ],
-      "target": "brcm63xx/smp"
-    },
     "Telco Electronics X1": {
       "id": "telco-electronics_x1",
       "images": [
@@ -10347,14 +9881,14 @@
       "target": "lantiq/xway"
     },
     "Telsey CPVA642-type (CPA-ZNTE60T)": {
-      "id": "CPA-ZNTE60T",
+      "id": "telsey_cpva642",
       "images": [
         {
-          "name": "openwrt-brcm63xx-smp-CPA-ZNTE60T-squashfs-cfe.bin",
+          "name": "openwrt-bcm63xx-smp-telsey_cpva642-squashfs-cfe.bin",
           "type": "cfe"
         }
       ],
-      "target": "brcm63xx/smp"
+      "target": "bcm63xx/smp"
     },
     "Teltonika RUT5XX": {
       "id": "teltonika_rut5xx",
@@ -10366,25 +9900,33 @@
       ],
       "target": "ramips/rt305x"
     },
-    "Tenda 3G150B": {
-      "id": "tenda_3g150b",
+    "Teltonika RUT955": {
+      "id": "teltonika_rut955",
       "images": [
         {
-          "name": "openwrt-ramips-rt305x-tenda_3g150b-squashfs-sysupgrade.bin",
+          "name": "openwrt-ath79-generic-teltonika_rut955-squashfs-factory.bin",
+          "type": "factory"
+        },
+        {
+          "name": "openwrt-ath79-generic-teltonika_rut955-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
         }
       ],
-      "target": "ramips/rt305x"
+      "target": "ath79/generic"
     },
-    "Tenda 3G300M": {
-      "id": "tenda_3g300m",
+    "Teltonika RUT955 H7V3C0": {
+      "id": "teltonika_rut955-h7v3c0",
       "images": [
         {
-          "name": "openwrt-ramips-rt305x-tenda_3g300m-squashfs-sysupgrade.bin",
+          "name": "openwrt-ath79-generic-teltonika_rut955-h7v3c0-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
+        },
+        {
+          "name": "openwrt-ath79-generic-teltonika_rut955-h7v3c0-squashfs-factory.bin",
+          "type": "factory"
         }
       ],
-      "target": "ramips/rt305x"
+      "target": "ath79/generic"
     },
     "Tenda AC9": {
       "id": "tenda-ac9",
@@ -10396,39 +9938,19 @@
       ],
       "target": "bcm53xx/generic"
     },
-    "Tenda W150M": {
-      "id": "tenda_w150m",
-      "images": [
-        {
-          "name": "openwrt-ramips-rt305x-tenda_w150m-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        }
-      ],
-      "target": "ramips/rt305x"
-    },
-    "Tenda W306R V2.0": {
-      "id": "tenda_w306r-v2",
-      "images": [
-        {
-          "name": "openwrt-ramips-rt305x-tenda_w306r-v2-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        }
-      ],
-      "target": "ramips/rt305x"
-    },
     "Texas Instruments AM335x BeagleBone Black": {
       "id": "ti_am335x-bone-black",
       "images": [
         {
-          "name": "openwrt-omap-ti_am335x-bone-black-ext4-sdcard.img.gz",
+          "name": "openwrt-omap-ti_am335x-bone-black-squashfs-sdcard.img.gz",
           "type": "sdcard"
         },
         {
-          "name": "openwrt-omap-ti_am335x-bone-black-squashfs-sdcard.img.gz",
+          "name": "openwrt-omap-ti_am335x-bone-black-ext4-sdcard.img.gz",
           "type": "sdcard"
         }
       ],
-      "target": "omap/"
+      "target": "omap/generic"
     },
     "Texas Instruments AM335x EVM": {
       "id": "ti_am335x-evm",
@@ -10442,7 +9964,7 @@
           "type": "sdcard"
         }
       ],
-      "target": "omap/"
+      "target": "omap/generic"
     },
     "Thunder Timecloud": {
       "id": "thunder_timecloud",
@@ -10466,21 +9988,37 @@
           "type": "combined"
         }
       ],
-      "target": "imx6/"
+      "target": "imx6/generic"
     },
-    "Traverse LS1043 Boards": {
-      "id": "traverse-ls1043",
+    "Traverse Technologies Geos": {
+      "id": "geos",
       "images": [
         {
-          "name": "openwrt-layerscape-armv8_64b-traverse-ls1043-ubifs-root",
-          "type": "root"
+          "name": "openwrt-x86-geode-geos-ext4-rootfs.img.gz",
+          "type": "rootfs"
         },
         {
-          "name": "openwrt-layerscape-armv8_64b-traverse-ls1043-ubifs-sysupgrade.bin",
-          "type": "sysupgrade"
+          "name": "openwrt-x86-geode-geos-squashfs-rootfs.img.gz",
+          "type": "rootfs"
+        },
+        {
+          "name": "openwrt-x86-geode-geos-ext4-combined.img.gz",
+          "type": "combined"
+        },
+        {
+          "name": "openwrt-x86-geode-geos-squashfs-combined-efi.img.gz",
+          "type": "combined-efi"
+        },
+        {
+          "name": "openwrt-x86-geode-geos-squashfs-combined.img.gz",
+          "type": "combined"
+        },
+        {
+          "name": "openwrt-x86-geode-geos-ext4-combined-efi.img.gz",
+          "type": "combined-efi"
         }
       ],
-      "target": "layerscape/armv8_64b"
+      "target": "x86/geode"
     },
     "Trendnet TEW-823DRU v1.0R": {
       "id": "trendnet_tew-823dru",
@@ -10496,16 +10034,6 @@
       ],
       "target": "ath79/generic"
     },
-    "UPVEL UR-326N4G": {
-      "id": "upvel_ur-326n4g",
-      "images": [
-        {
-          "name": "openwrt-ramips-rt305x-upvel_ur-326n4g-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        }
-      ],
-      "target": "ramips/rt305x"
-    },
     "UPVEL UR-336UN": {
       "id": "upvel_ur-336un",
       "images": [
@@ -10520,11 +10048,11 @@
       "id": "usrobotics-usr5461",
       "images": [
         {
-          "name": "openwrt-brcm47xx-legacy-usrobotics-usr5461-squashfs.bin",
+          "name": "openwrt-bcm47xx-legacy-usrobotics-usr5461-squashfs.bin",
           "type": "bin"
         }
       ],
-      "target": "brcm47xx/legacy"
+      "target": "bcm47xx/legacy"
     },
     "Ubiquiti AirRouter XM": {
       "id": "ubnt_airrouter",
@@ -10540,15 +10068,29 @@
       ],
       "target": "ath79/generic"
     },
-    "Ubiquiti Bullet-M XM": {
-      "id": "ubnt_bullet-m",
+    "Ubiquiti Bullet-M XM (AR7240)": {
+      "id": "ubnt_bullet-m-ar7240",
+      "images": [
+        {
+          "name": "openwrt-ath79-generic-ubnt_bullet-m-ar7240-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
+        },
+        {
+          "name": "openwrt-ath79-generic-ubnt_bullet-m-ar7240-squashfs-factory.bin",
+          "type": "factory"
+        }
+      ],
+      "target": "ath79/generic"
+    },
+    "Ubiquiti Bullet-M XM (AR7241)": {
+      "id": "ubnt_bullet-m-ar7241",
       "images": [
         {
-          "name": "openwrt-ath79-generic-ubnt_bullet-m-squashfs-factory.bin",
+          "name": "openwrt-ath79-generic-ubnt_bullet-m-ar7241-squashfs-factory.bin",
           "type": "factory"
         },
         {
-          "name": "openwrt-ath79-generic-ubnt_bullet-m-squashfs-sysupgrade.bin",
+          "name": "openwrt-ath79-generic-ubnt_bullet-m-ar7241-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
         }
       ],
@@ -10557,13 +10099,13 @@
     "Ubiquiti Bullet-M XW": {
       "id": "ubnt_bullet-m-xw",
       "images": [
-        {
-          "name": "openwrt-ath79-generic-ubnt_bullet-m-xw-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-ath79-generic-ubnt_bullet-m-xw-squashfs-factory.bin",
           "type": "factory"
+        },
+        {
+          "name": "openwrt-ath79-generic-ubnt_bullet-m-xw-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ath79/generic"
@@ -10576,7 +10118,7 @@
           "type": "sysupgrade"
         }
       ],
-      "target": "octeon/"
+      "target": "octeon/generic"
     },
     "Ubiquiti EdgeRouter Lite": {
       "id": "ubnt_edgerouter-lite",
@@ -10586,150 +10128,234 @@
           "type": "sysupgrade"
         }
       ],
-      "target": "octeon/"
+      "target": "octeon/generic"
+    },
+    "Ubiquiti EdgeRouter X": {
+      "id": "ubnt_edgerouter-x",
+      "images": [
+        {
+          "name": "openwrt-ramips-mt7621-ubnt_edgerouter-x-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
+        }
+      ],
+      "target": "ramips/mt7621"
+    },
+    "Ubiquiti EdgeRouter X SFP": {
+      "id": "ubnt_edgerouter-x-sfp",
+      "images": [
+        {
+          "name": "openwrt-ramips-mt7621-ubnt_edgerouter-x-sfp-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
+        }
+      ],
+      "target": "ramips/mt7621"
+    },
+    "Ubiquiti EdgeSwitch 5XP": {
+      "id": "ubnt_edgeswitch-5xp",
+      "images": [
+        {
+          "name": "openwrt-ath79-generic-ubnt_edgeswitch-5xp-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
+        },
+        {
+          "name": "openwrt-ath79-generic-ubnt_edgeswitch-5xp-squashfs-factory.bin",
+          "type": "factory"
+        }
+      ],
+      "target": "ath79/generic"
+    },
+    "Ubiquiti EdgeSwitch 8XP": {
+      "id": "ubnt_edgeswitch-8xp",
+      "images": [
+        {
+          "name": "openwrt-ath79-generic-ubnt_edgeswitch-8xp-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
+        },
+        {
+          "name": "openwrt-ath79-generic-ubnt_edgeswitch-8xp-squashfs-factory.bin",
+          "type": "factory"
+        }
+      ],
+      "target": "ath79/generic"
+    },
+    "Ubiquiti LiteAP ac LAP-120": {
+      "id": "ubnt_lap-120",
+      "images": [
+        {
+          "name": "openwrt-ath79-generic-ubnt_lap-120-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
+        },
+        {
+          "name": "openwrt-ath79-generic-ubnt_lap-120-squashfs-factory.bin",
+          "type": "factory"
+        }
+      ],
+      "target": "ath79/generic"
+    },
+    "Ubiquiti LiteBeam AC Gen2": {
+      "id": "ubnt_litebeam-ac-gen2",
+      "images": [
+        {
+          "name": "openwrt-ath79-generic-ubnt_litebeam-ac-gen2-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
+        },
+        {
+          "name": "openwrt-ath79-generic-ubnt_litebeam-ac-gen2-squashfs-factory.bin",
+          "type": "factory"
+        }
+      ],
+      "target": "ath79/generic"
+    },
+    "Ubiquiti NanoBeam AC": {
+      "id": "ubnt_nanobeam-ac",
+      "images": [
+        {
+          "name": "openwrt-ath79-generic-ubnt_nanobeam-ac-squashfs-factory.bin",
+          "type": "factory"
+        },
+        {
+          "name": "openwrt-ath79-generic-ubnt_nanobeam-ac-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
+        }
+      ],
+      "target": "ath79/generic"
     },
-    "Ubiquiti EdgeRouter X": {
-      "id": "ubiquiti_edgerouterx",
+    "Ubiquiti NanoBridge M XM": {
+      "id": "ubnt_nanobridge-m",
       "images": [
         {
-          "name": "openwrt-ramips-mt7621-ubiquiti_edgerouterx-squashfs-sysupgrade.bin",
+          "name": "openwrt-ath79-generic-ubnt_nanobridge-m-squashfs-factory.bin",
+          "type": "factory"
+        },
+        {
+          "name": "openwrt-ath79-generic-ubnt_nanobridge-m-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
         }
       ],
-      "target": "ramips/mt7621"
+      "target": "ath79/generic"
     },
-    "Ubiquiti EdgeRouter X-SFP": {
-      "id": "ubiquiti_edgerouterx-sfp",
+    "Ubiquiti Nanostation AC": {
+      "id": "ubnt_nanostation-ac",
       "images": [
         {
-          "name": "openwrt-ramips-mt7621-ubiquiti_edgerouterx-sfp-squashfs-sysupgrade.bin",
+          "name": "openwrt-ath79-generic-ubnt_nanostation-ac-squashfs-factory.bin",
+          "type": "factory"
+        },
+        {
+          "name": "openwrt-ath79-generic-ubnt_nanostation-ac-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
         }
       ],
-      "target": "ramips/mt7621"
+      "target": "ath79/generic"
     },
-    "Ubiquiti EdgeSwitch 5XP": {
-      "id": "ubnt_edgeswitch-5xp",
+    "Ubiquiti Nanostation AC loco": {
+      "id": "ubnt_nanostation-ac-loco",
       "images": [
         {
-          "name": "openwrt-ath79-generic-ubnt_edgeswitch-5xp-squashfs-sysupgrade.bin",
+          "name": "openwrt-ath79-generic-ubnt_nanostation-ac-loco-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
         },
         {
-          "name": "openwrt-ath79-generic-ubnt_edgeswitch-5xp-squashfs-factory.bin",
+          "name": "openwrt-ath79-generic-ubnt_nanostation-ac-loco-squashfs-factory.bin",
           "type": "factory"
         }
       ],
       "target": "ath79/generic"
     },
-    "Ubiquiti EdgeSwitch 8XP": {
-      "id": "ubnt_edgeswitch-8xp",
+    "Ubiquiti Nanostation Loco M XM": {
+      "id": "ubnt_nanostation-loco-m",
       "images": [
         {
-          "name": "openwrt-ath79-generic-ubnt_edgeswitch-8xp-squashfs-factory.bin",
-          "type": "factory"
+          "name": "openwrt-ath79-generic-ubnt_nanostation-loco-m-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         },
         {
-          "name": "openwrt-ath79-generic-ubnt_edgeswitch-8xp-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
+          "name": "openwrt-ath79-generic-ubnt_nanostation-loco-m-squashfs-factory.bin",
+          "type": "factory"
         }
       ],
       "target": "ath79/generic"
     },
-    "Ubiquiti LiteAP ac LAP-120": {
-      "id": "ubnt_lap-120",
+    "Ubiquiti Nanostation Loco M XW": {
+      "id": "ubnt_nanostation-loco-m-xw",
       "images": [
         {
-          "name": "openwrt-ath79-generic-ubnt_lap-120-squashfs-sysupgrade.bin",
+          "name": "openwrt-ath79-generic-ubnt_nanostation-loco-m-xw-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
         },
         {
-          "name": "openwrt-ath79-generic-ubnt_lap-120-squashfs-factory.bin",
+          "name": "openwrt-ath79-generic-ubnt_nanostation-loco-m-xw-squashfs-factory.bin",
           "type": "factory"
         }
       ],
       "target": "ath79/generic"
     },
-    "Ubiquiti LiteBeam AC Gen2": {
-      "id": "ubnt_litebeam-ac-gen2",
+    "Ubiquiti Nanostation M XM": {
+      "id": "ubnt_nanostation-m",
       "images": [
         {
-          "name": "openwrt-ath79-generic-ubnt_litebeam-ac-gen2-squashfs-factory.bin",
+          "name": "openwrt-ath79-generic-ubnt_nanostation-m-squashfs-factory.bin",
           "type": "factory"
         },
         {
-          "name": "openwrt-ath79-generic-ubnt_litebeam-ac-gen2-squashfs-sysupgrade.bin",
+          "name": "openwrt-ath79-generic-ubnt_nanostation-m-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
         }
       ],
       "target": "ath79/generic"
     },
-    "Ubiquiti NanoBeam AC": {
-      "id": "ubnt_nanobeam-ac",
+    "Ubiquiti Nanostation M XW": {
+      "id": "ubnt_nanostation-m-xw",
       "images": [
         {
-          "name": "openwrt-ath79-generic-ubnt_nanobeam-ac-squashfs-factory.bin",
+          "name": "openwrt-ath79-generic-ubnt_nanostation-m-xw-squashfs-factory.bin",
           "type": "factory"
         },
         {
-          "name": "openwrt-ath79-generic-ubnt_nanobeam-ac-squashfs-sysupgrade.bin",
+          "name": "openwrt-ath79-generic-ubnt_nanostation-m-xw-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
         }
       ],
       "target": "ath79/generic"
     },
-    "Ubiquiti Nanostation AC": {
-      "id": "ubnt_nanostation-ac",
+    "Ubiquiti Picostation M XM": {
+      "id": "ubnt_picostation-m",
       "images": [
         {
-          "name": "openwrt-ath79-generic-ubnt_nanostation-ac-squashfs-sysupgrade.bin",
+          "name": "openwrt-ath79-generic-ubnt_picostation-m-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
         },
         {
-          "name": "openwrt-ath79-generic-ubnt_nanostation-ac-squashfs-factory.bin",
+          "name": "openwrt-ath79-generic-ubnt_picostation-m-squashfs-factory.bin",
           "type": "factory"
         }
       ],
       "target": "ath79/generic"
     },
-    "Ubiquiti Nanostation AC loco": {
-      "id": "ubnt_nanostation-ac-loco",
+    "Ubiquiti PowerBeam 5AC 500": {
+      "id": "ubnt_powerbeam-5ac-500",
       "images": [
         {
-          "name": "openwrt-ath79-generic-ubnt_nanostation-ac-loco-squashfs-factory.bin",
+          "name": "openwrt-ath79-generic-ubnt_powerbeam-5ac-500-squashfs-factory.bin",
           "type": "factory"
         },
         {
-          "name": "openwrt-ath79-generic-ubnt_nanostation-ac-loco-squashfs-sysupgrade.bin",
+          "name": "openwrt-ath79-generic-ubnt_powerbeam-5ac-500-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
         }
       ],
       "target": "ath79/generic"
     },
-    "Ubiquiti Nanostation M XM": {
-      "id": "ubnt_nanostation-m",
+    "Ubiquiti PowerBeam 5AC Gen2": {
+      "id": "ubnt_powerbeam-5ac-gen2",
       "images": [
         {
-          "name": "openwrt-ath79-generic-ubnt_nanostation-m-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
-        {
-          "name": "openwrt-ath79-generic-ubnt_nanostation-m-squashfs-factory.bin",
+          "name": "openwrt-ath79-generic-ubnt_powerbeam-5ac-gen2-squashfs-factory.bin",
           "type": "factory"
-        }
-      ],
-      "target": "ath79/generic"
-    },
-    "Ubiquiti Nanostation M XW": {
-      "id": "ubnt_nanostation-m-xw",
-      "images": [
-        {
-          "name": "openwrt-ath79-generic-ubnt_nanostation-m-xw-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
         },
         {
-          "name": "openwrt-ath79-generic-ubnt_nanostation-m-xw-squashfs-factory.bin",
-          "type": "factory"
+          "name": "openwrt-ath79-generic-ubnt_powerbeam-5ac-gen2-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ath79/generic"
@@ -10737,13 +10363,13 @@
     "Ubiquiti Rocket-M XM": {
       "id": "ubnt_rocket-m",
       "images": [
-        {
-          "name": "openwrt-ath79-generic-ubnt_rocket-m-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-ath79-generic-ubnt_rocket-m-squashfs-factory.bin",
           "type": "factory"
+        },
+        {
+          "name": "openwrt-ath79-generic-ubnt_rocket-m-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ath79/generic"
@@ -10771,13 +10397,13 @@
     "Ubiquiti UniFi": {
       "id": "ubnt_unifi",
       "images": [
-        {
-          "name": "openwrt-ath79-generic-ubnt_unifi-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-ath79-generic-ubnt_unifi-squashfs-factory.bin",
           "type": "factory"
+        },
+        {
+          "name": "openwrt-ath79-generic-ubnt_unifi-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ath79/generic"
@@ -10832,6 +10458,16 @@
       ],
       "target": "ath79/generic"
     },
+    "Ubiquiti UniFi nanoHD": {
+      "id": "ubnt_unifi-nanohd",
+      "images": [
+        {
+          "name": "openwrt-ramips-mt7621-ubnt_unifi-nanohd-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
+        }
+      ],
+      "target": "ramips/mt7621"
+    },
     "Ubiquiti XS2": {
       "id": "ubnt2",
       "images": [
@@ -10840,7 +10476,7 @@
           "type": "sysupgrade"
         }
       ],
-      "target": "ath25/"
+      "target": "ath25/generic"
     },
     "Ubiquiti XS2-8": {
       "id": "ubnt2-pico2",
@@ -10850,7 +10486,7 @@
           "type": "sysupgrade"
         }
       ],
-      "target": "ath25/"
+      "target": "ath25/generic"
     },
     "Ubiquiti XS5": {
       "id": "ubnt5",
@@ -10860,18 +10496,18 @@
           "type": "sysupgrade"
         }
       ],
-      "target": "ath25/"
+      "target": "ath25/generic"
     },
     "Ubiquiti airCube ISP": {
       "id": "ubnt_acb-isp",
       "images": [
-        {
-          "name": "openwrt-ath79-generic-ubnt_acb-isp-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-ath79-generic-ubnt_acb-isp-squashfs-factory.bin",
           "type": "factory"
+        },
+        {
+          "name": "openwrt-ath79-generic-ubnt_acb-isp-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ath79/generic"
@@ -10986,16 +10622,6 @@
       ],
       "target": "lantiq/xway"
     },
-    "Vonets VAR11N-300": {
-      "id": "vonets_var11n-300",
-      "images": [
-        {
-          "name": "openwrt-ramips-mt7620-vonets_var11n-300-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        }
-      ],
-      "target": "ramips/mt7620"
-    },
     "WIZnet WizFi630A": {
       "id": "wiznet_wizfi630a",
       "images": [
@@ -11107,13 +10733,13 @@
           "name": "openwrt-apm821xx-sata-wd_mybooklive-ext4-sysupgrade.img.gz",
           "type": "sysupgrade"
         },
-        {
-          "name": "openwrt-apm821xx-sata-wd_mybooklive-squashfs-factory.img.gz",
-          "type": "factory"
-        },
         {
           "name": "openwrt-apm821xx-sata-wd_mybooklive-squashfs-sysupgrade.img.gz",
           "type": "sysupgrade"
+        },
+        {
+          "name": "openwrt-apm821xx-sata-wd_mybooklive-squashfs-factory.img.gz",
+          "type": "factory"
         }
       ],
       "target": "apm821xx/sata"
@@ -11121,13 +10747,13 @@
     "Western Digital My Net N750": {
       "id": "wd_mynet-n750",
       "images": [
-        {
-          "name": "openwrt-ath79-generic-wd_mynet-n750-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-ath79-generic-wd_mynet-n750-squashfs-factory.bin",
           "type": "factory"
+        },
+        {
+          "name": "openwrt-ath79-generic-wd_mynet-n750-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ath79/generic"
@@ -11182,16 +10808,6 @@
       ],
       "target": "lantiq/xway"
     },
-    "XDX RN502J": {
-      "id": "unbranded_xdx-rn502j",
-      "images": [
-        {
-          "name": "openwrt-ramips-rt305x-unbranded_xdx-rn502j-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        }
-      ],
-      "target": "ramips/rt305x"
-    },
     "XiaoYu XY-C5": {
       "id": "xiaoyu_xy-c5",
       "images": [
@@ -11220,16 +10836,16 @@
       "id": "xiaomi_mir3g",
       "images": [
         {
-          "name": "openwrt-ramips-mt7621-xiaomi_mir3g-squashfs-kernel1.bin",
-          "type": "kernel1"
+          "name": "openwrt-ramips-mt7621-xiaomi_mir3g-squashfs-rootfs0.bin",
+          "type": "rootfs0"
         },
         {
           "name": "openwrt-ramips-mt7621-xiaomi_mir3g-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
         },
         {
-          "name": "openwrt-ramips-mt7621-xiaomi_mir3g-squashfs-rootfs0.bin",
-          "type": "rootfs0"
+          "name": "openwrt-ramips-mt7621-xiaomi_mir3g-squashfs-kernel1.bin",
+          "type": "kernel1"
         }
       ],
       "target": "ramips/mt7621"
@@ -11294,6 +10910,24 @@
       ],
       "target": "ramips/mt76x8"
     },
+    "Xiaomi Redmi Router AC2100": {
+      "id": "xiaomi_redmi-router-ac2100",
+      "images": [
+        {
+          "name": "openwrt-ramips-mt7621-xiaomi_redmi-router-ac2100-squashfs-rootfs0.bin",
+          "type": "rootfs0"
+        },
+        {
+          "name": "openwrt-ramips-mt7621-xiaomi_redmi-router-ac2100-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
+        },
+        {
+          "name": "openwrt-ramips-mt7621-xiaomi_redmi-router-ac2100-squashfs-kernel1.bin",
+          "type": "kernel1"
+        }
+      ],
+      "target": "ramips/mt7621"
+    },
     "Xilinx ZC702": {
       "id": "xlnx_zynq-zc702",
       "images": [
@@ -11302,7 +10936,7 @@
           "type": "sdcard"
         }
       ],
-      "target": "zynq/"
+      "target": "zynq/generic"
     },
     "Xunlong Orange Pi 2": {
       "id": "xunlong_orangepi-2",
@@ -11322,11 +10956,11 @@
       "id": "xunlong_orangepi-one",
       "images": [
         {
-          "name": "openwrt-sunxi-cortexa7-xunlong_orangepi-one-squashfs-sdcard.img.gz",
+          "name": "openwrt-sunxi-cortexa7-xunlong_orangepi-one-ext4-sdcard.img.gz",
           "type": "sdcard"
         },
         {
-          "name": "openwrt-sunxi-cortexa7-xunlong_orangepi-one-ext4-sdcard.img.gz",
+          "name": "openwrt-sunxi-cortexa7-xunlong_orangepi-one-squashfs-sdcard.img.gz",
           "type": "sdcard"
         }
       ],
@@ -11335,40 +10969,26 @@
     "Xunlong Orange Pi PC": {
       "id": "xunlong_orangepi-pc",
       "images": [
-        {
-          "name": "openwrt-sunxi-cortexa7-xunlong_orangepi-pc-squashfs-sdcard.img.gz",
-          "type": "sdcard"
-        },
         {
           "name": "openwrt-sunxi-cortexa7-xunlong_orangepi-pc-ext4-sdcard.img.gz",
           "type": "sdcard"
-        }
-      ],
-      "target": "sunxi/cortexa7"
-    },
-    "Xunlong Orange Pi PC 2": {
-      "id": "xunlong_orangepi-pc2",
-      "images": [
-        {
-          "name": "openwrt-sunxi-cortexa53-xunlong_orangepi-pc2-ext4-sdcard.img.gz",
-          "type": "sdcard"
         },
         {
-          "name": "openwrt-sunxi-cortexa53-xunlong_orangepi-pc2-squashfs-sdcard.img.gz",
+          "name": "openwrt-sunxi-cortexa7-xunlong_orangepi-pc-squashfs-sdcard.img.gz",
           "type": "sdcard"
         }
       ],
-      "target": "sunxi/cortexa53"
+      "target": "sunxi/cortexa7"
     },
     "Xunlong Orange Pi PC Plus": {
       "id": "xunlong_orangepi-pc-plus",
       "images": [
         {
-          "name": "openwrt-sunxi-cortexa7-xunlong_orangepi-pc-plus-squashfs-sdcard.img.gz",
+          "name": "openwrt-sunxi-cortexa7-xunlong_orangepi-pc-plus-ext4-sdcard.img.gz",
           "type": "sdcard"
         },
         {
-          "name": "openwrt-sunxi-cortexa7-xunlong_orangepi-pc-plus-ext4-sdcard.img.gz",
+          "name": "openwrt-sunxi-cortexa7-xunlong_orangepi-pc-plus-squashfs-sdcard.img.gz",
           "type": "sdcard"
         }
       ],
@@ -11378,11 +10998,11 @@
       "id": "xunlong_orangepi-plus",
       "images": [
         {
-          "name": "openwrt-sunxi-cortexa7-xunlong_orangepi-plus-squashfs-sdcard.img.gz",
+          "name": "openwrt-sunxi-cortexa7-xunlong_orangepi-plus-ext4-sdcard.img.gz",
           "type": "sdcard"
         },
         {
-          "name": "openwrt-sunxi-cortexa7-xunlong_orangepi-plus-ext4-sdcard.img.gz",
+          "name": "openwrt-sunxi-cortexa7-xunlong_orangepi-plus-squashfs-sdcard.img.gz",
           "type": "sdcard"
         }
       ],
@@ -11416,20 +11036,6 @@
       ],
       "target": "sunxi/cortexa7"
     },
-    "Xunlong Orange Pi Zero Plus": {
-      "id": "xunlong_orangepi-zero-plus",
-      "images": [
-        {
-          "name": "openwrt-sunxi-cortexa53-xunlong_orangepi-zero-plus-ext4-sdcard.img.gz",
-          "type": "sdcard"
-        },
-        {
-          "name": "openwrt-sunxi-cortexa53-xunlong_orangepi-zero-plus-squashfs-sdcard.img.gz",
-          "type": "sdcard"
-        }
-      ],
-      "target": "sunxi/cortexa53"
-    },
     "YOUKU YK1": {
       "id": "youku_yk1",
       "images": [
@@ -11749,13 +11355,13 @@
     "ZyXEL Keenetic Omni": {
       "id": "zyxel_keenetic-omni",
       "images": [
-        {
-          "name": "openwrt-ramips-mt7620-zyxel_keenetic-omni-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-ramips-mt7620-zyxel_keenetic-omni-squashfs-factory.bin",
           "type": "factory"
+        },
+        {
+          "name": "openwrt-ramips-mt7620-zyxel_keenetic-omni-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ramips/mt7620"
@@ -11774,39 +11380,19 @@
       ],
       "target": "ramips/mt7620"
     },
-    "ZyXEL Keenetic Start": {
-      "id": "zyxel_keenetic-start",
-      "images": [
-        {
-          "name": "openwrt-ramips-rt305x-zyxel_keenetic-start-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        }
-      ],
-      "target": "ramips/rt305x"
-    },
     "ZyXEL Keenetic Viva": {
       "id": "zyxel_keenetic-viva",
       "images": [
-        {
-          "name": "openwrt-ramips-mt7620-zyxel_keenetic-viva-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-ramips-mt7620-zyxel_keenetic-viva-squashfs-factory.bin",
           "type": "factory"
-        }
-      ],
-      "target": "ramips/mt7620"
-    },
-    "ZyXEL NBG-419N": {
-      "id": "zyxel_nbg-419n",
-      "images": [
+        },
         {
-          "name": "openwrt-ramips-rt305x-zyxel_nbg-419n-squashfs-sysupgrade.bin",
+          "name": "openwrt-ramips-mt7620-zyxel_keenetic-viva-squashfs-sysupgrade.bin",
           "type": "sysupgrade"
         }
       ],
-      "target": "ramips/rt305x"
+      "target": "ramips/mt7620"
     },
     "ZyXEL NBG-419N v2": {
       "id": "zyxel_nbg-419n-v2",
@@ -11821,13 +11407,13 @@
     "ZyXEL NBG6617": {
       "id": "zyxel_nbg6617",
       "images": [
-        {
-          "name": "openwrt-ipq40xx-generic-zyxel_nbg6617-squashfs-sysupgrade.bin",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-ipq40xx-generic-zyxel_nbg6617-squashfs-factory.bin",
           "type": "factory"
+        },
+        {
+          "name": "openwrt-ipq40xx-generic-zyxel_nbg6617-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
         }
       ],
       "target": "ipq40xx/generic"
@@ -11835,10 +11421,6 @@
     "ZyXEL NBG6716": {
       "id": "zyxel_nbg6716",
       "images": [
-        {
-          "name": "openwrt-ath79-nand-zyxel_nbg6716-squashfs-sysupgrade.tar",
-          "type": "sysupgrade"
-        },
         {
           "name": "openwrt-ath79-nand-zyxel_nbg6716-squashfs-factory.bin",
           "type": "factory"
@@ -11846,6 +11428,10 @@
         {
           "name": "openwrt-ath79-nand-zyxel_nbg6716-squashfs-sysupgrade-4M-Kernel.bin",
           "type": "sysupgrade-4M-Kernel"
+        },
+        {
+          "name": "openwrt-ath79-nand-zyxel_nbg6716-squashfs-sysupgrade.tar",
+          "type": "sysupgrade"
         }
       ],
       "target": "ath79/nand"
@@ -11876,7 +11462,7 @@
           "type": "sysupgrade"
         }
       ],
-      "target": "kirkwood/"
+      "target": "kirkwood/generic"
     },
     "ZyXEL NSA325 v1/v2": {
       "id": "zyxel_nsa325",
@@ -11890,7 +11476,7 @@
           "type": "sysupgrade"
         }
       ],
-      "target": "kirkwood/"
+      "target": "kirkwood/generic"
     },
     "ZyXEL P-2601HN F1/F3": {
       "id": "zyxel_p-2601hn",
@@ -11922,16 +11508,6 @@
       ],
       "target": "lantiq/xrx200"
     },
-    "ZyXEL P870HW-51a v2": {
-      "id": "P870HW-51a_v2",
-      "images": [
-        {
-          "name": "openwrt-brcm63xx-smp-P870HW-51a_v2-squashfs-factory.bin",
-          "type": "factory"
-        }
-      ],
-      "target": "brcm63xx/smp"
-    },
     "ZyXEL WRE6606": {
       "id": "zyxel_wre6606",
       "images": [
@@ -12016,16 +11592,26 @@
       "id": "ethernut5",
       "images": [
         {
-          "name": "openwrt-at91-sam9x-ethernut5-ubifs-root.ubi",
+          "name": "openwrt-at91-sam9x-ethernut5-squashfs-root.ubi",
           "type": "root"
         },
         {
-          "name": "openwrt-at91-sam9x-ethernut5-squashfs-root.ubi",
+          "name": "openwrt-at91-sam9x-ethernut5-ubifs-root.ubi",
           "type": "root"
         }
       ],
       "target": "at91/sam9x"
     },
+    "ipTIME A1004ns": {
+      "id": "iptime_a1004ns",
+      "images": [
+        {
+          "name": "openwrt-ramips-mt7620-iptime_a1004ns-squashfs-sysupgrade.bin",
+          "type": "sysupgrade"
+        }
+      ],
+      "target": "ramips/mt7620"
+    },
     "ipTIME A104ns": {
       "id": "iptime_a104ns",
       "images": [
@@ -12112,5 +11698,5 @@
     }
   },
   "url": "https://downloads.openwrt.org/snapshots/targets/{target}",
-  "version_code": "r12145-4716c843d6"
+  "version_code": "r13342-e35e40ad82"
 }
\ No newline at end of file