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.

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

Restyle Remove support for nRF5 SDK for Thread & Zigbee #3606

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 0 additions & 3 deletions .github/boring-cyborg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,6 @@ labelPRBasedOnFilePath:
linux:
- src/platform/Linux/*

nrf5:
- src/platform/nRF5/*

nrf connect:
- src/platform/nrfconnect/*

Expand Down
3 changes: 0 additions & 3 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -146,9 +146,6 @@ k32w:
linux:
- src/platform/Linux/*

nrf5:
- src/platform/nRF5/*

nrf connect:
- src/platform/nrfconnect/*

Expand Down
94 changes: 0 additions & 94 deletions .github/workflows/examples-nrf.yaml

This file was deleted.

12 changes: 0 additions & 12 deletions .vscode/c_cpp_properties.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,18 +60,6 @@
"limitSymbolsToIncludedHeaders": true
}
},
{
"name": "nRF5 examples debug (GN)",
"cStandard": "c11",
"cppStandard": "c++11",
"intelliSenseMode": "gcc-x64",
"compileCommands": "${workspaceFolder}/out/debug/compile_commands.nrf5.json",
"compilerPath": "/opt/ARM-software/gcc-arm-none-eabi-9-2019-q4-major/bin/arm-none-eabi-gcc",
"browse": {
"path": ["${workspaceFolder}/out/debug/"],
"limitSymbolsToIncludedHeaders": true
}
},
{
"name": "EFR32 examples debug (GN)",
"cStandard": "c11",
Expand Down
26 changes: 0 additions & 26 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -114,32 +114,6 @@
]
}
},
{
"label": "Build nRF5 Lock Example",
"type": "shell",
"command": "scripts/examples/gn_build_example.sh examples/lock-app/nrf5 out/nrf5_lock_app",
"group": "build",
"problemMatcher": {
"base": "$gcc",
"fileLocation": [
"relative",
"${workspaceFolder}/out/nrf5_lock_app/"
]
}
},
{
"label": "Build nRF5 Lighting Example",
"type": "shell",
"command": "scripts/examples/gn_build_example.sh examples/lighting-app/nrf5 out/nrf5_lighting_app",
"group": "build",
"problemMatcher": {
"base": "$gcc",
"fileLocation": [
"relative",
"${workspaceFolder}/out/nrf5_lighting_app/"
]
}
},
{
"label": "Build EFR32 Lock Example",
"type": "shell",
Expand Down
39 changes: 0 additions & 39 deletions BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,6 @@ if (current_toolchain != "${dir_pw_toolchain}/dummy:dummy") {
# Enable building for Android.
enable_android_builds = false

# Set this to true to enable nRF5 builds by default.
enable_nrf5_builds = false

# Set this to true to enable efr32 builds by default.
enable_efr32_builds = false

Expand Down Expand Up @@ -139,15 +136,6 @@ if (current_toolchain != "${dir_pw_toolchain}/dummy:dummy") {
enable_linux_lighting_app_build =
enable_default_builds && host_os == "linux"

# Build the nRF5 lock app example.
enable_nrf5_lock_app_build = enable_nrf5_builds

# Build the nRF5 lighting app example.
enable_nrf5_lighting_app_build = enable_nrf5_builds

# Build the nRF5 pigweed app example.
enable_nrf5_pigweed_app_build = enable_nrf5_builds

# Build the efr32 lock app example.
enable_efr32_lock_app_build = enable_efr32_builds

Expand Down Expand Up @@ -220,24 +208,6 @@ if (current_toolchain != "${dir_pw_toolchain}/dummy:dummy") {
}
}

if (enable_nrf5_lock_app_build) {
group("nrf5_lock_app") {
deps = [ "${chip_root}/examples/lock-app/nrf5(${chip_root}/config/nrf5/toolchain:nrf5_lock_app)" ]
}
}

if (enable_nrf5_lighting_app_build) {
group("nrf5_lighting_app") {
deps = [ "${chip_root}/examples/lighting-app/nrf5(${chip_root}/config/nrf5/toolchain:nrf5_lighting_app)" ]
}
}

if (enable_nrf5_pigweed_app_build) {
group("nrf5_pigweed_app") {
deps = [ "${chip_root}/examples/pigweed-app/nrf5(${chip_root}/config/nrf5/toolchain:nrf5_pigweed_app)" ]
}
}

if (enable_efr32_lock_app_build) {
group("efr32_lock_app") {
deps = [ "${chip_root}/examples/lock-app/efr32(${chip_root}/config/efr32/toolchain:efr32_lock_app)" ]
Expand Down Expand Up @@ -290,15 +260,6 @@ if (current_toolchain != "${dir_pw_toolchain}/dummy:dummy") {
if (enable_linux_lighting_app_build) {
deps += [ ":linux_lighting_app" ]
}
if (enable_nrf5_lock_app_build) {
deps += [ ":nrf5_lock_app" ]
}
if (enable_nrf5_lighting_app_build) {
deps += [ ":nrf5_lighting_app" ]
}
if (enable_nrf5_pigweed_app_build) {
deps += [ ":nrf5_pigweed_app" ]
}
if (enable_efr32_lock_app_build) {
deps += [ ":efr32_lock_app" ]
}
Expand Down
18 changes: 0 additions & 18 deletions build_overrides/nrf5_sdk.gni

This file was deleted.

38 changes: 0 additions & 38 deletions config/nrf5/toolchain/BUILD.gn

This file was deleted.

8 changes: 4 additions & 4 deletions docs/BUILDING.md
Original file line number Diff line number Diff line change
Expand Up @@ -236,12 +236,12 @@ gn desc out/unified '//src/controller(//build/toolchain/host:linux_x64_clang)'
```

Note: Some builds are disabled by default as they need extra SDKs. For example,
to add the nRF5 examples to the unified build, download the
[Nordic nRF5 SDK for Thread and Zigbee](https://www.nordicsemi.com/Software-and-Tools/Software/nRF5-SDK-for-Thread-and-Zigbee)
and add the following build arguments:
to add the EFR32 examples to the unified build, download the
[SDK](https://github.com/SiliconLabs/sdk_support) and add the following build
arguments:

```
gn gen out/unified --args='target_os="all" enable_nrf5_builds=true nrf5_sdk_root="/path/to/sdk"'
gn gen out/unified --args='target_os="all" enable_efr32_builds=true efr32_sdk_root="/path/to/sdk" efr32_board="BRD4161A"'
```

### Getting Help
Expand Down
2 changes: 1 addition & 1 deletion docs/VSCODE_DEVELOPMENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ same base configuration and build.
- Main Build - Build the default configuration (i.e., Linux OpenSSL)
- Run Unit and Functional Tests - Test the default configuration
- Build & Test (all) - Build & Test various configurations (Linux variants,
Android, nRF5, EFR32)
Android, EFR32)
- Update compilation database - Update the database used by IntelliSense
(needed for cross references, completion)
- Bootstrap - On a clean tree, pull in the third party dependencies required
Expand Down
18 changes: 0 additions & 18 deletions examples/build_overrides/nrf5_sdk.gni

This file was deleted.

16 changes: 0 additions & 16 deletions examples/common/nrf5/README.md

This file was deleted.

38 changes: 0 additions & 38 deletions examples/common/nrf5/gdb/gdb-startup-cmds.txt

This file was deleted.

Loading