From 3019005bb1305bdf97c4c95433f39c4953a58911 Mon Sep 17 00:00:00 2001 From: chirag-silabs <100861685+chirag-silabs@users.noreply.github.com> Date: Thu, 24 Nov 2022 19:53:53 +0530 Subject: [PATCH] [Silabs] Folder structure introduction for addition of SiWx917 (#23736) * src/platform/silabs folder changes * examples/lighting-app and examples/platform folder modification for silabs/efr32 * Skeleton for the SiWx917 folder * CI fix for the lighting app due to modified folder structure * Revert "Skeleton for the SiWx917 folder" This reverts commit bbe322d8223507937679ab3cf2f341d95ff0a642. * Build changes for different applications * Restyle PR * Fixing the build failures * fixing the lock app * updating the dry run efr32 for the new folder structure] * Added a variable for the BUILD.gn file * restyle the last commit * src/platform/silabs folder changes * examples/lighting-app and examples/platform folder modification for silabs/efr32 * Skeleton for the SiWx917 folder * CI fix for the lighting app due to modified folder structure * Revert "Skeleton for the SiWx917 folder" This reverts commit bbe322d8223507937679ab3cf2f341d95ff0a642. * Build changes for different applications * Restyle PR * Fixing the build failures * fixing the lock app * updating the dry run efr32 for the new folder structure] * Added a variable for the BUILD.gn file * restyle the last commit --- .github/workflows/examples-efr32.yaml | 4 +- config/efr32/lib/pw_rpc/BUILD.gn | 2 +- config/efr32/lib/pw_rpc/pw_rpc.gni | 2 +- examples/light-switch-app/efr32/BUILD.gn | 18 ++++--- examples/light-switch-app/efr32/args.gni | 2 +- .../efr32/build_for_wifi_args.gni | 2 +- examples/lighting-app/efr32/build_overrides | 1 - .../efr32/third_party/connectedhomeip | 1 - examples/lighting-app/{ => silabs}/efr32/.gn | 0 .../lighting-app/{ => silabs}/efr32/BUILD.gn | 20 +++---- .../lighting-app/{ => silabs}/efr32/README.md | 0 .../lighting-app/{ => silabs}/efr32/args.gni | 2 +- .../efr32/build_for_wifi_args.gni | 2 +- .../efr32/build_for_wifi_gnfile.gn | 0 .../lighting-app/silabs/efr32/build_overrides | 1 + .../{ => silabs}/efr32/include/AppConfig.h | 0 .../{ => silabs}/efr32/include/AppEvent.h | 0 .../{ => silabs}/efr32/include/AppTask.h | 0 .../efr32/include/CHIPProjectConfig.h | 0 .../efr32/include/LightingManager.h | 0 .../{ => silabs}/efr32/src/AppTask.cpp | 0 .../efr32/src/LightingManager.cpp | 0 .../{ => silabs}/efr32/src/ZclCallbacks.cpp | 0 .../{ => silabs}/efr32/src/main.cpp | 0 .../silabs/efr32/third_party/connectedhomeip | 1 + .../{ => silabs}/efr32/with_pw_rpc.gni | 2 +- examples/lock-app/efr32/BUILD.gn | 18 ++++--- examples/lock-app/efr32/args.gni | 2 +- .../lock-app/efr32/build_for_wifi_args.gni | 2 +- examples/lock-app/efr32/with_pw_rpc.gni | 2 +- examples/persistent-storage/efr32/main.cpp | 2 +- .../EFR32DeviceAttestationCreds.cpp | 0 .../EFR32DeviceAttestationCreds.h | 0 .../{efr32 => silabs}/MemMonitoring.h | 0 .../{efr32 => silabs}/PigweedLogger.cpp | 0 .../{efr32 => silabs}/PigweedLogger.h | 0 examples/platform/{efr32 => silabs}/Rpc.cpp | 0 examples/platform/{efr32 => silabs}/Rpc.h | 0 examples/platform/{ => silabs}/efr32/BUILD.gn | 4 +- .../{ => silabs}/efr32/BaseApplication.cpp | 4 +- .../{ => silabs}/efr32/BaseApplication.h | 0 .../efr32/EFR32DeviceDataProvider.cpp | 2 +- .../efr32/EFR32DeviceDataProvider.h | 0 .../{ => silabs}/efr32/FreeRTOSConfig.h | 0 .../platform/{ => silabs}/efr32/LEDWidget.cpp | 0 .../platform/{ => silabs}/efr32/LEDWidget.h | 0 .../{ => silabs}/efr32/MemMonitoring.cpp | 0 .../platform/{ => silabs}/efr32/OTAConfig.cpp | 0 .../platform/{ => silabs}/efr32/OTAConfig.h | 2 +- .../{ => silabs}/efr32/TemperatureSensor.cpp | 0 .../{ => silabs}/efr32/TemperatureSensor.h | 0 examples/platform/{ => silabs}/efr32/args.gni | 0 .../{ => silabs}/efr32/board_config.h | 0 .../efr32/display/demo-ui-bitmaps.h | 0 .../{ => silabs}/efr32/display/demo-ui.c | 0 .../{ => silabs}/efr32/display/demo-ui.h | 0 .../{ => silabs}/efr32/display/lcd.cpp | 0 .../platform/{ => silabs}/efr32/display/lcd.h | 0 .../{ => silabs}/efr32/efr32_utils.cpp | 0 .../platform/{ => silabs}/efr32/efr32_utils.h | 0 .../{ => silabs}/efr32/init_efrPlatform.cpp | 0 .../{ => silabs}/efr32/init_efrPlatform.h | 0 .../{ => silabs}/efr32/ldscripts/efr32mg12.ld | 0 .../{ => silabs}/efr32/ldscripts/efr32mg21.ld | 0 .../{ => silabs}/efr32/ldscripts/efr32mg24.ld | 0 .../{ => silabs}/efr32/ldscripts/mgm24.ld | 0 .../{ => silabs}/efr32/matter_config.cpp | 2 +- .../{ => silabs}/efr32/matter_config.h | 0 .../efr32/project_include/OpenThreadConfig.h | 2 +- .../{ => silabs}/efr32/pw_sys_io/BUILD.gn | 2 +- .../pw_sys_io/public/pw_sys_io_efr32/init.h | 0 .../efr32/pw_sys_io/sys_io_efr32.cc | 0 .../{ => silabs}/efr32/rs911x/hal/efx_spi.c | 0 .../rs911x/hal/rsi_board_configuration.h | 0 .../{ => silabs}/efr32/rs911x/hal/rsi_hal.h | 0 .../efr32/rs911x/hal/rsi_hal_mcu_interrupt.c | 0 .../efr32/rs911x/hal/rsi_hal_mcu_ioports.c | 0 .../efr32/rs911x/hal/rsi_hal_mcu_rtc.c | 0 .../efr32/rs911x/hal/rsi_hal_mcu_timer.c | 0 .../{ => silabs}/efr32/rs911x/rs911x.gni | 4 +- .../{ => silabs}/efr32/rs911x/rsi_if.c | 0 .../efr32/rs911x/rsi_wlan_config.h | 0 .../{ => silabs}/efr32/rs911x/wfx_rsi.h | 0 .../{ => silabs}/efr32/rs911x/wfx_rsi_host.c | 0 .../{ => silabs}/efr32/rs911x/wfx_rsidev.c | 0 examples/platform/{ => silabs}/efr32/uart.cpp | 0 examples/platform/{ => silabs}/efr32/uart.h | 0 .../{ => silabs}/efr32/wf200/efr_spi.c | 0 .../{ => silabs}/efr32/wf200/host_if.cpp | 0 .../{ => silabs}/efr32/wf200/sl_wfx_board.h | 0 .../efr32/wf200/sl_wfx_configuration.h | 0 .../{ => silabs}/efr32/wf200/sl_wfx_crypto.c | 0 .../{ => silabs}/efr32/wf200/sl_wfx_host.h | 0 .../efr32/wf200/sl_wfx_securelink_task.c | 0 .../{ => silabs}/efr32/wf200/sl_wfx_task.c | 0 .../{ => silabs}/efr32/wf200/sl_wfx_task.h | 0 .../{ => silabs}/efr32/wf200/wf200.gni | 4 +- .../{ => silabs}/efr32/wf200/wf200_init.c | 0 .../platform/{efr32 => silabs}/efr32_creds.h | 0 .../{efr32 => silabs}/heap_4_silabs.c | 0 .../{efr32 => silabs}/heap_4_silabs.h | 0 .../{efr32 => silabs}/matter_shell.cpp | 0 .../platform/{efr32 => silabs}/matter_shell.h | 0 examples/thermostat/efr32/BUILD.gn | 20 +++---- examples/thermostat/efr32/args.gni | 2 +- .../thermostat/efr32/build_for_wifi_args.gni | 2 +- examples/window-app/efr32/BUILD.gn | 14 ++--- examples/window-app/efr32/args.gni | 2 +- .../window-app/efr32/build_for_wifi_args.gni | 2 +- .../window-app/efr32/src/WindowAppImpl.cpp | 2 +- scripts/build/builders/efr32.py | 2 + .../dry_run_efr32-brd4161a-light-rpc.txt | 2 +- scripts/tools/check_includes_config.py | 2 +- src/platform/BUILD.gn | 4 +- src/platform/device.gni | 2 +- .../{EFR32 => silabs}/BLEManagerImpl.h | 0 .../{EFR32 => silabs}/BlePlatformConfig.h | 2 - .../CHIPDevicePlatformConfig.h | 0 .../CHIPDevicePlatformEvent.h | 0 .../{EFR32 => silabs}/CHIPMem-Platform.cpp | 0 .../{EFR32 => silabs}/CHIPPlatformConfig.h | 0 .../ConfigurationManagerImpl.h | 2 +- .../ConnectivityManagerImpl.h | 0 .../ConnectivityManagerImpl_WIFI.cpp | 2 +- .../DiagnosticDataProviderImpl.cpp | 2 +- .../DiagnosticDataProviderImpl.h | 0 .../{ => silabs}/EFR32/BLEManagerImpl.cpp | 0 src/platform/{ => silabs}/EFR32/BUILD.gn | 52 ++++++++++--------- .../EFR32/CHIPCryptoPALPsaEfr32.cpp | 0 .../EFR32/ConfigurationManagerImpl.cpp | 2 +- .../EFR32/ConnectivityManagerImpl.cpp | 0 .../{ => silabs}/EFR32/Efr32OpaqueKeypair.h | 0 .../EFR32/Efr32PsaOpaqueKeypair.cpp | 0 .../EFR32/Efr32PsaOperationalKeystore.cpp | 2 +- .../EFR32/Efr32PsaOperationalKeystore.h | 0 .../EFR32/KeyValueStoreManagerImpl.cpp | 2 +- .../EFR32/OTAImageProcessorImpl.cpp | 2 +- .../EFR32/OTAImageProcessorImpl.h | 0 .../EFR32/PlatformManagerImpl.cpp | 2 +- .../EFR32/ThreadStackManagerImpl.cpp | 0 src/platform/{ => silabs}/EFR32/args.gni | 6 +-- .../EFR32/efr32-chip-mbedtls-config.h | 0 .../EFR32/efr32-mbedtls-psa-crypto-config.h | 0 .../{ => silabs}/EFR32/wifi/dhcp_client.cpp | 0 .../{ => silabs}/EFR32/wifi/dhcp_client.h | 0 .../{ => silabs}/EFR32/wifi/ethernetif.cpp | 0 .../{ => silabs}/EFR32/wifi/ethernetif.h | 0 .../{ => silabs}/EFR32/wifi/lwip_netif.cpp | 0 .../{ => silabs}/EFR32/wifi/wfx_host_events.h | 0 .../{ => silabs}/EFR32/wifi/wfx_msgs.h | 0 .../{ => silabs}/EFR32/wifi/wfx_notify.cpp | 0 .../{ => silabs}/EFR32/wifi/wifi_config.h | 0 src/platform/{ => silabs}/EFR32/wifi_args.gni | 2 +- .../{EFR32 => silabs}/EFR32Config.cpp | 2 +- src/platform/{EFR32 => silabs}/EFR32Config.h | 0 .../{EFR32 => silabs}/InetPlatformConfig.h | 0 .../KeyValueStoreManagerImpl.h | 0 src/platform/{EFR32 => silabs}/Logging.cpp | 0 .../NetworkCommissioningWiFiDriver.cpp | 4 +- .../NetworkCommissioningWiFiDriver.h | 0 .../{EFR32 => silabs}/PlatformManagerImpl.h | 0 .../{EFR32 => silabs}/SystemPlatformConfig.h | 0 .../ThreadStackManagerImpl.h | 0 .../{EFR32 => silabs}/WarmPlatformConfig.h | 0 src/test_driver/efr32/BUILD.gn | 10 ++-- src/test_driver/efr32/args.gni | 4 +- third_party/silabs/efr32_sdk.gni | 4 +- 167 files changed, 141 insertions(+), 129 deletions(-) delete mode 120000 examples/lighting-app/efr32/build_overrides delete mode 120000 examples/lighting-app/efr32/third_party/connectedhomeip rename examples/lighting-app/{ => silabs}/efr32/.gn (100%) rename examples/lighting-app/{ => silabs}/efr32/BUILD.gn (93%) rename examples/lighting-app/{ => silabs}/efr32/README.md (100%) rename examples/lighting-app/{ => silabs}/efr32/args.gni (95%) rename examples/lighting-app/{ => silabs}/efr32/build_for_wifi_args.gni (93%) rename examples/lighting-app/{ => silabs}/efr32/build_for_wifi_gnfile.gn (100%) create mode 120000 examples/lighting-app/silabs/efr32/build_overrides rename examples/lighting-app/{ => silabs}/efr32/include/AppConfig.h (100%) rename examples/lighting-app/{ => silabs}/efr32/include/AppEvent.h (100%) rename examples/lighting-app/{ => silabs}/efr32/include/AppTask.h (100%) rename examples/lighting-app/{ => silabs}/efr32/include/CHIPProjectConfig.h (100%) rename examples/lighting-app/{ => silabs}/efr32/include/LightingManager.h (100%) rename examples/lighting-app/{ => silabs}/efr32/src/AppTask.cpp (100%) rename examples/lighting-app/{ => silabs}/efr32/src/LightingManager.cpp (100%) rename examples/lighting-app/{ => silabs}/efr32/src/ZclCallbacks.cpp (100%) rename examples/lighting-app/{ => silabs}/efr32/src/main.cpp (100%) create mode 120000 examples/lighting-app/silabs/efr32/third_party/connectedhomeip rename examples/lighting-app/{ => silabs}/efr32/with_pw_rpc.gni (94%) rename examples/platform/{efr32 => silabs}/EFR32DeviceAttestationCreds.cpp (100%) rename examples/platform/{efr32 => silabs}/EFR32DeviceAttestationCreds.h (100%) rename examples/platform/{efr32 => silabs}/MemMonitoring.h (100%) rename examples/platform/{efr32 => silabs}/PigweedLogger.cpp (100%) rename examples/platform/{efr32 => silabs}/PigweedLogger.h (100%) rename examples/platform/{efr32 => silabs}/Rpc.cpp (100%) rename examples/platform/{efr32 => silabs}/Rpc.h (100%) rename examples/platform/{ => silabs}/efr32/BUILD.gn (97%) rename examples/platform/{ => silabs}/efr32/BaseApplication.cpp (99%) rename examples/platform/{ => silabs}/efr32/BaseApplication.h (100%) rename examples/platform/{ => silabs}/efr32/EFR32DeviceDataProvider.cpp (99%) rename examples/platform/{ => silabs}/efr32/EFR32DeviceDataProvider.h (100%) rename examples/platform/{ => silabs}/efr32/FreeRTOSConfig.h (100%) rename examples/platform/{ => silabs}/efr32/LEDWidget.cpp (100%) rename examples/platform/{ => silabs}/efr32/LEDWidget.h (100%) rename examples/platform/{ => silabs}/efr32/MemMonitoring.cpp (100%) rename examples/platform/{ => silabs}/efr32/OTAConfig.cpp (100%) rename examples/platform/{ => silabs}/efr32/OTAConfig.h (94%) rename examples/platform/{ => silabs}/efr32/TemperatureSensor.cpp (100%) rename examples/platform/{ => silabs}/efr32/TemperatureSensor.h (100%) rename examples/platform/{ => silabs}/efr32/args.gni (100%) rename examples/platform/{ => silabs}/efr32/board_config.h (100%) rename examples/platform/{ => silabs}/efr32/display/demo-ui-bitmaps.h (100%) rename examples/platform/{ => silabs}/efr32/display/demo-ui.c (100%) rename examples/platform/{ => silabs}/efr32/display/demo-ui.h (100%) rename examples/platform/{ => silabs}/efr32/display/lcd.cpp (100%) rename examples/platform/{ => silabs}/efr32/display/lcd.h (100%) rename examples/platform/{ => silabs}/efr32/efr32_utils.cpp (100%) rename examples/platform/{ => silabs}/efr32/efr32_utils.h (100%) rename examples/platform/{ => silabs}/efr32/init_efrPlatform.cpp (100%) rename examples/platform/{ => silabs}/efr32/init_efrPlatform.h (100%) rename examples/platform/{ => silabs}/efr32/ldscripts/efr32mg12.ld (100%) rename examples/platform/{ => silabs}/efr32/ldscripts/efr32mg21.ld (100%) rename examples/platform/{ => silabs}/efr32/ldscripts/efr32mg24.ld (100%) rename examples/platform/{ => silabs}/efr32/ldscripts/mgm24.ld (100%) rename examples/platform/{ => silabs}/efr32/matter_config.cpp (99%) rename examples/platform/{ => silabs}/efr32/matter_config.h (100%) rename examples/platform/{ => silabs}/efr32/project_include/OpenThreadConfig.h (98%) rename examples/platform/{ => silabs}/efr32/pw_sys_io/BUILD.gn (94%) rename examples/platform/{ => silabs}/efr32/pw_sys_io/public/pw_sys_io_efr32/init.h (100%) rename examples/platform/{ => silabs}/efr32/pw_sys_io/sys_io_efr32.cc (100%) rename examples/platform/{ => silabs}/efr32/rs911x/hal/efx_spi.c (100%) rename examples/platform/{ => silabs}/efr32/rs911x/hal/rsi_board_configuration.h (100%) rename examples/platform/{ => silabs}/efr32/rs911x/hal/rsi_hal.h (100%) rename examples/platform/{ => silabs}/efr32/rs911x/hal/rsi_hal_mcu_interrupt.c (100%) rename examples/platform/{ => silabs}/efr32/rs911x/hal/rsi_hal_mcu_ioports.c (100%) rename examples/platform/{ => silabs}/efr32/rs911x/hal/rsi_hal_mcu_rtc.c (100%) rename examples/platform/{ => silabs}/efr32/rs911x/hal/rsi_hal_mcu_timer.c (100%) rename examples/platform/{ => silabs}/efr32/rs911x/rs911x.gni (96%) rename examples/platform/{ => silabs}/efr32/rs911x/rsi_if.c (100%) rename examples/platform/{ => silabs}/efr32/rs911x/rsi_wlan_config.h (100%) rename examples/platform/{ => silabs}/efr32/rs911x/wfx_rsi.h (100%) rename examples/platform/{ => silabs}/efr32/rs911x/wfx_rsi_host.c (100%) rename examples/platform/{ => silabs}/efr32/rs911x/wfx_rsidev.c (100%) rename examples/platform/{ => silabs}/efr32/uart.cpp (100%) rename examples/platform/{ => silabs}/efr32/uart.h (100%) rename examples/platform/{ => silabs}/efr32/wf200/efr_spi.c (100%) rename examples/platform/{ => silabs}/efr32/wf200/host_if.cpp (100%) rename examples/platform/{ => silabs}/efr32/wf200/sl_wfx_board.h (100%) rename examples/platform/{ => silabs}/efr32/wf200/sl_wfx_configuration.h (100%) rename examples/platform/{ => silabs}/efr32/wf200/sl_wfx_crypto.c (100%) rename examples/platform/{ => silabs}/efr32/wf200/sl_wfx_host.h (100%) rename examples/platform/{ => silabs}/efr32/wf200/sl_wfx_securelink_task.c (100%) rename examples/platform/{ => silabs}/efr32/wf200/sl_wfx_task.c (100%) rename examples/platform/{ => silabs}/efr32/wf200/sl_wfx_task.h (100%) rename examples/platform/{ => silabs}/efr32/wf200/wf200.gni (85%) rename examples/platform/{ => silabs}/efr32/wf200/wf200_init.c (100%) rename examples/platform/{efr32 => silabs}/efr32_creds.h (100%) rename examples/platform/{efr32 => silabs}/heap_4_silabs.c (100%) rename examples/platform/{efr32 => silabs}/heap_4_silabs.h (100%) rename examples/platform/{efr32 => silabs}/matter_shell.cpp (100%) rename examples/platform/{efr32 => silabs}/matter_shell.h (100%) rename src/platform/{EFR32 => silabs}/BLEManagerImpl.h (100%) rename src/platform/{EFR32 => silabs}/BlePlatformConfig.h (98%) rename src/platform/{EFR32 => silabs}/CHIPDevicePlatformConfig.h (100%) rename src/platform/{EFR32 => silabs}/CHIPDevicePlatformEvent.h (100%) rename src/platform/{EFR32 => silabs}/CHIPMem-Platform.cpp (100%) rename src/platform/{EFR32 => silabs}/CHIPPlatformConfig.h (100%) rename src/platform/{EFR32 => silabs}/ConfigurationManagerImpl.h (98%) rename src/platform/{EFR32 => silabs}/ConnectivityManagerImpl.h (100%) rename src/platform/{EFR32 => silabs}/ConnectivityManagerImpl_WIFI.cpp (99%) rename src/platform/{EFR32 => silabs}/DiagnosticDataProviderImpl.cpp (99%) rename src/platform/{EFR32 => silabs}/DiagnosticDataProviderImpl.h (100%) rename src/platform/{ => silabs}/EFR32/BLEManagerImpl.cpp (100%) rename src/platform/{ => silabs}/EFR32/BUILD.gn (63%) rename src/platform/{ => silabs}/EFR32/CHIPCryptoPALPsaEfr32.cpp (100%) rename src/platform/{ => silabs}/EFR32/ConfigurationManagerImpl.cpp (99%) rename src/platform/{ => silabs}/EFR32/ConnectivityManagerImpl.cpp (100%) rename src/platform/{ => silabs}/EFR32/Efr32OpaqueKeypair.h (100%) rename src/platform/{ => silabs}/EFR32/Efr32PsaOpaqueKeypair.cpp (100%) rename src/platform/{ => silabs}/EFR32/Efr32PsaOperationalKeystore.cpp (99%) rename src/platform/{ => silabs}/EFR32/Efr32PsaOperationalKeystore.h (100%) rename src/platform/{ => silabs}/EFR32/KeyValueStoreManagerImpl.cpp (99%) rename src/platform/{ => silabs}/EFR32/OTAImageProcessorImpl.cpp (99%) rename src/platform/{ => silabs}/EFR32/OTAImageProcessorImpl.h (100%) rename src/platform/{ => silabs}/EFR32/PlatformManagerImpl.cpp (99%) rename src/platform/{ => silabs}/EFR32/ThreadStackManagerImpl.cpp (100%) rename src/platform/{ => silabs}/EFR32/args.gni (90%) rename src/platform/{ => silabs}/EFR32/efr32-chip-mbedtls-config.h (100%) rename src/platform/{ => silabs}/EFR32/efr32-mbedtls-psa-crypto-config.h (100%) rename src/platform/{ => silabs}/EFR32/wifi/dhcp_client.cpp (100%) rename src/platform/{ => silabs}/EFR32/wifi/dhcp_client.h (100%) rename src/platform/{ => silabs}/EFR32/wifi/ethernetif.cpp (100%) rename src/platform/{ => silabs}/EFR32/wifi/ethernetif.h (100%) rename src/platform/{ => silabs}/EFR32/wifi/lwip_netif.cpp (100%) rename src/platform/{ => silabs}/EFR32/wifi/wfx_host_events.h (100%) rename src/platform/{ => silabs}/EFR32/wifi/wfx_msgs.h (100%) rename src/platform/{ => silabs}/EFR32/wifi/wfx_notify.cpp (100%) rename src/platform/{ => silabs}/EFR32/wifi/wifi_config.h (100%) rename src/platform/{ => silabs}/EFR32/wifi_args.gni (96%) rename src/platform/{EFR32 => silabs}/EFR32Config.cpp (99%) rename src/platform/{EFR32 => silabs}/EFR32Config.h (100%) rename src/platform/{EFR32 => silabs}/InetPlatformConfig.h (100%) rename src/platform/{EFR32 => silabs}/KeyValueStoreManagerImpl.h (100%) rename src/platform/{EFR32 => silabs}/Logging.cpp (100%) rename src/platform/{EFR32 => silabs}/NetworkCommissioningWiFiDriver.cpp (99%) rename src/platform/{EFR32 => silabs}/NetworkCommissioningWiFiDriver.h (100%) rename src/platform/{EFR32 => silabs}/PlatformManagerImpl.h (100%) rename src/platform/{EFR32 => silabs}/SystemPlatformConfig.h (100%) rename src/platform/{EFR32 => silabs}/ThreadStackManagerImpl.h (100%) rename src/platform/{EFR32 => silabs}/WarmPlatformConfig.h (100%) diff --git a/.github/workflows/examples-efr32.yaml b/.github/workflows/examples-efr32.yaml index b5b533a26f333c..d245cea56323f5 100644 --- a/.github/workflows/examples-efr32.yaml +++ b/.github/workflows/examples-efr32.yaml @@ -101,7 +101,7 @@ jobs: - name: Build example EFR32 Lighting App for BRD4161A with RPCs timeout-minutes: 15 run: | - scripts/examples/gn_efr32_example.sh examples/lighting-app/efr32/ out/lighting_app_debug_rpc BRD4161A "is_debug=false" \ + scripts/examples/gn_efr32_example.sh examples/lighting-app/silabs/efr32/ out/lighting_app_debug_rpc BRD4161A "is_debug=false" \ disable_lcd=true 'import("//with_pw_rpc.gni")' .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py efr32 BRD4161A+rpc lighting-app \ out/lighting_app_debug_rpc/BRD4161A/chip-efr32-lighting-example.out /tmp/bloat_reports/ @@ -118,7 +118,7 @@ jobs: - name: Build example EFR32+RS911x WiFi Lighting app for BRD4161A timeout-minutes: 15 run: | - scripts/examples/gn_efr32_example.sh examples/lighting-app/efr32/ out/lighting_app_wifi_rs911x BRD4161A --wifi rs911x + scripts/examples/gn_efr32_example.sh examples/lighting-app/silabs/efr32/ out/lighting_app_wifi_rs911x BRD4161A --wifi rs911x .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py efr32 BRD4161A+rs911x lighting-app \ out/lighting_app_wifi_rs911x/BRD4161A/chip-efr32-lighting-example.out /tmp/bloat_reports/ - name: Clean out build output diff --git a/config/efr32/lib/pw_rpc/BUILD.gn b/config/efr32/lib/pw_rpc/BUILD.gn index 390ced7920eda9..32a95488dbdf30 100644 --- a/config/efr32/lib/pw_rpc/BUILD.gn +++ b/config/efr32/lib/pw_rpc/BUILD.gn @@ -24,7 +24,7 @@ static_library("pw_rpc") { public_deps = [ "$dir_pw_rpc:server", "$dir_pw_rpc/nanopb:echo_service", - "${chip_root}/examples/platform/efr32/pw_sys_io:pw_sys_io_efr32", + "${chip_root}/examples/platform/silabs/efr32/pw_sys_io:pw_sys_io_efr32", "${dir_pigweed}/pw_hdlc:pw_rpc", dir_pw_assert, dir_pw_checksum, diff --git a/config/efr32/lib/pw_rpc/pw_rpc.gni b/config/efr32/lib/pw_rpc/pw_rpc.gni index 68f1c6154f4a91..5fd576d93c4a98 100644 --- a/config/efr32/lib/pw_rpc/pw_rpc.gni +++ b/config/efr32/lib/pw_rpc/pw_rpc.gni @@ -18,7 +18,7 @@ import("//build_overrides/pigweed.gni") pw_log_BACKEND = "$dir_pw_log_basic" pw_assert_BACKEND = "$dir_pw_assert_log:check_backend" pw_sys_io_BACKEND = - "${chip_root}/examples/platform/efr32/pw_sys_io:pw_sys_io_efr32" + "${chip_root}/examples/platform/silabs/efr32/pw_sys_io:pw_sys_io_efr32" pw_build_LINK_DEPS = [ "$dir_pw_assert:impl", diff --git a/examples/light-switch-app/efr32/BUILD.gn b/examples/light-switch-app/efr32/BUILD.gn index 7d71569cd0ff76..83704a8fa6cc1b 100644 --- a/examples/light-switch-app/efr32/BUILD.gn +++ b/examples/light-switch-app/efr32/BUILD.gn @@ -32,7 +32,8 @@ if (chip_enable_pw_rpc) { assert(current_os == "freertos") efr32_project_dir = "${chip_root}/examples/light-switch-app/efr32" -examples_plat_dir = "${chip_root}/examples/platform/efr32" +examples_plat_dir = "${chip_root}/examples/platform/silabs/efr32" +examples_common_plat_dir = "${chip_root}/examples/platform/silabs" declare_args() { # Dump memory usage at link time. @@ -79,7 +80,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/EFR32/wifi_args.gni") + import("${chip_root}/src/platform/silabs/EFR32/wifi_args.gni") } # ThunderBoards, Explorer Kit and MGM240L do not support LCD (No LCD) @@ -91,7 +92,7 @@ if (silabs_board == "BRD4166A" || silabs_board == "BRD2601B" || # WiFi settings if (chip_enable_wifi) { - wifi_sdk_dir = "${chip_root}/src/platform/EFR32/wifi" + wifi_sdk_dir = "${chip_root}/src/platform/silabs/EFR32/wifi" efr32_lwip_defs = [ "LWIP_NETIF_API=1" ] if (lwip_ipv4) { efr32_lwip_defs += [ @@ -132,10 +133,11 @@ efr32_sdk("sdk") { ] include_dirs = [ - "${chip_root}/src/platform/EFR32", + "${chip_root}/src/platform/silabs/EFR32", "${efr32_project_dir}/include", "${examples_plat_dir}", "${chip_root}/src/lib", + "${examples_common_plat_dir}", ] defines = [ @@ -183,9 +185,9 @@ efr32_executable("light_switch_app") { defines = [] sources = [ + "${examples_common_plat_dir}/heap_4_silabs.c", "${examples_plat_dir}/BaseApplication.cpp", "${examples_plat_dir}/efr32_utils.cpp", - "${examples_plat_dir}/heap_4_silabs.c", "${examples_plat_dir}/init_efrPlatform.cpp", "${examples_plat_dir}/matter_config.cpp", "src/AppTask.cpp", @@ -302,8 +304,8 @@ efr32_executable("light_switch_app") { sources += [ "${chip_root}/examples/common/pigweed/RpcService.cpp", "${chip_root}/examples/common/pigweed/efr32/PigweedLoggerMutex.cpp", - "${examples_plat_dir}/PigweedLogger.cpp", - "${examples_plat_dir}/Rpc.cpp", + "${examples_common_plat_dir}/PigweedLogger.cpp", + "${examples_common_plat_dir}/Rpc.cpp", ] deps += [ @@ -327,7 +329,7 @@ efr32_executable("light_switch_app") { } if (enable_heap_monitoring) { - sources += [ "${examples_plat_dir}/MemMonitoring.cpp" ] + sources += [ "${examples_common_plat_dir}/MemMonitoring.cpp" ] defines += [ "HEAP_MONITORING" ] } diff --git a/examples/light-switch-app/efr32/args.gni b/examples/light-switch-app/efr32/args.gni index 752701e73aab63..f75911d38c37a8 100644 --- a/examples/light-switch-app/efr32/args.gni +++ b/examples/light-switch-app/efr32/args.gni @@ -15,7 +15,7 @@ import("//build_overrides/chip.gni") import("//build_overrides/pigweed.gni") import("${chip_root}/config/standalone/args.gni") -import("${chip_root}/src/platform/EFR32/args.gni") +import("${chip_root}/src/platform/silabs/EFR32/args.gni") efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain") diff --git a/examples/light-switch-app/efr32/build_for_wifi_args.gni b/examples/light-switch-app/efr32/build_for_wifi_args.gni index 236f166574862d..363d2be9e6f362 100644 --- a/examples/light-switch-app/efr32/build_for_wifi_args.gni +++ b/examples/light-switch-app/efr32/build_for_wifi_args.gni @@ -17,7 +17,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/EFR32/wifi_args.gni") +import("${chip_root}/src/platform/silabs/EFR32/wifi_args.gni") chip_enable_ota_requestor = true diff --git a/examples/lighting-app/efr32/build_overrides b/examples/lighting-app/efr32/build_overrides deleted file mode 120000 index e578e73312ebd1..00000000000000 --- a/examples/lighting-app/efr32/build_overrides +++ /dev/null @@ -1 +0,0 @@ -../../build_overrides \ No newline at end of file diff --git a/examples/lighting-app/efr32/third_party/connectedhomeip b/examples/lighting-app/efr32/third_party/connectedhomeip deleted file mode 120000 index c866b86874994d..00000000000000 --- a/examples/lighting-app/efr32/third_party/connectedhomeip +++ /dev/null @@ -1 +0,0 @@ -../../../.. \ No newline at end of file diff --git a/examples/lighting-app/efr32/.gn b/examples/lighting-app/silabs/efr32/.gn similarity index 100% rename from examples/lighting-app/efr32/.gn rename to examples/lighting-app/silabs/efr32/.gn diff --git a/examples/lighting-app/efr32/BUILD.gn b/examples/lighting-app/silabs/efr32/BUILD.gn similarity index 93% rename from examples/lighting-app/efr32/BUILD.gn rename to examples/lighting-app/silabs/efr32/BUILD.gn index 616a66bf05a029..3a812b966d3361 100644 --- a/examples/lighting-app/efr32/BUILD.gn +++ b/examples/lighting-app/silabs/efr32/BUILD.gn @@ -31,8 +31,9 @@ if (chip_enable_pw_rpc) { assert(current_os == "freertos") -efr32_project_dir = "${chip_root}/examples/lighting-app/efr32" -examples_plat_dir = "${chip_root}/examples/platform/efr32" +efr32_project_dir = "${chip_root}/examples/lighting-app/silabs/efr32" +examples_plat_dir = "${chip_root}/examples/platform/silabs/efr32" +examples_common_plat_dir = "${chip_root}/examples/platform/silabs" declare_args() { # Dump memory usage at link time. @@ -79,7 +80,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/EFR32/wifi_args.gni") + import("${chip_root}/src/platform/silabs/EFR32/wifi_args.gni") } # ThunderBoards, Explorer Kit and MGM240L do not support LCD (No LCD) @@ -96,7 +97,7 @@ if (chip_enable_wifi) { show_qr_code = false disable_lcd = true } - wifi_sdk_dir = "${chip_root}/src/platform/EFR32/wifi" + wifi_sdk_dir = "${chip_root}/src/platform/silabs/EFR32/wifi" efr32_lwip_defs = [ "LWIP_NETIF_API=1" ] if (lwip_ipv4) { efr32_lwip_defs += [ @@ -137,10 +138,11 @@ efr32_sdk("sdk") { ] include_dirs = [ - "${chip_root}/src/platform/EFR32", + "${chip_root}/src/platform/silabs/EFR32", "${efr32_project_dir}/include", "${examples_plat_dir}", "${chip_root}/src/lib", + "${examples_common_plat_dir}", ] defines = [ @@ -192,9 +194,9 @@ efr32_executable("lighting_app") { defines = [] sources = [ + "${examples_common_plat_dir}/heap_4_silabs.c", "${examples_plat_dir}/BaseApplication.cpp", "${examples_plat_dir}/efr32_utils.cpp", - "${examples_plat_dir}/heap_4_silabs.c", "${examples_plat_dir}/init_efrPlatform.cpp", "${examples_plat_dir}/matter_config.cpp", "src/AppTask.cpp", @@ -306,8 +308,8 @@ efr32_executable("lighting_app") { sources += [ "${chip_root}/examples/common/pigweed/RpcService.cpp", "${chip_root}/examples/common/pigweed/efr32/PigweedLoggerMutex.cpp", - "${examples_plat_dir}/PigweedLogger.cpp", - "${examples_plat_dir}/Rpc.cpp", + "${examples_common_plat_dir}/PigweedLogger.cpp", + "${examples_common_plat_dir}/Rpc.cpp", ] deps += [ @@ -336,7 +338,7 @@ efr32_executable("lighting_app") { } if (enable_heap_monitoring) { - sources += [ "${examples_plat_dir}/MemMonitoring.cpp" ] + sources += [ "${examples_common_plat_dir}/MemMonitoring.cpp" ] defines += [ "HEAP_MONITORING" ] } diff --git a/examples/lighting-app/efr32/README.md b/examples/lighting-app/silabs/efr32/README.md similarity index 100% rename from examples/lighting-app/efr32/README.md rename to examples/lighting-app/silabs/efr32/README.md diff --git a/examples/lighting-app/efr32/args.gni b/examples/lighting-app/silabs/efr32/args.gni similarity index 95% rename from examples/lighting-app/efr32/args.gni rename to examples/lighting-app/silabs/efr32/args.gni index 7f4a06e57d9a59..d216faa0a07dae 100644 --- a/examples/lighting-app/efr32/args.gni +++ b/examples/lighting-app/silabs/efr32/args.gni @@ -15,7 +15,7 @@ import("//build_overrides/chip.gni") import("//build_overrides/pigweed.gni") import("${chip_root}/config/standalone/args.gni") -import("${chip_root}/src/platform/EFR32/args.gni") +import("${chip_root}/src/platform/silabs/EFR32/args.gni") efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain") diff --git a/examples/lighting-app/efr32/build_for_wifi_args.gni b/examples/lighting-app/silabs/efr32/build_for_wifi_args.gni similarity index 93% rename from examples/lighting-app/efr32/build_for_wifi_args.gni rename to examples/lighting-app/silabs/efr32/build_for_wifi_args.gni index 236f166574862d..363d2be9e6f362 100644 --- a/examples/lighting-app/efr32/build_for_wifi_args.gni +++ b/examples/lighting-app/silabs/efr32/build_for_wifi_args.gni @@ -17,7 +17,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/EFR32/wifi_args.gni") +import("${chip_root}/src/platform/silabs/EFR32/wifi_args.gni") chip_enable_ota_requestor = true diff --git a/examples/lighting-app/efr32/build_for_wifi_gnfile.gn b/examples/lighting-app/silabs/efr32/build_for_wifi_gnfile.gn similarity index 100% rename from examples/lighting-app/efr32/build_for_wifi_gnfile.gn rename to examples/lighting-app/silabs/efr32/build_for_wifi_gnfile.gn diff --git a/examples/lighting-app/silabs/efr32/build_overrides b/examples/lighting-app/silabs/efr32/build_overrides new file mode 120000 index 00000000000000..995884e6163eb5 --- /dev/null +++ b/examples/lighting-app/silabs/efr32/build_overrides @@ -0,0 +1 @@ +../../../build_overrides \ No newline at end of file diff --git a/examples/lighting-app/efr32/include/AppConfig.h b/examples/lighting-app/silabs/efr32/include/AppConfig.h similarity index 100% rename from examples/lighting-app/efr32/include/AppConfig.h rename to examples/lighting-app/silabs/efr32/include/AppConfig.h diff --git a/examples/lighting-app/efr32/include/AppEvent.h b/examples/lighting-app/silabs/efr32/include/AppEvent.h similarity index 100% rename from examples/lighting-app/efr32/include/AppEvent.h rename to examples/lighting-app/silabs/efr32/include/AppEvent.h diff --git a/examples/lighting-app/efr32/include/AppTask.h b/examples/lighting-app/silabs/efr32/include/AppTask.h similarity index 100% rename from examples/lighting-app/efr32/include/AppTask.h rename to examples/lighting-app/silabs/efr32/include/AppTask.h diff --git a/examples/lighting-app/efr32/include/CHIPProjectConfig.h b/examples/lighting-app/silabs/efr32/include/CHIPProjectConfig.h similarity index 100% rename from examples/lighting-app/efr32/include/CHIPProjectConfig.h rename to examples/lighting-app/silabs/efr32/include/CHIPProjectConfig.h diff --git a/examples/lighting-app/efr32/include/LightingManager.h b/examples/lighting-app/silabs/efr32/include/LightingManager.h similarity index 100% rename from examples/lighting-app/efr32/include/LightingManager.h rename to examples/lighting-app/silabs/efr32/include/LightingManager.h diff --git a/examples/lighting-app/efr32/src/AppTask.cpp b/examples/lighting-app/silabs/efr32/src/AppTask.cpp similarity index 100% rename from examples/lighting-app/efr32/src/AppTask.cpp rename to examples/lighting-app/silabs/efr32/src/AppTask.cpp diff --git a/examples/lighting-app/efr32/src/LightingManager.cpp b/examples/lighting-app/silabs/efr32/src/LightingManager.cpp similarity index 100% rename from examples/lighting-app/efr32/src/LightingManager.cpp rename to examples/lighting-app/silabs/efr32/src/LightingManager.cpp diff --git a/examples/lighting-app/efr32/src/ZclCallbacks.cpp b/examples/lighting-app/silabs/efr32/src/ZclCallbacks.cpp similarity index 100% rename from examples/lighting-app/efr32/src/ZclCallbacks.cpp rename to examples/lighting-app/silabs/efr32/src/ZclCallbacks.cpp diff --git a/examples/lighting-app/efr32/src/main.cpp b/examples/lighting-app/silabs/efr32/src/main.cpp similarity index 100% rename from examples/lighting-app/efr32/src/main.cpp rename to examples/lighting-app/silabs/efr32/src/main.cpp diff --git a/examples/lighting-app/silabs/efr32/third_party/connectedhomeip b/examples/lighting-app/silabs/efr32/third_party/connectedhomeip new file mode 120000 index 00000000000000..59307833b4fee9 --- /dev/null +++ b/examples/lighting-app/silabs/efr32/third_party/connectedhomeip @@ -0,0 +1 @@ +../../../../.. \ No newline at end of file diff --git a/examples/lighting-app/efr32/with_pw_rpc.gni b/examples/lighting-app/silabs/efr32/with_pw_rpc.gni similarity index 94% rename from examples/lighting-app/efr32/with_pw_rpc.gni rename to examples/lighting-app/silabs/efr32/with_pw_rpc.gni index c705b92b12f6fd..40a8bb79d84b6a 100644 --- a/examples/lighting-app/efr32/with_pw_rpc.gni +++ b/examples/lighting-app/silabs/efr32/with_pw_rpc.gni @@ -17,7 +17,7 @@ import("//build_overrides/chip.gni") import("${chip_root}/config/efr32/lib/pw_rpc/pw_rpc.gni") -import("${chip_root}/examples/platform/efr32/args.gni") +import("${chip_root}/examples/platform/silabs/efr32/args.gni") efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain") diff --git a/examples/lock-app/efr32/BUILD.gn b/examples/lock-app/efr32/BUILD.gn index fdd3f9f9984b8d..8e22a6add4864e 100644 --- a/examples/lock-app/efr32/BUILD.gn +++ b/examples/lock-app/efr32/BUILD.gn @@ -32,7 +32,8 @@ if (chip_enable_pw_rpc) { assert(current_os == "freertos") efr32_project_dir = "${chip_root}/examples/lock-app/efr32" -examples_plat_dir = "${chip_root}/examples/platform/efr32" +examples_plat_dir = "${chip_root}/examples/platform/silabs/efr32" +examples_common_plat_dir = "${chip_root}/examples/platform/silabs" declare_args() { # Dump memory usage at link time. @@ -79,7 +80,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/EFR32/wifi_args.gni") + import("${chip_root}/src/platform/silabs/EFR32/wifi_args.gni") } # ThunderBoards, Explorer Kit and MGM240L do not support LCD (No LCD) @@ -91,7 +92,7 @@ if (silabs_board == "BRD4166A" || silabs_board == "BRD2601B" || # WiFi settings if (chip_enable_wifi) { - wifi_sdk_dir = "${chip_root}/src/platform/EFR32/wifi" + wifi_sdk_dir = "${chip_root}/src/platform/silabs/EFR32/wifi" efr32_lwip_defs = [ "LWIP_NETIF_API=1" ] if (lwip_ipv4) { efr32_lwip_defs += [ @@ -132,10 +133,11 @@ efr32_sdk("sdk") { ] include_dirs = [ - "${chip_root}/src/platform/EFR32", + "${chip_root}/src/platform/silabs/EFR32", "${efr32_project_dir}/include", "${examples_plat_dir}", "${chip_root}/src/lib", + "${examples_common_plat_dir}", ] defines = [ @@ -182,9 +184,9 @@ efr32_executable("lock_app") { defines = [] sources = [ + "${examples_common_plat_dir}/heap_4_silabs.c", "${examples_plat_dir}/BaseApplication.cpp", "${examples_plat_dir}/efr32_utils.cpp", - "${examples_plat_dir}/heap_4_silabs.c", "${examples_plat_dir}/init_efrPlatform.cpp", "${examples_plat_dir}/matter_config.cpp", "src/AppTask.cpp", @@ -300,8 +302,8 @@ efr32_executable("lock_app") { sources += [ "${chip_root}/examples/common/pigweed/RpcService.cpp", "${chip_root}/examples/common/pigweed/efr32/PigweedLoggerMutex.cpp", - "${examples_plat_dir}/PigweedLogger.cpp", - "${examples_plat_dir}/Rpc.cpp", + "${examples_common_plat_dir}/PigweedLogger.cpp", + "${examples_common_plat_dir}/Rpc.cpp", ] deps += [ @@ -327,7 +329,7 @@ efr32_executable("lock_app") { } if (enable_heap_monitoring) { - sources += [ "${examples_plat_dir}/MemMonitoring.cpp" ] + sources += [ "${examples_common_plat_dir}/MemMonitoring.cpp" ] defines += [ "HEAP_MONITORING" ] } diff --git a/examples/lock-app/efr32/args.gni b/examples/lock-app/efr32/args.gni index 02ac44a44ac925..23f22fbb83d459 100644 --- a/examples/lock-app/efr32/args.gni +++ b/examples/lock-app/efr32/args.gni @@ -15,7 +15,7 @@ import("//build_overrides/chip.gni") import("//build_overrides/pigweed.gni") import("${chip_root}/config/standalone/args.gni") -import("${chip_root}/src/platform/EFR32/args.gni") +import("${chip_root}/src/platform/silabs/EFR32/args.gni") efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain") diff --git a/examples/lock-app/efr32/build_for_wifi_args.gni b/examples/lock-app/efr32/build_for_wifi_args.gni index 236f166574862d..363d2be9e6f362 100644 --- a/examples/lock-app/efr32/build_for_wifi_args.gni +++ b/examples/lock-app/efr32/build_for_wifi_args.gni @@ -17,7 +17,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/EFR32/wifi_args.gni") +import("${chip_root}/src/platform/silabs/EFR32/wifi_args.gni") chip_enable_ota_requestor = true diff --git a/examples/lock-app/efr32/with_pw_rpc.gni b/examples/lock-app/efr32/with_pw_rpc.gni index f51b6aceb7ccff..faa281a6a4597c 100644 --- a/examples/lock-app/efr32/with_pw_rpc.gni +++ b/examples/lock-app/efr32/with_pw_rpc.gni @@ -17,7 +17,7 @@ import("//build_overrides/chip.gni") import("${chip_root}/config/efr32/lib/pw_rpc/pw_rpc.gni") -import("${chip_root}/examples/platform/efr32/args.gni") +import("${chip_root}/examples/platform/silabs/efr32/args.gni") efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain") diff --git a/examples/persistent-storage/efr32/main.cpp b/examples/persistent-storage/efr32/main.cpp index 2b0c65dd85869c..fea4ccb297a965 100644 --- a/examples/persistent-storage/efr32/main.cpp +++ b/examples/persistent-storage/efr32/main.cpp @@ -32,8 +32,8 @@ #include "init_efrPlatform.h" #include "sl_system_kernel.h" #include -#include #include +#include static TaskHandle_t sTestTaskHandle; void TestTask(void * pvParameter) diff --git a/examples/platform/efr32/EFR32DeviceAttestationCreds.cpp b/examples/platform/silabs/EFR32DeviceAttestationCreds.cpp similarity index 100% rename from examples/platform/efr32/EFR32DeviceAttestationCreds.cpp rename to examples/platform/silabs/EFR32DeviceAttestationCreds.cpp diff --git a/examples/platform/efr32/EFR32DeviceAttestationCreds.h b/examples/platform/silabs/EFR32DeviceAttestationCreds.h similarity index 100% rename from examples/platform/efr32/EFR32DeviceAttestationCreds.h rename to examples/platform/silabs/EFR32DeviceAttestationCreds.h diff --git a/examples/platform/efr32/MemMonitoring.h b/examples/platform/silabs/MemMonitoring.h similarity index 100% rename from examples/platform/efr32/MemMonitoring.h rename to examples/platform/silabs/MemMonitoring.h diff --git a/examples/platform/efr32/PigweedLogger.cpp b/examples/platform/silabs/PigweedLogger.cpp similarity index 100% rename from examples/platform/efr32/PigweedLogger.cpp rename to examples/platform/silabs/PigweedLogger.cpp diff --git a/examples/platform/efr32/PigweedLogger.h b/examples/platform/silabs/PigweedLogger.h similarity index 100% rename from examples/platform/efr32/PigweedLogger.h rename to examples/platform/silabs/PigweedLogger.h diff --git a/examples/platform/efr32/Rpc.cpp b/examples/platform/silabs/Rpc.cpp similarity index 100% rename from examples/platform/efr32/Rpc.cpp rename to examples/platform/silabs/Rpc.cpp diff --git a/examples/platform/efr32/Rpc.h b/examples/platform/silabs/Rpc.h similarity index 100% rename from examples/platform/efr32/Rpc.h rename to examples/platform/silabs/Rpc.h diff --git a/examples/platform/efr32/BUILD.gn b/examples/platform/silabs/efr32/BUILD.gn similarity index 97% rename from examples/platform/efr32/BUILD.gn rename to examples/platform/silabs/efr32/BUILD.gn index 1f945c2d9bc534..9f644031b14341 100644 --- a/examples/platform/efr32/BUILD.gn +++ b/examples/platform/silabs/efr32/BUILD.gn @@ -82,8 +82,8 @@ config("attestation-credentials-config") { source_set("efr32-attestation-credentials") { sources = [ - "EFR32DeviceAttestationCreds.cpp", - "EFR32DeviceAttestationCreds.h", + "../EFR32DeviceAttestationCreds.cpp", + "../EFR32DeviceAttestationCreds.h", ] public_deps = [ diff --git a/examples/platform/efr32/BaseApplication.cpp b/examples/platform/silabs/efr32/BaseApplication.cpp similarity index 99% rename from examples/platform/efr32/BaseApplication.cpp rename to examples/platform/silabs/efr32/BaseApplication.cpp index b99df3e0fd8b08..70f876c311cd06 100644 --- a/examples/platform/efr32/BaseApplication.cpp +++ b/examples/platform/silabs/efr32/BaseApplication.cpp @@ -51,15 +51,15 @@ #include #if CHIP_ENABLE_OPENTHREAD -#include #include #include +#include #endif // CHIP_ENABLE_OPENTHREAD #ifdef SL_WIFI #include "wfx_host_events.h" #include -#include +#include #endif // SL_WIFI /********************************************************** diff --git a/examples/platform/efr32/BaseApplication.h b/examples/platform/silabs/efr32/BaseApplication.h similarity index 100% rename from examples/platform/efr32/BaseApplication.h rename to examples/platform/silabs/efr32/BaseApplication.h diff --git a/examples/platform/efr32/EFR32DeviceDataProvider.cpp b/examples/platform/silabs/efr32/EFR32DeviceDataProvider.cpp similarity index 99% rename from examples/platform/efr32/EFR32DeviceDataProvider.cpp rename to examples/platform/silabs/efr32/EFR32DeviceDataProvider.cpp index 7599571bb852c4..07966d3f3ba0fa 100644 --- a/examples/platform/efr32/EFR32DeviceDataProvider.cpp +++ b/examples/platform/silabs/efr32/EFR32DeviceDataProvider.cpp @@ -16,9 +16,9 @@ */ #include "EFR32DeviceDataProvider.h" -#include "EFR32Config.h" #include #include +#include #include #include diff --git a/examples/platform/efr32/EFR32DeviceDataProvider.h b/examples/platform/silabs/efr32/EFR32DeviceDataProvider.h similarity index 100% rename from examples/platform/efr32/EFR32DeviceDataProvider.h rename to examples/platform/silabs/efr32/EFR32DeviceDataProvider.h diff --git a/examples/platform/efr32/FreeRTOSConfig.h b/examples/platform/silabs/efr32/FreeRTOSConfig.h similarity index 100% rename from examples/platform/efr32/FreeRTOSConfig.h rename to examples/platform/silabs/efr32/FreeRTOSConfig.h diff --git a/examples/platform/efr32/LEDWidget.cpp b/examples/platform/silabs/efr32/LEDWidget.cpp similarity index 100% rename from examples/platform/efr32/LEDWidget.cpp rename to examples/platform/silabs/efr32/LEDWidget.cpp diff --git a/examples/platform/efr32/LEDWidget.h b/examples/platform/silabs/efr32/LEDWidget.h similarity index 100% rename from examples/platform/efr32/LEDWidget.h rename to examples/platform/silabs/efr32/LEDWidget.h diff --git a/examples/platform/efr32/MemMonitoring.cpp b/examples/platform/silabs/efr32/MemMonitoring.cpp similarity index 100% rename from examples/platform/efr32/MemMonitoring.cpp rename to examples/platform/silabs/efr32/MemMonitoring.cpp diff --git a/examples/platform/efr32/OTAConfig.cpp b/examples/platform/silabs/efr32/OTAConfig.cpp similarity index 100% rename from examples/platform/efr32/OTAConfig.cpp rename to examples/platform/silabs/efr32/OTAConfig.cpp diff --git a/examples/platform/efr32/OTAConfig.h b/examples/platform/silabs/efr32/OTAConfig.h similarity index 94% rename from examples/platform/efr32/OTAConfig.h rename to examples/platform/silabs/efr32/OTAConfig.h index afc0f57d702ae4..a4f8ac4369e175 100644 --- a/examples/platform/efr32/OTAConfig.h +++ b/examples/platform/silabs/efr32/OTAConfig.h @@ -22,7 +22,7 @@ #include #include #include -#include +#include class OTAConfig { diff --git a/examples/platform/efr32/TemperatureSensor.cpp b/examples/platform/silabs/efr32/TemperatureSensor.cpp similarity index 100% rename from examples/platform/efr32/TemperatureSensor.cpp rename to examples/platform/silabs/efr32/TemperatureSensor.cpp diff --git a/examples/platform/efr32/TemperatureSensor.h b/examples/platform/silabs/efr32/TemperatureSensor.h similarity index 100% rename from examples/platform/efr32/TemperatureSensor.h rename to examples/platform/silabs/efr32/TemperatureSensor.h diff --git a/examples/platform/efr32/args.gni b/examples/platform/silabs/efr32/args.gni similarity index 100% rename from examples/platform/efr32/args.gni rename to examples/platform/silabs/efr32/args.gni diff --git a/examples/platform/efr32/board_config.h b/examples/platform/silabs/efr32/board_config.h similarity index 100% rename from examples/platform/efr32/board_config.h rename to examples/platform/silabs/efr32/board_config.h diff --git a/examples/platform/efr32/display/demo-ui-bitmaps.h b/examples/platform/silabs/efr32/display/demo-ui-bitmaps.h similarity index 100% rename from examples/platform/efr32/display/demo-ui-bitmaps.h rename to examples/platform/silabs/efr32/display/demo-ui-bitmaps.h diff --git a/examples/platform/efr32/display/demo-ui.c b/examples/platform/silabs/efr32/display/demo-ui.c similarity index 100% rename from examples/platform/efr32/display/demo-ui.c rename to examples/platform/silabs/efr32/display/demo-ui.c diff --git a/examples/platform/efr32/display/demo-ui.h b/examples/platform/silabs/efr32/display/demo-ui.h similarity index 100% rename from examples/platform/efr32/display/demo-ui.h rename to examples/platform/silabs/efr32/display/demo-ui.h diff --git a/examples/platform/efr32/display/lcd.cpp b/examples/platform/silabs/efr32/display/lcd.cpp similarity index 100% rename from examples/platform/efr32/display/lcd.cpp rename to examples/platform/silabs/efr32/display/lcd.cpp diff --git a/examples/platform/efr32/display/lcd.h b/examples/platform/silabs/efr32/display/lcd.h similarity index 100% rename from examples/platform/efr32/display/lcd.h rename to examples/platform/silabs/efr32/display/lcd.h diff --git a/examples/platform/efr32/efr32_utils.cpp b/examples/platform/silabs/efr32/efr32_utils.cpp similarity index 100% rename from examples/platform/efr32/efr32_utils.cpp rename to examples/platform/silabs/efr32/efr32_utils.cpp diff --git a/examples/platform/efr32/efr32_utils.h b/examples/platform/silabs/efr32/efr32_utils.h similarity index 100% rename from examples/platform/efr32/efr32_utils.h rename to examples/platform/silabs/efr32/efr32_utils.h diff --git a/examples/platform/efr32/init_efrPlatform.cpp b/examples/platform/silabs/efr32/init_efrPlatform.cpp similarity index 100% rename from examples/platform/efr32/init_efrPlatform.cpp rename to examples/platform/silabs/efr32/init_efrPlatform.cpp diff --git a/examples/platform/efr32/init_efrPlatform.h b/examples/platform/silabs/efr32/init_efrPlatform.h similarity index 100% rename from examples/platform/efr32/init_efrPlatform.h rename to examples/platform/silabs/efr32/init_efrPlatform.h diff --git a/examples/platform/efr32/ldscripts/efr32mg12.ld b/examples/platform/silabs/efr32/ldscripts/efr32mg12.ld similarity index 100% rename from examples/platform/efr32/ldscripts/efr32mg12.ld rename to examples/platform/silabs/efr32/ldscripts/efr32mg12.ld diff --git a/examples/platform/efr32/ldscripts/efr32mg21.ld b/examples/platform/silabs/efr32/ldscripts/efr32mg21.ld similarity index 100% rename from examples/platform/efr32/ldscripts/efr32mg21.ld rename to examples/platform/silabs/efr32/ldscripts/efr32mg21.ld diff --git a/examples/platform/efr32/ldscripts/efr32mg24.ld b/examples/platform/silabs/efr32/ldscripts/efr32mg24.ld similarity index 100% rename from examples/platform/efr32/ldscripts/efr32mg24.ld rename to examples/platform/silabs/efr32/ldscripts/efr32mg24.ld diff --git a/examples/platform/efr32/ldscripts/mgm24.ld b/examples/platform/silabs/efr32/ldscripts/mgm24.ld similarity index 100% rename from examples/platform/efr32/ldscripts/mgm24.ld rename to examples/platform/silabs/efr32/ldscripts/mgm24.ld diff --git a/examples/platform/efr32/matter_config.cpp b/examples/platform/silabs/efr32/matter_config.cpp similarity index 99% rename from examples/platform/efr32/matter_config.cpp rename to examples/platform/silabs/efr32/matter_config.cpp index d12a048a7d245d..a9dc33cc177688 100644 --- a/examples/platform/efr32/matter_config.cpp +++ b/examples/platform/silabs/efr32/matter_config.cpp @@ -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 +#include static chip::DeviceLayer::Internal::Efr32PsaOperationalKeystore gOperationalKeystore; #endif diff --git a/examples/platform/efr32/matter_config.h b/examples/platform/silabs/efr32/matter_config.h similarity index 100% rename from examples/platform/efr32/matter_config.h rename to examples/platform/silabs/efr32/matter_config.h diff --git a/examples/platform/efr32/project_include/OpenThreadConfig.h b/examples/platform/silabs/efr32/project_include/OpenThreadConfig.h similarity index 98% rename from examples/platform/efr32/project_include/OpenThreadConfig.h rename to examples/platform/silabs/efr32/project_include/OpenThreadConfig.h index 17ca50ac8bfd59..dccf3c816b7b66 100644 --- a/examples/platform/efr32/project_include/OpenThreadConfig.h +++ b/examples/platform/silabs/efr32/project_include/OpenThreadConfig.h @@ -29,7 +29,7 @@ // Disable the SiLabs-supplied OpenThread logging facilities and use // the facilities provided by the Device Layer (see -// src/platform/EFR32/Logging.cpp). +// src/platform/silabs/Logging.cpp). #define OPENTHREAD_CONFIG_LOG_OUTPUT OPENTHREAD_CONFIG_LOG_OUTPUT_APP // Turn on a moderate level of logging in OpenThread diff --git a/examples/platform/efr32/pw_sys_io/BUILD.gn b/examples/platform/silabs/efr32/pw_sys_io/BUILD.gn similarity index 94% rename from examples/platform/efr32/pw_sys_io/BUILD.gn rename to examples/platform/silabs/efr32/pw_sys_io/BUILD.gn index 13ee23fa4d52f2..722d2a7cad24e6 100644 --- a/examples/platform/efr32/pw_sys_io/BUILD.gn +++ b/examples/platform/silabs/efr32/pw_sys_io/BUILD.gn @@ -17,7 +17,7 @@ import("//build_overrides/pigweed.gni") import("$dir_pw_build/target_types.gni") -examples_plat_dir = "${chip_root}/examples/platform/efr32" +examples_plat_dir = "${chip_root}/examples/platform/silabs/efr32" config("default_config") { include_dirs = [ "public" ] diff --git a/examples/platform/efr32/pw_sys_io/public/pw_sys_io_efr32/init.h b/examples/platform/silabs/efr32/pw_sys_io/public/pw_sys_io_efr32/init.h similarity index 100% rename from examples/platform/efr32/pw_sys_io/public/pw_sys_io_efr32/init.h rename to examples/platform/silabs/efr32/pw_sys_io/public/pw_sys_io_efr32/init.h diff --git a/examples/platform/efr32/pw_sys_io/sys_io_efr32.cc b/examples/platform/silabs/efr32/pw_sys_io/sys_io_efr32.cc similarity index 100% rename from examples/platform/efr32/pw_sys_io/sys_io_efr32.cc rename to examples/platform/silabs/efr32/pw_sys_io/sys_io_efr32.cc diff --git a/examples/platform/efr32/rs911x/hal/efx_spi.c b/examples/platform/silabs/efr32/rs911x/hal/efx_spi.c similarity index 100% rename from examples/platform/efr32/rs911x/hal/efx_spi.c rename to examples/platform/silabs/efr32/rs911x/hal/efx_spi.c diff --git a/examples/platform/efr32/rs911x/hal/rsi_board_configuration.h b/examples/platform/silabs/efr32/rs911x/hal/rsi_board_configuration.h similarity index 100% rename from examples/platform/efr32/rs911x/hal/rsi_board_configuration.h rename to examples/platform/silabs/efr32/rs911x/hal/rsi_board_configuration.h diff --git a/examples/platform/efr32/rs911x/hal/rsi_hal.h b/examples/platform/silabs/efr32/rs911x/hal/rsi_hal.h similarity index 100% rename from examples/platform/efr32/rs911x/hal/rsi_hal.h rename to examples/platform/silabs/efr32/rs911x/hal/rsi_hal.h diff --git a/examples/platform/efr32/rs911x/hal/rsi_hal_mcu_interrupt.c b/examples/platform/silabs/efr32/rs911x/hal/rsi_hal_mcu_interrupt.c similarity index 100% rename from examples/platform/efr32/rs911x/hal/rsi_hal_mcu_interrupt.c rename to examples/platform/silabs/efr32/rs911x/hal/rsi_hal_mcu_interrupt.c diff --git a/examples/platform/efr32/rs911x/hal/rsi_hal_mcu_ioports.c b/examples/platform/silabs/efr32/rs911x/hal/rsi_hal_mcu_ioports.c similarity index 100% rename from examples/platform/efr32/rs911x/hal/rsi_hal_mcu_ioports.c rename to examples/platform/silabs/efr32/rs911x/hal/rsi_hal_mcu_ioports.c diff --git a/examples/platform/efr32/rs911x/hal/rsi_hal_mcu_rtc.c b/examples/platform/silabs/efr32/rs911x/hal/rsi_hal_mcu_rtc.c similarity index 100% rename from examples/platform/efr32/rs911x/hal/rsi_hal_mcu_rtc.c rename to examples/platform/silabs/efr32/rs911x/hal/rsi_hal_mcu_rtc.c diff --git a/examples/platform/efr32/rs911x/hal/rsi_hal_mcu_timer.c b/examples/platform/silabs/efr32/rs911x/hal/rsi_hal_mcu_timer.c similarity index 100% rename from examples/platform/efr32/rs911x/hal/rsi_hal_mcu_timer.c rename to examples/platform/silabs/efr32/rs911x/hal/rsi_hal_mcu_timer.c diff --git a/examples/platform/efr32/rs911x/rs911x.gni b/examples/platform/silabs/efr32/rs911x/rs911x.gni similarity index 96% rename from examples/platform/efr32/rs911x/rs911x.gni rename to examples/platform/silabs/efr32/rs911x/rs911x.gni index 87b30c43a7be33..f11981023e35f2 100644 --- a/examples/platform/efr32/rs911x/rs911x.gni +++ b/examples/platform/silabs/efr32/rs911x/rs911x.gni @@ -2,8 +2,8 @@ import("//build_overrides/chip.gni") import("//build_overrides/efr32_sdk.gni") import("//build_overrides/pigweed.gni") -examples_plat_dir = "${chip_root}/examples/platform/efr32" -wifi_sdk_dir = "${chip_root}/src/platform/EFR32/wifi" +examples_plat_dir = "${chip_root}/examples/platform/silabs/efr32" +wifi_sdk_dir = "${chip_root}/src/platform/silabs/EFR32/wifi" wiseconnect_sdk_root = "${chip_root}/third_party/silabs/wiseconnect-wifi-bt-sdk" rs911x_cflags = [] diff --git a/examples/platform/efr32/rs911x/rsi_if.c b/examples/platform/silabs/efr32/rs911x/rsi_if.c similarity index 100% rename from examples/platform/efr32/rs911x/rsi_if.c rename to examples/platform/silabs/efr32/rs911x/rsi_if.c diff --git a/examples/platform/efr32/rs911x/rsi_wlan_config.h b/examples/platform/silabs/efr32/rs911x/rsi_wlan_config.h similarity index 100% rename from examples/platform/efr32/rs911x/rsi_wlan_config.h rename to examples/platform/silabs/efr32/rs911x/rsi_wlan_config.h diff --git a/examples/platform/efr32/rs911x/wfx_rsi.h b/examples/platform/silabs/efr32/rs911x/wfx_rsi.h similarity index 100% rename from examples/platform/efr32/rs911x/wfx_rsi.h rename to examples/platform/silabs/efr32/rs911x/wfx_rsi.h diff --git a/examples/platform/efr32/rs911x/wfx_rsi_host.c b/examples/platform/silabs/efr32/rs911x/wfx_rsi_host.c similarity index 100% rename from examples/platform/efr32/rs911x/wfx_rsi_host.c rename to examples/platform/silabs/efr32/rs911x/wfx_rsi_host.c diff --git a/examples/platform/efr32/rs911x/wfx_rsidev.c b/examples/platform/silabs/efr32/rs911x/wfx_rsidev.c similarity index 100% rename from examples/platform/efr32/rs911x/wfx_rsidev.c rename to examples/platform/silabs/efr32/rs911x/wfx_rsidev.c diff --git a/examples/platform/efr32/uart.cpp b/examples/platform/silabs/efr32/uart.cpp similarity index 100% rename from examples/platform/efr32/uart.cpp rename to examples/platform/silabs/efr32/uart.cpp diff --git a/examples/platform/efr32/uart.h b/examples/platform/silabs/efr32/uart.h similarity index 100% rename from examples/platform/efr32/uart.h rename to examples/platform/silabs/efr32/uart.h diff --git a/examples/platform/efr32/wf200/efr_spi.c b/examples/platform/silabs/efr32/wf200/efr_spi.c similarity index 100% rename from examples/platform/efr32/wf200/efr_spi.c rename to examples/platform/silabs/efr32/wf200/efr_spi.c diff --git a/examples/platform/efr32/wf200/host_if.cpp b/examples/platform/silabs/efr32/wf200/host_if.cpp similarity index 100% rename from examples/platform/efr32/wf200/host_if.cpp rename to examples/platform/silabs/efr32/wf200/host_if.cpp diff --git a/examples/platform/efr32/wf200/sl_wfx_board.h b/examples/platform/silabs/efr32/wf200/sl_wfx_board.h similarity index 100% rename from examples/platform/efr32/wf200/sl_wfx_board.h rename to examples/platform/silabs/efr32/wf200/sl_wfx_board.h diff --git a/examples/platform/efr32/wf200/sl_wfx_configuration.h b/examples/platform/silabs/efr32/wf200/sl_wfx_configuration.h similarity index 100% rename from examples/platform/efr32/wf200/sl_wfx_configuration.h rename to examples/platform/silabs/efr32/wf200/sl_wfx_configuration.h diff --git a/examples/platform/efr32/wf200/sl_wfx_crypto.c b/examples/platform/silabs/efr32/wf200/sl_wfx_crypto.c similarity index 100% rename from examples/platform/efr32/wf200/sl_wfx_crypto.c rename to examples/platform/silabs/efr32/wf200/sl_wfx_crypto.c diff --git a/examples/platform/efr32/wf200/sl_wfx_host.h b/examples/platform/silabs/efr32/wf200/sl_wfx_host.h similarity index 100% rename from examples/platform/efr32/wf200/sl_wfx_host.h rename to examples/platform/silabs/efr32/wf200/sl_wfx_host.h diff --git a/examples/platform/efr32/wf200/sl_wfx_securelink_task.c b/examples/platform/silabs/efr32/wf200/sl_wfx_securelink_task.c similarity index 100% rename from examples/platform/efr32/wf200/sl_wfx_securelink_task.c rename to examples/platform/silabs/efr32/wf200/sl_wfx_securelink_task.c diff --git a/examples/platform/efr32/wf200/sl_wfx_task.c b/examples/platform/silabs/efr32/wf200/sl_wfx_task.c similarity index 100% rename from examples/platform/efr32/wf200/sl_wfx_task.c rename to examples/platform/silabs/efr32/wf200/sl_wfx_task.c diff --git a/examples/platform/efr32/wf200/sl_wfx_task.h b/examples/platform/silabs/efr32/wf200/sl_wfx_task.h similarity index 100% rename from examples/platform/efr32/wf200/sl_wfx_task.h rename to examples/platform/silabs/efr32/wf200/sl_wfx_task.h diff --git a/examples/platform/efr32/wf200/wf200.gni b/examples/platform/silabs/efr32/wf200/wf200.gni similarity index 85% rename from examples/platform/efr32/wf200/wf200.gni rename to examples/platform/silabs/efr32/wf200/wf200.gni index e7236d3004d2c1..358384a81121bf 100644 --- a/examples/platform/efr32/wf200/wf200.gni +++ b/examples/platform/silabs/efr32/wf200/wf200.gni @@ -2,8 +2,8 @@ import("//build_overrides/chip.gni") import("//build_overrides/efr32_sdk.gni") import("//build_overrides/pigweed.gni") -examples_plat_dir = "${chip_root}/examples/platform/efr32" -wifi_sdk_dir = "${chip_root}/src/platform/EFR32/wifi" +examples_plat_dir = "${chip_root}/examples/platform/silabs/efr32" +wifi_sdk_dir = "${chip_root}/src/platform/silabs/EFR32/wifi" wf200_defs = [ "SL_HEAP_SIZE=24576", diff --git a/examples/platform/efr32/wf200/wf200_init.c b/examples/platform/silabs/efr32/wf200/wf200_init.c similarity index 100% rename from examples/platform/efr32/wf200/wf200_init.c rename to examples/platform/silabs/efr32/wf200/wf200_init.c diff --git a/examples/platform/efr32/efr32_creds.h b/examples/platform/silabs/efr32_creds.h similarity index 100% rename from examples/platform/efr32/efr32_creds.h rename to examples/platform/silabs/efr32_creds.h diff --git a/examples/platform/efr32/heap_4_silabs.c b/examples/platform/silabs/heap_4_silabs.c similarity index 100% rename from examples/platform/efr32/heap_4_silabs.c rename to examples/platform/silabs/heap_4_silabs.c diff --git a/examples/platform/efr32/heap_4_silabs.h b/examples/platform/silabs/heap_4_silabs.h similarity index 100% rename from examples/platform/efr32/heap_4_silabs.h rename to examples/platform/silabs/heap_4_silabs.h diff --git a/examples/platform/efr32/matter_shell.cpp b/examples/platform/silabs/matter_shell.cpp similarity index 100% rename from examples/platform/efr32/matter_shell.cpp rename to examples/platform/silabs/matter_shell.cpp diff --git a/examples/platform/efr32/matter_shell.h b/examples/platform/silabs/matter_shell.h similarity index 100% rename from examples/platform/efr32/matter_shell.h rename to examples/platform/silabs/matter_shell.h diff --git a/examples/thermostat/efr32/BUILD.gn b/examples/thermostat/efr32/BUILD.gn index 690023d185c835..1e5deb78ef4f10 100644 --- a/examples/thermostat/efr32/BUILD.gn +++ b/examples/thermostat/efr32/BUILD.gn @@ -32,8 +32,8 @@ if (chip_enable_pw_rpc) { assert(current_os == "freertos") efr32_project_dir = "${chip_root}/examples/thermostat/efr32" -examples_plat_dir = "${chip_root}/examples/platform/efr32" -efr32_sdk_root = "${chip_root}/third_party/silabs/gecko_sdk" +examples_plat_dir = "${chip_root}/examples/platform/silabs/efr32" +examples_common_plat_dir = "${chip_root}/examples/platform/silabs" declare_args() { # Dump memory usage at link time. @@ -81,7 +81,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/EFR32/wifi_args.gni") + import("${chip_root}/src/platform/silabs/EFR32/wifi_args.gni") } # ThunderBoards, Explorer Kit and MGM240L do not support LCD (No LCD) @@ -93,7 +93,7 @@ if (silabs_board == "BRD4166A" || silabs_board == "BRD2601B" || # WiFi settings if (chip_enable_wifi) { - wifi_sdk_dir = "${chip_root}/src/platform/EFR32/wifi" + wifi_sdk_dir = "${chip_root}/src/platform/silabs/EFR32/wifi" efr32_lwip_defs = [ "LWIP_NETIF_API=1" ] if (lwip_ipv4) { efr32_lwip_defs += [ @@ -134,11 +134,11 @@ efr32_sdk("sdk") { ] include_dirs = [ - "${chip_root}/src/platform/EFR32", + "${chip_root}/src/platform/silabs/EFR32", "${efr32_project_dir}/include", "${examples_plat_dir}", "${chip_root}/src/lib", - "${efr32_sdk_root}/app/common/util/app_assert", + "${examples_common_plat_dir}", ] defines = [ @@ -198,9 +198,9 @@ efr32_executable("thermostat_app") { defines = [] sources = [ + "${examples_common_plat_dir}/heap_4_silabs.c", "${examples_plat_dir}/BaseApplication.cpp", "${examples_plat_dir}/efr32_utils.cpp", - "${examples_plat_dir}/heap_4_silabs.c", "${examples_plat_dir}/init_efrPlatform.cpp", "${examples_plat_dir}/matter_config.cpp", "src/AppTask.cpp", @@ -327,8 +327,8 @@ efr32_executable("thermostat_app") { sources += [ "${chip_root}/examples/common/pigweed/RpcService.cpp", "${chip_root}/examples/common/pigweed/efr32/PigweedLoggerMutex.cpp", - "${examples_plat_dir}/PigweedLogger.cpp", - "${examples_plat_dir}/Rpc.cpp", + "${examples_common_plat_dir}/PigweedLogger.cpp", + "${examples_common_plat_dir}/Rpc.cpp", ] deps += [ @@ -352,7 +352,7 @@ efr32_executable("thermostat_app") { } if (enable_heap_monitoring) { - sources += [ "${examples_plat_dir}/MemMonitoring.cpp" ] + sources += [ "${examples_common_plat_dir}/MemMonitoring.cpp" ] defines += [ "HEAP_MONITORING" ] } diff --git a/examples/thermostat/efr32/args.gni b/examples/thermostat/efr32/args.gni index 7f4a06e57d9a59..d216faa0a07dae 100644 --- a/examples/thermostat/efr32/args.gni +++ b/examples/thermostat/efr32/args.gni @@ -15,7 +15,7 @@ import("//build_overrides/chip.gni") import("//build_overrides/pigweed.gni") import("${chip_root}/config/standalone/args.gni") -import("${chip_root}/src/platform/EFR32/args.gni") +import("${chip_root}/src/platform/silabs/EFR32/args.gni") efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain") diff --git a/examples/thermostat/efr32/build_for_wifi_args.gni b/examples/thermostat/efr32/build_for_wifi_args.gni index 236f166574862d..363d2be9e6f362 100644 --- a/examples/thermostat/efr32/build_for_wifi_args.gni +++ b/examples/thermostat/efr32/build_for_wifi_args.gni @@ -17,7 +17,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/EFR32/wifi_args.gni") +import("${chip_root}/src/platform/silabs/EFR32/wifi_args.gni") chip_enable_ota_requestor = true diff --git a/examples/window-app/efr32/BUILD.gn b/examples/window-app/efr32/BUILD.gn index c94685c6279da5..142a4dc84146ab 100644 --- a/examples/window-app/efr32/BUILD.gn +++ b/examples/window-app/efr32/BUILD.gn @@ -26,7 +26,8 @@ assert(current_os == "freertos") project_dir = "${chip_root}/examples/window-app" efr32_project_dir = "${project_dir}/efr32" -examples_plat_dir = "${chip_root}/examples/platform/efr32" +examples_plat_dir = "${chip_root}/examples/platform/silabs/efr32" +examples_common_plat_dir = "${chip_root}/examples/platform/silabs" declare_args() { # Dump memory usage at link time. @@ -73,7 +74,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/EFR32/wifi_args.gni") + import("${chip_root}/src/platform/silabs/EFR32/wifi_args.gni") } # ThunderBoards, Explorer Kit and MGM240L do not support LCD (No LCD) @@ -90,7 +91,7 @@ if (chip_enable_wifi) { show_qr_code = false disable_lcd = true } - wifi_sdk_dir = "${chip_root}/src/platform/EFR32/wifi" + wifi_sdk_dir = "${chip_root}/src/platform/silabs/EFR32/wifi" efr32_lwip_defs = [ "LWIP_NETIF_API=1" ] if (lwip_ipv4) { efr32_lwip_defs += [ @@ -131,10 +132,11 @@ efr32_sdk("sdk") { ] include_dirs = [ - "${chip_root}/src/platform/EFR32", + "${chip_root}/src/platform/silabs/EFR32", "${efr32_project_dir}/include", "${examples_plat_dir}", "${chip_root}/src/lib", + "${examples_common_plat_dir}", ] defines = [ @@ -179,8 +181,8 @@ efr32_executable("window_app") { defines = [] sources = [ + "${examples_common_plat_dir}/heap_4_silabs.c", "${examples_plat_dir}/efr32_utils.cpp", - "${examples_plat_dir}/heap_4_silabs.c", "${examples_plat_dir}/init_efrPlatform.cpp", "${examples_plat_dir}/matter_config.cpp", "${project_dir}/common/src/WindowApp.cpp", @@ -275,7 +277,7 @@ efr32_executable("window_app") { if (enable_heap_monitoring) { defines += [ "HEAP_MONITORING" ] - sources += [ "${examples_plat_dir}/MemMonitoring.cpp" ] + sources += [ "${examples_common_plat_dir}/MemMonitoring.cpp" ] } ldscript = "${examples_plat_dir}/ldscripts/${silabs_family}.ld" diff --git a/examples/window-app/efr32/args.gni b/examples/window-app/efr32/args.gni index c45308a6da7597..212e702163aa6a 100644 --- a/examples/window-app/efr32/args.gni +++ b/examples/window-app/efr32/args.gni @@ -15,7 +15,7 @@ import("//build_overrides/chip.gni") import("//build_overrides/pigweed.gni") import("${chip_root}/config/standalone/args.gni") -import("${chip_root}/src/platform/EFR32/args.gni") +import("${chip_root}/src/platform/silabs/EFR32/args.gni") efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain") diff --git a/examples/window-app/efr32/build_for_wifi_args.gni b/examples/window-app/efr32/build_for_wifi_args.gni index 4a3bdfd804ae19..8fe1081d6d9b72 100644 --- a/examples/window-app/efr32/build_for_wifi_args.gni +++ b/examples/window-app/efr32/build_for_wifi_args.gni @@ -16,7 +16,7 @@ import("//build_overrides/pigweed.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/silabs/EFR32/wifi_args.gni") chip_enable_ota_requestor = true diff --git a/examples/window-app/efr32/src/WindowAppImpl.cpp b/examples/window-app/efr32/src/WindowAppImpl.cpp index 2675b7398d50a1..6e4c4cf60e985b 100644 --- a/examples/window-app/efr32/src/WindowAppImpl.cpp +++ b/examples/window-app/efr32/src/WindowAppImpl.cpp @@ -42,7 +42,7 @@ #ifdef SL_WIFI #include "wfx_host_events.h" #include -#include +#include #endif #ifdef DISPLAY_ENABLED diff --git a/scripts/build/builders/efr32.py b/scripts/build/builders/efr32.py index 6aba4a2a762d88..d622a9bd6eab3f 100644 --- a/scripts/build/builders/efr32.py +++ b/scripts/build/builders/efr32.py @@ -68,6 +68,8 @@ def FlashBundleName(self): def BuildRoot(self, root): if self == Efr32App.UNIT_TEST: return os.path.join(root, 'src', 'test_driver', 'efr32') + if self == Efr32App.LIGHT: + return os.path.join(root, 'examples', self.ExampleName(), 'silabs/efr32') else: return os.path.join(root, 'examples', self.ExampleName(), 'efr32') diff --git a/scripts/build/testdata/dry_run_efr32-brd4161a-light-rpc.txt b/scripts/build/testdata/dry_run_efr32-brd4161a-light-rpc.txt index cfbf6ba319e1fd..4a241682b02f49 100644 --- a/scripts/build/testdata/dry_run_efr32-brd4161a-light-rpc.txt +++ b/scripts/build/testdata/dry_run_efr32-brd4161a-light-rpc.txt @@ -2,7 +2,7 @@ cd "{root}" # Generating efr32-brd4161a-light-rpc -gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lighting-app/efr32 '--args=silabs_board="BRD4161A" is_debug=false import("//with_pw_rpc.gni")' {out}/efr32-brd4161a-light-rpc +gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lighting-app/silabs/efr32 '--args=silabs_board="BRD4161A" is_debug=false import("//with_pw_rpc.gni")' {out}/efr32-brd4161a-light-rpc # Building efr32-brd4161a-light-rpc ninja -C {out}/efr32-brd4161a-light-rpc diff --git a/scripts/tools/check_includes_config.py b/scripts/tools/check_includes_config.py index 511c8d8b56110c..81b2a481c472f9 100644 --- a/scripts/tools/check_includes_config.py +++ b/scripts/tools/check_includes_config.py @@ -42,7 +42,7 @@ '/platform/Beken/', '/platform/Infineon/CYW30739/', '/platform/Darwin/', - '/platform/EFR32/', + '/platform/silabs/', '/platform/ESP32/', '/platform/fake/', '/platform/Linux/', diff --git a/src/platform/BUILD.gn b/src/platform/BUILD.gn index 9b4f485e1da441..c02b331b49af33 100644 --- a/src/platform/BUILD.gn +++ b/src/platform/BUILD.gn @@ -162,7 +162,7 @@ if (chip_device_platform != "none" && chip_device_platform != "external") { } else if (chip_device_platform == "efr32") { defines += [ "CHIP_DEVICE_LAYER_TARGET_EFR32=1", - "CHIP_DEVICE_LAYER_TARGET=EFR32", + "CHIP_DEVICE_LAYER_TARGET=silabs", ] } else if (chip_device_platform == "esp32") { defines += [ @@ -409,7 +409,7 @@ if (chip_device_platform != "none") { } else if (chip_device_platform == "darwin") { _platform_target = "Darwin" } else if (chip_device_platform == "efr32") { - _platform_target = "EFR32" + _platform_target = "silabs/EFR32" } else if (chip_device_platform == "esp32") { _platform_target = "ESP32" } else if (chip_device_platform == "k32w0") { diff --git a/src/platform/device.gni b/src/platform/device.gni index f32ac03265b35b..601d21ef2ff2f1 100755 --- a/src/platform/device.gni +++ b/src/platform/device.gni @@ -112,7 +112,7 @@ if (chip_device_platform == "cc13x2_26x2") { } else if (chip_device_platform == "darwin") { _chip_device_layer = "Darwin" } else if (chip_device_platform == "efr32") { - _chip_device_layer = "EFR32" + _chip_device_layer = "silabs" } else if (chip_device_platform == "esp32") { _chip_device_layer = "ESP32" } else if (chip_device_platform == "linux") { diff --git a/src/platform/EFR32/BLEManagerImpl.h b/src/platform/silabs/BLEManagerImpl.h similarity index 100% rename from src/platform/EFR32/BLEManagerImpl.h rename to src/platform/silabs/BLEManagerImpl.h diff --git a/src/platform/EFR32/BlePlatformConfig.h b/src/platform/silabs/BlePlatformConfig.h similarity index 98% rename from src/platform/EFR32/BlePlatformConfig.h rename to src/platform/silabs/BlePlatformConfig.h index eec08879cac19b..51feaecd9c7fe8 100644 --- a/src/platform/EFR32/BlePlatformConfig.h +++ b/src/platform/silabs/BlePlatformConfig.h @@ -25,8 +25,6 @@ #pragma once -#include "sl_bt_api.h" - // ==================== Platform Adaptations ==================== #define BLE_CONNECTION_OBJECT uint8_t diff --git a/src/platform/EFR32/CHIPDevicePlatformConfig.h b/src/platform/silabs/CHIPDevicePlatformConfig.h similarity index 100% rename from src/platform/EFR32/CHIPDevicePlatformConfig.h rename to src/platform/silabs/CHIPDevicePlatformConfig.h diff --git a/src/platform/EFR32/CHIPDevicePlatformEvent.h b/src/platform/silabs/CHIPDevicePlatformEvent.h similarity index 100% rename from src/platform/EFR32/CHIPDevicePlatformEvent.h rename to src/platform/silabs/CHIPDevicePlatformEvent.h diff --git a/src/platform/EFR32/CHIPMem-Platform.cpp b/src/platform/silabs/CHIPMem-Platform.cpp similarity index 100% rename from src/platform/EFR32/CHIPMem-Platform.cpp rename to src/platform/silabs/CHIPMem-Platform.cpp diff --git a/src/platform/EFR32/CHIPPlatformConfig.h b/src/platform/silabs/CHIPPlatformConfig.h similarity index 100% rename from src/platform/EFR32/CHIPPlatformConfig.h rename to src/platform/silabs/CHIPPlatformConfig.h diff --git a/src/platform/EFR32/ConfigurationManagerImpl.h b/src/platform/silabs/ConfigurationManagerImpl.h similarity index 98% rename from src/platform/EFR32/ConfigurationManagerImpl.h rename to src/platform/silabs/ConfigurationManagerImpl.h index 2f40d8d260a363..7c47e98ab05c86 100644 --- a/src/platform/EFR32/ConfigurationManagerImpl.h +++ b/src/platform/silabs/ConfigurationManagerImpl.h @@ -26,7 +26,7 @@ #include -#include +#include namespace chip { namespace DeviceLayer { diff --git a/src/platform/EFR32/ConnectivityManagerImpl.h b/src/platform/silabs/ConnectivityManagerImpl.h similarity index 100% rename from src/platform/EFR32/ConnectivityManagerImpl.h rename to src/platform/silabs/ConnectivityManagerImpl.h diff --git a/src/platform/EFR32/ConnectivityManagerImpl_WIFI.cpp b/src/platform/silabs/ConnectivityManagerImpl_WIFI.cpp similarity index 99% rename from src/platform/EFR32/ConnectivityManagerImpl_WIFI.cpp rename to src/platform/silabs/ConnectivityManagerImpl_WIFI.cpp index 45b8b744cdd374..7bb0741b83d1a6 100644 --- a/src/platform/EFR32/ConnectivityManagerImpl_WIFI.cpp +++ b/src/platform/silabs/ConnectivityManagerImpl_WIFI.cpp @@ -21,8 +21,8 @@ #include #include #include -#include #include +#include #include #include diff --git a/src/platform/EFR32/DiagnosticDataProviderImpl.cpp b/src/platform/silabs/DiagnosticDataProviderImpl.cpp similarity index 99% rename from src/platform/EFR32/DiagnosticDataProviderImpl.cpp rename to src/platform/silabs/DiagnosticDataProviderImpl.cpp index 31858125a0665b..b1c548ba7eb3fb 100644 --- a/src/platform/EFR32/DiagnosticDataProviderImpl.cpp +++ b/src/platform/silabs/DiagnosticDataProviderImpl.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #if CHIP_DEVICE_CONFIG_ENABLE_THREAD #include #endif diff --git a/src/platform/EFR32/DiagnosticDataProviderImpl.h b/src/platform/silabs/DiagnosticDataProviderImpl.h similarity index 100% rename from src/platform/EFR32/DiagnosticDataProviderImpl.h rename to src/platform/silabs/DiagnosticDataProviderImpl.h diff --git a/src/platform/EFR32/BLEManagerImpl.cpp b/src/platform/silabs/EFR32/BLEManagerImpl.cpp similarity index 100% rename from src/platform/EFR32/BLEManagerImpl.cpp rename to src/platform/silabs/EFR32/BLEManagerImpl.cpp diff --git a/src/platform/EFR32/BUILD.gn b/src/platform/silabs/EFR32/BUILD.gn similarity index 63% rename from src/platform/EFR32/BUILD.gn rename to src/platform/silabs/EFR32/BUILD.gn index 239dcc5d1d5b4f..546fe7a2bed29b 100644 --- a/src/platform/EFR32/BUILD.gn +++ b/src/platform/silabs/EFR32/BUILD.gn @@ -20,6 +20,8 @@ import("${chip_root}/src/platform/device.gni") import("${chip_root}/build/chip/buildconfig_header.gni") import("${chip_root}/src/crypto/crypto.gni") +silabs_platform_dir = "${chip_root}/src/platform/silabs" + assert(chip_device_platform == "efr32") if (chip_enable_openthread) { @@ -32,29 +34,29 @@ if (chip_crypto == "platform") { static_library("EFR32") { sources = [ - "../FreeRTOS/SystemTimeSupport.cpp", - "../SingletonConfigurationManager.cpp", + "${silabs_platform_dir}/BLEManagerImpl.h", + "${silabs_platform_dir}/BlePlatformConfig.h", + "${silabs_platform_dir}/CHIPDevicePlatformConfig.h", + "${silabs_platform_dir}/CHIPDevicePlatformEvent.h", + "${silabs_platform_dir}/CHIPMem-Platform.cpp", + "${silabs_platform_dir}/CHIPPlatformConfig.h", + "${silabs_platform_dir}/ConfigurationManagerImpl.h", + "${silabs_platform_dir}/ConnectivityManagerImpl.h", + "${silabs_platform_dir}/DiagnosticDataProviderImpl.cpp", + "${silabs_platform_dir}/DiagnosticDataProviderImpl.h", + "${silabs_platform_dir}/EFR32Config.cpp", + "${silabs_platform_dir}/EFR32Config.h", + "${silabs_platform_dir}/InetPlatformConfig.h", + "${silabs_platform_dir}/KeyValueStoreManagerImpl.h", + "${silabs_platform_dir}/Logging.cpp", + "${silabs_platform_dir}/PlatformManagerImpl.h", + "${silabs_platform_dir}/SystemPlatformConfig.h", + "../../FreeRTOS/SystemTimeSupport.cpp", + "../../SingletonConfigurationManager.cpp", "BLEManagerImpl.cpp", - "BLEManagerImpl.h", - "BlePlatformConfig.h", - "CHIPDevicePlatformConfig.h", - "CHIPDevicePlatformEvent.h", - "CHIPMem-Platform.cpp", - "CHIPPlatformConfig.h", "ConfigurationManagerImpl.cpp", - "ConfigurationManagerImpl.h", - "ConnectivityManagerImpl.h", - "DiagnosticDataProviderImpl.cpp", - "DiagnosticDataProviderImpl.h", - "EFR32Config.cpp", - "EFR32Config.h", - "InetPlatformConfig.h", "KeyValueStoreManagerImpl.cpp", - "KeyValueStoreManagerImpl.h", - "Logging.cpp", "PlatformManagerImpl.cpp", - "PlatformManagerImpl.h", - "SystemPlatformConfig.h", ] if (chip_enable_ota_requestor) { @@ -97,14 +99,14 @@ static_library("EFR32") { deps += [ "${chip_root}/third_party/openthread:openthread_cli" ] sources += [ - "../OpenThread/OpenThreadUtils.cpp", + "${silabs_platform_dir}/ThreadStackManagerImpl.h", + "../../OpenThread/OpenThreadUtils.cpp", "ConnectivityManagerImpl.cpp", "ThreadStackManagerImpl.cpp", - "ThreadStackManagerImpl.h", ] if (chip_mdns == "platform") { - sources += [ "../OpenThread/DnssdImpl.cpp" ] + sources += [ "../../OpenThread/DnssdImpl.cpp" ] deps += [ "${chip_root}/src/lib/dnssd:platform_header" ] } @@ -115,9 +117,9 @@ static_library("EFR32") { if (chip_enable_wifi) { sources += [ - "ConnectivityManagerImpl_WIFI.cpp", - "NetworkCommissioningWiFiDriver.cpp", - "NetworkCommissioningWiFiDriver.h", + "${silabs_platform_dir}/ConnectivityManagerImpl_WIFI.cpp", + "${silabs_platform_dir}/NetworkCommissioningWiFiDriver.cpp", + "${silabs_platform_dir}/NetworkCommissioningWiFiDriver.h", ] } } diff --git a/src/platform/EFR32/CHIPCryptoPALPsaEfr32.cpp b/src/platform/silabs/EFR32/CHIPCryptoPALPsaEfr32.cpp similarity index 100% rename from src/platform/EFR32/CHIPCryptoPALPsaEfr32.cpp rename to src/platform/silabs/EFR32/CHIPCryptoPALPsaEfr32.cpp diff --git a/src/platform/EFR32/ConfigurationManagerImpl.cpp b/src/platform/silabs/EFR32/ConfigurationManagerImpl.cpp similarity index 99% rename from src/platform/EFR32/ConfigurationManagerImpl.cpp rename to src/platform/silabs/EFR32/ConfigurationManagerImpl.cpp index 0dd8170da5d3b5..5dc4be65853829 100644 --- a/src/platform/EFR32/ConfigurationManagerImpl.cpp +++ b/src/platform/silabs/EFR32/ConfigurationManagerImpl.cpp @@ -28,7 +28,7 @@ #include #include -#include +#include #include "em_rmu.h" diff --git a/src/platform/EFR32/ConnectivityManagerImpl.cpp b/src/platform/silabs/EFR32/ConnectivityManagerImpl.cpp similarity index 100% rename from src/platform/EFR32/ConnectivityManagerImpl.cpp rename to src/platform/silabs/EFR32/ConnectivityManagerImpl.cpp diff --git a/src/platform/EFR32/Efr32OpaqueKeypair.h b/src/platform/silabs/EFR32/Efr32OpaqueKeypair.h similarity index 100% rename from src/platform/EFR32/Efr32OpaqueKeypair.h rename to src/platform/silabs/EFR32/Efr32OpaqueKeypair.h diff --git a/src/platform/EFR32/Efr32PsaOpaqueKeypair.cpp b/src/platform/silabs/EFR32/Efr32PsaOpaqueKeypair.cpp similarity index 100% rename from src/platform/EFR32/Efr32PsaOpaqueKeypair.cpp rename to src/platform/silabs/EFR32/Efr32PsaOpaqueKeypair.cpp diff --git a/src/platform/EFR32/Efr32PsaOperationalKeystore.cpp b/src/platform/silabs/EFR32/Efr32PsaOperationalKeystore.cpp similarity index 99% rename from src/platform/EFR32/Efr32PsaOperationalKeystore.cpp rename to src/platform/silabs/EFR32/Efr32PsaOperationalKeystore.cpp index de983e247e6782..411db046bc924d 100644 --- a/src/platform/EFR32/Efr32PsaOperationalKeystore.cpp +++ b/src/platform/silabs/EFR32/Efr32PsaOperationalKeystore.cpp @@ -24,8 +24,8 @@ #include #include -#include "EFR32Config.h" #include "Efr32OpaqueKeypair.h" +#include namespace chip { namespace DeviceLayer { diff --git a/src/platform/EFR32/Efr32PsaOperationalKeystore.h b/src/platform/silabs/EFR32/Efr32PsaOperationalKeystore.h similarity index 100% rename from src/platform/EFR32/Efr32PsaOperationalKeystore.h rename to src/platform/silabs/EFR32/Efr32PsaOperationalKeystore.h diff --git a/src/platform/EFR32/KeyValueStoreManagerImpl.cpp b/src/platform/silabs/EFR32/KeyValueStoreManagerImpl.cpp similarity index 99% rename from src/platform/EFR32/KeyValueStoreManagerImpl.cpp rename to src/platform/silabs/EFR32/KeyValueStoreManagerImpl.cpp index a7f75af4006592..05b3acf122a43a 100644 --- a/src/platform/EFR32/KeyValueStoreManagerImpl.cpp +++ b/src/platform/silabs/EFR32/KeyValueStoreManagerImpl.cpp @@ -24,8 +24,8 @@ #include #include #include -#include #include +#include #include #include diff --git a/src/platform/EFR32/OTAImageProcessorImpl.cpp b/src/platform/silabs/EFR32/OTAImageProcessorImpl.cpp similarity index 99% rename from src/platform/EFR32/OTAImageProcessorImpl.cpp rename to src/platform/silabs/EFR32/OTAImageProcessorImpl.cpp index 70b1349ce378b6..49fd73d4c7b3ba 100644 --- a/src/platform/EFR32/OTAImageProcessorImpl.cpp +++ b/src/platform/silabs/EFR32/OTAImageProcessorImpl.cpp @@ -25,7 +25,7 @@ extern "C" { #include "em_bus.h" // For CORE_CRITICAL_SECTION } -#include "EFR32Config.h" +#include /// No error, operation OK #define SL_BOOTLOADER_OK 0L diff --git a/src/platform/EFR32/OTAImageProcessorImpl.h b/src/platform/silabs/EFR32/OTAImageProcessorImpl.h similarity index 100% rename from src/platform/EFR32/OTAImageProcessorImpl.h rename to src/platform/silabs/EFR32/OTAImageProcessorImpl.h diff --git a/src/platform/EFR32/PlatformManagerImpl.cpp b/src/platform/silabs/EFR32/PlatformManagerImpl.cpp similarity index 99% rename from src/platform/EFR32/PlatformManagerImpl.cpp rename to src/platform/silabs/EFR32/PlatformManagerImpl.cpp index 8d5acfba621c95..626ea16dc26fe2 100644 --- a/src/platform/EFR32/PlatformManagerImpl.cpp +++ b/src/platform/silabs/EFR32/PlatformManagerImpl.cpp @@ -24,11 +24,11 @@ /* this file behaves like a config.h, comes first */ #include -#include #include #include #include #include +#include #if CHIP_SYSTEM_CONFIG_USE_LWIP #include diff --git a/src/platform/EFR32/ThreadStackManagerImpl.cpp b/src/platform/silabs/EFR32/ThreadStackManagerImpl.cpp similarity index 100% rename from src/platform/EFR32/ThreadStackManagerImpl.cpp rename to src/platform/silabs/EFR32/ThreadStackManagerImpl.cpp diff --git a/src/platform/EFR32/args.gni b/src/platform/silabs/EFR32/args.gni similarity index 90% rename from src/platform/EFR32/args.gni rename to src/platform/silabs/EFR32/args.gni index bc075e6eba5c30..6e7ac8dcb49e51 100644 --- a/src/platform/EFR32/args.gni +++ b/src/platform/silabs/EFR32/args.gni @@ -16,7 +16,7 @@ import("//build_overrides/chip.gni") import("//build_overrides/efr32_sdk.gni") import("//build_overrides/pigweed.gni") -import("${chip_root}/examples/platform/efr32/args.gni") +import("${chip_root}/examples/platform/silabs/efr32/args.gni") import("${chip_root}/src/crypto/crypto.gni") # ARM architecture flags will be set based on silabs_family. @@ -44,14 +44,14 @@ chip_with_lwip = false chip_build_tests = false # Transitional CommissionableDataProvider not used anymore -# examples/platform/efr32/EFR32DeviceDataProvider is now used. +# examples/platform/silabs/efr32/EFR32DeviceDataProvider is now used. chip_use_transitional_commissionable_data_provider = false openthread_root = "${chip_root}/third_party/openthread/ot-efr32/openthread" openthread_core_config_platform_check_file = "openthread-core-efr32-config-check.h" openthread_project_core_config_file = "OpenThreadConfig.h" -openthread_core_config_deps = [ "${chip_root}/examples/platform/efr32:openthread_core_config_efr32_chip_examples" ] +openthread_core_config_deps = [ "${chip_root}/examples/platform/silabs/efr32:openthread_core_config_efr32_chip_examples" ] chip_config_memory_management = "platform" diff --git a/src/platform/EFR32/efr32-chip-mbedtls-config.h b/src/platform/silabs/EFR32/efr32-chip-mbedtls-config.h similarity index 100% rename from src/platform/EFR32/efr32-chip-mbedtls-config.h rename to src/platform/silabs/EFR32/efr32-chip-mbedtls-config.h diff --git a/src/platform/EFR32/efr32-mbedtls-psa-crypto-config.h b/src/platform/silabs/EFR32/efr32-mbedtls-psa-crypto-config.h similarity index 100% rename from src/platform/EFR32/efr32-mbedtls-psa-crypto-config.h rename to src/platform/silabs/EFR32/efr32-mbedtls-psa-crypto-config.h diff --git a/src/platform/EFR32/wifi/dhcp_client.cpp b/src/platform/silabs/EFR32/wifi/dhcp_client.cpp similarity index 100% rename from src/platform/EFR32/wifi/dhcp_client.cpp rename to src/platform/silabs/EFR32/wifi/dhcp_client.cpp diff --git a/src/platform/EFR32/wifi/dhcp_client.h b/src/platform/silabs/EFR32/wifi/dhcp_client.h similarity index 100% rename from src/platform/EFR32/wifi/dhcp_client.h rename to src/platform/silabs/EFR32/wifi/dhcp_client.h diff --git a/src/platform/EFR32/wifi/ethernetif.cpp b/src/platform/silabs/EFR32/wifi/ethernetif.cpp similarity index 100% rename from src/platform/EFR32/wifi/ethernetif.cpp rename to src/platform/silabs/EFR32/wifi/ethernetif.cpp diff --git a/src/platform/EFR32/wifi/ethernetif.h b/src/platform/silabs/EFR32/wifi/ethernetif.h similarity index 100% rename from src/platform/EFR32/wifi/ethernetif.h rename to src/platform/silabs/EFR32/wifi/ethernetif.h diff --git a/src/platform/EFR32/wifi/lwip_netif.cpp b/src/platform/silabs/EFR32/wifi/lwip_netif.cpp similarity index 100% rename from src/platform/EFR32/wifi/lwip_netif.cpp rename to src/platform/silabs/EFR32/wifi/lwip_netif.cpp diff --git a/src/platform/EFR32/wifi/wfx_host_events.h b/src/platform/silabs/EFR32/wifi/wfx_host_events.h similarity index 100% rename from src/platform/EFR32/wifi/wfx_host_events.h rename to src/platform/silabs/EFR32/wifi/wfx_host_events.h diff --git a/src/platform/EFR32/wifi/wfx_msgs.h b/src/platform/silabs/EFR32/wifi/wfx_msgs.h similarity index 100% rename from src/platform/EFR32/wifi/wfx_msgs.h rename to src/platform/silabs/EFR32/wifi/wfx_msgs.h diff --git a/src/platform/EFR32/wifi/wfx_notify.cpp b/src/platform/silabs/EFR32/wifi/wfx_notify.cpp similarity index 100% rename from src/platform/EFR32/wifi/wfx_notify.cpp rename to src/platform/silabs/EFR32/wifi/wfx_notify.cpp diff --git a/src/platform/EFR32/wifi/wifi_config.h b/src/platform/silabs/EFR32/wifi/wifi_config.h similarity index 100% rename from src/platform/EFR32/wifi/wifi_config.h rename to src/platform/silabs/EFR32/wifi/wifi_config.h diff --git a/src/platform/EFR32/wifi_args.gni b/src/platform/silabs/EFR32/wifi_args.gni similarity index 96% rename from src/platform/EFR32/wifi_args.gni rename to src/platform/silabs/EFR32/wifi_args.gni index 3c84e0e7519205..73a6613ecdcb4a 100644 --- a/src/platform/EFR32/wifi_args.gni +++ b/src/platform/silabs/EFR32/wifi_args.gni @@ -17,7 +17,7 @@ import("//build_overrides/chip.gni") import("//build_overrides/efr32_sdk.gni") import("//build_overrides/pigweed.gni") -import("${chip_root}/examples/platform/efr32/args.gni") +import("${chip_root}/examples/platform/silabs/efr32/args.gni") import("${chip_root}/src/crypto/crypto.gni") # ARM architecture flags will be set based on silabs_family. diff --git a/src/platform/EFR32/EFR32Config.cpp b/src/platform/silabs/EFR32Config.cpp similarity index 99% rename from src/platform/EFR32/EFR32Config.cpp rename to src/platform/silabs/EFR32Config.cpp index ff6a34c23485f1..82751b36f2077c 100644 --- a/src/platform/EFR32/EFR32Config.cpp +++ b/src/platform/silabs/EFR32Config.cpp @@ -24,7 +24,7 @@ /* this file behaves like a config.h, comes first */ #include -#include +#include #include #include diff --git a/src/platform/EFR32/EFR32Config.h b/src/platform/silabs/EFR32Config.h similarity index 100% rename from src/platform/EFR32/EFR32Config.h rename to src/platform/silabs/EFR32Config.h diff --git a/src/platform/EFR32/InetPlatformConfig.h b/src/platform/silabs/InetPlatformConfig.h similarity index 100% rename from src/platform/EFR32/InetPlatformConfig.h rename to src/platform/silabs/InetPlatformConfig.h diff --git a/src/platform/EFR32/KeyValueStoreManagerImpl.h b/src/platform/silabs/KeyValueStoreManagerImpl.h similarity index 100% rename from src/platform/EFR32/KeyValueStoreManagerImpl.h rename to src/platform/silabs/KeyValueStoreManagerImpl.h diff --git a/src/platform/EFR32/Logging.cpp b/src/platform/silabs/Logging.cpp similarity index 100% rename from src/platform/EFR32/Logging.cpp rename to src/platform/silabs/Logging.cpp diff --git a/src/platform/EFR32/NetworkCommissioningWiFiDriver.cpp b/src/platform/silabs/NetworkCommissioningWiFiDriver.cpp similarity index 99% rename from src/platform/EFR32/NetworkCommissioningWiFiDriver.cpp rename to src/platform/silabs/NetworkCommissioningWiFiDriver.cpp index 21de35eca234a6..55ae4d1fe5751e 100644 --- a/src/platform/EFR32/NetworkCommissioningWiFiDriver.cpp +++ b/src/platform/silabs/NetworkCommissioningWiFiDriver.cpp @@ -18,8 +18,8 @@ #include #include #include -#include -#include +#include +#include #include diff --git a/src/platform/EFR32/NetworkCommissioningWiFiDriver.h b/src/platform/silabs/NetworkCommissioningWiFiDriver.h similarity index 100% rename from src/platform/EFR32/NetworkCommissioningWiFiDriver.h rename to src/platform/silabs/NetworkCommissioningWiFiDriver.h diff --git a/src/platform/EFR32/PlatformManagerImpl.h b/src/platform/silabs/PlatformManagerImpl.h similarity index 100% rename from src/platform/EFR32/PlatformManagerImpl.h rename to src/platform/silabs/PlatformManagerImpl.h diff --git a/src/platform/EFR32/SystemPlatformConfig.h b/src/platform/silabs/SystemPlatformConfig.h similarity index 100% rename from src/platform/EFR32/SystemPlatformConfig.h rename to src/platform/silabs/SystemPlatformConfig.h diff --git a/src/platform/EFR32/ThreadStackManagerImpl.h b/src/platform/silabs/ThreadStackManagerImpl.h similarity index 100% rename from src/platform/EFR32/ThreadStackManagerImpl.h rename to src/platform/silabs/ThreadStackManagerImpl.h diff --git a/src/platform/EFR32/WarmPlatformConfig.h b/src/platform/silabs/WarmPlatformConfig.h similarity index 100% rename from src/platform/EFR32/WarmPlatformConfig.h rename to src/platform/silabs/WarmPlatformConfig.h diff --git a/src/test_driver/efr32/BUILD.gn b/src/test_driver/efr32/BUILD.gn index 1fcf1e12432930..4cdb8868f1ab76 100644 --- a/src/test_driver/efr32/BUILD.gn +++ b/src/test_driver/efr32/BUILD.gn @@ -31,7 +31,8 @@ import("//build_overrides/nlunit_test.gni") assert(current_os == "freertos") efr32_project_dir = "${chip_root}/src/test_driver/efr32" -examples_plat_dir = "${chip_root}/examples/platform/efr32" +examples_plat_dir = "${chip_root}/examples/platform/silabs/efr32" +examples_common_plat_dir = "${chip_root}/examples/platform/silabs" pw_proto_library("nl_test_service") { sources = [ "${efr32_project_dir}/proto/nl_test.proto" ] @@ -48,9 +49,10 @@ efr32_sdk("sdk") { ] include_dirs = [ - "${chip_root}/src/platform/EFR32", + "${chip_root}/src/platform/silabs/EFR32", "${efr32_project_dir}/include", "${examples_plat_dir}", + "${examples_common_plat_dir}", ] defines = [ @@ -70,8 +72,8 @@ efr32_executable("efr32_device_tests") { sources = [ "${chip_root}/examples/common/pigweed/RpcService.cpp", "${chip_root}/examples/common/pigweed/efr32/PigweedLoggerMutex.cpp", - "${examples_plat_dir}/PigweedLogger.cpp", - "${examples_plat_dir}/heap_4_silabs.c", + "${examples_common_plat_dir}/PigweedLogger.cpp", + "${examples_common_plat_dir}/heap_4_silabs.c", "${examples_plat_dir}/init_efrPlatform.cpp", "src/main.cpp", ] diff --git a/src/test_driver/efr32/args.gni b/src/test_driver/efr32/args.gni index 8db9c5e87eb212..a62432284c74a2 100644 --- a/src/test_driver/efr32/args.gni +++ b/src/test_driver/efr32/args.gni @@ -15,8 +15,8 @@ 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/efr32/args.gni") -import("${chip_root}/src/platform/EFR32/args.gni") +import("${chip_root}/examples/platform/silabs/efr32/args.gni") +import("${chip_root}/src/platform/silabs/EFR32/args.gni") efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain") diff --git a/third_party/silabs/efr32_sdk.gni b/third_party/silabs/efr32_sdk.gni index 493caaf4de447b..eec46000392061 100644 --- a/third_party/silabs/efr32_sdk.gni +++ b/third_party/silabs/efr32_sdk.gni @@ -397,8 +397,8 @@ template("efr32_sdk") { # system to recompile mbedTLS (= the SDK) when the mbedTLS config gets # edited. sources = [ - "${chip_root}/src/platform/EFR32/efr32-chip-mbedtls-config.h", - "${chip_root}/src/platform/EFR32/efr32-mbedtls-psa-crypto-config.h", + "${chip_root}/src/platform/silabs/EFR32/efr32-chip-mbedtls-config.h", + "${chip_root}/src/platform/silabs/EFR32/efr32-mbedtls-psa-crypto-config.h", ] public_deps = [ "${chip_root}/src/crypto:crypto_buildconfig" ]