Update script with better error handling, remove stale doc comment

project-chip · Nov 30, 2023 · 1511412 · 1511412
1 parent 27d99a3
commit 1511412
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/docs/guides/ti/matter_cc2674_migration.md b/docs/guides/ti/matter_cc2674_migration.md
@@ -24,10 +24,6 @@ CC2674P10 device
  defines for the CC2674
  - `ti_simplelink_board = CC2674`
  - `ti_simplelink_device = CC2674P10RGZ`
-- `third_party/ti_simplelink_sdk/repo_cc13xx_cc26xx`, replace this folder
- contents with the 7.10.01.24 version from
- [TI's downloads page](https://www.ti.com/tool/download/SIMPLELINK-LOWPOWER-F2-SDK/7.10.01.24)
- which is required to add support SDK for the CC2674P10 device.
 
 ## Configuring `chip.syscfg` in the SysConfig GUI
 

diff --git a/third_party/ti_simplelink_sdk/run_sdk_drivers_gen.py b/third_party/ti_simplelink_sdk/run_sdk_drivers_gen.py
@@ -12,13 +12,20 @@
 
 SDK_ROOT = sys.argv[1]
 CHIP_ENV_ROOT = sys.argv[2]
+ret = False
 
 if os.getenv('_PW_ACTUAL_ENVIRONMENT_ROOT'):
  CHIP_ENV_ROOT = os.getenv('_PW_ACTUAL_ENVIRONMENT_ROOT')
+
 GCC_ARMCOMPILER_PATH = CHIP_ENV_ROOT + "/cipd/packages/arm/"
 
-make_command = ["make", "-C", SDK_ROOT, "CMAKE=cmake", "GCC_ARMCOMPILER=" +
- GCC_ARMCOMPILER_PATH, "IAR_ARMCOMPILER=", "TICLANG_ARMCOMPILER=", "GENERATOR=Ninja"]
+if os.path.isdir(GCC_ARMCOMPILER_PATH):
+ make_command = ["make", "-C", SDK_ROOT, "CMAKE=cmake", "GCC_ARMCOMPILER=" +
+ GCC_ARMCOMPILER_PATH, "IAR_ARMCOMPILER=", "TICLANG_ARMCOMPILER=", "GENERATOR=Ninja"]
+
+ ret = subprocess.call(make_command)
+else:
+ print("Compiler Path is invalid: " + GCC_ARMCOMPILER_PATH)
 
-ret = subprocess.call(make_command)
 sys.exit(ret)
+