conf/machine/cubieboard4.conf

@@ -3,9 +3,6 @@
 #@DESCRIPTION: Machine configuration for the cubieboard4, based on allwinner A80 CPU http://cubieboard.org/
 
 require conf/machine/include/sun9i.inc
-require conf/machine/include/hardware/ap6330.inc
-
-MACHINE_FEATURES:append = " bluetooth wifi"
 
 KERNEL_IMAGETYPE = "zImage"
 

conf/machine/include/hardware/ap6330.inc

@@ -1,5 +0,0 @@
-# Include for boards with AMPAK AP6330 Wifi / Bluetooth module
-# https://linux-sunxi.org/Wifi#Ampak
-
-MACHINE_EXTRA_RRECOMMENDS:append = " kernel-module-brcmfmac"
-MACHINE_EXTRA_RDEPENDS:append = " linux-firmware-bcm4330"

conf/machine/merrii-a80-optimus.conf

@@ -3,9 +3,6 @@
 #@DESCRIPTION: Machine configuration for the Merrii A80 Optimus, based on Allwinner A80 CPU https://linux-sunxi.org/Merrii_A80_Optimus_Board
 
 require conf/machine/include/sun9i.inc
-require conf/machine/include/hardware/ap6330.inc
-
-MACHINE_FEATURES:append = " bluetooth wifi"
 
 KERNEL_IMAGETYPE = "zImage"
 

recipes-kernel/linux-firmware/linux-firmware_%.bbappend

@@ -11,15 +11,3 @@ do_install:append:sunxi() {
 	ln -sf -r ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.AP6212.txt ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.xunlong,orangepi-zero-plus2-h3.txt
 	ln -sf -r ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.AP6212.txt ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.friendlyarm,nanopi-neo-plus2.txt
 }
-
-do_install:append:cubieboard4() {
-	ln -sf -r ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac4330-sdio.bin ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac4330-sdio.cubietech,a80-cubieboard4.bin
-}
-
-do_install:append:merrii-a80-optimus() {
-	ln -sf -r ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac4330-sdio.bin ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac4330-sdio.merrii,a80-optimus.bin
-}
-
-do_install:append:sun9i() {
-	ln -sf -r ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac4330-sdio.Prowise-PT301.txt ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac4330-sdio.txt
-}

recipes-kernel/linux/linux-mainline/sun9i/defconfig

@@ -897,7 +897,7 @@ CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
 # CONFIG_MAC80211_MESSAGE_TRACING is not set
 # CONFIG_MAC80211_DEBUG_MENU is not set
 CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
-CONFIG_RFKILL=y
+# CONFIG_RFKILL is not set
 # CONFIG_NET_9P is not set
 # CONFIG_CAIF is not set
 # CONFIG_CEPH_LIB is not set