Gecko SDK 4.4.2 (#56)

* Bump RCP to 4.4.2 * Bump OT-RCP to 4.4.2 * Bump NCP to 4.4.2 * Bump firmware eraser to 4.4.2 * Bump bootloader to 4.4.2 * Bump Z-Wave NCP to 4.4.2 * Ignore migration `.bak` files * Bump Gecko SDK in `Dockerfile` * Revert `SL_APPLICATION_PRODUCT_ID` change in firmware eraser
NabuCasa · May 3, 2024 · 6033307 · 6033307
1 parent ff6487b
commit 6033307
Show file tree

Hide file tree

Showing 171 changed files with 516 additions and 262 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,4 +11,6 @@ autogen/
 build/
 artifact/
 artifacts/
-trashed_modified_files/
+trashed_modified_files/
+src/**/*.bak
+misc/**/*.bak
diff --git a/Dockerfile b/Dockerfile
@@ -51,11 +51,11 @@ RUN \
     && tar -C /opt -xf gcc-arm-none-eabi-10.3-2021.10-x86_64-linux.tar.bz2 \
     && rm gcc-arm-none-eabi-10.3-2021.10-x86_64-linux.tar.bz2
 
-# Gecko SDK 4.4.0
+# Gecko SDK 4.4.2
 RUN \
-    curl -o gecko_sdk_4.4.0.zip -L https://github.com/SiliconLabs/gecko_sdk/releases/download/v4.4.0/gecko-sdk.zip \
-    && unzip -q -d gecko_sdk_4.4.0 gecko_sdk_4.4.0.zip \
-    && rm gecko_sdk_4.4.0.zip
+    curl -o gecko_sdk_4.4.2.zip -L https://github.com/SiliconLabs/gecko_sdk/releases/download/v4.4.2/gecko-sdk.zip \
+    && unzip -q -d gecko_sdk_4.4.2 gecko_sdk_4.4.2.zip \
+    && rm gecko_sdk_4.4.2.zip
 
 # Gecko SDK 4.3.1
 RUN \

diff --git a/misc/firmware-eraser/.cproject b/misc/firmware-eraser/.cproject
diff --git a/misc/firmware-eraser/config/app_properties_config.h b/misc/firmware-eraser/config/app_properties_config.h
@@ -62,4 +62,4 @@
 
 // </h>
 
-#endif // APP_PROPERTIES_CONFIG_H
+#endif // APP_PROPERTIES_CONFIG_H
diff --git a/misc/firmware-eraser/config/btl_interface_cfg.h b/misc/firmware-eraser/config/btl_interface_cfg.h
@@ -45,4 +45,4 @@
 
 #endif // !BOOTLOADER_APPLOADER
 
-#endif // BTL_INTERFACE_CFG_H
+#endif // BTL_INTERFACE_CFG_H
diff --git a/misc/firmware-eraser/config/btl_interface_cfg_s2c1.h b/misc/firmware-eraser/config/btl_interface_cfg_s2c1.h
@@ -278,4 +278,4 @@
                                    | (BOOTLOADER_PPUSATD1_SEMAILBOX << _SMU_PPUSATD1_SEMAILBOX_SHIFT))
 #endif // BOOTLOADER_MANUAL_OVERRIDE_SECURITY_STATE
 
-#endif // BTL_INTERFACE_CFG_S2C1_H
+#endif // BTL_INTERFACE_CFG_S2C1_H
diff --git a/misc/firmware-eraser/config/emlib_core_debug_config.h b/misc/firmware-eraser/config/emlib_core_debug_config.h
@@ -42,4 +42,4 @@
 // </h>
 
 // <<< end of configuration section >>>
-#endif // EM_CORE_CONFIG_H
+#endif // EM_CORE_CONFIG_H
diff --git a/misc/firmware-eraser/config/sl_board_control_config.h b/misc/firmware-eraser/config/sl_board_control_config.h
@@ -53,4 +53,4 @@
 
 // <<< sl:end pin_tool >>>
 
