TSBM-21 Removed commented out code and added missing FSL_OS_FREERTOS …

…defines.
meulemanelectronics · Feb 26, 2024 · 932e3d8 · 932e3d8
1 parent 691e79c
commit 932e3d8
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 48 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
@@ -38,11 +38,6 @@ declare_args() {
 }
 
 template("renesas_sdk") {
- # if (defined(invoker.renesas_sdk_root)) {
-  #  renesas_sdk_root = invoker.renesas_sdk_root
-  #}
-
-  #assert(renesas_sdk_root != "", "renesas_sdk_root must be specified")
 
   config("${target_name}_config") {
     include_dirs = []
@@ -57,9 +52,7 @@ template("renesas_sdk") {
       defines += invoker.defines
     }
 
-    include_dirs += [
-
-    ]
+    include_dirs += [ ]
 
     cflags = [ "--specs=nano.specs" ]
     if (is_debug) {
@@ -68,55 +61,24 @@ template("renesas_sdk") {
 
     ldflags = [
       "--specs=nano.specs",
-    #  "-Wl,--entry=${renesas_sdk_crt_entry}",
-    #  "-Wl,--just-symbols=" +
-     #     rebase_path(renesas_sdk_patch_sym_file, root_build_dir),
       "-nostartfiles",
     ]
   }
-
- # renesas_sdk_script("${target_name}_gen_lib_installer") {
- #   script_file_name = "bt_gen_lib_installer.bash"
-
- #   lib_installer_file = "${root_gen_dir}/lib_installer.c"
-
- #   args = [ "--out=" + rebase_path(lib_installer_file, root_build_dir) ]
-
- #   outputs = [ lib_installer_file ]
- # }
-
   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"
-      #"ENABLE_DEBUG=${renesas_sdk_debug}",
-      #"SPAR_CRT_SETUP=${renesas_sdk_crt_entry}",
-      #"XS_LOCATION_ACTIVE=${btp.ConfigXS1Location}",
-      #"XS_LOCATION_UPGRADE=${btp.ConfigXS2Location}",
+      "CHIP_SYSTEM_CONFIG_USE_LWIP=1",
+      "FSL_RTOS_FREE_RTOS=1",
     ]
-    #if (chip_enable_ota_requestor) {
-    #  defines += [ "BLE_OTA_FW_UPGRADE=1" ]
-    #}
 
     public_configs = [ ":${target_name}_config" ]
 
     deps = [ ]
   }
 }
-