Apply 2.15.100 release update

nxp-mcuxpresso · Mar 26, 2024 · 5a37596 · 5a37596
1 parent 938e1fe
commit 5a37596
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 37 deletions.
diff --git a/manifests/middleware_elm_chan_fatfs_LPC55S06_manifest_v3_14.xml b/manifests/middleware_elm_chan_fatfs_LPC55S06_manifest_v3_14.xml
@@ -6,7 +6,7 @@
     <definition extID="armgcc"/>
     <definition extID="platform.drivers.common.LPC55S06"/>
   </externalDefinitions>
-  <ksdk id="MCUXpressoSDK2150_middleware_elm_chan_fatfs_LPC55S06_manifest_v3_14" name="MCUXpressoSDK2150_middleware_elm_chan_fatfs_LPC55S06_manifest_v3_14" version="2.15.0" revision="2.15.0"/>
+  <ksdk id="MCUXpressoSDK215100_middleware_elm_chan_fatfs_LPC55S06_manifest_v3_14" name="MCUXpressoSDK215100_middleware_elm_chan_fatfs_LPC55S06_manifest_v3_14" version="2.15.100" revision="2.15.100"/>
   <components>
     <component id="middleware.fatfs.template_mmc.LPC55S06" name="fatfs_mmc" brief="FatFs template MMC" version="0.15.0" full_name="FatFs template configuration for MMC disk" category="File System/FAT File System" user_visible="true" type="project_template" package_base_path=".././" project_base_path="source">
       <dependencies>

diff --git a/manifests/middleware_elm_chan_fatfs_LPC55S16_manifest_v3_14.xml b/manifests/middleware_elm_chan_fatfs_LPC55S16_manifest_v3_14.xml
@@ -10,7 +10,7 @@
     <definition extID="middleware.baremetal.LPC55S16"/>
     <definition extID="middleware.freertos-kernel.LPC55S16"/>
   </externalDefinitions>
-  <ksdk id="MCUXpressoSDK2150_middleware_elm_chan_fatfs_LPC55S16_manifest_v3_14" name="MCUXpressoSDK2150_middleware_elm_chan_fatfs_LPC55S16_manifest_v3_14" version="2.15.0" revision="2.15.0"/>
+  <ksdk id="MCUXpressoSDK215100_middleware_elm_chan_fatfs_LPC55S16_manifest_v3_14" name="MCUXpressoSDK215100_middleware_elm_chan_fatfs_LPC55S16_manifest_v3_14" version="2.15.100" revision="2.15.100"/>
   <components>
     <component id="middleware.fatfs.template_mmc.LPC55S16" name="fatfs_mmc" brief="FatFs template MMC" version="0.15.0" full_name="FatFs template configuration for MMC disk" category="File System/FAT File System" user_visible="true" type="project_template" package_base_path=".././" project_base_path="source">
       <dependencies>

diff --git a/manifests/middleware_elm_chan_fatfs_LPC55S28_manifest_v3_14.xml b/manifests/middleware_elm_chan_fatfs_LPC55S28_manifest_v3_14.xml
@@ -12,7 +12,7 @@
     <definition extID="middleware.baremetal.LPC55S28"/>
     <definition extID="middleware.freertos-kernel.LPC55S28"/>
   </externalDefinitions>
-  <ksdk id="MCUXpressoSDK2150_middleware_elm_chan_fatfs_LPC55S28_manifest_v3_14" name="MCUXpressoSDK2150_middleware_elm_chan_fatfs_LPC55S28_manifest_v3_14" version="2.15.0" revision="2.15.0"/>
+  <ksdk id="MCUXpressoSDK215100_middleware_elm_chan_fatfs_LPC55S28_manifest_v3_14" name="MCUXpressoSDK215100_middleware_elm_chan_fatfs_LPC55S28_manifest_v3_14" version="2.15.100" revision="2.15.100"/>
   <components>
     <component id="middleware.fatfs.template_mmc.LPC55S28" name="fatfs_mmc" brief="FatFs template MMC" version="0.15.0" full_name="FatFs template configuration for MMC disk" category="File System/FAT File System" user_visible="true" type="project_template" package_base_path=".././" project_base_path="source">
       <dependencies>

