Skip to content
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.

Sign up for GitHub

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

[Telink] zephyr versions compatibility changes #382

Draft
wants to merge 2 commits into
base: update_zephyr_3.7
Choose a base branch
from
Draft

[Telink] zephyr versions compatibility changes #382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
992afd0
[Telink] zephyr versions compatibility changes
s07641069 Feb 5, 2025
0a9cdba
[Telink] Change Window Covering App default SoC
s07641069 Feb 6, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/chef.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 4f721330d76c861f5a6b0f2ebea16d70916dc87e"
run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py 2cffe43322a15f1119a5ddea7a2c3c1e7ae50005"
- name: CI Examples Telink
shell: bash
run: |
Expand Down
50 changes: 25 additions & 25 deletions .github/workflows/examples-telink.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 4f721330d76c861f5a6b0f2ebea16d70916dc87e"
run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py 2cffe43322a15f1119a5ddea7a2c3c1e7ae50005"

- name: Build example Telink (B92 retention) Air Quality Sensor App
# Run test for master and s07641069 PRs
Expand Down Expand Up @@ -115,14 +115,14 @@ jobs:
- name: clean out build output
run: rm -rf ./out

- name: Build example Telink (TL7218) Bridge App
- name: Build example Telink (tl721x) Bridge App
# Run test for master and all PRs
run: |
./scripts/run_in_build_env.sh \
"./scripts/build/build_examples.py --target 'telink-tl7218-bridge' build"
"./scripts/build/build_examples.py --target 'telink-tl7218x-bridge' build"
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
telink tl7218 bridge-app \
out/telink-tl7218-bridge/zephyr/zephyr.elf \
telink tl7218x bridge-app \
out/telink-tl7218x-bridge/zephyr/zephyr.elf \
/tmp/bloat_reports/

- name: clean out build output
Expand Down Expand Up @@ -178,40 +178,40 @@ jobs:
- name: clean out build output (keep tools)
run: rm -rf ./out/telink*

- name: Build example Telink (TL3218) Lighting App with OTA, Factory Data
- name: Build example Telink (tl321x) Lighting App with OTA, Factory Data
# Run test for master and all PRs
run: |
./scripts/run_in_build_env.sh \
"./scripts/build/build_examples.py --target 'telink-tl3218-light-ota-factory-data' build"
"./scripts/build/build_examples.py --target 'telink-tl3218x-light-ota-factory-data' build"
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
telink tl3218 light-app-ota-factory-data \
out/telink-tl3218-light-ota-factory-data/zephyr/zephyr.elf \
telink tl3218x light-app-ota-factory-data \
out/telink-tl3218x-light-ota-factory-data/zephyr/zephyr.elf \
/tmp/bloat_reports/

- name: clean out build output (keep tools)
run: rm -rf ./out/telink*

- name: Build example Telink (TL7218) Lighting App with OTA, Shell, Factory Data
- name: Build example Telink (tl721x) Lighting App with OTA, Shell, Factory Data
# Run test for master and all PRs
run: |
./scripts/run_in_build_env.sh \
"./scripts/build/build_examples.py --target 'telink-tl7218-light-ota-shell-factory-data' build"
"./scripts/build/build_examples.py --target 'telink-tl7218x-light-ota-shell-factory-data' build"
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
telink tl7218 light-app-ota-shell-factory-data \
out/telink-tl7218-light-ota-shell-factory-data/zephyr/zephyr.elf \
telink tl7218x light-app-ota-shell-factory-data \
out/telink-tl7218x-light-ota-shell-factory-data/zephyr/zephyr.elf \
/tmp/bloat_reports/

- name: clean out build output (keep tools)
run: rm -rf ./out/telink*

