This is an automated email from the ASF dual-hosted git repository. vipulrahane pushed a commit to branch vipul/juul-master-steam-10-18-2023 in repository https://gitbox.apache.org/repos/asf/mynewt-core.git
commit bfac05b46f2d37b9a9c8a653e31d01998ad7e892 Author: Vipul Rahane <[email protected]> AuthorDate: Mon Sep 18 22:57:39 2023 -0700 - Add mbedtls dependency & fix merge 10/18/2023 & fix commit --- crypto/mbedtls/pkg.yml | 1 + hw/mcu/dialog/cmac/src/cmac_sleep.c | 2 +- hw/mcu/dialog/da1469x/syscfg.yml | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/crypto/mbedtls/pkg.yml b/crypto/mbedtls/pkg.yml index 4eb6fe3b8..5965fa553 100644 --- a/crypto/mbedtls/pkg.yml +++ b/crypto/mbedtls/pkg.yml @@ -35,6 +35,7 @@ pkg.include_dirs: - "include" - "@mbedtls/include" - "@mbedtls/library" + - "include/mbedtls" pkg.src_dirs: - "@mbedtls/library" diff --git a/hw/mcu/dialog/cmac/src/cmac_sleep.c b/hw/mcu/dialog/cmac/src/cmac_sleep.c index 1ed611ce3..5691bb2be 100644 --- a/hw/mcu/dialog/cmac/src/cmac_sleep.c +++ b/hw/mcu/dialog/cmac/src/cmac_sleep.c @@ -196,7 +196,7 @@ cmac_sleep_calculate_wakeup_time(void) * worst case. Finally, LLP compensation takes around 50us. */ T_LPTICK_U(2) + T_LPTICK_U(2) + - max(T_LPTICK_U(3), T_USEC(g_cmac_shared_data.xtal32m_settle_us)) + + max(T_LPTICK_U(3), T_USEC(g_cmac_shm_ctrl.xtal32m_settle_us)) + T_LPTICK(2) + T_USEC(50) + /* diff --git a/hw/mcu/dialog/da1469x/syscfg.yml b/hw/mcu/dialog/da1469x/syscfg.yml index 8e78f5d35..8105947a1 100644 --- a/hw/mcu/dialog/da1469x/syscfg.yml +++ b/hw/mcu/dialog/da1469x/syscfg.yml @@ -463,6 +463,7 @@ syscfg.defs: DA1469X_LPCLK_SYSINIT_STAGE: description: > 'Initalization stage for DA1469X' + value: 1 WATCHDOG_DISABLE_ON_INIT: description: >