-#endif // SL_BOARD_CONTROL_CONFIG_H
+#endif // SL_BOARD_CONTROL_CONFIG_H
diff --git a/misc/firmware-eraser/config/sl_debug_swo_config.h b/misc/firmware-eraser/config/sl_debug_swo_config.h
@@ -103,4 +103,4 @@
 // [GPIO_SL_DEBUG]$
 // <<< sl:end pin_tool >>>
 
-#endif // SL_DEBUG_SWO_CONFIG_H
+#endif // SL_DEBUG_SWO_CONFIG_H
diff --git a/misc/firmware-eraser/config/sl_device_init_emu_config.h b/misc/firmware-eraser/config/sl_device_init_emu_config.h
@@ -50,4 +50,4 @@
 
 // <<< end of configuration section >>>
 
-#endif // SL_DEVICE_INIT_EMU_CONFIG_H
+#endif // SL_DEVICE_INIT_EMU_CONFIG_H
diff --git a/misc/firmware-eraser/config/sl_device_init_hfrco_config.h b/misc/firmware-eraser/config/sl_device_init_hfrco_config.h
@@ -54,4 +54,4 @@
 
 // <<< end of configuration section >>>
 
-#endif // SL_DEVICE_INIT_HFRCO_CONFIG_H
+#endif // SL_DEVICE_INIT_HFRCO_CONFIG_H
diff --git a/misc/firmware-eraser/config/sl_device_init_hfxo_config.h b/misc/firmware-eraser/config/sl_device_init_hfxo_config.h
@@ -54,4 +54,4 @@
 
 // <<< end of configuration section >>>
 
-#endif // SL_DEVICE_INIT_HFXO_CONFIG_H
+#endif // SL_DEVICE_INIT_HFXO_CONFIG_H
diff --git a/misc/firmware-eraser/config/sl_device_init_lfxo_config.h b/misc/firmware-eraser/config/sl_device_init_lfxo_config.h
@@ -63,4 +63,26 @@
 #define SL_DEVICE_INIT_LFXO_TIMEOUT           cmuLfxoStartupDelay_4KCycles
 // <<< end of configuration section >>>
 
-#endif // SL_DEVICE_INIT_LFXO_CONFIG_H
+// <<< sl:start pin_tool >>>
+// <lfxo signal=(LFXTAL_O),(LFXTAL_I),(LF_EXTCLK)> SL_DEVICE_INIT_LFXO
+// $[LFXO_SL_DEVICE_INIT_LFXO]
+#define SL_DEVICE_INIT_LFXO_PERIPHERAL           LFXO
+
+// LFXO LFXTAL_O on PD00
+#define SL_DEVICE_INIT_LFXO_LFXTAL_O_PORT        gpioPortD
+#define SL_DEVICE_INIT_LFXO_LFXTAL_O_PIN         0
+
+// LFXO LFXTAL_I on PD01
+#define SL_DEVICE_INIT_LFXO_LFXTAL_I_PORT        gpioPortD
+#define SL_DEVICE_INIT_LFXO_LFXTAL_I_PIN         1
+
+
+// [LFXO_SL_DEVICE_INIT_LFXO]$
+
+// $[LFXO_EXTERNAL_DIGITAL_CLOCK]
+#define SL_DEVICE_INIT_LFXO_LF_EXTCLK_PORT         gpioPortD
+#define SL_DEVICE_INIT_LFXO_LF_EXTCLK_PIN          1
+// [LFXO_EXTERNAL_DIGITAL_CLOCK]$
+// <<< sl:end pin_tool >>>
+
+#endif // SL_DEVICE_INIT_LFXO_CONFIG_H
diff --git a/misc/firmware-eraser/firmware-eraser.pintool b/misc/firmware-eraser/firmware-eraser.pintool
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ASCII"?>
-<device:XMLDevice xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:device="http://www.silabs.com/ss/hwconfig/document/device.ecore" name="pin_tool.EFR32MG21A010F1024IM32" partId="mcu.arm.efr32.mg21.efr32mg21a010f1024im32" contextId="com.silabs.sdk.stack.super:4.4.0._-295637087">
+<device:XMLDevice xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:device="http://www.silabs.com/ss/hwconfig/document/device.ecore" name="pin_tool.EFR32MG21A010F1024IM32" partId="mcu.arm.efr32.mg21.efr32mg21a010f1024im32" contextId="com.silabs.sdk.stack.super:4.4.2._-295637085">
   <mode name="DefaultMode">
     <property object="DefaultMode" propertyId="mode.diagramLocation" value="100, 100"/>
   </mode>

