diff --git a/package/firmware/ap6236/bcm43436b0.hcd b/package/firmware/ap6236/bcm43436b0.hcd
new file mode 100755
index 000000000..e2473b9f9
Binary files /dev/null and b/package/firmware/ap6236/bcm43436b0.hcd differ
diff --git a/package/firmware/ap6236/fw_bcm43436b0.bin b/package/firmware/ap6236/fw_bcm43436b0.bin
new file mode 100755
index 000000000..e8f122a38
Binary files /dev/null and b/package/firmware/ap6236/fw_bcm43436b0.bin differ
diff --git a/package/firmware/ap6236/fw_bcm43436b0_apsta.bin b/package/firmware/ap6236/fw_bcm43436b0_apsta.bin
new file mode 100755
index 000000000..6263983b6
Binary files /dev/null and b/package/firmware/ap6236/fw_bcm43436b0_apsta.bin differ
diff --git a/package/firmware/ap6236/fw_bcm43436b0_p2p.bin b/package/firmware/ap6236/fw_bcm43436b0_p2p.bin
new file mode 100755
index 000000000..6263983b6
Binary files /dev/null and b/package/firmware/ap6236/fw_bcm43436b0_p2p.bin differ
diff --git a/package/firmware/ap6236/nvram_ap6236.txt b/package/firmware/ap6236/nvram_ap6236.txt
new file mode 100755
index 000000000..b6ec5311e
--- /dev/null
+++ b/package/firmware/ap6236/nvram_ap6236.txt
@@ -0,0 +1,64 @@
+#AP6236_NVRAM_V1.0_20170117
+# NVRAM file for BCM943430WLPTH, Bx Chip
+# 2.4 GHz, 20 MHz BW mode
+
+# The following parameter values are just placeholders, need to be updated.
+manfid=0x2d0
+prodid=0x0727
+vendid=0x14e4
+devid=0x43e2
+boardtype=0x0727
+boardrev=0x1331
+boardnum=22
+macaddr=00:90:4c:c5:12:38
+sromrev=11
+boardflags=0x00404201
+boardflags3=0x08000000
+xtalfreq=26000
+nocrc=1
+ag0=255
+aa2g=1
+ccode=ALL
+
+pa0itssit=0x20
+extpagain2g=0
+
+#PA parameters for 2.4GHz, measured at CHIP OUTPUT
+pa2ga0=-202,5582,-671
+AvVmid_c0=0x0,0xc8
+cckpwroffset0=5
+
+# PPR params
+maxp2ga0=74
+txpwrbckof=6
+cckbw202gpo=0x2222
+legofdmbw202gpo=0x55555555
+mcsbw202gpo=0x76666666
+propbw202gpo=0xcc
+
+# OFDM IIR :
+ofdmdigfilttype=18
+ofdmdigfilttypebe=18
+# PAPD mode:
+papdmode=1
+pacalidx2g=42
+papdepsoffset=-22
+papdendidx=58
+
+# LTECX flags
+ltecxmux=0
+ltecxpadnum=0x0102
+ltecxfnsel=0x44
+ltecxgcigpio=0x01
+
+il0macaddr=00:90:4c:c5:12:38
+wl0id=0x431b
+
+deadman_to=0xffffffff
+# muxenab: 0x1 for UART enable, 0x2 for GPIOs, 0x8 for JTAG
+muxenab=0x10
+# CLDO PWM voltage settings - 0x4 - 1.1 volt
+#cldo_pwm=0x4
+
+#VCO freq 326.4MHz
+spurconfig=0x3 
diff --git a/package/firmware/linux-firmware/broadcom_ap6236.mk b/package/firmware/linux-firmware/broadcom_ap6236.mk
new file mode 100755
index 000000000..9a50eeafe
--- /dev/null
+++ b/package/firmware/linux-firmware/broadcom_ap6236.mk
@@ -0,0 +1,14 @@
+Package/ap6236-firmware = $(call Package/firmware-default,Broadcom AP6236 firmware)
+define Package/ap6236-firmware/install
+	$(INSTALL_DIR) $(1)/lib/firmware
+	$(INSTALL_DATA) \
+		$(TOPDIR)/package/firmware/ap6236/*.bin \
+		$(1)/lib/firmware/
+	$(INSTALL_DATA) \
+		$(TOPDIR)/package/firmware/ap6236/*.hcd \
+		$(1)/lib/firmware/
+	$(INSTALL_DATA) \
+		$(TOPDIR)/package/firmware/ap6236/nvram_ap6236.txt \
+		$(1)/lib/firmware/nvram.txt
+endef
+$(eval $(call BuildPackage,ap6236-firmware))
diff --git a/target/allwinner/mandolin-pv1/defconfig b/target/allwinner/mandolin-pv1/defconfig
index 927dfc124..9d4dc624f 100644
--- a/target/allwinner/mandolin-pv1/defconfig
+++ b/target/allwinner/mandolin-pv1/defconfig
@@ -1544,7 +1544,8 @@ CONFIG_PACKAGE_wifimanager-smartaudio=y
 # CONFIG_PACKAGE_ap6212-firmware is not set
 # CONFIG_PACKAGE_ap6212_plus_ap6212a-firmware is not set
 # CONFIG_PACKAGE_ap6212a-firmware is not set
-CONFIG_PACKAGE_ap6212z-firmware=y
+# CONFIG_PACKAGE_ap6212z-firmware is not set
+CONFIG_PACKAGE_ap6236-firmware=y
 # CONFIG_PACKAGE_ap6255-firmware is not set
 # CONFIG_PACKAGE_ap6256-firmware is not set
 # CONFIG_PACKAGE_ap6330-firmware is not set