- name: Build example Telink (TL7218 retention) Light Switch App with OTA (LZMA), Factory Data
- name: Build example Telink (tl721x retention) Light Switch App with OTA (LZMA), Factory Data
# Run test for master and all PRs
run: |
./scripts/run_in_build_env.sh \
"./scripts/build/build_examples.py --target 'telink-tl7218_retention-light-switch-ota-compress-lzma-factory-data' build"
"./scripts/build/build_examples.py --target 'telink-tl7218x_retention-light-switch-ota-compress-lzma-factory-data' build"
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
telink tl7218_retention light-switch-app-ota-compress-lzma-factory-data \
out/telink-tl7218_retention-light-switch-ota-compress-lzma-factory-data/zephyr/zephyr.elf \
telink tl7218x_retention light-switch-app-ota-compress-lzma-factory-data \
out/telink-tl7218x_retention-light-switch-ota-compress-lzma-factory-data/zephyr/zephyr.elf \
/tmp/bloat_reports/

- name: clean out build output (keep tools)
Expand Down Expand Up @@ -244,15 +244,15 @@ jobs:
- name: clean out build output
run: rm -rf ./out

- name: Build example Telink (TL3218) OTA Requestor App
- name: Build example Telink (tl321x) OTA Requestor 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'
run: |
./scripts/run_in_build_env.sh \
"./scripts/build/build_examples.py --target 'telink-tl3218-ota-requestor' build"
"./scripts/build/build_examples.py --target 'telink-tl3218x-ota-requestor' build"
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
telink tl3218 ota-requestor-app \
out/telink-tl3218-ota-requestor/zephyr/zephyr.elf \
telink tl3218x ota-requestor-app \
out/telink-tl3218x-ota-requestor/zephyr/zephyr.elf \
/tmp/bloat_reports/

- name: clean out build output
Expand Down Expand Up @@ -342,15 +342,15 @@ jobs:
- name: clean out build output
run: rm -rf ./out

- name: Build example Telink (W91) Window Covering App
- name: Build example Telink (tl721x) Window Covering 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'
run: |
./scripts/run_in_build_env.sh \
"./scripts/build/build_examples.py --target 'telink-tlsr9118bdk40d-window-covering' build"
"./scripts/build/build_examples.py --target 'telink-tl7218x-window-covering' build"
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
telink tlsr9118bdk40d window-covering \
out/telink-tlsr9118bdk40d-window-covering/zephyr/zephyr.elf \
telink tl7218x window-covering \
out/telink-tl7218x-window-covering/zephyr/zephyr.elf \
/tmp/bloat_reports/

- name: clean out build output
Expand Down
6 changes: 3 additions & 3 deletions config/telink/chip-module/Kconfig.defaults
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,12 +207,12 @@ config PWM

endif

if BOARD_TL7218_RETENTION || BOARD_TL3218_RETENTION || BOARD_TL3218
if BOARD_TL7218X_RETENTION || BOARD_TL3218X_RETENTION || BOARD_TL3218X
config SOC_SERIES_RISCV_TELINK_TLX_NON_RETENTION_RAM_CODE
default n if PM

config TELINK_TLX_MATTER_RETENTION_LAYOUT
default y if PM || BOARD_TL3218
default y if PM || BOARD_TL3218X

config PWM
default n if PM
Expand All @@ -221,7 +221,7 @@ endif

# Board non-retention config
if BOARD_TLSR9118BDK40D || BOARD_TLSR9118BDK40D_V1 || \
BOARD_TLSR9528A || BOARD_TLSR9518ADK80D || BOARD_TL3218 || BOARD_TL7218
BOARD_TLSR9528A || BOARD_TLSR9518ADK80D || BOARD_TL3218X || BOARD_TL7218X
config PWM
default y
endif
Expand Down
2 changes: 1 addition & 1 deletion examples/window-app/telink/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,4 @@ CONFIG_CHIP_FACTORY_DATA_BUILD=n
CONFIG_CHIP_FACTORY_DATA_MERGE_WITH_FIRMWARE=n

