From 3611340813bd50202970679056fa4c64b4bca4e9 Mon Sep 17 00:00:00 2001
From: Vincent Coubard <vincent.coubard@arm.com>
Date: Wed, 3 Feb 2021 09:15:31 +0000
Subject: [PATCH] Update Mbed configuration

---
 config/mbed/chip-gn/.gn                |  2 +-
 config/mbed/chip-gn/BUILD.gn           | 14 +++++++++++++-
 config/mbed/chip-gn/args.gni           | 10 +++++++++-
 config/mbed/chip-gn/toolchain/BUILD.gn |  2 +-
 4 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/config/mbed/chip-gn/.gn b/config/mbed/chip-gn/.gn
index 963f80dfb05f2e..0ae417efaade6f 100644
--- a/config/mbed/chip-gn/.gn
+++ b/config/mbed/chip-gn/.gn
@@ -20,7 +20,7 @@ check_system_includes = true
 
 default_args = {
   target_cpu = "arm"
-  target_os = "mbed-os"
+  target_os = "mbed"
 
   import("//args.gni")
 }
diff --git a/config/mbed/chip-gn/BUILD.gn b/config/mbed/chip-gn/BUILD.gn
index 7e06a9ee688600..c67851b089dad6 100644
--- a/config/mbed/chip-gn/BUILD.gn
+++ b/config/mbed/chip-gn/BUILD.gn
@@ -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
@@ -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>"
+  ]
+}
diff --git a/config/mbed/chip-gn/args.gni b/config/mbed/chip-gn/args.gni
index 06ad3dabe697a9..62d40e8958c652 100644
--- a/config/mbed/chip-gn/args.gni
+++ b/config/mbed/chip-gn/args.gni
@@ -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"
diff --git a/config/mbed/chip-gn/toolchain/BUILD.gn b/config/mbed/chip-gn/toolchain/BUILD.gn
index c67c41d16c2ec7..7bb867bd7f713a 100644
--- a/config/mbed/chip-gn/toolchain/BUILD.gn
+++ b/config/mbed/chip-gn/toolchain/BUILD.gn
@@ -28,7 +28,7 @@ gcc_toolchain("mbed") {
   cxx = mbed_cxx
 
   toolchain_args = {
-    current_os = "mbed-os"
+    current_os = "mbed"
     is_clang = false
   }
 }