From 12bbd6c9be2dcc2dfee7e61a43f0cbebcbd0a190 Mon Sep 17 00:00:00 2001 From: Doru Gucea Date: Tue, 5 Apr 2022 02:28:04 -0700 Subject: [PATCH] FIx Signed-off-by: Doru Gucea --- .github/workflows/examples-k32w.yaml | 2 +- scripts/build/build/targets.py | 2 +- scripts/build/builders/k32w.py | 7 ++++++- scripts/build/testdata/all_targets_except_host.txt | 2 +- scripts/build/testdata/build_all_except_host.txt | 8 ++++---- 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.github/workflows/examples-k32w.yaml b/.github/workflows/examples-k32w.yaml index a84055e220bb87..91ca49a9482b03 100644 --- a/.github/workflows/examples-k32w.yaml +++ b/.github/workflows/examples-k32w.yaml @@ -70,7 +70,7 @@ jobs: run: | scripts/run_in_build_env.sh "\ ./scripts/build/build_examples.py \ - --target k32w-light-ota \ + --target k32w-light-ota-se \ --target k32w-light-release-no-ota \ --target k32w-lock-low-power-release \ --target k32w-shell-release \ diff --git a/scripts/build/build/targets.py b/scripts/build/build/targets.py index 521c10690cf3c5..de3e94538ade28 100644 --- a/scripts/build/build/targets.py +++ b/scripts/build/build/targets.py @@ -460,7 +460,7 @@ def AmebaTargets(): def K32WTargets(): target = Target('k32w', K32WBuilder) - yield target.Extend('light-ota', app=K32WApp.LIGHT, release=True, disable_ble=True).GlobBlacklist("Only on demand build") + yield target.Extend('light-ota-se', app=K32WApp.LIGHT, release=True, disable_ble=True, se05x=True).GlobBlacklist("Only on demand build") yield target.Extend('light-release-no-ota', app=K32WApp.LIGHT, tokenizer=True, disable_ota=True, release=True) yield target.Extend('shell-release', app=K32WApp.SHELL, release=True) yield target.Extend('lock-release', app=K32WApp.LOCK, release=True) diff --git a/scripts/build/builders/k32w.py b/scripts/build/builders/k32w.py index 00d00d2fc773e4..12fa239d692961 100644 --- a/scripts/build/builders/k32w.py +++ b/scripts/build/builders/k32w.py @@ -57,7 +57,8 @@ def __init__(self, low_power: bool = False, tokenizer: bool = False, disable_ble: bool = False, - disable_ota: bool = False): + disable_ota: bool = False, + se05x: bool = False): super(K32WBuilder, self).__init__( root=app.BuildRoot(root), runner=runner) @@ -68,6 +69,7 @@ def __init__(self, self.release = release self.disable_ble = disable_ble self.disable_ota = disable_ota + self.se05x = se05x def GnBuildArgs(self): args = [ @@ -91,6 +93,9 @@ def GnBuildArgs(self): if self.disable_ota: args.append('chip_enable_ota_requestor=false') + if self.se05x: + args.append('chip_with_se05x=0=true') + return args def generate(self): diff --git a/scripts/build/testdata/all_targets_except_host.txt b/scripts/build/testdata/all_targets_except_host.txt index 365d40bc66f398..a25205367182fa 100644 --- a/scripts/build/testdata/all_targets_except_host.txt +++ b/scripts/build/testdata/all_targets_except_host.txt @@ -152,7 +152,7 @@ esp32-qemu-tests infineon-p6-all-clusters infineon-p6-light infineon-p6-lock -k32w-light-ota (NOGLOB: Only on demand build) +k32w-light-ota-se (NOGLOB: Only on demand build) k32w-light-release-no-ota k32w-lock-low-power-release (NOGLOB: Only on demand build) k32w-lock-release diff --git a/scripts/build/testdata/build_all_except_host.txt b/scripts/build/testdata/build_all_except_host.txt index 62676fcb6c84d9..81ae8a8de857b0 100644 --- a/scripts/build/testdata/build_all_except_host.txt +++ b/scripts/build/testdata/build_all_except_host.txt @@ -700,8 +700,8 @@ gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/exa {root}/third_party/nxp/k32w0_sdk/sdk_fixes/patch_k32w_sdk.sh -# Generating k32w-light-ota -gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lighting-app/nxp/k32w/k32w0 '--args=k32w0_sdk_root="TEST_NXP_K32W061_SDK_ROOT" chip_with_low_power=0 is_debug=false chip_enable_ble=false' {out}/k32w-light-ota +# Generating k32w-light-ota-se +gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lighting-app/nxp/k32w/k32w0 '--args=k32w0_sdk_root="TEST_NXP_K32W061_SDK_ROOT" chip_with_low_power=0 is_debug=false chip_enable_ble=false chip_with_se05x=true' {out}/k32w-light-ota-se {root}/third_party/nxp/k32w0_sdk/sdk_fixes/patch_k32w_sdk.sh @@ -1614,8 +1614,8 @@ ninja -C {out}/infineon-p6-light # Building infineon-p6-lock ninja -C {out}/infineon-p6-lock -# Building k32w-light-ota -ninja -C {out}/k32w-light-ota +# Building k32w-light-ota-se +ninja -C {out}/k32w-light-ota-se # Building k32w-light-release-no-ota ninja -C {out}/k32w-light-release-no-ota