Restyled by gn

Author: restyled-commits

examples/platform/silabs/args.gni

@@ -25,5 +25,4 @@ segger_rtt_buffer_size_down = 1024
 
 declare_args() {
   app_data_model = ""
-  chip_enable_multi_ota_requestor = false
 }

examples/platform/silabs/efr32/BUILD.gn

@@ -180,11 +180,10 @@ config("efr32-common-config") {
     defines += [ "HEAP_MONITORING" ]
   }
 
-  if(chip_enable_multi_ota_requestor) {
-    defines += ["CHIP_DEVICE_CONFIG_ENABLE_MULTI_OTA_REQUESTOR=1"]
+  if (chip_enable_multi_ota_requestor) {
+    defines += [ "CHIP_DEVICE_CONFIG_ENABLE_MULTI_OTA_REQUESTOR=1" ]
   }
 
-
   ldflags = [ "-Wl,--no-warn-rwx-segment" ]
 }
 

scripts/tools/silabs/ota/README.md

@@ -69,20 +69,3 @@ format of the TLV by creating a JSON file based on the `ota_payload.schema`. The
 tool offers support for describing multiple TLV in the same JSON file. Please
 see the `examples/ota_max_entries_example.json` for a multi-app + SSBL example.
 Option `--json` must be used to specify the path to the JSON file.
-
-## Examples
-
-A set of examples can be found in `./examples`. Please run `create_ota_image.sh`
-to generate the examples:
-
--   Application image with default descriptor
--   Application image with specified descriptor
--   Factory data image
--   SSBL image
--   Application + SSBL + factory data image
--   Maximum number of entries image, using `ota_max_entries_example.json`. The
-    examples uses 8 SSBL binaries because they have a small size and fit in
-    external flash.
-
-The binaries from `./examples/binaries` should only be used only as an example.
-The user should provide their own binaries when generating the OTA image.

src/platform/silabs/efr32/BUILD.gn

@@ -18,7 +18,7 @@ import("${chip_root}/build/chip/buildconfig_header.gni")
 import("${chip_root}/src/crypto/crypto.gni")
 import("${chip_root}/src/platform/device.gni")
 import("${chip_root}/third_party/silabs/silabs_board.gni")
-import("${chip_root}/examples/platform/silabs/args.gni")
+import("${chip_root}/third_party/silabs/efr32_sdk.gni")
 
 silabs_platform_dir = "${chip_root}/src/platform/silabs"
 
@@ -80,21 +80,18 @@ static_library("efr32") {
 
   if (chip_enable_multi_ota_requestor) {
     sources += [
-      "${silabs_platform_dir}/multi-ota/OTAMultiImageProcessorImpl.h",
       "${silabs_platform_dir}/multi-ota/OTAMultiImageProcessorImpl.cpp",
-      "${silabs_platform_dir}/multi-ota/OTATlvProcessor.h",
+      "${silabs_platform_dir}/multi-ota/OTAMultiImageProcessorImpl.h",
       "${silabs_platform_dir}/multi-ota/OTATlvProcessor.cpp",
-      "${silabs_platform_dir}/multi-ota/efr32/OTAFirmwareProcessor.h",
+      "${silabs_platform_dir}/multi-ota/OTATlvProcessor.h",
       "${silabs_platform_dir}/multi-ota/efr32/OTAFirmwareProcessor.cpp",
+      "${silabs_platform_dir}/multi-ota/efr32/OTAFirmwareProcessor.h",
       "${silabs_platform_dir}/multi-ota/efr32/OTAHooks.cpp",
-
     ]
-  }
-  else if (chip_enable_ota_requestor) {
+  } else if (chip_enable_ota_requestor) {
     sources += [
       "${silabs_platform_dir}/OTAImageProcessorImpl.h",
       "${silabs_platform_dir}/efr32/OTAImageProcessorImpl.cpp",
-
     ]
   }
 

src/platform/silabs/multi-ota/OTATlvProcessor.h

@@ -42,9 +42,6 @@ namespace chip {
 #define CHIP_OTA_PROCESSOR_EXTERNAL_STORAGE CHIP_ERROR_TLV_PROCESSOR(0x0D)
 #define CHIP_OTA_PROCESSOR_START_IMAGE CHIP_ERROR_TLV_PROCESSOR(0x0E)
 
-// TODO: come up with error codes
-#define SL_GENERIC_OTA_ERROR CHIP_ERROR_TLV_PROCESSOR(0x0F)
-
 // Descriptor constants
 inline constexpr size_t kVersionStringSize = 64;
 inline constexpr size_t kBuildDateSize     = 64;

third_party/silabs/efr32_sdk.gni

@@ -74,6 +74,9 @@ declare_args() {
 
   # Use SLC generated files
   slc_reuse_files = false
+
+  # Multi-chip OTA
+  chip_enable_multi_ota_requestor = false
 }
 examples_plat_dir = "${chip_root}/examples/platform/silabs/efr32"
 silabs_plat_efr32_wifi_dir = "${chip_root}/src/platform/silabs/efr32/wifi"