From 3720728ed4aded314d4add94e5a5b5a4ef1fbd30 Mon Sep 17 00:00:00 2001
From: Junior Martinez <67972863+jmartinez-silabs@users.noreply.github.com>
Date: Mon, 7 Oct 2024 14:28:08 -0400
Subject: [PATCH] Fix efr32 test_driver build and make sure the linkerfile
 matches the target board

---
 src/test_driver/efr32/BUILD.gn | 11 +++++++++++
 src/test_driver/efr32/args.gni |  8 --------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/test_driver/efr32/BUILD.gn b/src/test_driver/efr32/BUILD.gn
index 0d10cb8d76a475..1fc16ed47f4d52 100644
--- a/src/test_driver/efr32/BUILD.gn
+++ b/src/test_driver/efr32/BUILD.gn
@@ -61,6 +61,16 @@ efr32_sdk("sdk") {
   ]
 }
 
+config("efr32_ldflags") {
+  _ldscript =
+      "${chip_root}/examples/platform/silabs/ldscripts/${silabs_family}.ld"
+
+  ldflags = [
+    "-T" + rebase_path(_ldscript, root_build_dir),
+    "-Wl,--no-warn-rwx-segment",
+  ]
+}
+
 # This is the test runner.  `pw_test` will dep this for each `silabs_executable` target.
 source_set("efr32_test_main") {
   defines = [ "PW_RPC_ENABLED" ]
@@ -103,6 +113,7 @@ source_set("efr32_test_main") {
   ]
 
   include_dirs = [ "${chip_root}/examples/common/pigweed/efr32" ]
+  public_configs = [ ":efr32_ldflags" ]
 }
 
 # This target is referred to by BuildRoot in scripts/build/builders/efr32.py, as well as the example in README.md.
diff --git a/src/test_driver/efr32/args.gni b/src/test_driver/efr32/args.gni
index f7f52398a5889e..35be5dd63e3870 100644
--- a/src/test_driver/efr32/args.gni
+++ b/src/test_driver/efr32/args.gni
@@ -15,9 +15,7 @@
 import("//build_overrides/chip.gni")
 import("//build_overrides/pigweed.gni")
 import("${chip_root}/config/efr32/lib/pw_rpc/pw_rpc.gni")
-import("${chip_root}/examples/platform/silabs/args.gni")
 import("${chip_root}/src/platform/silabs/efr32/args.gni")
-import("${chip_root}/third_party/silabs/silabs_board.gni")  # silabs_family
 
 silabs_sdk_target = get_label_info(":sdk", "label_no_toolchain")
 
@@ -46,9 +44,3 @@ pw_unit_test_MAIN = "//:efr32_test_main"
 # Additional variables needed by silabs_executable that must be passed in to pw_test.
 test_executable_output_name = "matter-silabs-device_tests-"
 test_executable_output_name_suffix = ".out"
-_ldscript =
-    "${chip_root}/examples/platform/silabs/ldscripts/${silabs_family}.ld"
-test_executable_ldflags = [
-  "-T" + rebase_path(_ldscript, root_build_dir),
-  "-Wl,--no-warn-rwx-segment",
-]