Skip to content

Commit

Permalink
Pull request project-chip#903: Fix system time counter
Browse files Browse the repository at this point in the history
Merge in WMN_TOOLS/matter from fix/time_drift to RC_2.1.0-1.1

Squashed commit of the following:

commit e34404ff67f6c1219ef4cbf39e64fc2cc4084870
Author: Satya Naag Bollimpalli <[email protected]>
Date:   Wed Jun 21 11:02:30 2023 +0000

    Pull request project-chip#904: changing the unify git location from cph to stash

    Merge in WMN_TOOLS/matter from bugfix/matter-bridge-jenkins-unify-git-location-change to silabs_1.1

    Squashed commit of the following:

    commit 0b9db3c60485b21fbabcb6f592ea09ba8c1b6c36
    Author: sabollim <[email protected]>
    Date:   Wed Jun 21 09:45:37 2023 +0530

        changing the unify git location from bitbucket-cph to stash

    commit 0859339d2bf0f20ea0bb5acded2fd3b7459c10d8
    Author: sabollim <[email protected]>
    Date:   Wed Jun 21 09:24:07 2023 +0530

        changing the unify git location from cph to stash

commit 63dfc3f438d416645a07878859b8886ba6a3eafb
Author: Junior Martinez <[email protected]>
Date:   Tue Jun 20 21:27:25 2023 -0400

    update matter_support submodule hash

commit 889cfb413e47452e09c03b7b0ba88da313738a7a
Author: Junior Martinez <[email protected]>
Date:   Tue Jun 20 20:01:40 2023 -0400

    Always build tick_power_manager.c has we now how sleeptimer and power manager always on. Fix paths for segger system view debugging
  • Loading branch information
