Merge pull request #14062 from dustin-crossman/pr/dec_asset_update

Cypress Asset Update

Author: 0xc0170

targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_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:6f:b2:ea"
+#define NVRAM_GENERATED_MAC_ADDRESS        "macaddr=00:A0:50:08:ab:72"

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

@@ -1,3 +1,3 @@
-#define WHD_VERSION "v1.91.2"
-#define WHD_BRANCH "v1.91.2"
-#define WHD_DATE "2020-06-25 02:15:47 -0500"
+#define WHD_VERSION "v1.92.0"
+#define WHD_BRANCH "v1.92.0"
+#define WHD_DATE "2020-09-25 03:12:36 -0500"

targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_43012/43012C0-mfgtest.bin

@@ -18,9 +18,9 @@
 #if defined(CY_STORAGE_WIFI_DATA)
 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, 118, 196, 112, 169, 1, 0, 0, 0, 2, 0, 0,
-        0, 0, 0, 0, 0, 60, 0, 0, 0, 209, 29, 0, 0, 236, 81, 84, 207, 0, 0, 0,
+const unsigned char wifi_firmware_clm_blob_data[7697] = {
+        66, 76, 79, 66, 60, 0, 0, 0, 227, 75, 186, 247, 1, 0, 0, 0, 2, 0, 0,
+        0, 0, 0, 0, 0, 60, 0, 0, 0, 209, 29, 0, 0, 79, 39, 210, 178, 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, 46,
@@ -257,7 +257,7 @@ const unsigned char wifi_firmware_clm_blob_image_data[7697] = {
         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, 50, 48, 45,
-        48, 49, 45, 50, 55, 32, 50, 49, 58, 53, 52, 58, 51, 51, 0, 0, 3, 0,
+        48, 57, 45, 48, 57, 32, 48, 49, 58, 49, 57, 58, 48, 51, 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,
@@ -423,5 +423,5 @@ const unsigned char wifi_firmware_clm_blob_image_data[7697] = {
         1, 0, 0, 0, 116, 13, 0, 0, 3, 0, 0, 0, 148, 14, 0, 0, 2, 2, 2, 2, 2,
         2, 2, 2, 2, 50, 50, 50, 114, 50, 163, 114, 163, 4, 168, 0, 0
 };
-const resource_hnd_t wifi_firmware_clm_blob = { RESOURCE_IN_MEMORY, 7697, {.mem = { (const char *) wifi_firmware_clm_blob_image_data }}};
+const resource_hnd_t wifi_firmware_clm_blob = { RESOURCE_IN_MEMORY, 7697, {.mem = { (const char *) wifi_firmware_clm_blob_data }}};
 

targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_43012/43012C0-mfgtest.clm_blob

@@ -20,12 +20,12 @@
 #include "wiced_resource.h"
 
 extern const resource_hnd_t wifi_firmware_image;
-extern const unsigned char wifi_firmware_image_data[414712];
+extern const unsigned char wifi_firmware_image_data[444199];
 extern const resource_hnd_t wifi_firmware_clm_blob;
-extern const unsigned char wifi_firmware_clm_blob_image_data[7697];
+extern const unsigned char wifi_firmware_clm_blob_data[7697];
 extern const resource_hnd_t wifi_mfg_firmware_image;
-extern const unsigned char wifi_mfg_firmware_image_data[495320];
+extern const unsigned char wifi_mfg_firmware_image_data[487520];
 extern const resource_hnd_t wifi_mfg_firmware_clm_blob;
-extern const unsigned char wifi_mfg_firmware_clm_blob_image_data[7697];
+extern const unsigned char wifi_mfg_firmware_clm_blob_data[7697];
 
 #endif /* ifndef INCLUDED_RESOURCES_H_ */

targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_43012/43012C0-mfgtest_bin.c

@@ -0,0 +1,31 @@
+/*
+ * 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.
+ */
+/* Automatically generated file - this comment ensures resources.h file creation */
+/* Auto-generated header file. Do not edit */
+#ifndef INCLUDED_RESOURCES_H_
+#define INCLUDED_RESOURCES_H_
+#include "wiced_resource.h"
+
+extern const resource_hnd_t wifi_firmware_image;
+extern const unsigned char wifi_firmware_image_data[556559];
+extern const resource_hnd_t wifi_firmware_clm_blob;
+extern const unsigned char wifi_firmware_clm_blob_data[4684];
+extern const resource_hnd_t wifi_mfg_firmware_image;
+extern const unsigned char wifi_mfg_firmware_image_data[561035];
+extern const resource_hnd_t wifi_mfg_firmware_clm_blob;
+extern const unsigned char wifi_mfg_firmware_clm_blob_data[4684];
+
+#endif /* ifndef INCLUDED_RESOURCES_H_ */

targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_43012/43012C0-mfgtest_clm_blob.c

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: LicenseRef-PBL
  *
  * This file and the related binary are licensed under the
- * Permissive Binary License, Version 1.0 (the "License");
+ * 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:
@@ -27,11 +27,11 @@ extern "C" {
 
 /**
  * Character array of NVRAM image
- * Generated from cyw9cy8cmod-064b0s2-4343w_P100_724315.txt
+ * Generated from cyw9cy8cmod-064b0s2-4343w_P100.txt
  */
 
 static const char wifi_nvram_image[] =
-        "NVRAMRev=$Rev: 724315 $"                                            "\x00"
+        "NVRAMRev=$Rev$"                                                     "\x00"
         "manfid=0x2d0"                                                       "\x00"
         "prodid=0x087d"                                                      "\x00"
         "vendid=0x14e4"                                                      "\x00"
@@ -55,7 +55,7 @@ static const char wifi_nvram_image[] =
         "pa0itssit=0x20"                                                     "\x00"
         "extpagain2g=0"                                                      "\x00"
         ""                                                                   "\x00"
-        "pa2ga0=-168,6393,-757"                                              "\x00"
+        "pa2ga0=-168,6777,-788"                                              "\x00"
         "AvVmid_c0=0x0,0xc8"                                                 "\x00"
         "AvVmidIQcal=0x2,0xa8"                                               "\x00"
         "cckpwroffset0=5"                                                    "\x00"

targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_43012/43012C0.bin

@@ -0,0 +1,96 @@
+/*
+ * 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.
+ */
+
+#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 cyw9cy8cmod-064s0s2-4343w_P100.txt
+ */
+
+static const char wifi_nvram_image[] =
+        "NVRAMRev=$Rev$"                                                     "\x00"
+        "manfid=0x2d0"                                                       "\x00"
+        "prodid=0x088d"                                                      "\x00"
+        "vendid=0x14e4"                                                      "\x00"
+        "devid=0x43e2"                                                       "\x00"
+        "boardtype=0x088d"                                                   "\x00"
+        "boardrev=0x1100"                                                    "\x00"
+        "boardnum=22"                                                        "\x00"
+        NVRAM_GENERATED_MAC_ADDRESS                                          "\x00"
+        "sromrev=11"                                                         "\x00"
+        "boardflags=0x00404201"                                              "\x00"
+        "boardflags3=0x08000000"                                             "\x00"
+        "xtalfreq=37400"                                                     "\x00"
+        "nocrc=1"                                                            "\x00"
+        "ag0=255"                                                            "\x00"
+        "aa2g=1"                                                             "\x00"
+        "ccode=ALL"                                                          "\x00"
+        ""                                                                   "\x00"
+        "swdiv_en=1"                                                         "\x00"
+        "swdiv_gpio=2"                                                       "\x00"
+        ""                                                                   "\x00"
+        "pa0itssit=0x20"                                                     "\x00"
+        "extpagain2g=0"                                                      "\x00"
+        ""                                                                   "\x00"
+        "pa2ga0=-168,6777,-788"                                              "\x00"
+        "AvVmid_c0=0x0,0xc8"                                                 "\x00"
+        "AvVmidIQcal=0x2,0xa8"                                               "\x00"
+        "cckpwroffset0=5"                                                    "\x00"
+        ""                                                                   "\x00"
+        "maxp2ga0=84"                                                        "\x00"
+        "txpwrbckof=6"                                                       "\x00"
+        "cckbw202gpo=0"                                                      "\x00"
+        "legofdmbw202gpo=0x66111111"                                         "\x00"
+        "mcsbw202gpo=0x77711111"                                             "\x00"
+        "propbw202gpo=0xdd"                                                  "\x00"
+        ""                                                                   "\x00"
+        "ofdmdigfilttype=18"                                                 "\x00"
+        "ofdmdigfilttypebe=18"                                               "\x00"
+        "papdmode=1"                                                         "\x00"
+        "papdvalidtest=1"                                                    "\x00"
+        "pacalidx2g=32"                                                      "\x00"
+        "papdepsoffset=-36"                                                  "\x00"
+        "papdendidx=61"                                                      "\x00"
+        ""                                                                   "\x00"
+        ""                                                                   "\x00"
+        "wl0id=0x431b"                                                       "\x00"
+        ""                                                                   "\x00"
+        "deadman_to=0xffffffff"                                              "\x00"
+        "muxenab=0x11"                                                       "\x00"
+        ""                                                                   "\x00"
+        "spurconfig=0x3 "                                                    "\x00"
+        ""                                                                   "\x00"
+        "rssicorrnorm=1"                                                     "\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_ */