Merge branch 'TSBM-21' into TSBM-21-cleanup

meulemanelectronics · Feb 26, 2024 · c62ce3c · c62ce3c
2 parents 680663c + 932e3d8
commit c62ce3c
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 22 deletions.
diff --git a/examples/lock-app/renesas/BUILD.gn b/examples/lock-app/renesas/BUILD.gn
@@ -24,7 +24,6 @@ declare_args() {
   setupDiscriminator = 3840
 }
 
-
 group("chip-lock-app")
 {
   deps = [
@@ -90,4 +89,5 @@ group("default") {
         "//third_party/connectedhomeip/third_party/nlio:nlio",
         "//third_party/connectedhomeip/third_party/nlunit-test:nlunit-test",
 ]
+
 }
diff --git a/src/BUILD.gn b/src/BUILD.gn
@@ -42,7 +42,7 @@ config("includes") {
   # TODO: generated file dependency should be a lib NOT an include
   include_dirs += [ "${chip_root}/zzz_generated/app-common" ]
 
-  defines = [ "CHIP_HAVE_CONFIG_H=1" ]
+  defines = [ "CHIP_HAVE_CONFIG_H=1", "FSL_RTOS_FREE_RTOS=1" ] #<< We need to add FSL_RTOS_FREE_RTOS to build using freertos using FSL.
 
   # Make __FILE__ and related macros relative to chip_root
   cflags = [ "-fmacro-prefix-map=${build_relative_chip_root}/=" ]

diff --git a/src/platform/device.gni b/src/platform/device.gni
@@ -223,8 +223,6 @@ declare_args() {
   chip_enable_segger_rtt = chip_device_platform != "qpg"
 }
 
-print("=========chip_device_platform: ${chip_device_platform}")
-print("=========current_os: ${current_os}")
 assert(
     (current_os != "freertos" && chip_device_platform == "none") ||
         chip_device_platform == "fake" ||

diff --git a/src/platform/renesas/BUILD.gn b/src/platform/renesas/BUILD.gn
@@ -46,10 +46,8 @@ static_library("renesas") {
 
   defines = [ "CHIP_SYSTEM_CONFIG_USE_LWIP=1", "FSL_RTOS_FREE_RTOS=1" ]
 
-
   deps = [ "${chip_root}/src/crypto" ]
 
-
   public_deps = [ "${chip_root}/src/lib/dnssd:platform_header",
                 "${chip_root}/src/platform:platform_base" ]
 

diff --git a/third_party/renesas_sdk/renesas_sdk.gni b/third_party/renesas_sdk/renesas_sdk.gni
@@ -36,6 +36,7 @@ declare_args() {
 }
 
 template("renesas_sdk") {
+
   config("${target_name}_config") {
     include_dirs = []
     defines = []
@@ -49,9 +50,7 @@ template("renesas_sdk") {
       defines += invoker.defines
     }
 
-    include_dirs += [
-
-    ]
+    include_dirs += [ ]
 
     cflags = [ "--specs=nano.specs" ]
     if (is_debug) {
@@ -65,30 +64,20 @@ template("renesas_sdk") {
   }
 
   source_set(target_name) {
-    sources = [
-
-    ]
-
-    if (chip_enable_ota_requestor) {
-      sources += [
-
-      ]
-    }
-
-    #sources += get_target_outputs(":${target_name}_gen_lib_installer")
+    sources = [ ]
 
     if (defined(invoker.sources)) {
       sources += invoker.sources
     }
 
     defines = [
       "CHIP_HAVE_CONFIG_H=1",
-      "CHIP_SYSTEM_CONFIG_USE_LWIP=1"
+      "CHIP_SYSTEM_CONFIG_USE_LWIP=1",
+      "FSL_RTOS_FREE_RTOS=1",
     ]
 
     public_configs = [ ":${target_name}_config" ]
 
     deps = [ ]
   }
 }
-