# Enable Power Management
CONFIG_PM=n
CONFIG_PM=y
6 changes: 3 additions & 3 deletions scripts/build/build/targets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -778,9 +778,9 @@ def BuildTelinkTarget():
TargetPart('tlsr9518adk80d', board=TelinkBoard.TLSR9518ADK80D),
TargetPart('tlsr9528a', board=TelinkBoard.TLSR9528A),
TargetPart('tlsr9528a_retention', board=TelinkBoard.TLSR9528A_RETENTION),
TargetPart('tl3218', board=TelinkBoard.TL3218),
TargetPart('tl7218', board=TelinkBoard.TL7218),
TargetPart('tl7218_retention', board=TelinkBoard.TL7218_RETENTION),
TargetPart('tl3218x', board=TelinkBoard.TL3218X),
TargetPart('tl7218x', board=TelinkBoard.TL7218X),
TargetPart('tl7218x_retention', board=TelinkBoard.TL7218X_RETENTION),
])

target.AppendFixedTargets([
Expand Down
18 changes: 9 additions & 9 deletions scripts/build/builders/telink.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,9 @@ class TelinkBoard(Enum):
TLSR9518ADK80D = auto()
TLSR9528A = auto()
TLSR9528A_RETENTION = auto()
TL3218 = auto()
TL7218 = auto()
TL7218_RETENTION = auto()
TL3218X = auto()
TL7218X = auto()
TL7218X_RETENTION = auto()

def GnArgName(self):
if self == TelinkBoard.TLRS9118BDK40D:
Expand All @@ -132,12 +132,12 @@ def GnArgName(self):
return 'tlsr9528a'
elif self == TelinkBoard.TLSR9528A_RETENTION:
return 'tlsr9528a_retention'
elif self == TelinkBoard.TL3218:
return 'tl3218'
elif self == TelinkBoard.TL7218:
return 'tl7218'
elif self == TelinkBoard.TL7218_RETENTION:
return 'tl7218_retention'
elif self == TelinkBoard.TL3218X:
return 'tl3218x'
elif self == TelinkBoard.TL7218X:
return 'tl7218x'
elif self == TelinkBoard.TL7218X_RETENTION:
return 'tl7218x_retention'
else:
raise Exception('Unknown board type: %r' % self)

Expand Down
2 changes: 1 addition & 1 deletion scripts/build/testdata/all_targets_linux_x64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ nuttx-x64-light
qpg-qpg6105-{lock,light,shell,persistent-storage,light-switch,thermostat}[-updateimage]
stm32-stm32wb5mm-dk-light
tizen-arm-{all-clusters,chip-tool,light,tests}[-no-ble][-no-thread][-no-wifi][-asan][-ubsan][-coverage][-with-ui]
telink-{tlsr9118bdk40d,tlsr9518adk80d,tlsr9528a,tlsr9528a_retention,tl3218,tl7218,tl7218_retention}-{air-quality-sensor,all-clusters,all-clusters-minimal,bridge,contact-sensor,light,light-switch,lock,ota-requestor,pump,pump-controller,shell,smoke-co-alarm,temperature-measurement,thermostat,window-covering}[-ota][-dfu][-shell][-rpc][-factory-data][-4mb][-mars][-usb][-compress-lzma][-thread-analyzer]
telink-{tlsr9118bdk40d,tlsr9518adk80d,tlsr9528a,tlsr9528a_retention,tl3218x,tl7218x,tl7218x_retention}-{air-quality-sensor,all-clusters,all-clusters-minimal,bridge,contact-sensor,light,light-switch,lock,ota-requestor,pump,pump-controller,shell,smoke-co-alarm,temperature-measurement,thermostat,window-covering}[-ota][-dfu][-shell][-rpc][-factory-data][-4mb][-mars][-usb][-compress-lzma][-thread-analyzer]
openiotsdk-{shell,lock}[-mbedtls][-psa]
0 src/platform/telink/tl3218_2m_flash.overlay → src/platform/telink/tl3218x_2m_flash.overlay
View file
Open in desktop
File renamed without changes.
0 src/platform/telink/tl7218_2m_flash.overlay → src/platform/telink/tl7218x_2m_flash.overlay
View file
Open in desktop
File renamed without changes.
Loading