Update Azure RTOS to 6.1.11 (#332)

* Update Azure RTOS to 6.1.11

* Update libwiced_sdk_bin.a to switch to debug and add strip stage.

Co-authored-by: Ryan Winter <ryanwinter@outlook.com>

Author: TiejunMS

MXChip/AZ3166/app/CMakeLists.txt

@@ -36,7 +36,7 @@ target_include_directories(${PROJECT_NAME}
 
 target_link_directories(${PROJECT_NAME} 
     PUBLIC 
-       startup
+        startup
 )
 
 

MXChip/AZ3166/lib/wiced_sdk/CMakeLists.txt

@@ -1,7 +1,8 @@
 set(TARGET wiced_sdk)
 
 add_library(${TARGET}
-    STATIC IMPORTED GLOBAL)
+    STATIC IMPORTED GLOBAL
+)
 
 set_target_properties(${TARGET}
     PROPERTIES
@@ -10,5 +11,5 @@ set_target_properties(${TARGET}
 
 target_include_directories(${TARGET}
     INTERFACE
-        include
+        inc
 )

MXChip/AZ3166/lib/wiced_sdk/binary_build/CMakeLists.txt

@@ -5,22 +5,23 @@ cmake_minimum_required(VERSION 3.13)
 set(CMAKE_C_STANDARD 99)
 
 set(GSG_BASE_DIR ${CMAKE_SOURCE_DIR}/../../../../..)
-set(SHARED_LIB_DIR ${GSG_BASE_DIR}/core/lib)
+set(SHARED_SRC_DIR ${GSG_BASE_DIR}/shared/src)
+set(SHARED_LIB_DIR ${GSG_BASE_DIR}/shared/lib)
 
 # use the repo version of ninja on Windows as there is no Ninja installer
 if(WIN32)
     set(CMAKE_MAKE_PROGRAM ${GSG_BASE_DIR}/cmake/ninja CACHE STRING "Ninja location")
 endif()
 
-set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose the type of build, options are: Debug Release." FORCE)
-
 list(APPEND CMAKE_MODULE_PATH ${GSG_BASE_DIR}/cmake)
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/../../../cmake)
 
 project(wiced_sdk C)
 
 add_subdirectory(../.. MXCHIP_lib)
 
+set(TARGET wiced_sdk_bin)
+
 set(WICED_SDK_SRC
     src/43362A2_bin.c
     43xxx_Wi-Fi/platforms/BCM943362WCD6/platform.c
@@ -59,11 +60,10 @@ set(WICED_SDK_SRC
     43xxx_Wi-Fi/WICED/platform/MCU/STM32F4xx/peripherals/libraries/src/stm32f4xx_syscfg.c
 )
 
-set(TARGET wiced_sdk_bin)
-
 # Add a library with the above sources
-add_library(${TARGET} 
-    ${WICED_SDK_SRC})
+add_library(${TARGET}
+    ${WICED_SDK_SRC}
+)
 
 # Preprocessor macros
 target_compile_definitions(${TARGET}
@@ -78,45 +78,52 @@ target_compile_definitions(${TARGET}
 target_include_directories(${TARGET}
     PUBLIC
         inc
+        include
 
         43xxx_Wi-Fi/include
-        43xxx_Wi-Fi/WICED/RTOS/ThreadX/WWD
-        43xxx_Wi-Fi/WICED/platform/include
-        43xxx_Wi-Fi/WICED/platform/GCC
+        43xxx_Wi-Fi/libraries/inputs/gpio_button
+        43xxx_Wi-Fi/libraries/filesystems/wicedfs/src
+        43xxx_Wi-Fi/libraries/utilities/crc
+        43xxx_Wi-Fi/libraries/utilities/linked_list
+        43xxx_Wi-Fi/libraries/utilities/ring_buffer
+        43xxx_Wi-Fi/libraries/utilities/tlv
+        43xxx_Wi-Fi/libraries/utilities/wifi
+        43xxx_Wi-Fi/platforms/BCM943362WCD6
+        43xxx_Wi-Fi/WICED/network/NetX_Duo/WICED
+        43xxx_Wi-Fi/WICED/network/NetX_Duo/WWD
         43xxx_Wi-Fi/WICED/platform/ARM_CM4
         43xxx_Wi-Fi/WICED/platform/ARM_CM4/CMSIS
-        43xxx_Wi-Fi/WICED/WWD/include
-        43xxx_Wi-Fi/WICED/WWD/include/RTOS
-        43xxx_Wi-Fi/WICED/WWD/include/network
-        43xxx_Wi-Fi/WICED/WWD
-        43xxx_Wi-Fi/libraries/filesystems/wicedfs/src
+        43xxx_Wi-Fi/WICED/platform/GCC
+        43xxx_Wi-Fi/WICED/platform/include
         43xxx_Wi-Fi/WICED/platform/MCU
         43xxx_Wi-Fi/WICED/platform/MCU/STM32F4xx
-        43xxx_Wi-Fi/WICED/platform/MCU/STM32F4xx/peripherals/libraries
-        43xxx_Wi-Fi/platforms/BCM943362WCD6
-        43xxx_Wi-Fi/WICED/WWD/internal/chips/43362
-        43xxx_Wi-Fi/WICED/network/NetX_Duo/WWD
-        43xxx_Wi-Fi/WICED/network/NetX_Duo/WICED
-        43xxx_Wi-Fi/WICED/security/BESL/include
-        43xxx_Wi-Fi/WICED/security/BESL/host/WICED
-        43xxx_Wi-Fi/WICED/security/BESL/crypto_internal
-        43xxx_Wi-Fi/WICED/security/BESL/mbedtls_open/include
-        43xxx_Wi-Fi/WICED/WWD/internal/bus_protocols/SDIO
         43xxx_Wi-Fi/WICED/platform/MCU/STM32F4xx/peripherals
         43xxx_Wi-Fi/WICED/platform/MCU/STM32F4xx/peripherals/libraries
         43xxx_Wi-Fi/WICED/platform/MCU/STM32F4xx/peripherals/libraries/inc
-        43xxx_Wi-Fi/libraries/utilities/tlv
-        43xxx_Wi-Fi/libraries/utilities/wifi
-        43xxx_Wi-Fi/libraries/utilities/ring_buffer
-        43xxx_Wi-Fi/libraries/utilities/linked_list
-        43xxx_Wi-Fi/libraries/inputs/gpio_button
-        43xxx_Wi-Fi/WICED/security/PostgreSQL/include
-        43xxx_Wi-Fi/WICED/RTOS/ThreadX/WWD/CM3_CM4
         43xxx_Wi-Fi/WICED/RTOS/ThreadX/WICED
+        43xxx_Wi-Fi/WICED/RTOS/ThreadX/WWD
+        43xxx_Wi-Fi/WICED/RTOS/ThreadX/WWD/CM3_CM4
+        43xxx_Wi-Fi/WICED/security/BESL/crypto_internal
+        43xxx_Wi-Fi/WICED/security/BESL/host/WICED
+        43xxx_Wi-Fi/WICED/security/BESL/include
+        43xxx_Wi-Fi/WICED/security/PostgreSQL/include
+        43xxx_Wi-Fi/WICED/WWD
+        43xxx_Wi-Fi/WICED/WWD/include
+        43xxx_Wi-Fi/WICED/WWD/include/network
+        43xxx_Wi-Fi/WICED/WWD/include/RTOS
+        43xxx_Wi-Fi/WICED/WWD/internal
+        43xxx_Wi-Fi/WICED/WWD/internal/bus_protocols/SDIO
+        43xxx_Wi-Fi/WICED/WWD/internal/chips/43362
 )
 
 target_link_libraries(${TARGET}
     PRIVATE
         azrtos::threadx
         azrtos::netxduo
 )
+
+add_custom_target(${TARGET}.stripped ALL 
+    DEPENDS ${TARGET}
+    COMMAND ${CMAKE_STRIP} --strip-debug lib${TARGET}.a
+    COMMAND ${CMAKE_COMMAND} -E copy lib${TARGET}.a ../../lib/
+)

MXChip/AZ3166/lib/wiced_sdk/binary_build/inc/resources.h

@@ -0,0 +1,10 @@
+/* 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 resources_firmware_DIR_43362_DIR_43362A2_bin;
+extern const char resources_firmware_DIR_43362_DIR_43362A2_bin_data[213732];
+
+#endif /* ifndef INCLUDED_RESOURCES_H_ */

MXChip/AZ3166/lib/wiced_sdk/binary_build/rebuild.bat

@@ -8,7 +8,7 @@ cd /d %~dp0
 
 IF EXIST build (rd /S /Q build)
 
-cmake -Bbuild -GNinja -DCMAKE_TOOLCHAIN_FILE="../../../../../cmake/arm-gcc-cortex-m4.cmake"
+cmake -Bbuild -GNinja -DCMAKE_BUILD_TYPE="Debug" -DCMAKE_TOOLCHAIN_FILE="../../../../../cmake/arm-gcc-cortex-m4.cmake"
 cmake --build build
 
 IF %0 == "%~0" pause