hal_nxp: Sync 25.06 components to hal_nxp

Signed-off-by: Zhaoxiang Jin <[email protected]>

Author: ZhaoxiangJin

mcux/mcux-sdk-ng/components/conn_fwloader/CMakeLists.txt

@@ -1,29 +1,55 @@
 # Copyright 2024 NXP
 # SPDX-License-Identifier: BSD-3-Clause
 
-if(NOT CONFIG_BUILD_WITH_TFM)
-  if (CONFIG_MCUX_COMPONENT_driver.conn_fwloader)
-      mcux_add_source(
-          SOURCES fsl_loader.c
-                  fsl_loader_utils.c
-                  nboot_hal.c
-                  life_cycle.c
-      )
-      mcux_add_include(
-          INCLUDES include
-      )
-  endif()
+if (CONFIG_MCUX_COMPONENT_driver.conn_fwloader)
+    mcux_add_source(
+        SOURCES include/api_tree_root.h
+                include/fsl_loader.h
+                include/fsl_loader_utils.h
+                include/fusemap.h
+                include/life_cycle.h
+                include/nboot_rom_api_table.h
+                fsl_loader.c
+                fsl_loader_utils.c
+                nboot_hal.c
+                life_cycle.c
+                readme.txt
+                script/fw_bin2c_conv.py
+                fw_bin/rw61x_sb_wifi_a2.bin
+                fw_bin/rw61x_sb_ble_a2.bin
+                fw_bin/rw61x_sb_ble_15d4_combo_a2.bin
+                fw_bin/script/wlan_gen_fw_incs.py
+                fw_bin/inc/*.inc
+                fw_bin/rw61x/rw61x_cpu1.c
+                fw_bin/rw61x/rw61x_cpu2.c
+    )
+    mcux_add_include(
+        INCLUDES include
+                 fw_bin
+                 fw_bin/inc
+                 fw_bin/rw61x
+                 fw_bin/script
+    )
 endif()
 
-if(CONFIG_BUILD_WITH_TFM)
-  add_compile_definitions(TFM_PARTITION_LOADER_SERVICE)
+if (CONFIG_MCUX_COMPONENT_driver.conn_fwloader_ns)
+    mcux_add_source(
+        SOURCES include/fsl_loader.h
+    )
+    mcux_add_include(
+        INCLUDES include
+    )
 endif()
 
-if(CONFIG_USE_component_osa_free_rtos_RW612) 
-  include(component_osa_free_rtos_RW612)
-endif()
+if (CONFIG_MCUX_COMPONENT_driver.conn_fwloader.monolithic)
+    mcux_add_macro(
+        CC  "-DgPlatformMonolithicApp_d=1"
+        CX  "-DgPlatformMonolithicApp_d=1"
+    )
 
-if(CONFIG_USE_component_osa_bm) 
-  include(component_osa_bm)
+    mcux_add_source(
+        BASE_PATH ${SdkRootDirPath}/examples/_boards/${board}
+        PREINCLUDE TRUE
+        SOURCES monolithic_config.h
+    )
 endif()
-

mcux/mcux-sdk-ng/components/conn_fwloader/fsl_loader_utils.c

@@ -1106,18 +1106,18 @@ status_t loader_process_sb_file(uint32_t readOffset)
 static status_t loader_process_raw_file(uint32_t readOffset)
 {
     status_t status = kStatus_Fail;
-    uint32_t *src_addr;
-    uint32_t *dst_addr;
+    uint8_t *src_addr;
+    uint8_t *dst_addr;
     uint32_t code_size;
-    uint32_t *data_ptr      = (uint32_t *)readOffset;
+    uint8_t *data_ptr      = (uint8_t *)readOffset;
     uint32_t total_raw_size = 0;
 
 #ifdef CONFIG_FW_VDLLV2
-    if ((*data_ptr == LOADER_RAW_BINARY_FORMAT) && (*(data_ptr + 1) == LOADER_VDLL_RAW_BINARY_FORMAT))
+    if ((*((uint32_t*)data_ptr) == LOADER_RAW_BINARY_FORMAT) && (*((uint32_t*)(data_ptr + 4)) == LOADER_VDLL_RAW_BINARY_FORMAT))
     {
-        src_addr  = data_ptr + 4;
-        dst_addr  = (uint32_t *)*(data_ptr + 2);
-        code_size = *(data_ptr + 3);
+        src_addr  = data_ptr + 16;
+        dst_addr  = (uint8_t *)(*((uint32_t*)(data_ptr + 8)));
+        code_size = *((uint32_t*)(data_ptr + 12));
         (void)memcpy(dst_addr, src_addr, code_size);
         status = kStatus_Success;
     }
@@ -1126,16 +1126,16 @@ static status_t loader_process_raw_file(uint32_t readOffset)
     {
         do
         {
-            if (*data_ptr != LOADER_RAW_BINARY_FORMAT)
-            {
+	    if(*((uint32_t*)data_ptr) != LOADER_RAW_BINARY_FORMAT)
+	    {
                 break;
-            }
+	    }
 
-            src_addr  = data_ptr + 4;
-            dst_addr  = (uint32_t *)*(data_ptr + 2);
-            code_size = *(data_ptr + 3);
+            src_addr  = data_ptr + 16;
+            dst_addr  = (uint8_t *)(*((uint32_t*)(data_ptr + 8)));
+            code_size = *((uint32_t*)(data_ptr + 12));
             // Check for raw ending segment
-            if (((uint32_t)src_addr == 0xffffffffU) || ((uint32_t)dst_addr == 0xffffffffU))
+            if ((uint32_t)src_addr == 0xffffffffU || (uint32_t)dst_addr == 0xffffffffU)
             {
                 if (code_size == total_raw_size)
                 {
@@ -1148,7 +1148,7 @@ static status_t loader_process_raw_file(uint32_t readOffset)
             }
 
             (void)memcpy(dst_addr, src_addr, code_size);
-            data_ptr += 4U + (code_size >> 2U);
+            data_ptr += 16 + code_size;
             total_raw_size += code_size;
         } while (true);
     }

mcux/mcux-sdk-ng/components/conn_fwloader/include/fsl_loader_utils.h

@@ -370,10 +370,10 @@ typedef union fsl_StandardVersion
     uint32_t version;   //!< combined version numbers
 
 #if defined(__cplusplus)
-    StandardVersion() : version(0)
+    fsl_StandardVersion() : version(0)
     {
     }
-    StandardVersion(uint32_t version) : version(version)
+    fsl_StandardVersion(uint32_t version) : version(version)
     {
     }
 #endif

mcux/mcux-sdk-ng/components/conn_fwloader/readme.txt

@@ -1,5 +1,5 @@
 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
+    Wi-Fi examples: wifi_cli, wifi_wpa_supplicant, wifi_cert, wifi_cli_fw_dump, wifi_test_mode
 	ncp examples: ncp_device
 	coex examples: coex_cli, coex_supplicant_cli
 
@@ -35,4 +35,4 @@
 	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 
-	get loaded using the mflash driver.
+	get loaded using the mflash driver.

mcux/mcux-sdk-ng/components/conn_fwloader/script/image_tool/elftosb/SB3Commands.docx

@@ -0,0 +1,11 @@
+{
+	"fw_elf": "./nbu_15_4.out",
+	"image_version": 2,
+	"image_type_raw": true,
+	"image_partition_a": true,
+	"target_cpu1": false,
+	"target_ble": false,
+	"target_ble_audio": false,
+	"target_ble_15_4_combo": false,
+	"sb3_config": "./image_tool/elftosb/rw610_cpu2_15d4_sb.json"
+}

mcux/mcux-sdk-ng/components/conn_fwloader/script/image_tool/elftosb/elftosb.exe

@@ -0,0 +1,11 @@
+{
+	"fw_elf": "./rw610n_le_audio.axf",
+	"image_version": 2,
+	"image_type_raw": true,
+	"image_partition_a": true,
+	"target_cpu1": false,
+	"target_ble": false,
+  "target_ble_audio": true,
+	"target_ble_15_4_combo": false,
+	"sb3_config": "./image_tool/elftosb/rw610_cpu2_ble_sb.json"
+}

mcux/mcux-sdk-ng/components/conn_fwloader/script/image_tool/elftosb/elftosbJsonDescription.docx

@@ -0,0 +1,11 @@
+{
+	"fw_elf": "./rw610n.axf",
+	"image_version": 2,
+	"image_type_raw": true,
+	"image_partition_a": true,
+	"target_cpu1": false,
+	"target_ble": true,
+	"target_ble_audio": false,
+	"target_ble_15_4_combo": false,
+	"sb3_config": "./image_tool/elftosb/rw610_cpu2_ble_sb.json"
+}