diff --git a/manifests/middleware_amazon_freertos_kernel_MCXA156_manifest_v3_13.xml b/manifests/middleware_amazon_freertos_kernel_MCXA156_manifest_v3_13.xml
new file mode 100644
index 00000000000..550ca0ad0c0
--- /dev/null
+++ b/manifests/middleware_amazon_freertos_kernel_MCXA156_manifest_v3_13.xml
@@ -0,0 +1,255 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ksdk:manifest xmlns:ksdk="http://nxp.com/ksdk/2.0/ksdk_manifest_v3.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="SDK_2.x_middleware_amazon_freertos_kernel_MCXA156_manifest_v3_13" name="FreeRTOS" brief="Real-time operating system for microcontrollers from Amazon" format_version="3.13" api_version="2.0.0" xsi:schemaLocation="http://nxp.com/ksdk/2.0/ksdk_manifest_v3.0.xsd http://nxp.com/mcuxpresso/sdk/sdk_manifest_v3.13.xsd">
+
+  <externalDefinitions>
+    <definition extID="MCXA156"/>
+    <definition extID="armgcc"/>
+    <definition extID="cm33_core0_MCXA156"/>
+    <definition extID="mcuxpresso"/>
+  </externalDefinitions>
+  <ksdk id="MCUXpressoSDK2150_middleware_amazon_freertos_kernel_MCXA156_manifest_v3_13" name="MCUXpressoSDK2150_middleware_amazon_freertos_kernel_MCXA156_manifest_v3_13" version="2.15.0" revision="2.15.0"/>
+  <components>
+    <component id="middleware.freertos-kernel.extension.MCXA156" name="FreeRTOS NXP extension" brief="FreeRTOS NXP extension" version="10.5.1" full_name="FreeRTOS NXP extension" devices="MCXA156" category="RTOS/TAD extension" user_visible="false" type="other" package_base_path=".././" project_base_path="freertos/freertos-kernel">
+      <source relative_path="./include" project_relative_path="include" type="c_include">
+        <files mask="freertos_tasks_c_additions.h"/>
+      </source>
+      <source toolchain="armgcc" relative_path="./" type="workspace">
+        <files mask="middleware_freertos-kernel_extension.cmake" hidden="true"/>
+      </source>
+      <include_paths>
+        <include_path relative_path="./include" project_relative_path="include" type="c_include"/>
+      </include_paths>
+    </component>
+    <component id="middleware.freertos-kernel.template.MCXA156" name="FreeRTOS configuration template" brief="Template configuration file to be edited by user. Provides also memory allocator (heap_x), change variant if needed." version="10.5.1" full_name="FreeRTOS configuration template" devices="MCXA156" category="RTOS/freertos template" user_visible="false" type="project_template" package_base_path=".././" project_base_path="freertos/freertos-kernel">
+      <source relative_path="./template/ARM_CM33_3_priority_bits" project_relative_path="../../source" config="true" type="c_include" device_cores="cm33_core0_MCXA156">
+        <files mask="FreeRTOSConfig.h"/>
+      </source>
+      <source toolchain="armgcc" relative_path="./" type="workspace">
+        <files mask="middleware_freertos-kernel_template.cmake" hidden="true"/>
+      </source>
+      <include_paths>
+        <include_path relative_path="./template/ARM_CM33_3_priority_bits" project_relative_path="../../source" type="c_include" device_cores="cm33_core0_MCXA156"/>
+      </include_paths>
+    </component>
+    <component id="middleware.freertos-kernel.MCXA156" name="FreeRTOS kernel" brief="FreeRTOS kernel" version="10.5.1" full_name="FreeRTOS kernel" devices="MCXA156" device_cores="cm33_core0_MCXA156" category="RTOS/Core" user_visible="true" type="OS" package_base_path=".././" project_base_path="freertos/freertos-kernel">
+      <defines>
+        <define name="SDK_OS_FREE_RTOS" value=""/>
+      </defines>
+      <dependencies>
+        <all>
+          <component_dependency value="middleware.freertos-kernel.cm33_non_trustzone.MCXA156"/>
+          <component_dependency value="middleware.freertos-kernel.template.MCXA156"/>
+          <component_dependency value="middleware.freertos-kernel.extension.MCXA156"/>
+        </all>
+      </dependencies>
+      <source relative_path="./" type="src">
+        <files mask="croutine.c"/>
+        <files mask="event_groups.c"/>
+        <files mask="list.c"/>
+        <files mask="queue.c"/>
+        <files mask="stream_buffer.c"/>
+        <files mask="tasks.c"/>
+        <files mask="timers.c"/>
+      </source>
+      <source relative_path="./include" project_relative_path="include" type="c_include">
+        <files mask="atomic.h"/>
+        <files mask="croutine.h"/>
+        <files mask="deprecated_definitions.h"/>
+        <files mask="event_groups.h"/>
+        <files mask="FreeRTOS.h"/>
+        <files mask="list.h"/>
+        <files mask="message_buffer.h"/>
+        <files mask="mpu_prototypes.h"/>
+        <files mask="mpu_wrappers.h"/>
+        <files mask="portable.h"/>
+        <files mask="projdefs.h"/>
+        <files mask="queue.h"/>
+        <files mask="semphr.h"/>
+        <files mask="stack_macros.h"/>
+        <files mask="StackMacros.h"/>
+        <files mask="stream_buffer.h"/>
+        <files mask="task.h"/>
+        <files mask="timers.h"/>
+      </source>
+      <source relative_path="./include" project_relative_path="include" type="doc">
+        <files mask="stdint.readme"/>
+      </source>
+      <source relative_path="./portable/MemMang" project_relative_path="portable/MemMang" type="other">
+        <files mask="ReadMe.url"/>
+      </source>
+      <source relative_path="./portable" project_relative_path="portable" type="doc">
+        <files mask="readme.txt"/>
+      </source>
+      <source toolchain="armgcc" relative_path="./" type="workspace">
+        <files mask="middleware_freertos-kernel.cmake" hidden="true"/>
+      </source>
+      <include_paths>
+        <include_path relative_path="./include" project_relative_path="include" type="c_include"/>
+      </include_paths>
+    </component>
+    <component id="middleware.freertos-kernel.cm33_non_trustzone.MCXA156" name="cm33 nontrustzone port" brief="FreeRTOS cm33 non trustzone port" version="10.5.1" full_name="FreeRTOS cm33 non trustzone port" devices="MCXA156" device_cores="cm33_core0_MCXA156" category="RTOS/cm33_non_trustzone_port" user_visible="true" type="middleware" package_base_path=".././" project_base_path="freertos/freertos-kernel">
+      <dependencies>
+        <all>
+          <any_of>
+            <not>
+              <component_dependency value="middleware.freertos-kernel.template.MCXA156"/>
+            </not>
+            <component_dependency value="middleware.freertos-kernel.template.MCXA156"/>
+          </any_of>
+          <component_dependency value="middleware.freertos-kernel.MCXA156"/>
+        </all>
+      </dependencies>
+      <source toolchain="armgcc mcuxpresso" relative_path="./portable/GCC/ARM_CM33_NTZ/non_secure" project_relative_path="portable/GCC/ARM_CM33_NTZ/non_secure" type="src" device_cores="cm33_core0_MCXA156">
+        <files mask="port.c"/>
+        <files mask="portasm.c"/>
+      </source>
+      <source toolchain="armgcc mcuxpresso" relative_path="./portable/GCC/ARM_CM33_NTZ/non_secure" project_relative_path="portable/GCC/ARM_CM33_NTZ/non_secure" type="c_include" device_cores="cm33_core0_MCXA156">
+        <files mask="portasm.h"/>
+        <files mask="portmacro.h"/>
+        <files mask="portmacrocommon.h"/>
+      </source>
+      <source toolchain="armgcc" relative_path="./" type="workspace">
+        <files mask="middleware_freertos-kernel_cm33_non_trustzone.cmake" hidden="true"/>
+      </source>
+      <include_paths>
+        <include_path relative_path="./portable/GCC/ARM_CM33_NTZ/non_secure" project_relative_path="portable/GCC/ARM_CM33_NTZ/non_secure" toolchain="armgcc mcuxpresso" type="c_include" device_cores="cm33_core0_MCXA156"/>
+      </include_paths>
+    </component>
+    <component id="middleware.freertos-kernel.heap_1.MCXA156" name="FreeRTOS heap 1" brief="FreeRTOS heap 1" version="10.5.1" full_name="FreeRTOS heap 1" devices="MCXA156" device_cores="cm33_core0_MCXA156" category="RTOS/Heap" user_visible="false" type="other" package_base_path=".././" project_base_path="freertos/freertos-kernel">
+      <dependencies>
+        <all>
+          <not>
+            <component_dependency value="middleware.freertos-kernel.heap_2.MCXA156"/>
+          </not>
+          <not>
+            <component_dependency value="middleware.freertos-kernel.heap_3.MCXA156"/>
+          </not>
+          <not>
+            <component_dependency value="middleware.freertos-kernel.heap_4.MCXA156"/>
+          </not>
+          <not>
+            <component_dependency value="middleware.freertos-kernel.heap_5.MCXA156"/>
+          </not>
+          <component_dependency value="middleware.freertos-kernel.MCXA156"/>
+        </all>
+      </dependencies>
+      <source relative_path="./portable/MemMang" project_relative_path="portable/MemMang" type="src">
+        <files mask="heap_1.c"/>
+      </source>
+      <source toolchain="armgcc" relative_path="./" type="workspace">
+        <files mask="middleware_freertos-kernel_heap_1.cmake" hidden="true"/>
+      </source>
+    </component>
+    <component id="middleware.freertos-kernel.heap_2.MCXA156" name="FreeRTOS heap 2" brief="FreeRTOS heap 2" version="10.5.1" full_name="FreeRTOS heap 2" devices="MCXA156" device_cores="cm33_core0_MCXA156" category="RTOS/Heap" user_visible="false" type="other" package_base_path=".././" project_base_path="freertos/freertos-kernel">
+      <dependencies>
+        <all>
+          <not>
+            <component_dependency value="middleware.freertos-kernel.heap_1.MCXA156"/>
+          </not>
+          <not>
+            <component_dependency value="middleware.freertos-kernel.heap_3.MCXA156"/>
+          </not>
+          <not>
+            <component_dependency value="middleware.freertos-kernel.heap_4.MCXA156"/>
+          </not>
+          <not>
+            <component_dependency value="middleware.freertos-kernel.heap_5.MCXA156"/>
+          </not>
+          <component_dependency value="middleware.freertos-kernel.MCXA156"/>
+        </all>
+      </dependencies>
+      <source relative_path="./portable/MemMang" project_relative_path="portable/MemMang" type="src">
+        <files mask="heap_2.c"/>
+      </source>
+      <source toolchain="armgcc" relative_path="./" type="workspace">
+        <files mask="middleware_freertos-kernel_heap_2.cmake" hidden="true"/>
+      </source>
+    </component>
+    <component id="middleware.freertos-kernel.heap_3.MCXA156" name="FreeRTOS heap 3" brief="FreeRTOS heap 3" version="10.5.1" full_name="FreeRTOS heap_3" devices="MCXA156" device_cores="cm33_core0_MCXA156" category="RTOS/Heap" user_visible="false" type="other" package_base_path=".././" project_base_path="freertos/freertos-kernel">
+      <dependencies>
+        <all>
+          <not>
+            <component_dependency value="middleware.freertos-kernel.heap_1.MCXA156"/>
+          </not>
+          <not>
+            <component_dependency value="middleware.freertos-kernel.heap_2.MCXA156"/>
+          </not>
+          <not>
+            <component_dependency value="middleware.freertos-kernel.heap_4.MCXA156"/>
+          </not>
+          <not>
+            <component_dependency value="middleware.freertos-kernel.heap_5.MCXA156"/>
+          </not>
+          <component_dependency value="middleware.freertos-kernel.MCXA156"/>
+        </all>
+      </dependencies>
+      <source relative_path="./portable/MemMang" project_relative_path="portable/MemMang" type="src">
+        <files mask="heap_3.c"/>
+      </source>
+      <source toolchain="armgcc" relative_path="./" type="workspace">
+        <files mask="middleware_freertos-kernel_heap_3.cmake" hidden="true"/>
+      </source>
+    </component>
+    <component id="middleware.freertos-kernel.heap_4.MCXA156" name="FreeRTOS heap 4" brief="FreeRTOS heap 4" version="10.5.1" full_name="FreeRTOS heap 4" devices="MCXA156" device_cores="cm33_core0_MCXA156" category="RTOS/Heap" user_visible="false" type="other" package_base_path=".././" project_base_path="freertos/freertos-kernel">
+      <dependencies>
+        <all>
+          <not>
+            <component_dependency value="middleware.freertos-kernel.heap_1.MCXA156"/>
+          </not>
+          <not>
+            <component_dependency value="middleware.freertos-kernel.heap_2.MCXA156"/>
+          </not>
+          <not>
+            <component_dependency value="middleware.freertos-kernel.heap_3.MCXA156"/>
+          </not>
+          <not>
+            <component_dependency value="middleware.freertos-kernel.heap_5.MCXA156"/>
+          </not>
+          <component_dependency value="middleware.freertos-kernel.MCXA156"/>
+        </all>
+      </dependencies>
+      <source relative_path="./portable/MemMang" project_relative_path="portable/MemMang" type="src">
+        <files mask="heap_4.c"/>
+      </source>
+      <source toolchain="armgcc" relative_path="./" type="workspace">
+        <files mask="middleware_freertos-kernel_heap_4.cmake" hidden="true"/>
+      </source>
+    </component>
+    <component id="middleware.freertos-kernel.heap_5.MCXA156" name="FreeRTOS heap 5" brief="FreeRTOS heap 5" version="10.5.1" full_name="FreeRTOS heap 5" devices="MCXA156" device_cores="cm33_core0_MCXA156" category="RTOS/Heap" user_visible="false" type="other" package_base_path=".././" project_base_path="freertos/freertos-kernel">
+      <dependencies>
+        <all>
+          <not>
+            <component_dependency value="middleware.freertos-kernel.heap_1.MCXA156"/>
+          </not>
+          <not>
+            <component_dependency value="middleware.freertos-kernel.heap_2.MCXA156"/>
+          </not>
+          <not>
+            <component_dependency value="middleware.freertos-kernel.heap_3.MCXA156"/>
+          </not>
+          <not>
+            <component_dependency value="middleware.freertos-kernel.heap_4.MCXA156"/>
+          </not>
+          <component_dependency value="middleware.freertos-kernel.MCXA156"/>
+        </all>
+      </dependencies>
+      <source relative_path="./portable/MemMang" project_relative_path="portable/MemMang" type="src">
+        <files mask="heap_5.c"/>
+      </source>
+      <source toolchain="armgcc" relative_path="./" type="workspace">
+        <files mask="middleware_freertos-kernel_heap_5.cmake" hidden="true"/>
+      </source>
+    </component>
+    <component id="middleware.freertos-kernel.mpu_wrappers.MCXA156" name="FreeRTOS MPU wrappers" brief="FreeRTOS MPU wrappers" version="10.5.1" full_name="FreeRTOS MPU wrappers" devices="MCXA156" device_cores="cm33_core0_MCXA156" category="RTOS/MPU wrappers" user_visible="false" type="other" package_base_path=".././" project_base_path="freertos/freertos-kernel">
+      <dependencies>
+        <component_dependency value="middleware.freertos-kernel.MCXA156"/>
+      </dependencies>
+      <source relative_path="./portable/Common" project_relative_path="portable/Common" type="src">
+        <files mask="mpu_wrappers.c"/>
+      </source>
+      <source toolchain="armgcc" relative_path="./" type="workspace">
+        <files mask="middleware_freertos-kernel_mpu_wrappers.cmake" hidden="true"/>
+      </source>
+    </component>
+  </components>
+</ksdk:manifest>
diff --git a/set_middleware_freertos-kernel.cmake b/set_middleware_freertos-kernel.cmake
index 18c81c54270..7571bc3b2c2 100644
--- a/set_middleware_freertos-kernel.cmake
+++ b/set_middleware_freertos-kernel.cmake
@@ -19,22 +19,32 @@ if (CONFIG_USE_middleware_freertos-kernel_template)
 
 message("middleware_freertos-kernel_template component is included from ${CMAKE_CURRENT_LIST_FILE}.")
 
