Skip to content

[Telink] Update Zephyr version from 3.7.0 into 4.1.0 #38408

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 16 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/chef.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -131,9 +131,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 8f0b3c350ff99dce5569bf4879d322d3aa0a84fd"
- 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 4b909d41ac1af033bd99311172c6f2b1a625e59c"
- name: CI Examples Telink
shell: bash
run: |
Expand Down
10 changes: 6 additions & 4 deletions .github/workflows/examples-telink.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,9 @@ jobs:
with:
gh-context: ${{ toJson(github) }}

# - name: Update Zephyr version 3.7.0 (develop) to specific revision (for developers purpose)
# run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py 8f0b3c350ff99dce5569bf4879d322d3aa0a84fd"
- name: Update Zephyr version 4.1.0 (develop) to specific revision (for developers purpose)
run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py 4b909d41ac1af033bd99311172c6f2b1a625e59c"

- name: Build example Telink (B92 retention) Air Quality Sensor App
# Run test for master and s07641069 PRs
if: github.event.pull_request.number == null || github.event.pull_request.head.repo.full_name == 's07641069/connectedhomeip'
Expand Down Expand Up @@ -390,8 +391,9 @@ jobs:
with:
gh-context: ${{ toJson(github) }}

# - name: Update Zephyr version 3.3.0 (develop_3.3) to specific revision (for developers purpose)
# run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py dc28389d22e984b61715ea3c965605c247854cab"
- name: Update Zephyr version 3.3.0 (develop_3.3) to specific revision (for developers purpose)
run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py a39f1e8426453d37da8a1dd41e44efb8c7887d31"

- name: Build example Telink (B92 retention) Air Quality Sensor App
# Run test for master and s07641069 PRs
if: github.event.pull_request.number == null || github.event.pull_request.head.repo.full_name == 's07641069/connectedhomeip'
Expand Down
25 changes: 22 additions & 3 deletions config/telink/chip-module/Kconfig.defaults
Original file line number Diff line number Diff line change
Expand Up @@ -158,9 +158,6 @@ config BT_BUF_ACL_TX_SIZE
config BT_BUF_EVT_RX_COUNT
default 4

config BT_BUF_ACL_RX_COUNT
default 4

config BT_GATT_CACHING
default n

Expand Down Expand Up @@ -490,6 +487,28 @@ config MBEDTLS_HKDF_C
config MBEDTLS_X509_CSR_WRITE_C
bool "X.509 Certificate Signing Requests writing"
default y

config PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY
bool "PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY"
default y

#Disable PSA usage
config MBEDTLS_USE_PSA_CRYPTO
bool "MBEDTLS_USE_PSA_CRYPTO"
default n

config MBEDTLS_PSA_STATIC_KEY_SLOTS
bool "MBEDTLS_PSA_STATIC_KEY_SLOTS"
default n

config MBEDTLS_PSA_CRYPTO_C
bool "MBEDTLS_PSA_CRYPTO_C"
default n

config CHIP_CRYPTO_PSA
bool "CHIP_CRYPTO_PSA"
default n

endif # !ZEPHYR_VERSION_3_3

config GETOPT_LONG
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ RUN set -x \
&& zephyr-sdk-0.17.0/setup.sh -t riscv64-zephyr-elf \
&& : # last line

# Setup Zephyr version: 3.7.0; branch: develop
# Setup Zephyr version: 4.1.0; branch: develop
ARG ZEPHYR_REVISION=9a6804cde48f744fa33ce782d2f50453abc9a767
ARG N22_BIN_REVISION=05f9bcecde9df997a7d735ea119bb9a8212b8a8f
WORKDIR /opt/telink/zephyrproject
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,6 @@ NetworkCommissioning::WiFiScanResponse ToScanResponse(const wifi_scan_result * r

if (result != nullptr)
{
static_assert(sizeof(response.ssid) == sizeof(result->ssid), "SSID length mismatch");
static_assert(sizeof(response.bssid) == sizeof(result->mac), "BSSID length mismatch");

// TODO: Distinguish WPA versions
response.security.Set(result->security == WIFI_SECURITY_TYPE_PSK ? NetworkCommissioning::WiFiSecurity::kWpaPersonal
: NetworkCommissioning::WiFiSecurity::kUnencrypted);
Expand Down
Loading