diff --git a/misc/firmware-eraser/firmware-eraser.slcp b/misc/firmware-eraser/firmware-eraser.slcp
@@ -22,17 +22,17 @@ include:
 - path: ''
   file_list:
   - {path: app.h}
-sdk: {id: gecko_sdk, version: 4.4.0}
+sdk: {id: gecko_sdk, version: 4.4.2}
 toolchain_settings: []
 component:
-- {id: sl_system}
-- {id: brd4001a}
+- {id: EFR32MG21A010F1024IM32}
 - {id: bootloader_app_properties}
+- {id: bootloader_interface}
+- {id: brd4001a}
+- {id: brd4179b}
 - {id: cpp_support}
 - {id: device_init}
-- {id: brd4179b}
-- {id: bootloader_interface}
-- {id: EFR32MG21A010F1024IM32}
+- {id: sl_system}
 define:
 - {name: DEBUG_EFM}
 ui_hints:

diff --git a/misc/firmware-eraser/firmware-eraser.slps b/misc/firmware-eraser/firmware-eraser.slps
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ASCII"?>
 <model:MDescriptors xmlns:model="http://www.silabs.com/ss/Studio.ecore">
   <descriptors name="firmware-eraser">
-    <properties key="projectCommon.sdkId" value="com.silabs.sdk.stack.super:4.4.0._-295637087"/>
+    <properties key="projectCommon.sdkId" value="com.silabs.sdk.stack.super:4.4.2._-295637085"/>
     <properties key="universalConfig.relativeWorkspacePath" value="../firmware-eraser.slcw"/>
     <properties key="universalConfig.generationDirectory" value=""/>
     <properties key="universalConfig.toolchainCompatibility" value="iar gcc"/>

diff --git a/src/bootloader-uart-xmodem/.cproject b/src/bootloader-uart-xmodem/.cproject
diff --git a/src/bootloader-uart-xmodem/bootloader-uart-xmodem.pintool b/src/bootloader-uart-xmodem/bootloader-uart-xmodem.pintool
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ASCII"?>
-<device:XMLDevice xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:device="http://www.silabs.com/ss/hwconfig/document/device.ecore" name="pin_tool.EFR32MG21A010F1024IM32" partId="mcu.arm.efr32.mg21.efr32mg21a010f1024im32" contextId="com.silabs.sdk.stack.super:4.4.0._-212564830">
+<device:XMLDevice xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:device="http://www.silabs.com/ss/hwconfig/document/device.ecore" name="pin_tool.EFR32MG21A010F1024IM32" partId="mcu.arm.efr32.mg21.efr32mg21a010f1024im32" contextId="com.silabs.sdk.stack.super:4.4.2._-295637085">
   <mode name="DefaultMode">
     <property object="DefaultMode" propertyId="mode.diagramLocation" value="100, 100"/>
     <property object="GPIO" propertyId="ABModule.selectedRequirement" value="gpio%T%SL_DEBUG%T%btl_debug_cfg.h"/>

diff --git a/src/bootloader-uart-xmodem/bootloader-uart-xmodem.slcp b/src/bootloader-uart-xmodem/bootloader-uart-xmodem.slcp
@@ -15,23 +15,23 @@ package: bootloader
 quality: production
 readme:
 - {path: readme.md}
-sdk: {id: gecko_sdk, version: 4.4.0}
+sdk: {id: gecko_sdk, version: 4.4.2}
 toolchain_settings: []
 component:
-- {id: bootloader_token_management}
-- {id: bootloader_serial_driver}
-- {id: bootloader_crc}
+- {id: EFR32MG21A010F1024IM32}
 - {id: bootloader_aes_sha_ecdsa}
+- {id: bootloader_core}
+- {id: bootloader_crc}
+- {id: bootloader_debug}
+- {id: bootloader_delay_driver}
 - {id: bootloader_gpio_activation}
