diff --git a/.github/workflows/examples-k32w.yaml b/.github/workflows/examples-k32w.yaml index 91b3fb1f9124ca..fe71137034ed0c 100644 --- a/.github/workflows/examples-k32w.yaml +++ b/.github/workflows/examples-k32w.yaml @@ -37,7 +37,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: connectedhomeip/chip-build-k32w:0.5.25 + image: connectedhomeip/chip-build-k32w:0.5.26 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" steps: diff --git a/build_overrides/k32w0_sdk.gni b/build_overrides/k32w0_sdk.gni index e8519a3ecafe91..fa487e9e7fb254 100644 --- a/build_overrides/k32w0_sdk.gni +++ b/build_overrides/k32w0_sdk.gni @@ -14,5 +14,5 @@ declare_args() { # Root directory for K32W SDK build files. - k32w0_sdk_build_root = "//third_party/k32w_sdk/nxp/k32w/k32w0" + k32w0_sdk_build_root = "//third_party/nxp/k32w0_sdk" } diff --git a/examples/build_overrides/k32w0_sdk.gni b/examples/build_overrides/k32w0_sdk.gni index 51a2821b4ab1fc..e77b63d1e02fa9 100644 --- a/examples/build_overrides/k32w0_sdk.gni +++ b/examples/build_overrides/k32w0_sdk.gni @@ -15,5 +15,5 @@ declare_args() { # Root directory for k32w SDK. k32w0_sdk_build_root = - "//third_party/connectedhomeip/third_party/k32w_sdk/nxp/k32w/k32w0" + "//third_party/connectedhomeip/third_party/nxp/k32w0_sdk" } diff --git a/examples/lighting-app/nxp/k32w/k32w0/README.md b/examples/lighting-app/nxp/k32w/k32w0/README.md index 20f767dbb008e7..4e69c8159cb8da 100644 --- a/examples/lighting-app/nxp/k32w/k32w0/README.md +++ b/examples/lighting-app/nxp/k32w/k32w0/README.md @@ -173,13 +173,13 @@ distribution (the demo-application was compiled on Ubuntu 20.04). - with Secure Element ``` -user@ubuntu:~/Desktop/git/connectedhomeip$ export K32W061_SDK_ROOT=/home/user/Desktop/SDK_2_6_4_K32W061DK6/ -user@ubuntu:~/Desktop/git/connectedhomeip$ ./third_party/k32w_sdk/sdk_fixes/patch_k32w_sdk.sh +user@ubuntu:~/Desktop/git/connectedhomeip$ export NXP_K32W0_SDK_ROOT=/home/user/Desktop/SDK_2_6_4_K32W061DK6/ +user@ubuntu:~/Desktop/git/connectedhomeip$ ./third_party/nxp/k32w0_sdk/sdk_fixes/patch_k32w_sdk.sh user@ubuntu:~/Desktop/git/connectedhomeip$ source ./scripts/activate.sh user@ubuntu:~/Desktop/git/connectedhomeip$ cd examples/lighting-app/nxp/k32w/k32w0 -user@ubuntu:~/Desktop/git/connectedhomeip/examples/lighting-app/nxp/k32w/k32w0$ gn gen out/debug --args="k32w0_sdk_root=\"${K32W061_SDK_ROOT}\" chip_with_OM15082=1 chip_with_ot_cli=0 is_debug=false chip_crypto=\"mbedtls\" chip_with_se05x=1" -user@ubuntu:~/Desktop/git/connectedhomeip/examples/lightin-app/nxp/k32w/k32w0$ ninja -C out/debug -user@ubuntu:~/Desktop/git/connectedhomeip/examples/lighting-app/nxp/k32w/k32w0$ $K32W061_SDK_ROOT/tools/imagetool/sign_images.sh out/debug/ +user@ubuntu:~/Desktop/git/connectedhomeip/examples/lighting-app/nxp/k32w/k32w0$ gn gen out/debug --args="k32w0_sdk_root=\"${NXP_K32W0_SDK_ROOT}\" chip_with_OM15082=1 chip_with_ot_cli=0 is_debug=false chip_crypto=\"mbedtls\" chip_with_se05x=1" +user@ubuntu:~/Desktop/git/connectedhomeip/examples/lighting-app/nxp/k32w/k32w0$ ninja -C out/debug +user@ubuntu:~/Desktop/git/connectedhomeip/examples/lighting-app/nxp/k32w/k32w0$ $NXP_K32W0_SDK_ROOT/tools/imagetool/sign_images.sh out/debug/ ``` - without Secure element diff --git a/examples/lock-app/nxp/k32w/k32w0/README.md b/examples/lock-app/nxp/k32w/k32w0/README.md index 71e227e9057ee2..bc8944386d953a 100644 --- a/examples/lock-app/nxp/k32w/k32w0/README.md +++ b/examples/lock-app/nxp/k32w/k32w0/README.md @@ -177,13 +177,13 @@ distribution (the demo-application was compiled on Ubuntu 20.04). - with Secure Element ``` -user@ubuntu:~/Desktop/git/connectedhomeip$ export K32W061_SDK_ROOT=/home/user/Desktop/SDK_2_6_4_K32W061DK6/ -user@ubuntu:~/Desktop/git/connectedhomeip$ ./third_party/k32w_sdk/sdk_fixes/patch_k32w_sdk.sh +user@ubuntu:~/Desktop/git/connectedhomeip$ export NXP_K32W0_SDK_ROOT=/home/user/Desktop/SDK_2_6_4_K32W061DK6/ +user@ubuntu:~/Desktop/git/connectedhomeip$ ./third_party/nxp/k32w0_sdk/sdk_fixes/patch_k32w_sdk.sh user@ubuntu:~/Desktop/git/connectedhomeip$ source ./scripts/activate.sh user@ubuntu:~/Desktop/git/connectedhomeip$ cd examples/lock-app/nxp/k32w/k32w0/ -user@ubuntu:~/Desktop/git/connectedhomeip/examples/lock-app/nxp/k32w/k32w0$ gn gen out/debug --args="k32w0_sdk_root=\"${K32W061_SDK_ROOT}\" chip_with_OM15082=1 chip_with_ot_cli=0 is_debug=false chip_crypto=\"mbedtls\" chip_with_se05x=1" +user@ubuntu:~/Desktop/git/connectedhomeip/examples/lock-app/nxp/k32w/k32w0$ gn gen out/debug --args="k32w0_sdk_root=\"${NXP_K32W0_SDK_ROOT}\" chip_with_OM15082=1 chip_with_ot_cli=0 is_debug=false chip_crypto=\"mbedtls\" chip_with_se05x=1" user@ubuntu:~/Desktop/git/connectedhomeip/examples/lock-app/nxp/k32w/k32w0$ ninja -C out/debug -user@ubuntu:~/Desktop/git/connectedhomeip/examples/lock-app/nxp/k32w/k32w0$ $K32W061_SDK_ROOT/tools/imagetool/sign_images.sh out/debug/ +user@ubuntu:~/Desktop/git/connectedhomeip/examples/lock-app/nxp/k32w/k32w0$ $NXP_K32W0_SDK_ROOT/tools/imagetool/sign_images.sh out/debug/ ``` - without Secure element diff --git a/gn_build.sh b/gn_build.sh index 361382dbdcef7c..8f938e68f2e423 100755 --- a/gn_build.sh +++ b/gn_build.sh @@ -155,14 +155,14 @@ fi # K32W SDK setup k32w_sdk_args="" -if [[ -d "$K32W061_SDK_ROOT" ]]; then - k32w_sdk_args+="k32w_sdk_root=\"$K32W061_SDK_ROOT\"" +if [[ -d "$NXP_K32W0_SDK_ROOT" ]]; then + k32w_sdk_args+="k32w_sdk_root=\"$NXP_K32W0_SDK_ROOT\"" extra_args+=" $k32w_sdk_args enable_k32w_builds=true" fi echo -if [[ ! -d "$K32W061_SDK_ROOT" ]]; then - echo "Hint: Set \$K32W061_SDK_ROOT to enable building for K32W061" +if [[ ! -d "$NXP_K32W0_SDK_ROOT" ]]; then + echo "Hint: Set \$NXP_K32W0_SDK_ROOT to enable building for K32W061" else echo 'To build the K32W lock sample as a standalone project': echo "(cd $CHIP_ROOT/examples/lock-app/k32w; gn gen out/debug --args='$k32w_sdk_args'; ninja -C out/debug)" diff --git a/scripts/examples/k32w_example.sh b/scripts/examples/k32w_example.sh index d9614e45026077..5a06129a01dc47 100755 --- a/scripts/examples/k32w_example.sh +++ b/scripts/examples/k32w_example.sh @@ -25,12 +25,12 @@ source "$(dirname "$0")/../../scripts/activate.sh" set -x env -"$(dirname "$0")"/../../third_party/k32w_sdk/sdk_fixes/patch_k32w_sdk.sh +"$(dirname "$0")"/../../third_party/nxp/k32w0_sdk/sdk_fixes/patch_k32w_sdk.sh if [ -z "$3" ]; then - gn gen --check --fail-on-unused-args --root="$1" "$2" --args="k32w0_sdk_root=\"$K32W061_SDK_ROOT\" is_debug=false chip_with_low_power=1" + gn gen --check --fail-on-unused-args --root="$1" "$2" --args="k32w0_sdk_root=\"$NXP_K32W0_SDK_ROOT\" is_debug=false chip_with_low_power=1" else - gn gen --check --fail-on-unused-args --root="$1" "$2" --args="k32w0_sdk_root=\"$K32W061_SDK_ROOT\" is_debug=false chip_with_low_power=0" + gn gen --check --fail-on-unused-args --root="$1" "$2" --args="k32w0_sdk_root=\"$NXP_K32W0_SDK_ROOT\" is_debug=false chip_with_low_power=0" fi ninja -C "$2" diff --git a/scripts/examples/k32w_se_example.sh b/scripts/examples/k32w_se_example.sh index 98909d90cf296b..9815dc9f49a06c 100755 --- a/scripts/examples/k32w_se_example.sh +++ b/scripts/examples/k32w_se_example.sh @@ -25,7 +25,7 @@ source "$(dirname "$0")/../../scripts/activate.sh" set -x env -"$(dirname "$0")"/../../third_party/k32w_sdk/sdk_fixes/patch_k32w_sdk.sh +"$(dirname "$0")"/../../third_party/nxp/k32w0_sdk/sdk_fixes/patch_k32w_sdk.sh -gn gen --check --fail-on-unused-args --root="$1" "$2" --args="k32w0_sdk_root=\"$K32W061_SDK_ROOT\" is_debug=false chip_crypto=\"mbedtls\" chip_with_se05x=1" +gn gen --check --fail-on-unused-args --root="$1" "$2" --args="k32w0_sdk_root=\"$NXP_K32W0_SDK_ROOT\" is_debug=false chip_crypto=\"mbedtls\" chip_with_se05x=1" ninja -C "$2" diff --git a/src/platform/nxp/k32w/k32w0/args.gni b/src/platform/nxp/k32w/k32w0/args.gni index 74d4b41b49c486..f0d5257522aa3e 100644 --- a/src/platform/nxp/k32w/k32w0/args.gni +++ b/src/platform/nxp/k32w/k32w0/args.gni @@ -28,7 +28,7 @@ chip_build_tests = false chip_mdns = "platform" -mbedtls_target = "${chip_root}/third_party/k32w_sdk/nxp/k32w/k32w0:mbedtls" +mbedtls_target = "${chip_root}/third_party/nxp/k32w0_sdk:mbedtls" openthread_external_mbedtls = mbedtls_target openthread_project_core_config_file = "OpenThreadConfig.h" diff --git a/third_party/k32w_sdk/sdk_fixes/patch_k32w_sdk.sh b/third_party/k32w_sdk/sdk_fixes/patch_k32w_sdk.sh deleted file mode 100755 index b9258f12af134a..00000000000000 --- a/third_party/k32w_sdk/sdk_fixes/patch_k32w_sdk.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -if [[ ! -d $K32W061_SDK_ROOT ]]; then - echo "K32W061_SDK_ROOT is not set" - exit 1 -fi - -cp ./third_party/k32w_sdk/sdk_fixes/gpio_pins.h "$K32W061_SDK_ROOT"/boards/k32w061dk6/wireless_examples/openthread/reed/bm/ -cp ./third_party/k32w_sdk/sdk_fixes/pin_mux.c "$K32W061_SDK_ROOT"/boards/k32w061dk6/wireless_examples/openthread/enablement/ - -#TODO internal: https://jira.sw.nxp.com/browse/MCB-2678 -cp ./third_party/k32w_sdk/sdk_fixes/SecLib.h "$K32W061_SDK_ROOT"/middleware/wireless/framework/SecLib/ - -# TODO internal: https://jira.sw.nxp.com/browse/MCB-2675 -cp -r ./third_party/k32w_sdk/sdk_fixes/app_dual_mode_low_power.h "$K32W061_SDK_ROOT"/boards/k32w061dk6/wireless_examples/hybrid/ble_ot/lped_ble_wuart/ble_802_15_4_common/ -cp -r ./third_party/k32w_sdk/sdk_fixes/app_dual_mode_switch.h "$K32W061_SDK_ROOT"/boards/k32w061dk6/wireless_examples/hybrid/ble_ot/lped_ble_wuart/ble_802_15_4_common/ - -echo "K32W SDK MR3 QP1 was patched!" -exit 0 diff --git a/third_party/k32w_sdk/nxp/k32w/k32w0/BUILD.gn b/third_party/nxp/k32w0_sdk/BUILD.gn similarity index 100% rename from third_party/k32w_sdk/nxp/k32w/k32w0/BUILD.gn rename to third_party/nxp/k32w0_sdk/BUILD.gn diff --git a/third_party/k32w_sdk/nxp/k32w/k32w0/k32w0_executable.gni b/third_party/nxp/k32w0_sdk/k32w0_executable.gni similarity index 100% rename from third_party/k32w_sdk/nxp/k32w/k32w0/k32w0_executable.gni rename to third_party/nxp/k32w0_sdk/k32w0_executable.gni diff --git a/third_party/k32w_sdk/nxp/k32w/k32w0/k32w0_sdk.gni b/third_party/nxp/k32w0_sdk/k32w0_sdk.gni similarity index 99% rename from third_party/k32w_sdk/nxp/k32w/k32w0/k32w0_sdk.gni rename to third_party/nxp/k32w0_sdk/k32w0_sdk.gni index 4ba8446ea3a80a..b0408d28dfedb5 100644 --- a/third_party/k32w_sdk/nxp/k32w/k32w0/k32w0_sdk.gni +++ b/third_party/nxp/k32w0_sdk/k32w0_sdk.gni @@ -20,7 +20,7 @@ import("${chip_root}/src/platform/nxp/k32w/k32w0/args.gni") declare_args() { # Location of the k32w0 SDK. - k32w0_sdk_root = getenv("K32W_SDK_ROOT") + k32w0_sdk_root = getenv("NXP_K32W0_SDK_ROOT") chip_with_OM15082 = 0 chip_with_ot_cli = 0 chip_with_low_power = 0 diff --git a/third_party/k32w_sdk/sdk_fixes/SecLib.h b/third_party/nxp/k32w0_sdk/sdk_fixes/SecLib.h similarity index 100% rename from third_party/k32w_sdk/sdk_fixes/SecLib.h rename to third_party/nxp/k32w0_sdk/sdk_fixes/SecLib.h diff --git a/third_party/k32w_sdk/sdk_fixes/app_dual_mode_low_power.h b/third_party/nxp/k32w0_sdk/sdk_fixes/app_dual_mode_low_power.h similarity index 100% rename from third_party/k32w_sdk/sdk_fixes/app_dual_mode_low_power.h rename to third_party/nxp/k32w0_sdk/sdk_fixes/app_dual_mode_low_power.h diff --git a/third_party/k32w_sdk/sdk_fixes/app_dual_mode_switch.h b/third_party/nxp/k32w0_sdk/sdk_fixes/app_dual_mode_switch.h similarity index 100% rename from third_party/k32w_sdk/sdk_fixes/app_dual_mode_switch.h rename to third_party/nxp/k32w0_sdk/sdk_fixes/app_dual_mode_switch.h diff --git a/third_party/k32w_sdk/sdk_fixes/gpio_pins.h b/third_party/nxp/k32w0_sdk/sdk_fixes/gpio_pins.h similarity index 100% rename from third_party/k32w_sdk/sdk_fixes/gpio_pins.h rename to third_party/nxp/k32w0_sdk/sdk_fixes/gpio_pins.h diff --git a/third_party/nxp/k32w0_sdk/sdk_fixes/patch_k32w_sdk.sh b/third_party/nxp/k32w0_sdk/sdk_fixes/patch_k32w_sdk.sh new file mode 100755 index 00000000000000..15e34c75fa16d5 --- /dev/null +++ b/third_party/nxp/k32w0_sdk/sdk_fixes/patch_k32w_sdk.sh @@ -0,0 +1,19 @@ +#!/bin/bash + +if [[ ! -d $NXP_K32W0_SDK_ROOT ]]; then + echo "NXP_K32W0_SDK_ROOT is not set" + exit 1 +fi + +cp ./third_party/nxp/k32w0_sdk/sdk_fixes/gpio_pins.h "$NXP_K32W0_SDK_ROOT"/boards/k32w061dk6/wireless_examples/openthread/reed/bm/ +cp ./third_party/nxp/k32w0_sdk/sdk_fixes/pin_mux.c "$NXP_K32W0_SDK_ROOT"/boards/k32w061dk6/wireless_examples/openthread/enablement/ + +#TODO internal: https://jira.sw.nxp.com/browse/MCB-2678 +cp ./third_party/nxp/k32w0_sdk/sdk_fixes/SecLib.h "$NXP_K32W0_SDK_ROOT"/middleware/wireless/framework/SecLib/ + +# TODO internal: https://jira.sw.nxp.com/browse/MCB-2675 +cp -r ./third_party/nxp/k32w0_sdk/sdk_fixes/app_dual_mode_low_power.h "$NXP_K32W0_SDK_ROOT"/boards/k32w061dk6/wireless_examples/hybrid/ble_ot/lped_ble_wuart/ble_802_15_4_common/ +cp -r ./third_party/nxp/k32w0_sdk/sdk_fixes/app_dual_mode_switch.h "$NXP_K32W0_SDK_ROOT"/boards/k32w061dk6/wireless_examples/hybrid/ble_ot/lped_ble_wuart/ble_802_15_4_common/ + +echo "K32W SDK MR3 QP1 was patched!" +exit 0 diff --git a/third_party/k32w_sdk/sdk_fixes/pin_mux.c b/third_party/nxp/k32w0_sdk/sdk_fixes/pin_mux.c similarity index 100% rename from third_party/k32w_sdk/sdk_fixes/pin_mux.c rename to third_party/nxp/k32w0_sdk/sdk_fixes/pin_mux.c diff --git a/third_party/openthread/platforms/nxp/k32w/k32w0/BUILD.gn b/third_party/openthread/platforms/nxp/k32w/k32w0/BUILD.gn index 746b0908e8794f..f78dda627c5f47 100644 --- a/third_party/openthread/platforms/nxp/k32w/k32w0/BUILD.gn +++ b/third_party/openthread/platforms/nxp/k32w/k32w0/BUILD.gn @@ -15,7 +15,7 @@ import("//build_overrides/chip.gni") import("//build_overrides/k32w0_sdk.gni") import("//build_overrides/openthread.gni") -import("${chip_root}/third_party/k32w_sdk/nxp/k32w/k32w0/k32w0_sdk.gni") +import("${chip_root}/third_party/nxp/k32w0_sdk/k32w0_sdk.gni") openthread_nxp_root = "${chip_root}/third_party/openthread/ot-nxp"