-if(CONFIG_CORE STREQUAL cm0p)
-  add_config_file(${CMAKE_CURRENT_LIST_DIR}/./template/ARM_CM0/FreeRTOSConfig.h ${CMAKE_CURRENT_LIST_DIR}/./template/ARM_CM4F_4_priority_bits middleware_freertos-kernel_template)
+if(CONFIG_CORE STREQUAL cm33 AND CONFIG_FPU STREQUAL SP_FPU AND (CONFIG_DEVICE_ID STREQUAL MCXA156 OR CONFIG_DEVICE_ID STREQUAL MCXA155 OR CONFIG_DEVICE_ID STREQUAL MCXA144 OR CONFIG_DEVICE_ID STREQUAL MCXA146 OR CONFIG_DEVICE_ID STREQUAL MCXA145))
+  add_config_file(${CMAKE_CURRENT_LIST_DIR}/./template/ARM_CM33_3_priority_bits/FreeRTOSConfig.h ${CMAKE_CURRENT_LIST_DIR}/./template/ARM_CM33_3_priority_bits middleware_freertos-kernel_template)
 endif()
 
-if(CONFIG_CORE STREQUAL cm33 AND (CONFIG_FPU STREQUAL NO_FPU OR CONFIG_FPU STREQUAL SP_FPU) AND (CONFIG_DEVICE_ID STREQUAL LPC5502 OR CONFIG_DEVICE_ID STREQUAL LPC5504 OR CONFIG_DEVICE_ID STREQUAL LPC5506 OR CONFIG_DEVICE_ID STREQUAL LPC5512 OR CONFIG_DEVICE_ID STREQUAL LPC5514 OR CONFIG_DEVICE_ID STREQUAL LPC5516 OR CONFIG_DEVICE_ID STREQUAL LPC5526 OR CONFIG_DEVICE_ID STREQUAL LPC5528 OR CONFIG_DEVICE_ID STREQUAL LPC5534 OR CONFIG_DEVICE_ID STREQUAL LPC5536 OR CONFIG_DEVICE_ID STREQUAL LPC55S04 OR CONFIG_DEVICE_ID STREQUAL LPC55S06 OR CONFIG_DEVICE_ID STREQUAL LPC55S14 OR CONFIG_DEVICE_ID STREQUAL LPC55S16 OR CONFIG_DEVICE_ID STREQUAL LPC55S26 OR CONFIG_DEVICE_ID STREQUAL LPC55S28 OR CONFIG_DEVICE_ID STREQUAL LPC55S36 OR CONFIG_DEVICE_ID STREQUAL LPC55S66 OR CONFIG_DEVICE_ID STREQUAL LPC55S69 OR CONFIG_DEVICE_ID STREQUAL MIMX8UD3xxx08 OR CONFIG_DEVICE_ID STREQUAL MIMX8UD5xxx08 OR CONFIG_DEVICE_ID STREQUAL MIMX8US3xxx08 OR CONFIG_DEVICE_ID STREQUAL MIMX8US5xxx08 OR CONFIG_DEVICE_ID STREQUAL MIMXRT533S OR CONFIG_DEVICE_ID STREQUAL MIMXRT555S OR CONFIG_DEVICE_ID STREQUAL MIMXRT595S OR CONFIG_DEVICE_ID STREQUAL MIMXRT633S OR CONFIG_DEVICE_ID STREQUAL MIMXRT685S))
-  add_config_file(${CMAKE_CURRENT_LIST_DIR}/./template/ARM_CM33_3_priority_bits/FreeRTOSConfig.h ${CMAKE_CURRENT_LIST_DIR}/./template/ARM_CM4F_4_priority_bits middleware_freertos-kernel_template)
-endif()
 
