diff --git a/graphics/gpu-firmware-amd-kmod/Makefile b/graphics/gpu-firmware-amd-kmod/Makefile
index 2181af01de04..f72f82a7c71f 100644
--- a/graphics/gpu-firmware-amd-kmod/Makefile
+++ b/graphics/gpu-firmware-amd-kmod/Makefile
@@ -1,74 +1,73 @@
 # Created by: Emmanuel Vadot <manu@FreeBSD.org>
 
 PORTNAME=	gpu-firmware-amd-kmod
 PORTVERSION=	20220511
 CATEGORIES=	graphics
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Firmware modules for ${FLAVOR} AMD GPUs
 
 LICENSE=	AMD
 LICENSE_NAME=	AMD firmware license (amdgpu/radeon)
 LICENSE_FILE=	${WRKSRC}/LICENSE.radeon
 LICENSE_PERMS=	dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept
 
 ONLY_FOR_ARCHS=		aarch64 amd64 i386 powerpc64le
 ONLY_FOR_ARCHS_REASON=	AMD GPUs are only available on aarch64, x86 and powerpc64le
 
 PKGNAMESUFFIX=	-${FLAVOR:C/_/-/g}
 FLAVORS=	banks \
 		bonaire \
 		carrizo \
 		fiji \
 		hainan \
 		hawaii \
 		kabini \
 		kaveri \
 		mullins \
 		navi10 \
 		navi12 \
 		navi14 \
 		oland \
 		picasso \
 		pitcairn \
 		polaris10 \
 		polaris11 \
 		polaris12 \
 		raven \
 		raven2 \
 		renoir \
 		si58 \
 		stoney \
 		tahiti \
 		tonga \
 		topaz \
 		vega10 \
 		vega12 \
 		vega20 \
 		vegam \
 		verde \
 		green_sardine \
 		sienna_cichlid
-FLAVOR?=	banks
 
 green_sardine_IGNORE_FreeBSD_12=	"Not supported on < 13.1"
 green_sardine_IGNORE_FreeBSD_13.0=	"Not supported on < 13.1"
 sienna_cichlid_IGNORE_FreeBSD_12=	"Not supported on < 13.1"
 sienna_cichlid_IGNORE_FreeBSD_13.0=	"Not supported on < 13.1"
 
 USES=		kmod uidfix
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	freebsd
 GH_PROJECT=	drm-kmod-firmware
 GH_TAGNAME=	20220511
 
 MAKE_ENV=	KMODS="amdgpukmsfw"
 MAKE_ENV+=	AMDGPUKMODS="${FLAVOR}"
 
 .include <bsd.port.pre.mk>
 
 PLIST_SUB+=	${FLAVORS:N${FLAVOR}:@v@${v:tu}="\@comment "@}
 PLIST_SUB+=	${FLAVOR:tu}=""
 
 .include <bsd.port.post.mk>
diff --git a/graphics/gpu-firmware-intel-kmod/Makefile b/graphics/gpu-firmware-intel-kmod/Makefile
index 0a341e956d13..96eb5ce7931e 100644
--- a/graphics/gpu-firmware-intel-kmod/Makefile
+++ b/graphics/gpu-firmware-intel-kmod/Makefile
@@ -1,45 +1,44 @@
 # Created by: Emmanuel Vadot <manu@FreeBSD.org>
 
 PORTNAME=	gpu-firmware-intel-kmod
 PORTVERSION=	20220511
 CATEGORIES=	graphics
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Firmware modules for ${FLAVOR} Intel GPUs
 
 LICENSE=	INTEL
 LICENSE_NAME=	Intel firmware license (i915)
 LICENSE_FILE=	${WRKSRC}/LICENSE.i915
 LICENSE_PERMS=	dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept
 
 ONLY_FOR_ARCHS=		amd64 i386
 ONLY_FOR_ARCHS_REASON=	Intel GPUs are only available on x86
 
 PKGNAMESUFFIX=	-${FLAVOR:C/_/-/g}
 FLAVORS=	skylake \
 		broxton \
 		kabylake \
 		geminilake \
 		coffeelake \
 		icelake \
 		elkhartlake \
 		tigerlake \
 		rocketlake
-FLAVOR?=	skylake
 
 USES=		kmod uidfix
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	freebsd
 GH_PROJECT=	drm-kmod-firmware
 GH_TAGNAME=	20220511
 
 MAKE_ENV=	KMODS="i915kmsfw"
 MAKE_ENV+=	I915KMODS="${FLAVOR}"
 
 .include <bsd.port.pre.mk>
 
 PLIST_SUB+=	${FLAVORS:N${FLAVOR}:@v@${v:tu}="\@comment "@}
 PLIST_SUB+=	${FLAVOR:tu}=""
 
 .include <bsd.port.post.mk>
diff --git a/graphics/gpu-firmware-radeon-kmod/Makefile b/graphics/gpu-firmware-radeon-kmod/Makefile
index 5323f561760c..f5e8ef7c4091 100644
--- a/graphics/gpu-firmware-radeon-kmod/Makefile
+++ b/graphics/gpu-firmware-radeon-kmod/Makefile
@@ -1,78 +1,77 @@
 # Created by: Emmanuel Vadot <manu@FreeBSD.org>
 
 PORTNAME=	gpu-firmware-radeon-kmod
 PORTVERSION=	20220511
 CATEGORIES=	graphics
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Firmware modules for ${FLAVOR} Radeon GPUs
 
 LICENSE=	RADEON
 LICENSE_NAME=	Radeon firmware license (i915)
 LICENSE_FILE=	${WRKSRC}/LICENSE.radeon
 LICENSE_PERMS=	dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept
 
 ONLY_FOR_ARCHS=		aarch64 amd64 i386 powerpc64 powerpc64le
 ONLY_FOR_ARCHS_REASON=	Radeon GPUs are only available on aarch64, x86 and powerpc64
 
 PKGNAMESUFFIX=	-${FLAVOR:C/_/-/g}
 FLAVORS=	aruba \
 		barts \
 		bonaire \
 		btc \
 		caicos \
 		cayman \
 		cedar \
 		cypress \
 		hainan \
 		hawaii \
 		juniper \
 		kabini \
 		kaveri \
 		mullins \
 		oland \
 		palm \
 		pitcairn \
 		r100 \
 		r200 \
 		r300 \
 		r420 \
 		r520 \
 		r600 \
 		r700 \
 		redwood \
 		rs600 \
 		rs690 \
 		rs780 \
 		rv610 \
 		rv620 \
 		rv630 \
 		rv635 \
 		rv670 \
 		rv710 \
 		rv730 \
 		rv740 \
 		rv770 \
 		sumo \
 		sumo2 \
 		tahiti \
 		turks \
 		verde
-FLAVOR?=	aruba
 
 USES=		kmod uidfix
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	freebsd
 GH_PROJECT=	drm-kmod-firmware
 GH_TAGNAME=	20220511
 
 MAKE_ENV=	KMODS="radeonkmsfw"
 MAKE_ENV+=	RADEONKMODS="${FLAVOR}"
 
 .include <bsd.port.pre.mk>
 
 PLIST_SUB+=	${FLAVORS:N${FLAVOR}:@v@${v:tu}="\@comment "@}
 PLIST_SUB+=	${FLAVOR:tu}=""
 
 .include <bsd.port.post.mk>