Pull request project-chip#1800: [Matter-2809]Update to GSDK 4.5.0

jepenven-silabs · jepenven-silabs · commit b2f0cf9625e0 · 2024-04-30T23:10:19.000Z
Merge in WMN_TOOLS/matter from feature/gsdk_update_dev_4.5.0 to silabs_slc_1.3

Squashed commit of the following:

commit 3296cf4a0195f387fd80df4b05d00630ea12a64f
Author: Jean-Francois Penven &lt;jean-francois.penven@silabs.com&gt;
Date:   Tue Apr 30 15:18:30 2024 -0400

    Apply comments

commit 21f2a006e3a0d3125da86f62ea0c70bbeba142f2
Author: Jean-Francois Penven &lt;jean-francois.penven@silabs.com&gt;
Date:   Tue Apr 30 08:41:53 2024 -0400

    Update to GSDK 4.5.0
diff --git a/.gitmodules b/.gitmodules
@@ -238,8 +238,8 @@
 	platforms = silabs,silabs_docker
 [submodule "third_party/silabs/gecko_sdk"]
 	path = third_party/silabs/gecko_sdk
-	url = https://github.com/SiliconLabs/gecko_sdk.git
-	branch = v4.4.1
+	url = https://stash.silabs.com/scm/embsw/gecko_sdk_release.git
+	branch = staging/2024.6/2024.6.0-build-1046
 	platforms = silabs
 [submodule "third_party/silabs/wiseconnect-wifi-bt-sdk"]
 	path = third_party/silabs/wiseconnect-wifi-bt-sdk
diff --git a/jenkins/jenkinsFunctions.groovy b/jenkins/jenkinsFunctions.groovy
@@ -11,15 +11,15 @@ def getThreadBoards(buildType='')
 {
     if (buildType == "FULL") {
         // Only A00 revision of BRD4319A is supported, enforced at generation time 
-        return ["BRD4186C", "BRD4187C", "BRD2703A", "BRD2704A", "BRD2601B",
+        return ["BRD4116A", "BRD4117A", "BRD4118A", "BRD4121A", "BRD4186C", "BRD4187C", "BRD2703A", "BRD2704A", "BRD2601B",
                 "BRD4316A", "BRD4317A", "BRD4319A", "BRD4337A", "BRD4318A"]     
     } 
     else if (buildType == "GBL")
     {
         return ["BRD4187C"]
     }
     else {
-        return ["BRD4187C", "BRD4316A", "BRD4337A"]
+        return ["BRD4121A", "BRD4187C", "BRD4316A", "BRD4337A"]
     } 
 }
 def getWifiBoards(buildType='')
@@ -35,19 +35,7 @@ def getWifiBoards(buildType='')
         return ["BRD4187C"]
     }
 }
