targets/lantiq-xway

+packages {
+	'-kmod-ltq-adsl-ar9-mei',
+	'-kmod-ltq-adsl-ar9',
+	'-kmod-ltq-adsl-ar9-fw-b',
+	'-kmod-ltq-atm-ar9',
+	'-ltq-adsl-app',
+	'-ppp-mod-pppoa',
+	'-kmod-ltq-deu-ar9'
+}
+
+
+-- AVM
+
+device('avm-fritz-box-7312', 'avm_fritz7312', {
+	factory = false,
+})
+
+
+-- NETGEAR
+
+device('netgear-dgn3500b', 'netgear_dgn3500b', {
+	factory_ext = '.img',
+})

targets/mediatek-filogic

+config('TARGET_ROOTFS_INITRAMFS', true)
+config('TARGET_INITRAMFS_COMPRESSION_LZMA', true)
+
+-- ASUS
+
+device('asus-rt-ax52', 'asus_rt-ax52', {
+	factory = false,
+})
+
+device('asus-tuf-ax4200', 'asus_tuf-ax4200', {
+	factory = false,
+})
+
+device('asus-tuf-ax6000', 'asus_tuf-ax6000', {
+	factory = false,
+})
+
+
+-- D-Link
+
+device('d-link-aquila-pro-ai-m30-a1', 'dlink_aquila-pro-ai-m30-a1', {
+	factory = false,
+	extra_images = {
+		{'-squashfs-recovery', '-recovery', '.bin'}
+	},
+})
+
+device('d-link-aquila-pro-ai-m60-a1', 'dlink_aquila-pro-ai-m60-a1', {
+	factory = false,
+	extra_images = {
+		{'-squashfs-recovery', '-recovery', '.bin'}
+	},
+})
+
+
+-- Cudy
+
+device('cudy-ap3000-outdoor-v1', 'cudy_ap3000outdoor-v1', {
+	factory = false,
+})
+
+device('cudy-tr3000-v1', 'cudy_tr3000-v1', {
+	factory = false,
+})
+
+device('cudy-wr3000-v1', 'cudy_wr3000-v1', {
+	factory = false,
+})
+
+
+-- GL.iNet
+
+device('gl.inet-gl-mt2500', 'glinet_gl-mt2500', {
+	factory = false,
+})
+
+device('gl.inet-gl-mt3000', 'glinet_gl-mt3000', {
+	factory = false,
+})
+
+
+-- NETGEAR
+
+device('netgear-wax220', 'netgear_wax220', {
+	factory_ext = '.img',
+})
+
+-- OpenWRT
+device('openwrt-one', 'openwrt_one',{
+	factory = '-factory',
+	factory_ext = '.ubi',
+	sysupgrade_ext = '.itb',
+})
+
+
+-- Ubiquiti
+
+device('ubiquiti-unifi-6-plus', 'ubnt_unifi-6-plus', {
+	factory = false,
+})
+
+
+-- Zyxel
+
+device('zyxel-nwa50ax-pro', 'zyxel_nwa50ax-pro')

targets/mediatek-mt7622

+-- Linksys
+
+device('linksys-e8450-ubi', 'linksys_e8450-ubi', {
+	factory = false,
+	sysupgrade_ext = '.itb',
+})
+
+
+-- Ubiquiti
+
+device('ubiquiti-unifi-6-lr-v1', 'ubnt_unifi-6-lr-v1', {
+	factory = false,
+	manifest_aliases = {'ubiquiti-unifi-6-lr'}, -- Upgrade from OpenWrt 22.03
+})
+

targets/mikrotik.inc

+-- Mikrotik images are netbooted via TFTP, then persisted with sysupgrade
+defaults {
+	factory = '-initramfs-kernel'
+}
+
+config('TARGET_ROOTFS_INITRAMFS', true)
+config('TARGET_INITRAMFS_COMPRESSION_LZMA', true)

targets/mpc85xx-generic

-device('tp-link-tl-wdr4900-v1', 'tl-wdr4900-v1')

targets/mpc85xx-p1010

+-- Enterasys
+
+device('enterasys-ws-ap3715i', 'enterasys_ws-ap3715i', {
+	factory = false,
+})
+
+
+-- Sophos
+
+device('sophos-red-15w-rev.1', 'sophos_red-15w-rev1', {
+	factory = false,
+})
+
+
+-- TP-Link
+
+device('tp-link-tl-wdr4900-v1', 'tplink_tl-wdr4900-v1')

