project-chip · mergify · Dec 11, 2023 · Aug 30, 2023 · Sep 1, 2023 · Sep 20, 2023
diff --git a/examples/all-clusters-app/cc13x4_26x4/BUILD.gn b/examples/all-clusters-app/cc13x4_26x4/BUILD.gn
@@ -37,7 +37,6 @@ ti_sysconfig("sysconfig") {
   sources = [ "${project_dir}/chip.syscfg" ]
 
   outputs = [
-    "ti_devices_config.c",
     "ti_radio_config.c",
     "ti_radio_config.h",
     "ti_drivers_config.c",
@@ -47,6 +46,10 @@ ti_sysconfig("sysconfig") {
     "ti_dmm_application_policy.c",
     "ti_dmm_application_policy.h",
 
+    # CCFG generation disabled for OTA-able application
+    #"ti_devices_config.c",
+    #"ti_devices_config.h",
+
     # disabled until upstream generation is aligned
     #"tiop_config.h",
     #"tiop_config.c",

diff --git a/examples/all-clusters-app/cc13x4_26x4/README.md b/examples/all-clusters-app/cc13x4_26x4/README.md
@@ -164,8 +164,8 @@ the session.
 Select the ELF image to load on the device with the `Browse` button. This file
 is placed in the `out/debug` folder by this guide and ends with the `*.out` file
 extension. For OTA enabled applications, the standalone image will instead end
-with the `*-bim.hex` file extension. This this is a combined image with
-application and and `BIM` included. The flag to enable or disable the OTA
+with the `*-mcuboot.hex` file extension. This this is a combined image with
+application and `MCUBoot` included. The flag to enable or disable the OTA
 feature is determined by "chip_enable_ota_requestor" in the application's
 args.gni file.
 

diff --git a/examples/all-clusters-app/cc13x4_26x4/args.gni b/examples/all-clusters-app/cc13x4_26x4/args.gni
@@ -27,7 +27,7 @@ ti_simplelink_board = "LP_EM_CC1354P10_6"
 optimize_debug_level = "s"
 lwip_debug = false
 
-chip_enable_ota_requestor = false
+chip_enable_ota_requestor = true
 
 openthread_external_platform = "${chip_root}/third_party/openthread/platforms/cc13x4_26x4:libopenthread-cc13x4_cc26x4"
 chip_openthread_ftd = true
@@ -49,4 +49,4 @@ chip_stack_lock_tracking = "none"
 matter_device_vid = "0xFFF1"
 matter_device_pid = "0x8006"
 matter_software_ver = "0x0001"
-matter_software_ver_str = "1.0d1"
+matter_software_ver_str = "1.0.1+1"
diff --git a/examples/all-clusters-app/cc13x4_26x4/chip.syscfg b/examples/all-clusters-app/cc13x4_26x4/chip.syscfg
@@ -83,7 +83,8 @@ for(var setting in ccfgSettings)
     CCFG[setting] = ccfgSettings[setting];
 }
 
-CCFG.enableCodeGeneration = true;
+/* disable CCFG for OTA-able application */
+CCFG.enableCodeGeneration = false;
 
 
 /* NVS */

diff --git a/examples/all-clusters-app/cc13x4_26x4/main/AppTask.cpp b/examples/all-clusters-app/cc13x4_26x4/main/AppTask.cpp
@@ -35,7 +35,7 @@
 #include <app/clusters/ota-requestor/DefaultOTARequestor.h>
 #include <app/clusters/ota-requestor/DefaultOTARequestorDriver.h>
 #include <app/clusters/ota-requestor/DefaultOTARequestorStorage.h>
-#include <platform/cc13x2_26x2/OTAImageProcessorImpl.h>
+#include <platform/cc13xx_26xx/OTAImageProcessorImpl.h>
 #endif
 #include <lib/support/CHIPMem.h>
 #include <lib/support/CHIPPlatformMemory.h>

diff --git a/examples/lighting-app/cc13x4_26x4/BUILD.gn b/examples/lighting-app/cc13x4_26x4/BUILD.gn
@@ -45,8 +45,10 @@ ti_sysconfig("sysconfig") {
     "ti_ble_config.h",
     "ti_dmm_application_policy.c",
     "ti_dmm_application_policy.h",
-    "ti_devices_config.c",
-    "ti_devices_config.h",
+
+    # CCFG generation disabled for OTA-able application
+    #"ti_devices_config.c",
+    #"ti_devices_config.h",
 
     # disabled until upstream generation is aligned
     #"tiop_config.h",

diff --git a/examples/lighting-app/cc13x4_26x4/README.md b/examples/lighting-app/cc13x4_26x4/README.md
@@ -162,8 +162,8 @@ the session.
 Select the ELF image to load on the device with the `Browse` button. This file
 is placed in the `out/debug` folder by this guide and ends with the `*.out` file
 extension. For OTA enabled applications, the standalone image will instead end
-with the `*-bim.hex` file extension. This this is a combined image with
-application and and `BIM` included. The flag to enable or disable the OTA
+with the `*-mcuboot.hex` file extension. This this is a combined image with
+application and `MCUBoot` included. The flag to enable or disable the OTA
 feature is determined by "chip_enable_ota_requestor" in the application's
 args.gni file.
 

diff --git a/examples/lighting-app/cc13x4_26x4/args.gni b/examples/lighting-app/cc13x4_26x4/args.gni
@@ -27,7 +27,7 @@ ti_simplelink_board = "LP_EM_CC1354P10_6"
 optimize_debug_level = "s"
 lwip_debug = false
 
-chip_enable_ota_requestor = false
+chip_enable_ota_requestor = true
 
 chip_openthread_ftd = true
 openthread_external_platform = "${chip_root}/third_party/openthread/platforms/cc13x4_26x4:libopenthread-cc13x4_cc26x4"
@@ -47,4 +47,4 @@ chip_stack_lock_tracking = "none"
 matter_device_vid = "0xFFF1"
 matter_device_pid = "0x8005"
 matter_software_ver = "0x0001"
-matter_software_ver_str = "1.0d1"
+matter_software_ver_str = "1.0.1+1"
diff --git a/examples/lighting-app/cc13x4_26x4/chip.syscfg b/examples/lighting-app/cc13x4_26x4/chip.syscfg
@@ -83,7 +83,8 @@ for(var setting in ccfgSettings)
     CCFG[setting] = ccfgSettings[setting];
 }
 
-CCFG.enableCodeGeneration = true;
+/* disable CCFG for OTA-able application */
+CCFG.enableCodeGeneration = false;
 
 
 /* NVS */

diff --git a/examples/lock-app/cc13x4_26x4/BUILD.gn b/examples/lock-app/cc13x4_26x4/BUILD.gn
@@ -41,16 +41,14 @@ ti_sysconfig("sysconfig") {
     "ti_radio_config.h",
     "ti_drivers_config.c",
     "ti_drivers_config.h",
-    "ti_devices_config.c",
-    "ti_devices_config.h",
     "ti_ble_config.c",
     "ti_ble_config.h",
     "ti_dmm_application_policy.c",
     "ti_dmm_application_policy.h",
 
-    # disabled until upstream generation is aligned
-    #"tiop_config.h",
-    #"tiop_config.c",
+    # CCFG generation disabled for OTA-able application
+    #"ti_devices_config.c",
+    #"ti_devices_config.h",
 
     # not traditional source files
     #"ti_utils_build_linker.cmd.genlibs",

diff --git a/examples/lock-app/cc13x4_26x4/README.md b/examples/lock-app/cc13x4_26x4/README.md
@@ -165,8 +165,8 @@ the session.
 Select the ELF image to load on the device with the `Browse` button. This file
 is placed in the `out/debug` folder by this guide and ends with the `*.out` file
 extension. For OTA enabled applications, the standalone image will instead end
-with the `*-bim.hex` file extension. This this is a combined image with
-application and and `BIM` included. The flag to enable or disable the OTA
+with the `*-mcuboot.hex` file extension. This this is a combined image with
+application and `MCUBoot` included. The flag to enable or disable the OTA
 feature is determined by "chip_enable_ota_requestor" in the application's
 args.gni file.
 

diff --git a/examples/lock-app/cc13x4_26x4/args.gni b/examples/lock-app/cc13x4_26x4/args.gni
@@ -27,15 +27,15 @@ ti_simplelink_board = "LP_EM_CC1354P10_6"
 optimize_debug_level = "s"
 lwip_debug = false
 
-chip_enable_ota_requestor = false
+chip_enable_ota_requestor = true
 
 chip_openthread_ftd = true
 openthread_external_platform = "${chip_root}/third_party/openthread/platforms/cc13x4_26x4:libopenthread-cc13x4_cc26x4"
 
 # Disable CHIP Logging
-#chip_progress_logging = false
-#chip_detail_logging = false
-#chip_automation_logging = false
+chip_progress_logging = true
+chip_detail_logging = true
+chip_automation_logging = true
 
 # BLE options
 chip_config_network_layer_ble = true
@@ -47,4 +47,5 @@ chip_stack_lock_tracking = "none"
 matter_device_vid = "0xFFF1"
 matter_device_pid = "0x8006"
 matter_software_ver = "0x0001"
-matter_software_ver_str = "1.0d1"
+matter_software_ver_str = "1.0.1+1"
+# should be maj.min.rev+build with later parts optional for MCUBoot
diff --git a/examples/lock-app/cc13x4_26x4/chip.syscfg b/examples/lock-app/cc13x4_26x4/chip.syscfg
@@ -83,7 +83,8 @@ for(var setting in ccfgSettings)
     CCFG[setting] = ccfgSettings[setting];
 }
 
-CCFG.enableCodeGeneration = true;
+/* disable CCFG for OTA-able application */
+CCFG.enableCodeGeneration = false;
 
 
 /* NVS */

diff --git a/examples/pump-app/cc13x4_26x4/BUILD.gn b/examples/pump-app/cc13x4_26x4/BUILD.gn
@@ -36,7 +36,6 @@ ti_sysconfig("sysconfig") {
   sources = [ "${project_dir}/chip.syscfg" ]
 
   outputs = [
-    "ti_devices_config.c",
     "ti_radio_config.c",
     "ti_radio_config.h",
     "ti_drivers_config.c",
@@ -46,6 +45,10 @@ ti_sysconfig("sysconfig") {
     "ti_dmm_application_policy.c",
     "ti_dmm_application_policy.h",
 
+    # CCFG generation disabled for OTA-able application
+    #"ti_devices_config.c",
+    #"ti_devices_config.h",
+
     # disabled until upstream generation is aligned
     #"tiop_config.h",
     #"tiop_config.c",

diff --git a/examples/pump-app/cc13x4_26x4/README.md b/examples/pump-app/cc13x4_26x4/README.md
@@ -163,8 +163,8 @@ the session.
 Select the ELF image to load on the device with the `Browse` button. This file
 is placed in the `out/debug` folder by this guide and ends with the `*.out` file
 extension. For OTA enabled applications, the standalone image will instead end
-with the `*-bim.hex` file extension. This this is a combined image with
-application and and `BIM` included. The flag to enable or disable the OTA
+with the `*-mcuboot.hex` file extension. This this is a combined image with
+application and `MCUBoot` included. The flag to enable or disable the OTA
 feature is determined by "chip_enable_ota_requestor" in the application's
 args.gni file.
 

diff --git a/examples/pump-app/cc13x4_26x4/args.gni b/examples/pump-app/cc13x4_26x4/args.gni
@@ -27,7 +27,7 @@ ti_simplelink_board = "LP_EM_CC1354P10_6"
 optimize_debug_level = "s"
 lwip_debug = false
 
-chip_enable_ota_requestor = false
+chip_enable_ota_requestor = true
 
 openthread_external_platform = "${chip_root}/third_party/openthread/platforms/cc13x4_26x4:libopenthread-cc13x4_cc26x4"
 chip_openthread_ftd = true
@@ -47,4 +47,4 @@ chip_stack_lock_tracking = "none"
 matter_device_vid = "0xFFF1"
 matter_device_pid = "0x800A"
 matter_software_ver = "0x0001"
-matter_software_ver_str = "1.0d1"
+matter_software_ver_str = "1.0.1+1"
diff --git a/examples/pump-app/cc13x4_26x4/chip.syscfg b/examples/pump-app/cc13x4_26x4/chip.syscfg
@@ -83,7 +83,8 @@ for(var setting in ccfgSettings)
     CCFG[setting] = ccfgSettings[setting];
 }
 
-CCFG.enableCodeGeneration = true;
+/* disable CCFG for OTA-able application */
+CCFG.enableCodeGeneration = false;
 
 
 /* NVS */

diff --git a/examples/pump-controller-app/cc13x4_26x4/BUILD.gn b/examples/pump-controller-app/cc13x4_26x4/BUILD.gn
@@ -37,7 +37,6 @@ ti_sysconfig("sysconfig") {
   sources = [ "${project_dir}/chip.syscfg" ]
 
   outputs = [
-    "ti_devices_config.c",
     "ti_radio_config.c",
     "ti_radio_config.h",
     "ti_drivers_config.c",
@@ -47,6 +46,10 @@ ti_sysconfig("sysconfig") {
     "ti_dmm_application_policy.c",
     "ti_dmm_application_policy.h",
 
+    # CCFG generation disabled for OTA-able application
+    #"ti_devices_config.c",
+    #"ti_devices_config.h",
+
     # disabled until upstream generation is aligned
     #"tiop_config.h",
     #"tiop_config.c",

diff --git a/examples/pump-controller-app/cc13x4_26x4/README.md b/examples/pump-controller-app/cc13x4_26x4/README.md
@@ -164,8 +164,8 @@ the session.
 Select the ELF image to load on the device with the `Browse` button. This file
 is placed in the `out/debug` folder by this guide and ends with the `*.out` file
 extension. For OTA enabled applications, the standalone image will instead end
-with the `*-bim.hex` file extension. This this is a combined image with
-application and and `BIM` included. The flag to enable or disable the OTA
+with the `*-mcuboot.hex` file extension. This this is a combined image with
+application and `MCUBoot` included. The flag to enable or disable the OTA
 feature is determined by "chip_enable_ota_requestor" in the application's
 args.gni file.
 

diff --git a/examples/pump-controller-app/cc13x4_26x4/args.gni b/examples/pump-controller-app/cc13x4_26x4/args.gni
@@ -27,7 +27,7 @@ ti_simplelink_board = "LP_EM_CC1354P10_6"
 optimize_debug_level = "s"
 lwip_debug = false
 
-chip_enable_ota_requestor = false
+chip_enable_ota_requestor = true
 
 openthread_external_platform = "${chip_root}/third_party/openthread/platforms/cc13x4_26x4:libopenthread-cc13x4_cc26x4"
 chip_openthread_ftd = true
@@ -47,4 +47,4 @@ chip_stack_lock_tracking = "none"
 matter_device_vid = "0xFFF1"
 matter_device_pid = "0x8011"
 matter_software_ver = "0x0001"
-matter_software_ver_str = "1.0d1"
+matter_software_ver_str = "1.0.1+1"
diff --git a/examples/pump-controller-app/cc13x4_26x4/chip.syscfg b/examples/pump-controller-app/cc13x4_26x4/chip.syscfg
@@ -83,7 +83,8 @@ for(var setting in ccfgSettings)
     CCFG[setting] = ccfgSettings[setting];
 }
 
-CCFG.enableCodeGeneration = true;
+/* disable CCFG for OTA-able application */
+CCFG.enableCodeGeneration = false;
 
 
 /* NVS */

diff --git a/examples/shell/cc13x4_26x4/README.md b/examples/shell/cc13x4_26x4/README.md
@@ -121,8 +121,8 @@ the session.
 Select the ELF image to load on the device with the `Browse` button. This file
 is placed in the `out/debug` folder by this guide and ends with the `*.out` file
 extension. For OTA enabled applications, the standalone image will instead end
-with the `*-bim.hex` file extension. This this is a combined image with
-application and and `BIM` included.
+with the `*-mcuboot.hex` file extension. This this is a combined image with
+application and and `MCUBoot` included.
 
 Finally click the `Load Image` button to load the executable image onto the
 device. You should be able to see the log output over the XDS110 User UART.

diff --git a/examples/shell/cc13x4_26x4/args.gni b/examples/shell/cc13x4_26x4/args.gni
@@ -25,7 +25,7 @@ ti_simplelink_board = "LP_EM_CC1354P10_6"
 # use -Os instead of -Og, LWIP release build
 is_debug = false
 
-chip_enable_ota_requestor = false
+chip_enable_ota_requestor = true
 
 # Disable FTD Build for all-clusters app to save Flash
 chip_openthread_ftd = false
@@ -48,4 +48,4 @@ chip_stack_lock_tracking = "none"
 matter_device_vid = "0xFFF1"
 matter_device_pid = "0x8006"
 matter_software_ver = "0x0001"
-matter_software_ver_str = "1.0d1"
+matter_software_ver_str = "1.0.1+1"
diff --git a/examples/shell/cc13x4_26x4/chip.syscfg b/examples/shell/cc13x4_26x4/chip.syscfg
@@ -83,7 +83,8 @@ for(var setting in ccfgSettings)
     CCFG[setting] = ccfgSettings[setting];
 }
 
-CCFG.enableCodeGeneration = true;
+/* disable CCFG for OTA-able application */
+CCFG.enableCodeGeneration = false;
 
 
 /* NVS */

diff --git a/scripts/setup/requirements.ti.txt b/scripts/setup/requirements.ti.txt
@@ -1,2 +1,5 @@
+cbor>=1.0.0
+click
+cryptography>=2.6
 ecdsa>=0.17.0
 intelhex
diff --git a/src/platform/cc13xx_26xx/cc13x2_26x2/BUILD.gn b/src/platform/cc13xx_26xx/cc13x2_26x2/BUILD.gn
@@ -65,8 +65,7 @@ static_library("cc13x2_26x2") {
       # this needs to be in the final link to place the data correctly
       # see ${chip_root}/third_party/ti_simplelink_sdk/ti_simplelink_executable.gni
       #"oad_image_header.c",
-      "../OTAImageProcessorImpl.cpp",
-      "../OTAImageProcessorImpl.h",
+      "OTAImageProcessorImpl.cpp",
     ]
   }
 

diff --git a/...orm/cc13xx_26xx/OTAImageProcessorImpl.cpp → ...6xx/cc13x2_26x2/OTAImageProcessorImpl.cpp b/...orm/cc13xx_26xx/OTAImageProcessorImpl.cpp → ...6xx/cc13x2_26x2/OTAImageProcessorImpl.cpp
diff --git a/src/platform/cc13xx_26xx/cc13x4_26x4/BUILD.gn b/src/platform/cc13xx_26xx/cc13x4_26x4/BUILD.gn
@@ -61,13 +61,7 @@ static_library("cc13x4_26x4") {
   }
 
   if (chip_enable_ota_requestor) {
-    sources += [
-      # this needs to be in the final link to place the data correctly
-      # see ${chip_root}/third_party/ti_simplelink_sdk/ti_simplelink_executable.gni
-      #"oad_image_header.c",
-      "../OTAImageProcessorImpl.cpp",
-      "../OTAImageProcessorImpl.h",
-    ]
+    sources += [ "OTAImageProcessorImpl.cpp" ]
   }
 
   if (chip_enable_openthread) {