Skip to content

Commit 3099269

Browse files
marius-alex-tacherestyled-commits
marius-alex-tache
and
restyled-commits
authored
[NXP] Update K32W build examples support (#32662)
* [NXP][CI] Update K32W build_examples support Rename all related files from k32w to nxp. Support for other platforms should be added in BuildNxpTarget. Signed-off-by: marius-alex-tache <marius.tache@nxp.com> * [NXP][CI] Add board constraints to the app targets Supported targets should be constrained by the board using OnlyIfRe calls. Signed-off-by: marius-alex-tache <marius.tache@nxp.com> * [NXP][CI] Update all targets linux x64 test data Signed-off-by: marius-alex-tache <marius.tache@nxp.com> * Restyled by autopep8 --------- Signed-off-by: marius-alex-tache <marius.tache@nxp.com> Co-authored-by: Restyled.io <commits@restyled.io>
1 parent 931e280 commit 3099269

File tree

6 files changed

+172
-194
lines changed

6 files changed

+172
-194
lines changed

‎.github/workflows/examples-k32w.yaml ‎.github/workflows/examples-nxp.yaml

+19-16
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
name: Build example - K32W
15+
name: Build example - NXP
1616

1717
on:
1818
push:
@@ -58,33 +58,36 @@ jobs:
5858
run: |
5959
scripts/run_in_build_env.sh "\
6060
./scripts/build/build_examples.py \
61-
--target k32w-k32w0-light-crypto-platform-tokenizer \
62-
--target k32w-k32w0-contact-crypto-platform-tokenizer \
63-
--target k32w-k32w0-contact-crypto-platform-low-power-nologs \
64-
--target k32w-k32w1-light-crypto-platform-openthread-ftd \
65-
--target k32w-k32w1-contact-crypto-platform-low-power-nologs \
61+
--target nxp-k32w0-lighting \
62+
--target nxp-k32w0-lighting-factory \
63+
--target nxp-k32w0-lighting-rotating-id \
64+
--target nxp-k32w0-contact-sensor \
65+
--target nxp-k32w0-contact-sensor-low-power \
66+
--target nxp-k32w0-contact-sensor-low-power-factory \
67+
--target nxp-k32w1-lighting \
68+
--target nxp-k32w1-contact-sensor-low-power \
6669
build \
6770
--copy-artifacts-to out/artifacts \
6871
"
69-
- name: Get light size stats
72+
- name: Get lighting app size stats
7073
run: |
7174
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
72-
k32w k32w0+release light \
73-
out/artifacts/k32w-k32w0-light-crypto-platform-tokenizer/chip-k32w0x-light-example.elf \
75+
nxp k32w0+release light \
76+
out/artifacts/nxp-k32w0-lighting/chip-k32w0x-light-example.elf \
7477
/tmp/bloat_reports/
7578
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
76-
k32w k32w1+release light \
77-
out/artifacts/k32w-k32w1-light-crypto-platform-openthread-ftd/chip-k32w1-light-example.elf \
79+
nxp k32w1+release light \
80+
out/artifacts/nxp-k32w1-lighting/chip-k32w1-light-example.elf \
7881
/tmp/bloat_reports/
79-
- name: Get contact size stats
82+
- name: Get contact sensor size stats
8083
run: |
8184
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
82-
k32w k32w0+release contact \
83-
out/artifacts/k32w-k32w0-contact-crypto-platform-tokenizer/chip-k32w0x-contact-example.elf \
85+
nxp k32w0+release contact \
86+
out/artifacts/nxp-k32w0-contact-sensor-low-power/chip-k32w0x-contact-example.elf \
8487
/tmp/bloat_reports/
8588
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
86-
k32w k32w1+release contact \
87-
out/artifacts/k32w-k32w1-contact-crypto-platform-low-power-nologs/chip-k32w1-contact-example.elf \
89+
nxp k32w1+release contact \
90+
out/artifacts/nxp-k32w1-contact-sensor-low-power/chip-k32w1-contact-example.elf \
8891
/tmp/bloat_reports/
8992
- name: Uploading Size Reports
9093
uses: ./.github/actions/upload-size-reports

‎scripts/build/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@ pw_python_package("build_examples") {
5353
"builders/host.py",
5454
"builders/imx.py",
5555
"builders/infineon.py",
56-
"builders/k32w.py",
5756
"builders/mbed.py",
5857
"builders/mw320.py",
5958
"builders/nrf.py",
59+
"builders/nxp.py",
6060
"builders/openiotsdk.py",
6161
"builders/qpg.py",
6262
"builders/rw61x.py",

‎scripts/build/build/targets.py

+16-19
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@
2424
from builders.host import HostApp, HostBoard, HostBuilder, HostCryptoLibrary, HostFuzzingType
2525
from builders.imx import IMXApp, IMXBuilder
2626
from builders.infineon import InfineonApp, InfineonBoard, InfineonBuilder
27-
from builders.k32w import K32WApp, K32WBoard, K32WBuilder
2827
from builders.mbed import MbedApp, MbedBoard, MbedBuilder, MbedProfile
2928
from builders.mw320 import MW320App, MW320Builder
3029
from builders.nrf import NrfApp, NrfBoard, NrfConnectBuilder
30+
from builders.nxp import NxpApp, NxpBoard, NxpBuilder
3131
from builders.openiotsdk import OpenIotSdkApp, OpenIotSdkBuilder, OpenIotSdkCryptoBackend
3232
from builders.qpg import QpgApp, QpgBoard, QpgBuilder
3333
from builders.rw61x import RW61XApp, RW61XBuilder
@@ -469,32 +469,29 @@ def BuildASRTarget():
469469
return target
470470

471471

472-
def BuildK32WTarget():
473-
target = BuildTarget('k32w', K32WBuilder)
472+
def BuildNxpTarget():
473+
target = BuildTarget('nxp', NxpBuilder)
474474

475475
# boards
476476
target.AppendFixedTargets([
477-
TargetPart('k32w0', board=K32WBoard.K32W0),
478-
TargetPart('k32w1', board=K32WBoard.K32W1)
477+
TargetPart('k32w0', board=NxpBoard.K32W0),
478+
TargetPart('k32w1', board=NxpBoard.K32W1)
479479
])
480480

481481
# apps
482482
target.AppendFixedTargets([
483-
TargetPart('light', app=K32WApp.LIGHT, release=True),
484-
TargetPart('shell', app=K32WApp.SHELL, release=True),
485-
TargetPart('lock', app=K32WApp.LOCK, release=True),
486-
TargetPart('contact', app=K32WApp.CONTACT, release=True)
483+
TargetPart('lighting', app=NxpApp.LIGHTING).OnlyIfRe('(k32w0|k32w1)'),
484+
TargetPart('contact-sensor', app=NxpApp.CONTACT).OnlyIfRe('(k32w0|k32w1)')
487485
])
488486

489-
target.AppendModifier(name="se05x", se05x=True)
490-
target.AppendModifier(name="no-ble", disable_ble=True)
491-
target.AppendModifier(name="no-ota", disable_ota=True)
492-
target.AppendModifier(name="low-power", low_power=True).OnlyIfRe("-nologs")
493-
target.AppendModifier(name="nologs", disable_logs=True)
494-
target.AppendModifier(name="crypto-platform", crypto_platform=True)
495-
target.AppendModifier(
496-
name="tokenizer", tokenizer=True).ExceptIfRe("-nologs")
497-
target.AppendModifier(name="openthread-ftd", openthread_ftd=True)
487+
target.AppendModifier(name="factory", enable_factory_data=True)
488+
target.AppendModifier(name="low-power", low_power=True).OnlyIfRe('contact-sensor')
489+
target.AppendModifier(name="lit", enable_lit=True).OnlyIfRe('contact-sensor')
490+
target.AppendModifier(name="fro32k", use_fro32k=True).OnlyIfRe('k32w0')
491+
target.AppendModifier(name="smu2", smu2=True).OnlyIfRe('k32w1-lighting')
492+
target.AppendModifier(name="dac-conversion", convert_dac_pk=True).OnlyIfRe('factory').ExceptIfRe('k32w0')
493+
target.AppendModifier(name="rotating-id", enable_rotating_id=True)
494+
target.AppendModifier(name="sw-v2", has_sw_version_2=True)
498495

499496
return target
500497

@@ -804,7 +801,7 @@ def BuildOpenIotSdkTargets():
804801
BuildIMXTarget(),
805802
BuildInfineonTarget(),
806803
BuildRW61XTarget(),
807-
BuildK32WTarget(),
804+
BuildNxpTarget(),
808805
BuildMbedTarget(),
809806
BuildMW320Target(),
810807
BuildNrfTarget(),

‎scripts/build/builders/k32w.py

-157
This file was deleted.

0 commit comments

Comments
 (0)