Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix TI simplelink in unified build #4983

Merged
merged 1 commit into from
Feb 24, 2021
Merged

Fix TI simplelink in unified build #4983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ if (current_toolchain != "${dir_pw_toolchain}/dummy:dummy") {
enable_android_builds = false

# Set this to true to enable TI builds by default.
enable_cc13x2_26x2_builds = false
enable_ti_simplelink_builds = false

# Set this to true to enable efr32 builds by default.
enable_efr32_builds = false
Expand Down Expand Up @@ -179,8 +179,8 @@ if (current_toolchain != "${dir_pw_toolchain}/dummy:dummy") {
enable_linux_lighting_app_build =
enable_default_builds && (host_os == "linux" || host_os == "mac")

# Build the cc13x2_26x2 lock app example.
enable_cc13x2_26x2_lock_app_build = enable_cc13x2_26x2_builds
# Build the cc13x2x7_26x2x7 lock app example.
enable_cc13x2x7_26x2x7_lock_app_build = enable_ti_simplelink_builds

# Build the efr32 lock app example.
enable_efr32_lock_app_build = enable_efr32_builds
Expand Down Expand Up @@ -240,9 +240,9 @@ if (current_toolchain != "${dir_pw_toolchain}/dummy:dummy") {
}
}

if (enable_cc13x2_26x2_lock_app_build) {
group("cc13x2_26x2_lock_app") {
deps = [ "${chip_root}/examples/lock-app/cc13x2_26x2(${chip_root}/config/cc13x2_26x2/toolchain:cc13x2_26x2_lock_app)" ]
if (enable_cc13x2x7_26x2x7_lock_app_build) {
group("cc13x2x7_26x2x7_lock_app") {
deps = [ "${chip_root}/examples/lock-app/cc13x2x7_26x2x7(${chip_root}/config/cc13x2_26x2/toolchain:cc13x2x7_26x2x7_lock_app)" ]
}
}

Expand Down Expand Up @@ -346,8 +346,8 @@ if (current_toolchain != "${dir_pw_toolchain}/dummy:dummy") {
if (enable_qpg6100_lock_app_build) {
deps += [ ":qpg6100_lock_app" ]
}
if (enable_cc13x2_26x2_lock_app_build) {
deps += [ ":cc13x2_26x2_lock_app" ]
if (enable_cc13x2x7_26x2x7_lock_app_build) {
deps += [ ":cc13x2x7_26x2x7_lock_app" ]
}
}

Expand Down
4 changes: 2 additions & 2 deletions config/cc13x2_26x2/toolchain/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ import("//build_overrides/chip.gni")

import("${build_root}/toolchain/arm_gcc/arm_toolchain.gni")

arm_toolchain("cc13x2_26x2_lock_app") {
arm_toolchain("cc13x2x7_26x2x7_lock_app") {
toolchain_args = {
current_os = "freertos"
import("${chip_root}/examples/lock-app/cc13x2_26x2/args.gni")
import("${chip_root}/examples/lock-app/cc13x2x7_26x2x7/args.gni")
}
}