Apply MCUXpresso SDK 2.16.100 release update

The update is from MCUXpresso SDK 2.16.100 release, please check the release note for the board scope and update projects included.

COPYING-BSD-3

@@ -1,5 +1,7 @@
 The BSD 3 Clause License
 
+Copyright 2016-2024 NXP
+
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
 

components/button/fsl_component_button.c

@@ -240,7 +240,9 @@ static void BUTTON_Task(void *param)
             s_buttonList.activeButtonCount--;
             if (0U == s_buttonList.activeButtonCount)
             {
+                BUTTON_EXIT_CRITICAL();
                 (void)TM_Stop(s_buttonList.timerHandle);
+                BUTTON_ENTER_CRITICAL();
             }
         }
         buttonState = buttonState->next;

components/conn_fwloader/fw_bin/rw61x/rw61x_cpu2.c

@@ -10,7 +10,7 @@
 
 #include <stdint.h>
 
-#if CONFIG_MONOLITHIC_IEEE802154
+#if CONFIG_MONOLITHIC_BLE_15_4
 const uint8_t fw_cpu2_combo[] __attribute__ ((aligned(4))) = {
 #if CONFIG_SOC_SERIES_RW6XX_REVISION_A2
 #if CONFIG_MFG_MONOLITHIC
@@ -23,7 +23,7 @@ const uint8_t fw_cpu2_combo[] __attribute__ ((aligned(4))) = {
 #endif
 };
 
-#elif CONFIG_MONOLITHIC_BT 
+#elif CONFIG_MONOLITHIC_BLE 
 
 const uint8_t fw_cpu2_ble[] __attribute__ ((aligned(4))) = {
 #if CONFIG_SOC_SERIES_RW6XX_REVISION_A2

components/conn_fwloader/fw_bin/script/wlan_gen_fw_incs.py

@@ -0,0 +1,43 @@
+#!/usr/bin/env python3
+#/*
+# * Copyright 2024 NXP
+# * 
+# * SPDX-License-Identifier: BSD-3-Clause
+# * The BSD-3-Clause license can be found at https://spdx.org/licenses/BSD-3-Clause.html
+# */
+
+# import OS module
+
+import os
+import argparse
+import codecs
+import gzip
+import io
+
+base_path = os.getcwd()
+
+src_path = base_path
+
+dest_path = base_path + "/inc"
+
+def get_nice_string(list_or_iterator):
+    return ", ".join( "0x" + str(x) for x in list_or_iterator)
+
+def make_hex(chunk, outfp):
+    hexdata = codecs.encode(chunk, 'hex').decode("utf-8")
+    hexlist = map(''.join, zip(*[iter(hexdata)]*2))
+    outfp.write(get_nice_string(hexlist) + ',')
+
+for d in os.listdir(src_path):
+
+    if '.bin' in d:
+
+        # Prints only text file present in My Folder
+
+        print("Convert: "+src_path+"/"+d +" => "+dest_path+"/"+d+".inc")
+
+        outfp = open(dest_path+"/"+d+".inc", "w")
+
+        with open(src_path+"/"+d, "rb") as fp:
+            for chunk in iter(lambda: fp.read(8), b''):
+                make_hex(chunk, outfp)

components/conn_fwloader/readme.txt

@@ -1,13 +1,20 @@
-1. FW image names:
+1.Examples that support monolithic image download do not need the steps 2-6 to load fw:
+    Wi-Fi examples: wifi_cli, wifi_wpa_supplicant, wifi_cli_static, wifi_cert, wifi_cli_fw_dump, wifi_cli_prov, wifi_test_mode
+	ncp examples: ncp_device
+	coex examples: coex_cli, coex_supplicant_cli
+
+	These examples can load cpu1/2 fw automatically, don't need to load them seperatly.
+
+2. FW image names:
 	Production FW, for users:
 		rw61x_sb_wifi_a2.bin, for CPU1_wifi of redfinch a2 board
 		rw61x_sb_ble_a2.bin, for CPU2_ble of redfinch a2 board
 		rw61x_sb_ble_15d4_combo_a2.bin, for CPU2_ble_15.4_combo of redfinch a2 board
 
-2. where to get FW image(Production and mfg_FW):
+3. where to get FW image(Production and mfg_FW):
 	In the directory:  /components/conn_fwloader/fw_bin
 
-3. How to load FW(Production and mfg_FW):
+4. How to load FW(Production and mfg_FW):
 	Need to write the FW image to flash first, then the loadservice will download FW when power on.
 	For example, the CMD to write CPU1 image to flash in J-link window:
 		loadbin C:\xxx\rw61x_sb_wifi_xx.bin,0x08400000
@@ -18,13 +25,13 @@
 	The CMD to write CPU2_15.4 image to flash in J-link window:
 		loadbin C:\xxx\rw61x_sb_ble_15d4_combo_xx.bin,0x085e0000
 
-4. How to generate the C files to be compiled in the monolithic binary:
+5. How to generate the C files to be compiled in the monolithic binary:
 	In a shell go to directory /components/conn_fwloader. Enter the following command:
 	 'python script/fw_bin2c_conv.py -t sb fw_bin'
 	or 'python script/fw_bin2c_conv.py -t raw fw_bin':
 	This results in generating the C files under fw_bin/A1 and fw_bin/A2 subdirectories.
 
-5. Remap mechanism support
+6. Remap mechanism support
 	Whenever the remap feature is active, the flash should not be accessed in direct mode.
 	As a consequence, no structure cast should be done on flash direct addresses. Likewise memcpy operations
 	should be avoided. Instead all flash accesses must be done via staging buffers in RAM, that 

components/conn_fwloader/script/fw_bin2c_conv.py

@@ -1,3 +1,9 @@
+#/*
+# * Copyright 2024 NXP
+# * 
+# * SPDX-License-Identifier: BSD-3-Clause
+# * The BSD-3-Clause license can be found at https://spdx.org/licenses/BSD-3-Clause.html
+# */
 import argparse
 import os
 import sys

components/els_pkc/src/comps/mcuxClPsaDriver/src/mcuxClPsaDriver_Key.c

@@ -544,6 +544,8 @@ MCUX_CSSL_ANALYSIS_STOP_PATTERN_DESCRIPTIVE_IDENTIFIER()
     return PSA_SUCCESS;
 }
 
+// Keeping the implementation for future reference and use.
+#if 0
 static inline psa_status_t mcuxClPsaDriver_psa_driver_wrapper_generate_s50_key(
     const psa_key_attributes_t *attributes,
     mcuxClEls_KeyIndex_t key_index_private_key,
@@ -606,6 +608,7 @@ static inline psa_status_t mcuxClPsaDriver_psa_driver_wrapper_generate_s50_key(
 
     return PSA_SUCCESS;
 }
+#endif
 
 MCUX_CSSL_ANALYSIS_START_PATTERN_DESCRIPTIVE_IDENTIFIER()
 psa_status_t mcuxClPsaDriver_psa_driver_wrapper_key_generate(
@@ -1643,4 +1646,4 @@ MCUX_CSSL_ANALYSIS_STOP_PATTERN_DESCRIPTIVE_IDENTIFIER()
     }
 
     return psa_status;
-}
+}

