[TI] Update Openthread & TI SDK references (project-chip#31456)

* Use Correct DMM library for M33F * Shift FreeRTOS Tickrate to 1ms to free up CPU. * Update SDK ref. * Update OT-TI ref * Update Openthread TI reference * Restyled by gn --------- Co-authored-by: Restyled.io <[email protected]>
erwinpan1 · Jan 19, 2024 · b21ea7d · b21ea7d
1 parent e512bf7
commit b21ea7d
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 9 deletions.
diff --git a/src/platform/cc13xx_26xx/cc13x2_26x2/FreeRTOSConfig.h b/src/platform/cc13xx_26xx/cc13x2_26x2/FreeRTOSConfig.h
@@ -49,7 +49,7 @@
 
 /* Constants related to the behaviour or the scheduler. */
 #define configUSE_PORT_OPTIMISED_TASK_SELECTION 1
-#define configTICK_RATE_HZ ((TickType_t) 100000)
+#define configTICK_RATE_HZ ((TickType_t) 1000)
 #define configUSE_PREEMPTION 1
 #define configUSE_TIME_SLICING 0
 #define configMAX_PRIORITIES (10UL)

diff --git a/src/platform/cc13xx_26xx/cc13x4_26x4/FreeRTOSConfig.h b/src/platform/cc13xx_26xx/cc13x4_26x4/FreeRTOSConfig.h
@@ -100,7 +100,7 @@
 #define configMINIMAL_SECURE_STACK_SIZE configMINIMAL_STACK_SIZE
 
 /* Constants related to the behaviour or the scheduler. */
-#define configTICK_RATE_HZ ((TickType_t) 100000)
+#define configTICK_RATE_HZ ((TickType_t) 1000)
 #define configUSE_PREEMPTION 1
 #define configUSE_TIME_SLICING 0
 #define configMAX_PRIORITIES (10UL)

diff --git a/third_party/openthread/ot-ti b/third_party/openthread/ot-ti
diff --git a/third_party/ti_simplelink_sdk/repo_cc13xx_cc26xx b/third_party/ti_simplelink_sdk/repo_cc13xx_cc26xx
diff --git a/third_party/ti_simplelink_sdk/ti_simplelink_board.gni b/third_party/ti_simplelink_sdk/ti_simplelink_board.gni
@@ -67,7 +67,7 @@ if (ti_simplelink_board == "CC1352R1_LAUNCHXL") {
   ti_simplelink_isa = "m33f"
 } else if (ti_simplelink_board == "LP_CC2652R7") {
   ti_simplelink_device_family = "cc13x2x7_26x2x7"
-  ti_simplelink_soc_family = "cc26x2"
+  ti_simplelink_soc_family = "cc26x2x7"
   ti_simplelink_isa = "m4f"
 
   # set -DDeviceFamily_CC26X2?

diff --git a/third_party/ti_simplelink_sdk/ti_simplelink_sdk.gni b/third_party/ti_simplelink_sdk/ti_simplelink_sdk.gni
@@ -192,9 +192,14 @@ template("ti_simplelink_sdk") {
     ]
     defines = []
 
-    if (ti_simplelink_device_family == "cc13x2_26x2" ||
-        ti_simplelink_device_family == "cc13x2x7_26x2x7" ||
-        ti_simplelink_device_family == "cc13x4_26x4") {
+    if (ti_simplelink_device_family == "cc13x2x7_26x2x7") {
+      libs += [
+        "${ti_simplelink_sdk_root}/source/ti/drivers/lib/gcc/${ti_simplelink_isa}/drivers_${ti_simplelink_soc_family}.a",
+        "${ti_simplelink_sdk_root}/source/ti/drivers/rf/lib/gcc/${ti_simplelink_isa}/rf_multiMode_cc13x2.a",
+      ]
+    } else if (ti_simplelink_device_family == "cc13x2_26x2" ||
+               ti_simplelink_device_family == "cc13x2x7_26x2x7" ||
+               ti_simplelink_device_family == "cc13x4_26x4") {
       assert(ti_simplelink_soc_family != "",
              "ti_simplelink_soc_family must be specified")
       assert(ti_simplelink_device_family != "",
@@ -476,7 +481,7 @@ template("ti_simplelink_sdk") {
         "${ti_simplelink_sdk_root}/source/ti/ble5stack/common/cc26xx/freertos/",
       ]
     } else if (ti_simplelink_device_family == "cc13x4_26x4") {
-      libs += [ "${ti_simplelink_sdk_root}/source/ti/dmm/lib/gcc/m4f/libdmmlib_freertos.a" ]
+      libs += [ "${ti_simplelink_sdk_root}/source/ti/dmm/lib/gcc/m33f/libdmmlib_freertos.a" ]
       if (ti_simplelink_board == "LP_EM_CC1354P10_1" ||
           (ti_simplelink_board == "CC2674" &&
            ti_simplelink_device == "CC2674R10RGZ")) {
+3 −3		CMakeLists.txt
+6 −0		boards.cmake
+1 −0		script/build
+3 −0		script/release
+5 −1		src/CMakeLists.txt
+5 −4		src/FreeRTOSConfig.h
+180 −47		src/alarm.c
+72 −41		src/alarm_micro.c
+11 −2		src/openthread-core-cc13xx_cc26xx-config-matter.h
+13 −5		src/openthread-core-cc13xx_cc26xx-config-thci.h
+11 −2		src/openthread-core-cc13xx_cc26xx-config.h
+6 −1		src/openthread.syscfg
+181 −72		src/radio.c
+39 −24		src/uart.c
+21 −0		third_party/ti_simplelink_sdk/CMakeLists.txt
+1 −1		third_party/ti_simplelink_sdk/repo_cc13xx_cc26xx