diff --git a/config/boards/bananapim4zero.conf b/config/boards/bananapim4zero.conf
index d77a0f93e..da6a890cc 100644
--- a/config/boards/bananapim4zero.conf
+++ b/config/boards/bananapim4zero.conf
@@ -1,5 +1,5 @@
 # Allwinner H618 quad core 1/2/4GB RAM SoC WiFi SPI USB-C
-BOARD_NAME="Banana Pi M4Zero"
+BOARD_NAME="BananaPi BPI-M4-Zero"
 BOARDFAMILY="sun50iw9-bpi"
 BOARD_MAINTAINER="pyavitz"
 BOOTCONFIG="bananapi_m4zero_defconfig"
@@ -12,10 +12,12 @@ FORCE_BOOTSCRIPT_UPDATE="yes"
 BOOTBRANCH_BOARD="tag:v2024.04"
 BOOTPATCHDIR="v2024.04"
 
-function post_family_tweaks_bsp__bananapi_rtl_bt() {
-	if [[ -d "$SRC/packages/bsp/bananapi/rtl_bt" ]]; then
+function post_family_tweaks_bsp__bananapi_firmware() {
+	if [[ -d "$SRC/packages/bsp/bananapi/brcm" ]] && [[ -d "$SRC/packages/bsp/bananapi/rtl_bt" ]]; then
+		mkdir -p "${destination}"/lib/firmware/updates/brcm
 		mkdir -p "${destination}"/lib/firmware/updates/rtl_bt
 		display_alert "$BOARD" "Installing upstream firmware" "info"
+		cp -fr $SRC/packages/bsp/bananapi/brcm/* "${destination}"/lib/firmware/updates/brcm/
 		cp -fr $SRC/packages/bsp/bananapi/rtl_bt/* "${destination}"/lib/firmware/updates/rtl_bt/
 	fi
 }
diff --git a/packages/bsp/bananapi/brcm/BCM4345C0.sinovoip,bpi-m4-zero.hcd b/packages/bsp/bananapi/brcm/BCM4345C0.sinovoip,bpi-m4-zero.hcd
new file mode 100644
index 000000000..ccdbca165
Binary files /dev/null and b/packages/bsp/bananapi/brcm/BCM4345C0.sinovoip,bpi-m4-zero.hcd differ
diff --git a/packages/bsp/bananapi/brcm/brcmfmac43455-sdio.bin b/packages/bsp/bananapi/brcm/brcmfmac43455-sdio.bin
new file mode 100644
index 000000000..2b241ea0b
Binary files /dev/null and b/packages/bsp/bananapi/brcm/brcmfmac43455-sdio.bin differ
diff --git a/packages/bsp/bananapi/brcm/brcmfmac43455-sdio.clm_blob b/packages/bsp/bananapi/brcm/brcmfmac43455-sdio.clm_blob
new file mode 100644
index 000000000..4cf6d315f
Binary files /dev/null and b/packages/bsp/bananapi/brcm/brcmfmac43455-sdio.clm_blob differ
diff --git a/packages/bsp/bananapi/brcm/brcmfmac43455-sdio.sinovoip,bpi-m4-zero.bin b/packages/bsp/bananapi/brcm/brcmfmac43455-sdio.sinovoip,bpi-m4-zero.bin
new file mode 120000
index 000000000..e44aa55aa
--- /dev/null
+++ b/packages/bsp/bananapi/brcm/brcmfmac43455-sdio.sinovoip,bpi-m4-zero.bin
@@ -0,0 +1 @@
+brcmfmac43455-sdio.bin
\ No newline at end of file
diff --git a/packages/bsp/bananapi/brcm/brcmfmac43455-sdio.sinovoip,bpi-m4-zero.txt b/packages/bsp/bananapi/brcm/brcmfmac43455-sdio.sinovoip,bpi-m4-zero.txt
new file mode 120000
index 000000000..2aba486e0
--- /dev/null
+++ b/packages/bsp/bananapi/brcm/brcmfmac43455-sdio.sinovoip,bpi-m4-zero.txt
@@ -0,0 +1 @@
+brcmfmac43455-sdio.txt
\ No newline at end of file
diff --git a/packages/bsp/bananapi/brcm/brcmfmac43455-sdio.txt b/packages/bsp/bananapi/brcm/brcmfmac43455-sdio.txt
new file mode 100644
index 000000000..9a20cb7e4
--- /dev/null
+++ b/packages/bsp/bananapi/brcm/brcmfmac43455-sdio.txt
@@ -0,0 +1,98 @@
+# Cloned from bcm94345wlpagb_p2xx.txt 
+NVRAMRev=$Rev: 498373 $
+sromrev=11
+vendid=0x14e4
+devid=0x43ab
+manfid=0x2d0
+prodid=0x06e4
+#macaddr=00:90:4c:c5:12:38
+macaddr=b8:27:eb:74:f2:6c
+nocrc=1
+boardtype=0x6e4
+boardrev=0x1304
+
+#XTAL 37.4MHz
+xtalfreq=37400
+
+btc_mode=1
+#------------------------------------------------------
+#boardflags: 5GHz eTR switch by default
+#            2.4GHz eTR switch by default
+#            bit1 for btcoex
+boardflags=0x00480201
+boardflags2=0x40800000
+boardflags3=0x44200100
+phycal_tempdelta=15
+rxchain=1
+txchain=1
+aa2g=1
+aa5g=1
+tssipos5g=1
+tssipos2g=1
+femctrl=0
+AvVmid_c0=1,165,2,100,2,100,2,100,2,100
+pa2ga0=-129,6525,-718
+pa2ga1=-149,4408,-601
+pa5ga0=-185,6836,-815,-186,6838,-815,-184,6859,-815,-184,6882,-818
+pa5ga1=-202,4285,-574,-201,4312,-578,-196,4391,-586,-201,4294,-575
+itrsw=1
+pdoffsetcckma0=2
+pdoffset2gperchan=0,-2,1,0,1,0,1,1,1,0,0,-1,-1,0
+pdoffset2g40ma0=16
+pdoffset40ma0=0x8888
+pdoffset80ma0=0x8888
+extpagain5g=2
+extpagain2g=2
+tworangetssi2g=1
+tworangetssi5g=1
+# LTECX flags
+# WCI2
+ltecxmux=0
+ltecxpadnum=0x0504
+ltecxfnsel=0x22
+ltecxgcigpio=0x32
+
+maxp2ga0=80
+ofdmlrbw202gpo=0x0022
+dot11agofdmhrbw202gpo=0x4442
+mcsbw202gpo=0x98444422
+mcsbw402gpo=0x98444422
+maxp5ga0=82,82,82,82
+mcsbw205glpo=0xb9555000
+mcsbw205gmpo=0xb9555000
+mcsbw205ghpo=0xb9555000
+mcsbw405glpo=0xb9555000
+mcsbw405gmpo=0xb9555000
+mcsbw405ghpo=0xb9555000
+mcsbw805glpo=0xb9555000
+mcsbw805gmpo=0xb9555000
+mcsbw805ghpo=0xb9555000
+
+swctrlmap_2g=0x00000000,0x00000000,0x00000000,0x010000,0x3ff
+swctrlmap_5g=0x00100010,0x00200020,0x00200020,0x010000,0x3fe
+swctrlmapext_5g=0x00000000,0x00000000,0x00000000,0x000000,0x3
+swctrlmapext_2g=0x00000000,0x00000000,0x00000000,0x000000,0x3
+
+vcodivmode=1
+deadman_to=481500000
+
+ed_thresh2g=-54
+ed_thresh5g=-54
+eu_edthresh2g=-54
+eu_edthresh5g=-54
+ldo1=4
+rawtempsense=0x1ff
+cckPwrIdxCorr=3
+cckTssiDelay=150
+ofdmTssiDelay=150
+txpwr2gAdcScale=1
+txpwr5gAdcScale=1
+dot11b_opts=0x3aa85
+cbfilttype=1
+fdsslevel_ch11=6
+
+# Improved Bluetooth coexistence parameters from Cypress
+btc_mode=1
+btc_params8=0x4e20
+btc_params1=0x7530
+btc_params50=0x972c