[EFR32]Remove Thread NVM section in the linker file for WiFi builds (#…

…14787) * Remove Thread NVM section in the linker file for WiFi builds * Restyled by gn Co-authored-by: Restyled.io <[email protected]>
project-chip · Feb 4, 2022 · c5437aa · c5437aa
1 parent 4b37bd5
commit c5437aa
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 6 deletions.
diff --git a/examples/lighting-app/efr32/BUILD.gn b/examples/lighting-app/efr32/BUILD.gn
@@ -258,6 +258,12 @@ efr32_executable("lighting_app") {
       "-fstack-usage",
     ]
   }
+  if (use_rs911x || use_wf200) {
+    ldflags += [
+      "-Wl,--defsym",
+      "-Wl,SILABS_WIFI=1",
+    ]
+  }
 
   output_dir = root_out_dir
 }

diff --git a/examples/lock-app/efr32/BUILD.gn b/examples/lock-app/efr32/BUILD.gn
@@ -261,6 +261,12 @@ efr32_executable("lock_app") {
       "-fstack-usage",
     ]
   }
+  if (use_rs911x || use_wf200) {
+    ldflags += [
+      "-Wl,--defsym",
+      "-Wl,SILABS_WIFI=1",
+    ]
+  }
 
   output_dir = root_out_dir
 }

diff --git a/examples/platform/efr32/ldscripts/efr32mg12.ld b/examples/platform/efr32/ldscripts/efr32mg12.ld
@@ -197,8 +197,8 @@ SECTIONS
     __nvm3_dummy_chip = .;
     KEEP(*(chipNvm3_section));
     . = ALIGN (8192);
-    . += OPENTHREAD_NVM_SIZE;
-    . = ALIGN (8192);
+    . += DEFINED(SILABS_WIFI) ? 0 : OPENTHREAD_NVM_SIZE;
+    . = DEFINED(SILABS_WIFI) ? . : ALIGN (8192);
   } > FLASH
 
   /* Set NVM to end of FLASH */
@@ -286,4 +286,4 @@ SECTIONS
   /* Check if FLASH usage exceeds FLASH size */
   ASSERT( LENGTH(FLASH) >= (__etext + SIZEOF(.data)), "FLASH memory overflowed !")
   ASSERT((__etext + SIZEOF(.data)) <= __nvm3Base, "FLASH memory overlapped with NVM section.")
-}
+}
diff --git a/examples/platform/efr32/ldscripts/efr32mg24.ld b/examples/platform/efr32/ldscripts/efr32mg24.ld
@@ -197,8 +197,8 @@ SECTIONS
     __nvm3_dummy_chip = .;
     KEEP(*(chipNvm3_section));
     . = ALIGN (8192);
-    . += OPENTHREAD_NVM_SIZE;
-    . = ALIGN (8192);
+    . += DEFINED(SILABS_WIFI) ? 0 : OPENTHREAD_NVM_SIZE;
+    . = DEFINED(SILABS_WIFI) ? . : ALIGN (8192);
   } > FLASH
 
   /* Set NVM to end of FLASH */
@@ -286,4 +286,4 @@ SECTIONS
   /* Check if FLASH usage exceeds FLASH size */
   ASSERT( (ORIGIN(FLASH) + LENGTH(FLASH)) >= (__etext + SIZEOF(.data)), "FLASH memory overflowed !")
   ASSERT((__etext + SIZEOF(.data)) <= __nvm3Base, "FLASH memory overlapped with NVM section.")
-}
+}
diff --git a/examples/window-app/efr32/BUILD.gn b/examples/window-app/efr32/BUILD.gn
@@ -218,6 +218,12 @@ efr32_executable("window_app") {
       "-fstack-usage",
     ]
   }
+  if (use_rs911x || use_wf200) {
+    ldflags += [
+      "-Wl,--defsym",
+      "-Wl,SILABS_WIFI=1",
+    ]
+  }
 }
 
 group("efr32") {