Skip to content

Commit

Permalink
Update Mbed configuration
Browse files Browse the repository at this point in the history
  • Loading branch information
pan- authored and Filip Jagodzinski committed Mar 24, 2021
1 parent dcc476c commit 3611340
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 4 deletions.
2 changes: 1 addition & 1 deletion config/mbed/chip-gn/.gn
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ check_system_includes = true

default_args = {
target_cpu = "arm"
target_os = "mbed-os"
target_os = "mbed"

import("//args.gni")
}
14 changes: 13 additions & 1 deletion config/mbed/chip-gn/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,10 @@
import("//build_overrides/chip.gni")

import("//${chip_root}/build/chip/tests.gni")
import("//build_overrides/mbedtls.gni")
import("${mbedtls_root}/mbedtls.gni")

assert(current_os == "mbed-os")
assert(current_os == "mbed")

declare_args() {
chip_build_libshell = false
Expand All @@ -36,3 +38,13 @@ group("mbed") {
group("default") {
deps = [ ":mbed" ]
}

mbedtls_target("mbedtls") {
include_dirs = [
"mbedtls"
]

defines = [
"MBEDTLS_CONFIG_FILE=<mbed_tls_mbed_stub_config.h>"
]
}
10 changes: 9 additions & 1 deletion config/mbed/chip-gn/args.gni
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,12 @@ chip_system_project_config_include = ""
chip_ble_project_config_include = ""

custom_toolchain = "//toolchain:mbed"
mbedtls_target = "//:dummy"
mbedtls_target = "//:mbedtls"


treat_warnings_as_errors = false
chip_system_config_locking="none"
chip_with_lwip=true
chip_system_config_use_lwip=true
chip_system_config_use_sockets=false
chip_device_platform = "mbed"
2 changes: 1 addition & 1 deletion config/mbed/chip-gn/toolchain/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ gcc_toolchain("mbed") {
cxx = mbed_cxx

toolchain_args = {
current_os = "mbed-os"
current_os = "mbed"
is_clang = false
}
}

0 comments on commit 3611340

Please sign in to comment.