Remove references to BRD4325A

Author: mkardous-silabs

examples/platform/silabs/SiWx917/BUILD.gn

@@ -210,7 +210,7 @@ source_set("siwx917-common") {
   ]
 
   if (chip_enable_pw_rpc || chip_build_libshell || sl_uart_log_output) {
-    sources += [ "uart.cpp" ]
+    sources += [ "${silabs_common_plat_dir}/uart.cpp" ]
   }
 
   if (chip_enable_ota_requestor) {

examples/platform/silabs/SoftwareFaultReports.cpp

@@ -26,17 +26,18 @@
 #include <platform/CHIPDeviceLayer.h>
 #include <platform/DiagnosticDataProvider.h>
 
-#ifndef BRD4325A
+#if !defined(SLI_SI91X_MCU_INTERFACE) || !defined(SLI_SI91X_ENABLE_BLE)
 #include "rail_types.h"
 
 #ifdef RAIL_ASSERT_DEBUG_STRING
 #include "rail_assert_error_codes.h"
 #endif
-#endif // BRD4325A
+#endif // !defined(SLI_SI91X_MCU_INTERFACE) || !defined(SLI_SI91X_ENABLE_BLE)
+
+#if defined(SLI_SI91X_MCU_INTERFACE) && SLI_SI91X_MCU_INTERFACE
 
-#ifdef BRD4325A // For SiWx917 Platform only
 #include "core_cm4.h"
-#endif
+#endif // defined(SLI_SI91X_MCU_INTERFACE) && SLI_SI91X_MCU_INTERFACE
 
 // Technically FaultRecording is an octstr up to 1024 bytes.
 // We currently only report short strings. 100 char will more than enough for now.
@@ -227,7 +228,7 @@ extern "C" void vApplicationGetTimerTaskMemory(StaticTask_t ** ppxTimerTaskTCBBu
     *pulTimerTaskStackSize = configTIMER_TASK_STACK_DEPTH;
 }
 
-#ifndef BRD4325A
+#if !defined(SLI_SI91X_MCU_INTERFACE) || !defined(SLI_SI91X_ENABLE_BLE)
 extern "C" void RAILCb_AssertFailed(RAIL_Handle_t railHandle, uint32_t errorCode)
 {
     char faultMessage[kMaxFaultStringLen] = { 0 };
@@ -251,6 +252,5 @@ extern "C" void RAILCb_AssertFailed(RAIL_Handle_t railHandle, uint32_t errorCode
 
     chipAbort();
 }
-#endif // BRD4325A
-
+#endif // !defined(SLI_SI91X_MCU_INTERFACE) || !defined(SLI_SI91X_ENABLE_BLE)
 #endif // HARD_FAULT_LOG_ENABLE

examples/platform/silabs/efr32/BUILD.gn

@@ -248,7 +248,7 @@ source_set("efr32-common") {
   ]
 
   if (chip_enable_pw_rpc || chip_build_libshell || enable_openthread_cli) {
-    sources += [ "uart.cpp" ]
+    sources += [ "${silabs_common_plat_dir}/uart.cpp" ]
   }
 
   if (chip_enable_ota_requestor) {

examples/smoke-co-alarm-app/silabs/src/AppTask.cpp

@@ -31,7 +31,7 @@
 #include <setup_payload/QRCodeSetupPayloadGenerator.h>
 #include <setup_payload/SetupPayload.h>
 
-#if (defined(SL_CATALOG_SIMPLE_LED_LED1_PRESENT) || defined(BRD4325B))
+#if (defined(SL_CATALOG_SIMPLE_LED_LED1_PRESENT))
 #define LIGHT_LED 1
 #else
 #define LIGHT_LED 0

src/lib/shell/MainLoopSilabs.cpp

@@ -206,10 +206,6 @@ void ProcessShellLine(intptr_t args)
         }
     }
     MemoryFree(line);
-#ifdef BRD4325A
-    // small delay for uart print
-    vTaskDelay(1);
-#endif
     streamer_printf(streamer_get(), kShellPrompt);
 }
 

src/platform/silabs/Logging.cpp

@@ -15,13 +15,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#ifndef BRD4325A
-
-#ifdef RAIL_ASSERT_DEBUG_STRING
-#include "rail_assert_error_codes.h"
-#endif
-#endif // BRD4325A
-
 #ifdef PW_RPC_ENABLED
 #include "PigweedLogger.h"
 #endif

src/test_driver/efr32/BUILD.gn

@@ -73,7 +73,7 @@ silabs_executable("efr32_device_tests") {
     "${examples_common_plat_dir}/provision/ProvisionStorageCustom.cpp",
     "${examples_common_plat_dir}/provision/ProvisionStorageDefault.cpp",
     "${examples_common_plat_dir}/syscalls_stubs.cpp",
-    "${examples_plat_dir}/uart.cpp",
+    "${examples_common_plat_dir}/uart.cpp",
     "src/main.cpp",
   ]
 

third_party/silabs/SiWx917_sdk.gni

@@ -215,7 +215,6 @@ template("siwx917_sdk") {
       "ROMDRIVER_PRESENT=1",
       "SL_CATALOG_FREERTOS_KERNEL_PRESENT=1",
       "SLI_SI91X_MCU_CONFIG_RADIO_BOARD_BASE_VER=1",
-      "BRD4325A",  #TODO: should be removed after SoC macro clean-up
       "SLI_SI917B0=1",
       "SLI_SI91X_MCU_COMMON_FLASH_MODE=1",
       "SLI_SI91X_MCU_CONFIG_RADIO_BOARD_VER2=1",