diff --git a/manifests/middleware_elm_chan_fatfs_LPC55S36_manifest_v3_14.xml b/manifests/middleware_elm_chan_fatfs_LPC55S36_manifest_v3_14.xml
@@ -10,7 +10,7 @@
     <definition extID="middleware.baremetal.LPC55S36"/>
     <definition extID="middleware.freertos-kernel.LPC55S36"/>
   </externalDefinitions>
-  <ksdk id="MCUXpressoSDK2150_middleware_elm_chan_fatfs_LPC55S36_manifest_v3_14" name="MCUXpressoSDK2150_middleware_elm_chan_fatfs_LPC55S36_manifest_v3_14" version="2.15.0" revision="2.15.0"/>
+  <ksdk id="MCUXpressoSDK215100_middleware_elm_chan_fatfs_LPC55S36_manifest_v3_14" name="MCUXpressoSDK215100_middleware_elm_chan_fatfs_LPC55S36_manifest_v3_14" version="2.15.100" revision="2.15.100"/>
   <components>
     <component id="middleware.fatfs.template_mmc.LPC55S36" name="fatfs_mmc" brief="FatFs template MMC" version="0.15.0" full_name="FatFs template configuration for MMC disk" category="File System/FAT File System" user_visible="true" type="project_template" package_base_path=".././" project_base_path="source">
       <dependencies>

diff --git a/manifests/middleware_elm_chan_fatfs_LPC55S69_manifest_v3_14.xml b/manifests/middleware_elm_chan_fatfs_LPC55S69_manifest_v3_14.xml
@@ -12,7 +12,7 @@
     <definition extID="middleware.baremetal.LPC55S69"/>
     <definition extID="middleware.freertos-kernel.LPC55S69"/>
   </externalDefinitions>
-  <ksdk id="MCUXpressoSDK2150_middleware_elm_chan_fatfs_LPC55S69_manifest_v3_14" name="MCUXpressoSDK2150_middleware_elm_chan_fatfs_LPC55S69_manifest_v3_14" version="2.15.0" revision="2.15.0"/>
+  <ksdk id="MCUXpressoSDK215100_middleware_elm_chan_fatfs_LPC55S69_manifest_v3_14" name="MCUXpressoSDK215100_middleware_elm_chan_fatfs_LPC55S69_manifest_v3_14" version="2.15.100" revision="2.15.100"/>
   <components>
     <component id="middleware.fatfs.template_mmc.LPC55S69" name="fatfs_mmc" brief="FatFs template MMC" version="0.15.0" full_name="FatFs template configuration for MMC disk" category="File System/FAT File System" user_visible="true" type="project_template" package_base_path=".././" project_base_path="source">
       <dependencies>

diff --git a/manifests/middleware_elm_chan_fatfs_MIMXRT1021_manifest_v3_14.xml b/manifests/middleware_elm_chan_fatfs_MIMXRT1021_manifest_v3_14.xml
@@ -12,7 +12,7 @@
     <definition extID="middleware.baremetal.MIMXRT1021"/>
     <definition extID="middleware.freertos-kernel.MIMXRT1021"/>
   </externalDefinitions>
-  <ksdk id="MCUXpressoSDK2150_middleware_elm_chan_fatfs_MIMXRT1021_manifest_v3_14" name="MCUXpressoSDK2150_middleware_elm_chan_fatfs_MIMXRT1021_manifest_v3_14" version="2.15.0" revision="2.15.0"/>
+  <ksdk id="MCUXpressoSDK215100_middleware_elm_chan_fatfs_MIMXRT1021_manifest_v3_14" name="MCUXpressoSDK215100_middleware_elm_chan_fatfs_MIMXRT1021_manifest_v3_14" version="2.15.100" revision="2.15.100"/>
   <components>
     <component id="middleware.fatfs.template_mmc.MIMXRT1021" name="fatfs_mmc" brief="FatFs template MMC" version="0.15.0" full_name="FatFs template configuration for MMC disk" category="File System/FAT File System" user_visible="true" type="project_template" package_base_path=".././" project_base_path="source">
       <dependencies>

