Merge pull request #11668 from morser499/pr/whd_1.40

Update Cypress WiFi driver code to version 1.40

Author: 0xc0170

targets/TARGET_Cypress/TARGET_PSOC6/TARGET_WHD/generated_mac_address.txt

@@ -6,4 +6,4 @@
  * MAC address is printed during WHD power up
  */
 
-#define NVRAM_GENERATED_MAC_ADDRESS        "macaddr=00:A0:50:d4:32:81"
+#define NVRAM_GENERATED_MAC_ADDRESS        "macaddr=00:A0:50:bb:5c:af"

targets/TARGET_Cypress/TARGET_PSOC6/TARGET_WHD/inc/whd_version.h

@@ -1,3 +1,3 @@
-#define WHD_VERSION "v1.30.0-rc3-dirty"
-#define WHD_BRANCH "v1.30.0-rc3"
-#define WHD_DATE "2019-08-27 16:29:32 +0800"
+#define WHD_VERSION "v1.40.0"
+#define WHD_BRANCH "v1.40.0"
+#define WHD_DATE "2019-10-02 13:25:35 +0800"

targets/TARGET_Cypress/TARGET_PSOC6/TARGET_WHD/resources/firmware/TARGET_43012/43012C0-mfgtest.bin

@@ -16,12 +16,12 @@
 #include "wiced_resource.h"
 
 #if defined(CY_STORAGE_WIFI_DATA)