+- {id: bootloader_image_parser}
+- {id: bootloader_serial_driver}
+- {id: bootloader_token_management}
 - {id: bootloader_uart_xmodem}
-- {id: brd4001a}
 - {id: bootloader_xmodem_parser}
-- {id: bootloader_delay_driver}
-- {id: bootloader_debug}
+- {id: brd4001a}
 - {id: brd4179b}
-- {id: bootloader_image_parser}
-- {id: bootloader_core}
-- {id: EFR32MG21A010F1024IM32}
 configuration:
 - {name: SL_VCOM_ENABLE, value: '1'}
 ui_hints:

diff --git a/src/bootloader-uart-xmodem/bootloader-uart-xmodem.slps b/src/bootloader-uart-xmodem/bootloader-uart-xmodem.slps
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ASCII"?>
 <model:MDescriptors xmlns:model="http://www.silabs.com/ss/Studio.ecore">
   <descriptors name="bootloader-uart-xmodem">
-    <properties key="projectCommon.sdkId" value="com.silabs.sdk.stack.super:4.4.0._-212564830"/>
+    <properties key="projectCommon.sdkId" value="com.silabs.sdk.stack.super:4.4.2._-295637085"/>
     <properties key="universalConfig.relativeWorkspacePath" value="../bootloader-uart-xmodem.slcw"/>
     <properties key="universalConfig.generationDirectory" value=""/>
     <properties key="universalConfig.toolchainCompatibility" value="iar gcc"/>

diff --git a/src/bootloader-uart-xmodem/config/btl_aes_ctr_stream_block_cfg.h b/src/bootloader-uart-xmodem/config/btl_aes_ctr_stream_block_cfg.h
@@ -41,4 +41,4 @@
 #define SLI_SE_AES_CTR_NUM_BLOCKS_BUFFERED BOOTLOADER_AES_CTR_NUM_BLOCKS_BUFFERED
 #endif
 
-#endif //BTL_AES_CTR_STREAM_BLOCK_CFG_H
+#endif //BTL_AES_CTR_STREAM_BLOCK_CFG_H
diff --git a/src/bootloader-uart-xmodem/config/btl_core_cfg.h b/src/bootloader-uart-xmodem/config/btl_core_cfg.h
@@ -114,7 +114,7 @@
 // <o BOOTLOADER_VERSION_MAIN_CUSTOMER> Bootloader Version Main Customer
 // <i> Default: 0
 // <i> Bootloader Version Main Customer
-#define BOOTLOADER_VERSION_MAIN_CUSTOMER                    0
+#define BOOTLOADER_VERSION_MAIN_CUSTOMER                    2
 
 // <e USE_CUSTOM_APP_SIZE> Use custom Bootloader Application Size
 // <i> Default: 0
@@ -136,4 +136,4 @@
 
 // <<< end of configuration section >>>
 
-#endif // BTL_CORE_CONFIG_H
+#endif // BTL_CORE_CONFIG_H
diff --git a/src/bootloader-uart-xmodem/config/btl_debug_cfg.h b/src/bootloader-uart-xmodem/config/btl_debug_cfg.h
@@ -49,4 +49,4 @@
 // [GPIO_SL_DEBUG]$
 // <<< sl:end pin_tool >>>
 
-#endif // BTL_DEBUG_CONFIG_H
+#endif // BTL_DEBUG_CONFIG_H
diff --git a/src/bootloader-uart-xmodem/config/btl_gpio_activation_cfg.h b/src/bootloader-uart-xmodem/config/btl_gpio_activation_cfg.h
@@ -47,4 +47,4 @@
 
 // <<< sl:end pin_tool >>>
 
-#endif // BTL_GPIO_ACTIVATION_CONFIG_H
+#endif // BTL_GPIO_ACTIVATION_CONFIG_H
diff --git a/src/bootloader-uart-xmodem/config/btl_uart_driver_cfg.h b/src/bootloader-uart-xmodem/config/btl_uart_driver_cfg.h
@@ -105,4 +105,4 @@
 
 // <<< sl:end pin_tool >>>
 