diff --git a/manifests/middleware_elm_chan_fatfs_MIMXRT1042_manifest_v3_14.xml b/manifests/middleware_elm_chan_fatfs_MIMXRT1042_manifest_v3_14.xml
@@ -12,7 +12,7 @@
     <definition extID="middleware.baremetal.MIMXRT1042"/>
     <definition extID="middleware.freertos-kernel.MIMXRT1042"/>
   </externalDefinitions>
-  <ksdk id="MCUXpressoSDK2150_middleware_elm_chan_fatfs_MIMXRT1042_manifest_v3_14" name="MCUXpressoSDK2150_middleware_elm_chan_fatfs_MIMXRT1042_manifest_v3_14" version="2.15.0" revision="2.15.0"/>
+  <ksdk id="MCUXpressoSDK215100_middleware_elm_chan_fatfs_MIMXRT1042_manifest_v3_14" name="MCUXpressoSDK215100_middleware_elm_chan_fatfs_MIMXRT1042_manifest_v3_14" version="2.15.100" revision="2.15.100"/>
   <components>
     <component id="middleware.fatfs.template_mmc.MIMXRT1042" name="fatfs_mmc" brief="FatFs template MMC" version="0.15.0" full_name="FatFs template configuration for MMC disk" category="File System/FAT File System" user_visible="true" type="project_template" package_base_path=".././" project_base_path="source">
       <dependencies>

diff --git a/manifests/middleware_elm_chan_fatfs_MIMXRT1052_manifest_v3_14.xml b/manifests/middleware_elm_chan_fatfs_MIMXRT1052_manifest_v3_14.xml
@@ -12,7 +12,7 @@
     <definition extID="middleware.baremetal.MIMXRT1052"/>
     <definition extID="middleware.freertos-kernel.MIMXRT1052"/>
   </externalDefinitions>
-  <ksdk id="MCUXpressoSDK2150_middleware_elm_chan_fatfs_MIMXRT1052_manifest_v3_14" name="MCUXpressoSDK2150_middleware_elm_chan_fatfs_MIMXRT1052_manifest_v3_14" version="2.15.0" revision="2.15.0"/>
+  <ksdk id="MCUXpressoSDK215100_middleware_elm_chan_fatfs_MIMXRT1052_manifest_v3_14" name="MCUXpressoSDK215100_middleware_elm_chan_fatfs_MIMXRT1052_manifest_v3_14" version="2.15.100" revision="2.15.100"/>
   <components>
     <component id="middleware.fatfs.template_mmc.MIMXRT1052" name="fatfs_mmc" brief="FatFs template MMC" version="0.15.0" full_name="FatFs template configuration for MMC disk" category="File System/FAT File System" user_visible="true" type="project_template" package_base_path=".././" project_base_path="source">
       <dependencies>

diff --git a/manifests/middleware_elm_chan_fatfs_MIMXRT1062_manifest_v3_14.xml b/manifests/middleware_elm_chan_fatfs_MIMXRT1062_manifest_v3_14.xml
@@ -13,7 +13,7 @@
     <definition extID="middleware.baremetal.MIMXRT1062"/>
     <definition extID="middleware.freertos-kernel.MIMXRT1062"/>
   </externalDefinitions>