-if(CONFIG_CORE STREQUAL cm4f AND (CONFIG_DEVICE_ID STREQUAL LPC54005 OR CONFIG_DEVICE_ID STREQUAL LPC54016 OR CONFIG_DEVICE_ID STREQUAL LPC54018 OR CONFIG_DEVICE_ID STREQUAL LPC54018J2M OR CONFIG_DEVICE_ID STREQUAL LPC54018J4M OR CONFIG_DEVICE_ID STREQUAL LPC54605J512 OR CONFIG_DEVICE_ID STREQUAL LPC54605J256 OR CONFIG_DEVICE_ID STREQUAL LPC54606J512 OR CONFIG_DEVICE_ID STREQUAL LPC54606J256 OR CONFIG_DEVICE_ID STREQUAL LPC54607J256 OR CONFIG_DEVICE_ID STREQUAL LPC54607J512 OR CONFIG_DEVICE_ID STREQUAL LPC54608J512 OR CONFIG_DEVICE_ID STREQUAL LPC54616J512 OR CONFIG_DEVICE_ID STREQUAL LPC54616J256 OR CONFIG_DEVICE_ID STREQUAL LPC54618J512 OR CONFIG_DEVICE_ID STREQUAL LPC54628J512 OR CONFIG_DEVICE_ID STREQUAL LPC54S005 OR CONFIG_DEVICE_ID STREQUAL LPC54S016 OR CONFIG_DEVICE_ID STREQUAL LPC54S018 OR CONFIG_DEVICE_ID STREQUAL LPC54S018J2M OR CONFIG_DEVICE_ID STREQUAL LPC54S018J4M))
-  add_config_file(${CMAKE_CURRENT_LIST_DIR}/./template/ARM_CM4F_3_priority_bits/FreeRTOSConfig.h ${CMAKE_CURRENT_LIST_DIR}/./template/ARM_CM4F_4_priority_bits middleware_freertos-kernel_template)
 endif()
 
