Merge pull request #440 from okaestne/feat/machine-feature-wifi-bt

feat: add MACHINE_FEATURE wifi and bluetooth for AP6212 and AP6330 boards

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"

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"

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"

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"

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"

recipes-kernel/linux/linux-mainline.inc

@@ -57,6 +57,7 @@ SOURCES_K65 = " \
 	file://6.5/0003-dts-allwinner-bananapi-m2-zero-Enforce-consistent-MM.patch \
 	file://6.5/0004-dts-allwinner-bananapi-m64-Consistent-nodes-for-mmc-devices.patch \
 	file://6.5/0005-ARM-dts-sunxi-Add-MMC-alias-for-consistent-enumerati.patch \
+	file://6.5/0006-dts-allwinner-orangepi-zero-mmc-aliases-for-consiste.patch \
 "
 
 SOURCES = " \

recipes-kernel/linux/linux-mainline/6.5/0006-dts-allwinner-orangepi-zero-mmc-aliases-for-consiste.patch

@@ -0,0 +1,32 @@
+From a2d765aab2989ba080b8f63cb0489d6a531cb3fd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Oliver=20K=C3=A4stner?= <git@oliver-kaestner.de>
+Date: Sun, 16 Mar 2025 22:36:53 +0100
+Subject: [PATCH] dts: allwinner: orangepi-zero: mmc aliases for consistent
+ enumeration
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This fixes random boot failures.
+
+Upstream-Status: Inappropriate [https://github.com/linux-sunxi/meta-sunxi/pull/431]
+
+Signed-off-by: Oliver Kästner <git@oliver-kaestner.de>
+---
+ arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts
+index ca94e313f..570a88327 100644
+--- a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts
++++ b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts
+@@ -59,6 +59,9 @@ aliases {
+ 		/* ethernet0 is the H3 emac, defined in sun8i-h3.dtsi */
+ 		ethernet0 = &emac;
+ 		ethernet1 = &xr819;
++		mmc0 = &mmc0; /* microSD */
++		mmc1 = &mmc1; /* XR819 WiFi */
++		mmc2 = &mmc2;
+ 	};
+ 
+ 	chosen {