components/led/fsl_component_led.c

@@ -371,6 +371,7 @@ led_status_t LED_Init(led_handle_t ledHandle, const led_config_t *ledConfig)
         do
         {
             timer_status_t tmState;
+            EnableGlobalIRQ(regPrimask);
             tmState = TM_Open((timer_handle_t)s_ledList.timerHandle);
             assert(kStatus_TimerSuccess == tmState);
 
@@ -380,7 +381,7 @@ led_status_t LED_Init(led_handle_t ledHandle, const led_config_t *ledConfig)
             tmState = TM_Start(s_ledList.timerHandle, (uint8_t)kTimerModeIntervalTimer, LED_TIMER_INTERVAL);
             assert(kStatus_TimerSuccess == tmState);
             (void)tmState;
-
+            regPrimask = DisableGlobalIRQ();
             s_ledList.ledState = ledState;
         } while (false);
     }
@@ -510,9 +511,13 @@ led_status_t LED_Deinit(led_handle_t ledHandle)
 
     if (NULL == s_ledList.ledState)
     {
+        EnableGlobalIRQ(regPrimask);
         (void)TM_Close(s_ledList.timerHandle);
     }
-    EnableGlobalIRQ(regPrimask);
+    else
+    {
+        EnableGlobalIRQ(regPrimask);
+    }
 
 #if (defined(LED_DIMMING_ENABLEMENT) && (LED_DIMMING_ENABLEMENT > 0U))
 #if (defined(LED_USE_CONFIGURE_STRUCTURE) && (LED_USE_CONFIGURE_STRUCTURE > 0U))