-#endif // BTL_UART_DRIVER_CONFIG_H
+#endif // BTL_UART_DRIVER_CONFIG_H
diff --git a/src/bootloader-uart-xmodem/config/btl_xmodem_config.h b/src/bootloader-uart-xmodem/config/btl_xmodem_config.h
@@ -45,4 +45,4 @@
 
 #endif // End of BTL_XMODEM_CONFIG_H module include.
 
-// <<< end of configuration section >>>
+// <<< end of configuration section >>>
diff --git a/src/bootloader-uart-xmodem/config/emlib_core_debug_config.h b/src/bootloader-uart-xmodem/config/emlib_core_debug_config.h
@@ -42,4 +42,4 @@
 // </h>
 
 // <<< end of configuration section >>>
-#endif // EM_CORE_CONFIG_H
+#endif // EM_CORE_CONFIG_H
diff --git a/src/bootloader-uart-xmodem/config/psa_crypto_config.h b/src/bootloader-uart-xmodem/config/psa_crypto_config.h
@@ -110,6 +110,42 @@
 
 // </h>
 
+// <h> Power optimization configuration
+
+// <e SL_VSE_BUFFER_TRNG_DATA_DURING_SLEEP> Store already-generated random bytes before putting the device to sleep
+// <i> Using the hardware TRNG (for example through psa_generate_random()) will
+// <i> consume a non-negligible amount of power. A start-up routine must pass
+// <i> and a relatively large minimum amount of random bytes will be generated.
+// <i> Use cases where the device is frequently entering EM2/EM3 and thereafter
+// <i> consumes a small amount of data from the TRNG may benefit from buffering
+// <i> the existing random bytes before putting the device to sleep. These
+// <i> buffered bytes are then consumed until exhaustion before the TRNG needs
+// <i> to be initialized and used again.
+// <i>
+// <i> NOTE: this configuration option is only applicable for devices with a
+// <i> Virtual Secure Engine (VSE), and requires the 'Power Manager' component
+// <i> to be included in the project.
+// <i>
+// <i> Default: 0
+#define SL_VSE_BUFFER_TRNG_DATA_DURING_SLEEP  (0)
+
+// <o SL_VSE_MAX_TRNG_WORDS_BUFFERED_DURING_SLEEP> Number of random words to buffer before putting the device to sleep <1-63>
+// <i> This option can be used to decrease the amount of random words that
+// <i> (if enabled) are buffered before the device enters EM2/EM3. Lowering this
+// <i> number will result in less static RAM usage, but also means that the TRNG
+// <i> potentially has to be initialized more times--leading to increased power
+// <i> consumption. By default this option in configured to buffer as much TRNG
+// <i> data as possible (limited by the depth of the TRNG FIFO).
+// <i>
+// <i> NOTE: this configuration option is only applicable when
+// <i> SL_VSE_BUFFER_TRNG_DATA_DURING_SLEEP is enabled.
+// <i>
+// <i> Default: 63
+#define SL_VSE_MAX_TRNG_WORDS_BUFFERED_DURING_SLEEP (63)
+// </e>
+
+// </h>
+
 // <<< end of configuration section >>>
 
 // -----------------------------------------------------------------------------
@@ -131,4 +167,4 @@
 
 #include "sli_psa_builtin_config_autogen.h"
 
-#endif // PSA_CRYPTO_CONFIG_H
+#endif // PSA_CRYPTO_CONFIG_H
diff --git a/src/bootloader-uart-xmodem/config/sl_fault_injection_hardening_cfg.h b/src/bootloader-uart-xmodem/config/sl_fault_injection_hardening_cfg.h
@@ -104,4 +104,4 @@
     #error "Choose either TFM fault injection hardening profile as LOW or Medium or High"
   #endif // !TFM_FIH_PROFILE_LOW && TFM_FIH_PROFILE_MEDIUM && TFM_FIH_PROFILE_HIGH
 #endif // TFM_FIH_PROFILE_ON
-#endif // FAULT_INJECTION_HARDENING_CFG_H
+#endif // FAULT_INJECTION_HARDENING_CFG_H
diff --git a/src/bootloader-uart-xmodem/config/sl_mbedtls_config.h b/src/bootloader-uart-xmodem/config/sl_mbedtls_config.h
@@ -115,4 +115,4 @@
 // Included for backward compatibility reasons.
 #include "mbedtls/build_info.h"
 
