Change BCM4339 wifi firmware position

Change firmware position.
Will pop warning info when not found
the firmware.

When build the images in root top the scripts will copy the
fw_bcmdhd.bin, fw_bcmdhd_apsta.bin bcmdhd.cal to the firmware folder.
Before test this please use
"$tools/bdk/brunch/brunch bsp download picoimx" to download firmware.
Bug:28537290

Change-Id: I400cbb8f4db450136d26a29c00503ac14128dc9e
Signed-off-by: Wang Haoran <Haoran.Wang@freescale.com>

2 files changed, 109 insertions, 5 deletions

diff --git a/peripheral/wifi/bcm4339/bcmdhd.cal b/peripheral/wifi/bcm4339/bcmdhd.cal
new file mode 100644
index 0000000..4716c7e
--- /dev/null
+++ b/peripheral/wifi/bcm4339/bcmdhd.cal
@@ -0,0 +1,102 @@
+# Sample NVRAM for BCM94339 WLCSP with eTR,iPA, and eLNA.
+sromrev=11
+boardrev=0x1100
+boardtype=0x06c9
+boardflags=0x10081401
+boardflags2=0x00000000
+boardflags3=0x08001188
+#boardnum=57410
+macaddr=00:90:4c:c5:12:38
+ccode=0
+regrev=0
+antswitch=0
+pdgain2g=7
+pdgain5g=7
+tworangetssi2g=0
+tworangetssi5g=0
+vendid=0x14e4
+devid=0x43ae
+manfid=0x2d0
+#prodid=0x052e
+nocrc=1
+otpimagesize=502
+xtalfreq=37400
+extpagain2g=2
+pdetrange2g=2
+extpagain5g=2
+pdetrange5g=2
+rxgains2gelnagaina0=2
+rxgains2gtrisoa0=6
+rxgains2gtrelnabypa0=1
+rxgains5gelnagaina0=4
+rxgains5gtrisoa0=4
+rxgains5gtrelnabypa0=1
+rxchain=1
+txchain=1
+aa2g=1
+aa5g=1
+tssipos5g=0
+tssipos2g=0
+pa2ga0=0xFF47,0x17B5,0xFD2B
+pa2gccka0=0xFF5F,0x1B46,0xFCCC
+pa5ga0=0xff54,0x16ec,0xfd45,0xff52,0x16a1,0xfd4d,0xff46,0x15b7,0xfd5a,0xff56,0x156d,0xfd79
+pa5gbw40a0=0xff59,0x17ca,0xfd30,0xff42,0x163d,0xfd4b,0xff31,0x152e,0xfd55,0xff60,0x16d8,0xfd54
+pa5gbw80a0=0xff56,0x1740,0xfd3f,0xff50,0x1738,0xfd3d,0xff4d,0x16b4,0xfd42,0xff58,0x1634,0xfd60
+# Default Target Power for 2G -- 17dBm(11)/14dBm(54)/13dBm(MCS7)/12dBm(MCS8)/12dBm(MCS9)
+maxp2ga0=74
+maxp5ga0=74,74,74,74
+cckbw202gpo=0x0000
+cckbw20ul2gpo=0x0000
+mcsbw202gpo=0xaa888888
+mcsbw402gpo=0xaa888888
+dot11agofdmhrbw202gpo=0x6666
+ofdmlrbw202gpo=0x0066
+tssifloor2g=500
+# Default Target Power for 5G -- 14dBm(54)/13dBm(MCS7)/12dBm(MCS8)/12dBm(MCS9)
+mcsbw205glpo=0xaa866666
+mcsbw405glpo=0xaa866666
+mcsbw805glpo=0xaa866666
+mcsbw205gmpo=0xaa866666
+mcsbw405gmpo=0xaa866666
+mcsbw805gmpo=0xaa866666
+mcsbw205ghpo=0xaa866666
+mcsbw405ghpo=0xaa866666
+mcsbw805ghpo=0xaa866666
+mcslr5glpo=0x0000
+mcslr5gmpo=0x0000
+mcslr5ghpo=0x0000
+sb20in40hrpo=0x0
+sb20in80and160hr5glpo=0x0
+sb40and80hr5glpo=0x0
+sb20in80and160hr5gmpo=0x0
+sb40and80hr5gmpo=0x0
+sb20in80and160hr5ghpo=0x0
+sb40and80hr5ghpo=0x0
+sb20in40lrpo=0x0
+sb20in80and160lr5glpo=0x0
+sb40and80lr5glpo=0x0
+sb20in80and160lr5gmpo=0x0
+sb40and80lr5gmpo=0x0
+sb20in80and160lr5ghpo=0x0
+sb40and80lr5ghpo=0x0
+dot11agduphrpo=0x0
+dot11agduplrpo=0x0
+phycal_tempdelta=25
+cckdigfilttype=2
+swctrlmap_5g=0x00080008,0x00500010,0x00100008,0x000000,0x078
+swctrlmap_2g=0x00010001,0x00220002,0x00020001,0x042202,0x1ff
+swctrlmapext_5g=0x00000000,0x00000000,0x00000000,0x000000,0x000
+swctrlmapext_2g=0x00000000,0x00000000,0x00000000,0x000000,0x000
+#
+#GPIO 0 for SDIO HW OOB interruption
+#muxenab=0x10
+#sd_gpout=0
+#sd_oobonly=1
+#
+rssicorrnorm_c0=-2,0
+rssicorrnorm5g_c0=3,5,2,3,4,2,2,3,1,2,3,1
+## ED threshold level to address the new ETSI requirement - 10/31/2013
+ed_thresh2g=-77
+ed_thresh5g=-77
+#
+paparambwver=1
diff --git a/peripheral/wifi/bcm4339/peripheral.mk b/peripheral/wifi/bcm4339/peripheral.mk
index 9376140..3f8c7b9 100644
--- a/peripheral/wifi/bcm4339/peripheral.mk
+++ b/peripheral/wifi/bcm4339/peripheral.mk
@@ -14,15 +14,17 @@
 # limitations under the License.
 #
 