-if((CONFIG_CORE STREQUAL cm4f OR CONFIG_CORE STREQUAL cm7f) AND (CONFIG_DEVICE_ID STREQUAL K32L3A60xxx OR CONFIG_DEVICE_ID STREQUAL MCIMX7U3xxxxx OR CONFIG_DEVICE_ID STREQUAL MCIMX7U5xxxxx OR CONFIG_DEVICE_ID STREQUAL MIMX8MD6xxxJZ OR CONFIG_DEVICE_ID STREQUAL MIMX8MD6xxxHZ OR CONFIG_DEVICE_ID STREQUAL MIMX8MD7xxxJZ OR CONFIG_DEVICE_ID STREQUAL MIMX8MD7xxxHZ OR CONFIG_DEVICE_ID STREQUAL MIMX8MM1xxxLZ OR CONFIG_DEVICE_ID STREQUAL MIMX8MM1xxxKZ OR CONFIG_DEVICE_ID STREQUAL MIMX8MM2xxxLZ OR CONFIG_DEVICE_ID STREQUAL MIMX8MM2xxxKZ OR CONFIG_DEVICE_ID STREQUAL MIMX8MM3xxxLZ OR CONFIG_DEVICE_ID STREQUAL MIMX8MM3xxxKZ OR CONFIG_DEVICE_ID STREQUAL MIMX8MM4xxxLZ OR CONFIG_DEVICE_ID STREQUAL MIMX8MM4xxxKZ OR CONFIG_DEVICE_ID STREQUAL MIMX8MM5xxxLZ OR CONFIG_DEVICE_ID STREQUAL MIMX8MM5xxxKZ OR CONFIG_DEVICE_ID STREQUAL MIMX8MM6xxxLZ OR CONFIG_DEVICE_ID STREQUAL MIMX8MM6xxxKZ OR CONFIG_DEVICE_ID STREQUAL MIMX8MQ5xxxJZ OR CONFIG_DEVICE_ID STREQUAL MIMX8MQ5xxxHZ OR CONFIG_DEVICE_ID STREQUAL MIMX8MQ6xxxJZ OR CONFIG_DEVICE_ID STREQUAL MIMX8MQ6xxxHZ OR CONFIG_DEVICE_ID STREQUAL MIMX8MQ7xxxJZ OR CONFIG_DEVICE_ID STREQUAL MIMX8MQ7xxxHZ OR CONFIG_DEVICE_ID STREQUAL MIMXRT1165xxxxx OR CONFIG_DEVICE_ID STREQUAL MIMXRT1166xxxxx OR CONFIG_DEVICE_ID STREQUAL MIMXRT1173xxxxx OR CONFIG_DEVICE_ID STREQUAL MIMXRT1175xxxxx OR CONFIG_DEVICE_ID STREQUAL MIMXRT1176xxxxx OR CONFIG_DEVICE_ID STREQUAL MK02FN128xxx10 OR CONFIG_DEVICE_ID STREQUAL MK02FN64xxx10 OR CONFIG_DEVICE_ID STREQUAL MK22FN128xxx12 OR CONFIG_DEVICE_ID STREQUAL MK22FN256xxx12 OR CONFIG_DEVICE_ID STREQUAL MK22FN512xxx12 OR CONFIG_DEVICE_ID STREQUAL MIMX8ML3xxxLZ OR CONFIG_DEVICE_ID STREQUAL MIMX8ML3xxxKZ OR CONFIG_DEVICE_ID STREQUAL MIMX8ML4xxxLZ OR CONFIG_DEVICE_ID STREQUAL MIMX8ML4xxxKZ OR CONFIG_DEVICE_ID STREQUAL MIMX8ML6xxxLZ OR CONFIG_DEVICE_ID STREQUAL MIMX8ML6xxxKZ OR CONFIG_DEVICE_ID STREQUAL MIMX8ML8xxxLZ OR CONFIG_DEVICE_ID STREQUAL MIMX8ML8xxxKZ OR CONFIG_DEVICE_ID STREQUAL MIMX8MN1xxxJZ OR CONFIG_DEVICE_ID STREQUAL MIMX8MN1xxxIZ OR CONFIG_DEVICE_ID STREQUAL MIMX8MN2xxxJZ OR CONFIG_DEVICE_ID STREQUAL MIMX8MN2xxxIZ OR CONFIG_DEVICE_ID STREQUAL MIMX8MN3xxxJZ OR CONFIG_DEVICE_ID STREQUAL MIMX8MN3xxxIZ OR CONFIG_DEVICE_ID STREQUAL MIMX8MN4xxxJZ OR CONFIG_DEVICE_ID STREQUAL MIMX8MN4xxxIZ OR CONFIG_DEVICE_ID STREQUAL MIMX8MN5xxxJZ OR CONFIG_DEVICE_ID STREQUAL MIMX8MN5xxxIZ OR CONFIG_DEVICE_ID STREQUAL MIMX8MN6xxxJZ OR CONFIG_DEVICE_ID STREQUAL MIMX8MN6xxxIZ OR CONFIG_DEVICE_ID STREQUAL MIMXRT1011xxxxx OR CONFIG_DEVICE_ID STREQUAL MIMXRT1015xxxxx OR CONFIG_DEVICE_ID STREQUAL MIMXRT1021xxxxx OR CONFIG_DEVICE_ID STREQUAL MIMXRT1024xxxxx OR CONFIG_DEVICE_ID STREQUAL MIMXRT1041xxxxB OR CONFIG_DEVICE_ID STREQUAL MIMXRT1042xxxxB OR CONFIG_DEVICE_ID STREQUAL MIMXRT1051xxxxB OR CONFIG_DEVICE_ID STREQUAL MIMXRT1052xxxxB OR CONFIG_DEVICE_ID STREQUAL MIMXRT1061xxxxA OR CONFIG_DEVICE_ID STREQUAL MIMXRT1061xxxxB OR CONFIG_DEVICE_ID STREQUAL MIMXRT1062xxxxA OR CONFIG_DEVICE_ID STREQUAL MIMXRT1062xxxxB OR CONFIG_DEVICE_ID STREQUAL MIMXRT1064xxxxA OR CONFIG_DEVICE_ID STREQUAL MIMXRT1171xxxxx OR CONFIG_DEVICE_ID STREQUAL MIMXRT1172xxxxx))
-  add_config_file(${CMAKE_CURRENT_LIST_DIR}/./template/ARM_CM4F_4_priority_bits/FreeRTOSConfig.h ${CMAKE_CURRENT_LIST_DIR}/./template/ARM_CM4F_4_priority_bits middleware_freertos-kernel_template)
+
+if (CONFIG_USE_middleware_freertos-kernel_cm33_trustzone_secure_context)
+# Add set(CONFIG_USE_middleware_freertos-kernel_cm33_trustzone_secure_context true) in config.cmake to use this component
+
+message("middleware_freertos-kernel_cm33_trustzone_secure_context component is included from ${CMAKE_CURRENT_LIST_FILE}.")
+
+if((NOT (CONFIG_NOT STREQUAL MCXA144)) AND (CONFIG_CORE STREQUAL cm33))
+
+if(CONFIG_CORE STREQUAL cm33 AND (CONFIG_TOOLCHAIN STREQUAL armgcc OR CONFIG_TOOLCHAIN STREQUAL mcux) AND CONFIG_FPU STREQUAL SP_FPU)
+target_include_directories(${MCUX_SDK_PROJECT_NAME} PUBLIC
+  ${CMAKE_CURRENT_LIST_DIR}/./portable/GCC/ARM_CM33/secure
+)
 endif()
 
