From b75d3f37f218cd0cc193d79e2292e89b7411874e Mon Sep 17 00:00:00 2001 From: Haiwen Xia Date: Wed, 27 Nov 2024 19:52:39 +0800 Subject: [PATCH] riscv:telink: update commit id and nvs config. - update commit id for zephyr. - add NVS_RAM_OPTIMIZATION option. Signed-off-by: Haiwen Xia --- .github/workflows/chef.yaml | 6 +++--- .github/workflows/examples-telink.yaml | 4 ++-- config/telink/chip-module/Kconfig.defaults | 18 +++++++++++++++--- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/.github/workflows/chef.yaml b/.github/workflows/chef.yaml index c897952d45107c..a0b41aaf0651b4 100644 --- a/.github/workflows/chef.yaml +++ b/.github/workflows/chef.yaml @@ -109,9 +109,9 @@ jobs: uses: ./.github/actions/checkout-submodules-and-bootstrap with: platform: telink - # - name: Update Zephyr to specific revision (for developers purpose) - # shell: bash - # run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py 8b29ee6b118ebe6eeec3224dbe343474e11403d8" + - name: Update Zephyr to specific revision (for developers purpose) + shell: bash + run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py 1f90d4f87c4b36a3bb53edf4870585f42a943e3b" - name: CI Examples Telink shell: bash run: | diff --git a/.github/workflows/examples-telink.yaml b/.github/workflows/examples-telink.yaml index 1b6fd20aa72260..5f7cd9537942a0 100644 --- a/.github/workflows/examples-telink.yaml +++ b/.github/workflows/examples-telink.yaml @@ -57,8 +57,8 @@ jobs: with: gh-context: ${{ toJson(github) }} - # - name: Update Zephyr to specific revision (for developers purpose) - # run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py 8b29ee6b118ebe6eeec3224dbe343474e11403d8" + - name: Update Zephyr to specific revision (for developers purpose) + run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py 1f90d4f87c4b36a3bb53edf4870585f42a943e3b" - name: Build example Telink (B92 retention) Air Quality Sensor App # Run test for master and s07641069 PRs diff --git a/config/telink/chip-module/Kconfig.defaults b/config/telink/chip-module/Kconfig.defaults index 3503aae4000f06..ee452c0b664e1e 100644 --- a/config/telink/chip-module/Kconfig.defaults +++ b/config/telink/chip-module/Kconfig.defaults @@ -82,8 +82,9 @@ config SYSTEM_WORKQUEUE_STACK_SIZE config HEAP_MEM_POOL_SIZE default 256 +# need to enlarge to 21000 , to pass TC_RR_1.1 config COMMON_LIBC_MALLOC_ARENA_SIZE - default 20716 if SOC_RISCV_TELINK_TL321X || SOC_SERIES_RISCV_TELINK_B9X_RETENTION + default 21000 if SOC_RISCV_TELINK_TL321X || SOC_SERIES_RISCV_TELINK_B9X_RETENTION default 12288 config NET_IPV6_MLD @@ -256,9 +257,20 @@ config TELINK_SOC_REBOOT_ON_FAULT config NVS_LOOKUP_CACHE default y +# the nvs lookup cache size should be 2048 ,or the TC_RR1.0 will fail . config NVS_LOOKUP_CACHE_SIZE - default 400 if SOC_RISCV_TELINK_TL321X - default 2048 if !PM + default 2048 if SOC_RISCV_TELINK_TL321X + default 2048 if !PM + default 2048 + +config NVS_RAM_OPTIMIZATION + bool + default y if PM || SOC_RISCV_TELINK_TL321X + default n + +# test on newest based code, need to enlarge to 512 which can pass TC_RR_1.1 +config NVS_LOOKUP_CACHE_ARRAY_SIZE + default 512 if PM || SOC_RISCV_TELINK_TL321X # Set multiplicator of Name Value Storage (NVS) as 1 to reach NVS sector size 4KB # nvs_sector_size = flash_page_size * mult = 4KB * 1 = 4KB