-bcmdhd_firmware_mk := hardware/bsp/freescale/peripheral/wifi/bcm4339/bcmdhd
+bcmdhd_firmware_mk := vendor/bsp/freescale/peripheral/wifi/bcm4339/firmware/
 
 ifeq ($(bcmdhd_firmware_mk), $(wildcard $(bcmdhd_firmware_mk)))
-wlan_firmware_src_folder = hardware/bsp/freescale/peripheral/wifi/bcm4339/bcmdhd/firmware/ZP_BCM4339/
 firmware_dst_folder = system/vendor/firmware/wlan/bcm4339
 
-SRC_FILES := bcmdhd.ZP.SDIO.cal fw_bcmdhd.bin fw_bcmdhd_apsta.bin
+SRC_FILES := fw_bcmdhd.bin fw_bcmdhd_apsta.bin
 COPY_FILES += \
-  $(join $(patsubst %, $(wlan_firmware_src_folder)/%, $(SRC_FILES)), $(patsubst %, :$(firmware_dst_folder)/%, $(SRC_FILES)))
+  $(join $(patsubst %, $(bcmdhd_firmware_mk)/%, $(SRC_FILES)), $(patsubst %, :$(firmware_dst_folder)/%, $(SRC_FILES)))
+PRODUCT_COPY_FILES += $(COPY_FILES)
+PRODUCT_COPY_FILES += hardware/bsp/freescale/peripheral/wifi/bcm4339/bcmdhd.cal:$(firmware_dst_folder)/bcmdhd.cal
+else
+  $(warning "Not found bcm4339 wifi firmware. Please use 'tools/bdk/brunch/brunch bsp download picoimx' command to download.")
 endif
 
-PRODUCT_COPY_FILES += $(COPY_FILES)