Merge pull request #14 in TIOP/connectedhomeip from feature/CHIP-50-u…

…pdate-github-build-to-target-agama-704-by-default to connectedhomeip-next

Squashed commit of the following:

commit ce09c52e094dd5ee90e912141c21984dd9cc0d12
Author: Seth Rickard <s-rickard@ti.com>
Date:   Thu Jan 28 21:54:52 2021 +0000

    Enable Agama 704 build

examples/lock-app/cc13x2_26x2/BUILD.gn → examples/lock-app/cc13x2x7_26x2x7/BUILD.gn

@@ -21,7 +21,7 @@ import("${ti_simplelink_sdk_build_root}/ti_simplelink_sdk.gni")
 
 assert(current_os == "freertos")
 
-project_dir = "${chip_root}/examples/lock-app/cc13x2_26x2"
+project_dir = "${chip_root}/examples/lock-app/cc13x2x7_26x2x7"
 
 ti_simplelink_sdk("sdk") {
   include_dirs = [ "${project_dir}/main/include" ]
@@ -64,14 +64,14 @@ ti_simplelink_executable("lock_app") {
     "${project_dir}/main/include",
   ]
   defines = []
-  output_name = "chip-cc13x2_26x2-lock-example.out"
+  output_name = "chip-${ti_simplelink_board}-lock-example.out"
 
   public_deps = [
     ":sdk",
     ":sysconfig",
     "${chip_root}/examples/lock-app/lock-common",
     "${chip_root}/src/lib",
-    "${openthread_root}:libopenthread-cli-mtd",
+    "${openthread_root}:libopenthread-cli-ftd",
   ]
 
   sources = [
@@ -83,15 +83,15 @@ ti_simplelink_executable("lock_app") {
 
   output_dir = root_out_dir
 
-  ldscript = "${ti_simplelink_sdk_root}/source/ti/boards/cc13x2_cc26x2/cc13x2_cc26x2_freertos.lds"
+  ldscript = "${ti_simplelink_sdk_root}/source/ti/boards/cc13x2x7_cc26x2x7/cc13x2x7_cc26x2x7_freertos.lds"
 
   ldflags = [ "-T" + rebase_path(ldscript, root_build_dir) ]
 }
 
-group("cc13x2_26x2") {
+group("cc13x2x7_26x2x7") {
   deps = [ ":lock_app" ]
 }
 
 group("default") {
-  deps = [ ":cc13x2_26x2" ]
+  deps = [ ":cc13x2x7_26x2x7" ]
 }

examples/lock-app/cc13x2_26x2/args.gni → examples/lock-app/cc13x2x7_26x2x7/args.gni

@@ -19,7 +19,7 @@ ti_simplelink_sdk_target = get_label_info(":sdk", "label_no_toolchain")
 ti_simplelink_sysconfig_target =
     get_label_info(":sysconfig", "label_no_toolchain")
 
-ti_simplelink_board = "CC1352R1_LAUNCHXL"
+ti_simplelink_board = "LP_CC2652R7"
 
 # use -Os instead of -Og
 #is_debug = false

examples/lock-app/cc13x2_26x2/chip.syscfg → examples/lock-app/cc13x2x7_26x2x7/chip.syscfg

@@ -116,7 +116,7 @@ UART2.uart.rxPin.$suggestSolution   = "boosterpack.18";
 TRNG1.$name     = "CONFIG_TRNG_0";
 
 /* Thread */
-Thread.deviceType         = "mtd";
+Thread.deviceType         = "ftd";
 Thread.deviceTypeReadOnly = true;
 /* Thread SysConfig generated sources are not used until the upstream modules
  * can be updated to enable CHIP.

src/platform/BUILD.gn

@@ -241,13 +241,22 @@ if (chip_device_platform != "none" && chip_device_platform != "external") {
         "cc13x2_26x2/SystemPlatformConfig.h",
       ]
       if (chip_enable_openthread) {
+        # needed for MTD/FTD
+        import("//build_overrides/ti_simplelink_sdk.gni")
+        import("${ti_simplelink_sdk_build_root}/ti_simplelink_board.gni")
+
         public_deps += [
           "${chip_root}/third_party/ti_simplelink_sdk:mbedtls",
           "${chip_root}/third_party/ti_simplelink_sdk:ti_simplelink_sdk",
           "${chip_root}/third_party/ti_simplelink_sdk:ti_simplelink_sysconfig",
-          "${openthread_root}:libopenthread-mtd",
         ]
 
+        if (ti_simplelink_device_family == "cc13x2_26x2") {
+          public_deps += [ "${openthread_root}:libopenthread-mtd" ]
+        } else if (ti_simplelink_device_family == "cc13x2x7_26x2x7") {
+          public_deps += [ "${openthread_root}:libopenthread-ftd" ]
+        }
+
         sources += [
           "OpenThread/OpenThreadUtils.cpp",
           "cc13x2_26x2/ThreadStackManagerImpl.cpp",

third_party/ti_simplelink_sdk/ti_simplelink_arm_platform_config.gni

@@ -14,7 +14,8 @@
 
 import("ti_simplelink_board.gni")
 
-if (ti_simplelink_device_family == "cc13x2_26x2") {
+if (ti_simplelink_device_family == "cc13x2_26x2" ||
+    ti_simplelink_device_family == "cc13x2x7_26x2x7") {
   arm_arch = "armv7e-m"
   arm_abi = "aapcs"
   arm_cpu = "cortex-m4"

third_party/ti_simplelink_sdk/ti_simplelink_board.gni

@@ -25,10 +25,11 @@ assert(ti_simplelink_board != "", "ti_simplelink_board must be specified")
 
 # Differentiate between boards
 #
-# | Development Kit   | Device Family | SoC        |
-# | ----------------- | ------------- | ---------- |
-# | CC1352R1_LAUNCHXL | cc13x2_26x2   | cc1352r1f3 |
-# | CC2652R1_LAUNCHXL | cc13x2_26x2   | cc2652r1f3 |
+# | Development Kit   | Device Family   | SoC        |                     |
+# | ----------------- | --------------- | ---------- | ------------------- |
+# | CC1352R1_LAUNCHXL | cc13x2_26x2     | cc1352r1f3 | Thread MTD + no BLE |
+# | CC2652R1_LAUNCHXL | cc13x2_26x2     | cc2652r1f3 | Thread MTD + no BLE |
+# | LP_CC2652R7       | cc13x2x7_26x2x7 | cc2652r1f7 | Thread FTD + BLE    |
 
 # XXX: Can we do an array with a case statement?
 if (ti_simplelink_board == "CC1352R1_LAUNCHXL") {
@@ -43,6 +44,12 @@ if (ti_simplelink_board == "CC1352R1_LAUNCHXL") {
 
   # set -DDeviceFamily_CC26X2?
   ti_simplelink_soc = "cc2652r1f3"
+} else if (ti_simplelink_board == "LP_CC2652R7") {
+  ti_simplelink_device_family = "cc13x2x7_26x2x7"
+  ti_simplelink_soc_family = "cc26x2"
+
+  # set -DDeviceFamily_CC26X2?
+  ti_simplelink_soc = "cc2652r1f7"
 } else {
   print("Please provide a valid value for TI_SIMPLELINK_BOARD env variable")
   assert(false, "The board ${ti_simplelink_board} is unsupported as for now.")

third_party/ti_simplelink_sdk/ti_simplelink_sdk.gni

@@ -54,11 +54,11 @@ template("ti_sysconfig") {
     }
 
     if (ti_simplelink_device_family == "cc13x2_26x2") {
-      assert(ti_simplelink_soc_family != "",
-             "ti_simplelink_soc_family must be specified")
-
       ldflags += [ "-nostartfiles" ]
       defines += [ "DeviceFamily_CC13X2_CC26X2" ]
+    } else if (ti_simplelink_device_family == "cc13x2x7_26x2x7") {
+      ldflags += [ "-nostartfiles" ]
+      defines += [ "DeviceFamily_CC13X2X7_CC26X2X7" ]
     }
   }
 
@@ -120,19 +120,27 @@ template("ti_simplelink_sdk") {
     ]
     defines = []
 
-    if (ti_simplelink_device_family == "cc13x2_26x2") {
+    if (ti_simplelink_device_family == "cc13x2_26x2" ||
+        ti_simplelink_device_family == "cc13x2x7_26x2x7") {
       assert(ti_simplelink_soc_family != "",
              "ti_simplelink_soc_family must be specified")
-
-      defines += [ "DeviceFamily_CC13X2_CC26X2" ]
+      assert(ti_simplelink_device_family != "",
+             "ti_simplelink_device_family must be specified")
 
       libs += [
         "${ti_simplelink_sdk_root}/source/ti/drivers/lib/gcc/m4f/drivers_${ti_simplelink_soc_family}.a",
-        "${ti_simplelink_sdk_root}/source/ti/devices/cc13x2_cc26x2/driverlib/bin/gcc/driverlib.lib",
         "${ti_simplelink_sdk_root}/source/ti/drivers/rf/lib/rf_multiMode_${ti_simplelink_soc_family}.am4fg",
       ]
     }
 
+    if (ti_simplelink_device_family == "cc13x2_26x2") {
+      defines += [ "DeviceFamily_CC13X2_CC26X2" ]
+      libs += [ "${ti_simplelink_sdk_root}/source/ti/devices/cc13x2_cc26x2/driverlib/bin/gcc/driverlib.lib" ]
+    } else if (ti_simplelink_device_family == "cc13x2x7_26x2x7") {
+      defines += [ "DeviceFamily_CC13X2X7_CC26X2X7" ]
+      libs += [ "${ti_simplelink_sdk_root}/source/ti/devices/cc13x2x7_cc26x2x7/driverlib/bin/gcc/driverlib.lib" ]
+    }
+
     if (defined(invoker.defines)) {
       defines += invoker.defines
     }
@@ -205,14 +213,26 @@ template("ti_simplelink_sdk") {
     public_configs = [ ":${sdk_target_name}_config" ]
   }
 
+  if (ti_simplelink_device_family == "cc13x2_26x2") {
+    openthread_example = "cli_mtd"
+  } else if (ti_simplelink_device_family == "cc13x2x7_26x2x7") {
+    openthread_example = "cli_ftd"
+  }
+
   config("${sdk_target_name}_openthread_platform_config") {
     defines = [ "NVOCMP_POSIX_MUTEX" ]
     include_dirs = [
       "${chip_root}/third_party/openthread/repo/examples/platforms",
       "${chip_root}/third_party/openthread/repo/src/core",
-      "${ti_simplelink_sdk_root}/source/ti/devices/cc13x2_cc26x2",
-      "${ti_simplelink_sdk_root}/examples/rtos/${ti_simplelink_board}/thread/cli_mtd",
+      "${ti_simplelink_sdk_root}/source/ti/devices/${ti_simplelink_device_family}",
+      "${ti_simplelink_sdk_root}/examples/rtos/${ti_simplelink_board}/thread/${openthread_example}",
     ]
+
+    if (ti_simplelink_device_family == "cc13x2_26x2") {
+      include_dirs += [ "${ti_simplelink_sdk_root}/source/ti/devices/cc13x2_cc26x2" ]
+    } else if (ti_simplelink_device_family == "cc13x2x7_26x2x7") {
+      include_dirs += [ "${ti_simplelink_sdk_root}/source/ti/devices/cc13x2x7_cc26x2x7" ]
+    }
   }
 
   source_set("${sdk_target_name}_openthread_platform") {
@@ -232,36 +252,42 @@ template("ti_simplelink_sdk") {
     configs -= [ "//build/config/compiler:std_default" ]
     configs += [ ":${sdk_target_name}_posix_config" ]
     sources = [
-      "${ti_simplelink_sdk_root}/examples/rtos/${ti_simplelink_board}/thread/cli_mtd/platform/alarm.c",
-      "${ti_simplelink_sdk_root}/examples/rtos/${ti_simplelink_board}/thread/cli_mtd/platform/alarm_micro.c",
-      "${ti_simplelink_sdk_root}/examples/rtos/${ti_simplelink_board}/thread/cli_mtd/platform/crypto/aes_alt.c",
-      "${ti_simplelink_sdk_root}/examples/rtos/${ti_simplelink_board}/thread/cli_mtd/platform/crypto/ecjpake_alt.c",
-      "${ti_simplelink_sdk_root}/examples/rtos/${ti_simplelink_board}/thread/cli_mtd/platform/crypto/sha256_alt.c",
-      "${ti_simplelink_sdk_root}/examples/rtos/${ti_simplelink_board}/thread/cli_mtd/platform/diag.c",
-      "${ti_simplelink_sdk_root}/examples/rtos/${ti_simplelink_board}/thread/cli_mtd/platform/entropy.c",
-      "${ti_simplelink_sdk_root}/examples/rtos/${ti_simplelink_board}/thread/cli_mtd/platform/misc.c",
-      "${ti_simplelink_sdk_root}/examples/rtos/${ti_simplelink_board}/thread/cli_mtd/platform/nv/crc.c",
-      "${ti_simplelink_sdk_root}/examples/rtos/${ti_simplelink_board}/thread/cli_mtd/platform/nv/nvocmp.c",
-      "${ti_simplelink_sdk_root}/examples/rtos/${ti_simplelink_board}/thread/cli_mtd/platform/radio.c",
-      "${ti_simplelink_sdk_root}/examples/rtos/${ti_simplelink_board}/thread/cli_mtd/platform/settings.c",
-      "${ti_simplelink_sdk_root}/examples/rtos/${ti_simplelink_board}/thread/cli_mtd/platform/system.c",
-      "${ti_simplelink_sdk_root}/examples/rtos/${ti_simplelink_board}/thread/cli_mtd/platform/uart.c",
+      "${ti_simplelink_sdk_root}/examples/rtos/${ti_simplelink_board}/thread/${openthread_example}/platform/alarm.c",
+      "${ti_simplelink_sdk_root}/examples/rtos/${ti_simplelink_board}/thread/${openthread_example}/platform/alarm_micro.c",
+      "${ti_simplelink_sdk_root}/examples/rtos/${ti_simplelink_board}/thread/${openthread_example}/platform/crypto/aes_alt.c",
+      "${ti_simplelink_sdk_root}/examples/rtos/${ti_simplelink_board}/thread/${openthread_example}/platform/crypto/ecjpake_alt.c",
+      "${ti_simplelink_sdk_root}/examples/rtos/${ti_simplelink_board}/thread/${openthread_example}/platform/crypto/sha256_alt.c",
+      "${ti_simplelink_sdk_root}/examples/rtos/${ti_simplelink_board}/thread/${openthread_example}/platform/diag.c",
+      "${ti_simplelink_sdk_root}/examples/rtos/${ti_simplelink_board}/thread/${openthread_example}/platform/entropy.c",
+      "${ti_simplelink_sdk_root}/examples/rtos/${ti_simplelink_board}/thread/${openthread_example}/platform/misc.c",
+      "${ti_simplelink_sdk_root}/examples/rtos/${ti_simplelink_board}/thread/${openthread_example}/platform/nv/crc.c",
+      "${ti_simplelink_sdk_root}/examples/rtos/${ti_simplelink_board}/thread/${openthread_example}/platform/nv/nvocmp.c",
+      "${ti_simplelink_sdk_root}/examples/rtos/${ti_simplelink_board}/thread/${openthread_example}/platform/radio.c",
+      "${ti_simplelink_sdk_root}/examples/rtos/${ti_simplelink_board}/thread/${openthread_example}/platform/settings.c",
+      "${ti_simplelink_sdk_root}/examples/rtos/${ti_simplelink_board}/thread/${openthread_example}/platform/system.c",
+      "${ti_simplelink_sdk_root}/examples/rtos/${ti_simplelink_board}/thread/${openthread_example}/platform/uart.c",
     ]
 
     public_configs = [
       ":${sdk_target_name}_config",
       ":${sdk_target_name}_openthread_platform_config",
       "${chip_root}/third_party/openthread/repo:openthread_config",
-      "${chip_root}/third_party/openthread/repo:openthread_mtd_config",
     ]
+
+    if (ti_simplelink_device_family == "cc13x2_26x2") {
+      public_configs += [ "${chip_root}/third_party/openthread/repo:openthread_mtd_config" ]
+    } else if (ti_simplelink_device_family == "cc13x2x7_26x2x7") {
+      public_configs += [ "${chip_root}/third_party/openthread/repo:openthread_ftd_config" ]
+    }
   }
 
   group(sdk_target_name) {
     public_deps = [
       ":${sdk_target_name}_dpl",
       ":${sdk_target_name}_freertos",
     ]
-    if (ti_simplelink_device_family == "cc13x2_26x2") {
+    if (ti_simplelink_device_family == "cc13x2_26x2" ||
+        ti_simplelink_device_family == "cc13x2x7_26x2x7") {
       public_deps += [ ":${sdk_target_name}_openthread_platform" ]
     }
   }