-#endif // SL_MBEDTLS_CONFIG_H
+#endif // SL_MBEDTLS_CONFIG_H
diff --git a/src/bootloader-uart-xmodem/config/sl_mbedtls_device_config.h b/src/bootloader-uart-xmodem/config/sl_mbedtls_device_config.h
@@ -69,4 +69,4 @@
   #define SL_SE_ASSUME_FW_AT_LEAST_1_2_2  1
 #endif
 
-#endif // SL_MBEDTLS_DEVICE_CONFIG_H
+#endif // SL_MBEDTLS_DEVICE_CONFIG_H
diff --git a/src/ncp-uart-hw/.cproject b/src/ncp-uart-hw/.cproject
diff --git a/src/ncp-uart-hw/config/SEGGER_RTT_Conf.h b/src/ncp-uart-hw/config/SEGGER_RTT_Conf.h
@@ -425,4 +425,4 @@ void OS_SIM_LeaveCriticalSection(void);
 #endif
 
 #endif
-/*************************** End of file ****************************/
+/*************************** End of file ****************************/
diff --git a/src/ncp-uart-hw/config/app_properties_config.h b/src/ncp-uart-hw/config/app_properties_config.h
@@ -62,4 +62,4 @@
 
 // </h>
 
-#endif // APP_PROPERTIES_CONFIG_H
+#endif // APP_PROPERTIES_CONFIG_H
diff --git a/src/ncp-uart-hw/config/btl_interface_cfg.h b/src/ncp-uart-hw/config/btl_interface_cfg.h
@@ -45,4 +45,4 @@
 
 #endif // !BOOTLOADER_APPLOADER
 
-#endif // BTL_INTERFACE_CFG_H
+#endif // BTL_INTERFACE_CFG_H
diff --git a/src/ncp-uart-hw/config/btl_interface_cfg_s2c1.h b/src/ncp-uart-hw/config/btl_interface_cfg_s2c1.h
@@ -278,4 +278,4 @@
                                    | (BOOTLOADER_PPUSATD1_SEMAILBOX << _SMU_PPUSATD1_SEMAILBOX_SHIFT))
 #endif // BOOTLOADER_MANUAL_OVERRIDE_SECURITY_STATE
 
-#endif // BTL_INTERFACE_CFG_S2C1_H
+#endif // BTL_INTERFACE_CFG_S2C1_H
diff --git a/src/ncp-uart-hw/config/dmadrv_config.h b/src/ncp-uart-hw/config/dmadrv_config.h
@@ -23,4 +23,4 @@
 
 // <<< end of configuration section >>>
 
-#endif // DMADRV_CONFIG_H
+#endif // DMADRV_CONFIG_H
diff --git a/src/ncp-uart-hw/config/emlib_core_debug_config.h b/src/ncp-uart-hw/config/emlib_core_debug_config.h
@@ -42,4 +42,4 @@
 // </h>
 
 // <<< end of configuration section >>>
-#endif // EM_CORE_CONFIG_H
+#endif // EM_CORE_CONFIG_H
diff --git a/src/ncp-uart-hw/config/legacy_common_ash_config.h b/src/ncp-uart-hw/config/legacy_common_ash_config.h
@@ -40,4 +40,4 @@
 
 #endif /* LEGACY_NCP_ASH_CONFIG_H */
 
-// <<< end of configuration section >>>
+// <<< end of configuration section >>>
diff --git a/src/ncp-uart-hw/config/legacy_hal_config.h b/src/ncp-uart-hw/config/legacy_hal_config.h
@@ -44,4 +44,4 @@
 
 #endif /* LEGACY_HAL_CONFIG_H */
 
-// <<< end of configuration section >>>
+// <<< end of configuration section >>>
diff --git a/src/ncp-uart-hw/config/nvm3_default_config.h b/src/ncp-uart-hw/config/nvm3_default_config.h
@@ -42,4 +42,4 @@
 
 // <<< end of configuration section >>>
 
-#endif // NVM3_DEFAULT_CONFIG_H
+#endif // NVM3_DEFAULT_CONFIG_H