-  <ksdk id="MCUXpressoSDK2150_middleware_elm_chan_fatfs_MIMXRT1062_manifest_v3_14" name="MCUXpressoSDK2150_middleware_elm_chan_fatfs_MIMXRT1062_manifest_v3_14" version="2.15.0" revision="2.15.0"/>
+  <ksdk id="MCUXpressoSDK215100_middleware_elm_chan_fatfs_MIMXRT1062_manifest_v3_14" name="MCUXpressoSDK215100_middleware_elm_chan_fatfs_MIMXRT1062_manifest_v3_14" version="2.15.100" revision="2.15.100"/>
   <components>
     <component id="middleware.fatfs.template_mmc.MIMXRT1062" name="fatfs_mmc" brief="FatFs template MMC" version="0.15.0" full_name="FatFs template configuration for MMC disk" category="File System/FAT File System" user_visible="true" type="project_template" package_base_path=".././" project_base_path="source">
       <dependencies>

diff --git a/manifests/middleware_elm_chan_fatfs_MIMXRT1064_manifest_v3_14.xml b/manifests/middleware_elm_chan_fatfs_MIMXRT1064_manifest_v3_14.xml
@@ -13,7 +13,7 @@
     <definition extID="middleware.baremetal.MIMXRT1064"/>
     <definition extID="middleware.freertos-kernel.MIMXRT1064"/>
   </externalDefinitions>
-  <ksdk id="MCUXpressoSDK2150_middleware_elm_chan_fatfs_MIMXRT1064_manifest_v3_14" name="MCUXpressoSDK2150_middleware_elm_chan_fatfs_MIMXRT1064_manifest_v3_14" version="2.15.0" revision="2.15.0"/>
+  <ksdk id="MCUXpressoSDK215100_middleware_elm_chan_fatfs_MIMXRT1064_manifest_v3_14" name="MCUXpressoSDK215100_middleware_elm_chan_fatfs_MIMXRT1064_manifest_v3_14" version="2.15.100" revision="2.15.100"/>
   <components>
     <component id="middleware.fatfs.template_mmc.MIMXRT1064" name="fatfs_mmc" brief="FatFs template MMC" version="0.15.0" full_name="FatFs template configuration for MMC disk" category="File System/FAT File System" user_visible="true" type="project_template" package_base_path=".././" project_base_path="source">
       <dependencies>

diff --git a/manifests/middleware_elm_chan_fatfs_MIMXRT1166_manifest_v3_14.xml b/manifests/middleware_elm_chan_fatfs_MIMXRT1166_manifest_v3_14.xml
@@ -12,7 +12,7 @@
     <definition extID="middleware.baremetal.MIMXRT1166"/>
     <definition extID="middleware.freertos-kernel.MIMXRT1166"/>
   </externalDefinitions>
-  <ksdk id="MCUXpressoSDK2150_middleware_elm_chan_fatfs_MIMXRT1166_manifest_v3_14" name="MCUXpressoSDK2150_middleware_elm_chan_fatfs_MIMXRT1166_manifest_v3_14" version="2.15.0" revision="2.15.0"/>
+  <ksdk id="MCUXpressoSDK215100_middleware_elm_chan_fatfs_MIMXRT1166_manifest_v3_14" name="MCUXpressoSDK215100_middleware_elm_chan_fatfs_MIMXRT1166_manifest_v3_14" version="2.15.100" revision="2.15.100"/>
   <components>
     <component id="middleware.fatfs.template_mmc.MIMXRT1166" name="fatfs_mmc" brief="FatFs template MMC" version="0.15.0" full_name="FatFs template configuration for MMC disk" category="File System/FAT File System" user_visible="true" type="project_template" package_base_path=".././" project_base_path="source">
       <dependencies>

diff --git a/manifests/middleware_elm_chan_fatfs_MIMXRT1176_manifest_v3_14.xml b/manifests/middleware_elm_chan_fatfs_MIMXRT1176_manifest_v3_14.xml
@@ -12,7 +12,7 @@
     <definition extID="middleware.baremetal.MIMXRT1176"/>
     <definition extID="middleware.freertos-kernel.MIMXRT1176"/>
   </externalDefinitions>
