diff --git a/layers/meta-resin-allwinner/recipes-kernel/linux-firmware/files/bcm4329.hcd b/layers/meta-resin-allwinner/recipes-kernel/linux-firmware/files/bcm4329.hcd
new file mode 100644
index 0000000..b7c5762
Binary files /dev/null and b/layers/meta-resin-allwinner/recipes-kernel/linux-firmware/files/bcm4329.hcd differ
diff --git a/layers/meta-resin-allwinner/recipes-kernel/linux-firmware/files/bcm4330.hcd b/layers/meta-resin-allwinner/recipes-kernel/linux-firmware/files/bcm4330.hcd
new file mode 100644
index 0000000..947d5fe
Binary files /dev/null and b/layers/meta-resin-allwinner/recipes-kernel/linux-firmware/files/bcm4330.hcd differ
diff --git a/layers/meta-resin-allwinner/recipes-kernel/linux-firmware/files/bcm43438-sdio.hcd b/layers/meta-resin-allwinner/recipes-kernel/linux-firmware/files/bcm43438-sdio.hcd
new file mode 100644
index 0000000..1fc806e
Binary files /dev/null and b/layers/meta-resin-allwinner/recipes-kernel/linux-firmware/files/bcm43438-sdio.hcd differ
diff --git a/layers/meta-resin-allwinner/recipes-kernel/linux-firmware/files/fw_bcm43438a0.bin b/layers/meta-resin-allwinner/recipes-kernel/linux-firmware/files/brcmfmac43430-sdio.bin
similarity index 100%
rename from layers/meta-resin-allwinner/recipes-kernel/linux-firmware/files/fw_bcm43438a0.bin
rename to layers/meta-resin-allwinner/recipes-kernel/linux-firmware/files/brcmfmac43430-sdio.bin
diff --git a/layers/meta-resin-allwinner/recipes-kernel/linux-firmware/files/nvram_ap6212.txt b/layers/meta-resin-allwinner/recipes-kernel/linux-firmware/files/brcmfmac43430-sdio.txt
similarity index 94%
rename from layers/meta-resin-allwinner/recipes-kernel/linux-firmware/files/nvram_ap6212.txt
rename to layers/meta-resin-allwinner/recipes-kernel/linux-firmware/files/brcmfmac43430-sdio.txt
index 578376c..8f0bf69 100644
--- a/layers/meta-resin-allwinner/recipes-kernel/linux-firmware/files/nvram_ap6212.txt
+++ b/layers/meta-resin-allwinner/recipes-kernel/linux-firmware/files/brcmfmac43430-sdio.txt
@@ -1,54 +1,54 @@
-#AP6212_NVRAM_V1.0_20140603
-# 2.4 GHz, 20 MHz BW mode
-
-# The following parameter values are just placeholders, need to be updated.
-manfid=0x2d0
-prodid=0x0726
-vendid=0x14e4
-devid=0x43e2
-boardtype=0x0726
-boardrev=0x1101
-boardnum=22
-macaddr=00:90:4c:c5:12:38
-sromrev=11
-boardflags=0x00404201
-xtalfreq=26000
-nocrc=1
-ag0=255
-aa2g=1
-ccode=ALL
-
-pa0itssit=0x20
-extpagain2g=0
-
-#PA parameters for 2.4GHz, measured at CHIP OUTPUT
-pa2ga0=-168,7161,-820
-AvVmid_c0=0x0,0xc8
-cckpwroffset0=5
-
-# PPR params
-maxp2ga0=90
-txpwrbckof=6
-cckbw202gpo=0x5555
-legofdmbw202gpo=0x77777777
-mcsbw202gpo=0xaaaaaaaa
-
-# OFDM IIR :
-ofdmdigfilttype=7
-# PAPD mode:
-papdmode=2
-
-il0macaddr=00:90:4c:c5:12:38
-wl0id=0x431b
-
-#OOB parameters
-hostwake=0x40
-hostrdy=0x41
-usbrdy=0x03
-usbrdydelay=100
-deadman_to=0xffffffff
-# muxenab: 0x1 for UART enable, 0x10 for Host awake
-muxenab=0x10
-# CLDO PWM voltage settings - 0x4 - 1.1 volt
-#cldo_pwm=0x4
-
+#AP6212_NVRAM_V1.0_20140603
+# 2.4 GHz, 20 MHz BW mode
+
+# The following parameter values are just placeholders, need to be updated.
+manfid=0x2d0
+prodid=0x0726
+vendid=0x14e4
+devid=0x43e2
+boardtype=0x0726
+boardrev=0x1101
+boardnum=22
+macaddr=00:90:4c:c5:12:38
+sromrev=11
+boardflags=0x00404201
+xtalfreq=26000
+nocrc=1
+ag0=255
+aa2g=1
+ccode=ALL
+
+pa0itssit=0x20
+extpagain2g=0
+
+#PA parameters for 2.4GHz, measured at CHIP OUTPUT
+pa2ga0=-168,7161,-820
+AvVmid_c0=0x0,0xc8
+cckpwroffset0=5
+
+# PPR params
+maxp2ga0=90
+txpwrbckof=6
+cckbw202gpo=0x5555
+legofdmbw202gpo=0x77777777
+mcsbw202gpo=0xaaaaaaaa
+
+# OFDM IIR :
+ofdmdigfilttype=7
+# PAPD mode:
+papdmode=2
+
+il0macaddr=00:90:4c:c5:12:38
+wl0id=0x431b
+
+#OOB parameters
+hostwake=0x40
+hostrdy=0x41
+usbrdy=0x03
+usbrdydelay=100
+deadman_to=0xffffffff
+# muxenab: 0x1 for UART enable, 0x10 for Host awake
+muxenab=0x10
+# CLDO PWM voltage settings - 0x4 - 1.1 volt
+#cldo_pwm=0x4
+
diff --git a/layers/meta-resin-allwinner/recipes-kernel/linux-firmware/files/config.txt b/layers/meta-resin-allwinner/recipes-kernel/linux-firmware/files/config.txt
new file mode 100644
index 0000000..59b9682
--- /dev/null
+++ b/layers/meta-resin-allwinner/recipes-kernel/linux-firmware/files/config.txt
@@ -0,0 +1,4 @@
+PM=0
+nv_by_chip=1 \
+43362 1 nvram_ap6210.txt
+43430 0 nvram_ap6212.txt
diff --git a/layers/meta-resin-allwinner/recipes-kernel/linux-firmware/files/fw_bcm43438a1.bin b/layers/meta-resin-allwinner/recipes-kernel/linux-firmware/files/fw_bcm43438a1.bin
deleted file mode 100644
index e815f44..0000000
Binary files a/layers/meta-resin-allwinner/recipes-kernel/linux-firmware/files/fw_bcm43438a1.bin and /dev/null differ
diff --git a/layers/meta-resin-allwinner/recipes-kernel/linux-firmware/linux-firmware_%.bbappend b/layers/meta-resin-allwinner/recipes-kernel/linux-firmware/linux-firmware_%.bbappend
index 33ac901..3117a96 100644
--- a/layers/meta-resin-allwinner/recipes-kernel/linux-firmware/linux-firmware_%.bbappend
+++ b/layers/meta-resin-allwinner/recipes-kernel/linux-firmware/linux-firmware_%.bbappend
@@ -1,18 +1,31 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 
+# These firmware files are fetched from https://github.com/armbian/build/tree/master/packages/extras/firmware/brcm
 SRC_URI_append = " \
-    file://nvram_ap6212.txt \
-    file://fw_bcm43438a0.bin \
+    file://bcm4329.hcd \
+    file://bcm4330.hcd \
+    file://bcm43438-sdio.hcd \
+    file://brcmfmac43430-sdio.bin \
+    file://brcmfmac43430-sdio.txt \
+    file://config.txt \
     "
 
 do_install_append() {
-    cp ${WORKDIR}/nvram_ap6212.txt ${D}/lib/firmware/brcm/brcmfmac43430-sdio.txt
-    cp ${WORKDIR}/fw_bcm43438a0.bin ${D}/lib/firmware/brcm/brcmfmac43430-sdio.bin
+    cp ${WORKDIR}/bcm4329.hcd ${D}/lib/firmware/brcm/bcm4329.hcd
+    cp ${WORKDIR}/bcm4330.hcd ${D}/lib/firmware/brcm/bcm4330.hcd
+    cp ${WORKDIR}/bcm43438-sdio.hcd ${D}/lib/firmware/brcm/bcm43438-sdio.hcd
+    cp ${WORKDIR}/brcmfmac43430-sdio.bin ${D}/lib/firmware/brcm/brcmfmac43430-sdio.bin
+    cp ${WORKDIR}/brcmfmac43430-sdio.txt ${D}/lib/firmware/brcm/brcmfmac43430-sdio.txt
+    cp ${WORKDIR}/config.txt ${D}/lib/firmware/brcm/config.txt
 }
 
 PACKAGES =+ "${PN}-ap6212"
 
 FILES_${PN}-ap6212 = " \
-  /lib/firmware/brcm/brcmfmac43430-sdio.txt \
+  /lib/firmware/brcm/bcm4329.hcd \
+  /lib/firmware/brcm/bcm4330.hcd \
+  /lib/firmware/brcm/bcm43438-sdio.hcd \
   /lib/firmware/brcm/brcmfmac43430-sdio.bin \
+  /lib/firmware/brcm/brcmfmac43430-sdio.txt \
+  /lib/firmware/brcm/config.txt \
 "
\ No newline at end of file