[Telink] zephyr version change, cleanup

Changed MCUBOOT logs config
s07641069 · Dec 16, 2024 · b0f72df · b0f72df
1 parent c0b2a27
commit b0f72df
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 15 deletions.
diff --git a/.github/workflows/chef.yaml b/.github/workflows/chef.yaml
@@ -122,7 +122,7 @@ jobs:
                 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 a207b2cbc7d12de37d75b45b5025e8035bbc4bac"
+              run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py 7c5d3acfbeb25d115cfb6542616f0e7906b4c70a"
             - name: CI Examples Telink
               shell: bash
               run: |

diff --git a/.github/workflows/examples-telink.yaml b/.github/workflows/examples-telink.yaml
@@ -71,7 +71,7 @@ jobs:
                 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 a207b2cbc7d12de37d75b45b5025e8035bbc4bac"
+              run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py 7c5d3acfbeb25d115cfb6542616f0e7906b4c70a"
 
             - name: Build example Telink (B92 retention) Air Quality Sensor App
               # Run test for master and s07641069 PRs

diff --git a/config/telink/app/bootloader.conf b/config/telink/app/bootloader.conf
@@ -29,18 +29,15 @@ CONFIG_BOOT_SWAP_USING_SCRATCH=n
 # With disabled option the only image magic is validated
 CONFIG_BOOT_VALIDATE_SLOT0=y
 
-# Sets log level for modules which don't specify it explicitly.
-# When set to 0 it means log will not be activated for those modules.
-# Levels are:
-#  - 0 OFF, do not write by default
-#  - 1 ERROR, default to only write LOG_LEVEL_ERR
-#  - 2 WARNING, default to write LOG_LEVEL_WRN
-#  - 3 INFO, default to write LOG_LEVEL_INFO
-#  - 4 DEBUG, default to write LOG_LEVEL_DBG
-# CONFIG_LOG_DEFAULT_LEVEL=1
+# MCUBOOT log levels are:
+#  - OFF, LOG_LEVEL_ERR_OFF
+#  - ERROR,  LOG_LEVEL_ERR
+#  - WARNING,  LOG_LEVEL_WRN
+#  - INFO,  LOG_LEVEL_INF
+#  - DEBUG, LOG_LEVEL_DBG
+CONFIG_MCUBOOT_LOG_LEVEL_ERR=y
 
-# revert before merge (made to first run Jenkins)
-CONFIG_EXCEPTION_DEBUG=n # -1k 52282
-CONFIG_PICOLIBC=y # -1k 51270 B
-CONFIG_MCUBOOT_LOG_LEVEL_ERR=y # -2k 49266 B
+# TODO: revert before merge (made to first run Jenkins)
+CONFIG_EXCEPTION_DEBUG=n
+CONFIG_PICOLIBC=y
 CONFIG_GPIO=n