From 92515f1416bbb6b5b48347f2a60a63bb80c848b5 Mon Sep 17 00:00:00 2001 From: lpbeliveau-silabs Date: Tue, 16 Jul 2024 16:11:21 -0400 Subject: [PATCH] Reverted styling and applied comments --- .../efr32mg24/BRD2601B/autogen/gatt_db.h | 16 ++--- .../BRD2601B/autogen/sl_component_catalog.h | 2 + .../BRD2601B/autogen/sl_event_handler.h | 1 - .../autogen/sl_simple_led_instances.h | 4 +- .../autogen/sli_mbedtls_config_autogen.h | 7 ++ .../autogen/sli_psa_builtin_config_autogen.h | 1 + .../BRD2601B/autogen/sli_psa_config_autogen.h | 36 +++++----- .../BRD2601B/config/psa_crypto_config.h | 16 ++--- .../config/sl_openthread_ble_cli_config.h | 36 ---------- .../efr32mg24/BRD2703A/autogen/gatt_db.h | 16 ++--- .../BRD2703A/autogen/sl_component_catalog.h | 1 - .../BRD2703A/autogen/sl_event_handler.c | 2 - .../BRD2703A/autogen/sl_event_handler.h | 1 - .../BRD2703A/autogen/sl_i2cspm_init.c | 64 ----------------- .../BRD2703A/autogen/sl_i2cspm_instances.h | 52 -------------- .../autogen/sl_simple_led_instances.h | 4 +- .../autogen/sli_mbedtls_config_autogen.h | 7 ++ .../autogen/sli_psa_builtin_config_autogen.h | 1 + .../BRD2703A/autogen/sli_psa_config_autogen.h | 36 +++++----- .../BRD2703A/config/psa_crypto_config.h | 16 ++--- .../BRD2703A/config/sl_i2cspm_sensor_config.h | 69 ------------------- .../sl_mx25_flash_shutdown_usart_config.h | 61 ---------------- .../config/sl_openthread_ble_cli_config.h | 36 ---------- .../efr32mg24/BRD4186A/autogen/gatt_db.h | 16 ++--- .../BRD4186A/autogen/sl_event_handler.h | 1 - .../autogen/sl_simple_led_instances.h | 4 +- .../autogen/sli_mbedtls_config_autogen.h | 5 ++ .../autogen/sli_psa_builtin_config_autogen.h | 1 + .../BRD4186A/autogen/sli_psa_config_autogen.h | 36 +++++----- .../BRD4186A/config/psa_crypto_config.h | 16 ++--- .../config/sl_openthread_ble_cli_config.h | 36 ---------- .../efr32mg24/BRD4186C/autogen/gatt_db.h | 16 ++--- .../BRD4186C/autogen/sl_event_handler.h | 1 - .../autogen/sl_simple_led_instances.h | 4 +- .../autogen/sli_mbedtls_config_autogen.h | 5 ++ .../autogen/sli_psa_builtin_config_autogen.h | 1 + .../BRD4186C/autogen/sli_psa_config_autogen.h | 36 +++++----- .../BRD4186C/config/psa_crypto_config.h | 16 ++--- .../config/sl_openthread_ble_cli_config.h | 36 ---------- .../efr32mg24/BRD4187A/autogen/gatt_db.h | 16 ++--- .../BRD4187A/autogen/sl_event_handler.h | 1 - .../autogen/sli_mbedtls_config_autogen.h | 5 ++ .../autogen/sli_psa_builtin_config_autogen.h | 1 + .../BRD4187A/autogen/sli_psa_config_autogen.h | 36 +++++----- .../BRD4187A/config/psa_crypto_config.h | 20 +++--- .../config/sl_openthread_ble_cli_config.h | 36 ---------- .../efr32mg24/BRD4187C/autogen/gatt_db.h | 16 ++--- .../BRD4187C/autogen/sl_event_handler.h | 1 - .../autogen/sl_simple_led_instances.h | 4 +- .../autogen/sli_mbedtls_config_autogen.h | 5 ++ .../autogen/sli_psa_builtin_config_autogen.h | 1 + .../BRD4187C/autogen/sli_psa_config_autogen.h | 36 +++++----- .../BRD4187C/config/nvm3_default_config.h | 8 +-- .../BRD4187C/config/psa_crypto_config.h | 16 ++--- .../BRD4187C/config/sl_bt_rtos_config.h | 14 ++-- .../BRD4187C/config/sl_mbedtls_config.h | 27 ++++---- .../config/sl_memory_manager_region_config.h | 2 +- .../efr32mg26/BRD2608A/autogen/gatt_db.h | 7 ++ .../BRD2608A/autogen/sl_event_handler.h | 1 - .../autogen/sl_simple_led_instances.h | 4 +- .../autogen/sli_mbedtls_config_autogen.h | 5 ++ .../autogen/sli_psa_builtin_config_autogen.h | 1 + .../BRD2608A/autogen/sli_psa_config_autogen.h | 36 +++++----- .../BRD2608A/config/psa_crypto_config.h | 20 +++--- .../BRD2608A/config/sl_bt_rtos_config.h | 6 +- .../config/sl_device_init_dcdc_config.h | 58 ---------------- .../efr32mg26/BRD4116A/autogen/gatt_db.h | 16 ++--- .../BRD4116A/autogen/sl_event_handler.h | 1 - .../autogen/sl_simple_led_instances.h | 4 +- .../autogen/sli_mbedtls_config_autogen.h | 5 ++ .../autogen/sli_psa_builtin_config_autogen.h | 1 + .../BRD4116A/autogen/sli_psa_config_autogen.h | 36 +++++----- .../BRD4116A/config/psa_crypto_config.h | 20 +++--- .../efr32mg26/BRD4117A/autogen/gatt_db.h | 16 ++--- .../BRD4117A/autogen/sl_event_handler.h | 1 - .../autogen/sl_simple_led_instances.h | 7 ++ .../autogen/sli_mbedtls_config_autogen.h | 5 ++ .../autogen/sli_psa_builtin_config_autogen.h | 1 + .../BRD4117A/autogen/sli_psa_config_autogen.h | 36 +++++----- .../BRD4117A/config/psa_crypto_config.h | 20 +++--- .../BRD4117A/config/sl_bt_rtos_config.h | 6 +- .../efr32mg26/BRD4118A/autogen/gatt_db.h | 16 ++--- .../BRD4118A/autogen/sl_event_handler.h | 1 - .../autogen/sl_simple_led_instances.h | 4 +- .../autogen/sli_mbedtls_config_autogen.h | 5 ++ .../autogen/sli_psa_builtin_config_autogen.h | 1 + .../BRD4118A/autogen/sli_psa_config_autogen.h | 36 +++++----- .../BRD4118A/config/psa_crypto_config.h | 20 +++--- 88 files changed, 470 insertions(+), 886 deletions(-) delete mode 100644 matter/efr32/efr32mg24/BRD2601B/config/sl_openthread_ble_cli_config.h delete mode 100644 matter/efr32/efr32mg24/BRD2703A/autogen/sl_i2cspm_init.c delete mode 100644 matter/efr32/efr32mg24/BRD2703A/autogen/sl_i2cspm_instances.h delete mode 100644 matter/efr32/efr32mg24/BRD2703A/config/sl_i2cspm_sensor_config.h delete mode 100644 matter/efr32/efr32mg24/BRD2703A/config/sl_mx25_flash_shutdown_usart_config.h delete mode 100644 matter/efr32/efr32mg24/BRD2703A/config/sl_openthread_ble_cli_config.h delete mode 100644 matter/efr32/efr32mg24/BRD4186A/config/sl_openthread_ble_cli_config.h delete mode 100644 matter/efr32/efr32mg24/BRD4186C/config/sl_openthread_ble_cli_config.h delete mode 100644 matter/efr32/efr32mg24/BRD4187A/config/sl_openthread_ble_cli_config.h delete mode 100644 matter/efr32/efr32mg26/BRD2608A/config/sl_device_init_dcdc_config.h diff --git a/matter/efr32/efr32mg24/BRD2601B/autogen/gatt_db.h b/matter/efr32/efr32mg24/BRD2601B/autogen/gatt_db.h index 3e608dd00b..bee94f4ef7 100644 --- a/matter/efr32/efr32mg24/BRD2601B/autogen/gatt_db.h +++ b/matter/efr32/efr32mg24/BRD2601B/autogen/gatt_db.h @@ -13,14 +13,14 @@ extern "C" { extern const sli_bt_gattdb_t gattdb; -#define gattdb_generic_attribute 1 -#define gattdb_service_changed_char 3 -#define gattdb_database_hash 6 -#define gattdb_client_support_features 8 -#define gattdb_device_name 11 -#define gattdb_CHIPoBLEChar_Rx 23 -#define gattdb_CHIPoBLEChar_Tx 25 -#define gattdb_CHIPoBLEChar_C3 28 +#define gattdb_generic_attribute 1 +#define gattdb_service_changed_char 3 +#define gattdb_database_hash 6 +#define gattdb_client_support_features 8 +#define gattdb_device_name 11 +#define gattdb_CHIPoBLEChar_Rx 23 +#define gattdb_CHIPoBLEChar_Tx 25 +#define gattdb_CHIPoBLEChar_C3 28 #if __cplusplus } diff --git a/matter/efr32/efr32mg24/BRD2601B/autogen/sl_component_catalog.h b/matter/efr32/efr32mg24/BRD2601B/autogen/sl_component_catalog.h index e557e8266d..9559258cfa 100644 --- a/matter/efr32/efr32mg24/BRD2601B/autogen/sl_component_catalog.h +++ b/matter/efr32/efr32mg24/BRD2601B/autogen/sl_component_catalog.h @@ -57,6 +57,8 @@ #define SL_CATALOG_SIMPLE_LED_LED1_PRESENT #define SL_CATALOG_SLEEPTIMER_PRESENT #define SL_CATALOG_SLI_PROTOCOL_CRYPTO_PRESENT +#if defined(CONFIG_ENABLE_UART) #define SL_CATALOG_UARTDRV_EUSART_PRESENT +#endif #endif // SL_COMPONENT_CATALOG_H diff --git a/matter/efr32/efr32mg24/BRD2601B/autogen/sl_event_handler.h b/matter/efr32/efr32mg24/BRD2601B/autogen/sl_event_handler.h index ef8751b80f..2333539d21 100644 --- a/matter/efr32/efr32mg24/BRD2601B/autogen/sl_event_handler.h +++ b/matter/efr32/efr32mg24/BRD2601B/autogen/sl_event_handler.h @@ -7,6 +7,5 @@ void sl_driver_init(void); void sl_service_init(void); void sl_stack_init(void); void sl_internal_app_init(void); -void sl_iostream_init_instances(void); #endif // SL_EVENT_HANDLER_H diff --git a/matter/efr32/efr32mg24/BRD2601B/autogen/sl_simple_led_instances.h b/matter/efr32/efr32mg24/BRD2601B/autogen/sl_simple_led_instances.h index 808c6a721f..928fbe942a 100644 --- a/matter/efr32/efr32mg24/BRD2601B/autogen/sl_simple_led_instances.h +++ b/matter/efr32/efr32mg24/BRD2601B/autogen/sl_simple_led_instances.h @@ -1,4 +1,4 @@ -/***************************************************************************/ /** +/***************************************************************************//** * @file * @brief LED Driver Instances ******************************************************************************* @@ -42,7 +42,7 @@ extern const sl_led_t sl_led_led1; extern const sl_led_t *sl_simple_led_array[]; -#define SL_SIMPLE_LED_COUNT 2 +#define SL_SIMPLE_LED_COUNT 2 #define SL_SIMPLE_LED_INSTANCE(n) (sl_simple_led_array[n]) void sl_simple_led_init_instances(void); diff --git a/matter/efr32/efr32mg24/BRD2601B/autogen/sli_mbedtls_config_autogen.h b/matter/efr32/efr32mg24/BRD2601B/autogen/sli_mbedtls_config_autogen.h index 164bff9db4..1129d41c3c 100644 --- a/matter/efr32/efr32mg24/BRD2601B/autogen/sli_mbedtls_config_autogen.h +++ b/matter/efr32/efr32mg24/BRD2601B/autogen/sli_mbedtls_config_autogen.h @@ -3,11 +3,13 @@ #ifndef SLI_MBEDTLS_CONFIG_AUTOGEN_H #define SLI_MBEDTLS_CONFIG_AUTOGEN_H + // Added definition check because of DIC specific configs #ifndef MBEDTLS_MPI_MAX_SIZE #define MBEDTLS_MPI_MAX_SIZE 32 #endif + #define MBEDTLS_AES_C #define MBEDTLS_ASN1_PARSE_C #define MBEDTLS_ASN1_WRITE_C @@ -43,4 +45,9 @@ #define MBEDTLS_PSA_CRYPTO_DRIVERS #define MBEDTLS_PSA_CRYPTO_STORAGE_C + + + + + #endif // SLI_MBEDTLS_CONFIG_AUTOGEN_H diff --git a/matter/efr32/efr32mg24/BRD2601B/autogen/sli_psa_builtin_config_autogen.h b/matter/efr32/efr32mg24/BRD2601B/autogen/sli_psa_builtin_config_autogen.h index 34f74fb60c..c8b70fad12 100644 --- a/matter/efr32/efr32mg24/BRD2601B/autogen/sli_psa_builtin_config_autogen.h +++ b/matter/efr32/efr32mg24/BRD2601B/autogen/sli_psa_builtin_config_autogen.h @@ -9,4 +9,5 @@ // #define MBEDTLS_PSA_BUILTIN_ALG_CMAC 1 // #define MBEDTLS_PSA_BUILTIN_ALG_PBKDF2_AES_CMAC_PRF_128 1 + #endif // SLI_PSA_BUILTIN_CONFIG_AUTOGEN_H diff --git a/matter/efr32/efr32mg24/BRD2601B/autogen/sli_psa_config_autogen.h b/matter/efr32/efr32mg24/BRD2601B/autogen/sli_psa_config_autogen.h index 038ab753c1..c2a379f438 100644 --- a/matter/efr32/efr32mg24/BRD2601B/autogen/sli_psa_config_autogen.h +++ b/matter/efr32/efr32mg24/BRD2601B/autogen/sli_psa_config_autogen.h @@ -3,25 +3,25 @@ #ifndef SLI_PSA_CONFIG_AUTOGEN_H #define SLI_PSA_CONFIG_AUTOGEN_H -#define PSA_WANT_KEY_TYPE_AES 1 -#define PSA_WANT_ALG_CCM 1 -#define PSA_WANT_ALG_ECB_NO_PADDING 1 -#define PSA_WANT_ALG_CMAC 1 -#define PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY 1 -#define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_BASIC 1 -#define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_IMPORT 1 -#define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_EXPORT 1 +#define PSA_WANT_KEY_TYPE_AES 1 +#define PSA_WANT_ALG_CCM 1 +#define PSA_WANT_ALG_ECB_NO_PADDING 1 +#define PSA_WANT_ALG_CMAC 1 +#define PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY 1 +#define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_BASIC 1 +#define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_IMPORT 1 +#define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_EXPORT 1 #define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_GENERATE 1 -#define PSA_WANT_ECC_SECP_R1_256 1 -#define PSA_WANT_ALG_ECDH 1 -#define PSA_WANT_ALG_ECDSA 1 -#define PSA_WANT_ALG_HKDF 1 -#define PSA_WANT_ALG_HMAC 1 -#define PSA_WANT_KEY_TYPE_HMAC 1 -#define PSA_WANT_ALG_PBKDF2_AES_CMAC_PRF_128 1 -#define PSA_WANT_ALG_SHA_256 1 -#define PSA_WANT_ALG_TLS12_PRF 1 -#define PSA_WANT_ALG_TLS12_PSK_TO_MS 1 +#define PSA_WANT_ECC_SECP_R1_256 1 +#define PSA_WANT_ALG_ECDH 1 +#define PSA_WANT_ALG_ECDSA 1 +#define PSA_WANT_ALG_HKDF 1 +#define PSA_WANT_ALG_HMAC 1 +#define PSA_WANT_KEY_TYPE_HMAC 1 +#define PSA_WANT_ALG_PBKDF2_AES_CMAC_PRF_128 1 +#define PSA_WANT_ALG_SHA_256 1 +#define PSA_WANT_ALG_TLS12_PRF 1 +#define PSA_WANT_ALG_TLS12_PSK_TO_MS 1 #define MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG #define MBEDTLS_PSA_KEY_SLOT_COUNT (2 + 15 + 1 + SL_PSA_KEY_USER_SLOT_COUNT) diff --git a/matter/efr32/efr32mg24/BRD2601B/config/psa_crypto_config.h b/matter/efr32/efr32mg24/BRD2601B/config/psa_crypto_config.h index cf09cf76e4..44dc70284f 100644 --- a/matter/efr32/efr32mg24/BRD2601B/config/psa_crypto_config.h +++ b/matter/efr32/efr32mg24/BRD2601B/config/psa_crypto_config.h @@ -25,7 +25,7 @@ // gracefully in case an application opens more than its declared amount of // keys, thereby precluding the stack from functioning. // Default: 4 -#define SL_PSA_KEY_USER_SLOT_COUNT (4) +#define SL_PSA_KEY_USER_SLOT_COUNT (4) // PSA Maximum User Persistent Keys Count <0-1024> // Maximum amount of keys (or other files) that can be stored persistently @@ -48,7 +48,7 @@ // and if SL_PSA_ITS_USER_MAX_FILES is changed, ITS should be cleared and // all files need to be stored again. // Default: 128 -#define SL_PSA_ITS_USER_MAX_FILES (128) +#define SL_PSA_ITS_USER_MAX_FILES (128) // Enable V1 Format Support For ITS Files <0-1> // Devices that used PSA ITS together with gecko_sdk_3.1.x or earlier @@ -105,7 +105,7 @@ // It is recommended to only use the PUF key for deriving further key // material. // Default: PSA_ALG_PBKDF2_AES_CMAC_PRF_128 -#define SL_CRYPTOACC_BUILTIN_KEY_PUF_ALG (PSA_ALG_PBKDF2_AES_CMAC_PRF_128) +#define SL_CRYPTOACC_BUILTIN_KEY_PUF_ALG (PSA_ALG_PBKDF2_AES_CMAC_PRF_128) #endif // SL_CRYPTOACC_BUILTIN_KEY_PUF_ALG // @@ -127,7 +127,7 @@ // to be included in the project. // // Default: 0 -#define SL_VSE_BUFFER_TRNG_DATA_DURING_SLEEP (0) +#define SL_VSE_BUFFER_TRNG_DATA_DURING_SLEEP (0) // Number of random words to buffer before putting the device to sleep <1-63> // This option can be used to decrease the amount of random words that @@ -152,17 +152,17 @@ // Sub-files #if defined(SLI_PSA_CONFIG_AUTOGEN_OVERRIDE_FILE) -#include SLI_PSA_CONFIG_AUTOGEN_OVERRIDE_FILE + #include SLI_PSA_CONFIG_AUTOGEN_OVERRIDE_FILE #else -#include "sli_psa_config_autogen.h" + #include "sli_psa_config_autogen.h" #endif #if defined(TFM_CONFIG_SL_SECURE_LIBRARY) -#include "sli_psa_tfm_translation.h" + #include "sli_psa_tfm_translation.h" #endif #if SL_MBEDTLS_DRIVERS_ENABLED -#include "sli_psa_acceleration.h" + #include "sli_psa_acceleration.h" #endif #include "sli_psa_builtin_config_autogen.h" diff --git a/matter/efr32/efr32mg24/BRD2601B/config/sl_openthread_ble_cli_config.h b/matter/efr32/efr32mg24/BRD2601B/config/sl_openthread_ble_cli_config.h deleted file mode 100644 index 8829fa9dab..0000000000 --- a/matter/efr32/efr32mg24/BRD2601B/config/sl_openthread_ble_cli_config.h +++ /dev/null @@ -1,36 +0,0 @@ -/***************************************************************************//** - * @file - * @brief OpenThread Bluetooth CLI configuration file. - ******************************************************************************* - * # License - * Copyright 2024 Silicon Laboratories Inc. www.silabs.com - ******************************************************************************* - * - * SPDX-License-Identifier: Zlib - * - * The licensor of this software is Silicon Laboratories Inc. - * - * This software is provided 'as-is', without any express or implied - * warranty. In no event will the authors be held liable for any damages - * arising from the use of this software. - * - * Permission is granted to anyone to use this software for any purpose, - * including commercial applications, and to alter it and redistribute it - * freely, subject to the following restrictions: - * - * 1. The origin of this software must not be misrepresented; you must not - * claim that you wrote the original software. If you use this software - * in a product, an acknowledgment in the product documentation would be - * appreciated but is not required. - * 2. Altered source versions must be plainly marked as such, and must not be - * misrepresented as being the original software. - * 3. This notice may not be removed or altered from any source distribution. - * - ******************************************************************************/ - -//-------- <<< Use Configuration Wizard in Context Menu >>> ----------------- -// -// Bluetooth CLI -#define SL_OPENTHREAD_BLE_CLI_ENABLE 1 -// -// <<< end of configuration section >>> diff --git a/matter/efr32/efr32mg24/BRD2703A/autogen/gatt_db.h b/matter/efr32/efr32mg24/BRD2703A/autogen/gatt_db.h index 3e608dd00b..bee94f4ef7 100644 --- a/matter/efr32/efr32mg24/BRD2703A/autogen/gatt_db.h +++ b/matter/efr32/efr32mg24/BRD2703A/autogen/gatt_db.h @@ -13,14 +13,14 @@ extern "C" { extern const sli_bt_gattdb_t gattdb; -#define gattdb_generic_attribute 1 -#define gattdb_service_changed_char 3 -#define gattdb_database_hash 6 -#define gattdb_client_support_features 8 -#define gattdb_device_name 11 -#define gattdb_CHIPoBLEChar_Rx 23 -#define gattdb_CHIPoBLEChar_Tx 25 -#define gattdb_CHIPoBLEChar_C3 28 +#define gattdb_generic_attribute 1 +#define gattdb_service_changed_char 3 +#define gattdb_database_hash 6 +#define gattdb_client_support_features 8 +#define gattdb_device_name 11 +#define gattdb_CHIPoBLEChar_Rx 23 +#define gattdb_CHIPoBLEChar_Tx 25 +#define gattdb_CHIPoBLEChar_C3 28 #if __cplusplus } diff --git a/matter/efr32/efr32mg24/BRD2703A/autogen/sl_component_catalog.h b/matter/efr32/efr32mg24/BRD2703A/autogen/sl_component_catalog.h index 6aa5ef81fe..d21a264ac7 100644 --- a/matter/efr32/efr32mg24/BRD2703A/autogen/sl_component_catalog.h +++ b/matter/efr32/efr32mg24/BRD2703A/autogen/sl_component_catalog.h @@ -32,7 +32,6 @@ #define SL_CATALOG_MEMORY_MANAGER_PRESENT #define SL_CATALOG_MEMORY_PROFILER_API_PRESENT #define SL_CATALOG_MPU_PRESENT -#define SL_CATALOG_MX25_FLASH_SHUTDOWN_USART_PRESENT #define SL_CATALOG_NVM3_PRESENT #define SL_CATALOG_OT_GP_INTERFACE_PRESENT #define SL_CATALOG_OPENTHREAD_STACK_PRESENT diff --git a/matter/efr32/efr32mg24/BRD2703A/autogen/sl_event_handler.c b/matter/efr32/efr32mg24/BRD2703A/autogen/sl_event_handler.c index 6ad7fcc1eb..71afae022f 100644 --- a/matter/efr32/efr32mg24/BRD2703A/autogen/sl_event_handler.c +++ b/matter/efr32/efr32mg24/BRD2703A/autogen/sl_event_handler.c @@ -18,7 +18,6 @@ #include "sl_sleeptimer.h" #include "sl_mpu.h" #include "gpiointerrupt.h" -#include "sl_i2cspm_instances.h" #include "sl_iostream_rtt.h" #include "sl_mbedtls.h" #include "nvm3_default.h" @@ -60,7 +59,6 @@ void sl_kernel_start(void) void sl_driver_init(void) { GPIOINT_Init(); - sl_i2cspm_init_instances(); sl_simple_button_init_instances(); sl_simple_led_init_instances(); #if defined(CONFIG_ENABLE_UART) diff --git a/matter/efr32/efr32mg24/BRD2703A/autogen/sl_event_handler.h b/matter/efr32/efr32mg24/BRD2703A/autogen/sl_event_handler.h index ef8751b80f..2333539d21 100644 --- a/matter/efr32/efr32mg24/BRD2703A/autogen/sl_event_handler.h +++ b/matter/efr32/efr32mg24/BRD2703A/autogen/sl_event_handler.h @@ -7,6 +7,5 @@ void sl_driver_init(void); void sl_service_init(void); void sl_stack_init(void); void sl_internal_app_init(void); -void sl_iostream_init_instances(void); #endif // SL_EVENT_HANDLER_H diff --git a/matter/efr32/efr32mg24/BRD2703A/autogen/sl_i2cspm_init.c b/matter/efr32/efr32mg24/BRD2703A/autogen/sl_i2cspm_init.c deleted file mode 100644 index 247e557d74..0000000000 --- a/matter/efr32/efr32mg24/BRD2703A/autogen/sl_i2cspm_init.c +++ /dev/null @@ -1,64 +0,0 @@ -/***************************************************************************//** - * @file - * @brief I2C simple poll-based master mode driver instance initialilization - ******************************************************************************* - * # License - * Copyright 2020 Silicon Laboratories Inc. www.silabs.com - ******************************************************************************* - * - * SPDX-License-Identifier: Zlib - * - * The licensor of this software is Silicon Laboratories Inc. - * - * This software is provided 'as-is', without any express or implied - * warranty. In no event will the authors be held liable for any damages - * arising from the use of this software. - * - * Permission is granted to anyone to use this software for any purpose, - * including commercial applications, and to alter it and redistribute it - * freely, subject to the following restrictions: - * - * 1. The origin of this software must not be misrepresented; you must not - * claim that you wrote the original software. If you use this software - * in a product, an acknowledgment in the product documentation would be - * appreciated but is not required. - * 2. Altered source versions must be plainly marked as such, and must not be - * misrepresented as being the original software. - * 3. This notice may not be removed or altered from any source distribution. - * - ******************************************************************************/ - -#include "sl_i2cspm.h" -#include "sl_clock_manager.h" -// Include instance config -#include "sl_i2cspm_sensor_config.h" - -sl_i2cspm_t *sl_i2cspm_sensor = SL_I2CSPM_SENSOR_PERIPHERAL; - -#if SL_I2CSPM_SENSOR_SPEED_MODE == 0 -#define SL_I2CSPM_SENSOR_HLR i2cClockHLRStandard -#define SL_I2CSPM_SENSOR_MAX_FREQ I2C_FREQ_STANDARD_MAX -#elif SL_I2CSPM_SENSOR_SPEED_MODE == 1 -#define SL_I2CSPM_SENSOR_HLR i2cClockHLRAsymetric -#define SL_I2CSPM_SENSOR_MAX_FREQ I2C_FREQ_FAST_MAX -#elif SL_I2CSPM_SENSOR_SPEED_MODE == 2 -#define SL_I2CSPM_SENSOR_HLR i2cClockHLRFast -#define SL_I2CSPM_SENSOR_MAX_FREQ I2C_FREQ_FASTPLUS_MAX -#endif - -I2CSPM_Init_TypeDef init_sensor = { - .port = SL_I2CSPM_SENSOR_PERIPHERAL, - .sclPort = SL_I2CSPM_SENSOR_SCL_PORT, - .sclPin = SL_I2CSPM_SENSOR_SCL_PIN, - .sdaPort = SL_I2CSPM_SENSOR_SDA_PORT, - .sdaPin = SL_I2CSPM_SENSOR_SDA_PIN, - .i2cRefFreq = 0, - .i2cMaxFreq = SL_I2CSPM_SENSOR_MAX_FREQ, - .i2cClhr = SL_I2CSPM_SENSOR_HLR -}; - -void sl_i2cspm_init_instances(void) -{ - sl_clock_manager_enable_bus_clock(SL_BUS_CLOCK_GPIO); - I2CSPM_Init(&init_sensor); -} diff --git a/matter/efr32/efr32mg24/BRD2703A/autogen/sl_i2cspm_instances.h b/matter/efr32/efr32mg24/BRD2703A/autogen/sl_i2cspm_instances.h deleted file mode 100644 index 41ff115bfd..0000000000 --- a/matter/efr32/efr32mg24/BRD2703A/autogen/sl_i2cspm_instances.h +++ /dev/null @@ -1,52 +0,0 @@ -/***************************************************************************//** - * @file - * @brief I2C simple poll-based master mode driver instances - ******************************************************************************* - * # License - * Copyright 2020 Silicon Laboratories Inc. www.silabs.com - ******************************************************************************* - * - * SPDX-License-Identifier: Zlib - * - * The licensor of this software is Silicon Laboratories Inc. - * - * This software is provided 'as-is', without any express or implied - * warranty. In no event will the authors be held liable for any damages - * arising from the use of this software. - * - * Permission is granted to anyone to use this software for any purpose, - * including commercial applications, and to alter it and redistribute it - * freely, subject to the following restrictions: - * - * 1. The origin of this software must not be misrepresented; you must not - * claim that you wrote the original software. If you use this software - * in a product, an acknowledgment in the product documentation would be - * appreciated but is not required. - * 2. Altered source versions must be plainly marked as such, and must not be - * misrepresented as being the original software. - * 3. This notice may not be removed or altered from any source distribution. - * - ******************************************************************************/ - -#ifndef SL_I2CSPM_INSTANCES_H -#define SL_I2CSPM_INSTANCES_H - -#ifdef __cplusplus -extern "C" { -#endif - -#include "sl_i2cspm.h" - - -#define SL_I2CSPM_SENSOR_PRESENT - - -extern sl_i2cspm_t *sl_i2cspm_sensor; - -void sl_i2cspm_init_instances(void); - -#ifdef __cplusplus -} -#endif - -#endif // SL_I2CSPM_INSTANCES_H diff --git a/matter/efr32/efr32mg24/BRD2703A/autogen/sl_simple_led_instances.h b/matter/efr32/efr32mg24/BRD2703A/autogen/sl_simple_led_instances.h index 808c6a721f..928fbe942a 100644 --- a/matter/efr32/efr32mg24/BRD2703A/autogen/sl_simple_led_instances.h +++ b/matter/efr32/efr32mg24/BRD2703A/autogen/sl_simple_led_instances.h @@ -1,4 +1,4 @@ -/***************************************************************************/ /** +/***************************************************************************//** * @file * @brief LED Driver Instances ******************************************************************************* @@ -42,7 +42,7 @@ extern const sl_led_t sl_led_led1; extern const sl_led_t *sl_simple_led_array[]; -#define SL_SIMPLE_LED_COUNT 2 +#define SL_SIMPLE_LED_COUNT 2 #define SL_SIMPLE_LED_INSTANCE(n) (sl_simple_led_array[n]) void sl_simple_led_init_instances(void); diff --git a/matter/efr32/efr32mg24/BRD2703A/autogen/sli_mbedtls_config_autogen.h b/matter/efr32/efr32mg24/BRD2703A/autogen/sli_mbedtls_config_autogen.h index 164bff9db4..f272a75664 100644 --- a/matter/efr32/efr32mg24/BRD2703A/autogen/sli_mbedtls_config_autogen.h +++ b/matter/efr32/efr32mg24/BRD2703A/autogen/sli_mbedtls_config_autogen.h @@ -40,7 +40,14 @@ #define MBEDTLS_ECP_DP_SECP256R1_ENABLED #define MBEDTLS_ECDSA_C #define MBEDTLS_MD_C +#define MBEDTLS_SHA224_C +#define MBEDTLS_SHA256_C #define MBEDTLS_PSA_CRYPTO_DRIVERS #define MBEDTLS_PSA_CRYPTO_STORAGE_C + + + + + #endif // SLI_MBEDTLS_CONFIG_AUTOGEN_H diff --git a/matter/efr32/efr32mg24/BRD2703A/autogen/sli_psa_builtin_config_autogen.h b/matter/efr32/efr32mg24/BRD2703A/autogen/sli_psa_builtin_config_autogen.h index 34f74fb60c..c8b70fad12 100644 --- a/matter/efr32/efr32mg24/BRD2703A/autogen/sli_psa_builtin_config_autogen.h +++ b/matter/efr32/efr32mg24/BRD2703A/autogen/sli_psa_builtin_config_autogen.h @@ -9,4 +9,5 @@ // #define MBEDTLS_PSA_BUILTIN_ALG_CMAC 1 // #define MBEDTLS_PSA_BUILTIN_ALG_PBKDF2_AES_CMAC_PRF_128 1 + #endif // SLI_PSA_BUILTIN_CONFIG_AUTOGEN_H diff --git a/matter/efr32/efr32mg24/BRD2703A/autogen/sli_psa_config_autogen.h b/matter/efr32/efr32mg24/BRD2703A/autogen/sli_psa_config_autogen.h index 038ab753c1..c2a379f438 100644 --- a/matter/efr32/efr32mg24/BRD2703A/autogen/sli_psa_config_autogen.h +++ b/matter/efr32/efr32mg24/BRD2703A/autogen/sli_psa_config_autogen.h @@ -3,25 +3,25 @@ #ifndef SLI_PSA_CONFIG_AUTOGEN_H #define SLI_PSA_CONFIG_AUTOGEN_H -#define PSA_WANT_KEY_TYPE_AES 1 -#define PSA_WANT_ALG_CCM 1 -#define PSA_WANT_ALG_ECB_NO_PADDING 1 -#define PSA_WANT_ALG_CMAC 1 -#define PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY 1 -#define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_BASIC 1 -#define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_IMPORT 1 -#define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_EXPORT 1 +#define PSA_WANT_KEY_TYPE_AES 1 +#define PSA_WANT_ALG_CCM 1 +#define PSA_WANT_ALG_ECB_NO_PADDING 1 +#define PSA_WANT_ALG_CMAC 1 +#define PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY 1 +#define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_BASIC 1 +#define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_IMPORT 1 +#define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_EXPORT 1 #define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_GENERATE 1 -#define PSA_WANT_ECC_SECP_R1_256 1 -#define PSA_WANT_ALG_ECDH 1 -#define PSA_WANT_ALG_ECDSA 1 -#define PSA_WANT_ALG_HKDF 1 -#define PSA_WANT_ALG_HMAC 1 -#define PSA_WANT_KEY_TYPE_HMAC 1 -#define PSA_WANT_ALG_PBKDF2_AES_CMAC_PRF_128 1 -#define PSA_WANT_ALG_SHA_256 1 -#define PSA_WANT_ALG_TLS12_PRF 1 -#define PSA_WANT_ALG_TLS12_PSK_TO_MS 1 +#define PSA_WANT_ECC_SECP_R1_256 1 +#define PSA_WANT_ALG_ECDH 1 +#define PSA_WANT_ALG_ECDSA 1 +#define PSA_WANT_ALG_HKDF 1 +#define PSA_WANT_ALG_HMAC 1 +#define PSA_WANT_KEY_TYPE_HMAC 1 +#define PSA_WANT_ALG_PBKDF2_AES_CMAC_PRF_128 1 +#define PSA_WANT_ALG_SHA_256 1 +#define PSA_WANT_ALG_TLS12_PRF 1 +#define PSA_WANT_ALG_TLS12_PSK_TO_MS 1 #define MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG #define MBEDTLS_PSA_KEY_SLOT_COUNT (2 + 15 + 1 + SL_PSA_KEY_USER_SLOT_COUNT) diff --git a/matter/efr32/efr32mg24/BRD2703A/config/psa_crypto_config.h b/matter/efr32/efr32mg24/BRD2703A/config/psa_crypto_config.h index cf09cf76e4..44dc70284f 100644 --- a/matter/efr32/efr32mg24/BRD2703A/config/psa_crypto_config.h +++ b/matter/efr32/efr32mg24/BRD2703A/config/psa_crypto_config.h @@ -25,7 +25,7 @@ // gracefully in case an application opens more than its declared amount of // keys, thereby precluding the stack from functioning. // Default: 4 -#define SL_PSA_KEY_USER_SLOT_COUNT (4) +#define SL_PSA_KEY_USER_SLOT_COUNT (4) // PSA Maximum User Persistent Keys Count <0-1024> // Maximum amount of keys (or other files) that can be stored persistently @@ -48,7 +48,7 @@ // and if SL_PSA_ITS_USER_MAX_FILES is changed, ITS should be cleared and // all files need to be stored again. // Default: 128 -#define SL_PSA_ITS_USER_MAX_FILES (128) +#define SL_PSA_ITS_USER_MAX_FILES (128) // Enable V1 Format Support For ITS Files <0-1> // Devices that used PSA ITS together with gecko_sdk_3.1.x or earlier @@ -105,7 +105,7 @@ // It is recommended to only use the PUF key for deriving further key // material. // Default: PSA_ALG_PBKDF2_AES_CMAC_PRF_128 -#define SL_CRYPTOACC_BUILTIN_KEY_PUF_ALG (PSA_ALG_PBKDF2_AES_CMAC_PRF_128) +#define SL_CRYPTOACC_BUILTIN_KEY_PUF_ALG (PSA_ALG_PBKDF2_AES_CMAC_PRF_128) #endif // SL_CRYPTOACC_BUILTIN_KEY_PUF_ALG // @@ -127,7 +127,7 @@ // to be included in the project. // // Default: 0 -#define SL_VSE_BUFFER_TRNG_DATA_DURING_SLEEP (0) +#define SL_VSE_BUFFER_TRNG_DATA_DURING_SLEEP (0) // Number of random words to buffer before putting the device to sleep <1-63> // This option can be used to decrease the amount of random words that @@ -152,17 +152,17 @@ // Sub-files #if defined(SLI_PSA_CONFIG_AUTOGEN_OVERRIDE_FILE) -#include SLI_PSA_CONFIG_AUTOGEN_OVERRIDE_FILE + #include SLI_PSA_CONFIG_AUTOGEN_OVERRIDE_FILE #else -#include "sli_psa_config_autogen.h" + #include "sli_psa_config_autogen.h" #endif #if defined(TFM_CONFIG_SL_SECURE_LIBRARY) -#include "sli_psa_tfm_translation.h" + #include "sli_psa_tfm_translation.h" #endif #if SL_MBEDTLS_DRIVERS_ENABLED -#include "sli_psa_acceleration.h" + #include "sli_psa_acceleration.h" #endif #include "sli_psa_builtin_config_autogen.h" diff --git a/matter/efr32/efr32mg24/BRD2703A/config/sl_i2cspm_sensor_config.h b/matter/efr32/efr32mg24/BRD2703A/config/sl_i2cspm_sensor_config.h deleted file mode 100644 index 917e8ceb83..0000000000 --- a/matter/efr32/efr32mg24/BRD2703A/config/sl_i2cspm_sensor_config.h +++ /dev/null @@ -1,69 +0,0 @@ -/***************************************************************************//** - * @file - * @brief I2CSPM Config - ******************************************************************************* - * # License - * Copyright 2019 Silicon Laboratories Inc. www.silabs.com - ******************************************************************************* - * - * SPDX-License-Identifier: Zlib - * - * The licensor of this software is Silicon Laboratories Inc. - * - * This software is provided 'as-is', without any express or implied - * warranty. In no event will the authors be held liable for any damages - * arising from the use of this software. - * - * Permission is granted to anyone to use this software for any purpose, - * including commercial applications, and to alter it and redistribute it - * freely, subject to the following restrictions: - * - * 1. The origin of this software must not be misrepresented; you must not - * claim that you wrote the original software. If you use this software - * in a product, an acknowledgment in the product documentation would be - * appreciated but is not required. - * 2. Altered source versions must be plainly marked as such, and must not be - * misrepresented as being the original software. - * 3. This notice may not be removed or altered from any source distribution. - * - ******************************************************************************/ - -#ifndef SL_I2CSPM_SENSOR_CONFIG_H -#define SL_I2CSPM_SENSOR_CONFIG_H - -// <<< Use Configuration Wizard in Context Menu - -// I2CSPM settings - -// Reference clock frequency -// Frequency in Hz of the reference clock. -// Select 0 to use the frequency of the currently selected clock. -// Default: 0 -#define SL_I2CSPM_SENSOR_REFERENCE_CLOCK 0 - -// Speed mode -// <0=> Standard mode (100kbit/s) -// <1=> Fast mode (400kbit/s) -// <2=> Fast mode plus (1Mbit/s) -// Default: 0 -#define SL_I2CSPM_SENSOR_SPEED_MODE 0 -// end I2CSPM config - -// <<< end of configuration section >>> - -// <<< sl:start pin_tool >>> -// SL_I2CSPM_SENSOR -// $[I2C_SL_I2CSPM_SENSOR] -#warning "I2CSPM I2C peripheral not configured" -// #define SL_I2CSPM_SENSOR_PERIPHERAL I2C0 - -// #define SL_I2CSPM_SENSOR_SCL_PORT gpioPortC -// #define SL_I2CSPM_SENSOR_SCL_PIN 11 - -// #define SL_I2CSPM_SENSOR_SDA_PORT gpioPortC -// #define SL_I2CSPM_SENSOR_SDA_PIN 10 - -// [I2C_SL_I2CSPM_SENSOR]$ -// <<< sl:end pin_tool >>> - -#endif // SL_I2CSPM_SENSOR_CONFIG_H diff --git a/matter/efr32/efr32mg24/BRD2703A/config/sl_mx25_flash_shutdown_usart_config.h b/matter/efr32/efr32mg24/BRD2703A/config/sl_mx25_flash_shutdown_usart_config.h deleted file mode 100644 index 167b0c1682..0000000000 --- a/matter/efr32/efr32mg24/BRD2703A/config/sl_mx25_flash_shutdown_usart_config.h +++ /dev/null @@ -1,61 +0,0 @@ -/***************************************************************************//** - * @file - * @brief SL_MX25_FLASH_SHUTDOWN_USART Config - ******************************************************************************* - * # License - * Copyright 2020 Silicon Laboratories Inc. www.silabs.com - ******************************************************************************* - * - * SPDX-License-Identifier: Zlib - * - * The licensor of this software is Silicon Laboratories Inc. - * - * This software is provided 'as-is', without any express or implied - * warranty. In no event will the authors be held liable for any damages - * arising from the use of this software. - * - * Permission is granted to anyone to use this software for any purpose, - * including commercial applications, and to alter it and redistribute it - * freely, subject to the following restrictions: - * - * 1. The origin of this software must not be misrepresented; you must not - * claim that you wrote the original software. If you use this software - * in a product, an acknowledgment in the product documentation would be - * appreciated but is not required. - * 2. Altered source versions must be plainly marked as such, and must not be - * misrepresented as being the original software. - * 3. This notice may not be removed or altered from any source distribution. - * - ******************************************************************************/ - -#ifndef SL_MX25_FLASH_SHUTDOWN_CONFIG_H -#define SL_MX25_FLASH_SHUTDOWN_CONFIG_H - -// <<< sl:start pin_tool >>> -// SL_MX25_FLASH_SHUTDOWN -// $[USART_SL_MX25_FLASH_SHUTDOWN] -#warning "MX25 SPI peripheral not configured" -// #define SL_MX25_FLASH_SHUTDOWN_PERIPHERAL USART1 -// #define SL_MX25_FLASH_SHUTDOWN_PERIPHERAL_NO 1 - -// #define SL_MX25_FLASH_SHUTDOWN_TX_PORT gpioPortC -// #define SL_MX25_FLASH_SHUTDOWN_TX_PIN 6 - -// #define SL_MX25_FLASH_SHUTDOWN_RX_PORT gpioPortC -// #define SL_MX25_FLASH_SHUTDOWN_RX_PIN 7 - -// #define SL_MX25_FLASH_SHUTDOWN_CLK_PORT gpioPortC -// #define SL_MX25_FLASH_SHUTDOWN_CLK_PIN 8 -// [USART_SL_MX25_FLASH_SHUTDOWN]$ - -// SL_MX25_FLASH_SHUTDOWN_CS - -// $[GPIO_SL_MX25_FLASH_SHUTDOWN_CS] -#warning "MX25 SPI pin not configured" -// #define SL_MX25_FLASH_SHUTDOWN_CS_PORT gpioPortA -// #define SL_MX25_FLASH_SHUTDOWN_CS_PIN 4 -// [GPIO_SL_MX25_FLASH_SHUTDOWN_CS]$ - -// <<< sl:end pin_tool >>> - -#endif // SL_MX25_FLASH_SHUTDOWN_CONFIG_H diff --git a/matter/efr32/efr32mg24/BRD2703A/config/sl_openthread_ble_cli_config.h b/matter/efr32/efr32mg24/BRD2703A/config/sl_openthread_ble_cli_config.h deleted file mode 100644 index 8829fa9dab..0000000000 --- a/matter/efr32/efr32mg24/BRD2703A/config/sl_openthread_ble_cli_config.h +++ /dev/null @@ -1,36 +0,0 @@ -/***************************************************************************//** - * @file - * @brief OpenThread Bluetooth CLI configuration file. - ******************************************************************************* - * # License - * Copyright 2024 Silicon Laboratories Inc. www.silabs.com - ******************************************************************************* - * - * SPDX-License-Identifier: Zlib - * - * The licensor of this software is Silicon Laboratories Inc. - * - * This software is provided 'as-is', without any express or implied - * warranty. In no event will the authors be held liable for any damages - * arising from the use of this software. - * - * Permission is granted to anyone to use this software for any purpose, - * including commercial applications, and to alter it and redistribute it - * freely, subject to the following restrictions: - * - * 1. The origin of this software must not be misrepresented; you must not - * claim that you wrote the original software. If you use this software - * in a product, an acknowledgment in the product documentation would be - * appreciated but is not required. - * 2. Altered source versions must be plainly marked as such, and must not be - * misrepresented as being the original software. - * 3. This notice may not be removed or altered from any source distribution. - * - ******************************************************************************/ - -//-------- <<< Use Configuration Wizard in Context Menu >>> ----------------- -// -// Bluetooth CLI -#define SL_OPENTHREAD_BLE_CLI_ENABLE 1 -// -// <<< end of configuration section >>> diff --git a/matter/efr32/efr32mg24/BRD4186A/autogen/gatt_db.h b/matter/efr32/efr32mg24/BRD4186A/autogen/gatt_db.h index 3e608dd00b..bee94f4ef7 100644 --- a/matter/efr32/efr32mg24/BRD4186A/autogen/gatt_db.h +++ b/matter/efr32/efr32mg24/BRD4186A/autogen/gatt_db.h @@ -13,14 +13,14 @@ extern "C" { extern const sli_bt_gattdb_t gattdb; -#define gattdb_generic_attribute 1 -#define gattdb_service_changed_char 3 -#define gattdb_database_hash 6 -#define gattdb_client_support_features 8 -#define gattdb_device_name 11 -#define gattdb_CHIPoBLEChar_Rx 23 -#define gattdb_CHIPoBLEChar_Tx 25 -#define gattdb_CHIPoBLEChar_C3 28 +#define gattdb_generic_attribute 1 +#define gattdb_service_changed_char 3 +#define gattdb_database_hash 6 +#define gattdb_client_support_features 8 +#define gattdb_device_name 11 +#define gattdb_CHIPoBLEChar_Rx 23 +#define gattdb_CHIPoBLEChar_Tx 25 +#define gattdb_CHIPoBLEChar_C3 28 #if __cplusplus } diff --git a/matter/efr32/efr32mg24/BRD4186A/autogen/sl_event_handler.h b/matter/efr32/efr32mg24/BRD4186A/autogen/sl_event_handler.h index ef8751b80f..2333539d21 100644 --- a/matter/efr32/efr32mg24/BRD4186A/autogen/sl_event_handler.h +++ b/matter/efr32/efr32mg24/BRD4186A/autogen/sl_event_handler.h @@ -7,6 +7,5 @@ void sl_driver_init(void); void sl_service_init(void); void sl_stack_init(void); void sl_internal_app_init(void); -void sl_iostream_init_instances(void); #endif // SL_EVENT_HANDLER_H diff --git a/matter/efr32/efr32mg24/BRD4186A/autogen/sl_simple_led_instances.h b/matter/efr32/efr32mg24/BRD4186A/autogen/sl_simple_led_instances.h index 808c6a721f..928fbe942a 100644 --- a/matter/efr32/efr32mg24/BRD4186A/autogen/sl_simple_led_instances.h +++ b/matter/efr32/efr32mg24/BRD4186A/autogen/sl_simple_led_instances.h @@ -1,4 +1,4 @@ -/***************************************************************************/ /** +/***************************************************************************//** * @file * @brief LED Driver Instances ******************************************************************************* @@ -42,7 +42,7 @@ extern const sl_led_t sl_led_led1; extern const sl_led_t *sl_simple_led_array[]; -#define SL_SIMPLE_LED_COUNT 2 +#define SL_SIMPLE_LED_COUNT 2 #define SL_SIMPLE_LED_INSTANCE(n) (sl_simple_led_array[n]) void sl_simple_led_init_instances(void); diff --git a/matter/efr32/efr32mg24/BRD4186A/autogen/sli_mbedtls_config_autogen.h b/matter/efr32/efr32mg24/BRD4186A/autogen/sli_mbedtls_config_autogen.h index 164bff9db4..ddda08f19f 100644 --- a/matter/efr32/efr32mg24/BRD4186A/autogen/sli_mbedtls_config_autogen.h +++ b/matter/efr32/efr32mg24/BRD4186A/autogen/sli_mbedtls_config_autogen.h @@ -43,4 +43,9 @@ #define MBEDTLS_PSA_CRYPTO_DRIVERS #define MBEDTLS_PSA_CRYPTO_STORAGE_C + + + + + #endif // SLI_MBEDTLS_CONFIG_AUTOGEN_H diff --git a/matter/efr32/efr32mg24/BRD4186A/autogen/sli_psa_builtin_config_autogen.h b/matter/efr32/efr32mg24/BRD4186A/autogen/sli_psa_builtin_config_autogen.h index 34f74fb60c..c8b70fad12 100644 --- a/matter/efr32/efr32mg24/BRD4186A/autogen/sli_psa_builtin_config_autogen.h +++ b/matter/efr32/efr32mg24/BRD4186A/autogen/sli_psa_builtin_config_autogen.h @@ -9,4 +9,5 @@ // #define MBEDTLS_PSA_BUILTIN_ALG_CMAC 1 // #define MBEDTLS_PSA_BUILTIN_ALG_PBKDF2_AES_CMAC_PRF_128 1 + #endif // SLI_PSA_BUILTIN_CONFIG_AUTOGEN_H diff --git a/matter/efr32/efr32mg24/BRD4186A/autogen/sli_psa_config_autogen.h b/matter/efr32/efr32mg24/BRD4186A/autogen/sli_psa_config_autogen.h index 038ab753c1..c2a379f438 100644 --- a/matter/efr32/efr32mg24/BRD4186A/autogen/sli_psa_config_autogen.h +++ b/matter/efr32/efr32mg24/BRD4186A/autogen/sli_psa_config_autogen.h @@ -3,25 +3,25 @@ #ifndef SLI_PSA_CONFIG_AUTOGEN_H #define SLI_PSA_CONFIG_AUTOGEN_H -#define PSA_WANT_KEY_TYPE_AES 1 -#define PSA_WANT_ALG_CCM 1 -#define PSA_WANT_ALG_ECB_NO_PADDING 1 -#define PSA_WANT_ALG_CMAC 1 -#define PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY 1 -#define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_BASIC 1 -#define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_IMPORT 1 -#define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_EXPORT 1 +#define PSA_WANT_KEY_TYPE_AES 1 +#define PSA_WANT_ALG_CCM 1 +#define PSA_WANT_ALG_ECB_NO_PADDING 1 +#define PSA_WANT_ALG_CMAC 1 +#define PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY 1 +#define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_BASIC 1 +#define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_IMPORT 1 +#define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_EXPORT 1 #define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_GENERATE 1 -#define PSA_WANT_ECC_SECP_R1_256 1 -#define PSA_WANT_ALG_ECDH 1 -#define PSA_WANT_ALG_ECDSA 1 -#define PSA_WANT_ALG_HKDF 1 -#define PSA_WANT_ALG_HMAC 1 -#define PSA_WANT_KEY_TYPE_HMAC 1 -#define PSA_WANT_ALG_PBKDF2_AES_CMAC_PRF_128 1 -#define PSA_WANT_ALG_SHA_256 1 -#define PSA_WANT_ALG_TLS12_PRF 1 -#define PSA_WANT_ALG_TLS12_PSK_TO_MS 1 +#define PSA_WANT_ECC_SECP_R1_256 1 +#define PSA_WANT_ALG_ECDH 1 +#define PSA_WANT_ALG_ECDSA 1 +#define PSA_WANT_ALG_HKDF 1 +#define PSA_WANT_ALG_HMAC 1 +#define PSA_WANT_KEY_TYPE_HMAC 1 +#define PSA_WANT_ALG_PBKDF2_AES_CMAC_PRF_128 1 +#define PSA_WANT_ALG_SHA_256 1 +#define PSA_WANT_ALG_TLS12_PRF 1 +#define PSA_WANT_ALG_TLS12_PSK_TO_MS 1 #define MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG #define MBEDTLS_PSA_KEY_SLOT_COUNT (2 + 15 + 1 + SL_PSA_KEY_USER_SLOT_COUNT) diff --git a/matter/efr32/efr32mg24/BRD4186A/config/psa_crypto_config.h b/matter/efr32/efr32mg24/BRD4186A/config/psa_crypto_config.h index cf09cf76e4..44dc70284f 100644 --- a/matter/efr32/efr32mg24/BRD4186A/config/psa_crypto_config.h +++ b/matter/efr32/efr32mg24/BRD4186A/config/psa_crypto_config.h @@ -25,7 +25,7 @@ // gracefully in case an application opens more than its declared amount of // keys, thereby precluding the stack from functioning. // Default: 4 -#define SL_PSA_KEY_USER_SLOT_COUNT (4) +#define SL_PSA_KEY_USER_SLOT_COUNT (4) // PSA Maximum User Persistent Keys Count <0-1024> // Maximum amount of keys (or other files) that can be stored persistently @@ -48,7 +48,7 @@ // and if SL_PSA_ITS_USER_MAX_FILES is changed, ITS should be cleared and // all files need to be stored again. // Default: 128 -#define SL_PSA_ITS_USER_MAX_FILES (128) +#define SL_PSA_ITS_USER_MAX_FILES (128) // Enable V1 Format Support For ITS Files <0-1> // Devices that used PSA ITS together with gecko_sdk_3.1.x or earlier @@ -105,7 +105,7 @@ // It is recommended to only use the PUF key for deriving further key // material. // Default: PSA_ALG_PBKDF2_AES_CMAC_PRF_128 -#define SL_CRYPTOACC_BUILTIN_KEY_PUF_ALG (PSA_ALG_PBKDF2_AES_CMAC_PRF_128) +#define SL_CRYPTOACC_BUILTIN_KEY_PUF_ALG (PSA_ALG_PBKDF2_AES_CMAC_PRF_128) #endif // SL_CRYPTOACC_BUILTIN_KEY_PUF_ALG // @@ -127,7 +127,7 @@ // to be included in the project. // // Default: 0 -#define SL_VSE_BUFFER_TRNG_DATA_DURING_SLEEP (0) +#define SL_VSE_BUFFER_TRNG_DATA_DURING_SLEEP (0) // Number of random words to buffer before putting the device to sleep <1-63> // This option can be used to decrease the amount of random words that @@ -152,17 +152,17 @@ // Sub-files #if defined(SLI_PSA_CONFIG_AUTOGEN_OVERRIDE_FILE) -#include SLI_PSA_CONFIG_AUTOGEN_OVERRIDE_FILE + #include SLI_PSA_CONFIG_AUTOGEN_OVERRIDE_FILE #else -#include "sli_psa_config_autogen.h" + #include "sli_psa_config_autogen.h" #endif #if defined(TFM_CONFIG_SL_SECURE_LIBRARY) -#include "sli_psa_tfm_translation.h" + #include "sli_psa_tfm_translation.h" #endif #if SL_MBEDTLS_DRIVERS_ENABLED -#include "sli_psa_acceleration.h" + #include "sli_psa_acceleration.h" #endif #include "sli_psa_builtin_config_autogen.h" diff --git a/matter/efr32/efr32mg24/BRD4186A/config/sl_openthread_ble_cli_config.h b/matter/efr32/efr32mg24/BRD4186A/config/sl_openthread_ble_cli_config.h deleted file mode 100644 index 8829fa9dab..0000000000 --- a/matter/efr32/efr32mg24/BRD4186A/config/sl_openthread_ble_cli_config.h +++ /dev/null @@ -1,36 +0,0 @@ -/***************************************************************************//** - * @file - * @brief OpenThread Bluetooth CLI configuration file. - ******************************************************************************* - * # License - * Copyright 2024 Silicon Laboratories Inc. www.silabs.com - ******************************************************************************* - * - * SPDX-License-Identifier: Zlib - * - * The licensor of this software is Silicon Laboratories Inc. - * - * This software is provided 'as-is', without any express or implied - * warranty. In no event will the authors be held liable for any damages - * arising from the use of this software. - * - * Permission is granted to anyone to use this software for any purpose, - * including commercial applications, and to alter it and redistribute it - * freely, subject to the following restrictions: - * - * 1. The origin of this software must not be misrepresented; you must not - * claim that you wrote the original software. If you use this software - * in a product, an acknowledgment in the product documentation would be - * appreciated but is not required. - * 2. Altered source versions must be plainly marked as such, and must not be - * misrepresented as being the original software. - * 3. This notice may not be removed or altered from any source distribution. - * - ******************************************************************************/ - -//-------- <<< Use Configuration Wizard in Context Menu >>> ----------------- -// -// Bluetooth CLI -#define SL_OPENTHREAD_BLE_CLI_ENABLE 1 -// -// <<< end of configuration section >>> diff --git a/matter/efr32/efr32mg24/BRD4186C/autogen/gatt_db.h b/matter/efr32/efr32mg24/BRD4186C/autogen/gatt_db.h index 3e608dd00b..bee94f4ef7 100644 --- a/matter/efr32/efr32mg24/BRD4186C/autogen/gatt_db.h +++ b/matter/efr32/efr32mg24/BRD4186C/autogen/gatt_db.h @@ -13,14 +13,14 @@ extern "C" { extern const sli_bt_gattdb_t gattdb; -#define gattdb_generic_attribute 1 -#define gattdb_service_changed_char 3 -#define gattdb_database_hash 6 -#define gattdb_client_support_features 8 -#define gattdb_device_name 11 -#define gattdb_CHIPoBLEChar_Rx 23 -#define gattdb_CHIPoBLEChar_Tx 25 -#define gattdb_CHIPoBLEChar_C3 28 +#define gattdb_generic_attribute 1 +#define gattdb_service_changed_char 3 +#define gattdb_database_hash 6 +#define gattdb_client_support_features 8 +#define gattdb_device_name 11 +#define gattdb_CHIPoBLEChar_Rx 23 +#define gattdb_CHIPoBLEChar_Tx 25 +#define gattdb_CHIPoBLEChar_C3 28 #if __cplusplus } diff --git a/matter/efr32/efr32mg24/BRD4186C/autogen/sl_event_handler.h b/matter/efr32/efr32mg24/BRD4186C/autogen/sl_event_handler.h index ef8751b80f..2333539d21 100644 --- a/matter/efr32/efr32mg24/BRD4186C/autogen/sl_event_handler.h +++ b/matter/efr32/efr32mg24/BRD4186C/autogen/sl_event_handler.h @@ -7,6 +7,5 @@ void sl_driver_init(void); void sl_service_init(void); void sl_stack_init(void); void sl_internal_app_init(void); -void sl_iostream_init_instances(void); #endif // SL_EVENT_HANDLER_H diff --git a/matter/efr32/efr32mg24/BRD4186C/autogen/sl_simple_led_instances.h b/matter/efr32/efr32mg24/BRD4186C/autogen/sl_simple_led_instances.h index 2fd553076e..afb5875eb6 100644 --- a/matter/efr32/efr32mg24/BRD4186C/autogen/sl_simple_led_instances.h +++ b/matter/efr32/efr32mg24/BRD4186C/autogen/sl_simple_led_instances.h @@ -1,4 +1,4 @@ -/***************************************************************************/ /** +/***************************************************************************//** * @file * @brief LED Driver Instances ******************************************************************************* @@ -41,7 +41,7 @@ extern const sl_led_t sl_led_led1; extern const sl_led_t *sl_simple_led_array[]; -#define SL_SIMPLE_LED_COUNT 2 +#define SL_SIMPLE_LED_COUNT 2 #define SL_SIMPLE_LED_INSTANCE(n) (sl_simple_led_array[n]) void sl_simple_led_init_instances(void); diff --git a/matter/efr32/efr32mg24/BRD4186C/autogen/sli_mbedtls_config_autogen.h b/matter/efr32/efr32mg24/BRD4186C/autogen/sli_mbedtls_config_autogen.h index 164bff9db4..ddda08f19f 100644 --- a/matter/efr32/efr32mg24/BRD4186C/autogen/sli_mbedtls_config_autogen.h +++ b/matter/efr32/efr32mg24/BRD4186C/autogen/sli_mbedtls_config_autogen.h @@ -43,4 +43,9 @@ #define MBEDTLS_PSA_CRYPTO_DRIVERS #define MBEDTLS_PSA_CRYPTO_STORAGE_C + + + + + #endif // SLI_MBEDTLS_CONFIG_AUTOGEN_H diff --git a/matter/efr32/efr32mg24/BRD4186C/autogen/sli_psa_builtin_config_autogen.h b/matter/efr32/efr32mg24/BRD4186C/autogen/sli_psa_builtin_config_autogen.h index 34f74fb60c..c8b70fad12 100644 --- a/matter/efr32/efr32mg24/BRD4186C/autogen/sli_psa_builtin_config_autogen.h +++ b/matter/efr32/efr32mg24/BRD4186C/autogen/sli_psa_builtin_config_autogen.h @@ -9,4 +9,5 @@ // #define MBEDTLS_PSA_BUILTIN_ALG_CMAC 1 // #define MBEDTLS_PSA_BUILTIN_ALG_PBKDF2_AES_CMAC_PRF_128 1 + #endif // SLI_PSA_BUILTIN_CONFIG_AUTOGEN_H diff --git a/matter/efr32/efr32mg24/BRD4186C/autogen/sli_psa_config_autogen.h b/matter/efr32/efr32mg24/BRD4186C/autogen/sli_psa_config_autogen.h index 038ab753c1..c2a379f438 100644 --- a/matter/efr32/efr32mg24/BRD4186C/autogen/sli_psa_config_autogen.h +++ b/matter/efr32/efr32mg24/BRD4186C/autogen/sli_psa_config_autogen.h @@ -3,25 +3,25 @@ #ifndef SLI_PSA_CONFIG_AUTOGEN_H #define SLI_PSA_CONFIG_AUTOGEN_H -#define PSA_WANT_KEY_TYPE_AES 1 -#define PSA_WANT_ALG_CCM 1 -#define PSA_WANT_ALG_ECB_NO_PADDING 1 -#define PSA_WANT_ALG_CMAC 1 -#define PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY 1 -#define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_BASIC 1 -#define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_IMPORT 1 -#define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_EXPORT 1 +#define PSA_WANT_KEY_TYPE_AES 1 +#define PSA_WANT_ALG_CCM 1 +#define PSA_WANT_ALG_ECB_NO_PADDING 1 +#define PSA_WANT_ALG_CMAC 1 +#define PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY 1 +#define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_BASIC 1 +#define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_IMPORT 1 +#define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_EXPORT 1 #define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_GENERATE 1 -#define PSA_WANT_ECC_SECP_R1_256 1 -#define PSA_WANT_ALG_ECDH 1 -#define PSA_WANT_ALG_ECDSA 1 -#define PSA_WANT_ALG_HKDF 1 -#define PSA_WANT_ALG_HMAC 1 -#define PSA_WANT_KEY_TYPE_HMAC 1 -#define PSA_WANT_ALG_PBKDF2_AES_CMAC_PRF_128 1 -#define PSA_WANT_ALG_SHA_256 1 -#define PSA_WANT_ALG_TLS12_PRF 1 -#define PSA_WANT_ALG_TLS12_PSK_TO_MS 1 +#define PSA_WANT_ECC_SECP_R1_256 1 +#define PSA_WANT_ALG_ECDH 1 +#define PSA_WANT_ALG_ECDSA 1 +#define PSA_WANT_ALG_HKDF 1 +#define PSA_WANT_ALG_HMAC 1 +#define PSA_WANT_KEY_TYPE_HMAC 1 +#define PSA_WANT_ALG_PBKDF2_AES_CMAC_PRF_128 1 +#define PSA_WANT_ALG_SHA_256 1 +#define PSA_WANT_ALG_TLS12_PRF 1 +#define PSA_WANT_ALG_TLS12_PSK_TO_MS 1 #define MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG #define MBEDTLS_PSA_KEY_SLOT_COUNT (2 + 15 + 1 + SL_PSA_KEY_USER_SLOT_COUNT) diff --git a/matter/efr32/efr32mg24/BRD4186C/config/psa_crypto_config.h b/matter/efr32/efr32mg24/BRD4186C/config/psa_crypto_config.h index cf09cf76e4..44dc70284f 100644 --- a/matter/efr32/efr32mg24/BRD4186C/config/psa_crypto_config.h +++ b/matter/efr32/efr32mg24/BRD4186C/config/psa_crypto_config.h @@ -25,7 +25,7 @@ // gracefully in case an application opens more than its declared amount of // keys, thereby precluding the stack from functioning. // Default: 4 -#define SL_PSA_KEY_USER_SLOT_COUNT (4) +#define SL_PSA_KEY_USER_SLOT_COUNT (4) // PSA Maximum User Persistent Keys Count <0-1024> // Maximum amount of keys (or other files) that can be stored persistently @@ -48,7 +48,7 @@ // and if SL_PSA_ITS_USER_MAX_FILES is changed, ITS should be cleared and // all files need to be stored again. // Default: 128 -#define SL_PSA_ITS_USER_MAX_FILES (128) +#define SL_PSA_ITS_USER_MAX_FILES (128) // Enable V1 Format Support For ITS Files <0-1> // Devices that used PSA ITS together with gecko_sdk_3.1.x or earlier @@ -105,7 +105,7 @@ // It is recommended to only use the PUF key for deriving further key // material. // Default: PSA_ALG_PBKDF2_AES_CMAC_PRF_128 -#define SL_CRYPTOACC_BUILTIN_KEY_PUF_ALG (PSA_ALG_PBKDF2_AES_CMAC_PRF_128) +#define SL_CRYPTOACC_BUILTIN_KEY_PUF_ALG (PSA_ALG_PBKDF2_AES_CMAC_PRF_128) #endif // SL_CRYPTOACC_BUILTIN_KEY_PUF_ALG // @@ -127,7 +127,7 @@ // to be included in the project. // // Default: 0 -#define SL_VSE_BUFFER_TRNG_DATA_DURING_SLEEP (0) +#define SL_VSE_BUFFER_TRNG_DATA_DURING_SLEEP (0) // Number of random words to buffer before putting the device to sleep <1-63> // This option can be used to decrease the amount of random words that @@ -152,17 +152,17 @@ // Sub-files #if defined(SLI_PSA_CONFIG_AUTOGEN_OVERRIDE_FILE) -#include SLI_PSA_CONFIG_AUTOGEN_OVERRIDE_FILE + #include SLI_PSA_CONFIG_AUTOGEN_OVERRIDE_FILE #else -#include "sli_psa_config_autogen.h" + #include "sli_psa_config_autogen.h" #endif #if defined(TFM_CONFIG_SL_SECURE_LIBRARY) -#include "sli_psa_tfm_translation.h" + #include "sli_psa_tfm_translation.h" #endif #if SL_MBEDTLS_DRIVERS_ENABLED -#include "sli_psa_acceleration.h" + #include "sli_psa_acceleration.h" #endif #include "sli_psa_builtin_config_autogen.h" diff --git a/matter/efr32/efr32mg24/BRD4186C/config/sl_openthread_ble_cli_config.h b/matter/efr32/efr32mg24/BRD4186C/config/sl_openthread_ble_cli_config.h deleted file mode 100644 index 8829fa9dab..0000000000 --- a/matter/efr32/efr32mg24/BRD4186C/config/sl_openthread_ble_cli_config.h +++ /dev/null @@ -1,36 +0,0 @@ -/***************************************************************************//** - * @file - * @brief OpenThread Bluetooth CLI configuration file. - ******************************************************************************* - * # License - * Copyright 2024 Silicon Laboratories Inc. www.silabs.com - ******************************************************************************* - * - * SPDX-License-Identifier: Zlib - * - * The licensor of this software is Silicon Laboratories Inc. - * - * This software is provided 'as-is', without any express or implied - * warranty. In no event will the authors be held liable for any damages - * arising from the use of this software. - * - * Permission is granted to anyone to use this software for any purpose, - * including commercial applications, and to alter it and redistribute it - * freely, subject to the following restrictions: - * - * 1. The origin of this software must not be misrepresented; you must not - * claim that you wrote the original software. If you use this software - * in a product, an acknowledgment in the product documentation would be - * appreciated but is not required. - * 2. Altered source versions must be plainly marked as such, and must not be - * misrepresented as being the original software. - * 3. This notice may not be removed or altered from any source distribution. - * - ******************************************************************************/ - -//-------- <<< Use Configuration Wizard in Context Menu >>> ----------------- -// -// Bluetooth CLI -#define SL_OPENTHREAD_BLE_CLI_ENABLE 1 -// -// <<< end of configuration section >>> diff --git a/matter/efr32/efr32mg24/BRD4187A/autogen/gatt_db.h b/matter/efr32/efr32mg24/BRD4187A/autogen/gatt_db.h index 3e608dd00b..bee94f4ef7 100644 --- a/matter/efr32/efr32mg24/BRD4187A/autogen/gatt_db.h +++ b/matter/efr32/efr32mg24/BRD4187A/autogen/gatt_db.h @@ -13,14 +13,14 @@ extern "C" { extern const sli_bt_gattdb_t gattdb; -#define gattdb_generic_attribute 1 -#define gattdb_service_changed_char 3 -#define gattdb_database_hash 6 -#define gattdb_client_support_features 8 -#define gattdb_device_name 11 -#define gattdb_CHIPoBLEChar_Rx 23 -#define gattdb_CHIPoBLEChar_Tx 25 -#define gattdb_CHIPoBLEChar_C3 28 +#define gattdb_generic_attribute 1 +#define gattdb_service_changed_char 3 +#define gattdb_database_hash 6 +#define gattdb_client_support_features 8 +#define gattdb_device_name 11 +#define gattdb_CHIPoBLEChar_Rx 23 +#define gattdb_CHIPoBLEChar_Tx 25 +#define gattdb_CHIPoBLEChar_C3 28 #if __cplusplus } diff --git a/matter/efr32/efr32mg24/BRD4187A/autogen/sl_event_handler.h b/matter/efr32/efr32mg24/BRD4187A/autogen/sl_event_handler.h index ef8751b80f..2333539d21 100644 --- a/matter/efr32/efr32mg24/BRD4187A/autogen/sl_event_handler.h +++ b/matter/efr32/efr32mg24/BRD4187A/autogen/sl_event_handler.h @@ -7,6 +7,5 @@ void sl_driver_init(void); void sl_service_init(void); void sl_stack_init(void); void sl_internal_app_init(void); -void sl_iostream_init_instances(void); #endif // SL_EVENT_HANDLER_H diff --git a/matter/efr32/efr32mg24/BRD4187A/autogen/sli_mbedtls_config_autogen.h b/matter/efr32/efr32mg24/BRD4187A/autogen/sli_mbedtls_config_autogen.h index 164bff9db4..ddda08f19f 100644 --- a/matter/efr32/efr32mg24/BRD4187A/autogen/sli_mbedtls_config_autogen.h +++ b/matter/efr32/efr32mg24/BRD4187A/autogen/sli_mbedtls_config_autogen.h @@ -43,4 +43,9 @@ #define MBEDTLS_PSA_CRYPTO_DRIVERS #define MBEDTLS_PSA_CRYPTO_STORAGE_C + + + + + #endif // SLI_MBEDTLS_CONFIG_AUTOGEN_H diff --git a/matter/efr32/efr32mg24/BRD4187A/autogen/sli_psa_builtin_config_autogen.h b/matter/efr32/efr32mg24/BRD4187A/autogen/sli_psa_builtin_config_autogen.h index 34f74fb60c..c8b70fad12 100644 --- a/matter/efr32/efr32mg24/BRD4187A/autogen/sli_psa_builtin_config_autogen.h +++ b/matter/efr32/efr32mg24/BRD4187A/autogen/sli_psa_builtin_config_autogen.h @@ -9,4 +9,5 @@ // #define MBEDTLS_PSA_BUILTIN_ALG_CMAC 1 // #define MBEDTLS_PSA_BUILTIN_ALG_PBKDF2_AES_CMAC_PRF_128 1 + #endif // SLI_PSA_BUILTIN_CONFIG_AUTOGEN_H diff --git a/matter/efr32/efr32mg24/BRD4187A/autogen/sli_psa_config_autogen.h b/matter/efr32/efr32mg24/BRD4187A/autogen/sli_psa_config_autogen.h index 038ab753c1..c2a379f438 100644 --- a/matter/efr32/efr32mg24/BRD4187A/autogen/sli_psa_config_autogen.h +++ b/matter/efr32/efr32mg24/BRD4187A/autogen/sli_psa_config_autogen.h @@ -3,25 +3,25 @@ #ifndef SLI_PSA_CONFIG_AUTOGEN_H #define SLI_PSA_CONFIG_AUTOGEN_H -#define PSA_WANT_KEY_TYPE_AES 1 -#define PSA_WANT_ALG_CCM 1 -#define PSA_WANT_ALG_ECB_NO_PADDING 1 -#define PSA_WANT_ALG_CMAC 1 -#define PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY 1 -#define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_BASIC 1 -#define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_IMPORT 1 -#define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_EXPORT 1 +#define PSA_WANT_KEY_TYPE_AES 1 +#define PSA_WANT_ALG_CCM 1 +#define PSA_WANT_ALG_ECB_NO_PADDING 1 +#define PSA_WANT_ALG_CMAC 1 +#define PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY 1 +#define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_BASIC 1 +#define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_IMPORT 1 +#define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_EXPORT 1 #define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_GENERATE 1 -#define PSA_WANT_ECC_SECP_R1_256 1 -#define PSA_WANT_ALG_ECDH 1 -#define PSA_WANT_ALG_ECDSA 1 -#define PSA_WANT_ALG_HKDF 1 -#define PSA_WANT_ALG_HMAC 1 -#define PSA_WANT_KEY_TYPE_HMAC 1 -#define PSA_WANT_ALG_PBKDF2_AES_CMAC_PRF_128 1 -#define PSA_WANT_ALG_SHA_256 1 -#define PSA_WANT_ALG_TLS12_PRF 1 -#define PSA_WANT_ALG_TLS12_PSK_TO_MS 1 +#define PSA_WANT_ECC_SECP_R1_256 1 +#define PSA_WANT_ALG_ECDH 1 +#define PSA_WANT_ALG_ECDSA 1 +#define PSA_WANT_ALG_HKDF 1 +#define PSA_WANT_ALG_HMAC 1 +#define PSA_WANT_KEY_TYPE_HMAC 1 +#define PSA_WANT_ALG_PBKDF2_AES_CMAC_PRF_128 1 +#define PSA_WANT_ALG_SHA_256 1 +#define PSA_WANT_ALG_TLS12_PRF 1 +#define PSA_WANT_ALG_TLS12_PSK_TO_MS 1 #define MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG #define MBEDTLS_PSA_KEY_SLOT_COUNT (2 + 15 + 1 + SL_PSA_KEY_USER_SLOT_COUNT) diff --git a/matter/efr32/efr32mg24/BRD4187A/config/psa_crypto_config.h b/matter/efr32/efr32mg24/BRD4187A/config/psa_crypto_config.h index cf09cf76e4..20703b41d2 100644 --- a/matter/efr32/efr32mg24/BRD4187A/config/psa_crypto_config.h +++ b/matter/efr32/efr32mg24/BRD4187A/config/psa_crypto_config.h @@ -25,7 +25,7 @@ // gracefully in case an application opens more than its declared amount of // keys, thereby precluding the stack from functioning. // Default: 4 -#define SL_PSA_KEY_USER_SLOT_COUNT (4) +#define SL_PSA_KEY_USER_SLOT_COUNT (4) // PSA Maximum User Persistent Keys Count <0-1024> // Maximum amount of keys (or other files) that can be stored persistently @@ -48,7 +48,7 @@ // and if SL_PSA_ITS_USER_MAX_FILES is changed, ITS should be cleared and // all files need to be stored again. // Default: 128 -#define SL_PSA_ITS_USER_MAX_FILES (128) +#define SL_PSA_ITS_USER_MAX_FILES (128) // Enable V1 Format Support For ITS Files <0-1> // Devices that used PSA ITS together with gecko_sdk_3.1.x or earlier @@ -56,7 +56,7 @@ // If no v1 files are used, its support can be disabled for space // optimization. // Default: 0 -#define SL_PSA_ITS_SUPPORT_V1_DRIVER 1 +#define SL_PSA_ITS_SUPPORT_V1_DRIVER 0 // Enable V2 ITS Driver Support <0-1> // Devices that have used GSDK 4.1.x and earlier, and used ITS have the keys @@ -69,7 +69,7 @@ // driver before in GSDK 4.1.x and earlier, or the keys has been already // migrated. // Default: 0 -#define SL_PSA_ITS_SUPPORT_V2_DRIVER 1 +#define SL_PSA_ITS_SUPPORT_V2_DRIVER 0 // Enable support for V3 ITS Driver <0-1> // Devices that have used GSDK 4.1.x and earlier, and used ITS have the keys @@ -105,7 +105,7 @@ // It is recommended to only use the PUF key for deriving further key // material. // Default: PSA_ALG_PBKDF2_AES_CMAC_PRF_128 -#define SL_CRYPTOACC_BUILTIN_KEY_PUF_ALG (PSA_ALG_PBKDF2_AES_CMAC_PRF_128) +#define SL_CRYPTOACC_BUILTIN_KEY_PUF_ALG (PSA_ALG_PBKDF2_AES_CMAC_PRF_128) #endif // SL_CRYPTOACC_BUILTIN_KEY_PUF_ALG // @@ -127,7 +127,7 @@ // to be included in the project. // // Default: 0 -#define SL_VSE_BUFFER_TRNG_DATA_DURING_SLEEP (0) +#define SL_VSE_BUFFER_TRNG_DATA_DURING_SLEEP (0) // Number of random words to buffer before putting the device to sleep <1-63> // This option can be used to decrease the amount of random words that @@ -152,17 +152,17 @@ // Sub-files #if defined(SLI_PSA_CONFIG_AUTOGEN_OVERRIDE_FILE) -#include SLI_PSA_CONFIG_AUTOGEN_OVERRIDE_FILE + #include SLI_PSA_CONFIG_AUTOGEN_OVERRIDE_FILE #else -#include "sli_psa_config_autogen.h" + #include "sli_psa_config_autogen.h" #endif #if defined(TFM_CONFIG_SL_SECURE_LIBRARY) -#include "sli_psa_tfm_translation.h" + #include "sli_psa_tfm_translation.h" #endif #if SL_MBEDTLS_DRIVERS_ENABLED -#include "sli_psa_acceleration.h" + #include "sli_psa_acceleration.h" #endif #include "sli_psa_builtin_config_autogen.h" diff --git a/matter/efr32/efr32mg24/BRD4187A/config/sl_openthread_ble_cli_config.h b/matter/efr32/efr32mg24/BRD4187A/config/sl_openthread_ble_cli_config.h deleted file mode 100644 index 8829fa9dab..0000000000 --- a/matter/efr32/efr32mg24/BRD4187A/config/sl_openthread_ble_cli_config.h +++ /dev/null @@ -1,36 +0,0 @@ -/***************************************************************************//** - * @file - * @brief OpenThread Bluetooth CLI configuration file. - ******************************************************************************* - * # License - * Copyright 2024 Silicon Laboratories Inc. www.silabs.com - ******************************************************************************* - * - * SPDX-License-Identifier: Zlib - * - * The licensor of this software is Silicon Laboratories Inc. - * - * This software is provided 'as-is', without any express or implied - * warranty. In no event will the authors be held liable for any damages - * arising from the use of this software. - * - * Permission is granted to anyone to use this software for any purpose, - * including commercial applications, and to alter it and redistribute it - * freely, subject to the following restrictions: - * - * 1. The origin of this software must not be misrepresented; you must not - * claim that you wrote the original software. If you use this software - * in a product, an acknowledgment in the product documentation would be - * appreciated but is not required. - * 2. Altered source versions must be plainly marked as such, and must not be - * misrepresented as being the original software. - * 3. This notice may not be removed or altered from any source distribution. - * - ******************************************************************************/ - -//-------- <<< Use Configuration Wizard in Context Menu >>> ----------------- -// -// Bluetooth CLI -#define SL_OPENTHREAD_BLE_CLI_ENABLE 1 -// -// <<< end of configuration section >>> diff --git a/matter/efr32/efr32mg24/BRD4187C/autogen/gatt_db.h b/matter/efr32/efr32mg24/BRD4187C/autogen/gatt_db.h index 3e608dd00b..bee94f4ef7 100644 --- a/matter/efr32/efr32mg24/BRD4187C/autogen/gatt_db.h +++ b/matter/efr32/efr32mg24/BRD4187C/autogen/gatt_db.h @@ -13,14 +13,14 @@ extern "C" { extern const sli_bt_gattdb_t gattdb; -#define gattdb_generic_attribute 1 -#define gattdb_service_changed_char 3 -#define gattdb_database_hash 6 -#define gattdb_client_support_features 8 -#define gattdb_device_name 11 -#define gattdb_CHIPoBLEChar_Rx 23 -#define gattdb_CHIPoBLEChar_Tx 25 -#define gattdb_CHIPoBLEChar_C3 28 +#define gattdb_generic_attribute 1 +#define gattdb_service_changed_char 3 +#define gattdb_database_hash 6 +#define gattdb_client_support_features 8 +#define gattdb_device_name 11 +#define gattdb_CHIPoBLEChar_Rx 23 +#define gattdb_CHIPoBLEChar_Tx 25 +#define gattdb_CHIPoBLEChar_C3 28 #if __cplusplus } diff --git a/matter/efr32/efr32mg24/BRD4187C/autogen/sl_event_handler.h b/matter/efr32/efr32mg24/BRD4187C/autogen/sl_event_handler.h index ef8751b80f..2333539d21 100644 --- a/matter/efr32/efr32mg24/BRD4187C/autogen/sl_event_handler.h +++ b/matter/efr32/efr32mg24/BRD4187C/autogen/sl_event_handler.h @@ -7,6 +7,5 @@ void sl_driver_init(void); void sl_service_init(void); void sl_stack_init(void); void sl_internal_app_init(void); -void sl_iostream_init_instances(void); #endif // SL_EVENT_HANDLER_H diff --git a/matter/efr32/efr32mg24/BRD4187C/autogen/sl_simple_led_instances.h b/matter/efr32/efr32mg24/BRD4187C/autogen/sl_simple_led_instances.h index 2fd553076e..afb5875eb6 100644 --- a/matter/efr32/efr32mg24/BRD4187C/autogen/sl_simple_led_instances.h +++ b/matter/efr32/efr32mg24/BRD4187C/autogen/sl_simple_led_instances.h @@ -1,4 +1,4 @@ -/***************************************************************************/ /** +/***************************************************************************//** * @file * @brief LED Driver Instances ******************************************************************************* @@ -41,7 +41,7 @@ extern const sl_led_t sl_led_led1; extern const sl_led_t *sl_simple_led_array[]; -#define SL_SIMPLE_LED_COUNT 2 +#define SL_SIMPLE_LED_COUNT 2 #define SL_SIMPLE_LED_INSTANCE(n) (sl_simple_led_array[n]) void sl_simple_led_init_instances(void); diff --git a/matter/efr32/efr32mg24/BRD4187C/autogen/sli_mbedtls_config_autogen.h b/matter/efr32/efr32mg24/BRD4187C/autogen/sli_mbedtls_config_autogen.h index 164bff9db4..ddda08f19f 100644 --- a/matter/efr32/efr32mg24/BRD4187C/autogen/sli_mbedtls_config_autogen.h +++ b/matter/efr32/efr32mg24/BRD4187C/autogen/sli_mbedtls_config_autogen.h @@ -43,4 +43,9 @@ #define MBEDTLS_PSA_CRYPTO_DRIVERS #define MBEDTLS_PSA_CRYPTO_STORAGE_C + + + + + #endif // SLI_MBEDTLS_CONFIG_AUTOGEN_H diff --git a/matter/efr32/efr32mg24/BRD4187C/autogen/sli_psa_builtin_config_autogen.h b/matter/efr32/efr32mg24/BRD4187C/autogen/sli_psa_builtin_config_autogen.h index 34f74fb60c..c8b70fad12 100644 --- a/matter/efr32/efr32mg24/BRD4187C/autogen/sli_psa_builtin_config_autogen.h +++ b/matter/efr32/efr32mg24/BRD4187C/autogen/sli_psa_builtin_config_autogen.h @@ -9,4 +9,5 @@ // #define MBEDTLS_PSA_BUILTIN_ALG_CMAC 1 // #define MBEDTLS_PSA_BUILTIN_ALG_PBKDF2_AES_CMAC_PRF_128 1 + #endif // SLI_PSA_BUILTIN_CONFIG_AUTOGEN_H diff --git a/matter/efr32/efr32mg24/BRD4187C/autogen/sli_psa_config_autogen.h b/matter/efr32/efr32mg24/BRD4187C/autogen/sli_psa_config_autogen.h index 038ab753c1..c2a379f438 100644 --- a/matter/efr32/efr32mg24/BRD4187C/autogen/sli_psa_config_autogen.h +++ b/matter/efr32/efr32mg24/BRD4187C/autogen/sli_psa_config_autogen.h @@ -3,25 +3,25 @@ #ifndef SLI_PSA_CONFIG_AUTOGEN_H #define SLI_PSA_CONFIG_AUTOGEN_H -#define PSA_WANT_KEY_TYPE_AES 1 -#define PSA_WANT_ALG_CCM 1 -#define PSA_WANT_ALG_ECB_NO_PADDING 1 -#define PSA_WANT_ALG_CMAC 1 -#define PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY 1 -#define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_BASIC 1 -#define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_IMPORT 1 -#define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_EXPORT 1 +#define PSA_WANT_KEY_TYPE_AES 1 +#define PSA_WANT_ALG_CCM 1 +#define PSA_WANT_ALG_ECB_NO_PADDING 1 +#define PSA_WANT_ALG_CMAC 1 +#define PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY 1 +#define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_BASIC 1 +#define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_IMPORT 1 +#define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_EXPORT 1 #define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_GENERATE 1 -#define PSA_WANT_ECC_SECP_R1_256 1 -#define PSA_WANT_ALG_ECDH 1 -#define PSA_WANT_ALG_ECDSA 1 -#define PSA_WANT_ALG_HKDF 1 -#define PSA_WANT_ALG_HMAC 1 -#define PSA_WANT_KEY_TYPE_HMAC 1 -#define PSA_WANT_ALG_PBKDF2_AES_CMAC_PRF_128 1 -#define PSA_WANT_ALG_SHA_256 1 -#define PSA_WANT_ALG_TLS12_PRF 1 -#define PSA_WANT_ALG_TLS12_PSK_TO_MS 1 +#define PSA_WANT_ECC_SECP_R1_256 1 +#define PSA_WANT_ALG_ECDH 1 +#define PSA_WANT_ALG_ECDSA 1 +#define PSA_WANT_ALG_HKDF 1 +#define PSA_WANT_ALG_HMAC 1 +#define PSA_WANT_KEY_TYPE_HMAC 1 +#define PSA_WANT_ALG_PBKDF2_AES_CMAC_PRF_128 1 +#define PSA_WANT_ALG_SHA_256 1 +#define PSA_WANT_ALG_TLS12_PRF 1 +#define PSA_WANT_ALG_TLS12_PSK_TO_MS 1 #define MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG #define MBEDTLS_PSA_KEY_SLOT_COUNT (2 + 15 + 1 + SL_PSA_KEY_USER_SLOT_COUNT) diff --git a/matter/efr32/efr32mg24/BRD4187C/config/nvm3_default_config.h b/matter/efr32/efr32mg24/BRD4187C/config/nvm3_default_config.h index 809138ecd8..2bf415f943 100644 --- a/matter/efr32/efr32mg24/BRD4187C/config/nvm3_default_config.h +++ b/matter/efr32/efr32mg24/BRD4187C/config/nvm3_default_config.h @@ -11,14 +11,14 @@ // should be equal to or higher than the number of NVM3 objects in the // default NVM3 instance. // Default: 200 -#define NVM3_DEFAULT_CACHE_SIZE 200 +#define NVM3_DEFAULT_CACHE_SIZE 200 #endif #ifndef NVM3_DEFAULT_MAX_OBJECT_SIZE // NVM3 Default Instance Max Object Size // Max NVM3 object size that can be stored. // Default: 254 -#define NVM3_DEFAULT_MAX_OBJECT_SIZE 4092 +#define NVM3_DEFAULT_MAX_OBJECT_SIZE 4092 #endif #ifndef NVM3_DEFAULT_REPACK_HEADROOM @@ -27,7 +27,7 @@ // repack limit should be placed. The default is 0, which means the user and // forced repack limits are equal. // Default: 0 -#define NVM3_DEFAULT_REPACK_HEADROOM 0 +#define NVM3_DEFAULT_REPACK_HEADROOM 0 #endif #ifndef NVM3_DEFAULT_NVM_SIZE @@ -35,7 +35,7 @@ // Size of the NVM3 storage region in flash. This size should be aligned with // the flash page size of the device. // Default: 40960 -#define NVM3_DEFAULT_NVM_SIZE 40960 +#define NVM3_DEFAULT_NVM_SIZE 40960 #endif // diff --git a/matter/efr32/efr32mg24/BRD4187C/config/psa_crypto_config.h b/matter/efr32/efr32mg24/BRD4187C/config/psa_crypto_config.h index cf09cf76e4..44dc70284f 100644 --- a/matter/efr32/efr32mg24/BRD4187C/config/psa_crypto_config.h +++ b/matter/efr32/efr32mg24/BRD4187C/config/psa_crypto_config.h @@ -25,7 +25,7 @@ // gracefully in case an application opens more than its declared amount of // keys, thereby precluding the stack from functioning. // Default: 4 -#define SL_PSA_KEY_USER_SLOT_COUNT (4) +#define SL_PSA_KEY_USER_SLOT_COUNT (4) // PSA Maximum User Persistent Keys Count <0-1024> // Maximum amount of keys (or other files) that can be stored persistently @@ -48,7 +48,7 @@ // and if SL_PSA_ITS_USER_MAX_FILES is changed, ITS should be cleared and // all files need to be stored again. // Default: 128 -#define SL_PSA_ITS_USER_MAX_FILES (128) +#define SL_PSA_ITS_USER_MAX_FILES (128) // Enable V1 Format Support For ITS Files <0-1> // Devices that used PSA ITS together with gecko_sdk_3.1.x or earlier @@ -105,7 +105,7 @@ // It is recommended to only use the PUF key for deriving further key // material. // Default: PSA_ALG_PBKDF2_AES_CMAC_PRF_128 -#define SL_CRYPTOACC_BUILTIN_KEY_PUF_ALG (PSA_ALG_PBKDF2_AES_CMAC_PRF_128) +#define SL_CRYPTOACC_BUILTIN_KEY_PUF_ALG (PSA_ALG_PBKDF2_AES_CMAC_PRF_128) #endif // SL_CRYPTOACC_BUILTIN_KEY_PUF_ALG // @@ -127,7 +127,7 @@ // to be included in the project. // // Default: 0 -#define SL_VSE_BUFFER_TRNG_DATA_DURING_SLEEP (0) +#define SL_VSE_BUFFER_TRNG_DATA_DURING_SLEEP (0) // Number of random words to buffer before putting the device to sleep <1-63> // This option can be used to decrease the amount of random words that @@ -152,17 +152,17 @@ // Sub-files #if defined(SLI_PSA_CONFIG_AUTOGEN_OVERRIDE_FILE) -#include SLI_PSA_CONFIG_AUTOGEN_OVERRIDE_FILE + #include SLI_PSA_CONFIG_AUTOGEN_OVERRIDE_FILE #else -#include "sli_psa_config_autogen.h" + #include "sli_psa_config_autogen.h" #endif #if defined(TFM_CONFIG_SL_SECURE_LIBRARY) -#include "sli_psa_tfm_translation.h" + #include "sli_psa_tfm_translation.h" #endif #if SL_MBEDTLS_DRIVERS_ENABLED -#include "sli_psa_acceleration.h" + #include "sli_psa_acceleration.h" #endif #include "sli_psa_builtin_config_autogen.h" diff --git a/matter/efr32/efr32mg24/BRD4187C/config/sl_bt_rtos_config.h b/matter/efr32/efr32mg24/BRD4187C/config/sl_bt_rtos_config.h index d522a1a0dc..c87ca11c3b 100644 --- a/matter/efr32/efr32mg24/BRD4187C/config/sl_bt_rtos_config.h +++ b/matter/efr32/efr32mg24/BRD4187C/config/sl_bt_rtos_config.h @@ -1,4 +1,4 @@ -/***************************************************************************/ /** +/***************************************************************************//** * @file * @brief Bluetooth RTOS configuration ******************************************************************************* @@ -40,38 +40,38 @@ // Define the priority of the Bluetooth link layer task. This must be a valid // priority value from CMSIS-RTOS2 osPriority_t definition. The link layer // task must have the highest priority in these three Bluetooth RTOS tasks. -#define SL_BT_RTOS_LINK_LAYER_TASK_PRIORITY (52) +#define SL_BT_RTOS_LINK_LAYER_TASK_PRIORITY (52) // Bluetooth link layer task stack size in bytes // Default: 1000 // Define the stack size of the Bluetooth link layer task. The value is in bytes // and will be word aligned when it is applied at the task creation. -#define SL_BT_RTOS_LINK_LAYER_TASK_STACK_SIZE 1024 +#define SL_BT_RTOS_LINK_LAYER_TASK_STACK_SIZE 1024 // Bluetooth host stack task priority // Default: 51 (CMSIS-RTOS2 osPriorityRealtime3) // Define the priority of the Bluetooth host stack task. This must be a // valid priority value from CMSIS-RTOS2 osPriority_t definition. -#define SL_BT_RTOS_HOST_STACK_TASK_PRIORITY (51) +#define SL_BT_RTOS_HOST_STACK_TASK_PRIORITY (51) // Bluetooth host stack task stack size in bytes // Default: 2000 // Define the stack size of the Bluetooth host stack task. The value is in bytes // and will be word aligned when it is applied at the task creation. -#define SL_BT_RTOS_HOST_STACK_TASK_STACK_SIZE 2048 +#define SL_BT_RTOS_HOST_STACK_TASK_STACK_SIZE 2048 // Bluetooth event handler task priority // Default: 50 (CMSIS-RTOS2 osPriorityRealtime2) // Define the priority of the Bluetooth event handler task. This must be a // valid priority value from CMSIS-RTOS2 osPriority_t definition. The event // handler task must have the lowest priority in these three Bluetooth RTOS tasks. -#define SL_BT_RTOS_EVENT_HANDLER_TASK_PRIORITY (50) +#define SL_BT_RTOS_EVENT_HANDLER_TASK_PRIORITY (50) // Bluetooth event handler task stack size in bytes // Default: 1000 // Define the stack size of the Bluetooth event handler task. The value is in bytes // and will be word aligned when it is applied at the task creation. -#define SL_BT_RTOS_EVENT_HANDLER_STACK_SIZE 1536 +#define SL_BT_RTOS_EVENT_HANDLER_STACK_SIZE 1536 // End Priority Configuration for Bluetooth RTOS Tasks diff --git a/matter/efr32/efr32mg24/BRD4187C/config/sl_mbedtls_config.h b/matter/efr32/efr32mg24/BRD4187C/config/sl_mbedtls_config.h index 486b71d744..b6872e6d1a 100644 --- a/matter/efr32/efr32mg24/BRD4187C/config/sl_mbedtls_config.h +++ b/matter/efr32/efr32mg24/BRD4187C/config/sl_mbedtls_config.h @@ -1,5 +1,6 @@ #ifndef SL_MBEDTLS_CONFIG_H #define SL_MBEDTLS_CONFIG_H + // ----------------------------------------------------------------------------- // User exposed config options @@ -11,55 +12,55 @@ // Default: MBEDTLS_TLS_ECJPAKE_WITH_AES_128_CCM_8 // Complete list of ciphersuites to use, in order of preference. // The value of this configuration should be updated for the application needs. -#define MBEDTLS_SSL_CIPHERSUITES MBEDTLS_TLS_ECJPAKE_WITH_AES_128_CCM_8 +#define MBEDTLS_SSL_CIPHERSUITES MBEDTLS_TLS_ECJPAKE_WITH_AES_128_CCM_8 // Maximum TLS/DTLS fragment length in bytes (input). // Default: 768 // The size configured here determines the size of the internal I/O // buffer used in mbedTLS when receiving data. -#define SL_MBEDTLS_SSL_IN_CONTENT_LEN 768 +#define SL_MBEDTLS_SSL_IN_CONTENT_LEN 768 // Maximum TLS/DTLS fragment length in bytes (output). // Default: 768 // The size configured here determines the size of the internal I/O // buffer used in mbedTLS when sending data. -#define SL_MBEDTLS_SSL_OUT_CONTENT_LEN 768 +#define SL_MBEDTLS_SSL_OUT_CONTENT_LEN 768 // Enable support for RFC 6066 max_fragment_length extension in SSL. // Default: 1 // Enable support for RFC 6066 max_fragment_length extension in SSL. -#define SL_MBEDTLS_SSL_MAX_FRAGMENT_LENGTH 1 +#define SL_MBEDTLS_SSL_MAX_FRAGMENT_LENGTH 1 // Enable support for exporting key block and master secret. // Default: 1 // Enable support for exporting key block and master secret. // This is required for certain users of TLS, e.g. EAP-TLS. -#define SL_MBEDTLS_SSL_EXPORT_KEYS 1 +#define SL_MBEDTLS_SSL_EXPORT_KEYS 1 // Enable the PSK based ciphersuite modes in SSL / TLS. // Default: 0 // Enable the PSK based ciphersuite modes in SSL / TLS. -#define SL_MBEDTLS_KEY_EXCHANGE_PSK_ENABLED 1 +#define SL_MBEDTLS_KEY_EXCHANGE_PSK_ENABLED 1 // Enable the ECDHE-PSK based ciphersuite modes in SSL / TLS. // Default: 0 // Enable the ECDHE-PSK based ciphersuite modes in SSL / TLS. -#define SL_MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED 0 +#define SL_MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED 0 // Enable the ECDHE-ECDSA based ciphersuite modes in SSL / TLS. // Default: 0 // Enable the ECDHE-ECDSA based ciphersuite modes in SSL / TLS. -#define SL_MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED 0 +#define SL_MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED 0 // Enable the ECDHE-RSA based ciphersuite modes in SSL / TLS. // Default: 0 // Enable the ECDHE-RSA based ciphersuite modes in SSL / TLS. -#define SL_MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED 0 +#define SL_MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED 0 // Enable the ECDH-ECDSA based ciphersuite modes in SSL / TLS. // Default: 0 // Enable the ECDH-ECDSA based ciphersuite modes in SSL / TLS. -#define SL_MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED 0 +#define SL_MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED 0 // Enable parsing of the compressed curves. // Default: 0 @@ -94,15 +95,15 @@ // Sub-files #if defined(SLI_MBEDTLS_CONFIG_AUTOGEN_OVERRIDE_FILE) -#include SLI_MBEDTLS_CONFIG_AUTOGEN_OVERRIDE_FILE + #include SLI_MBEDTLS_CONFIG_AUTOGEN_OVERRIDE_FILE #else -#include "sli_mbedtls_config_autogen.h" + #include "sli_mbedtls_config_autogen.h" #endif #include "sli_mbedtls_omnipresent.h" #if SL_MBEDTLS_DRIVERS_ENABLED -#include "sli_mbedtls_acceleration.h" + #include "sli_mbedtls_acceleration.h" #endif #include "sl_mbedtls_device_config.h" diff --git a/matter/efr32/efr32mg24/BRD4187C/config/sl_memory_manager_region_config.h b/matter/efr32/efr32mg24/BRD4187C/config/sl_memory_manager_region_config.h index e360f56e0d..f34bb11775 100644 --- a/matter/efr32/efr32mg24/BRD4187C/config/sl_memory_manager_region_config.h +++ b/matter/efr32/efr32mg24/BRD4187C/config/sl_memory_manager_region_config.h @@ -1,4 +1,4 @@ -/***************************************************************************/ /** +/***************************************************************************//** * @file * @brief Memory Heap and stack size configuration file. ******************************************************************************* diff --git a/matter/efr32/efr32mg26/BRD2608A/autogen/gatt_db.h b/matter/efr32/efr32mg26/BRD2608A/autogen/gatt_db.h index 21f9f25f8e..bee94f4ef7 100644 --- a/matter/efr32/efr32mg26/BRD2608A/autogen/gatt_db.h +++ b/matter/efr32/efr32mg26/BRD2608A/autogen/gatt_db.h @@ -5,6 +5,10 @@ #ifndef __GATT_DB_H #define __GATT_DB_H +#if __cplusplus +extern "C" { +#endif + #include "sli_bt_gattdb_def.h" extern const sli_bt_gattdb_t gattdb; @@ -18,5 +22,8 @@ extern const sli_bt_gattdb_t gattdb; #define gattdb_CHIPoBLEChar_Tx 25 #define gattdb_CHIPoBLEChar_C3 28 +#if __cplusplus +} +#endif #endif // __GATT_DB_H diff --git a/matter/efr32/efr32mg26/BRD2608A/autogen/sl_event_handler.h b/matter/efr32/efr32mg26/BRD2608A/autogen/sl_event_handler.h index ef8751b80f..2333539d21 100644 --- a/matter/efr32/efr32mg26/BRD2608A/autogen/sl_event_handler.h +++ b/matter/efr32/efr32mg26/BRD2608A/autogen/sl_event_handler.h @@ -7,6 +7,5 @@ void sl_driver_init(void); void sl_service_init(void); void sl_stack_init(void); void sl_internal_app_init(void); -void sl_iostream_init_instances(void); #endif // SL_EVENT_HANDLER_H diff --git a/matter/efr32/efr32mg26/BRD2608A/autogen/sl_simple_led_instances.h b/matter/efr32/efr32mg26/BRD2608A/autogen/sl_simple_led_instances.h index 2fd553076e..afb5875eb6 100644 --- a/matter/efr32/efr32mg26/BRD2608A/autogen/sl_simple_led_instances.h +++ b/matter/efr32/efr32mg26/BRD2608A/autogen/sl_simple_led_instances.h @@ -1,4 +1,4 @@ -/***************************************************************************/ /** +/***************************************************************************//** * @file * @brief LED Driver Instances ******************************************************************************* @@ -41,7 +41,7 @@ extern const sl_led_t sl_led_led1; extern const sl_led_t *sl_simple_led_array[]; -#define SL_SIMPLE_LED_COUNT 2 +#define SL_SIMPLE_LED_COUNT 2 #define SL_SIMPLE_LED_INSTANCE(n) (sl_simple_led_array[n]) void sl_simple_led_init_instances(void); diff --git a/matter/efr32/efr32mg26/BRD2608A/autogen/sli_mbedtls_config_autogen.h b/matter/efr32/efr32mg26/BRD2608A/autogen/sli_mbedtls_config_autogen.h index 164bff9db4..ddda08f19f 100644 --- a/matter/efr32/efr32mg26/BRD2608A/autogen/sli_mbedtls_config_autogen.h +++ b/matter/efr32/efr32mg26/BRD2608A/autogen/sli_mbedtls_config_autogen.h @@ -43,4 +43,9 @@ #define MBEDTLS_PSA_CRYPTO_DRIVERS #define MBEDTLS_PSA_CRYPTO_STORAGE_C + + + + + #endif // SLI_MBEDTLS_CONFIG_AUTOGEN_H diff --git a/matter/efr32/efr32mg26/BRD2608A/autogen/sli_psa_builtin_config_autogen.h b/matter/efr32/efr32mg26/BRD2608A/autogen/sli_psa_builtin_config_autogen.h index 34f74fb60c..c8b70fad12 100644 --- a/matter/efr32/efr32mg26/BRD2608A/autogen/sli_psa_builtin_config_autogen.h +++ b/matter/efr32/efr32mg26/BRD2608A/autogen/sli_psa_builtin_config_autogen.h @@ -9,4 +9,5 @@ // #define MBEDTLS_PSA_BUILTIN_ALG_CMAC 1 // #define MBEDTLS_PSA_BUILTIN_ALG_PBKDF2_AES_CMAC_PRF_128 1 + #endif // SLI_PSA_BUILTIN_CONFIG_AUTOGEN_H diff --git a/matter/efr32/efr32mg26/BRD2608A/autogen/sli_psa_config_autogen.h b/matter/efr32/efr32mg26/BRD2608A/autogen/sli_psa_config_autogen.h index 038ab753c1..c2a379f438 100644 --- a/matter/efr32/efr32mg26/BRD2608A/autogen/sli_psa_config_autogen.h +++ b/matter/efr32/efr32mg26/BRD2608A/autogen/sli_psa_config_autogen.h @@ -3,25 +3,25 @@ #ifndef SLI_PSA_CONFIG_AUTOGEN_H #define SLI_PSA_CONFIG_AUTOGEN_H -#define PSA_WANT_KEY_TYPE_AES 1 -#define PSA_WANT_ALG_CCM 1 -#define PSA_WANT_ALG_ECB_NO_PADDING 1 -#define PSA_WANT_ALG_CMAC 1 -#define PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY 1 -#define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_BASIC 1 -#define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_IMPORT 1 -#define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_EXPORT 1 +#define PSA_WANT_KEY_TYPE_AES 1 +#define PSA_WANT_ALG_CCM 1 +#define PSA_WANT_ALG_ECB_NO_PADDING 1 +#define PSA_WANT_ALG_CMAC 1 +#define PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY 1 +#define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_BASIC 1 +#define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_IMPORT 1 +#define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_EXPORT 1 #define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_GENERATE 1 -#define PSA_WANT_ECC_SECP_R1_256 1 -#define PSA_WANT_ALG_ECDH 1 -#define PSA_WANT_ALG_ECDSA 1 -#define PSA_WANT_ALG_HKDF 1 -#define PSA_WANT_ALG_HMAC 1 -#define PSA_WANT_KEY_TYPE_HMAC 1 -#define PSA_WANT_ALG_PBKDF2_AES_CMAC_PRF_128 1 -#define PSA_WANT_ALG_SHA_256 1 -#define PSA_WANT_ALG_TLS12_PRF 1 -#define PSA_WANT_ALG_TLS12_PSK_TO_MS 1 +#define PSA_WANT_ECC_SECP_R1_256 1 +#define PSA_WANT_ALG_ECDH 1 +#define PSA_WANT_ALG_ECDSA 1 +#define PSA_WANT_ALG_HKDF 1 +#define PSA_WANT_ALG_HMAC 1 +#define PSA_WANT_KEY_TYPE_HMAC 1 +#define PSA_WANT_ALG_PBKDF2_AES_CMAC_PRF_128 1 +#define PSA_WANT_ALG_SHA_256 1 +#define PSA_WANT_ALG_TLS12_PRF 1 +#define PSA_WANT_ALG_TLS12_PSK_TO_MS 1 #define MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG #define MBEDTLS_PSA_KEY_SLOT_COUNT (2 + 15 + 1 + SL_PSA_KEY_USER_SLOT_COUNT) diff --git a/matter/efr32/efr32mg26/BRD2608A/config/psa_crypto_config.h b/matter/efr32/efr32mg26/BRD2608A/config/psa_crypto_config.h index cf09cf76e4..20703b41d2 100644 --- a/matter/efr32/efr32mg26/BRD2608A/config/psa_crypto_config.h +++ b/matter/efr32/efr32mg26/BRD2608A/config/psa_crypto_config.h @@ -25,7 +25,7 @@ // gracefully in case an application opens more than its declared amount of // keys, thereby precluding the stack from functioning. // Default: 4 -#define SL_PSA_KEY_USER_SLOT_COUNT (4) +#define SL_PSA_KEY_USER_SLOT_COUNT (4) // PSA Maximum User Persistent Keys Count <0-1024> // Maximum amount of keys (or other files) that can be stored persistently @@ -48,7 +48,7 @@ // and if SL_PSA_ITS_USER_MAX_FILES is changed, ITS should be cleared and // all files need to be stored again. // Default: 128 -#define SL_PSA_ITS_USER_MAX_FILES (128) +#define SL_PSA_ITS_USER_MAX_FILES (128) // Enable V1 Format Support For ITS Files <0-1> // Devices that used PSA ITS together with gecko_sdk_3.1.x or earlier @@ -56,7 +56,7 @@ // If no v1 files are used, its support can be disabled for space // optimization. // Default: 0 -#define SL_PSA_ITS_SUPPORT_V1_DRIVER 1 +#define SL_PSA_ITS_SUPPORT_V1_DRIVER 0 // Enable V2 ITS Driver Support <0-1> // Devices that have used GSDK 4.1.x and earlier, and used ITS have the keys @@ -69,7 +69,7 @@ // driver before in GSDK 4.1.x and earlier, or the keys has been already // migrated. // Default: 0 -#define SL_PSA_ITS_SUPPORT_V2_DRIVER 1 +#define SL_PSA_ITS_SUPPORT_V2_DRIVER 0 // Enable support for V3 ITS Driver <0-1> // Devices that have used GSDK 4.1.x and earlier, and used ITS have the keys @@ -105,7 +105,7 @@ // It is recommended to only use the PUF key for deriving further key // material. // Default: PSA_ALG_PBKDF2_AES_CMAC_PRF_128 -#define SL_CRYPTOACC_BUILTIN_KEY_PUF_ALG (PSA_ALG_PBKDF2_AES_CMAC_PRF_128) +#define SL_CRYPTOACC_BUILTIN_KEY_PUF_ALG (PSA_ALG_PBKDF2_AES_CMAC_PRF_128) #endif // SL_CRYPTOACC_BUILTIN_KEY_PUF_ALG // @@ -127,7 +127,7 @@ // to be included in the project. // // Default: 0 -#define SL_VSE_BUFFER_TRNG_DATA_DURING_SLEEP (0) +#define SL_VSE_BUFFER_TRNG_DATA_DURING_SLEEP (0) // Number of random words to buffer before putting the device to sleep <1-63> // This option can be used to decrease the amount of random words that @@ -152,17 +152,17 @@ // Sub-files #if defined(SLI_PSA_CONFIG_AUTOGEN_OVERRIDE_FILE) -#include SLI_PSA_CONFIG_AUTOGEN_OVERRIDE_FILE + #include SLI_PSA_CONFIG_AUTOGEN_OVERRIDE_FILE #else -#include "sli_psa_config_autogen.h" + #include "sli_psa_config_autogen.h" #endif #if defined(TFM_CONFIG_SL_SECURE_LIBRARY) -#include "sli_psa_tfm_translation.h" + #include "sli_psa_tfm_translation.h" #endif #if SL_MBEDTLS_DRIVERS_ENABLED -#include "sli_psa_acceleration.h" + #include "sli_psa_acceleration.h" #endif #include "sli_psa_builtin_config_autogen.h" diff --git a/matter/efr32/efr32mg26/BRD2608A/config/sl_bt_rtos_config.h b/matter/efr32/efr32mg26/BRD2608A/config/sl_bt_rtos_config.h index c87ca11c3b..a0ef9988b1 100644 --- a/matter/efr32/efr32mg26/BRD2608A/config/sl_bt_rtos_config.h +++ b/matter/efr32/efr32mg26/BRD2608A/config/sl_bt_rtos_config.h @@ -46,7 +46,7 @@ // Default: 1000 // Define the stack size of the Bluetooth link layer task. The value is in bytes // and will be word aligned when it is applied at the task creation. -#define SL_BT_RTOS_LINK_LAYER_TASK_STACK_SIZE 1024 +#define SL_BT_RTOS_LINK_LAYER_TASK_STACK_SIZE (1024) // Bluetooth host stack task priority // Default: 51 (CMSIS-RTOS2 osPriorityRealtime3) @@ -58,7 +58,7 @@ // Default: 2000 // Define the stack size of the Bluetooth host stack task. The value is in bytes // and will be word aligned when it is applied at the task creation. -#define SL_BT_RTOS_HOST_STACK_TASK_STACK_SIZE 2048 +#define SL_BT_RTOS_HOST_STACK_TASK_STACK_SIZE (2048) // Bluetooth event handler task priority // Default: 50 (CMSIS-RTOS2 osPriorityRealtime2) @@ -71,7 +71,7 @@ // Default: 1000 // Define the stack size of the Bluetooth event handler task. The value is in bytes // and will be word aligned when it is applied at the task creation. -#define SL_BT_RTOS_EVENT_HANDLER_STACK_SIZE 1536 +#define SL_BT_RTOS_EVENT_HANDLER_STACK_SIZE (1536) // End Priority Configuration for Bluetooth RTOS Tasks diff --git a/matter/efr32/efr32mg26/BRD2608A/config/sl_device_init_dcdc_config.h b/matter/efr32/efr32mg26/BRD2608A/config/sl_device_init_dcdc_config.h deleted file mode 100644 index 4fb88397d2..0000000000 --- a/matter/efr32/efr32mg26/BRD2608A/config/sl_device_init_dcdc_config.h +++ /dev/null @@ -1,58 +0,0 @@ -/***************************************************************************//** - * @file - * @brief DEVICE_INIT_DCDC Config - ******************************************************************************* - * # License - * Copyright 2022 Silicon Laboratories Inc. www.silabs.com - ******************************************************************************* - * - * SPDX-License-Identifier: Zlib - * - * The licensor of this software is Silicon Laboratories Inc. - * - * This software is provided 'as-is', without any express or implied - * warranty. In no event will the authors be held liable for any damages - * arising from the use of this software. - * - * Permission is granted to anyone to use this software for any purpose, - * including commercial applications, and to alter it and redistribute it - * freely, subject to the following restrictions: - * - * 1. The origin of this software must not be misrepresented; you must not - * claim that you wrote the original software. If you use this software - * in a product, an acknowledgment in the product documentation would be - * appreciated but is not required. - * 2. Altered source versions must be plainly marked as such, and must not be - * misrepresented as being the original software. - * 3. This notice may not be removed or altered from any source distribution. - * - ******************************************************************************/ - -#ifndef SL_DEVICE_INIT_DCDC_CONFIG_H -#define SL_DEVICE_INIT_DCDC_CONFIG_H - -// <<< Use Configuration Wizard in Context Menu >>> - -// Enable DC/DC Converter -// -// Default: 1 -#define SL_DEVICE_INIT_DCDC_ENABLE 1 - -// Set DC/DC Converter in Bypass Mode -// -// Default: 0 -#define SL_DEVICE_INIT_DCDC_BYPASS 0 - -// Override for DCDC PFMX Mode Peak Current Setting -// -// Default: 1 -#define SL_DEVICE_INIT_DCDC_PFMX_IPKVAL_OVERRIDE 1 - -// DCDC PFMX Mode Peak Current Setting <0-15> -// -// Default: DCDC_PFMXCTRL_IPKVAL_DEFAULT -#define SL_DEVICE_INIT_DCDC_PFMX_IPKVAL 12 - -// <<< end of configuration section >>> - -#endif // SL_DEVICE_INIT_DCDC_CONFIG_H diff --git a/matter/efr32/efr32mg26/BRD4116A/autogen/gatt_db.h b/matter/efr32/efr32mg26/BRD4116A/autogen/gatt_db.h index 3e608dd00b..bee94f4ef7 100644 --- a/matter/efr32/efr32mg26/BRD4116A/autogen/gatt_db.h +++ b/matter/efr32/efr32mg26/BRD4116A/autogen/gatt_db.h @@ -13,14 +13,14 @@ extern "C" { extern const sli_bt_gattdb_t gattdb; -#define gattdb_generic_attribute 1 -#define gattdb_service_changed_char 3 -#define gattdb_database_hash 6 -#define gattdb_client_support_features 8 -#define gattdb_device_name 11 -#define gattdb_CHIPoBLEChar_Rx 23 -#define gattdb_CHIPoBLEChar_Tx 25 -#define gattdb_CHIPoBLEChar_C3 28 +#define gattdb_generic_attribute 1 +#define gattdb_service_changed_char 3 +#define gattdb_database_hash 6 +#define gattdb_client_support_features 8 +#define gattdb_device_name 11 +#define gattdb_CHIPoBLEChar_Rx 23 +#define gattdb_CHIPoBLEChar_Tx 25 +#define gattdb_CHIPoBLEChar_C3 28 #if __cplusplus } diff --git a/matter/efr32/efr32mg26/BRD4116A/autogen/sl_event_handler.h b/matter/efr32/efr32mg26/BRD4116A/autogen/sl_event_handler.h index ef8751b80f..2333539d21 100644 --- a/matter/efr32/efr32mg26/BRD4116A/autogen/sl_event_handler.h +++ b/matter/efr32/efr32mg26/BRD4116A/autogen/sl_event_handler.h @@ -7,6 +7,5 @@ void sl_driver_init(void); void sl_service_init(void); void sl_stack_init(void); void sl_internal_app_init(void); -void sl_iostream_init_instances(void); #endif // SL_EVENT_HANDLER_H diff --git a/matter/efr32/efr32mg26/BRD4116A/autogen/sl_simple_led_instances.h b/matter/efr32/efr32mg26/BRD4116A/autogen/sl_simple_led_instances.h index 2fd553076e..afb5875eb6 100644 --- a/matter/efr32/efr32mg26/BRD4116A/autogen/sl_simple_led_instances.h +++ b/matter/efr32/efr32mg26/BRD4116A/autogen/sl_simple_led_instances.h @@ -1,4 +1,4 @@ -/***************************************************************************/ /** +/***************************************************************************//** * @file * @brief LED Driver Instances ******************************************************************************* @@ -41,7 +41,7 @@ extern const sl_led_t sl_led_led1; extern const sl_led_t *sl_simple_led_array[]; -#define SL_SIMPLE_LED_COUNT 2 +#define SL_SIMPLE_LED_COUNT 2 #define SL_SIMPLE_LED_INSTANCE(n) (sl_simple_led_array[n]) void sl_simple_led_init_instances(void); diff --git a/matter/efr32/efr32mg26/BRD4116A/autogen/sli_mbedtls_config_autogen.h b/matter/efr32/efr32mg26/BRD4116A/autogen/sli_mbedtls_config_autogen.h index 164bff9db4..ddda08f19f 100644 --- a/matter/efr32/efr32mg26/BRD4116A/autogen/sli_mbedtls_config_autogen.h +++ b/matter/efr32/efr32mg26/BRD4116A/autogen/sli_mbedtls_config_autogen.h @@ -43,4 +43,9 @@ #define MBEDTLS_PSA_CRYPTO_DRIVERS #define MBEDTLS_PSA_CRYPTO_STORAGE_C + + + + + #endif // SLI_MBEDTLS_CONFIG_AUTOGEN_H diff --git a/matter/efr32/efr32mg26/BRD4116A/autogen/sli_psa_builtin_config_autogen.h b/matter/efr32/efr32mg26/BRD4116A/autogen/sli_psa_builtin_config_autogen.h index 34f74fb60c..c8b70fad12 100644 --- a/matter/efr32/efr32mg26/BRD4116A/autogen/sli_psa_builtin_config_autogen.h +++ b/matter/efr32/efr32mg26/BRD4116A/autogen/sli_psa_builtin_config_autogen.h @@ -9,4 +9,5 @@ // #define MBEDTLS_PSA_BUILTIN_ALG_CMAC 1 // #define MBEDTLS_PSA_BUILTIN_ALG_PBKDF2_AES_CMAC_PRF_128 1 + #endif // SLI_PSA_BUILTIN_CONFIG_AUTOGEN_H diff --git a/matter/efr32/efr32mg26/BRD4116A/autogen/sli_psa_config_autogen.h b/matter/efr32/efr32mg26/BRD4116A/autogen/sli_psa_config_autogen.h index 038ab753c1..c2a379f438 100644 --- a/matter/efr32/efr32mg26/BRD4116A/autogen/sli_psa_config_autogen.h +++ b/matter/efr32/efr32mg26/BRD4116A/autogen/sli_psa_config_autogen.h @@ -3,25 +3,25 @@ #ifndef SLI_PSA_CONFIG_AUTOGEN_H #define SLI_PSA_CONFIG_AUTOGEN_H -#define PSA_WANT_KEY_TYPE_AES 1 -#define PSA_WANT_ALG_CCM 1 -#define PSA_WANT_ALG_ECB_NO_PADDING 1 -#define PSA_WANT_ALG_CMAC 1 -#define PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY 1 -#define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_BASIC 1 -#define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_IMPORT 1 -#define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_EXPORT 1 +#define PSA_WANT_KEY_TYPE_AES 1 +#define PSA_WANT_ALG_CCM 1 +#define PSA_WANT_ALG_ECB_NO_PADDING 1 +#define PSA_WANT_ALG_CMAC 1 +#define PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY 1 +#define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_BASIC 1 +#define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_IMPORT 1 +#define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_EXPORT 1 #define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_GENERATE 1 -#define PSA_WANT_ECC_SECP_R1_256 1 -#define PSA_WANT_ALG_ECDH 1 -#define PSA_WANT_ALG_ECDSA 1 -#define PSA_WANT_ALG_HKDF 1 -#define PSA_WANT_ALG_HMAC 1 -#define PSA_WANT_KEY_TYPE_HMAC 1 -#define PSA_WANT_ALG_PBKDF2_AES_CMAC_PRF_128 1 -#define PSA_WANT_ALG_SHA_256 1 -#define PSA_WANT_ALG_TLS12_PRF 1 -#define PSA_WANT_ALG_TLS12_PSK_TO_MS 1 +#define PSA_WANT_ECC_SECP_R1_256 1 +#define PSA_WANT_ALG_ECDH 1 +#define PSA_WANT_ALG_ECDSA 1 +#define PSA_WANT_ALG_HKDF 1 +#define PSA_WANT_ALG_HMAC 1 +#define PSA_WANT_KEY_TYPE_HMAC 1 +#define PSA_WANT_ALG_PBKDF2_AES_CMAC_PRF_128 1 +#define PSA_WANT_ALG_SHA_256 1 +#define PSA_WANT_ALG_TLS12_PRF 1 +#define PSA_WANT_ALG_TLS12_PSK_TO_MS 1 #define MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG #define MBEDTLS_PSA_KEY_SLOT_COUNT (2 + 15 + 1 + SL_PSA_KEY_USER_SLOT_COUNT) diff --git a/matter/efr32/efr32mg26/BRD4116A/config/psa_crypto_config.h b/matter/efr32/efr32mg26/BRD4116A/config/psa_crypto_config.h index cf09cf76e4..20703b41d2 100644 --- a/matter/efr32/efr32mg26/BRD4116A/config/psa_crypto_config.h +++ b/matter/efr32/efr32mg26/BRD4116A/config/psa_crypto_config.h @@ -25,7 +25,7 @@ // gracefully in case an application opens more than its declared amount of // keys, thereby precluding the stack from functioning. // Default: 4 -#define SL_PSA_KEY_USER_SLOT_COUNT (4) +#define SL_PSA_KEY_USER_SLOT_COUNT (4) // PSA Maximum User Persistent Keys Count <0-1024> // Maximum amount of keys (or other files) that can be stored persistently @@ -48,7 +48,7 @@ // and if SL_PSA_ITS_USER_MAX_FILES is changed, ITS should be cleared and // all files need to be stored again. // Default: 128 -#define SL_PSA_ITS_USER_MAX_FILES (128) +#define SL_PSA_ITS_USER_MAX_FILES (128) // Enable V1 Format Support For ITS Files <0-1> // Devices that used PSA ITS together with gecko_sdk_3.1.x or earlier @@ -56,7 +56,7 @@ // If no v1 files are used, its support can be disabled for space // optimization. // Default: 0 -#define SL_PSA_ITS_SUPPORT_V1_DRIVER 1 +#define SL_PSA_ITS_SUPPORT_V1_DRIVER 0 // Enable V2 ITS Driver Support <0-1> // Devices that have used GSDK 4.1.x and earlier, and used ITS have the keys @@ -69,7 +69,7 @@ // driver before in GSDK 4.1.x and earlier, or the keys has been already // migrated. // Default: 0 -#define SL_PSA_ITS_SUPPORT_V2_DRIVER 1 +#define SL_PSA_ITS_SUPPORT_V2_DRIVER 0 // Enable support for V3 ITS Driver <0-1> // Devices that have used GSDK 4.1.x and earlier, and used ITS have the keys @@ -105,7 +105,7 @@ // It is recommended to only use the PUF key for deriving further key // material. // Default: PSA_ALG_PBKDF2_AES_CMAC_PRF_128 -#define SL_CRYPTOACC_BUILTIN_KEY_PUF_ALG (PSA_ALG_PBKDF2_AES_CMAC_PRF_128) +#define SL_CRYPTOACC_BUILTIN_KEY_PUF_ALG (PSA_ALG_PBKDF2_AES_CMAC_PRF_128) #endif // SL_CRYPTOACC_BUILTIN_KEY_PUF_ALG // @@ -127,7 +127,7 @@ // to be included in the project. // // Default: 0 -#define SL_VSE_BUFFER_TRNG_DATA_DURING_SLEEP (0) +#define SL_VSE_BUFFER_TRNG_DATA_DURING_SLEEP (0) // Number of random words to buffer before putting the device to sleep <1-63> // This option can be used to decrease the amount of random words that @@ -152,17 +152,17 @@ // Sub-files #if defined(SLI_PSA_CONFIG_AUTOGEN_OVERRIDE_FILE) -#include SLI_PSA_CONFIG_AUTOGEN_OVERRIDE_FILE + #include SLI_PSA_CONFIG_AUTOGEN_OVERRIDE_FILE #else -#include "sli_psa_config_autogen.h" + #include "sli_psa_config_autogen.h" #endif #if defined(TFM_CONFIG_SL_SECURE_LIBRARY) -#include "sli_psa_tfm_translation.h" + #include "sli_psa_tfm_translation.h" #endif #if SL_MBEDTLS_DRIVERS_ENABLED -#include "sli_psa_acceleration.h" + #include "sli_psa_acceleration.h" #endif #include "sli_psa_builtin_config_autogen.h" diff --git a/matter/efr32/efr32mg26/BRD4117A/autogen/gatt_db.h b/matter/efr32/efr32mg26/BRD4117A/autogen/gatt_db.h index 3e608dd00b..bee94f4ef7 100644 --- a/matter/efr32/efr32mg26/BRD4117A/autogen/gatt_db.h +++ b/matter/efr32/efr32mg26/BRD4117A/autogen/gatt_db.h @@ -13,14 +13,14 @@ extern "C" { extern const sli_bt_gattdb_t gattdb; -#define gattdb_generic_attribute 1 -#define gattdb_service_changed_char 3 -#define gattdb_database_hash 6 -#define gattdb_client_support_features 8 -#define gattdb_device_name 11 -#define gattdb_CHIPoBLEChar_Rx 23 -#define gattdb_CHIPoBLEChar_Tx 25 -#define gattdb_CHIPoBLEChar_C3 28 +#define gattdb_generic_attribute 1 +#define gattdb_service_changed_char 3 +#define gattdb_database_hash 6 +#define gattdb_client_support_features 8 +#define gattdb_device_name 11 +#define gattdb_CHIPoBLEChar_Rx 23 +#define gattdb_CHIPoBLEChar_Tx 25 +#define gattdb_CHIPoBLEChar_C3 28 #if __cplusplus } diff --git a/matter/efr32/efr32mg26/BRD4117A/autogen/sl_event_handler.h b/matter/efr32/efr32mg26/BRD4117A/autogen/sl_event_handler.h index ef8751b80f..2333539d21 100644 --- a/matter/efr32/efr32mg26/BRD4117A/autogen/sl_event_handler.h +++ b/matter/efr32/efr32mg26/BRD4117A/autogen/sl_event_handler.h @@ -7,6 +7,5 @@ void sl_driver_init(void); void sl_service_init(void); void sl_stack_init(void); void sl_internal_app_init(void); -void sl_iostream_init_instances(void); #endif // SL_EVENT_HANDLER_H diff --git a/matter/efr32/efr32mg26/BRD4117A/autogen/sl_simple_led_instances.h b/matter/efr32/efr32mg26/BRD4117A/autogen/sl_simple_led_instances.h index 08c8291ae2..afb5875eb6 100644 --- a/matter/efr32/efr32mg26/BRD4117A/autogen/sl_simple_led_instances.h +++ b/matter/efr32/efr32mg26/BRD4117A/autogen/sl_simple_led_instances.h @@ -31,6 +31,9 @@ #ifndef SL_SIMPLE_LED_INSTANCES_H #define SL_SIMPLE_LED_INSTANCES_H +#ifdef __cplusplus +extern "C" { +#endif #include "sl_simple_led.h" extern const sl_led_t sl_led_led0; @@ -43,4 +46,8 @@ extern const sl_led_t *sl_simple_led_array[]; void sl_simple_led_init_instances(void); +#ifdef __cplusplus +} +#endif + #endif // SL_SIMPLE_LED_INIT_H diff --git a/matter/efr32/efr32mg26/BRD4117A/autogen/sli_mbedtls_config_autogen.h b/matter/efr32/efr32mg26/BRD4117A/autogen/sli_mbedtls_config_autogen.h index 164bff9db4..ddda08f19f 100644 --- a/matter/efr32/efr32mg26/BRD4117A/autogen/sli_mbedtls_config_autogen.h +++ b/matter/efr32/efr32mg26/BRD4117A/autogen/sli_mbedtls_config_autogen.h @@ -43,4 +43,9 @@ #define MBEDTLS_PSA_CRYPTO_DRIVERS #define MBEDTLS_PSA_CRYPTO_STORAGE_C + + + + + #endif // SLI_MBEDTLS_CONFIG_AUTOGEN_H diff --git a/matter/efr32/efr32mg26/BRD4117A/autogen/sli_psa_builtin_config_autogen.h b/matter/efr32/efr32mg26/BRD4117A/autogen/sli_psa_builtin_config_autogen.h index 34f74fb60c..c8b70fad12 100644 --- a/matter/efr32/efr32mg26/BRD4117A/autogen/sli_psa_builtin_config_autogen.h +++ b/matter/efr32/efr32mg26/BRD4117A/autogen/sli_psa_builtin_config_autogen.h @@ -9,4 +9,5 @@ // #define MBEDTLS_PSA_BUILTIN_ALG_CMAC 1 // #define MBEDTLS_PSA_BUILTIN_ALG_PBKDF2_AES_CMAC_PRF_128 1 + #endif // SLI_PSA_BUILTIN_CONFIG_AUTOGEN_H diff --git a/matter/efr32/efr32mg26/BRD4117A/autogen/sli_psa_config_autogen.h b/matter/efr32/efr32mg26/BRD4117A/autogen/sli_psa_config_autogen.h index 038ab753c1..c2a379f438 100644 --- a/matter/efr32/efr32mg26/BRD4117A/autogen/sli_psa_config_autogen.h +++ b/matter/efr32/efr32mg26/BRD4117A/autogen/sli_psa_config_autogen.h @@ -3,25 +3,25 @@ #ifndef SLI_PSA_CONFIG_AUTOGEN_H #define SLI_PSA_CONFIG_AUTOGEN_H -#define PSA_WANT_KEY_TYPE_AES 1 -#define PSA_WANT_ALG_CCM 1 -#define PSA_WANT_ALG_ECB_NO_PADDING 1 -#define PSA_WANT_ALG_CMAC 1 -#define PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY 1 -#define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_BASIC 1 -#define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_IMPORT 1 -#define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_EXPORT 1 +#define PSA_WANT_KEY_TYPE_AES 1 +#define PSA_WANT_ALG_CCM 1 +#define PSA_WANT_ALG_ECB_NO_PADDING 1 +#define PSA_WANT_ALG_CMAC 1 +#define PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY 1 +#define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_BASIC 1 +#define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_IMPORT 1 +#define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_EXPORT 1 #define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_GENERATE 1 -#define PSA_WANT_ECC_SECP_R1_256 1 -#define PSA_WANT_ALG_ECDH 1 -#define PSA_WANT_ALG_ECDSA 1 -#define PSA_WANT_ALG_HKDF 1 -#define PSA_WANT_ALG_HMAC 1 -#define PSA_WANT_KEY_TYPE_HMAC 1 -#define PSA_WANT_ALG_PBKDF2_AES_CMAC_PRF_128 1 -#define PSA_WANT_ALG_SHA_256 1 -#define PSA_WANT_ALG_TLS12_PRF 1 -#define PSA_WANT_ALG_TLS12_PSK_TO_MS 1 +#define PSA_WANT_ECC_SECP_R1_256 1 +#define PSA_WANT_ALG_ECDH 1 +#define PSA_WANT_ALG_ECDSA 1 +#define PSA_WANT_ALG_HKDF 1 +#define PSA_WANT_ALG_HMAC 1 +#define PSA_WANT_KEY_TYPE_HMAC 1 +#define PSA_WANT_ALG_PBKDF2_AES_CMAC_PRF_128 1 +#define PSA_WANT_ALG_SHA_256 1 +#define PSA_WANT_ALG_TLS12_PRF 1 +#define PSA_WANT_ALG_TLS12_PSK_TO_MS 1 #define MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG #define MBEDTLS_PSA_KEY_SLOT_COUNT (2 + 15 + 1 + SL_PSA_KEY_USER_SLOT_COUNT) diff --git a/matter/efr32/efr32mg26/BRD4117A/config/psa_crypto_config.h b/matter/efr32/efr32mg26/BRD4117A/config/psa_crypto_config.h index cf09cf76e4..20703b41d2 100644 --- a/matter/efr32/efr32mg26/BRD4117A/config/psa_crypto_config.h +++ b/matter/efr32/efr32mg26/BRD4117A/config/psa_crypto_config.h @@ -25,7 +25,7 @@ // gracefully in case an application opens more than its declared amount of // keys, thereby precluding the stack from functioning. // Default: 4 -#define SL_PSA_KEY_USER_SLOT_COUNT (4) +#define SL_PSA_KEY_USER_SLOT_COUNT (4) // PSA Maximum User Persistent Keys Count <0-1024> // Maximum amount of keys (or other files) that can be stored persistently @@ -48,7 +48,7 @@ // and if SL_PSA_ITS_USER_MAX_FILES is changed, ITS should be cleared and // all files need to be stored again. // Default: 128 -#define SL_PSA_ITS_USER_MAX_FILES (128) +#define SL_PSA_ITS_USER_MAX_FILES (128) // Enable V1 Format Support For ITS Files <0-1> // Devices that used PSA ITS together with gecko_sdk_3.1.x or earlier @@ -56,7 +56,7 @@ // If no v1 files are used, its support can be disabled for space // optimization. // Default: 0 -#define SL_PSA_ITS_SUPPORT_V1_DRIVER 1 +#define SL_PSA_ITS_SUPPORT_V1_DRIVER 0 // Enable V2 ITS Driver Support <0-1> // Devices that have used GSDK 4.1.x and earlier, and used ITS have the keys @@ -69,7 +69,7 @@ // driver before in GSDK 4.1.x and earlier, or the keys has been already // migrated. // Default: 0 -#define SL_PSA_ITS_SUPPORT_V2_DRIVER 1 +#define SL_PSA_ITS_SUPPORT_V2_DRIVER 0 // Enable support for V3 ITS Driver <0-1> // Devices that have used GSDK 4.1.x and earlier, and used ITS have the keys @@ -105,7 +105,7 @@ // It is recommended to only use the PUF key for deriving further key // material. // Default: PSA_ALG_PBKDF2_AES_CMAC_PRF_128 -#define SL_CRYPTOACC_BUILTIN_KEY_PUF_ALG (PSA_ALG_PBKDF2_AES_CMAC_PRF_128) +#define SL_CRYPTOACC_BUILTIN_KEY_PUF_ALG (PSA_ALG_PBKDF2_AES_CMAC_PRF_128) #endif // SL_CRYPTOACC_BUILTIN_KEY_PUF_ALG // @@ -127,7 +127,7 @@ // to be included in the project. // // Default: 0 -#define SL_VSE_BUFFER_TRNG_DATA_DURING_SLEEP (0) +#define SL_VSE_BUFFER_TRNG_DATA_DURING_SLEEP (0) // Number of random words to buffer before putting the device to sleep <1-63> // This option can be used to decrease the amount of random words that @@ -152,17 +152,17 @@ // Sub-files #if defined(SLI_PSA_CONFIG_AUTOGEN_OVERRIDE_FILE) -#include SLI_PSA_CONFIG_AUTOGEN_OVERRIDE_FILE + #include SLI_PSA_CONFIG_AUTOGEN_OVERRIDE_FILE #else -#include "sli_psa_config_autogen.h" + #include "sli_psa_config_autogen.h" #endif #if defined(TFM_CONFIG_SL_SECURE_LIBRARY) -#include "sli_psa_tfm_translation.h" + #include "sli_psa_tfm_translation.h" #endif #if SL_MBEDTLS_DRIVERS_ENABLED -#include "sli_psa_acceleration.h" + #include "sli_psa_acceleration.h" #endif #include "sli_psa_builtin_config_autogen.h" diff --git a/matter/efr32/efr32mg26/BRD4117A/config/sl_bt_rtos_config.h b/matter/efr32/efr32mg26/BRD4117A/config/sl_bt_rtos_config.h index c87ca11c3b..a0ef9988b1 100644 --- a/matter/efr32/efr32mg26/BRD4117A/config/sl_bt_rtos_config.h +++ b/matter/efr32/efr32mg26/BRD4117A/config/sl_bt_rtos_config.h @@ -46,7 +46,7 @@ // Default: 1000 // Define the stack size of the Bluetooth link layer task. The value is in bytes // and will be word aligned when it is applied at the task creation. -#define SL_BT_RTOS_LINK_LAYER_TASK_STACK_SIZE 1024 +#define SL_BT_RTOS_LINK_LAYER_TASK_STACK_SIZE (1024) // Bluetooth host stack task priority // Default: 51 (CMSIS-RTOS2 osPriorityRealtime3) @@ -58,7 +58,7 @@ // Default: 2000 // Define the stack size of the Bluetooth host stack task. The value is in bytes // and will be word aligned when it is applied at the task creation. -#define SL_BT_RTOS_HOST_STACK_TASK_STACK_SIZE 2048 +#define SL_BT_RTOS_HOST_STACK_TASK_STACK_SIZE (2048) // Bluetooth event handler task priority // Default: 50 (CMSIS-RTOS2 osPriorityRealtime2) @@ -71,7 +71,7 @@ // Default: 1000 // Define the stack size of the Bluetooth event handler task. The value is in bytes // and will be word aligned when it is applied at the task creation. -#define SL_BT_RTOS_EVENT_HANDLER_STACK_SIZE 1536 +#define SL_BT_RTOS_EVENT_HANDLER_STACK_SIZE (1536) // End Priority Configuration for Bluetooth RTOS Tasks diff --git a/matter/efr32/efr32mg26/BRD4118A/autogen/gatt_db.h b/matter/efr32/efr32mg26/BRD4118A/autogen/gatt_db.h index 3e608dd00b..bee94f4ef7 100644 --- a/matter/efr32/efr32mg26/BRD4118A/autogen/gatt_db.h +++ b/matter/efr32/efr32mg26/BRD4118A/autogen/gatt_db.h @@ -13,14 +13,14 @@ extern "C" { extern const sli_bt_gattdb_t gattdb; -#define gattdb_generic_attribute 1 -#define gattdb_service_changed_char 3 -#define gattdb_database_hash 6 -#define gattdb_client_support_features 8 -#define gattdb_device_name 11 -#define gattdb_CHIPoBLEChar_Rx 23 -#define gattdb_CHIPoBLEChar_Tx 25 -#define gattdb_CHIPoBLEChar_C3 28 +#define gattdb_generic_attribute 1 +#define gattdb_service_changed_char 3 +#define gattdb_database_hash 6 +#define gattdb_client_support_features 8 +#define gattdb_device_name 11 +#define gattdb_CHIPoBLEChar_Rx 23 +#define gattdb_CHIPoBLEChar_Tx 25 +#define gattdb_CHIPoBLEChar_C3 28 #if __cplusplus } diff --git a/matter/efr32/efr32mg26/BRD4118A/autogen/sl_event_handler.h b/matter/efr32/efr32mg26/BRD4118A/autogen/sl_event_handler.h index ef8751b80f..2333539d21 100644 --- a/matter/efr32/efr32mg26/BRD4118A/autogen/sl_event_handler.h +++ b/matter/efr32/efr32mg26/BRD4118A/autogen/sl_event_handler.h @@ -7,6 +7,5 @@ void sl_driver_init(void); void sl_service_init(void); void sl_stack_init(void); void sl_internal_app_init(void); -void sl_iostream_init_instances(void); #endif // SL_EVENT_HANDLER_H diff --git a/matter/efr32/efr32mg26/BRD4118A/autogen/sl_simple_led_instances.h b/matter/efr32/efr32mg26/BRD4118A/autogen/sl_simple_led_instances.h index 2fd553076e..afb5875eb6 100644 --- a/matter/efr32/efr32mg26/BRD4118A/autogen/sl_simple_led_instances.h +++ b/matter/efr32/efr32mg26/BRD4118A/autogen/sl_simple_led_instances.h @@ -1,4 +1,4 @@ -/***************************************************************************/ /** +/***************************************************************************//** * @file * @brief LED Driver Instances ******************************************************************************* @@ -41,7 +41,7 @@ extern const sl_led_t sl_led_led1; extern const sl_led_t *sl_simple_led_array[]; -#define SL_SIMPLE_LED_COUNT 2 +#define SL_SIMPLE_LED_COUNT 2 #define SL_SIMPLE_LED_INSTANCE(n) (sl_simple_led_array[n]) void sl_simple_led_init_instances(void); diff --git a/matter/efr32/efr32mg26/BRD4118A/autogen/sli_mbedtls_config_autogen.h b/matter/efr32/efr32mg26/BRD4118A/autogen/sli_mbedtls_config_autogen.h index 164bff9db4..ddda08f19f 100644 --- a/matter/efr32/efr32mg26/BRD4118A/autogen/sli_mbedtls_config_autogen.h +++ b/matter/efr32/efr32mg26/BRD4118A/autogen/sli_mbedtls_config_autogen.h @@ -43,4 +43,9 @@ #define MBEDTLS_PSA_CRYPTO_DRIVERS #define MBEDTLS_PSA_CRYPTO_STORAGE_C + + + + + #endif // SLI_MBEDTLS_CONFIG_AUTOGEN_H diff --git a/matter/efr32/efr32mg26/BRD4118A/autogen/sli_psa_builtin_config_autogen.h b/matter/efr32/efr32mg26/BRD4118A/autogen/sli_psa_builtin_config_autogen.h index 34f74fb60c..c8b70fad12 100644 --- a/matter/efr32/efr32mg26/BRD4118A/autogen/sli_psa_builtin_config_autogen.h +++ b/matter/efr32/efr32mg26/BRD4118A/autogen/sli_psa_builtin_config_autogen.h @@ -9,4 +9,5 @@ // #define MBEDTLS_PSA_BUILTIN_ALG_CMAC 1 // #define MBEDTLS_PSA_BUILTIN_ALG_PBKDF2_AES_CMAC_PRF_128 1 + #endif // SLI_PSA_BUILTIN_CONFIG_AUTOGEN_H diff --git a/matter/efr32/efr32mg26/BRD4118A/autogen/sli_psa_config_autogen.h b/matter/efr32/efr32mg26/BRD4118A/autogen/sli_psa_config_autogen.h index 038ab753c1..c2a379f438 100644 --- a/matter/efr32/efr32mg26/BRD4118A/autogen/sli_psa_config_autogen.h +++ b/matter/efr32/efr32mg26/BRD4118A/autogen/sli_psa_config_autogen.h @@ -3,25 +3,25 @@ #ifndef SLI_PSA_CONFIG_AUTOGEN_H #define SLI_PSA_CONFIG_AUTOGEN_H -#define PSA_WANT_KEY_TYPE_AES 1 -#define PSA_WANT_ALG_CCM 1 -#define PSA_WANT_ALG_ECB_NO_PADDING 1 -#define PSA_WANT_ALG_CMAC 1 -#define PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY 1 -#define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_BASIC 1 -#define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_IMPORT 1 -#define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_EXPORT 1 +#define PSA_WANT_KEY_TYPE_AES 1 +#define PSA_WANT_ALG_CCM 1 +#define PSA_WANT_ALG_ECB_NO_PADDING 1 +#define PSA_WANT_ALG_CMAC 1 +#define PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY 1 +#define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_BASIC 1 +#define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_IMPORT 1 +#define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_EXPORT 1 #define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_GENERATE 1 -#define PSA_WANT_ECC_SECP_R1_256 1 -#define PSA_WANT_ALG_ECDH 1 -#define PSA_WANT_ALG_ECDSA 1 -#define PSA_WANT_ALG_HKDF 1 -#define PSA_WANT_ALG_HMAC 1 -#define PSA_WANT_KEY_TYPE_HMAC 1 -#define PSA_WANT_ALG_PBKDF2_AES_CMAC_PRF_128 1 -#define PSA_WANT_ALG_SHA_256 1 -#define PSA_WANT_ALG_TLS12_PRF 1 -#define PSA_WANT_ALG_TLS12_PSK_TO_MS 1 +#define PSA_WANT_ECC_SECP_R1_256 1 +#define PSA_WANT_ALG_ECDH 1 +#define PSA_WANT_ALG_ECDSA 1 +#define PSA_WANT_ALG_HKDF 1 +#define PSA_WANT_ALG_HMAC 1 +#define PSA_WANT_KEY_TYPE_HMAC 1 +#define PSA_WANT_ALG_PBKDF2_AES_CMAC_PRF_128 1 +#define PSA_WANT_ALG_SHA_256 1 +#define PSA_WANT_ALG_TLS12_PRF 1 +#define PSA_WANT_ALG_TLS12_PSK_TO_MS 1 #define MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG #define MBEDTLS_PSA_KEY_SLOT_COUNT (2 + 15 + 1 + SL_PSA_KEY_USER_SLOT_COUNT) diff --git a/matter/efr32/efr32mg26/BRD4118A/config/psa_crypto_config.h b/matter/efr32/efr32mg26/BRD4118A/config/psa_crypto_config.h index cf09cf76e4..20703b41d2 100644 --- a/matter/efr32/efr32mg26/BRD4118A/config/psa_crypto_config.h +++ b/matter/efr32/efr32mg26/BRD4118A/config/psa_crypto_config.h @@ -25,7 +25,7 @@ // gracefully in case an application opens more than its declared amount of // keys, thereby precluding the stack from functioning. // Default: 4 -#define SL_PSA_KEY_USER_SLOT_COUNT (4) +#define SL_PSA_KEY_USER_SLOT_COUNT (4) // PSA Maximum User Persistent Keys Count <0-1024> // Maximum amount of keys (or other files) that can be stored persistently @@ -48,7 +48,7 @@ // and if SL_PSA_ITS_USER_MAX_FILES is changed, ITS should be cleared and // all files need to be stored again. // Default: 128 -#define SL_PSA_ITS_USER_MAX_FILES (128) +#define SL_PSA_ITS_USER_MAX_FILES (128) // Enable V1 Format Support For ITS Files <0-1> // Devices that used PSA ITS together with gecko_sdk_3.1.x or earlier @@ -56,7 +56,7 @@ // If no v1 files are used, its support can be disabled for space // optimization. // Default: 0 -#define SL_PSA_ITS_SUPPORT_V1_DRIVER 1 +#define SL_PSA_ITS_SUPPORT_V1_DRIVER 0 // Enable V2 ITS Driver Support <0-1> // Devices that have used GSDK 4.1.x and earlier, and used ITS have the keys @@ -69,7 +69,7 @@ // driver before in GSDK 4.1.x and earlier, or the keys has been already // migrated. // Default: 0 -#define SL_PSA_ITS_SUPPORT_V2_DRIVER 1 +#define SL_PSA_ITS_SUPPORT_V2_DRIVER 0 // Enable support for V3 ITS Driver <0-1> // Devices that have used GSDK 4.1.x and earlier, and used ITS have the keys @@ -105,7 +105,7 @@ // It is recommended to only use the PUF key for deriving further key // material. // Default: PSA_ALG_PBKDF2_AES_CMAC_PRF_128 -#define SL_CRYPTOACC_BUILTIN_KEY_PUF_ALG (PSA_ALG_PBKDF2_AES_CMAC_PRF_128) +#define SL_CRYPTOACC_BUILTIN_KEY_PUF_ALG (PSA_ALG_PBKDF2_AES_CMAC_PRF_128) #endif // SL_CRYPTOACC_BUILTIN_KEY_PUF_ALG // @@ -127,7 +127,7 @@ // to be included in the project. // // Default: 0 -#define SL_VSE_BUFFER_TRNG_DATA_DURING_SLEEP (0) +#define SL_VSE_BUFFER_TRNG_DATA_DURING_SLEEP (0) // Number of random words to buffer before putting the device to sleep <1-63> // This option can be used to decrease the amount of random words that @@ -152,17 +152,17 @@ // Sub-files #if defined(SLI_PSA_CONFIG_AUTOGEN_OVERRIDE_FILE) -#include SLI_PSA_CONFIG_AUTOGEN_OVERRIDE_FILE + #include SLI_PSA_CONFIG_AUTOGEN_OVERRIDE_FILE #else -#include "sli_psa_config_autogen.h" + #include "sli_psa_config_autogen.h" #endif #if defined(TFM_CONFIG_SL_SECURE_LIBRARY) -#include "sli_psa_tfm_translation.h" + #include "sli_psa_tfm_translation.h" #endif #if SL_MBEDTLS_DRIVERS_ENABLED -#include "sli_psa_acceleration.h" + #include "sli_psa_acceleration.h" #endif #include "sli_psa_builtin_config_autogen.h"