-CY_SECTION(CY_STORAGE_WIFI_DATA) __attribute__( (used) )
+CY_SECTION_WHD(CY_STORAGE_WIFI_DATA) __attribute__( (used) )
 #endif
 const unsigned char wifi_firmware_clm_blob_image_data[7697] =
 {
-    66, 76, 79, 66, 60, 0, 0, 0, 192, 67, 184, 158, 1, 0, 0, 0, 2, 0, 0,
-    0, 0, 0, 0, 0, 60, 0, 0, 0, 209, 29, 0, 0, 191, 213, 43, 137, 0, 0,
+    66, 76, 79, 66, 60, 0, 0, 0, 212, 152, 37, 70, 1, 0, 0, 0, 2, 0, 0,
+    0, 0, 0, 0, 0, 60, 0, 0, 0, 209, 29, 0, 0, 217, 180, 83, 115, 0, 0,
     0, 0, 0, 0, 0, 0, 13, 30, 0, 0, 4, 0, 0, 0, 147, 68, 77, 121, 0, 0,
     0, 0, 67, 76, 77, 32, 68, 65, 84, 65, 0, 0, 18, 0, 2, 0, 57, 46, 49,
     48, 46, 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 49, 46, 51, 54,
@@ -258,8 +258,8 @@ const unsigned char wifi_firmware_clm_blob_image_data[7697] =
     14, 15, 16, 17, 18, 19, 20, 21, 12, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
     11, 4, 0, 1, 2, 3, 8, 12, 13, 14, 15, 16, 17, 18, 19, 8, 4, 5, 6, 7,
     8, 9, 10, 11, 21, 2, 2, 18, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-    16, 17, 18, 19, 20, 21, 50, 48, 49, 57, 45, 48, 56, 45, 48, 49, 32,
-    49, 50, 58, 51, 53, 58, 48, 50, 0, 0, 3, 0, 0, 0, 196, 11, 0, 0, 1,
+    16, 17, 18, 19, 20, 21, 50, 48, 49, 57, 45, 48, 57, 45, 48, 53, 32,
+    48, 50, 58, 53, 54, 58, 50, 56, 0, 0, 3, 0, 0, 0, 196, 11, 0, 0, 1,
     14, 1, 0, 3, 0, 0, 0, 120, 14, 0, 0, 42, 58, 16, 106, 138, 16, 155,
     171, 16, 0, 0, 0, 3, 0, 0, 0, 28, 23, 0, 0, 21, 2, 2, 0, 9, 0, 19, 0,
     22, 0, 24, 0, 32, 0, 35, 0, 42, 0, 53, 0, 59, 0, 73, 0, 75, 0, 77, 0,

targets/TARGET_Cypress/TARGET_PSOC6/TARGET_WHD/resources/firmware/TARGET_43012/43012C0-mfgtest.clm_blob

@@ -0,0 +1,167 @@
+/*
+ * Copyright (c) 2019, Cypress Semiconductor Corporation, All Rights Reserved
+ * SPDX-License-Identifier: LicenseRef-PBL
+ *
+ * This file and the related binary are licensed under the
+ * Permissive Binary License, Version 1.0 (the "License");
+ * you may not use these files except in compliance with the License.
+ *
+ * You may obtain a copy of the License here:
+ * LICENSE-permissive-binary-license-1.0.txt and at
+ * https://www.mbed.com/licenses/PBL-1.0
+ * 
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** @file
+ *  NVRAM file for CY8CKIT_062S2_43012
+ */
+
+#ifndef INCLUDED_NVRAM_IMAGE_H_
+#define INCLUDED_NVRAM_IMAGE_H_
+
+#include <string.h>
+#include <stdint.h>
+#include "generated_mac_address.txt"
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/**
+ *
+ * Character array of NVRAM image
+ *
+ * Generated from cyw9cy8ckit_062S2_43012_P100_722591.txt
+ *
+ */
+
+
+
+static const char wifi_nvram_image[] =
+        "NVRAMRev=$Rev:722591$"                                              "\x00"
+        "sromrev=11"                                                         "\x00"
+        "cckdigfilttype=4"                                                   "\x00"
+        "cckpwroffset0=2"                                                    "\x00"
+        "bphyscale=0x20"                                                     "\x00"
+        "boardflags3=0x40000100"                                             "\x00"
+        "vendid=0x14e4"                                                      "\x00"
+        "devid=0xA804"                                                       "\x00"
+        "manfid=0x2d0"                                                       "\x00"
+        "prodid=0x052e"                                                      "\x00"
+        NVRAM_GENERATED_MAC_ADDRESS                                          "\x00"
+        "mac_clkgating=1"                                                    "\x00"
+        "nocrc=1"                                                            "\x00"
+        "boardtype=0x0869"                                                   "\x00"
+        "boardrev=0x1102"                                                    "\x00"
+        "xtalfreq=37400"                                                     "\x00"
+        "boardflags2=0xc0000000"                                             "\x00"
+        "boardflags=0x00000001"                                              "\x00"
+        "etmode=0x11"                                                        "\x00"
+        "extpagain2g=2"                                                      "\x00"
+        "extpagain5g=2"                                                      "\x00"
+        "ccode=0"                                                            "\x00"
+        "regrev=0"                                                           "\x00"
+        "antswitch=0"                                                        "\x00"
+        "rxgains2gelnagaina0=0"                                              "\x00"
+        "rxgains2gtrisoa0=15"                                                "\x00"
+        "rxgains2gtrelnabypa0=0"                                             "\x00"
+        "rxgains5gelnagaina0=0"                                              "\x00"
+        "rxgains5gtrisoa0=9"                                                 "\x00"
+        "rxgains5gtrelnabypa0=0"                                             "\x00"
+        "pdgain5g=0"                                                         "\x00"
+        "pdgain2g=0"                                                         "\x00"
+        "tworangetssi2g=0"                                                   "\x00"
+        "tworangetssi5g=0"                                                   "\x00"
+        "rxchain=1"                                                          "\x00"
+        "txchain=1"                                                          "\x00"
+        "aa2g=1"                                                             "\x00"
+        "aa5g=1"                                                             "\x00"
+        "tssipos5g=0"                                                        "\x00"
+        "tssipos2g=0"                                                        "\x00"
+        "femctrl=17"                                                         "\x00"
+        "subband5gver=4"                                                     "\x00"
+        "pa2ga0=-108,6062,-661"                                              "\x00"
+        "pa5ga0=-82,6252,-698,-14,6722,-697,-92,6084,-710,-88,6465,-755"     "\x00"
+        "pdoffset40ma0=0"                                                    "\x00"
+        "pdoffset80ma0=0"                                                    "\x00"
+        "lowpowerrange2g=0"                                                  "\x00"
+        "lowpowerrange5g=0"                                                  "\x00"
+        "ed_thresh2g=-63"                                                    "\x00"
+        "ed_thresh5g=-63"                                                    "\x00"
+        "swctrlmap_2g=0x10101010,0x20202020,0x10101010,0x442020,0x3ff"       "\x00"
+        "swctrlmapext_2g=0x01000100,0x01000100,0x01000100,0x000000,0x301"    "\x00"
+        "swctrlmap_5g=0x80808080,0x00000000,0x80808080,0x442020,0x381"       "\x00"
+        "swctrlmapext_5g=0x01000100,0x01000100,0x00000000,0x000000,0x303"    "\x00"
+        "ulpnap=0"                                                           "\x00"
+        "ulpadc=1"                                                           "\x00"
+        "ssagc_en=0"                                                         "\x00"
+        "ds1_nap=0"                                                          "\x00"
+        "spurcan_ch_list_MHz=2422,2427,2432,2437,2462,2467,2472"             "\x00"
+        "spurcan_sp_freq_KHz=9000,4000,-1000,-6000,6400,1400,-3600"          "\x00"
+        "spurcan_NumSpur=7"                                                  "\x00"
+        "epacal2g=0"                                                         "\x00"
+        "epacal5g=0"                                                         "\x00"
+        "papdcck=0"                                                          "\x00"
+        "epacal2g_mask=0x3fff"                                               "\x00"
+        "maxp2ga0=74"                                                        "\x00"
+        "ofdmlrbw202gpo=0x0020"                                              "\x00"
+        "dot11agofdmhrbw202gpo=0x6442"                                       "\x00"
+        "mcsbw202gpo=0xCC864420"                                             "\x00"
+        "maxp5ga0=70,70,70,70"                                               "\x00"
+        "mcsbw205glpo=0xCC864220"                                            "\x00"
+        "mcsbw205gmpo=0xCC864220"                                            "\x00"
+        "mcsbw205ghpo=0xCC864220"                                            "\x00"
+        "femctrlwar=0"                                                       "\x00"
+        "use5gpllfor2g=1"                                                    "\x00"
+        "pt5db_gaintbl=0"                                                    "\x00"
+        "muxenab=0x01"                                                       "\x00"
+        "txwbpapden=1"                                                       "\x00"
+        "wb_rxattn=0x0303"                                                   "\x00"
+        "wb_txattn=0x0203"                                                   "\x00"
+        "wb_papdcalidx=0x0808"                                               "\x00"
+        "wb_papdcalidx_5g=0x00101010"                                        "\x00"
+        "wb_eps_offset=0x01ba01a8"                                           "\x00"
+        "wb_eps_offset_5g=0x01ba01bc"                                        "\x00"
+        "wb_bbmult=0x2040"                                                   "\x00"
+        "wb_bbmult_5g=0x00303030"                                            "\x00"
+        "wb_calref_db=0x1c2e"                                                "\x00"
+        "wb_tia_gain_mode=0x0606"                                            "\x00"
+        "wb_txbuf_offset=0x1e1e"                                             "\x00"
+        "wb_frac_del=0x6991"                                                 "\x00"
+        "wb_g_frac_bits=0xab"                                                "\x00"
+        "nb_rxattn=0x0404"                                                   "\x00"
+        "nb_txattn=0x0404"                                                   "\x00"
+        "nb_papdcalidx=0x1414"                                               "\x00"
+        "nb_eps_offset=0x01d701d7"                                           "\x00"
+        "nb_bbmult=0x5A5A"                                                   "\x00"
+        "nb_tia_gain_mode=0x0000"                                            "\x00"
+        "AvVmid_c0=6,100,7,70,7,70,7,70,7,70"                                "\x00"
+        "tssisleep_en=0x5"                                                   "\x00"
+        "lpflags=0x0"                                                        "\x00"
+        "lpo_select=4"                                                       "\x00"
+        "paprrmcsgamma2g=450,500,550,600,675,950,950,950,950,950,950,950"    "\x00"
+        "paprrmcsgamma5g20=450,500,550,600,800,950,1100,1100,1100,1100,1100,1100""\x00"
+        "swdiv_en=0"/*ToenableSW-DIVfeature*/                                   "\x00"
+        "swdiv_gpio=0"                                                       "\x00"
+        "swdiv_swctrl_en=2"                                                  "\x00"
+        "swdiv_swctrl_ant0=0"                                                "\x00"
+        "swdiv_swctrl_ant1=1"                                                "\x00"
+        "swdiv_antmap2g_main=1"                                              "\x00"
+        "swdiv_antmap5g_main=1"                                              "\x00"
+        "swdiv_snrlim=10000"/*Onlyenablesw_divifthesnronpresentantennaislessthan10000/8=1250*/"\x00"
+        "swdiv_thresh=3000"/*No.ofrxpktsthreshold*/                             "\x00"
+        "swdiv_snrthresh=24"/*Differencebetweenantenna'ssnrisgreaterthan24/8=3dB,thenshifttheantennas*/"\x00"
+        "lhlgpio_cfg=0x00000020,0x00000000"                                  "\x00"
+        "\x00\x00";
+
+#ifdef __cplusplus
+} /*extern "C" */
+#endif
+
+#else /* ifndef INCLUDED_NVRAM_IMAGE_H_ */
+#error Wi-Fi NVRAM image included twice
+#endif /* ifndef INCLUDED_NVRAM_IMAGE_H_ */