Skip to content

Commit f45fdb8

Browse files
[NXP][scripts] Switch RW61X to use common NXP builder and workflow (#34510)
* [NXP][scripts] Switch RW61X to use common NXP builder Signed-off-by: Martin Girardot <martin.girardot@nxp.com> * Restyled by autopep8 * Restyled by isort --------- Signed-off-by: Martin Girardot <martin.girardot@nxp.com> Co-authored-by: Restyled.io <commits@restyled.io>
1 parent d5f3db3 commit f45fdb8

File tree

7 files changed

+161
-262
lines changed

7 files changed

+161
-262
lines changed

.github/workflows/examples-nxp.yaml

+64
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,71 @@ jobs:
9696
if: ${{ !env.ACT }}
9797
with:
9898
platform-name: K32W
99+
rw61x:
100+
name: RW61X
99101

102+
env:
103+
BUILD_TYPE: gn_rw61x
104+
105+
runs-on: ubuntu-latest
106+
if: github.actor != 'restyled-io[bot]'
107+
108+
container:
109+
image: ghcr.io/project-chip/chip-build-rw61x:66
110+
volumes:
111+
- "/tmp/bloat_reports:/tmp/bloat_reports"
112+
steps:
113+
- name: Checkout
114+
uses: actions/checkout@v4
115+
- name: Checkout submodules & Bootstrap
116+
uses: ./.github/actions/checkout-submodules-and-bootstrap
117+
with:
118+
platform: nxp
119+
extra-submodule-parameters: --recursive
120+
121+
- name: Set up environment for size reports
122+
uses: ./.github/actions/setup-size-reports
123+
if: ${{ !env.ACT }}
124+
with:
125+
gh-context: ${{ toJson(github) }}
126+
127+
- name: Build RW61X all clusters example app
128+
run: |
129+
scripts/run_in_build_env.sh "\
130+
./scripts/build/build_examples.py \
131+
--target nxp-rw61x-freertos-all-clusters-wifi \
132+
--target nxp-rw61x-freertos-all-clusters-thread \
133+
--target nxp-rw61x-freertos-all-clusters-thread-wifi \
134+
build \
135+
--copy-artifacts-to out/artifacts \
136+
"
137+
138+
- name: Build RW61X thermostat example app
139+
run: |
140+
scripts/run_in_build_env.sh "\
141+
./scripts/build/build_examples.py \
142+
--target nxp-rw61x-freertos-thermostat-wifi \
143+
--target nxp-rw61x-freertos-thermostat-thread \
144+
--target nxp-rw61x-freertos-thermostat-thread-wifi \
145+
build \
146+
--copy-artifacts-to out/artifacts \
147+
"
148+
149+
- name: Build RW61X laundry-washer example app
150+
run: |
151+
scripts/run_in_build_env.sh "\
152+
./scripts/build/build_examples.py \
153+
--target nxp-rw61x-freertos-laundry-washer-wifi \
154+
--target nxp-rw61x-freertos-laundry-washer-thread \
155+
--target nxp-rw61x-freertos-laundry-washer-thread-wifi \
156+
build \
157+
--copy-artifacts-to out/artifacts \
158+
"
159+
- name: Uploading Size Reports
160+
uses: ./.github/actions/upload-size-reports
161+
if: ${{ !env.ACT }}
162+
with:
163+
platform-name: RW61X
100164
zephyr:
101165
name: ZEPHYR_RW61X
102166

.github/workflows/examples-rw61x.yaml

-96
This file was deleted.

scripts/build/BUILD.gn

-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ pw_python_package("build_examples") {
5959
"builders/nxp.py",
6060
"builders/openiotsdk.py",
6161
"builders/qpg.py",
62-
"builders/rw61x.py",
6362
"builders/telink.py",
6463
"builders/tizen.py",
6564
"runner/__init__.py",

scripts/build/build/targets.py

+5-22
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
from builders.nxp import NxpApp, NxpBoard, NxpBuilder, NxpOsUsed
3232
from builders.openiotsdk import OpenIotSdkApp, OpenIotSdkBuilder, OpenIotSdkCryptoBackend
3333
from builders.qpg import QpgApp, QpgBoard, QpgBuilder
34-
from builders.rw61x import RW61XApp, RW61XBuilder
3534
from builders.stm32 import stm32App, stm32Board, stm32Builder
3635
from builders.telink import TelinkApp, TelinkBoard, TelinkBuilder
3736
from builders.ti import TIApp, TIBoard, TIBuilder
@@ -506,7 +505,7 @@ def BuildNxpTarget():
506505
# OS
507506
target.AppendFixedTargets([
508507
TargetPart('zephyr', os_env=NxpOsUsed.ZEPHYR).OnlyIfRe('rw61x'),
509-
TargetPart('freertos', os_env=NxpOsUsed.FREERTOS).ExceptIfRe('rw61x'),
508+
TargetPart('freertos', os_env=NxpOsUsed.FREERTOS),
510509
])
511510

512511
# apps
@@ -526,6 +525,10 @@ def BuildNxpTarget():
526525
target.AppendModifier(name="dac-conversion", convert_dac_pk=True).OnlyIfRe('factory').ExceptIfRe('(k32w0|rw61x)')
527526
target.AppendModifier(name="rotating-id", enable_rotating_id=True).ExceptIfRe('rw61x')
528527
target.AppendModifier(name="sw-v2", has_sw_version_2=True)
528+
target.AppendModifier(name="ota", enable_ota=True).ExceptIfRe('zephyr')
529+
target.AppendModifier(name="wifi", enable_wifi=True).OnlyIfRe('rw61x')
530+
target.AppendModifier(name="thread", enable_thread=True).ExceptIfRe('zephyr')
531+
target.AppendModifier(name="matter-shell", enable_shell=True).ExceptIfRe('k32w0|k32w1')
529532

530533
return target
531534

@@ -720,25 +723,6 @@ def BuildMW320Target():
720723
return target
721724

722725

723-
def BuildRW61XTarget():
724-
target = BuildTarget('rw61x', RW61XBuilder)
725-
726-
# apps
727-
target.AppendFixedTargets([
728-
TargetPart('all-clusters-app', app=RW61XApp.ALL_CLUSTERS, release=True),
729-
TargetPart('thermostat', app=RW61XApp.THERMOSTAT, release=True),
730-
TargetPart('laundry-washer', app=RW61XApp.LAUNDRY_WASHER, release=True),
731-
])
732-
733-
target.AppendModifier(name="ota", enable_ota=True)
734-
target.AppendModifier(name="wifi", enable_wifi=True)
735-
target.AppendModifier(name="thread", enable_thread=True)
736-
target.AppendModifier(name="factory-data", enable_factory_data=True)
737-
target.AppendModifier(name="matter-shell", enable_shell=True)
738-
739-
return target
740-
741-
742726
def BuildGenioTarget():
743727
target = BuildTarget('genio', GenioBuilder)
744728
target.AppendFixedTargets([TargetPart('lighting-app', app=GenioApp.LIGHT)])
@@ -820,7 +804,6 @@ def BuildOpenIotSdkTargets():
820804
BuildHostTestRunnerTarget(),
821805
BuildIMXTarget(),
822806
BuildInfineonTarget(),
823-
BuildRW61XTarget(),
824807
BuildNxpTarget(),
825808
BuildMbedTarget(),
826809
BuildMW320Target(),

0 commit comments

Comments
 (0)