+else()
+
+message(SEND_ERROR "middleware_freertos-kernel_cm33_trustzone_secure_context dependency does not meet, please check ${CMAKE_CURRENT_LIST_FILE}.")
+
+endif()
 
 endif()
 
@@ -44,7 +54,7 @@ if (CONFIG_USE_middleware_freertos-kernel)
 
 message("middleware_freertos-kernel component is included from ${CMAKE_CURRENT_LIST_FILE}.")
 
-if(CONFIG_USE_middleware_freertos-kernel_template AND CONFIG_USE_middleware_freertos-kernel_extension)
+if(CONFIG_USE_middleware_freertos-kernel_cm33_non_trustzone AND CONFIG_USE_middleware_freertos-kernel_template AND CONFIG_USE_middleware_freertos-kernel_extension)
 
 target_sources(${MCUX_SDK_PROJECT_NAME} PRIVATE
   ${CMAKE_CURRENT_LIST_DIR}/./croutine.c
@@ -56,34 +66,10 @@ target_sources(${MCUX_SDK_PROJECT_NAME} PRIVATE
   ${CMAKE_CURRENT_LIST_DIR}/./timers.c
 )
 
-if(CONFIG_COMPILER STREQUAL gcc AND CONFIG_CORE STREQUAL cm0p AND (CONFIG_TOOLCHAIN STREQUAL armgcc OR CONFIG_TOOLCHAIN STREQUAL mcux))
-  target_sources(${MCUX_SDK_PROJECT_NAME} PRIVATE
-      ${CMAKE_CURRENT_LIST_DIR}/./portable/GCC/ARM_CM0/port.c
-  )
-endif()
-
-if(CONFIG_COMPILER STREQUAL gcc AND (CONFIG_CORE STREQUAL cm4f OR CONFIG_CORE STREQUAL cm7f) AND (CONFIG_TOOLCHAIN STREQUAL armgcc OR CONFIG_TOOLCHAIN STREQUAL mcux))
-  target_sources(${MCUX_SDK_PROJECT_NAME} PRIVATE
-      ${CMAKE_CURRENT_LIST_DIR}/./portable/GCC/ARM_CM4F/port.c
-  )
-endif()
-
 target_include_directories(${MCUX_SDK_PROJECT_NAME} PUBLIC
   ${CMAKE_CURRENT_LIST_DIR}/./include
 )
 
-if(CONFIG_COMPILER STREQUAL gcc AND CONFIG_CORE STREQUAL cm0p AND (CONFIG_TOOLCHAIN STREQUAL armgcc OR CONFIG_TOOLCHAIN STREQUAL mcux))
-target_include_directories(${MCUX_SDK_PROJECT_NAME} PUBLIC
-  ${CMAKE_CURRENT_LIST_DIR}/./portable/GCC/ARM_CM0
-)
-endif()
-
-if(CONFIG_COMPILER STREQUAL gcc AND (CONFIG_CORE STREQUAL cm4f OR CONFIG_CORE STREQUAL cm7f) AND (CONFIG_TOOLCHAIN STREQUAL armgcc OR CONFIG_TOOLCHAIN STREQUAL mcux))
-target_include_directories(${MCUX_SDK_PROJECT_NAME} PUBLIC
-  ${CMAKE_CURRENT_LIST_DIR}/./portable/GCC/ARM_CM4F
-)
-endif()
-
 if(CONFIG_USE_COMPONENT_CONFIGURATION)
   message("===>Import configuration from ${CMAKE_CURRENT_LIST_FILE}")
 
@@ -109,14 +95,14 @@ message("middleware_freertos-kernel_cm33_non_trustzone component is included fro
 
 if(CONFIG_USE_middleware_freertos-kernel AND (CONFIG_USE_middleware_freertos-kernel_template OR (NOT CONFIG_USE_middleware_freertos-kernel_template)) AND (CONFIG_CORE STREQUAL cm33) AND (NOT CONFIG_USE_middleware_freertos-kernel_cm33_trustzone_non_secure) AND (NOT CONFIG_USE_middleware_freertos-kernel_cm33_trustzone_secure))
 
-if(CONFIG_CORE STREQUAL cm33 AND (CONFIG_FPU STREQUAL NO_FPU OR CONFIG_FPU STREQUAL SP_FPU) AND (CONFIG_TOOLCHAIN STREQUAL armgcc OR CONFIG_TOOLCHAIN STREQUAL mcux))
+if(CONFIG_CORE STREQUAL cm33 AND CONFIG_FPU STREQUAL SP_FPU AND (CONFIG_TOOLCHAIN STREQUAL armgcc OR CONFIG_TOOLCHAIN STREQUAL mcux))
   target_sources(${MCUX_SDK_PROJECT_NAME} PRIVATE
       ${CMAKE_CURRENT_LIST_DIR}/./portable/GCC/ARM_CM33_NTZ/non_secure/port.c
       ${CMAKE_CURRENT_LIST_DIR}/./portable/GCC/ARM_CM33_NTZ/non_secure/portasm.c
   )
 endif()
 
-if(CONFIG_CORE STREQUAL cm33 AND (CONFIG_FPU STREQUAL NO_FPU OR CONFIG_FPU STREQUAL SP_FPU) AND (CONFIG_TOOLCHAIN STREQUAL armgcc OR CONFIG_TOOLCHAIN STREQUAL mcux))
+if(CONFIG_CORE STREQUAL cm33 AND CONFIG_FPU STREQUAL SP_FPU AND (CONFIG_TOOLCHAIN STREQUAL armgcc OR CONFIG_TOOLCHAIN STREQUAL mcux))
 target_include_directories(${MCUX_SDK_PROJECT_NAME} PUBLIC
   ${CMAKE_CURRENT_LIST_DIR}/./portable/GCC/ARM_CM33_NTZ/non_secure
 )
@@ -138,14 +124,14 @@ message("middleware_freertos-kernel_cm33_trustzone_non_secure component is inclu
 
 if(CONFIG_USE_middleware_freertos-kernel AND CONFIG_USE_middleware_freertos-kernel_mpu_wrappers AND CONFIG_USE_middleware_freertos-kernel_cm33_trustzone_secure_context AND (CONFIG_CORE STREQUAL cm33) AND (NOT CONFIG_USE_middleware_freertos-kernel_cm33_non_trustzone))
 
-if(CONFIG_CORE STREQUAL cm33 AND (CONFIG_FPU STREQUAL NO_FPU OR CONFIG_FPU STREQUAL SP_FPU) AND (CONFIG_TOOLCHAIN STREQUAL armgcc OR CONFIG_TOOLCHAIN STREQUAL mcux))
+if(CONFIG_CORE STREQUAL cm33 AND CONFIG_FPU STREQUAL SP_FPU AND (CONFIG_TOOLCHAIN STREQUAL armgcc OR CONFIG_TOOLCHAIN STREQUAL mcux))
   target_sources(${MCUX_SDK_PROJECT_NAME} PRIVATE
       ${CMAKE_CURRENT_LIST_DIR}/./portable/GCC/ARM_CM33/non_secure/port.c
       ${CMAKE_CURRENT_LIST_DIR}/./portable/GCC/ARM_CM33/non_secure/portasm.c
   )
 endif()
 
-if(CONFIG_CORE STREQUAL cm33 AND (CONFIG_FPU STREQUAL NO_FPU OR CONFIG_FPU STREQUAL SP_FPU) AND (CONFIG_TOOLCHAIN STREQUAL armgcc OR CONFIG_TOOLCHAIN STREQUAL mcux))
+if(CONFIG_CORE STREQUAL cm33 AND CONFIG_FPU STREQUAL SP_FPU AND (CONFIG_TOOLCHAIN STREQUAL armgcc OR CONFIG_TOOLCHAIN STREQUAL mcux))
 target_include_directories(${MCUX_SDK_PROJECT_NAME} PUBLIC
   ${CMAKE_CURRENT_LIST_DIR}/./portable/GCC/ARM_CM33/non_secure
 )
@@ -280,28 +266,6 @@ endif()
 endif()
 
 
-if (CONFIG_USE_middleware_freertos-kernel_cm33_trustzone_secure_context)
-# Add set(CONFIG_USE_middleware_freertos-kernel_cm33_trustzone_secure_context true) in config.cmake to use this component
-
-message("middleware_freertos-kernel_cm33_trustzone_secure_context component is included from ${CMAKE_CURRENT_LIST_FILE}.")
-
-if((CONFIG_CORE STREQUAL cm33))
-
-if(CONFIG_CORE STREQUAL cm33 AND (CONFIG_TOOLCHAIN STREQUAL armgcc OR CONFIG_TOOLCHAIN STREQUAL mcux) AND (CONFIG_FPU STREQUAL NO_FPU OR CONFIG_FPU STREQUAL SP_FPU))
-target_include_directories(${MCUX_SDK_PROJECT_NAME} PUBLIC
-  ${CMAKE_CURRENT_LIST_DIR}/./portable/GCC/ARM_CM33/secure
-)
-endif()
-
-else()
-
-message(SEND_ERROR "middleware_freertos-kernel_cm33_trustzone_secure_context dependency does not meet, please check ${CMAKE_CURRENT_LIST_FILE}.")
-
-endif()
-
-endif()
-
-
 if (CONFIG_USE_middleware_freertos-kernel_cm33_trustzone_secure)
 # Add set(CONFIG_USE_middleware_freertos-kernel_cm33_trustzone_secure true) in config.cmake to use this component