Skip to content

Commit 8bc4d7d

Browse files
marius-alex-tacheEthan Tanaxelnxpdoru91restyled-commits
authored
[K32W0] SDK 2.6.13 changes (project-chip#30678)
* [K32W0] Bring platform diff Signed-off-by: marius-alex-tache <marius.tache@nxp.com> * [K32W0] Add SSBL version retrieval The applications will now print the SSBL version also. If the SSBL doesn't have a version defined, the expected value is 0. Signed-off-by: marius-alex-tache <marius.tache@nxp.com> * [K32W0] Fix SSBL version retrieval SSBL will always be seen as booting from address 0, thanks to the remapping mechanism. This means the SSBL version will always offset from address 0. Signed-off-by: marius-alex-tache <marius.tache@nxp.com> * [K32W0] Add support for simple hash verification Signed-off-by: marius-alex-tache <marius.tache@nxp.com> * [K32W] Add support for BLE callback delegate Application can register callbacks for GAP/GATT events. Signed-off-by: marius-alex-tache <marius.tache@nxp.com> * [K32W0] Add example for registering BLE event callbacks Signed-off-by: marius-alex-tache <marius.tache@nxp.com> * [K32W0] replace to use SecLib API and SecLib mutex * [COMMON] Fix manufacturing flow Signed-off-by: marius-alex-tache <marius.tache@nxp.com> * [COMMON] Add python script to generate certificates Signed-off-by: Axel Le Bourhis <axel.lebourhis@nxp.com> * [common] Update generate_certs script * Add valid_from and lifetime optional parameters * Updated parameters descriptions * Misc improvements Signed-off-by: Axel Le Bourhis <axel.lebourhis@nxp.com> * [COMMON] Update nxp_manufacturing_flow document Updated the document to make use of the new generate_certs.py script. Signed-off-by: Axel Le Bourhis <axel.lebourhis@nxp.com> * [K32W0] Fix function signature Signed-off-by: marius-alex-tache <marius.tache@nxp.com> * [K32W0] Remove duplicate reboot cause set Signed-off-by: marius-alex-tache <marius.tache@nxp.com> * [K32W] Set BLE manager impl pointer before calling InitHostController When adding app BLE callbacks, the sImplInstance pointer is used, so it needs to be set beforehand. Signed-off-by: marius-alex-tache <marius.tache@nxp.com> * [COMMON] Update ot-nxp to release branch Signed-off-by: marius-alex-tache <marius.tache@nxp.com> * [K32W0] Update west manifest to point to 2.6.13 SDK Signed-off-by: marius-alex-tache <marius.tache@nxp.com> * [K32W0] Fix ICD parameters Signed-off-by: Doru Gucea <doru-cristian.gucea@nxp.com> * [NXP] Bump ot-nxp to latest Signed-off-by: marius-alex-tache <marius.tache@nxp.com> * [NXP] Fix tools lint errors Signed-off-by: marius-alex-tache <marius.tache@nxp.com> * Restyled by whitespace Restyled by clang-format Restyled by gn Restyled by prettier-markdown Restyled by autopep8 Restyled by isort * [NXP] Add extra condition for SDK gn variable to take into account CI Signed-off-by: marius-alex-tache <marius.tache@nxp.com> * Restyled by gn * [NXP] Fix some lint errors Signed-off-by: marius-alex-tache <marius.tache@nxp.com> * [K32W0] Fix include header Signed-off-by: marius-alex-tache <marius.tache@nxp.com> * Restyled by autopep8 * [NXP] Fix lint error Signed-off-by: marius-alex-tache <marius.tache@nxp.com> * [NXP] Update docker image used by the github actions workflow for K32W Signed-off-by: marius-alex-tache <marius.tache@nxp.com> * [K32W1] Add example for registering BLE event callbacks Signed-off-by: marius-alex-tache <marius.tache@nxp.com> * Restyled by clang-format * [NXP] Clarify usage of hash id in factory data. Update MATTER_ROOT to use a more generic path Signed-off-by: marius-alex-tache <marius.tache@nxp.com> --------- Signed-off-by: marius-alex-tache <marius.tache@nxp.com> Signed-off-by: Axel Le Bourhis <axel.lebourhis@nxp.com> Signed-off-by: Doru Gucea <doru-cristian.gucea@nxp.com> Co-authored-by: Ethan Tan <nxf42555@lsvm11u0000160.swis.ap-northeast-2.aws.nxp.com> Co-authored-by: Axel Le Bourhis <axel.lebourhis@nxp.com> Co-authored-by: Doru Gucea <doru-cristian.gucea@nxp.com> Co-authored-by: Restyled.io <commits@restyled.io>
1 parent 2980e51 commit 8bc4d7d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+1426
-176
lines changed

‎.github/workflows/examples-k32w.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
if: github.actor != 'restyled-io[bot]'
3838

3939
container:
40-
image: ghcr.io/project-chip/chip-build-k32w:26
40+
image: ghcr.io/project-chip/chip-build-k32w:27
4141
volumes:
4242
- "/tmp/bloat_reports:/tmp/bloat_reports"
4343
steps:

‎docs/guides/nxp_manufacturing_flow.md

+122-76
Large diffs are not rendered by default.

‎examples/contact-sensor-app/nxp/k32w/k32w0/BUILD.gn

+5
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import("${chip_root}/src/platform/device.gni")
2525

2626
declare_args() {
2727
chip_software_version = 0
28+
chip_simple_hash_verification = 0
2829
}
2930

3031
if (chip_pw_tokenizer_logging) {
@@ -177,6 +178,10 @@ action("binsign") {
177178
script = "${k32w0_platform_dir}/scripts/sign-outdir.py"
178179
output_name = "bignsign.log"
179180
outputs = [ "${root_build_dir}/${output_name}" ]
181+
182+
if (chip_simple_hash_verification == 1) {
183+
args = [ "--simple-hash" ]
184+
}
180185
}
181186

182187
group("default") {

‎examples/contact-sensor-app/nxp/k32w/k32w0/README.md

+22
Original file line numberDiff line numberDiff line change
@@ -440,6 +440,10 @@ SSBL demo application can be imported from the `Quickstart panel`:
440440
441441
![SSBL Application Select](../../../../platform/nxp/k32w/k32w0/doc/images/ssbl_select.JPG)
442442
443+
### Features
444+
445+
#### Multi image
446+
443447
To support multi-image OTA feature, the SSBL project must be compiled using the
444448
following defines:
445449
@@ -457,6 +461,24 @@ Optionally, add the following defines:
457461
458462
![SSBL_MULTI_IMAGE](../../../../platform/nxp/k32w/k32w0/doc/images/ssbl_multi_image.JPG)
459463
464+
#### Simple hash verification
465+
466+
When secure boot is not used, a simple hash can be appended at the end of the
467+
image for integrity check. Applications should be built with
468+
`chip_simple_hash_verification=1`.
469+
470+
To support simple hash verification feature, the SSBL project must be compiled
471+
with:
472+
473+
- `gSimpleHashVerification=1`
474+
475+
and update the post-build command to use simple hash verification instead of the
476+
default options. Go to
477+
`Project -> Properties -> C/C++ Build -> Settings -> Build steps` and press
478+
`Edit` under `Post-build steps` subsection. The command should look similar to:
479+
480+
![SSBL_SIMPLE_HASH_VERIFICATION](../../../../platform/nxp/k32w/k32w0/doc/images/ssbl_simple_hash.JPG)
481+
460482
Once compiled, the required SSBL file is called `k32w061dk6_ssbl.bin`.
461483
462484
![SSBL_BIN](../../../../platform/nxp/k32w/k32w0/doc/images/ssbl_bin.JPG)

‎examples/contact-sensor-app/nxp/k32w/k32w0/args.gni

+4
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,7 @@ k32w0_sdk_target = get_label_info(":sdk", "label_no_toolchain")
2222
chip_enable_ota_requestor = true
2323
chip_stack_lock_tracking = "fatal"
2424
chip_enable_ble = true
25+
26+
chip_enable_icd_server = true
27+
chip_persist_subscriptions = true
28+
chip_subscription_timeout_resumption = true

‎examples/contact-sensor-app/nxp/k32w/k32w0/include/CHIPProjectConfig.h

+6-2
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,11 @@
5959
#define CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID 0x1037
6060
#define CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID 0xA220
6161

62+
// Set the following define to use the Certification Declaration from below and not use it stored in factory data section
63+
#ifndef CHIP_USE_DEVICE_CONFIG_CERTIFICATION_DECLARATION
64+
#define CHIP_USE_DEVICE_CONFIG_CERTIFICATION_DECLARATION 0
65+
#endif
66+
6267
#ifndef CHIP_DEVICE_CONFIG_CERTIFICATION_DECLARATION
6368
//-> format_version = 1
6469
//-> vendor_id = 0x1037
@@ -188,8 +193,7 @@
188193
#define CHIP_CONFIG_MAX_FABRICS 5 // 5 is the minimum number of supported fabrics
189194

190195
#define CHIP_DEVICE_CONFIG_ENABLE_SED 1
191-
#define CHIP_DEVICE_CONFIG_ICD_SLOW_POLL_INTERVAL 1000_ms32
192-
#define CHIP_DEVICE_CONFIG_ICD_FAST_POLL_INTERVAL 100_ms32
196+
193197
/**
194198
* @def CHIP_IM_MAX_NUM_COMMAND_HANDLER
195199
*

‎examples/contact-sensor-app/nxp/k32w/k32w0/main/AppTask.cpp

+25
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@
4545
#include <src/platform/nxp/k32w/common/OTAImageProcessorImpl.h>
4646
#endif
4747

48+
#include "BLEManagerImpl.h"
49+
4850
#include "Keyboard.h"
4951
#include "LED.h"
5052
#include "LEDWidget.h"
@@ -123,6 +125,18 @@ CHIP_ERROR AppTask::StartAppTask()
123125
return err;
124126
}
125127

128+
static void app_gap_callback(gapGenericEvent_t * event)
129+
{
130+
/* This callback is called in the context of BLE task, so event processing
131+
* should be posted to app task. */
132+
}
133+
134+
static void app_gatt_callback(deviceId_t id, gattServerEvent_t * event)
135+
{
136+
/* This callback is called in the context of BLE task, so event processing
137+
* should be posted to app task. */
138+
}
139+
126140
#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
127141
static void CheckOtaEntry()
128142
{
@@ -240,6 +254,17 @@ CHIP_ERROR AppTask::Init()
240254

241255
K32W_LOG("Current Software Version: %s, %" PRIu32, currentSoftwareVer, currentVersion);
242256

257+
#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
258+
/* SSBL will always be seen as booting from address 0, thanks to the remapping mechanism.
259+
* This means the SSBL version will always offset from address 0. */
260+
extern uint32_t __MATTER_SSBL_VERSION_START[];
261+
K32W_LOG("Current SSBL Version: %ld. Found at address 0x%lx", *((uint32_t *) __MATTER_SSBL_VERSION_START),
262+
(uint32_t) __MATTER_SSBL_VERSION_START);
263+
#endif
264+
265+
auto & bleManager = chip::DeviceLayer::Internal::BLEMgrImpl();
266+
bleManager.RegisterAppCallbacks(app_gap_callback, app_gatt_callback);
267+
243268
return err;
244269
}
245270

‎examples/contact-sensor-app/nxp/k32w/k32w1/main/AppTask.cpp

+17
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@
4646
#include <src/platform/nxp/k32w/common/OTAImageProcessorImpl.h>
4747
#endif
4848

49+
#include <src/platform/nxp/k32w/k32w1/BLEManagerImpl.h>
50+
4951
#include "K32W1PersistentStorageOpKeystore.h"
5052

5153
#include "LEDWidget.h"
@@ -106,6 +108,18 @@ static BDXDownloader gDownloader __attribute__((section(".data")));
106108
constexpr uint16_t requestedOtaBlockSize = 1024;
107109
#endif
108110

111+
static void app_gap_callback(gapGenericEvent_t * event)
112+
{
113+
/* This callback is called in the context of BLE task, so event processing
114+
* should be posted to app task. */
115+
}
116+
117+
static void app_gatt_callback(deviceId_t id, gattServerEvent_t * event)
118+
{
119+
/* This callback is called in the context of BLE task, so event processing
120+
* should be posted to app task. */
121+
}
122+
109123
CHIP_ERROR AppTask::StartAppTask()
110124
{
111125
CHIP_ERROR err = CHIP_NO_ERROR;
@@ -188,6 +202,9 @@ CHIP_ERROR AppTask::Init()
188202

189203
K32W_LOG("Current Software Version: %s, %d", currentSoftwareVer, currentVersion);
190204

205+
auto & bleManager = chip::DeviceLayer::Internal::BLEMgrImpl();
206+
bleManager.RegisterAppCallbacks(app_gap_callback, app_gatt_callback);
207+
191208
return err;
192209
}
193210

‎examples/lighting-app/nxp/k32w/k32w0/BUILD.gn

+5
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import("${chip_root}/src/platform/device.gni")
2525

2626
declare_args() {
2727
chip_software_version = 0
28+
chip_simple_hash_verification = 0
2829
}
2930

3031
if (chip_pw_tokenizer_logging) {
@@ -170,6 +171,10 @@ action("binsign") {
170171
script = "${k32w0_platform_dir}/scripts/sign-outdir.py"
171172
output_name = "bignsign.log"
172173
outputs = [ "${root_build_dir}/${output_name}" ]
174+
175+
if (chip_simple_hash_verification == 1) {
176+
args = [ "--simple-hash" ]
177+
}
173178
}
174179

175180
group("default") {

‎examples/lighting-app/nxp/k32w/k32w0/README.md

+22
Original file line numberDiff line numberDiff line change
@@ -457,6 +457,10 @@ SSBL demo application can be imported from the `Quickstart panel`:
457457

458458
![SSBL Application Select](../../../../platform/nxp/k32w/k32w0/doc/images/ssbl_select.JPG)
459459

460+
### Features
461+
462+
#### Multi image
463+
460464
To support multi-image OTA feature, the SSBL project must be compiled using the
461465
following defines:
462466

@@ -474,6 +478,24 @@ Optionally, add the following defines:
474478

475479
![SSBL_MULTI_IMAGE](../../../../platform/nxp/k32w/k32w0/doc/images/ssbl_multi_image.JPG)
476480

481+
#### Simple hash verification
482+
483+
When secure boot is not used, a simple hash can be appended at the end of the
484+
image for integrity check. Applications should be built with
485+
`chip_simple_hash_verification=1`.
486+
487+
To support simple hash verification feature, the SSBL project must be compiled
488+
with:
489+
490+
- `gSimpleHashVerification=1`
491+
492+
and update the post-build command to use simple hash verification instead of the
493+
default options. Go to
494+
`Project -> Properties -> C/C++ Build -> Settings -> Build steps` and press
495+
`Edit` under `Post-build steps` subsection. The command should look similar to:
496+
497+
![SSBL_SIMPLE_HASH_VERIFICATION](../../../../platform/nxp/k32w/k32w0/doc/images/ssbl_simple_hash.JPG)
498+
477499
Once compiled, the required SSBL file is called `k32w061dk6_ssbl.bin`.
478500

479501
![SSBL_BIN](../../../../platform/nxp/k32w/k32w0/doc/images/ssbl_bin.JPG)

‎examples/lighting-app/nxp/k32w/k32w0/include/CHIPProjectConfig.h

+5
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,11 @@
5959
#define CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID 0x1037
6060
#define CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID 0xA220
6161

62+
// Set the following define to use the Certification Declaration from below and not use it stored in factory data section
63+
#ifndef CHIP_USE_DEVICE_CONFIG_CERTIFICATION_DECLARATION
64+
#define CHIP_USE_DEVICE_CONFIG_CERTIFICATION_DECLARATION 0
65+
#endif
66+
6267
#ifndef CHIP_DEVICE_CONFIG_CERTIFICATION_DECLARATION
6368
//-> format_version = 1
6469
//-> vendor_id = 0x1037

‎examples/lighting-app/nxp/k32w/k32w0/main/AppTask.cpp

+23-2
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,14 @@ CHIP_ERROR AppTask::Init()
249249

250250
K32W_LOG("Current Software Version: %s, %" PRIu32, currentSoftwareVer, currentVersion);
251251

252+
#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
253+
/* SSBL will always be seen as booting from address 0, thanks to the remapping mechanism.
254+
* This means the SSBL version will always offset from address 0. */
255+
extern uint32_t __MATTER_SSBL_VERSION_START[];
256+
K32W_LOG("Current SSBL Version: %ld. Found at address 0x%lx", *((uint32_t *) __MATTER_SSBL_VERSION_START),
257+
(uint32_t) __MATTER_SSBL_VERSION_START);
258+
#endif
259+
252260
return err;
253261
}
254262

@@ -897,11 +905,24 @@ void AppTask::PostTurnOnActionRequest(int32_t aActor, LightingManager::Action_t
897905

898906
void AppTask::PostEvent(const AppEvent * aEvent)
899907
{
908+
portBASE_TYPE taskToWake = pdFALSE;
900909
if (sAppEventQueue != NULL)
901910
{
902-
if (!xQueueSend(sAppEventQueue, aEvent, 1))
911+
if (__get_IPSR())
903912
{
904-
K32W_LOG("Failed to post event to app task event queue");
913+
if (!xQueueSendToFrontFromISR(sAppEventQueue, aEvent, &taskToWake))
914+
{
915+
K32W_LOG("Failed to post event to app task event queue");
916+
}
917+
918+
portYIELD_FROM_ISR(taskToWake);
919+
}
920+
else
921+
{
922+
if (!xQueueSend(sAppEventQueue, aEvent, 1))
923+
{
924+
K32W_LOG("Failed to post event to app task event queue");
925+
}
905926
}
906927
}
907928
}

‎examples/lock-app/nxp/k32w/k32w0/args.gni

+4
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,7 @@ k32w0_sdk_target = get_label_info(":sdk", "label_no_toolchain")
2121

2222
chip_stack_lock_tracking = "fatal"
2323
chip_enable_ble = true
24+
25+
chip_enable_icd_server = true
26+
chip_persist_subscriptions = true
27+
chip_subscription_timeout_resumption = true

‎examples/lock-app/nxp/k32w/k32w0/include/CHIPProjectConfig.h

+5-2
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,11 @@
5959
#define CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID 0x1037
6060
#define CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID 0xA220
6161

62+
// Set the following define to use the Certification Declaration from below and not use it stored in factory data section
63+
#ifndef CHIP_USE_DEVICE_CONFIG_CERTIFICATION_DECLARATION
64+
#define CHIP_USE_DEVICE_CONFIG_CERTIFICATION_DECLARATION 0
65+
#endif
66+
6267
#ifndef CHIP_DEVICE_CONFIG_CERTIFICATION_DECLARATION
6368
//-> format_version = 1
6469
//-> vendor_id = 0x1037
@@ -179,8 +184,6 @@
179184
#define CHIP_CONFIG_MAX_FABRICS 5 // 5 is the minimum number of supported fabrics
180185

181186
#define CHIP_DEVICE_CONFIG_ENABLE_SED 1
182-
#define CHIP_DEVICE_CONFIG_ICD_SLOW_POLL_INTERVAL 1000_ms32
183-
#define CHIP_DEVICE_CONFIG_ICD_FAST_POLL_INTERVAL 100_ms32
184187

185188
/**
186189
* CHIP_CONFIG_EVENT_LOGGING_DEFAULT_IMPORTANCE

‎examples/platform/nxp/k32w/k32w0/app/ldscripts/chip-k32w0x-linker.ld

+7-2
Original file line numberDiff line numberDiff line change
@@ -432,8 +432,13 @@ SECTIONS
432432

433433
__StackLimit = _vStackTop - STACK_SIZE;
434434

435-
__FACTORY_DATA_START = FACTORY_DATA_START_ADDRESS;
436-
__FACTORY_DATA_SIZE = m_factory_data_size;
435+
__MATTER_FACTORY_DATA_START = FACTORY_DATA_START_ADDRESS;
436+
__MATTER_FACTORY_DATA_SIZE = m_factory_data_size;
437+
438+
/* The .ro_version section inside SSBL is set after the .m_interrupts sections,
439+
* which is assumed to never change, so the offset remains the same across different
440+
* SSBL versions. This symbol is used in Matter Application to retrieve the SSBL version. */
441+
__MATTER_SSBL_VERSION_START = 0x00000120;
437442

438443
ASSERT(((m_app_start + m_app_size + m_app_meta_data + m_factory_data_size + m_flash_config_size) <= m_int_flash_size),
439444
"Internal flash capacity exceeded")

‎examples/platform/nxp/k32w/k32w0/doc/images/ssbl_simple_hash.JPG

55.1 KB
Loading

‎examples/platform/nxp/k32w/k32w0/scripts/sign-outdir.py

+30-11
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,36 @@
1+
import argparse
12
import os
23
import subprocess
34

4-
if os.environ["NXP_K32W0_SDK_ROOT"] != "":
5-
sign_images_path = os.environ["NXP_K32W0_SDK_ROOT"] + "/tools/imagetool/sign_images.sh"
6-
else:
7-
sign_images_path = os.getcwd() + "/../../../../../../third_party/nxp/k32w0_sdk/repo/core/tools/imagetool/sign_images.sh"
85

9-
# Give execute permission if needed
10-
if os.access(sign_images_path, os.X_OK) is False:
11-
os.chmod(sign_images_path, 0o766)
6+
def main(args):
7+
if os.environ["NXP_K32W0_SDK_ROOT"] != "":
8+
sign_images_path = os.environ["NXP_K32W0_SDK_ROOT"] + "/tools/imagetool/sign_images.sh"
9+
else:
10+
sign_images_path = os.getcwd() + "/../../../../../../../third_party/nxp/k32w0_sdk/repo/core/tools/imagetool/sign_images.sh"
1211

13-
# Convert script to unix format if needed
14-
subprocess.call("(file " + sign_images_path + " | grep CRLF > /dev/null) && (dos2unix " + sign_images_path + ")", shell=True)
12+
# Give execute permission if needed
13+
if os.access(sign_images_path, os.X_OK) is False:
14+
os.chmod(sign_images_path, 0o766)
1515

16-
# Call sign_images.sh script with the output directory
17-
subprocess.call(sign_images_path + " " + os.getcwd(), shell=True)
16+
# Convert script to unix format if needed
17+
subprocess.call("(file " + sign_images_path + " | grep CRLF > /dev/null) && (dos2unix " + sign_images_path + ")", shell=True)
18+
19+
# Call sign_images.sh script with the output directory
20+
cmd = sign_images_path + " " + os.getcwd()
21+
if args.simple_hash:
22+
cmd = cmd + " -SimpleHashVerification"
23+
24+
subprocess.call(cmd, shell=True)
25+
26+
27+
if __name__ == "__main__":
28+
parser = argparse.ArgumentParser()
29+
parser.add_argument(
30+
"--simple-hash",
31+
help="When enabled, adds a hash of the whole image at the end of the binary.",
32+
action="store_true"
33+
)
34+
args = parser.parse_args()
35+
36+
main(args)

0 commit comments

Comments
 (0)