From dcd6baa7cf4b4b8a72f0ab8f31d0bb43402d14b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20K=C3=A4stner?= Date: Mon, 17 Mar 2025 21:03:59 +0100 Subject: [PATCH] feat: add MACHINE_FEATURE wifi and bluetooth for AP6212 and AP6330 boards MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Oliver Kästner --- conf/machine/cubieboard4.conf | 2 -- conf/machine/include/hardware/ap6212a.inc | 2 ++ conf/machine/include/hardware/ap6330.inc | 2 ++ conf/machine/merrii-a80-optimus.conf | 2 -- conf/machine/orange-pi-prime.conf | 1 - 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/conf/machine/cubieboard4.conf b/conf/machine/cubieboard4.conf index c0958b6..ceb6168 100644 --- a/conf/machine/cubieboard4.conf +++ b/conf/machine/cubieboard4.conf @@ -5,8 +5,6 @@ require conf/machine/include/sun9i.inc require conf/machine/include/hardware/ap6330.inc -MACHINE_FEATURES:append = " bluetooth wifi" - KERNEL_IMAGETYPE = "zImage" KERNEL_DEVICETREE = "sun9i-a80-cubieboard4.dtb" diff --git a/conf/machine/include/hardware/ap6212a.inc b/conf/machine/include/hardware/ap6212a.inc index 4543f38..e8f4dcd 100644 --- a/conf/machine/include/hardware/ap6212a.inc +++ b/conf/machine/include/hardware/ap6212a.inc @@ -3,3 +3,5 @@ MACHINE_EXTRA_RRECOMMENDS:append = " kernel-module-brcmfmac" MACHINE_EXTRA_RDEPENDS:append = " linux-firmware-bcm43430" + +MACHINE_FEATURES:append = " bluetooth wifi" diff --git a/conf/machine/include/hardware/ap6330.inc b/conf/machine/include/hardware/ap6330.inc index 7ef7e28..1245764 100644 --- a/conf/machine/include/hardware/ap6330.inc +++ b/conf/machine/include/hardware/ap6330.inc @@ -3,3 +3,5 @@ MACHINE_EXTRA_RRECOMMENDS:append = " kernel-module-brcmfmac" MACHINE_EXTRA_RDEPENDS:append = " linux-firmware-bcm4330" + +MACHINE_FEATURES:append = " bluetooth wifi" diff --git a/conf/machine/merrii-a80-optimus.conf b/conf/machine/merrii-a80-optimus.conf index e8317da..48ae08e 100644 --- a/conf/machine/merrii-a80-optimus.conf +++ b/conf/machine/merrii-a80-optimus.conf @@ -5,8 +5,6 @@ require conf/machine/include/sun9i.inc require conf/machine/include/hardware/ap6330.inc -MACHINE_FEATURES:append = " bluetooth wifi" - KERNEL_IMAGETYPE = "zImage" KERNEL_DEVICETREE = "sun9i-a80-optimus.dtb" diff --git a/conf/machine/orange-pi-prime.conf b/conf/machine/orange-pi-prime.conf index 6c26c38..4dff13e 100644 --- a/conf/machine/orange-pi-prime.conf +++ b/conf/machine/orange-pi-prime.conf @@ -8,5 +8,4 @@ require conf/machine/include/hardware/ap6212a.inc KERNEL_DEVICETREE = "allwinner/sun50i-h5-orangepi-prime.dtb" UBOOT_MACHINE = "orangepi_prime_defconfig" -MACHINE_FEATURES:append = " bluetooth wifi" MACHINE_EXTRA_RRECOMMENDS:append = " linux-firmware-rtl8723"