-  <ksdk id="MCUXpressoSDK2150_middleware_elm_chan_fatfs_MIMXRT1176_manifest_v3_14" name="MCUXpressoSDK2150_middleware_elm_chan_fatfs_MIMXRT1176_manifest_v3_14" version="2.15.0" revision="2.15.0"/>
+  <ksdk id="MCUXpressoSDK215100_middleware_elm_chan_fatfs_MIMXRT1176_manifest_v3_14" name="MCUXpressoSDK215100_middleware_elm_chan_fatfs_MIMXRT1176_manifest_v3_14" version="2.15.100" revision="2.15.100"/>
   <components>
     <component id="middleware.fatfs.template_mmc.MIMXRT1176" name="fatfs_mmc" brief="FatFs template MMC" version="0.15.0" full_name="FatFs template configuration for MMC disk" category="File System/FAT File System" user_visible="true" type="project_template" package_base_path=".././" project_base_path="source">
       <dependencies>

diff --git a/set_middleware_fatfs.cmake b/set_middleware_fatfs.cmake
@@ -73,7 +73,7 @@ if (CONFIG_USE_middleware_fatfs)
 
 message("middleware_fatfs component is included from ${CMAKE_CURRENT_LIST_FILE}.")
 
-if((CONFIG_USE_middleware_fatfs_template_ram AND CONFIG_USE_middleware_fatfs_ram) OR (CONFIG_USE_middleware_fatfs_template_sd AND CONFIG_USE_middleware_fatfs_sd) OR (CONFIG_USE_middleware_fatfs_template_sdspi AND CONFIG_USE_middleware_fatfs_sdspi) OR (CONFIG_USE_middleware_fatfs_template_mmc AND CONFIG_USE_middleware_fatfs_mmc) OR (CONFIG_USE_middleware_fatfs_template_usb AND CONFIG_USE_middleware_fatfs_usb))
+if((CONFIG_USE_middleware_fatfs_template_ram AND CONFIG_USE_middleware_fatfs_ram) OR (CONFIG_USE_middleware_fatfs_template_sd AND CONFIG_USE_middleware_fatfs_sd) OR (CONFIG_USE_middleware_fatfs_template_mmc AND CONFIG_USE_middleware_fatfs_mmc) OR (CONFIG_USE_middleware_fatfs_template_usb AND CONFIG_USE_middleware_fatfs_usb))
 
 target_sources(${MCUX_SDK_PROJECT_NAME} PRIVATE
   ${CMAKE_CURRENT_LIST_DIR}/./source/diskio.c
@@ -167,30 +167,6 @@ endif()
 endif()
 
 
-if (CONFIG_USE_middleware_fatfs_sdspi)
-# Add set(CONFIG_USE_middleware_fatfs_sdspi true) in config.cmake to use this component
-
-message("middleware_fatfs_sdspi component is included from ${CMAKE_CURRENT_LIST_FILE}.")
-
-if(CONFIG_USE_middleware_fatfs AND CONFIG_USE_middleware_fatfs_template_sdspi AND CONFIG_USE_middleware_sdmmc_sdspi AND CONFIG_USE_driver_common AND CONFIG_USE_driver_dspi AND CONFIG_USE_driver_gpio)
-
-target_sources(${MCUX_SDK_PROJECT_NAME} PRIVATE
-  ${CMAKE_CURRENT_LIST_DIR}/./source/fsl_sdspi_disk/fsl_sdspi_disk.c
-)
-
-target_include_directories(${MCUX_SDK_PROJECT_NAME} PUBLIC
-  ${CMAKE_CURRENT_LIST_DIR}/./source/fsl_sdspi_disk
-)
-
-else()
-
-message(SEND_ERROR "middleware_fatfs_sdspi dependency does not meet, please check ${CMAKE_CURRENT_LIST_FILE}.")
-
-endif()
-
-endif()
-
-
 if (CONFIG_USE_middleware_fatfs_usb)
 # Add set(CONFIG_USE_middleware_fatfs_usb true) in config.cmake to use this component