From 08805ebfb650a02ce3ce285c1b2d10f6c243219b Mon Sep 17 00:00:00 2001 From: "Ching-Hsin,Lee" Date: Tue, 9 Jul 2024 15:21:48 +0800 Subject: [PATCH 1/8] Update changelog for v202407.00 release --- CHANGELOG.md | 17 ++++++++ README.md | 26 ++++++------ idt_config/dummyPublicKeyAsciiHex.txt | 6 --- idt_config/linux/build.sh | 10 ----- idt_config/linux/config.json | 19 --------- idt_config/linux/device.json | 60 --------------------------- idt_config/linux/flash.sh | 11 ----- idt_config/linux/userdata.json | 48 --------------------- idt_config/mac/build.sh | 10 ----- idt_config/mac/config.json | 19 --------- idt_config/mac/device.json | 60 --------------------------- idt_config/mac/flash.sh | 11 ----- idt_config/mac/userdata.json | 48 --------------------- idt_config/windows/build.bat | 10 ----- idt_config/windows/config.json | 19 --------- idt_config/windows/device.json | 60 --------------------------- idt_config/windows/flash.bat | 8 ---- idt_config/windows/userdata.json | 48 --------------------- 18 files changed, 30 insertions(+), 460 deletions(-) delete mode 100644 idt_config/dummyPublicKeyAsciiHex.txt delete mode 100755 idt_config/linux/build.sh delete mode 100644 idt_config/linux/config.json delete mode 100644 idt_config/linux/device.json delete mode 100755 idt_config/linux/flash.sh delete mode 100644 idt_config/linux/userdata.json delete mode 100755 idt_config/mac/build.sh delete mode 100644 idt_config/mac/config.json delete mode 100644 idt_config/mac/device.json delete mode 100755 idt_config/mac/flash.sh delete mode 100644 idt_config/mac/userdata.json delete mode 100644 idt_config/windows/build.bat delete mode 100644 idt_config/windows/config.json delete mode 100644 idt_config/windows/device.json delete mode 100644 idt_config/windows/flash.bat delete mode 100644 idt_config/windows/userdata.json diff --git a/CHANGELOG.md b/CHANGELOG.md index 107949c..f0ba03e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,22 @@ # Changelog for NXP i.MX RT1060 Featured FreeRTOS IoT Integration +## v202407.00 ( July 2024 ) + +- [#48](https://github.com/FreeRTOS/iot-reference-nxp-rt1060/pull/48) Update third party submodule + * [Unity v2.6.0](https://github.com/ThrowTheSwitch/Unity/tree/v2.6.0) + * [mbedtls v2.28.8](https://github.com/Mbed-TLS/mbedtls/tree/v2.28.8) +- [#47](https://github.com/FreeRTOS/iot-reference-nxp-rt1060/pull/47) Update integration test to 202406.00 version +- [#45](https://github.com/FreeRTOS/iot-reference-nxp-rt1060/pull/45) Switch to modular OTA and aws-iot-core-mqtt-file-streams-embedded-c. Update Long Term Support (LTS) libraries to 202406.00. + * [FreeRTOS-Kernel V11.1.0](https://github.com/FreeRTOS/FreeRTOS-Kernel/blob/V11.1.0) + * [coreMQTT v2.3.0](https://github.com/FreeRTOS/coreMQTT/blob/v2.3.0) + * [corePKCS11 v3.6.1](https://github.com/FreeRTOS/corePKCS11/tree/v3.6.1) + * [coreJSON v3.3.0](https://github.com/FreeRTOS/coreJSON/tree/v3.3.0) + * [backoffAlgorithm v1.4.1](https://github.com/FreeRTOS/backoffAlgorithm/tree/v1.4.1) + * [AWS IoT Jobs v1.5.1](https://github.com/aws/Jobs-for-AWS-IoT-embedded-sdk/tree/v1.5.1) + * [AWS IoT Device Shadow v1.4.1](https://github.com/aws/Device-Shadow-for-AWS-IoT-embedded-sdk/tree/v1.4.1) + * [AWS IoT Device Defender v1.4.0](https://github.com/aws/Device-Defender-for-AWS-IoT-embedded-sdk/tree/v1.4.0) + * [AWS MQTT file streams v1.1.0](https://github.com/aws/aws-iot-core-mqtt-file-streams-embedded-c/tree/v1.1.0) + ## v202212.00 ( December 2022 ) - [#33](https://github.com/FreeRTOS/iot-reference-nxp-rt1060/pull/33) and [#29](https://github.com/FreeRTOS/iot-reference-nxp-rt1060/pull/29) Update Long Term Support (LTS) libraries to 202210.01-LTS: * [FreeRTOS-Kernel V10.5.1](https://github.com/FreeRTOS/FreeRTOS-Kernel/blob/V10.5.1/History.txt) diff --git a/README.md b/README.md index beeb98e..e3e315d 100644 --- a/README.md +++ b/README.md @@ -11,19 +11,19 @@ For more details on the feature, see the [NXP Featured IoT Reference Integration ### Folder Structure The folder inside the repository is organized as follows: ``` -|— core/ -|- Middleware/ - |- NXP/ - |- AWS/ - |- FreeRTOS/ - |- third_party libs -|- examples/ - |- evkbmimxrt1060/ - |- common/ -|- projects/ - |- evkbmimxrt1060/ -|- README.md -|- LICENSE +├─ core/ +├─ Middleware/ +│  ├─ NXP/ +│ ├─ AWS/ +│ ├─ FreeRTOS/ +│ └─ third_party libs +├─ examples/ +│ ├─ evkbmimxrt1060/ +│ └─ common/ +├─ projects/ +│ └─ evkbmimxrt1060/ +├─ README.md +└─ LICENSE ``` The root of the repository contains the following top level folders: * `core` contains submodules to NXP's MCUX SDK repository. The repository hosts the MCUXpresso software development package which contains ARM CMSIS core files, diff --git a/idt_config/dummyPublicKeyAsciiHex.txt b/idt_config/dummyPublicKeyAsciiHex.txt deleted file mode 100644 index 4772b24..0000000 --- a/idt_config/dummyPublicKeyAsciiHex.txt +++ /dev/null @@ -1,6 +0,0 @@ -3059 3013 0607 2a86 48ce 3d02 0106 082a -8648 ce3d 0301 0703 4200 04cd 6569 ceb8 -1bb9 1e72 339f e8cf 60ef 0f9f b473 33ac -6f19 1813 6999 3fa0 c293 5fae 08f1 1ad0 -41b7 345c e746 1046 228e 5a5f d787 d571 -dcb2 4e8d 75b3 2586 e2cc 0c \ No newline at end of file diff --git a/idt_config/linux/build.sh b/idt_config/linux/build.sh deleted file mode 100755 index 5b8f69d..0000000 --- a/idt_config/linux/build.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/zsh -SOURCE_PATH=$1 -IDE_PATH= -TOOLCHAIN_PATH=$IDE_PATH/ide/tools/bin -IDE=$IDE_PATH/ide/MCUXpressoIDE.app/Contents/MacOS/mcuxpressoide -rm -r $SOURCE_PATH/.metadata -$IDE -nosplash -application org.eclipse.cdt.managedbuilder.core.headlessbuild -data $SOURCE_PATH -verbose -import "$SOURCE_PATH/projects/evkmimxrt1060/bootloader" -build bootloader/Debug && \ -$IDE -nosplash -application org.eclipse.cdt.managedbuilder.core.headlessbuild -data $SOURCE_PATH -verbose -import "$SOURCE_PATH/projects/evkmimxrt1060/test" -build aws_iot_qual_test/Debug && \ -python3 "$SOURCE_PATH/Middleware/mcuboot/scripts/imgtool.py" sign -k $SOURCE_PATH/examples/evkbmimxrt1060/bootloader/signing_key.pem --align 4 --header-size 0x400 --pad-header --slot-size 0x200000 --max-sectors 800 --version "1.0" --pad --confirm $SOURCE_PATH/projects/evkmimxrt1060/test/Debug/aws_iot_qual_test.bin $SOURCE_PATH/projects/evkmimxrt1060/test/Debug/aws_iot_qual_test_signed.bin && \ -python3 "$SOURCE_PATH/Middleware/mcuboot/scripts/imgtool.py" sign -k $SOURCE_PATH/examples/evkbmimxrt1060/bootloader/signing_key.pem --align 4 --header-size 0x400 --pad-header --slot-size 0x200000 --max-sectors 800 --version "1.0" $SOURCE_PATH/projects/evkmimxrt1060/test/Debug/aws_iot_qual_test.bin $SOURCE_PATH/projects/evkmimxrt1060/test/Debug/aws_iot_qual_test_signed_OTA.bin \ No newline at end of file diff --git a/idt_config/linux/config.json b/idt_config/linux/config.json deleted file mode 100644 index f831a3a..0000000 --- a/idt_config/linux/config.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "log": { - "location": "../logs/" - }, - "configFiles": { - "root": "../configs", - "device": "../configs/device.json" - }, - "testPath": "../tests/", - "reportPath": "../results/", - "certificatePath": "../certificates/", - "awsRegion": "", - "auth": { - "method": "file", - "credentials": { - "profile": "" - } - } -} diff --git a/idt_config/linux/device.json b/idt_config/linux/device.json deleted file mode 100644 index 4cbe017..0000000 --- a/idt_config/linux/device.json +++ /dev/null @@ -1,60 +0,0 @@ -[ - { - "id":"nxp-test", - "sku":"", - "features":[ - { - "name":"Wifi", - "value":"No" - }, - { - "name":"Cellular", - "value":"No" - }, - { - "name":"BLE", - "value":"No" - }, - { - "name":"PKCS11", - "value":"ECC" - }, - { - "name":"OTA", - "value":"Yes", - "configs":[ - { - "name":"OTADataPlaneProtocol", - "value":"MQTT" - } - ] - }, - { - "name":"KeyProvisioning", - "value":"No" - } - ], - "devices":[ - { - "id":"nxp", - "connectivity":{ - "protocol":"uart", - "serialPort":"" - }, - "secureElementConfig" : { - "publicKeyAsciiHexFilePath" : "", - "publicDeviceCertificateArn": "", - "secureElementSerialNumber": "", - "preProvisioned" : "Yes", - "pkcs11JITPCodeVerifyRootCertSupport": "No" - }, - "identifiers":[ - { - "name":"serialNo", - "value":"" - } - ] - } - ] - } -] diff --git a/idt_config/linux/flash.sh b/idt_config/linux/flash.sh deleted file mode 100755 index 448d381..0000000 --- a/idt_config/linux/flash.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/zsh - -SOURCE_PATH=$1 -IDE_PATH= -MCUX_WORKSPACE_LOC=$SOURCE_PATH -MCUX_FLASH_DIR0= -MCUX_FLASH_DIR1=$SOURCE_PATH/.mcuxpressoide_packages_support/MIMXRT1062xxxxA_support/Flash -MCUX_IDE_BIN= -$MCUX_IDE_BIN/crt_emu_cm_redlink --flash-mass -p MIMXRT1062xxxxA --ConnectScript RT1060_connect.scp -ProbeHandle=1 -CoreIndex=0 --flash-driver LPC11_12_13_32K_8K.cfx -x $MCUX_WORKSPACE_LOC/projects/evkmimxrt1060/bootloader/Debug --flash-dir $MCUX_FLASH_DIR0 --flash-dir $MCUX_FLASH_DIR1 --flash-hashing -$MCUX_IDE_BIN/crt_emu_cm_redlink --flash-load-exec "$MCUX_WORKSPACE_LOC/projects/evkmimxrt1060/bootloader/Debug/bootloader.bin" -p MIMXRT1062xxxxA --load-base=0x60000000 --ConnectScript RT1060_connect.scp -ProbeHandle=1 -CoreIndex=0 --flash-driver= -x $MCUX_WORKSPACE_LOC/projects/evkmimxrt1060/bootloader/Debug --flash-dir $MCUX_FLASH_DIR0 --flash-dir $MCUX_FLASH_DIR1 --flash-hashing -$MCUX_IDE_BIN/crt_emu_cm_redlink --flash-load-exec "$MCUX_WORKSPACE_LOC/projects/evkmimxrt1060/test/Debug/aws_iot_qual_test_signed.bin" -p MIMXRT1062xxxxA --load-base=0x60040000 --ConnectScript RT1060_connect.scp -ProbeHandle=1 -CoreIndex=0 --flash-driver LPC11_12_13_32K_8K.cfx -x $MCUX_WORKSPACE_LOC/projects/evkmimxrt1060/test/Debug --flash-dir $MCUX_FLASH_DIR0 --flash-dir $MCUX_FLASH_DIR1 --flash-hashing \ No newline at end of file diff --git a/idt_config/linux/userdata.json b/idt_config/linux/userdata.json deleted file mode 100644 index ea7a078..0000000 --- a/idt_config/linux/userdata.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "sourcePath": "", - "freeRTOSTestParamConfigPath": "{{testData.sourcePath}}/examples/evkbmimxrt1060/test/include/test_param_config.h", - "freeRTOSTestExecutionConfigPath": "{{testData.sourcePath}}/examples/evkbmimxrt1060/test/include/test_execution_config.h", - "freeRTOSVersion": "202210.01-LTS", - "buildTool": { - "name": "nxp-build", - "version": "1.0.0", - "command": [ - "{{config.idtRootPath}}/configs/build.sh {{testData.sourcePath}}" - ] - }, - "flashTool": { - "name": "nxp-flash", - "version": "1.0.0", - "command": [ - "{{config.idtRootPath}}/configs/flash.sh {{testData.sourcePath}}" - ] - }, - "testStartDelayms": 5000, - "echoServerCertificateConfiguration": { - "certificateGenerationMethod": "Automatic" - }, - "echoServerConfiguration": { - "keyGenerationMethod": "EC", - "serverPort": 9000 - }, - "otaConfiguration": { - "otaPALCertificatePath": "sss:00223346", - "otaE2EFirmwarePath":"{{testData.sourcePath}}/projects/evkmimxrt1060/test/Debug/aws_iot_qual_test_signed_OTA.bin", - "deviceFirmwarePath":"NA", - "codeSigningConfiguration": { - "signingMethod": "AWS", - "signerHashingAlgorithm": "SHA256", - "signerSigningAlgorithm": "ECDSA", - "signerCertificate": "", - "untrustedSignerCertificate": "", - "signerCertificateFileName": "sss:00223344", - "compileSignerCertificate": false, - "signerPlatform": "AmazonFreeRTOS-Default" - } - }, - "pkcs11LabelConfiguration":{ - "pkcs11LabelPreProvisionedECDevicePrivateKeyForTLS": "\"sss:F0000000\"", - "pkcs11LabelPreProvisionedECDevicePublicKeyForTLS": "\"sss:00223345\"", - "pkcs11LabelPreProvisionedECDeviceCertificateForTLS": "\"sss:F0000001\"" - } -} \ No newline at end of file diff --git a/idt_config/mac/build.sh b/idt_config/mac/build.sh deleted file mode 100755 index ec3a48b..0000000 --- a/idt_config/mac/build.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/zsh -SOURCE_PATH=$1 -IDE_PATH= -TOOLCHAIN_PATH=$IDE_PATH/ide/tools/bin -IDE=$IDE_PATH/ide/MCUXpressoIDE.app/Contents/MacOS/mcuxpressoide -rm -r $SOURCE_PATH/.metadata -$IDE -nosplash -application org.eclipse.cdt.managedbuilder.core.headlessbuild -data $SOURCE_PATH -verbose -import "$SOURCE_PATH/projects/evkmimxrt1060/bootloader" -build bootloader/Debug && \ -$IDE -nosplash -application org.eclipse.cdt.managedbuilder.core.headlessbuild -data $SOURCE_PATH -verbose -import "$SOURCE_PATH/projects/evkmimxrt1060/test" -build aws_iot_qual_test/Debug && \ -python3 "$SOURCE_PATH/Middleware/mcuboot/scripts/imgtool.py" sign -k $SOURCE_PATH/examples/evkbmimxrt1060/bootloader/signing_key.pem --align 4 --header-size 0x400 --pad-header --slot-size 0x200000 --max-sectors 800 --version "1.0" --pad --confirm $SOURCE_PATH/projects/evkmimxrt1060/test/Debug/aws_iot_qual_test.bin $SOURCE_PATH/projects/evkmimxrt1060/test/Debug/aws_iot_qual_test_signed.bin && \ -python3 "$SOURCE_PATH/Middleware/mcuboot/scripts/imgtool.py" sign -k $SOURCE_PATH/examples/evkbmimxrt1060/bootloader/signing_key.pem --align 4 --header-size 0x400 --pad-header --slot-size 0x200000 --max-sectors 800 --version "1.0" $SOURCE_PATH/projects/evkmimxrt1060/test/Debug/aws_iot_qual_test.bin $SOURCE_PATH/projects/evkmimxrt1060/test/Debug/aws_iot_qual_test_signed_OTA.bin diff --git a/idt_config/mac/config.json b/idt_config/mac/config.json deleted file mode 100644 index f831a3a..0000000 --- a/idt_config/mac/config.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "log": { - "location": "../logs/" - }, - "configFiles": { - "root": "../configs", - "device": "../configs/device.json" - }, - "testPath": "../tests/", - "reportPath": "../results/", - "certificatePath": "../certificates/", - "awsRegion": "", - "auth": { - "method": "file", - "credentials": { - "profile": "" - } - } -} diff --git a/idt_config/mac/device.json b/idt_config/mac/device.json deleted file mode 100644 index 4cbe017..0000000 --- a/idt_config/mac/device.json +++ /dev/null @@ -1,60 +0,0 @@ -[ - { - "id":"nxp-test", - "sku":"", - "features":[ - { - "name":"Wifi", - "value":"No" - }, - { - "name":"Cellular", - "value":"No" - }, - { - "name":"BLE", - "value":"No" - }, - { - "name":"PKCS11", - "value":"ECC" - }, - { - "name":"OTA", - "value":"Yes", - "configs":[ - { - "name":"OTADataPlaneProtocol", - "value":"MQTT" - } - ] - }, - { - "name":"KeyProvisioning", - "value":"No" - } - ], - "devices":[ - { - "id":"nxp", - "connectivity":{ - "protocol":"uart", - "serialPort":"" - }, - "secureElementConfig" : { - "publicKeyAsciiHexFilePath" : "", - "publicDeviceCertificateArn": "", - "secureElementSerialNumber": "", - "preProvisioned" : "Yes", - "pkcs11JITPCodeVerifyRootCertSupport": "No" - }, - "identifiers":[ - { - "name":"serialNo", - "value":"" - } - ] - } - ] - } -] diff --git a/idt_config/mac/flash.sh b/idt_config/mac/flash.sh deleted file mode 100755 index 422d704..0000000 --- a/idt_config/mac/flash.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/zsh - -SOURCE_PATH=$1 -IDE_PATH= -MCUX_WORKSPACE_LOC=$SOURCE_PATH -MCUX_FLASH_DIR0= -MCUX_FLASH_DIR1=$SOURCE_PATH/.mcuxpressoide_packages_support/MIMXRT1062xxxxA_support/Flash -MCUX_IDE_BIN= -$MCUX_IDE_BIN/crt_emu_cm_redlink --flash-mass -p MIMXRT1062xxxxA --ConnectScript RT1060_connect.scp -ProbeHandle=1 -CoreIndex=0 --flash-driver LPC11_12_13_32K_8K.cfx -x $MCUX_WORKSPACE_LOC/projects/evkmimxrt1060/bootloader/Debug --flash-dir $MCUX_FLASH_DIR0 --flash-dir $MCUX_FLASH_DIR1 --flash-hashing -$MCUX_IDE_BIN/crt_emu_cm_redlink --flash-load-exec "$MCUX_WORKSPACE_LOC/projects/evkmimxrt1060/bootloader/Debug/bootloader.bin" -p MIMXRT1062xxxxA --load-base=0x60000000 --ConnectScript RT1060_connect.scp -ProbeHandle=1 -CoreIndex=0 --flash-driver= -x $MCUX_WORKSPACE_LOC/projects/evkmimxrt1060/bootloader/Debug --flash-dir $MCUX_FLASH_DIR0 --flash-dir $MCUX_FLASH_DIR1 --flash-hashing -$MCUX_IDE_BIN/crt_emu_cm_redlink --flash-load-exec "$MCUX_WORKSPACE_LOC/projects/evkmimxrt1060/test/Debug/aws_iot_qual_test_signed.bin" -p MIMXRT1062xxxxA --load-base=0x60040000 --ConnectScript RT1060_connect.scp -ProbeHandle=1 -CoreIndex=0 --flash-driver LPC11_12_13_32K_8K.cfx -x $MCUX_WORKSPACE_LOC/projects/evkmimxrt1060/test/Debug --flash-dir $MCUX_FLASH_DIR0 --flash-dir $MCUX_FLASH_DIR1 --flash-hashing \ No newline at end of file diff --git a/idt_config/mac/userdata.json b/idt_config/mac/userdata.json deleted file mode 100644 index ea7a078..0000000 --- a/idt_config/mac/userdata.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "sourcePath": "", - "freeRTOSTestParamConfigPath": "{{testData.sourcePath}}/examples/evkbmimxrt1060/test/include/test_param_config.h", - "freeRTOSTestExecutionConfigPath": "{{testData.sourcePath}}/examples/evkbmimxrt1060/test/include/test_execution_config.h", - "freeRTOSVersion": "202210.01-LTS", - "buildTool": { - "name": "nxp-build", - "version": "1.0.0", - "command": [ - "{{config.idtRootPath}}/configs/build.sh {{testData.sourcePath}}" - ] - }, - "flashTool": { - "name": "nxp-flash", - "version": "1.0.0", - "command": [ - "{{config.idtRootPath}}/configs/flash.sh {{testData.sourcePath}}" - ] - }, - "testStartDelayms": 5000, - "echoServerCertificateConfiguration": { - "certificateGenerationMethod": "Automatic" - }, - "echoServerConfiguration": { - "keyGenerationMethod": "EC", - "serverPort": 9000 - }, - "otaConfiguration": { - "otaPALCertificatePath": "sss:00223346", - "otaE2EFirmwarePath":"{{testData.sourcePath}}/projects/evkmimxrt1060/test/Debug/aws_iot_qual_test_signed_OTA.bin", - "deviceFirmwarePath":"NA", - "codeSigningConfiguration": { - "signingMethod": "AWS", - "signerHashingAlgorithm": "SHA256", - "signerSigningAlgorithm": "ECDSA", - "signerCertificate": "", - "untrustedSignerCertificate": "", - "signerCertificateFileName": "sss:00223344", - "compileSignerCertificate": false, - "signerPlatform": "AmazonFreeRTOS-Default" - } - }, - "pkcs11LabelConfiguration":{ - "pkcs11LabelPreProvisionedECDevicePrivateKeyForTLS": "\"sss:F0000000\"", - "pkcs11LabelPreProvisionedECDevicePublicKeyForTLS": "\"sss:00223345\"", - "pkcs11LabelPreProvisionedECDeviceCertificateForTLS": "\"sss:F0000001\"" - } -} \ No newline at end of file diff --git a/idt_config/windows/build.bat b/idt_config/windows/build.bat deleted file mode 100644 index 1f35491..0000000 --- a/idt_config/windows/build.bat +++ /dev/null @@ -1,10 +0,0 @@ -SET IDE_PATH= -SET SOURCE_PATH=%1% -SET TOOLCHAIN_PATH=%IDE_PATH%\ide\tools\bin -SET IDE=%IDE_PATH%\ide\mcuxpressoidec.exe -ECHO %PATH%|findstr /i /c:"%TOOLCHAIN_PATH:"=%">nul || set PATH=%PATH%;%TOOLCHAIN_PATH% -RD/S/Q "%SOURCE_PATH%\.metadata" -"%IDE%" -nosplash -application org.eclipse.cdt.managedbuilder.core.headlessbuild -data "%SOURCE_PATH%" -verbose -import "%SOURCE_PATH%\projects\evkmimxrt1060\bootloader" -build bootloader/Debug -"%IDE%" -nosplash -application org.eclipse.cdt.managedbuilder.core.headlessbuild -data "%SOURCE_PATH%" -verbose -import "%SOURCE_PATH%\projects\evkmimxrt1060\test" -build aws_iot_qual_test/Debug -py "%SOURCE_PATH%\Middleware\mcuboot\scripts\imgtool.py" sign -k %SOURCE_PATH%\examples\evkbmimxrt1060\bootloader\signing_key.pem --align 4 --header-size 0x400 --pad-header --slot-size 0x200000 --max-sectors 800 --version "1.0" --pad --confirm %SOURCE_PATH%\projects\evkmimxrt1060\test\Debug\aws_iot_qual_test.bin %SOURCE_PATH%\projects\evkmimxrt1060\test\Debug\aws_iot_qual_test_signed.bin -py "%SOURCE_PATH%\Middleware\mcuboot\scripts\imgtool.py" sign -k %SOURCE_PATH%\examples\evkbmimxrt1060\bootloader\signing_key.pem --align 4 --header-size 0x400 --pad-header --slot-size 0x200000 --max-sectors 800 --version "1.0" %SOURCE_PATH%\projects\evkmimxrt1060\test\Debug\aws_iot_qual_test.bin %SOURCE_PATH%\projects\evkmimxrt1060\test\Debug\aws_iot_qual_test_signed_OTA.bin \ No newline at end of file diff --git a/idt_config/windows/config.json b/idt_config/windows/config.json deleted file mode 100644 index 625ba46..0000000 --- a/idt_config/windows/config.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "log": { - "location": "../logs/" - }, - "configFiles": { - "root": "../configs", - "device": "../configs/device.json" - }, - "testPath": "../tests/", - "reportPath": "../results/", - "certificatePath": "../certificates/", - "awsRegion": "", - "auth": { - "method": "file", - "credentials": { - "profile": "" - } - } - } \ No newline at end of file diff --git a/idt_config/windows/device.json b/idt_config/windows/device.json deleted file mode 100644 index 8a8f819..0000000 --- a/idt_config/windows/device.json +++ /dev/null @@ -1,60 +0,0 @@ -[ - { - "id":"nxp-test", - "sku":"", - "features":[ - { - "name":"Wifi", - "value":"No" - }, - { - "name":"Cellular", - "value":"No" - }, - { - "name":"BLE", - "value":"No" - }, - { - "name":"PKCS11", - "value":"ECC" - }, - { - "name":"OTA", - "value":"Yes", - "configs":[ - { - "name":"OTADataPlaneProtocol", - "value":"MQTT" - } - ] - }, - { - "name":"KeyProvisioning", - "value":"No" - } - ], - "devices":[ - { - "id":"nxp", - "connectivity":{ - "protocol":"uart", - "serialPort":"" - }, - "secureElementConfig" : { - "publicKeyAsciiHexFilePath" : "", - "publicDeviceCertificateArn": "", - "secureElementSerialNumber": "", - "preProvisioned" : "Yes", - "pkcs11JITPCodeVerifyRootCertSupport": "No" - }, - "identifiers":[ - { - "name":"serialNo", - "value":"" - } - ] - } - ] - } - ] diff --git a/idt_config/windows/flash.bat b/idt_config/windows/flash.bat deleted file mode 100644 index 4c428d6..0000000 --- a/idt_config/windows/flash.bat +++ /dev/null @@ -1,8 +0,0 @@ -SET SOURCE_PATH=%1% -set MCUX_WORKSPACE_LOC=%SOURCE_PATH% -set MCUX_FLASH_DIR0= -set MCUX_FLASH_DIR1=%SOURCE_PATH%/.mcuxpressoide_packages_support/MIMXRT1062xxxxA_support -set MCUX_IDE_BIN= -%MCUX_IDE_BIN%/crt_emu_cm_redlink --flash-mass -p MIMXRT1062xxxxA --ConnectScript RT1060_connect.scp -ProbeHandle=1 -CoreIndex=0 --flash-driver LPC11_12_13_32K_8K.cfx -x %MCUX_WORKSPACE_LOC%/projects/evkmimxrt1060/bootloader/Debug --flash-dir %MCUX_FLASH_DIR0% --flash-dir %MCUX_FLASH_DIR1% --flash-hashing -%MCUX_IDE_BIN%/crt_emu_cm_redlink --flash-load-exec "%MCUX_WORKSPACE_LOC%/projects/evkmimxrt1060/bootloader/Debug/bootloader.bin" -p MIMXRT1062xxxxA --load-base=0x60000000 --ConnectScript RT1060_connect.scp -ProbeHandle=1 -CoreIndex=0 --flash-driver= -x %MCUX_WORKSPACE_LOC%/projects/evkmimxrt1060/bootloader/Debug --flash-dir %MCUX_FLASH_DIR0% --flash-dir %MCUX_FLASH_DIR1% --flash-hashing -%MCUX_IDE_BIN%/crt_emu_cm_redlink --flash-load-exec "%MCUX_WORKSPACE_LOC%/projects/evkmimxrt1060/test/Debug/aws_iot_qual_test_signed.bin" -p MIMXRT1062xxxxA --load-base=0x60040000 --ConnectScript RT1060_connect.scp -ProbeHandle=1 -CoreIndex=0 --flash-driver LPC11_12_13_32K_8K.cfx -x %MCUX_WORKSPACE_LOC%/projects/evkmimxrt1060/test/Debug --flash-dir %MCUX_FLASH_DIR0% --flash-dir %MCUX_FLASH_DIR1% --flash-hashing \ No newline at end of file diff --git a/idt_config/windows/userdata.json b/idt_config/windows/userdata.json deleted file mode 100644 index 82b1d3e..0000000 --- a/idt_config/windows/userdata.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "sourcePath": "", - "freeRTOSTestParamConfigPath": "{{testData.sourcePath}}/examples/evkbmimxrt1060/test/include/test_param_config.h", - "freeRTOSTestExecutionConfigPath": "{{testData.sourcePath}}/examples/evkbmimxrt1060/test/include/test_execution_config.h", - "freeRTOSVersion": "202210.01-LTS", - "buildTool": { - "name": "nxp-build", - "version": "1.0.0", - "command": [ - "{{config.idtRootPath}}/configs/build.bat {{testData.sourcePath}}" - ] - }, - "flashTool": { - "name": "nxp-flash", - "version": "1.0.0", - "command": [ - "{{config.idtRootPath}}/configs/flash.bat {{testData.sourcePath}}" - ] - }, - "testStartDelayms": 5000, - "echoServerCertificateConfiguration": { - "certificateGenerationMethod": "Automatic" - }, - "echoServerConfiguration": { - "keyGenerationMethod": "EC", - "serverPort": 9000 - }, - "otaConfiguration": { - "otaPALCertificatePath": "sss:00223346", - "otaE2EFirmwarePath":"{{testData.sourcePath}}/projects/evkmimxrt1060/test/Debug/aws_iot_qual_test_signed_OTA.bin", - "deviceFirmwarePath":"NA", - "codeSigningConfiguration": { - "signingMethod": "AWS", - "signerHashingAlgorithm": "SHA256", - "signerSigningAlgorithm": "ECDSA", - "signerCertificate": "", - "untrustedSignerCertificate": "", - "signerCertificateFileName": "sss:00223344", - "compileSignerCertificate": false, - "signerPlatform": "AmazonFreeRTOS-Default" - } - }, - "pkcs11LabelConfiguration":{ - "pkcs11LabelPreProvisionedECDevicePrivateKeyForTLS": "\"sss:F0000000\"", - "pkcs11LabelPreProvisionedECDevicePublicKeyForTLS": "\"sss:00223345\"", - "pkcs11LabelPreProvisionedECDeviceCertificateForTLS": "\"sss:F0000001\"" - } -} \ No newline at end of file From 48771054cbb71133b02d31876cad0783ad01a00f Mon Sep 17 00:00:00 2001 From: "Ching-Hsin,Lee" Date: Tue, 9 Jul 2024 15:42:26 +0800 Subject: [PATCH 2/8] Add release yml file --- .github/workflows/release.yml | 106 ++++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) create mode 100644 .github/workflows/release.yml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..7a0a96f --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,106 @@ +name: Release automation + +on: + workflow_dispatch: + inputs: + commit_id: + description: 'Commit ID/branch to tag and create a release for' + required: true + version_number: + description: 'Release Version (Eg, 202012.00-LTS)' + required: true + +env: + repository_name: iot-reference-nxp-rt1060 + repository_compressed_name: ${{ env.repository_name }}v${{ github.event.inputs.version_number }} + repostiory_zip_name: ${{ env.repository_compressed_name }}.zip + +jobs: + tag-commit: + name: Tag commit + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v4 + with: + ref: ${{ github.event.inputs.commit_id }} + - name: Configure git identity + run: | + git config --global user.name ${{ github.actor }} + git config --global user.email ${{ github.actor }}@users.noreply.github.com + - name: create a new branch that references commit id + run: git checkout -b ${{ github.event.inputs.version_number }} ${{ github.event.inputs.commit_id }} + - name: Tag Commit and Push to remote + run: | + git tag ${{ github.event.inputs.version_number }} -a -m "Release ${{ github.event.inputs.version_number }}" + git push origin --tags + - name: Verify tag on remote + run: | + git tag -d ${{ github.event.inputs.version_number }} + git remote update + git checkout tags/${{ github.event.inputs.version_number }} + git diff ${{ github.event.inputs.commit_id }} tags/${{ github.event.inputs.version_number }} + create-zip: + needs: tag-commit + name: Create ZIP and verify package for release asset. + runs-on: ubuntu-latest + steps: + - name: Install ZIP tools + run: sudo apt-get install zip unzip + - name: Checkout code + uses: actions/checkout@v4 + with: + ref: ${{ github.event.inputs.commit_id }} + path: ${{ env.repository_name }} + submodules: recursive + - name: Checkout disabled submodules + run: | + cd ${{ env.repository_name }} + git submodule update --init --checkout --recursive + - name: Create ZIP + run: | + zip -r ${{ env.repostiory_zip_name }} ${{ env.repository_name }} -x "*.git*" + ls ./ + - name: Validate created ZIP + run: | + mkdir zip-check + mv ${{ env.repostiory_zip_name }} zip-check + cd zip-check + unzip ${{ env.repostiory_zip_name }} -d ${{ repository_compressed_name }} + ls ${{ repository_compressed_name }} + diff -r -x "*.git*" ${{ env.repository_compressed_name }}/${{ env.repository_name }}/ ../${{ env.repository_name }}/ + - name: Create artifact of ZIP + uses: actions/upload-artifact@v2 + with: + name: ${{ env.repostiory_zip_name }} + path: zip-check/${{ env.repostiory_zip_name }} + create-release: + needs: create-zip + name: Create Release and Upload Release Asset + runs-on: ubuntu-latest + steps: + - name: Create Release + id: create_release + uses: actions/create-release@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + tag_name: ${{ github.event.inputs.version_number }} + release_name: ${{ github.event.inputs.version_number }} + body: ${{ github.event.inputs.version_number }} Release + draft: false + prerelease: false + - name: Download ZIP artifact + uses: actions/download-artifact@v2 + with: + name: ${{ env.repostiory_zip_name }} + - name: Upload Release Asset + id: upload-release-asset + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} + asset_path: ./${{ env.repostiory_zip_name }} + asset_name: ${{ env.repostiory_zip_name }} + asset_content_type: application/zip From b81f37b24f03765038f154423a8614626c95b485 Mon Sep 17 00:00:00 2001 From: "Ching-Hsin,Lee" Date: Tue, 9 Jul 2024 16:19:38 +0800 Subject: [PATCH 3/8] Update manifest file for v202407.00 --- manifest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.yml b/manifest.yml index aacaa5e..03cbecb 100644 --- a/manifest.yml +++ b/manifest.yml @@ -1,5 +1,5 @@ name : "NXP i.MXRT1060 and EdgeLock® SE050 Reference Integration" -version: "v202210.01" +version: "v202407.00" description: |- "Reference IoT integration project using NXP i.MX RT1060 with EdgeLock® SE050 secure element and FreeRTOS LTS libraries" dependencies: From 1f4dc20370dbfa8b66deff38c1e51e0dd6fd3437 Mon Sep 17 00:00:00 2001 From: "Ching-Hsin,Lee" Date: Fri, 26 Jul 2024 10:52:39 +0800 Subject: [PATCH 4/8] Update coreMQTT version to v2.3.1 --- Middleware/FreeRTOS/coreMQTT | 2 +- manifest.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Middleware/FreeRTOS/coreMQTT b/Middleware/FreeRTOS/coreMQTT index 3f4cedc..2beef04 160000 --- a/Middleware/FreeRTOS/coreMQTT +++ b/Middleware/FreeRTOS/coreMQTT @@ -1 +1 @@ -Subproject commit 3f4cedc1ad027d76b2f00c2f83481b212b7a8632 +Subproject commit 2beef04725328923e05e576b884212d53ec97af7 diff --git a/manifest.yml b/manifest.yml index aacaa5e..9ddc143 100644 --- a/manifest.yml +++ b/manifest.yml @@ -16,7 +16,7 @@ dependencies: url: "https://github.com/FreeRTOS/coreJSON.git" path: "Middleware/FreeRTOS/coreJSON" - name: "coreMQTT" - version: "v2.3.0" + version: "v2.3.1" repository: type: "git" url: "https://github.com/FreeRTOS/coreMQTT.git" From 96fbcce868a1dd544a37cc717fdf75d71abcb746 Mon Sep 17 00:00:00 2001 From: "Ching-Hsin,Lee" Date: Fri, 26 Jul 2024 11:58:55 +0800 Subject: [PATCH 5/8] Fix release.yml file for repository name --- .github/workflows/release.yml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7a0a96f..32c3af3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,9 +11,8 @@ on: required: true env: - repository_name: iot-reference-nxp-rt1060 - repository_compressed_name: ${{ env.repository_name }}v${{ github.event.inputs.version_number }} - repostiory_zip_name: ${{ env.repository_compressed_name }}.zip + repository_compressed_name: ${{ github.event.repository.name }}v${{ github.event.inputs.version_number }} + repostiory_zip_name: ${{ github.event.repository.name }}.zip jobs: tag-commit: @@ -51,24 +50,24 @@ jobs: uses: actions/checkout@v4 with: ref: ${{ github.event.inputs.commit_id }} - path: ${{ env.repository_name }} + path: ${{ github.event.repository.name }} submodules: recursive - name: Checkout disabled submodules run: | - cd ${{ env.repository_name }} + cd ${{ github.event.repository.name }} git submodule update --init --checkout --recursive - name: Create ZIP run: | - zip -r ${{ env.repostiory_zip_name }} ${{ env.repository_name }} -x "*.git*" + zip -r ${{ env.repostiory_zip_name }} ${{ github.event.repository.name }} -x "*.git*" ls ./ - name: Validate created ZIP run: | mkdir zip-check mv ${{ env.repostiory_zip_name }} zip-check cd zip-check - unzip ${{ env.repostiory_zip_name }} -d ${{ repository_compressed_name }} - ls ${{ repository_compressed_name }} - diff -r -x "*.git*" ${{ env.repository_compressed_name }}/${{ env.repository_name }}/ ../${{ env.repository_name }}/ + unzip ${{ env.repostiory_zip_name }} -d ${{ env.repository_compressed_name }} + ls ${{ env.repository_compressed_name }} + diff -r -x "*.git*" ${{ env.repository_compressed_name }}/${{ github.event.repository.name }}/ ../${{ github.event.repository.name }}/ - name: Create artifact of ZIP uses: actions/upload-artifact@v2 with: From 3de0b6e33f83f6ad2f8331c9c3b23816848efbc4 Mon Sep 17 00:00:00 2001 From: "Ching-Hsin,Lee" Date: Fri, 26 Jul 2024 12:18:21 +0800 Subject: [PATCH 6/8] Update CHANGELOG for release information --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f0ba03e..2f55e25 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,10 @@ # Changelog for NXP i.MX RT1060 Featured FreeRTOS IoT Integration ## v202407.00 ( July 2024 ) - +- [#49](https://github.com/FreeRTOS/iot-reference-nxp-rt1060/pull/49) + * Update 202407.00 release information + * Remove IDT folder and related information + * [coreMQTT v2.3.1] (https://github.com/FreeRTOS/coreMQTT/blob/v2.3.1) - [#48](https://github.com/FreeRTOS/iot-reference-nxp-rt1060/pull/48) Update third party submodule * [Unity v2.6.0](https://github.com/ThrowTheSwitch/Unity/tree/v2.6.0) * [mbedtls v2.28.8](https://github.com/Mbed-TLS/mbedtls/tree/v2.28.8) From 3837f161c24e16a77289d3cf91e4039245c861ec Mon Sep 17 00:00:00 2001 From: "Ching-Hsin,Lee" Date: Fri, 26 Jul 2024 12:25:09 +0800 Subject: [PATCH 7/8] Update changelog information --- CHANGELOG.md | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2f55e25..e3107aa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,13 @@ # Changelog for NXP i.MX RT1060 Featured FreeRTOS IoT Integration ## v202407.00 ( July 2024 ) -- [#49](https://github.com/FreeRTOS/iot-reference-nxp-rt1060/pull/49) - * Update 202407.00 release information - * Remove IDT folder and related information +- [#49](https://github.com/FreeRTOS/iot-reference-nxp-rt1060/pull/49) Update 202407.00 release information and Long Term Support (LTS) libraries to 202406.01-LTS. * [coreMQTT v2.3.1] (https://github.com/FreeRTOS/coreMQTT/blob/v2.3.1) - [#48](https://github.com/FreeRTOS/iot-reference-nxp-rt1060/pull/48) Update third party submodule * [Unity v2.6.0](https://github.com/ThrowTheSwitch/Unity/tree/v2.6.0) * [mbedtls v2.28.8](https://github.com/Mbed-TLS/mbedtls/tree/v2.28.8) -- [#47](https://github.com/FreeRTOS/iot-reference-nxp-rt1060/pull/47) Update integration test to 202406.00 version -- [#45](https://github.com/FreeRTOS/iot-reference-nxp-rt1060/pull/45) Switch to modular OTA and aws-iot-core-mqtt-file-streams-embedded-c. Update Long Term Support (LTS) libraries to 202406.00. +- [#47](https://github.com/FreeRTOS/iot-reference-nxp-rt1060/pull/47) Update FreeRTOS Libraries Integration Test to 202406.00 version +- [#45](https://github.com/FreeRTOS/iot-reference-nxp-rt1060/pull/45) Switch to modular OTA and aws-iot-core-mqtt-file-streams-embedded-c. Update Long Term Support (LTS) libraries to 202406.00-LTS. * [FreeRTOS-Kernel V11.1.0](https://github.com/FreeRTOS/FreeRTOS-Kernel/blob/V11.1.0) * [coreMQTT v2.3.0](https://github.com/FreeRTOS/coreMQTT/blob/v2.3.0) * [corePKCS11 v3.6.1](https://github.com/FreeRTOS/corePKCS11/tree/v3.6.1) From a4aa0a19c9eea418a99db78cf6a9a88cd1291fd5 Mon Sep 17 00:00:00 2001 From: "Ching-Hsin,Lee" Date: Thu, 1 Aug 2024 22:11:20 +0800 Subject: [PATCH 8/8] Adding OTA handler for incomming packets --- examples/evkbmimxrt1060/test/integration_test.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/examples/evkbmimxrt1060/test/integration_test.c b/examples/evkbmimxrt1060/test/integration_test.c index b077002..21600c5 100644 --- a/examples/evkbmimxrt1060/test/integration_test.c +++ b/examples/evkbmimxrt1060/test/integration_test.c @@ -117,6 +117,17 @@ static void ThreadWrapper( void * pParam ) /*-----------------------------------------------------------*/ +/* Adding this function to use the common MQTT agent task. */ +bool otaDemo_handleIncomingMQTTMessage( char * topic, + size_t topicLength, + uint8_t * message, + size_t messageLength ) +{ + return false; +} + +/*-----------------------------------------------------------*/ + int FRTest_GenerateRandInt() { static bool first = true;