jmartinez-silabs committed Jul 4, 2023
1 parent dae4d20 commit cfef832
Showing 1 changed file with 10 additions and 12 deletions.
22 changes: 10 additions & 12 deletions third_party/silabs/efr32_sdk.gni
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,8 @@ template("efr32_sdk") {
"SL_COMPONENT_CATALOG_PRESENT=1",
"PLATFORM_HEADER=\"platform-header.h\"",
"USE_NVM3=1",
"SL_CATALOG_POWER_MANAGER_PRESENT",
"SL_CATALOG_SLEEPTIMER_PRESENT",

#"__STACK_SIZE=0",
]
Expand Down Expand Up @@ -304,9 +306,9 @@ template("efr32_sdk") {
if (use_system_view) {
_include_dirs += [
"${efr32_sdk_root}/util/third_party/segger/systemview/SEGGER",
"${efr32_sdk_root}/util/third_party/segger/systemview/Sample/FreeRTOSV10/Config/Cortex-M",
"${efr32_sdk_root}/util/third_party/segger/systemview/Sample/FreeRTOSV10",
"${efr32_sdk_root}/util/third_party/segger/systemview/Config/",
"${efr32_sdk_root}/util/third_party/segger/systemview/init/",
"${efr32_sdk_root}/util/third_party/segger/systemview/profiles/freertos_v10/",
]

defines += [ "SL_SYSTEM_VIEW=1" ]
Expand All @@ -327,8 +329,6 @@ template("efr32_sdk") {
if (enable_sleepy_device) {
defines += [
"CHIP_DEVICE_CONFIG_ENABLE_SED=1",
"SL_CATALOG_POWER_MANAGER_PRESENT",
"SL_CATALOG_SLEEPTIMER_PRESENT",
"SL_OT_IDLE_INTERVAL=${sl_ot_idle_interval_ms}",
"SL_OT_ACTIVE_INTERVAL=${sl_ot_active_interval_ms}",
"SL_ACTIVE_MODE_THRESHOLD=${sl_active_mode_threshold}",
Expand Down Expand Up @@ -541,6 +541,7 @@ template("efr32_sdk") {
"${efr32_sdk_root}/hardware/board/src/sl_board_control_gpio.c",
"${efr32_sdk_root}/hardware/board/src/sl_board_init.c",
"${efr32_sdk_root}/hardware/driver/configuration_over_swo/src/sl_cos.c",
"${efr32_sdk_root}/hardware/driver/configuration_over_swo/src/sl_cos.c",
"${efr32_sdk_root}/platform/CMSIS/RTOS2/Source/os_systick.c",
"${efr32_sdk_root}/platform/bootloader/api/btl_interface.c",
"${efr32_sdk_root}/platform/bootloader/api/btl_interface_storage.c",
Expand Down Expand Up @@ -620,6 +621,7 @@ template("efr32_sdk") {
"${efr32_sdk_root}/util/third_party/freertos/kernel/croutine.c",
"${efr32_sdk_root}/util/third_party/freertos/kernel/event_groups.c",
"${efr32_sdk_root}/util/third_party/freertos/kernel/list.c",
"${efr32_sdk_root}/util/third_party/freertos/kernel/portable/SiliconLabs/tick_power_manager.c",
"${efr32_sdk_root}/util/third_party/freertos/kernel/queue.c",
"${efr32_sdk_root}/util/third_party/freertos/kernel/stream_buffer.c",
"${efr32_sdk_root}/util/third_party/freertos/kernel/tasks.c",
Expand Down Expand Up @@ -749,8 +751,8 @@ template("efr32_sdk") {
if (use_system_view) {
sources += [
"${efr32_sdk_root}/util/third_party/segger/systemview/SEGGER/SEGGER_SYSVIEW.c",
"${efr32_sdk_root}/util/third_party/segger/systemview/Sample/FreeRTOSV10/Config/Cortex-M/SEGGER_SYSVIEW_Config_FreeRTOS.c",
"${efr32_sdk_root}/util/third_party/segger/systemview/Sample/FreeRTOSV10/SEGGER_SYSVIEW_FreeRTOS.c",
"${efr32_sdk_root}/util/third_party/segger/systemview/init/SEGGER_SYSVIEW_Init.c",
"${efr32_sdk_root}/util/third_party/segger/systemview/profiles/freertos_v10/SEGGER_SYSVIEW_FreeRTOS.c",
]
}

Expand All @@ -772,10 +774,6 @@ template("efr32_sdk") {
]
}

if (enable_sleepy_device) {
sources += [ "${efr32_sdk_root}/util/third_party/freertos/kernel/portable/SiliconLabs/tick_power_manager.c" ]
}

if (defined(enable_fem)) {
sources += [
"${efr32_sdk_root}/util/plugin/plugin-common/fem-control/fem-control.c",
Expand Down Expand Up @@ -923,6 +921,8 @@ template("efr32_sdk") {
"${efr32_sdk_root}/platform/Device/SiliconLabs/MGM24/Source/startup_mgm24.c",
"${efr32_sdk_root}/platform/Device/SiliconLabs/MGM24/Source/system_mgm24.c",
"${efr32_sdk_root}/platform/radio/rail_lib/plugin/fem_util/sl_fem_util.c",
"${efr32_sdk_root}/platform/radio/rail_lib/plugin/fem_util/sl_fem_util.c",
"${efr32_sdk_root}/platform/radio/rail_lib/plugin/rail_util_rssi/sl_rail_util_rssi.c",
"${efr32_sdk_root}/platform/security/sl_component/se_manager/src/sl_se_manager.c",
"${efr32_sdk_root}/platform/security/sl_component/se_manager/src/sl_se_manager_attestation.c",
"${efr32_sdk_root}/platform/security/sl_component/se_manager/src/sl_se_manager_cipher.c",
Expand Down Expand Up @@ -957,8 +957,6 @@ template("efr32_sdk") {
"${efr32_sdk_root}/platform/service/hfxo_manager/src/sl_hfxo_manager_hal_s2.c",
"${efr32_sdk_root}/util/third_party/freertos/kernel/portable/GCC/ARM_CM33_NTZ/non_secure/port.c",
"${efr32_sdk_root}/util/third_party/freertos/kernel/portable/GCC/ARM_CM33_NTZ/non_secure/portasm.c",

#"${efr32_sdk_root}/platform/radio/rail_lib/plugin/rail_util_rssi/sl_rail_util_rssi.c",
]
}

Expand Down

0 comments on commit cfef832

Please sign in to comment.