targets/brcm2708-bcm2708 → targets/bcm27xx-bcm2708

-include 'brcm2708.inc'
+include 'bcm27xx.inc'
 
-device('raspberry-pi', 'rpi', {
+device('raspberrypi-model-b', 'rpi', {
 	manifest_aliases = {
+		'raspberrypi-model-b-plus',
+		'raspberrypi-model-b-rev2',
+
+		-- from Gluon 2023.1 and older
+		'raspberry-pi-model-b-rev-1',
 		'raspberry-pi-model-b-rev-2',
 		'raspberry-pi-model-b-plus-rev-1.2',
 	},

targets/brcm2708-bcm2709 → targets/bcm27xx-bcm2709

-include 'brcm2708.inc'
+include 'bcm27xx.inc'
 
-device('raspberry-pi-2', 'rpi-2', {
+device('raspberrypi-2-model-b', 'rpi-2', {
 	manifest_aliases = {
+		-- from Gluon 2023.1 and older
 		'raspberry-pi-2-model-b-rev-1.1',
 	},
 })

targets/bcm27xx-bcm2710

+include 'bcm27xx.inc'
+
+device('raspberrypi-3-model-b', 'rpi-3', {
+	manifest_aliases = {
+		'raspberrypi-3-model-b-plus',
+
+		-- from Gluon 2023.1 and older
+		'raspberry-pi-3-model-b-rev-1.2',
+		'raspberry-pi-3-model-b-plus-rev-1.3',
+	},
+})

targets/bcm27xx-bcm2711

+include 'bcm27xx.inc'
+
+device('raspberrypi-4-model-b', 'rpi-4', {
+	manifest_aliases = {
+		-- from Gluon 2023.1 and older
+		'raspberry-pi-4-model-b-rev-1.1',
+		'raspberry-pi-4-model-b-rev-1.2', -- untested
+		'raspberry-pi-4-model-b-rev-1.4', -- untested
+		'raspberry-pi-4-model-b-rev-1.5', -- untested
+	},
+})

targets/brcm2708.inc → targets/bcm27xx.inc

+-- We do not use the ext4 images, so we do not want to build them.
+config('TARGET_ROOTFS_EXT4FS', false)
+
 defaults {
-	factory = '-ext4-factory',
 	factory_ext = '.img.gz',
-	sysupgrade = '-ext4-sysupgrade',
 	sysupgrade_ext = '.img.gz',
 }

targets/brcm2708-bcm2710

-include 'brcm2708.inc'
-
-device('raspberry-pi-3', 'rpi-3')

targets/generic

 assert(env.GLUON_LANGS)
 
 
-config('CONFIG_GLUON_SITEDIR="%s"', env.GLUON_SITEDIR)
-config('CONFIG_GLUON_RELEASE="%s"', env.GLUON_RELEASE)
-try_config('CONFIG_GLUON_BRANCH="%s"', env.GLUON_BRANCH or '')
+config('GLUON_SITEDIR', env.GLUON_SITEDIR)
+config('GLUON_VERSION', env.GLUON_VERSION)
+config('GLUON_SITE_VERSION', env.GLUON_SITE_VERSION)
+config('GLUON_RELEASE', env.GLUON_RELEASE)
+
+try_config('GLUON_AUTOUPDATER_BRANCH', env.GLUON_AUTOUPDATER_BRANCH)
+try_config('GLUON_AUTOUPDATER_ENABLED', istrue(env.GLUON_AUTOUPDATER_ENABLED))
 
 for lang in string.gmatch(env.GLUON_LANGS, '%S+') do
-	try_config('CONFIG_GLUON_WEB_LANG_%s=y', lang)
+	try_config('GLUON_WEB_LANG_' .. lang, true)
 end
 
-config('CONFIG_TARGET_%s=y', env.BOARD)
+config('TARGET_' .. env.BOARD, true)
 if env.SUBTARGET ~= '' then
-	config('CONFIG_TARGET_%s_%s=y', env.BOARD, env.SUBTARGET)
+	config(string.format('TARGET_%s_%s', env.BOARD, env.SUBTARGET), true)
 end
 
 -- Disable non-default feeds in distfeeds.conf
-config('# CONFIG_FEED_gluon_base is not set')
+config('FEED_gluon_base', false)
 
 local default_feeds = {}
 for feed in string.gmatch(exec_capture_raw('. scripts/default_feeds.sh && echo "$DEFAULT_FEEDS"'), '%S+') do
@@ -24,47 +28,101 @@ end
 
 for feed in string.gmatch(exec_capture_raw('. scripts/modules.sh && echo -n "$FEEDS"'), '%S+') do
 	if not default_feeds[feed] then
-		config('# CONFIG_FEED_%s is not set', feed)
+		config('FEED_' .. feed, false)
 	end
 end
 
 
-config '# CONFIG_TARGET_ROOTFS_INITRAMFS is not set'
-
-config 'CONFIG_ALL_NONSHARED=y'
-
-config '# CONFIG_PACKAGE_usbip is not set' -- fails to build
-config '# CONFIG_PACKAGE_kmod-jool is not set' -- fails to build
-
-config 'CONFIG_BUSYBOX_CUSTOM=y'
-config '# CONFIG_BUSYBOX_CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set'
-
-config 'CONFIG_PACKAGE_ATH_DEBUG=y'
-
-config '# CONFIG_KERNEL_IP_MROUTE is not set'
-config '# CONFIG_KERNEL_IPV6_MROUTE is not set'
-
-try_config 'CONFIG_TARGET_MULTI_PROFILE=y'
-try_config 'CONFIG_TARGET_PER_DEVICE_ROOTFS=y'
-
-if envtrue.GLUON_MULTIDOMAIN then
-	config 'CONFIG_GLUON_MULTIDOMAIN=y'
-end
-
-if envtrue.GLUON_DEBUG then
-	config 'CONFIG_DEBUG=y'
-	config 'CONFIG_NO_STRIP=y'
-	config '# CONFIG_USE_STRIP is not set'
-	config '# CONFIG_USE_SSTRIP is not set'
+config('TARGET_ROOTFS_INITRAMFS', false)
+
+config('DEVEL', true)
+config('ALL_NONSHARED', true)
+config('BPF_TOOLCHAIN_HOST', true)
+
+try_config('PACKAGE_usbip', false) -- fails to build
+try_config('PACKAGE_coova-chilli', false) -- fails to build
+try_config('PACKAGE_kmod-ipt-coova', false) -- fails to build
+try_config('PACKAGE_libpfring', false) -- fails to build
+try_config('PACKAGE_kmod-pf-ring', false) -- fails to build
+
+try_config('PACKAGE_ATH_DEBUG', true)
+
+try_config('PACKAGE_dnsmasq_full_dhcpv6', false)
+try_config('PACKAGE_dnsmasq_full_auth', false)
+try_config('PACKAGE_dnsmasq_full_ipset', false)
+try_config('PACKAGE_dnsmasq_full_nftset', false)
+try_config('PACKAGE_dnsmasq_full_conntrack', false)
+try_config('PACKAGE_dnsmasq_full_noid', false)
+try_config('PACKAGE_dnsmasq_full_broken_rtc', false)
+try_config('PACKAGE_dnsmasq_full_rtc', false)
+
+try_config('TARGET_SQUASHFS_BLOCK_SIZE', 256)
+
+-- OpenWrt disables ed25519 keys on SMALL_FLASH targets
+-- (e.g. ramips-mt76x8) by default.
+config('DROPBEAR_ED25519', true)
+
+config('KERNEL_PROC_STRIPPED', true)
+config('KERNEL_AIO', false)
+try_config('KERNEL_IO_URING', false)
+config('KERNEL_FHANDLE', false)
+config('KERNEL_FANOTIFY', false)
+config('KERNEL_CGROUPS', false)
+-- KERNEL_NAMESPACES is required for procd-ujail
+-- This option is enabled by default on non small flash targets
+config('KERNEL_NAMESPACES', true)
+config('KERNEL_IP_MROUTE', false)
+config('KERNEL_IPV6_MROUTE', false)
+config('KERNEL_IPV6_SEG6_LWTUNNEL', false)
+config('KERNEL_SWAP', false)
+config('USE_SECCOMP', false)
+config('KERNEL_SECCOMP', false)
+-- kmod-mt7915e pulls in CONFIG_KERNEL_RELAY
+-- use try_config, so enabling the package is still possible
+try_config('PACKAGE_kmod-mt7915e', false)
+
+try_config('OONF_GENERIC_HTTP', true)
+
+config('COLLECT_KERNEL_DEBUG', true)
+
+config('TARGET_MULTI_PROFILE', true)
+config('TARGET_PER_DEVICE_ROOTFS', true)
+
+config('GLUON_MULTIDOMAIN', istrue(env.GLUON_MULTIDOMAIN))
+
+try_config('GRUB_TITLE', 'Gluon')
+
+config('AUTOREMOVE', istrue(env.GLUON_AUTOREMOVE))
+
+if (tonumber(env.GLUON_DEBUG) or 0) > 1 then
+	config('DEBUG', true)
+	config('NO_STRIP', true)
+	config('USE_STRIP', false)
+	config('USE_SSTRIP', false)
+
+	try_config('TARGET_ROOTFS_PARTSIZE', 500)
+elseif istrue(env.GLUON_DEBUG) then
+	config('USE_STRIP', true)
+	config('USE_SSTRIP', false)
 end
 
+config('GLUON_MINIFY', istrue(env.GLUON_MINIFY))
 
 packages {
+	'-ca-bundle',
+	'-dnsmasq',
+	'-kmod-ipt-offload',
+	'-kmod-nft-offload',
+	'-libustream-mbedtls',
+	'-libmbedtls',
+	'-nftables',
 	'-odhcpd-ipv6only',
 	'-ppp',
 	'-ppp-mod-pppoe',
 	'-wpad-mini',
 	'-wpad-basic',
+	'-wpad-basic-mbedtls',
+	'-firewall4',
 	'gluon-core',
-	'ip6tables',
+	'ip6tables-zz-legacy',
 }

targets/ipq40xx-chromium

+-- Google
+
+device('google-wifi-gale', 'google_wifi', {
+	broken = true, -- can only be flashed by opening the device, to enter devmode
+})

targets/ipq40xx-generic

 local ATH10K_PACKAGES_IPQ40XX = {
 	'kmod-ath10k',
 	'-kmod-ath10k-ct',
+	'-kmod-ath10k-ct-smallbuffers',
 	'ath10k-firmware-qca4019',
 	'-ath10k-firmware-qca4019-ct',
 }
 local ATH10K_PACKAGES_IPQ40XX_QCA9888 = {
 	'kmod-ath10k',
 	'-kmod-ath10k-ct',
+	'-kmod-ath10k-ct-smallbuffers',
 	'ath10k-firmware-qca4019',
 	'-ath10k-firmware-qca4019-ct',
 	'ath10k-firmware-qca9888',
@@ -19,6 +21,24 @@ defaults {
 }
 
 
+-- Aruba
+
+device('aruba-ap-303', 'aruba_ap-303', {
+	factory = false,
+	aliases = {'aruba-instant-on-ap11'},
+})
+
+device('aruba-ap-303h', 'aruba_ap-303h', {
+	factory = false,
+	aliases = {'aruba-instant-on-ap11d'},
+})
+
+device('aruba-ap-365', 'aruba_ap-365', {
+	factory = false,
+	aliases = {'aruba-instant-on-ap17'},
+})
+
+
 -- AVM
 
 device('avm-fritz-box-4040', 'avm_fritzbox-4040', {
@@ -28,6 +48,24 @@ device('avm-fritz-box-4040', 'avm_fritzbox-4040', {
 	},
 })
 
+device('avm-fritz-box-7530', 'avm_fritzbox-7530', {
+	factory = false,
+	aliases = {'avm-fritz-box-7520'},
+	packages = {
+		-- same as ATH10K_PACKAGES_IPQ40XX
+		'kmod-ath10k',
+		'-kmod-ath10k-ct',
+		'-kmod-ath10k-ct-smallbuffers',
+		'ath10k-firmware-qca4019',
+		'-ath10k-firmware-qca4019-ct',
+
+		-- VDSL modem
+		'ppp',
+		'kmod-ppp',
+		'ppp-mod-pppoe',
+	},
+})
+
 device('avm-fritz-repeater-1200', 'avm_fritzrepeater-1200', {
 	factory = false,
 })
@@ -35,11 +73,37 @@ device('avm-fritz-repeater-1200', 'avm_fritzrepeater-1200', {
 
 -- GL.iNet
 
+device('gl.inet-gl-ap1300', 'glinet_gl-ap1300', {
+	factory_ext = '.ubi',
+})
+
 device('gl.inet-gl-b1300', 'glinet_gl-b1300', {
 	factory = false,
 })
 
 
+-- Linksys
+
+device('linksys-ea6350v3', 'linksys_ea6350v3')
+
+
+-- Meraki
+
+device('meraki-mr33-access-point', 'meraki_mr33', {
+	packages = {
+		-- radio0 is monitoring radio - removed for now
+		-- the -ct firmware does not have working mesh
+		'-ath10k-firmware-qca9887-ct',
+		'-ath10k-board-qca9887',
+	},
+	factory = false,
+	broken = true,
+	-- case must be opened to install
+	-- the board also bricks the SoC on newer bootloader-versions which is irreversible
+	-- third radio not yet working
+})
+
+
 -- NETGEAR
 
 device('netgear-ex6100v2', 'netgear_ex6100v2', {
@@ -60,20 +124,36 @@ device('openmesh-a62', 'openmesh_a62', {
 })
 
 
--- ZyXEL
+-- Plasma Cloud
 
-device('zyxel-nbg6617', 'zyxel_nbg6617')
+device('plasma-cloud-pa1200', 'plasmacloud_pa1200')
 
-device('zyxel-wre6606', 'zyxel_wre6606', {
+device('plasma-cloud-pa2200', 'plasmacloud_pa2200', {
+	packages = ATH10K_PACKAGES_IPQ40XX_QCA9888,
+})
+
+
+-- ZTE
+
+device('zte-mf289f', 'zte_mf289f', {
+	broken = true,	-- case must be opened to install
 	factory = false,
 })
 
 
+-- Zyxel
+
+device('zyxel-nbg6617', 'zyxel_nbg6617')
+
+
 -- 8devices
 
 device('8devices-jalapeno', '8dev_jalapeno', {
-	factory = '-squashfs-nand-factory',
 	factory_ext = '.ubi',
-	sysupgrade = '-squashfs-nand-sysupgrade',
-	sysupgrade_ext = '.bin',
+})
+
+-- Extreme Networks
+
+device('extreme-networks-ws-ap3915i', 'extreme-networks_ws-ap3915i', {
+	factory = false,
 })

targets/ipq40xx-mikrotik

+include 'mikrotik.inc'
+
+local ATH10K_PACKAGES_IPQ40XX_SMALLBUFFERS = {}
+
+device('mikrotik-hap-ac2', 'mikrotik_hap-ac2', {
+	packages = ATH10K_PACKAGES_IPQ40XX_SMALLBUFFERS,
+})
+
+device('mikrotik-sxtsq-5-ac-rbsxtsqg-5acd', 'mikrotik_sxtsq-5-ac', {
+	factory = false,
+	aliases = {'mikrotik-discg-5acd'},
+})

targets/ipq806x-generic

@@ -26,3 +26,9 @@ device('netgear-nighthawk-x4s-r7800', 'netgear_r7800', {
 	factory_ext = '.img',
 	packages = QCA9984_PACKAGES,
 })
+
+-- Ubiquiti
+device('ubiquiti-unifi-ac-hd', 'ubnt_unifi-ac-hd', {
+	packages = QCA9984_PACKAGES,
+	factory = false,
+})

targets/kirkwood-generic

+-- Linksys
+
+device('linksys-e4200-v2-viper', 'linksys_e4200-v2', {
+	broken = true, -- no 802.11s support
+})
+
+device('linksys-ea4500-viper', 'linksys_ea4500', {
+	broken = true, -- no 802.11s support
+})

targets/lantiq-xrx200

+packages {
+	'-ltq-vdsl-vr9-vectoring-fw-installer',
+	'-kmod-ltq-vdsl-vr9-mei',
+	'-kmod-ltq-vdsl-vr9',
+	'-kmod-ltq-atm-vr9',
+	'-kmod-ltq-ptm-vr9',
+	'-kmod-ltq-deu-vr9',
+	'-ltq-vdsl-vr9-app',
+	'-dsl-vrx200-firmware-xdsl-a',
+	'-dsl-vrx200-firmware-xdsl-b-patch',
+	'-ppp-mod-pppoa',
+	'-ltq-dsl-base',
+}
+
+
+-- AVM
+
+device('avm-fritz-box-3370-rev-2-hynix-nand', 'avm_fritz3370-rev2-hynix', {
+	factory = false,
+	extra_images = {
+		{'-squashfs-eva-filesystem', '-eva-filesystem', '.bin'},
+		{'-squashfs-eva-kernel', '-eva-kernel', '.bin'},
+	},
+	broken = true, -- no button for setup mode; hw revision not visible on device
+})
+
+device('avm-fritz-box-3370-rev-2-micron-nand', 'avm_fritz3370-rev2-micron', {
+	factory = false,
+	extra_images = {
+		{'-squashfs-eva-filesystem', '-eva-filesystem', '.bin'},
+		{'-squashfs-eva-kernel', '-eva-kernel', '.bin'},
+	},
+	broken = true, -- no button for setup mode; hw revision not visible on device
+})
+
 device('avm-fritz-box-7360-sl', 'avm_fritz7360sl', {
 	factory = false,
-        aliases = {'avm-fritz-box-7360-v1', 'avm-fritz-box-7360-v2'},
+	aliases = {'avm-fritz-box-7360-v1'},
+})
+
+device('avm-fritz-box-7360-v2', 'avm_fritz7360-v2', {
+	factory = false,
 })
 
 device('avm-fritz-box-7362-sl', 'avm_fritz7362sl', {
@@ -10,3 +49,8 @@ device('avm-fritz-box-7362-sl', 'avm_fritz7362sl', {
 device('avm-fritz-box-7412', 'avm_fritz7412', {
 	factory = false,
 })
+
+device('arcadyan-vgv7510kw22', 'arcadyan_vgv7510kw22-nor', {
+	factory = false,
+	aliases = {'o2-box-6431'},
+})

targets/lantiq-xrx200_legacy

+packages {
+	'-ltq-vdsl-vr9-vectoring-fw-installer',
+	'-kmod-ltq-vdsl-vr9-mei',
+	'-kmod-ltq-vdsl-vr9',
+	'-kmod-ltq-atm-vr9',
+	'-kmod-ltq-ptm-vr9',
+	'-kmod-ltq-deu-vr9',
+	'-ltq-vdsl-vr9-app',
+	'-dsl-vrx200-firmware-xdsl-a',
+	'-dsl-vrx200-firmware-xdsl-b-patch',
+	'-ppp-mod-pppoa',
+	'-ltq-dsl-base',
+}
+
+-- TP-Link
+
+-- CAVEAT: These devices don't have a dedicated WAN port.
+--         All ethernet ports on the device are bridged and
+--         used as WAN ports. Clients connected to these
+--         ports will be connected to your private network.
+
+device('tp-link-td-w8970', 'tplink_tdw8970', {
+	factory = false,
+})
+
+device('tp-link-td-w8980', 'tplink_tdw8980', {
+	factory = false,
+	aliases = {'tp-link-td-w9980'},
+	broken = true, -- 5GHz unsupported
+})

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,
 })
 
-device('avm-fritz-box-7320', 'avm_fritz7320', {
-        factory = false,
-        aliases = {'avm-fritz-box-7330', 'avm-fritz-box-7330-sl'},
+
+-- 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,
+})
+
+
+-- Wavlink
+
+device('wavlink-wl-wn573hx3', 'wavlink_wl-wn573hx3', {
+	factory = false,
+	sysupgrade = '-squashfs-WN573HX3-sysupgrade',
+})
+
+
+-- 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')