Skip to content

Commit

Permalink
[Silabs] Change directory to be inline with all the other ones (#24798)
Browse files Browse the repository at this point in the history
* rename directory

* bypass case sensitivity

* set real name

* fix static lib name
  • Loading branch information
mkardous-silabs authored and pull[bot] committed Aug 23, 2023
1 parent 71ecb38 commit 4207939
Show file tree
Hide file tree
Showing 57 changed files with 34 additions and 34 deletions.
2 changes: 1 addition & 1 deletion .github/boring-cyborg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ labelPRBasedOnFilePath:
- src/darwin/*

efr32:
- src/platform/EFR32/*
- src/platform/efr32/*

esp32:
- src/platform/ESP32/*
Expand Down
4 changes: 2 additions & 2 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -182,8 +182,8 @@ darwin:
- examples/darwin-framework-tool/**/*

efr32:
- src/platform/EFR32/*
- src/platform/EFR32/**/*
- src/platform/efr32/*
- src/platform/efr32/**/*

esp32:
- src/platform/ESP32/*
Expand Down
2 changes: 1 addition & 1 deletion examples/chef/efr32/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ efr32_sdk("sdk") {
]

include_dirs = [
"${chip_root}/src/platform/silabs/EFR32",
"${chip_root}/src/platform/silabs/efr32",
"${efr32_project_dir}/include",
"${examples_plat_dir}",
"${chip_root}/src/lib",
Expand Down
2 changes: 1 addition & 1 deletion examples/chef/efr32/args.gni
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

import("//build_overrides/chip.gni")
import("${chip_root}/config/standalone/args.gni")
import("${chip_root}/src/platform/EFR32/args.gni")
import("${chip_root}/src/platform/efr32/args.gni")

efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain")

Expand Down
2 changes: 1 addition & 1 deletion examples/chef/efr32/build_for_wifi_args.gni
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ import("//build_overrides/chip.gni")

efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain")
chip_enable_openthread = false
import("${chip_root}/src/platform/EFR32/wifi_args.gni")
import("${chip_root}/src/platform/efr32/wifi_args.gni")

chip_enable_ota_requestor = true
2 changes: 1 addition & 1 deletion examples/light-switch-app/silabs/efr32/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ efr32_sdk("sdk") {

include_dirs = [
"${chip_root}/examples/light-switch-app/silabs/common",
"${chip_root}/src/platform/silabs/EFR32",
"${chip_root}/src/platform/silabs/efr32",
"${efr32_project_dir}/include",
"${examples_plat_dir}",
"${chip_root}/src/lib",
Expand Down
2 changes: 1 addition & 1 deletion examples/light-switch-app/silabs/efr32/args.gni
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

import("//build_overrides/chip.gni")
import("${chip_root}/config/standalone/args.gni")
import("${chip_root}/src/platform/silabs/EFR32/args.gni")
import("${chip_root}/src/platform/silabs/efr32/args.gni")

efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import("${chip_root}/config/standalone/args.gni")

efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain")
chip_enable_openthread = false
import("${chip_root}/src/platform/silabs/EFR32/wifi_args.gni")
import("${chip_root}/src/platform/silabs/efr32/wifi_args.gni")

chip_enable_ota_requestor = true
app_data_model = "${chip_root}/examples/light-switch-app/light-switch-common"
2 changes: 1 addition & 1 deletion examples/lighting-app/silabs/efr32/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ efr32_sdk("sdk") {
]

include_dirs = [
"${chip_root}/src/platform/silabs/EFR32",
"${chip_root}/src/platform/silabs/efr32",
"${efr32_project_dir}/include",
"${examples_plat_dir}",
"${chip_root}/src/lib",
Expand Down
2 changes: 1 addition & 1 deletion examples/lighting-app/silabs/efr32/args.gni
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

import("//build_overrides/chip.gni")
import("${chip_root}/config/standalone/args.gni")
import("${chip_root}/src/platform/silabs/EFR32/args.gni")
import("${chip_root}/src/platform/silabs/efr32/args.gni")

efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain")

Expand Down
2 changes: 1 addition & 1 deletion examples/lighting-app/silabs/efr32/build_for_wifi_args.gni
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import("${chip_root}/config/standalone/args.gni")

efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain")
chip_enable_openthread = false
import("${chip_root}/src/platform/silabs/EFR32/wifi_args.gni")
import("${chip_root}/src/platform/silabs/efr32/wifi_args.gni")

chip_enable_ota_requestor = true
app_data_model = "${chip_root}/examples/lighting-app/lighting-common"
2 changes: 1 addition & 1 deletion examples/lock-app/silabs/efr32/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ efr32_sdk("sdk") {
]

include_dirs = [
"${chip_root}/src/platform/silabs/EFR32",
"${chip_root}/src/platform/silabs/efr32",
"${efr32_project_dir}/include",
"${examples_plat_dir}",
"${chip_root}/src/lib",
Expand Down
2 changes: 1 addition & 1 deletion examples/lock-app/silabs/efr32/args.gni
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

import("//build_overrides/chip.gni")
import("${chip_root}/config/standalone/args.gni")
import("${chip_root}/src/platform/silabs/EFR32/args.gni")
import("${chip_root}/src/platform/silabs/efr32/args.gni")

efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain")

Expand Down
2 changes: 1 addition & 1 deletion examples/lock-app/silabs/efr32/build_for_wifi_args.gni
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import("${chip_root}/config/standalone/args.gni")

efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain")
chip_enable_openthread = false
import("${chip_root}/src/platform/silabs/EFR32/wifi_args.gni")
import("${chip_root}/src/platform/silabs/efr32/wifi_args.gni")

chip_enable_ota_requestor = true
app_data_model = "${chip_root}/examples/lock-app/lock-common"
2 changes: 1 addition & 1 deletion examples/platform/silabs/SiWx917/OTAConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include <app/clusters/ota-requestor/DefaultOTARequestor.h>
#include <app/clusters/ota-requestor/DefaultOTARequestorDriver.h>
#include <app/clusters/ota-requestor/DefaultOTARequestorStorage.h>
#include <platform/silabs/EFR32/OTAImageProcessorImpl.h>
#include <platform/silabs/efr32/OTAImageProcessorImpl.h>

class OTAConfig
{
Expand Down
2 changes: 1 addition & 1 deletion examples/platform/silabs/efr32/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ assert(!(use_wf200 && chip_enable_openthread))
if (chip_enable_wifi) {
assert(use_rs911x || use_wf200)
enable_openthread_cli = false
import("${chip_root}/src/platform/silabs/EFR32/wifi_args.gni")
import("${chip_root}/src/platform/silabs/efr32/wifi_args.gni")

if (use_rs911x) {
wiseconnect_sdk_root =
Expand Down
2 changes: 1 addition & 1 deletion examples/platform/silabs/efr32/OTAConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include <app/clusters/ota-requestor/DefaultOTARequestor.h>
#include <app/clusters/ota-requestor/DefaultOTARequestorDriver.h>
#include <app/clusters/ota-requestor/DefaultOTARequestorStorage.h>
#include <platform/silabs/EFR32/OTAImageProcessorImpl.h>
#include <platform/silabs/efr32/OTAImageProcessorImpl.h>

class OTAConfig
{
Expand Down
2 changes: 1 addition & 1 deletion examples/platform/silabs/efr32/matter_config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ using namespace ::chip::DeviceLayer;
// If building with the EFR32-provided crypto backend, we can use the
// opaque keystore
#if CHIP_CRYPTO_PLATFORM
#include <platform/silabs/EFR32/Efr32PsaOperationalKeystore.h>
#include <platform/silabs/efr32/Efr32PsaOperationalKeystore.h>
static chip::DeviceLayer::Internal::Efr32PsaOperationalKeystore gOperationalKeystore;
#endif

Expand Down
2 changes: 1 addition & 1 deletion examples/platform/silabs/efr32/rs911x/rs911x.gni
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import("//build_overrides/chip.gni")

examples_plat_dir = "${chip_root}/examples/platform/silabs/efr32"
wifi_sdk_dir = "${chip_root}/src/platform/silabs/EFR32/wifi"
wifi_sdk_dir = "${chip_root}/src/platform/silabs/efr32/wifi"
wiseconnect_sdk_root = "${chip_root}/third_party/silabs/wiseconnect-wifi-bt-sdk"

rs911x_src_plat = [
Expand Down
2 changes: 1 addition & 1 deletion examples/platform/silabs/efr32/wf200/wf200.gni
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import("//build_overrides/chip.gni")

examples_plat_dir = "${chip_root}/examples/platform/silabs/efr32"
wifi_sdk_dir = "${chip_root}/src/platform/silabs/EFR32/wifi"
wifi_sdk_dir = "${chip_root}/src/platform/silabs/efr32/wifi"

wf200_plat_incs = [ "${examples_plat_dir}/wf200" ]
wf200_plat_src = [
Expand Down
2 changes: 1 addition & 1 deletion examples/thermostat/silabs/efr32/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ efr32_sdk("sdk") {
]

include_dirs = [
"${chip_root}/src/platform/silabs/EFR32",
"${chip_root}/src/platform/silabs/efr32",
"${efr32_project_dir}/include",
"${examples_plat_dir}",
"${chip_root}/src/lib",
Expand Down
2 changes: 1 addition & 1 deletion examples/thermostat/silabs/efr32/args.gni
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

import("//build_overrides/chip.gni")
import("${chip_root}/config/standalone/args.gni")
import("${chip_root}/src/platform/silabs/EFR32/args.gni")
import("${chip_root}/src/platform/silabs/efr32/args.gni")

efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain")

Expand Down
2 changes: 1 addition & 1 deletion examples/thermostat/silabs/efr32/build_for_wifi_args.gni
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import("${chip_root}/config/standalone/args.gni")

efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain")
chip_enable_openthread = false
import("${chip_root}/src/platform/silabs/EFR32/wifi_args.gni")
import("${chip_root}/src/platform/silabs/efr32/wifi_args.gni")

chip_enable_ota_requestor = true
app_data_model = "${chip_root}/examples/thermostat/thermostat-common"
2 changes: 1 addition & 1 deletion examples/window-app/silabs/efr32/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ efr32_sdk("sdk") {
]

include_dirs = [
"${chip_root}/src/platform/silabs/EFR32",
"${chip_root}/src/platform/silabs/efr32",
"${efr32_project_dir}/include",
"${examples_plat_dir}",
"${chip_root}/src/lib",
Expand Down
2 changes: 1 addition & 1 deletion examples/window-app/silabs/efr32/args.gni
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

import("//build_overrides/chip.gni")
import("${chip_root}/config/standalone/args.gni")
import("${chip_root}/src/platform/silabs/EFR32/args.gni")
import("${chip_root}/src/platform/silabs/efr32/args.gni")

efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain")

Expand Down
2 changes: 1 addition & 1 deletion examples/window-app/silabs/efr32/build_for_wifi_args.gni
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import("//build_overrides/chip.gni")

efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain")
chip_enable_openthread = false
import("${chip_root}/src/platform/silabs/EFR32/wifi_args.gni")
import("${chip_root}/src/platform/silabs/efr32/wifi_args.gni")

chip_enable_ota_requestor = true
app_data_model = "${chip_root}/examples/window-app/common:window-common"
Expand Down
2 changes: 1 addition & 1 deletion src/platform/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ if (chip_device_platform != "none") {
} else if (chip_device_platform == "darwin") {
_platform_target = "Darwin"
} else if (chip_device_platform == "efr32") {
_platform_target = "silabs/EFR32"
_platform_target = "silabs/efr32"
} else if (chip_device_platform == "SiWx917") {
_platform_target = "silabs/SiWx917"
} else if (chip_device_platform == "esp32") {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ config("efr32-platform-wifi-config") {
}
}

static_library("EFR32") {
static_library("efr32") {
sources = [
"${silabs_platform_dir}/BLEManagerImpl.h",
"${silabs_platform_dir}/BlePlatformConfig.h",
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion src/test_driver/efr32/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ efr32_sdk("sdk") {
]

include_dirs = [
"${chip_root}/src/platform/silabs/EFR32",
"${chip_root}/src/platform/silabs/efr32",
"${efr32_project_dir}/include",
"${examples_plat_dir}",
"${examples_common_plat_dir}",
Expand Down
2 changes: 1 addition & 1 deletion src/test_driver/efr32/args.gni
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,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/efr32/args.gni")
import("${chip_root}/src/platform/silabs/EFR32/args.gni")
import("${chip_root}/src/platform/silabs/efr32/args.gni")

efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain")

Expand Down
6 changes: 3 additions & 3 deletions third_party/silabs/efr32_sdk.gni
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ template("efr32_sdk") {
}

if (use_wf200 || !use_rs911x_sockets) {
import("${chip_root}/src/platform/silabs/EFR32/wifi_args.gni")
import("${chip_root}/src/platform/silabs/efr32/wifi_args.gni")

defines += [ "LWIP_NETIF_API=1" ]
if (lwip_ipv4) {
Expand Down Expand Up @@ -455,8 +455,8 @@ template("efr32_sdk") {
# system to recompile mbedTLS (= the SDK) when the mbedTLS config gets
# edited.
sources = [
"${chip_root}/src/platform/silabs/EFR32/efr32-chip-mbedtls-config.h",
"${chip_root}/src/platform/silabs/EFR32/psa_crypto_config.h",
"${chip_root}/src/platform/silabs/efr32/efr32-chip-mbedtls-config.h",
"${chip_root}/src/platform/silabs/efr32/psa_crypto_config.h",
]

public_deps = [ "${chip_root}/src/crypto:crypto_buildconfig" ]
Expand Down

0 comments on commit 4207939

Please sign in to comment.