Skip to content

Commit 4082fd7

Browse files
restyled-commitsabiradarti
restyled-commits
authored and
abiradarti
committed
Restyled by gn
1 parent 9fcff72 commit 4082fd7

File tree

9 files changed

+60
-49
lines changed

9 files changed

+60
-49
lines changed

‎examples/all-clusters-app/cc13x4_26x4/BUILD.gn

+5-2
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,11 @@ ti_simplelink_executable("all-clusters-app") {
119119
defines = [ "CC13XX_26XX_FACTORY_DATA" ]
120120
}
121121

122-
if(chip_enable_icd_server){
123-
defines += ["CHIP_DEVICE_CONFIG_ENABLE_SED", "TI_ICD_ENABLE_SERVER"]
122+
if (chip_enable_icd_server) {
123+
defines += [
124+
"CHIP_DEVICE_CONFIG_ENABLE_SED",
125+
"TI_ICD_ENABLE_SERVER",
126+
]
124127
}
125128

126129
include_dirs = [

‎examples/lighting-app/cc13x4_26x4/BUILD.gn

+6-4
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ ti_sysconfig("sysconfig") {
6868
cflags = [
6969
"-Wno-comment",
7070
"@" + rebase_path("${target_gen_dir}/sysconfig/ti_utils_build_compiler.opt",
71-
root_build_dir),
71+
root_build_dir),
7272
]
7373
}
7474

@@ -101,9 +101,11 @@ ti_simplelink_executable("lighting_app") {
101101
defines = [ "CC13XX_26XX_FACTORY_DATA" ]
102102
}
103103

104-
if(chip_enable_icd_server){
105-
defines += ["CHIP_DEVICE_CONFIG_ENABLE_SED",
106-
"TI_ICD_ENABLE_SERVER"]
104+
if (chip_enable_icd_server) {
105+
defines += [
106+
"CHIP_DEVICE_CONFIG_ENABLE_SED",
107+
"TI_ICD_ENABLE_SERVER",
108+
]
107109
}
108110

109111
include_dirs = [

‎examples/lock-app/cc13x4_26x4/BUILD.gn

+5-2
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,11 @@ ti_simplelink_executable("lock_app") {
105105
defines = [ "CC13XX_26XX_FACTORY_DATA" ]
106106
}
107107

108-
if(chip_enable_icd_server){
109-
defines += ["CHIP_DEVICE_CONFIG_ENABLE_SED", "TI_ICD_ENABLE_SERVER"]
108+
if (chip_enable_icd_server) {
109+
defines += [
110+
"CHIP_DEVICE_CONFIG_ENABLE_SED",
111+
"TI_ICD_ENABLE_SERVER",
112+
]
110113
}
111114
include_dirs = [
112115
"${project_dir}",

‎examples/pump-app/cc13x4_26x4/BUILD.gn

+5-2
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,11 @@ ti_simplelink_executable("pump_app") {
101101
defines = [ "CC13XX_26XX_FACTORY_DATA" ]
102102
}
103103

104-
if(chip_enable_icd_server){
105-
defines += ["CHIP_DEVICE_CONFIG_ENABLE_SED", "TI_ICD_ENABLE_SERVER"]
104+
if (chip_enable_icd_server) {
105+
defines += [
106+
"CHIP_DEVICE_CONFIG_ENABLE_SED",
107+
"TI_ICD_ENABLE_SERVER",
108+
]
106109
}
107110

108111
include_dirs = [

‎examples/pump-controller-app/cc13x4_26x4/BUILD.gn

+5-2
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,11 @@ ti_simplelink_executable("pump_controller_app") {
100100
defines = [ "CC13XX_26XX_FACTORY_DATA" ]
101101
}
102102

103-
if (chip_enable_icd_server){
104-
defines += ["CHIP_DEVICE_CONFIG_ENABLE_SED", "TI_ICD_ENABLE_SERVER"]
103+
if (chip_enable_icd_server) {
104+
defines += [
105+
"CHIP_DEVICE_CONFIG_ENABLE_SED",
106+
"TI_ICD_ENABLE_SERVER",
107+
]
105108
}
106109
include_dirs = [
107110
"${project_dir}",

‎examples/pump-controller-app/cc13x4_26x4/args.gni

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,4 @@ chip_enable_icd_server = false
5757
chip_persist_subscriptions = false
5858
chip_subscription_timeout_resumption = false
5959

60-
freertos_root = "//third_party/connectedhomeip/third_party/ti_simplelink_sdk/repo_cc13xx_cc26xx/source/third_party/freertos"
60+
freertos_root = "//third_party/connectedhomeip/third_party/ti_simplelink_sdk/repo_cc13xx_cc26xx/source/third_party/freertos"

‎examples/shell/cc13x4_26x4/BUILD.gn

+5-2
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,11 @@ ti_simplelink_executable("shell_app") {
100100
defines = [ "CC13XX_26XX_FACTORY_DATA" ]
101101
}
102102

103-
if (chip_enable_icd_server){
104-
defines += ["CHIP_DEVICE_CONFIG_ENABLE_SED", "TI_ICD_ENABLE_SERVER"]
103+
if (chip_enable_icd_server) {
104+
defines += [
105+
"CHIP_DEVICE_CONFIG_ENABLE_SED",
106+
"TI_ICD_ENABLE_SERVER",
107+
]
105108
}
106109

107110
include_dirs = [

‎third_party/ti_simplelink_sdk/ti_simplelink_executable.gni

+4-7
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,6 @@ template("ti_simplelink_executable") {
289289
if (defined(invoker.ota_args)) {
290290
args += invoker.ota_args
291291
}
292-
293292
}
294293
} else if (ti_simplelink_device_family == "cc13x4_26x4") {
295294
if (custom_factory_data) {
@@ -419,13 +418,11 @@ template("ti_simplelink_executable") {
419418
flashable_executable("${simplelink_target_name}_mcubootloader") {
420419
output_name = "${output_base_name}.mcubootloader.out"
421420
output_dir = root_out_dir
422-
deps = [
423-
":${simplelink_target_name}_mcuboot.syscfg",
424-
":build_external_library",
425-
]
426-
public_configs = [
427-
":external_library_config",
421+
deps = [
422+
":${simplelink_target_name}_mcuboot.syscfg",
423+
":build_external_library",
428424
]
425+
public_configs = [ ":external_library_config" ]
429426
ldscript =
430427
"${ti_simplelink_sdk_build_root}/mcuboot/mcuboot_cc13x4_cc26x4.lds"
431428
objcopy_image_name = "${output_base_name}.mcubootloader.hex"

‎third_party/ti_simplelink_sdk/ti_simplelink_sdk.gni

+24-27
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,10 @@ template("ti_simplelink_sdk") {
186186
ti_simplelink_device_family == "cc13x4_26x4") {
187187
action("build_external_library") {
188188
script = "${ti_simplelink_sdk_build_root}/run_sdk_drivers_gen.py"
189-
outputs = [ "${target_gen_dir}/drivers_${ti_simplelink_soc_family}.a" , "${target_gen_dir}/driverlib.lib"]
189+
outputs = [
190+
"${target_gen_dir}/drivers_${ti_simplelink_soc_family}.a",
191+
"${target_gen_dir}/driverlib.lib",
192+
]
190193
args = [
191194
"--sdk",
192195
rebase_path(ti_simplelink_sdk_root),
@@ -195,8 +198,8 @@ template("ti_simplelink_sdk") {
195198
"--src-path-drivers",
196199
"/source/ti/drivers/lib/gcc/${ti_simplelink_isa}/drivers_${ti_simplelink_soc_family}.a",
197200
"--src-path-driverlib",
198-
"/source/ti/devices/${ti_simplelink_device_family_driverlib}/driverlib/bin/gcc/driverlib.lib",
199-
201+
"/source/ti/devices/${ti_simplelink_device_family_driverlib}/driverlib/bin/gcc/driverlib.lib",
202+
200203
"--dest-path",
201204
rebase_path(target_gen_dir),
202205
]
@@ -209,23 +212,17 @@ template("ti_simplelink_sdk") {
209212
sdk_target_name = target_name
210213

211214
config("cc13x2_26x2_sdk_config") {
212-
libs = [
213-
"${ti_simplelink_sdk_root}/source/ti/drivers/rf/lib/gcc/${ti_simplelink_isa}/rf_multiMode_${ti_simplelink_soc_family}.a",
214-
]
215+
libs = [ "${ti_simplelink_sdk_root}/source/ti/drivers/rf/lib/gcc/${ti_simplelink_isa}/rf_multiMode_${ti_simplelink_soc_family}.a" ]
215216
defines = [ "DeviceFamily_CC13X2_CC26X2" ]
216217
}
217218

218219
config("cc13x2x7_26x2x7_sdk_config") {
219-
libs = [
220-
"${ti_simplelink_sdk_root}/source/ti/drivers/rf/lib/gcc/${ti_simplelink_isa}/rf_multiMode_cc26x2.a",
221-
]
220+
libs = [ "${ti_simplelink_sdk_root}/source/ti/drivers/rf/lib/gcc/${ti_simplelink_isa}/rf_multiMode_cc26x2.a" ]
222221
defines = [ "DeviceFamily_CC13X2X7_CC26X2X7" ]
223222
}
224223

225224
config("cc13x4_26x4_sdk_config") {
226-
libs = [
227-
"${ti_simplelink_sdk_root}/source/ti/drivers/rf/lib/gcc/${ti_simplelink_isa}/rf_multiMode_${ti_simplelink_soc_family}.a",
228-
]
225+
libs = [ "${ti_simplelink_sdk_root}/source/ti/drivers/rf/lib/gcc/${ti_simplelink_isa}/rf_multiMode_${ti_simplelink_soc_family}.a" ]
229226
defines = [ "FLASH_ONLY_BUILD" ]
230227
if (ti_simplelink_device == "") {
231228
defines += [ "DeviceFamily_CC13X4" ]
@@ -256,12 +253,14 @@ template("ti_simplelink_sdk") {
256253
]
257254
}
258255

259-
260256
if (ti_simplelink_device_family == "cc13x2_26x2" ||
261257
ti_simplelink_device_family == "cc13x2x7_26x2x7" ||
262258
ti_simplelink_device_family == "cc13x4_26x4") {
263259
config("external_library_config") {
264-
libs = [ "${target_gen_dir}/drivers_${ti_simplelink_soc_family}.a", "${target_gen_dir}/driverlib.lib" ]
260+
libs = [
261+
"${target_gen_dir}/drivers_${ti_simplelink_soc_family}.a",
262+
"${target_gen_dir}/driverlib.lib",
263+
]
265264
}
266265

267266
group("external_library") {
@@ -785,31 +784,30 @@ template("ti_simplelink_sdk") {
785784
ti_simplelink_device_family == "cc13x2x7_26x2x7" ||
786785
ti_simplelink_device_family == "cc13x4_26x4") {
787786
public_deps += [
788-
":build_external_library",
789787
":${sdk_target_name}_dmm",
790788
":${sdk_target_name}_nvocmp",
789+
":build_external_library",
791790
]
792791
}
793792
if (defined(invoker.public_configs)) {
794793
public_configs = invoker.public_configs
795-
if (ti_simplelink_device_family == "cc13x2_26x2" ||
796-
ti_simplelink_device_family == "cc13x2x7_26x2x7" ||
797-
ti_simplelink_device_family == "cc13x4_26x4") {
798-
public_configs += [ ":external_library_config" ]
799-
}
794+
if (ti_simplelink_device_family == "cc13x2_26x2" ||
795+
ti_simplelink_device_family == "cc13x2x7_26x2x7" ||
796+
ti_simplelink_device_family == "cc13x4_26x4") {
797+
public_configs += [ ":external_library_config" ]
798+
}
800799
}
801800
}
802801
}
803802

804803
template("freertos_target") {
805804
freertos_target_name = target_name
806805

807-
if (ti_simplelink_device_family == "cc13x2_26x2" ||
808-
ti_simplelink_device_family == "cc13x2x7_26x2x7" ||
809-
ti_simplelink_device_family == "cc13x4_26x4") {
810-
_freertos_root = "${freertos_root}"
811-
}
812-
else{
806+
if (ti_simplelink_device_family == "cc13x2_26x2" ||
807+
ti_simplelink_device_family == "cc13x2x7_26x2x7" ||
808+
ti_simplelink_device_family == "cc13x4_26x4") {
809+
_freertos_root = "${freertos_root}"
810+
} else {
813811
_freertos_root = "${freertos_root}/repo"
814812
}
815813

@@ -845,4 +843,3 @@ template("freertos_target") {
845843
public_configs += [ ":${freertos_target_name}_config" ]
846844
}
847845
}
848-

0 commit comments

Comments
 (0)