components/osa/set_component_osa.cmake

@@ -18,6 +18,30 @@ target_include_directories(${MCUX_SDK_PROJECT_NAME} PUBLIC
 endif()
 
 
+if (CONFIG_USE_component_common_task)
+# Add set(CONFIG_USE_component_common_task true) in config.cmake to use this component
+
+message("component_common_task component is included from ${CMAKE_CURRENT_LIST_FILE}.")
+
+if(CONFIG_USE_driver_common AND CONFIG_USE_component_osa)
+
+target_sources(${MCUX_SDK_PROJECT_NAME} PRIVATE
+  ${CMAKE_CURRENT_LIST_DIR}/../common_task/fsl_component_common_task.c
+)
+
+target_include_directories(${MCUX_SDK_PROJECT_NAME} PUBLIC
+  ${CMAKE_CURRENT_LIST_DIR}/../common_task/.
+)
+
+else()
+
+message(SEND_ERROR "component_common_task dependency does not meet, please check ${CMAKE_CURRENT_LIST_FILE}.")
+
+endif()
+
+endif()
+
+
 if (CONFIG_USE_component_osa_bm)
 # Add set(CONFIG_USE_component_osa_bm true) in config.cmake to use this component
 
@@ -141,27 +165,3 @@ endif()
 
 endif()
 
-
-if (CONFIG_USE_component_common_task)
-# Add set(CONFIG_USE_component_common_task true) in config.cmake to use this component
-
-message("component_common_task component is included from ${CMAKE_CURRENT_LIST_FILE}.")
-
-if(CONFIG_USE_driver_common AND CONFIG_USE_component_osa)
-
-target_sources(${MCUX_SDK_PROJECT_NAME} PRIVATE
-  ${CMAKE_CURRENT_LIST_DIR}/../common_task/fsl_component_common_task.c
-)
-
-target_include_directories(${MCUX_SDK_PROJECT_NAME} PUBLIC
-  ${CMAKE_CURRENT_LIST_DIR}/../common_task/.
-)
-
-else()
-
-message(SEND_ERROR "component_common_task dependency does not meet, please check ${CMAKE_CURRENT_LIST_FILE}.")
-
-endif()
-
-endif()
-

components/psa_crypto_driver/els_pkc/oracle/inc/mcuxClPsaDriver_Oracle_Utils.h

@@ -43,7 +43,7 @@
 #define MBEDTLS_NXP_DIE_EL2GOATTEST_AUTH_PRK_ID  NXP_DIE_EL2GOATTEST_AUTH_PRK_ID
 #else
 #define MBEDTLS_NXP_DIE_KEK_SK_ID                                                 \
-    {                                                                                         \
+    {                                                                             \
         .MBEDTLS_PRIVATE(owner) = 0, .MBEDTLS_PRIVATE(key_id) = NXP_DIE_KEK_SK_ID \
     }
 #define MBEDTLS_NXP_DIE_EL2GOIMPORT_KEK_SK_ID                                                 \
@@ -107,7 +107,7 @@ typedef struct _key_recipe_step_ckdf_t
     union 
     {
         uint8_t derivation_data[MCUXCLELS_CKDF_DERIVATIONDATA_SIZE];
-        int (*derivation_fn)(uint8_t *derived_data);    
+        psa_status_t (*derivation_fn)(uint8_t *derived_data);    
     };
 } key_recipe_step_ckdf_t;