-def getWifiMG12Boards(buildType='')
-{
-    if (buildType == "FULL") {
-        return ["BRD4161A", "BRD4162A", "BRD4163A", "BRD4164A", "BRD4170A",]
-    }
-    else if (buildType == "GBL")
-    {
-        return ["BRD4161A"]
-    }
-    else{
-        return ["BRD4161A"]
-    }
-}
+
 def getWifiSocBoards()
 {
     return ["BRD4338A"]
@@ -147,7 +135,7 @@ def getProtocol(ncp=""){
 }
 def getSeries(brd){
     seriesOneBoards = ["BRD4161A", "BRD4162A", "BRD4163A", "BRD4164A", "BRD4166A", "BRD4170A"]
-    seriesTwoBoards = ["BRD4186C", "BRD4187C", "BRD2703A", "BRD2704A", "BRD2601B", "BRD4316A", "BRD4317A", "BRD4318A","BRD4319A", "BRD4337A"]
+    seriesTwoBoards = ["BRD4116A", "BRD4117A", "BRD4118A", "BRD4121A", "BRD4186C", "BRD4187C", "BRD2703A", "BRD2704A", "BRD2601B", "BRD4316A", "BRD4317A", "BRD4318A","BRD4319A", "BRD4337A"]
     if(brd.toUpperCase() in seriesOneBoards){
         return "series-1"
     }
@@ -175,7 +163,6 @@ def testCopyContents(){
     appsToBuild += getBuildConfigs(board="BRD4187C", appName="lighting-app", otaVersion="", ncp = "",        configs = "--copy-sources", useWorkspace = false, additionalComponents = "")
     appsToBuild += getBuildConfigs(board="BRD4187C", appName="lighting-app", otaVersion="", ncp = "rs911x",  configs = "--copy-sources", useWorkspace = false, additionalComponents = "")
     appsToBuild += getBuildConfigs(board="BRD4338A", appName="lighting-app", otaVersion="", ncp = "917-soc", configs = "--copy-sources", useWorkspace = false, additionalComponents = "")
-    appsToBuild += getBuildConfigs(board="BRD4161A", appName="lighting-app", otaVersion="", ncp = "",        configs = "--copy-sources", useWorkspace = false, additionalComponents = "")
     appsToBuild += getBuildConfigs(board="BRD4187C", appName="lighting-app", otaVersion="", ncp = "wf200",   configs = "--copy-sources", useWorkspace = false, additionalComponents = "")
     slcBuild(appsToBuild, "Copy Contents")
 }
@@ -185,7 +172,6 @@ def buildNoDebugImages(){
     appsToBuild += getBuildConfigs(board="BRD4187C", appName="lighting-app", otaVersion="", ncp = "",       configs = componentsToRemove, useWorkspace = false, additionalComponents = ",matter_no_debug;matter")
     appsToBuild += getBuildConfigs(board="BRD4187C", appName="lock-app",     otaVersion="", ncp = "",       configs = componentsToRemove, useWorkspace = false, additionalComponents = ",matter_no_debug;matter")
     appsToBuild += getBuildConfigs(board="BRD4187C", appName="window-app",   otaVersion="", ncp = "",       configs = componentsToRemove, useWorkspace = false, additionalComponents = ",matter_no_debug;matter")
-    appsToBuild += getBuildConfigs(board="BRD4161A", appName="window-app",   otaVersion="", ncp = "",       configs = componentsToRemove, useWorkspace = false, additionalComponents = ",matter_no_debug;matter")
     appsToBuild += getBuildConfigs(board="BRD4187C", appName="lock-app",     otaVersion="", ncp = "rs911x", configs = componentsToRemove, useWorkspace = false, additionalComponents = ",matter_no_debug;matter")
     appsToBuild += getBuildConfigs(board="BRD4187C", appName="thermostat",   otaVersion="", ncp = "rs911x", configs = componentsToRemove, useWorkspace = false, additionalComponents = ",matter_no_debug;matter")
     slcBuild(appsToBuild, "No Debug")
@@ -499,7 +485,6 @@ def exportIoTReports()
         performCodeAnalysis("BRD4187C",  "lock-app",     "rs911x")
 
         performCodeAnalysis("BRD4187C",  "window-app",   "thread")
-        performCodeAnalysis("BRD4161A",  "window-app",   "thread")
 
         performCodeAnalysis("BRD4187C",  "thermostat",   "rs911x")
     }
@@ -931,7 +916,7 @@ def utfWiFiTestSuite(nomadNode,deviceGroup,testBedName,appName,matterType,board,
 def downloadGsdkSidePackage()
 {
     gsdkMajVer = pipelineMetadata.toolchain_info.gsdk.gsdkBranch.split("/")[1]
-    downloadUrl = "https://artifactory.silabs.net/artifactory/gsdk-generic-staging/" + gsdkMajVer + "/" + pipelineMetadata.toolchain_info.gsdk.gsdkTag.replaceAll("v", "") + "/side-packages/gsdk/gecko-platform-sqa.zip"
+    downloadUrl = "https://artifactory.silabs.net/artifactory/gsdk-generic-staging/" + gsdkMajVer + "/" + pipelineMetadata.toolchain_info.gsdk.gsdkTag.replaceAll("v", "") + "/side-packages/sisdk/gecko-platform-sqa.zip"
     gsdkSidePackage = "sidePackage.zip"
     
     withCredentials([usernameColonPassword(credentialsId: 'svc_gsdk', variable:'svc_gsdk')]){ 
diff --git a/matter.slce b/matter.slce
@@ -4,7 +4,7 @@ description: "Matter extension for Gecko SDK Suite"
 label: "Silicon Labs Matter"
 sdk:
   id: gecko_sdk
-  version: 4.4.2
+  version: 4.5.0
 upgrade_manifest:
   - path: upgrade.slcu
 component_path:
diff --git a/matter_docs.xml b/matter_docs.xml
@@ -3,8 +3,8 @@
   <contentItemData label="Matter Release Notes" itemURI="https://github.com/SiliconLabs/matter_extension/releases/tag/v2.2.1" category="Release Notes" priority="40">
     <property key="core.category" value="Release Notes"/>
     <property key="core.priority" value="40"/>
-    <property key="core.boardCompatibility" value="brd4161a brd4162a brd4163a brd4164a brd4166a brd4170a brd4186c brd4187c brd2601b brd2703a brd2704a brd4316a brd4317a brd4319a brd4338a"/>
-    <property key="core.partCompatibility" value=".*efr32mg12p.* .*efr32mg24.* .*mgm24.* .*siwg917m111mgtba.* .*siwg917m111mgtba.* .*siwg917m111mgtba.*"/>
+    <property key="core.boardCompatibility" value="brd4116a brd4117a brd4118a brd4121a brd4186c brd4187c brd2601b brd2703a brd2704a brd4316a brd4317a brd4319a brd4338a"/>
+    <property key="core.partCompatibility" value=".*efr32mg26.* .*efr32mg24.* .*mgm24.* .*siwg917m111mgtba.* .*siwg917m111mgtba.* .*siwg917m111mgtba.*"/>
     <property key="core.sdkAndProtocolTags" value="Matter"/>
     <description>Release Notes for the Silicon Labs Matter v2.2.1-1.2. These release notes provide information on the release including part compatibility, changes and added/deleted/deprecated features/API.</description>
   </contentItemData>
diff --git a/pipeline_metadata.yml b/pipeline_metadata.yml
@@ -8,10 +8,10 @@
     studioBranch: 'master'
     ucCliBranch: 'rel'
     gsdk:
-      gsdkBranch: 'staging/4.4/4.4.2-rc2'
+      gsdkBranch: 'staging/2024.6/2024.6.0-build-1046'
       browserUrl: 'https://stash.silabs.com/projects/embsw/repos/gecko_sdk_release/'
       gitUrl: 'ssh://git@stash.silabs.com/embsw/gecko_sdk_release.git'
-      gsdkTag: 'v4.4.2-rc2'
+      gsdkTag: 'v2024.6.0-build-1046'
     zap:
       zapBranch: 'master'
       browserUrl: 'https://stash.silabs.com/projects/WMN_TOOLS/repos/zap'
diff --git a/slc/component/matter-platform/bluetooth/matter_ble.slcc b/slc/component/matter-platform/bluetooth/matter_ble.slcc
@@ -7,16 +7,11 @@ quality: production
 requires:
   - name: matter_libblelayer
   - name: matter
-  - name: bluetooth_feature_gap
-  - name: bluetooth_feature_gatt
   - name: bluetooth_feature_gatt_server
-  - name: bluetooth_feature_nvm
-  - name: bluetooth_feature_sm
   - name: bluetooth_feature_legacy_advertiser
   - name: bluetooth_stack
   - name: bluetooth_feature_system
   - name: bluetooth_feature_connection
-  - name: bluetooth_crypto
   - name: matter_gatt
   
 provides:
diff --git a/slc/component/matter-platform/buttons/matter_buttons.slcc b/slc/component/matter-platform/buttons/matter_buttons.slcc
@@ -10,19 +10,13 @@ requires:
 # Every board that uses buttons
   - name: simple_button_recommended_instance
     condition:
-      - brd4161a
+      - brd4116a
   - name: simple_button_recommended_instance
     condition:
-      - brd4162a
+      - brd4117a  
   - name: simple_button_recommended_instance
     condition:
-      - brd4163a
-  - name: simple_button_recommended_instance
-    condition:
-      - brd4164a
-  - name: simple_button_recommended_instance
-    condition:
-      - brd4166a
+      - brd4121a
   - name: simple_button_recommended_instance
     condition:
       - brd4170b
diff --git a/slc/component/matter-platform/matter_platform_efr32.slcc b/slc/component/matter-platform/matter_platform_efr32.slcc
@@ -13,7 +13,6 @@ config_file:
 
 provides:
 - name: matter_platform_efr32
-- name: freertos_heap
 include:
 - path: examples/platform/silabs
   file_list:
@@ -22,42 +21,24 @@ include:
   - path: silabs_utils.h
   - path: LEDWidget.h
   - path: MatterConfig.h
-  - path: heap_4_silabs.h
   - path: OTAConfig.h
   - path: matter_shell.h
   - path: MemMonitoring.h
   - path: BaseApplication.h
   - path: SoftwareFaultReports.h
-  
+
 source:
 - path: examples/platform/silabs/BaseApplication.cpp
 - path: examples/platform/silabs/silabs_utils.cpp
-- path: examples/platform/silabs/heap_4_silabs.c
 - path: examples/platform/silabs/MatterConfig.cpp
 - path: examples/platform/silabs/SoftwareFaultReports.cpp
 - path: examples/platform/silabs/LEDWidget.cpp
 
 toolchain_settings:
-- option: gcc_linker_option
-  value: -Wl,--wrap=malloc
-- option: gcc_linker_option
-  value: -Wl,--wrap=free
-- option: gcc_linker_option
-  value: -Wl,--wrap=realloc
-- option: gcc_linker_option
-  value: -Wl,--wrap=calloc
 - option: gcc_linker_option
   value: -Wl,--wrap=MemoryAlloc
     # Wrap these in case internal newlib call them (e.g. strdup will)
     # directly call _malloc_r)
-- option: gcc_linker_option
-  value: -Wl,--wrap=_malloc_r
-- option: gcc_linker_option
-  value: -Wl,--wrap=_realloc_r
-- option: gcc_linker_option
-  value: -Wl,--wrap=_free_r
-- option: gcc_linker_option
-  value: -Wl,--wrap=_calloc_r
 
 requires:
   - name: matter_provision
@@ -78,4 +59,3 @@ requires:
   - name: rail_lib_multiprotocol
   - name: rail_util_pti
   - name: emlib
-    
diff --git a/slc/component/matter-platform/matter_platform_siwx917.slcc b/slc/component/matter-platform/matter_platform_siwx917.slcc
@@ -61,26 +61,10 @@ define:
 # TODO : should be removed after code clean-up.
   - name: BRD4325A
 toolchain_settings:
-  - option: gcc_linker_option
-    value: "-Wl,--wrap=malloc"
-  - option: gcc_linker_option
-    value: "-Wl,--wrap=free"
-  - option: gcc_linker_option
-    value: "-Wl,--wrap=realloc"
-  - option: gcc_linker_option
-    value: "-Wl,--wrap=calloc"
   - option: gcc_linker_option
     value: "-Wl,--wrap=MemoryAlloc"
     # Wrap these in case internal newlib call them (e.g. strdup will)
     # directly call _malloc_r)
-  - option: gcc_linker_option
-    value: "-Wl,--wrap=_malloc_r"
-  - option: gcc_linker_option
-    value: "-Wl,--wrap=_realloc_r"
-  - option: gcc_linker_option
-    value: "-Wl,--wrap=_free_r"
-  - option: gcc_linker_option
-    value: "-Wl,--wrap=_calloc_r"
 
   # flags for the SiWx917
   - option: gcc_compiler_option
diff --git a/slc/component/matter-platform/wstk-leds/matter_wstk_leds.slcc b/slc/component/matter-platform/wstk-leds/matter_wstk_leds.slcc
@@ -14,12 +14,19 @@ requires:
   - name: simple_led_recommended_instance
     condition:
       - device_family_efr32mg24
+  - name: simple_led_recommended_instance
+    condition:
+      - device_family_efr32mg26
   - name: simple_led_recommended_instance
     condition:
       - brd2704a
 
 define:
 # This should cover all supported boards that use LEDs
+  - name: ENABLE_WSTK_LEDS
+    value: "1"
+    condition:
+      - device_family_efr32mg26 
   - name: ENABLE_WSTK_LEDS
     value: "1"
     condition:
diff --git a/slc/component/matter.slcc b/slc/component/matter.slcc
@@ -18,8 +18,6 @@ toolchain_settings:
     value: -Wno-maybe-uninitialized
   - option: gcc_compiler_option
     value: -Wno-missing-field-initializers
-  - option: gcc_compiler_option
-    value: -Wno-unused-parameter
   - option: gcc_compiler_option
     value: -Wno-cast-function-type
   - option: gcc_compiler_option
diff --git a/slc/copy-extension.sh b/slc/copy-extension.sh
@@ -213,8 +213,6 @@ cp $GSDK_ROOT/platform/radio/wifi/wfx_fmac_driver/bus/sl_wfx_bus.h  $EXT_DIR/thi
 cp $GSDK_ROOT/platform/radio/wifi/wfx_fmac_driver/bus/sl_wfx_bus_spi.c  $EXT_DIR/third_party/silabs/gecko_sdk/platform/radio/wifi/wfx_fmac_driver/bus/
 cp $GSDK_ROOT/platform/radio/wifi/wfx_fmac_driver/bus/sl_wfx_bus.c  $EXT_DIR/third_party/silabs/gecko_sdk/platform/radio/wifi/wfx_fmac_driver/bus/
 cp -R $GSDK_ROOT/platform/radio/wifi/wfx_fmac_driver/config/brd2204a/  $EXT_DIR/third_party/silabs/gecko_sdk/platform/radio/wifi/wfx_fmac_driver/config/
-cp -R $GSDK_ROOT/platform/radio/wifi/wfx_fmac_driver/config/brd416Xa/  $EXT_DIR/third_party/silabs/gecko_sdk/platform/radio/wifi/wfx_fmac_driver/config/
-cp -R $GSDK_ROOT/platform/radio/wifi/wfx_fmac_driver/config/brd4321a/ $EXT_DIR/third_party/silabs/gecko_sdk/platform/radio/wifi/wfx_fmac_driver/config/
 cp $GSDK_ROOT/platform/radio/wifi/wfx_fmac_driver/config/sl_wfx*  $EXT_DIR/third_party/silabs/gecko_sdk/platform/radio/wifi/wfx_fmac_driver/config/
 cp -R $GSDK_ROOT/platform/radio/wifi/wfx_fmac_driver/firmware  $EXT_DIR/third_party/silabs/gecko_sdk/platform/radio/wifi/wfx_fmac_driver/
 cp -R $GSDK_ROOT/platform/radio/wifi/wfx_fmac_driver/pds $EXT_DIR/third_party/silabs/gecko_sdk/platform/radio/wifi/wfx_fmac_driver/
diff --git a/src/platform/silabs/CHIPMem-Platform.cpp b/src/platform/silabs/CHIPMem-Platform.cpp
@@ -52,6 +52,8 @@
 #include <cstring>
 #include <stdlib.h>
 
+#include "sl_memory_manager.h"
+
 #if CHIP_CONFIG_MEMORY_MGMT_PLATFORM
 
 extern "C" void memMonitoringTrackAlloc(void * ptr, size_t size);
@@ -104,7 +106,7 @@ void * MemoryAlloc(size_t size)
 {
     void * ptr;
     VERIFY_INITIALIZED();
-    ptr = pvPortMalloc(size);
+    ptr = malloc(size);
     trackAlloc(ptr, size);
     return ptr;
 }
@@ -113,7 +115,7 @@ void * MemoryAlloc(size_t size, bool isLongTermAlloc)
 {
     void * ptr;
     VERIFY_INITIALIZED();
-    ptr = pvPortMalloc(size);
+    ptr = malloc(size);
     trackAlloc(ptr, size);
     return ptr;
 }
@@ -122,7 +124,7 @@ void * MemoryCalloc(size_t num, size_t size)
 {
     VERIFY_INITIALIZED();
 
-    void * ptr = pvPortCalloc(num, size);
+    void * ptr = calloc(num, size);
     trackAlloc(ptr, size * num);
     return ptr;
 }
@@ -131,15 +133,15 @@ void * MemoryRealloc(void * p, size_t size)
 {
     VERIFY_INITIALIZED();
 
-    p = pvPortRealloc(p, size);
+    p = realloc(p, size);
     return p;
 }
 
 void MemoryFree(void * p)
 {
     VERIFY_INITIALIZED();
     trackFree(p, 0);
-    vPortFree(p);
+    free(p);
 }
 
 bool MemoryInternalCheckPointer(const void * p, size_t min_size)
@@ -150,6 +152,7 @@ bool MemoryInternalCheckPointer(const void * p, size_t min_size)
 } // namespace Platform
 } // namespace chip
 
+
 #ifdef BRD4325A
 extern "C" void memMonitoringTrackAlloc(void * ptr, size_t size) {}
 extern "C" void memMonitoringTrackFree(void * ptr, size_t size) {}
diff --git a/src/platform/silabs/DiagnosticDataProviderImpl.cpp b/src/platform/silabs/DiagnosticDataProviderImpl.cpp
diff --git a/third_party/silabs/gecko_sdk b/third_party/silabs/gecko_sdk

Original file line number	Diff line number	Diff line change
`@@ -11,15 +11,15 @@ def getThreadBoards(buildType='')`
`11`	`11`	`{`
`12`	`12`	`if (buildType == "FULL") {`
`13`	`13`	`// Only A00 revision of BRD4319A is supported, enforced at generation time`
`14`		`- return ["BRD4186C", "BRD4187C", "BRD2703A", "BRD2704A", "BRD2601B",`
	`14`	`+ return ["BRD4116A", "BRD4117A", "BRD4118A", "BRD4121A", "BRD4186C", "BRD4187C", "BRD2703A", "BRD2704A", "BRD2601B",`
`15`	`15`	`"BRD4316A", "BRD4317A", "BRD4319A", "BRD4337A", "BRD4318A"]`
`16`	`16`	`}`
`17`	`17`	`else if (buildType == "GBL")`
`18`	`18`	`{`
`19`	`19`	`return ["BRD4187C"]`
`20`	`20`	`}`
`21`	`21`	`else {`
`22`		`- return ["BRD4187C", "BRD4316A", "BRD4337A"]`
	`22`	`+ return ["BRD4121A", "BRD4187C", "BRD4316A", "BRD4337A"]`
`23`	`23`	`}`
`24`	`24`	`}`
`25`	`25`	`def getWifiBoards(buildType='')`
`@@ -35,19 +35,7 @@ def getWifiBoards(buildType='')`
`35`	`35`	`return ["BRD4187C"]`
`36`	`36`	`}`
`37`	`37`	`}`
`38`		`-def getWifiMG12Boards(buildType='')`
`39`		`-{`
`40`		`- if (buildType == "FULL") {`
`41`		`- return ["BRD4161A", "BRD4162A", "BRD4163A", "BRD4164A", "BRD4170A",]`
`42`		`- }`
`43`		`- else if (buildType == "GBL")`
`44`		`- {`
`45`		`- return ["BRD4161A"]`
`46`		`- }`
`47`		`- else{`
`48`		`- return ["BRD4161A"]`
`49`		`- }`
`50`		`-}`
	`38`	`+`
`51`	`39`	`def getWifiSocBoards()`
`52`	`40`	`{`
`53`	`41`	`return ["BRD4338A"]`
`@@ -147,7 +135,7 @@ def getProtocol(ncp=""){`
`147`	`135`	`}`
`148`	`136`	`def getSeries(brd){`
`149`	`137`	`seriesOneBoards = ["BRD4161A", "BRD4162A", "BRD4163A", "BRD4164A", "BRD4166A", "BRD4170A"]`
`150`		`- seriesTwoBoards = ["BRD4186C", "BRD4187C", "BRD2703A", "BRD2704A", "BRD2601B", "BRD4316A", "BRD4317A", "BRD4318A","BRD4319A", "BRD4337A"]`
	`138`	`+ seriesTwoBoards = ["BRD4116A", "BRD4117A", "BRD4118A", "BRD4121A", "BRD4186C", "BRD4187C", "BRD2703A", "BRD2704A", "BRD2601B", "BRD4316A", "BRD4317A", "BRD4318A","BRD4319A", "BRD4337A"]`
`151`	`139`	`if(brd.toUpperCase() in seriesOneBoards){`
`152`	`140`	`return "series-1"`
`153`	`141`	`}`
`@@ -175,7 +163,6 @@ def testCopyContents(){`
`175`	`163`	`appsToBuild += getBuildConfigs(board="BRD4187C", appName="lighting-app", otaVersion="", ncp = "", configs = "--copy-sources", useWorkspace = false, additionalComponents = "")`
`176`	`164`	`appsToBuild += getBuildConfigs(board="BRD4187C", appName="lighting-app", otaVersion="", ncp = "rs911x", configs = "--copy-sources", useWorkspace = false, additionalComponents = "")`
`177`	`165`	`appsToBuild += getBuildConfigs(board="BRD4338A", appName="lighting-app", otaVersion="", ncp = "917-soc", configs = "--copy-sources", useWorkspace = false, additionalComponents = "")`
`178`		`- appsToBuild += getBuildConfigs(board="BRD4161A", appName="lighting-app", otaVersion="", ncp = "", configs = "--copy-sources", useWorkspace = false, additionalComponents = "")`
`179`	`166`	`appsToBuild += getBuildConfigs(board="BRD4187C", appName="lighting-app", otaVersion="", ncp = "wf200", configs = "--copy-sources", useWorkspace = false, additionalComponents = "")`
`180`	`167`	`slcBuild(appsToBuild, "Copy Contents")`
`181`	`168`	`}`
`@@ -185,7 +172,6 @@ def buildNoDebugImages(){`
`185`	`172`	`appsToBuild += getBuildConfigs(board="BRD4187C", appName="lighting-app", otaVersion="", ncp = "", configs = componentsToRemove, useWorkspace = false, additionalComponents = ",matter_no_debug;matter")`
`186`	`173`	`appsToBuild += getBuildConfigs(board="BRD4187C", appName="lock-app", otaVersion="", ncp = "", configs = componentsToRemove, useWorkspace = false, additionalComponents = ",matter_no_debug;matter")`
`187`	`174`	`appsToBuild += getBuildConfigs(board="BRD4187C", appName="window-app", otaVersion="", ncp = "", configs = componentsToRemove, useWorkspace = false, additionalComponents = ",matter_no_debug;matter")`
`188`		`- appsToBuild += getBuildConfigs(board="BRD4161A", appName="window-app", otaVersion="", ncp = "", configs = componentsToRemove, useWorkspace = false, additionalComponents = ",matter_no_debug;matter")`
`189`	`175`	`appsToBuild += getBuildConfigs(board="BRD4187C", appName="lock-app", otaVersion="", ncp = "rs911x", configs = componentsToRemove, useWorkspace = false, additionalComponents = ",matter_no_debug;matter")`
`190`	`176`	`appsToBuild += getBuildConfigs(board="BRD4187C", appName="thermostat", otaVersion="", ncp = "rs911x", configs = componentsToRemove, useWorkspace = false, additionalComponents = ",matter_no_debug;matter")`
`191`	`177`	`slcBuild(appsToBuild, "No Debug")`
`@@ -499,7 +485,6 @@ def exportIoTReports()`
`499`	`485`	`performCodeAnalysis("BRD4187C", "lock-app", "rs911x")`
`500`	`486`
`501`	`487`	`performCodeAnalysis("BRD4187C", "window-app", "thread")`
`502`		`- performCodeAnalysis("BRD4161A", "window-app", "thread")`
`503`	`488`
`504`	`489`	`performCodeAnalysis("BRD4187C", "thermostat", "rs911x")`
`505`	`490`	`}`
`@@ -931,7 +916,7 @@ def utfWiFiTestSuite(nomadNode,deviceGroup,testBedName,appName,matterType,board,`
`931`	`916`	`def downloadGsdkSidePackage()`
`932`	`917`	`{`
`933`	`918`	`gsdkMajVer = pipelineMetadata.toolchain_info.gsdk.gsdkBranch.split("/")[1]`
`934`		`- downloadUrl = "https://artifactory.silabs.net/artifactory/gsdk-generic-staging/" + gsdkMajVer + "/" + pipelineMetadata.toolchain_info.gsdk.gsdkTag.replaceAll("v", "") + "/side-packages/gsdk/gecko-platform-sqa.zip"`
	`919`	`+ downloadUrl = "https://artifactory.silabs.net/artifactory/gsdk-generic-staging/" + gsdkMajVer + "/" + pipelineMetadata.toolchain_info.gsdk.gsdkTag.replaceAll("v", "") + "/side-packages/sisdk/gecko-platform-sqa.zip"`
`935`	`920`	`gsdkSidePackage = "sidePackage.zip"`
`936`	`921`
`937`	`922`	`withCredentials([usernameColonPassword(credentialsId: 'svc_gsdk', variable:'svc_gsdk')]){`
Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,8 @@`
`52`	`52`	`#include <cstring>`
`53`	`53`	`#include <stdlib.h>`
`54`	`54`
	`55`	`+#include "sl_memory_manager.h"`
	`56`	`+`
`55`	`57`	`#if CHIP_CONFIG_MEMORY_MGMT_PLATFORM`
`56`	`58`
`57`	`59`	`extern "C" void memMonitoringTrackAlloc(void * ptr, size_t size);`
`@@ -104,7 +106,7 @@ void * MemoryAlloc(size_t size)`
`104`	`106`	`{`
`105`	`107`	`void * ptr;`
`106`	`108`	`VERIFY_INITIALIZED();`
`107`		`- ptr = pvPortMalloc(size);`
	`109`	`+ ptr = malloc(size);`
`108`	`110`	`trackAlloc(ptr, size);`
`109`	`111`	`return ptr;`
`110`	`112`	`}`
`@@ -113,7 +115,7 @@ void * MemoryAlloc(size_t size, bool isLongTermAlloc)`
`113`	`115`	`{`
`114`	`116`	`void * ptr;`
`115`	`117`	`VERIFY_INITIALIZED();`
`116`		`- ptr = pvPortMalloc(size);`
	`118`	`+ ptr = malloc(size);`
`117`	`119`	`trackAlloc(ptr, size);`
`118`	`120`	`return ptr;`
`119`	`121`	`}`
`@@ -122,7 +124,7 @@ void * MemoryCalloc(size_t num, size_t size)`
`122`	`124`	`{`
`123`	`125`	`VERIFY_INITIALIZED();`
`124`	`126`
`125`		`- void * ptr = pvPortCalloc(num, size);`
	`127`	`+ void * ptr = calloc(num, size);`
`126`	`128`	`trackAlloc(ptr, size * num);`
`127`	`129`	`return ptr;`
`128`	`130`	`}`
`@@ -131,15 +133,15 @@ void * MemoryRealloc(void * p, size_t size)`
`131`	`133`	`{`
`132`	`134`	`VERIFY_INITIALIZED();`
`133`	`135`
`134`		`- p = pvPortRealloc(p, size);`
	`136`	`+ p = realloc(p, size);`
`135`	`137`	`return p;`
`136`	`138`	`}`
`137`	`139`
`138`	`140`	`void MemoryFree(void * p)`
`139`	`141`	`{`
`140`	`142`	`VERIFY_INITIALIZED();`
`141`	`143`	`trackFree(p, 0);`
`142`		`- vPortFree(p);`
	`144`	`+ free(p);`
`143`	`145`	`}`
`144`	`146`
`145`	`147`	`bool MemoryInternalCheckPointer(const void * p, size_t min_size)`
`@@ -150,6 +152,7 @@ bool MemoryInternalCheckPointer(const void * p, size_t min_size)`
`150`	`152`	`} // namespace Platform`
`151`	`153`	`} // namespace chip`
`152`	`154`
	`155`	`+`
`153`	`156`	`#ifdef BRD4325A`
`154`	`157`	`extern "C" void memMonitoringTrackAlloc(void * ptr, size_t size) {}`
`155`	`158`	`extern "C" void memMonitoringTrackFree(void * ptr, size_t size) {}`