targets/mpc85xx-p1020

+local ATH10K_PACKAGES_QCA9880 = {
+	'kmod-ath10k',
+	'-kmod-ath10k-ct',
+	'-kmod-ath10k-ct-smallbuffers',
+	'ath10k-firmware-qca988x',
+	'-ath10k-firmware-qca988x-ct',
+}
+
+
 -- Aerohive
 
-device('aerohive-hiveap-330', 'hiveap-330', {
+device('aerohive-hiveap-330', 'aerohive_hiveap-330', {
+	factory = false,
+})
+
+
+-- Enterasys
+
+device('enterasys-ws-ap3710i', 'enterasys_ws-ap3710i', {
+	factory = false,
+})
+
+
+-- Extreme Networks
+
+device('extreme-networks-ws-ap3825i', 'extreme-networks_ws-ap3825i', {
+	factory = false,
+	packages = ATH10K_PACKAGES_QCA9880,
+})
+
+
+-- Hewlett-Packard
+
+device('hewlett-packard-msm460', 'hpe_msm460')
+
+
+-- OCEDO
+
+device('ocedo-panda', 'ocedo_panda', {
 	factory = false,
 })

targets/mvebu-cortexa9

-device('linksys-wrt1200ac', 'linksys-wrt1200ac', {
+device('linksys-wrt1200ac', 'linksys_wrt1200ac', {
 	factory_ext = '.img',
 })

targets/ramips-mt7620

 -- ASUS
 
-device('asus-rt-ac51u', 'rt-ac51u', {
+device('asus-rt-ac51u', 'asus_rt-ac51u', {
 	factory = false,
-	broken = true, -- no 5GHz usable, LEDs not fully supported
 })
 
 
--- GL Innovations
+-- GL.iNet
 
-device('gl-mt300a', 'gl-mt300a', {
+device('gl-mt300a', 'glinet_gl-mt300a', {
 	factory = false,
 })
 
-device('gl-mt300n', 'gl-mt300n', {
+device('gl-mt300n', 'glinet_gl-mt300n', {
 	factory = false,
 })
 
-device('gl-mt750', 'gl-mt750', {
+device('gl-mt750', 'glinet_gl-mt750', {
 	factory = false,
 })
 
 
+-- NETGEAR
+
+device('netgear-ex3700', 'netgear_ex3700', {
+	aliases = {
+		'netgear-ex3800',
+	},
+	manifest_aliases = {'netgear-ex3700-ex3800'},
+	factory_ext = '.chk',
+})
+
+device('netgear-ex6130', 'netgear_ex6130', {
+	factory_ext = '.chk',
+})
+
+
 -- Nexx
 
-device('nexx-wt3020-8m', 'wt3020-8M', {
+device('nexx-wt3020-8m', 'nexx_wt3020-8m', {
 	aliases = {
 		'nexx-wt3020ad',
 		'nexx-wt3020f',
@@ -32,9 +46,30 @@ device('nexx-wt3020-8m', 'wt3020-8M', {
 })
 
 
+-- TP-Link
+
+local tplink_region_suffix = ''
+if (env.GLUON_REGION or '') ~= '' then
+	tplink_region_suffix = '-' .. env.GLUON_REGION
+end
+
+device('tp-link-archer-c2-v1', 'tplink_archer-c2-v1', {
+	factory = false,
+})
+
+device('tp-link-archer-c20-v1', 'tplink_archer-c20-v1', {
+	factory = false,
+})
+
+device('tp-link-archer-c20i', 'tplink_archer-c20i')
+
+device('tp-link-archer-c50-v1', 'tplink_archer-c50-v1', {
+	factory = '-squashfs-factory' .. tplink_region_suffix,
+})
+
+
 -- Xiaomi
 
-device('xiaomi-miwifi-mini', 'miwifi-mini', {
+device('xiaomi-miwifi-mini', 'xiaomi_miwifi-mini', {
 	factory = false,
-	broken = true, -- 2.4GHz WiFi is unstable
 })

targets/ramips-mt7621

 -- ASUS
 
-device('asus-rt-ac57u', 'asus_rt-ac57u', {
+device('asus-rt-ac57u-v1', 'asus_rt-ac57u-v1', {
+	factory = false,
+	manifest_aliases = {
+		'asus-rt-ac57u', -- Upgrade from OpenWrt 22.03
+	},
+})
+
+device('asus-rt-ax53u', 'asus_rt-ax53u')
+
+
+-- Cudy
+
+device('cudy-wr1300-v1', 'cudy_wr1300-v1', {
+	factory = false,
+	manifest_aliases = {
+		'cudy-wr1300', -- Upgrade from OpenWrt 22.03
+	},
+})
+
+device('cudy-wr2100', 'cudy_wr2100', {
+	factory = false,
+})
+
+device('cudy-x6-v1', 'cudy_x6-v1', {
+	factory = false,
+})
+
+device('cudy-x6-v2', 'cudy_x6-v2', {
 	factory = false,
-	broken = (env.GLUON_WLAN_MESH ~= '11s'),
 })
 
 
 -- D-Link
 
-device('d-link-dir-860l-b1', 'dir-860l-b1', {
-	broken = (env.GLUON_WLAN_MESH ~= '11s'),
+device('d-link-dap-1620-b1', 'dlink_dap-1620-b1', {
+	broken = true, -- mt76 driver issue - See #3124
+})
+
+device('d-link-covr-x1860-a1', 'dlink_covr-x1860-a1', {
+	extra_images = {
+		{'-squashfs-recovery', '-recovery', '.bin'}
+	},
+})
+
+device('d-link-dap-x1860-a1', 'dlink_dap-x1860-a1')
+
+device('d-link-dir-860l-b1', 'dlink_dir-860l-b1')
+
+device('d-link-dir-878-a1', 'dlink_dir-878-a1')
+
+device('d-link-dir-882-a1', 'dlink_dir-882-a1')
+
+
+-- Genexis
+
+device('genexis-pulse-ex400', 'genexis_pulse-ex400', {
+	factory = false,
+	sysupgrade = '-sysupgrade',
+})
+
+
+-- GL.iNet
+
+device('gl.inet-gl-mt1300', 'glinet_gl-mt1300', {
+	factory = false,
+})
+
+
+-- MERCUSYS
+
+device('mercusys-mr70x-v1', 'mercusys_mr70x-v1')
+
+
+-- NETGEAR
+
+device('netgear-eax12', 'netgear_eax12', {
+	factory_ext = '.img',
+	aliases = {'netgear-eax11-v2', 'netgear-eax15-v2'},
+})
+
+device('netgear-ex6150', 'netgear_ex6150', {
+	factory_ext = '.chk',
+})
+
+device('netgear-r6220', 'netgear_r6220', {
+	factory_ext = '.img',
+})
+
+device('netgear-r6260', 'netgear_r6260', {
+	factory_ext = '.img',
 })
 
+device('netgear-wac104', 'netgear_wac104', {
+	factory_ext = '.img',
+})
 
--- Netgear
+device('netgear-wax202', 'netgear_wax202', {
+	factory_ext = '.img',
+})
 
-device('netgear-wndr3700v5', 'wndr3700v5', {
+device('netgear-wndr3700-v5', 'netgear_wndr3700-v5', {
 	factory = false,
 	broken = true, -- untested
 })
 
 
--- ZBT
+-- TP-Link
+
+device('tp-link-archer-ax23-v1', 'tplink_archer-ax23-v1', {
+	broken = true, -- LAN LED not working - review after resolving #2756
+})
+
+device('tp-link-archer-c6-v3', 'tplink_archer-c6-v3', {
+	broken = true, -- LAN LED not working - review after resolving #2756
+})
+
+device('tp-link-eap615-wall-v1', 'tplink_eap615-wall-v1')
 
-device('zbt-wg3526-16m', 'zbt-wg3526-16M', {
+device('tp-link-re500-v1', 'tplink_re500-v1')
+
+device('tp-link-re650-v1', 'tplink_re650-v1')
+
+
+-- Ubiquiti
+
+device('ubiquiti-unifi-6-lite', 'ubnt_unifi-6-lite', {
 	factory = false,
-	manifest_aliases = {
-		'zbt-wg3526',
-	},
-	broken = (env.GLUON_WLAN_MESH ~= '11s'),
 })
 
-device('zbt-wg3526-32m', 'zbt-wg3526-32M', {
+device('ubiquiti-unifi-nanohd', 'ubnt_unifi-nanohd', {
+	factory = false,
+})
+
+
+-- Wavlink
+
+device('wavlink-ws-wn572hp3-4g', 'wavlink_ws-wn572hp3-4g', {
+	factory = false,
+})
+
+
+-- Xiaomi
+
+device('xiaomi-mi-router-4a-gigabit-edition', 'xiaomi_mi-router-4a-gigabit', {
+	factory = false,
+})
+
+device('xiaomi-mi-router-4a-gigabit-edition-v2', 'xiaomi_mi-router-4a-gigabit-v2', {
+	factory = false,
+})
+
+device('xiaomi-mi-router-3g', 'xiaomi_mi-router-3g', {
+	factory = false,
+})
+
+device('xiaomi-mi-router-3g-v2', 'xiaomi_mi-router-3g-v2', {
+	factory = false,
+})
+
+
+-- Zbtlink
+
+device('zbtlink-zbt-wg3526-16m', 'zbtlink_zbt-wg3526-16m', {
+	factory = false,
+})
+
+device('zbtlink-zbt-wg3526-32m', 'zbtlink_zbt-wg3526-32m', {
+	factory = false,
+})
+
+
+-- Zyxel
+
+device('zyxel-nwa50ax', 'zyxel_nwa50ax')
+
+device('zyxel-nwa55axe', 'zyxel_nwa55axe', {
+	broken = true, -- Missing LED / Reset button
+})
+
+device('zyxel-wsm20', 'zyxel_wsm20', {
 	factory = false,
-	broken = (env.GLUON_WLAN_MESH ~= '11s'),
 })
 
 
@@ -41,14 +188,12 @@ device('zbt-wg3526-32m', 'zbt-wg3526-32M', {
 
 -- Ubiquiti
 
-device('ubnt-erx', 'ubnt-erx', {
+device('ubiquiti-edgerouter-x', 'ubnt_edgerouter-x', {
 	factory = false,
-	sysupgrade_ext = '.tar',
 	packages = {'-hostapd-mini'},
 })
 
-device('ubnt-erx-sfp', 'ubnt-erx-sfp', {
+device('ubiquiti-edgerouter-x-sfp', 'ubnt_edgerouter-x-sfp', {
 	factory = false,
-	sysupgrade_ext = '.tar',
 	packages = {'-hostapd-mini'},
 })

targets/ramips-mt76x8

+-- Cudy
+
+device('cudy-tr1200-v1', 'cudy_tr1200-v1', {
+	factory = false,
+})
+
+device('cudy-wr1000', 'cudy_wr1000')
+
+
 -- GL.iNet
 
-device('gl-mt300n-v2', 'gl-mt300n-v2', {
+device('gl-mt300n-v2', 'glinet_gl-mt300n-v2', {
+	factory = false,
+})
+
+device('gl.inet-microuter-n300', 'glinet_microuter-n300', {
+	factory = false,
+})
+
+device('gl.inet-vixmini', 'glinet_vixmini', {
 	factory = false,
 })
 
 
--- Netgear
+-- NETGEAR
+
+device('netgear-r6020', 'netgear_r6020', {
+	factory_ext = '.img',
+})
 
 device('netgear-r6120', 'netgear_r6120', {
 	factory_ext = '.img',
 })
 
 
+-- RAVPower
+
+device('ravpower-rp-wd009', 'ravpower_rp-wd009')
+
+
 -- TP-Link
 
-device('tp-link-archer-c50-v3', 'tplink_c50-v3', {
+device('tp-link-archer-c20-v4', 'tplink_archer-c20-v4', {
 	factory = false,
 	extra_images = {
 		{'-squashfs-tftp-recovery', '-bootloader', '.bin'},
 	},
 })
 
-device('tp-link-archer-c50-v4', 'tplink_c50-v4', {
+device('tp-link-archer-c20-v5', 'tplink_archer-c20-v5', {
 	factory = false,
 })
 
+device('tp-link-archer-c50-v3', 'tplink_archer-c50-v3', {
+	factory = false,
+	extra_images = {
+		{'-squashfs-tftp-recovery', '-bootloader', '.bin'},
+	},
+})
+
+device('tp-link-archer-c50-v4', 'tplink_archer-c50-v4', {
+	factory = false,
+})
+
+device('tp-link-re200-v2', 'tplink_re200-v2')
+
+device('tp-link-re200-v3', 'tplink_re200-v3')
+
+device('tp-link-re200-v4', 'tplink_re200-v4')
+
+device('tp-link-tl-mr3020-v3', 'tplink_tl-mr3020-v3', {
+	factory = false,
+	extra_images = {
+		{'-squashfs-tftp-recovery', '-bootloader', '.bin'},
+	},
+})
+
 device('tp-link-tl-mr3420-v5', 'tplink_tl-mr3420-v5', {
 	factory = false,
 	extra_images = {
@@ -32,7 +82,35 @@ device('tp-link-tl-mr3420-v5', 'tplink_tl-mr3420-v5', {
 	},
 })
 
-device('tp-link-tl-wr841n-v13', 'tl-wr841n-v13', {
+device('tp-link-tl-mr6400-v5', 'tplink_tl-mr6400-v5', {
+	factory = false,
+	extra_images = {
+		{'-squashfs-tftp-recovery', '-bootloader', '.bin'},
+	},
+})
+
+device('tp-link-tl-wa801nd-v5', 'tplink_tl-wa801nd-v5', {
+	factory = false,
+	extra_images = {
+		{'-squashfs-tftp-recovery', '-bootloader', '.bin'},
+	},
+})
+
+device('tp-link-tl-wr841n-v13', 'tplink_tl-wr841n-v13', {
+	factory = false,
+	extra_images = {
+		{'-squashfs-tftp-recovery', '-bootloader', '.bin'},
+	},
+})
+
+device('tp-link-tl-wr902ac-v3', 'tplink_tl-wr902ac-v3', {
+	factory = false,
+	extra_images = {
+		{'-squashfs-tftp-recovery', '-bootloader', '.bin'},
+	},
+})
+
+device('tp-link-tl-wr902ac-v4', 'tplink_tl-wr902ac-v4', {
 	factory = false,
 	extra_images = {
 		{'-squashfs-tftp-recovery', '-bootloader', '.bin'},
@@ -42,6 +120,30 @@ device('tp-link-tl-wr841n-v13', 'tl-wr841n-v13', {
 
 -- VoCore 2
 
-device('vocore2', 'vocore2', {
+device('vocore2', 'vocore_vocore2', {
+	factory = false,
+})
+
+
+-- Xiaomi
+
+device('xiaomi-mi-router-4a-100m-edition', 'xiaomi_mi-router-4a-100m', {
+	factory = false,
+})
+
+device('xiaomi-mi-router-4a-100m-international-edition', 'xiaomi_mi-router-4a-100m-intl', {
+	factory = false,
+})
+
+device('xiaomi-mi-router-4a-100m-international-edition-v2', 'xiaomi_mi-router-4a-100m-intl-v2', {
+	factory = false,
+})
+
+device('xiaomi-mi-router-4c', 'xiaomi_mi-router-4c', {
+	factory = false,
+})
+
+device('xiaomi-mi-ra75', 'xiaomi_mi-ra75', {
 	factory = false,
+	broken = true,  -- Only serial flash possible
 })

targets/ramips-rt305x

-config '# CONFIG_KERNEL_KALLSYMS is not set'
-
--- A5
-
-device('a5-v11', 'a5-v11', {
-	deprecated = true, -- 4/32
-})
-
-
--- D-Link
-
-device('d-link-dir-615-h1', 'dir-615-h1', {
-	deprecated = true, -- 4/32
-})
-
-device('d-link-dir-615-d', 'dir-615-d', {
-	aliases = {
-		'd-link-dir-615-d1',
-		'd-link-dir-615-d2',
-		'd-link-dir-615-d3',
-		'd-link-dir-615-d4',
-	},
-	deprecated = true, -- 4/32
-})
-
-
--- VoCore
-
-device('vocore-8M', 'vocore-8M', {
-	factory = false,
-})
-
-device('vocore-16M', 'vocore-16M', {
-	factory = false,
-})

targets/rockchip-armv8

+defaults {
+	factory = false,
+	sysupgrade_ext = '.img.gz',
+}
+
+device('friendlyelec-nanopi-r2s', 'friendlyarm_nanopi-r2s')
+device('friendlyelec-nanopi-r3s', 'friendlyarm_nanopi-r3s')
+device('friendlyelec-nanopi-r4s', 'friendlyarm_nanopi-r4s') -- 4GB LPDDR4

targets/sunxi-cortexa7

@@ -6,12 +6,12 @@ defaults {
 }
 
 
-device('lemaker-banana-pi', 'sun7i-a20-bananapi')
+device('lemaker-banana-pi', 'lemaker_bananapi')
 
-device('lemaker-banana-pro', 'sun7i-a20-bananapro', {
+device('lemaker-banana-pro', 'lemaker_bananapro', {
 	broken = true, -- WiFi chip not supported
 })
 
-device('lamobo-r1', 'sun7i-a20-lamobo-r1', {
-	broken = true, -- AP+IBSS and AP+11s not working
+device('lamobo-r1', 'lamobo_lamobo-r1', {
+	broken = true, -- AP+11s not working
 })

targets/targets.mk

-GLUON_WLAN_MESH_11s := $(filter 11s,$(GLUON_WLAN_MESH))
-
-$(eval $(call GluonTarget,ar71xx,generic))
-ifneq ($(GLUON_DEPRECATED),0)
-$(eval $(call GluonTarget,ar71xx,tiny))
-endif
-$(eval $(call GluonTarget,ar71xx,nand))
-$(eval $(call GluonTarget,brcm2708,bcm2708))
-$(eval $(call GluonTarget,brcm2708,bcm2709))
-$(eval $(call GluonTarget,mpc85xx,generic))
+$(eval $(call GluonTarget,armsr,armv7))
+$(eval $(call GluonTarget,armsr,armv8))
+$(eval $(call GluonTarget,ath79,generic))
+$(eval $(call GluonTarget,ath79,nand))
+$(eval $(call GluonTarget,ath79,mikrotik))
+$(eval $(call GluonTarget,bcm27xx,bcm2708))
+$(eval $(call GluonTarget,bcm27xx,bcm2709))
+$(eval $(call GluonTarget,ipq40xx,generic))
+$(eval $(call GluonTarget,ipq40xx,mikrotik))
+$(eval $(call GluonTarget,ipq806x,generic))
+$(eval $(call GluonTarget,lantiq,xrx200))
+$(eval $(call GluonTarget,lantiq,xrx200_legacy))
+$(eval $(call GluonTarget,lantiq,xway))
+$(eval $(call GluonTarget,mediatek,filogic))
+$(eval $(call GluonTarget,mediatek,mt7622))
+$(eval $(call GluonTarget,mpc85xx,p1010))
 $(eval $(call GluonTarget,mpc85xx,p1020))
+$(eval $(call GluonTarget,ramips,mt7620))
 $(eval $(call GluonTarget,ramips,mt7621))
+$(eval $(call GluonTarget,ramips,mt76x8))
+$(eval $(call GluonTarget,rockchip,armv8))
 $(eval $(call GluonTarget,sunxi,cortexa7))
 $(eval $(call GluonTarget,x86,generic))
 $(eval $(call GluonTarget,x86,geode))
+$(eval $(call GluonTarget,x86,legacy))
 $(eval $(call GluonTarget,x86,64))
 
-ifneq ($(GLUON_WLAN_MESH_11s)$(BROKEN),)
-$(eval $(call GluonTarget,ipq40xx))
-$(eval $(call GluonTarget,ramips,mt7620))
-$(eval $(call GluonTarget,ramips,mt76x8))
-$(eval $(call GluonTarget,ramips,rt305x))
-endif
 
-ifneq ($(BROKEN),)
-$(eval $(call GluonTarget,ar71xx,mikrotik)) # BROKEN: no sysupgrade support
-$(eval $(call GluonTarget,brcm2708,bcm2710)) # BROKEN: Untested
-$(eval $(call GluonTarget,ipq806x)) # BROKEN: See target file for details
-$(eval $(call GluonTarget,mvebu,cortexa9)) # BROKEN: No AP+IBSS or 11s support
+ifeq ($(BROKEN),1)
+$(eval $(call GluonTarget,bcm27xx,bcm2710)) # BROKEN: Untested
+$(eval $(call GluonTarget,bcm27xx,bcm2711)) # BROKEN: No 11s support, no reset button, sys LED issues
+$(eval $(call GluonTarget,kirkwood,generic)) # BROKEN: No devices with 11s support
+$(eval $(call GluonTarget,mvebu,cortexa9)) # BROKEN: No 11s support
 endif

targets/x86-64

 include 'x86.inc'
 
-factory_image('x86-64', 'combined-squashfs', '.img.gz')
-factory_image('x86-64', 'combined-squashfs', '.vdi')
-factory_image('x86-64', 'combined-squashfs', '.vmdk')
-sysupgrade_image('x86-64', 'combined-squashfs', '.img.gz')
+packages {
+	'kmod-gpio-nct5104d',
+	'kmod-leds-gpio',
+	'kmod-pcengines-apuv2',
+}
+
+device('x86-64', 'generic', {
+	extra_images = {
+		{'-kernel', '-kernel', '.bin'},
+		{'-squashfs-rootfs', '-rootfs', '.img.gz'},
+	},
+})

targets/x86-generic

 include 'x86.inc'
 
-factory_image('x86-generic', 'combined-squashfs', '.img.gz')
-factory_image('x86-generic', 'combined-squashfs', '.vdi')
-factory_image('x86-generic', 'combined-squashfs', '.vmdk')
-sysupgrade_image('x86-generic', 'combined-squashfs', '.img.gz', {
-	manifest_aliases = {
-		'x86-kvm',
-		'x86-xen_domu',
+packages {
+	'kmod-gpio-nct5104d',
+	'kmod-leds-gpio',
+	'kmod-pcengines-apuv2',
+}
+
+device('x86-generic', 'generic', {
+	extra_images = {
+		{'-kernel', '-kernel', '.bin'},
+		{'-squashfs-rootfs', '-rootfs', '.img.gz'},
 	},
 })

targets/x86-geode

@@ -18,5 +18,9 @@ packages {
 	'kmod-via-velocity',
 }
 
-factory_image('x86-geode', 'combined-squashfs', '.img.gz')
-sysupgrade_image('x86-geode', 'combined-squashfs', '.img.gz')
+device('x86-geode', 'generic', {
+	factory = '-squashfs-combined',
+	factory_ext = '.img.gz',
+	sysupgrade = '-squashfs-combined',
+	sysupgrade_ext = '.img.gz',
+})

targets/x86-legacy

+include 'x86.inc'
+
+device('x86-legacy', 'generic')

targets/x86.inc

-config 'CONFIG_VDI_IMAGES=y'
-config 'CONFIG_VMDK_IMAGES=y'
-
-local ATH10K_PACKAGES = {'kmod-ath10k-ct', 'ath10k-firmware-qca9887', 'ath10k-firmware-qca988x'}
-if env.GLUON_WLAN_MESH == 'ibss' then
-	ATH10K_PACKAGES = {'kmod-ath10k-ct', 'ath10k-firmware-qca9887-ct', 'ath10k-firmware-qca988x-ct'}
-end
+config('VDI_IMAGES', true)
+config('VMDK_IMAGES', true)
 
 packages {
 	'kmod-3c59x',
@@ -27,16 +22,32 @@ packages {
 	'kmod-via-velocity',
 	'kmod-ath9k',
 	'kmod-gpio-button-hotplug',
-	'kmod-gpio-nct5104d',
 	'kmod-hwmon-core',
-	'kmod-leds-gpio',
-	'kmod-leds-apu2',
-	'kmod-sp5100_tco',
+	'kmod-sp5100-tco',
 	'kmod-usb-core',
 	'kmod-usb-ohci',
 	'kmod-usb2',
 	'kmod-usb3',
 	'kmod-usb-serial',
+	'kmod-ath10k',
+	'ath10k-firmware-qca9887',
+	'ath10k-firmware-qca9888',
+	'ath10k-firmware-qca988x',
+	'ath10k-firmware-qca9984',
+	'kmod-mt76x0e',
+	'kmod-mt76x2',
+	'kmod-mt7603',
+	'kmod-mt7615-firmware',
+	'kmod-mt7915-firmware',
+	'kmod-mt7921-firmware',
 }
 
-packages(ATH10K_PACKAGES)
+-- We do not use the ext4 images, so we do not want to build them.
+config('TARGET_ROOTFS_EXT4FS', false)
+
+defaults {
+	factory = '-squashfs-combined-efi',
+	factory_ext = {'.img.gz', '.vmdk', '.vdi'},
+	sysupgrade = '-squashfs-combined-efi',
+	sysupgrade_ext = '.img.gz',
+}