From 30d452abf59ef31547b197d3bd0bbaec6407d01a Mon Sep 17 00:00:00 2001
From: hathach <thach@tinyusb.org>
Date: Tue, 8 Apr 2014 13:51:16 +0700
Subject: update all IAR project to support NGX4330 SPIFI configure

---
 demos/device/device_cmsis_rtx/device_cmsis_rtx.ewd |  10 +-
 demos/device/device_cmsis_rtx/device_cmsis_rtx.ewp |   4 +-
 demos/device/device_freertos/device_freertos.ewd   |  56 +++++-----
 demos/device/device_freertos/device_freertos.ewp   |   4 +-
 demos/host/host_cmsis_rtx/host_cmsis_rtx.ewd       |  30 +++---
 demos/host/host_cmsis_rtx/host_cmsis_rtx.ewp       |   8 +-
 demos/host/host_freertos/host_freertos.ewd         |  54 +++++-----
 demos/host/host_freertos/host_freertos.ewp         | 116 ++++++++++-----------
 demos/host/host_os_none/host_os_none.ewd           |  74 ++++++-------
 demos/host/host_os_none/host_os_none.ewp           |  28 ++---
 10 files changed, 193 insertions(+), 191 deletions(-)

diff --git a/demos/device/device_cmsis_rtx/device_cmsis_rtx.ewd b/demos/device/device_cmsis_rtx/device_cmsis_rtx.ewd
index 95dec23ff..c411dc1d2 100644
--- a/demos/device/device_cmsis_rtx/device_cmsis_rtx.ewd
+++ b/demos/device/device_cmsis_rtx/device_cmsis_rtx.ewd
@@ -2627,11 +2627,11 @@
         </option>
         <option>
           <name>MacOverride</name>
-          <state>0</state>
+          <state>1</state>
         </option>
         <option>
           <name>MacFile</name>
-          <state></state>
+          <state>$PROJ_DIR$\..\..\..\mcu\lpc43xx\iar\lpc18xx_43xx_debug.mac</state>
         </option>
         <option>
           <name>MemOverride</name>
@@ -2691,7 +2691,7 @@
         </option>
         <option>
           <name>UseFlashLoader</name>
-          <state>0</state>
+          <state>1</state>
         </option>
         <option>
           <name>CLowLevel</name>
@@ -2711,7 +2711,7 @@
         </option>
         <option>
           <name>FlashLoadersV3</name>
-          <state>$TOOLKIT_DIR$\config\flashloader\</state>
+          <state>$PROJ_DIR$\..\..\..\mcu\lpc43xx\iar\FlashLPC18xx_43xx_SPIFI.board</state>
         </option>
         <option>
           <name>OCImagesSuppressCheck1</name>
@@ -2739,7 +2739,7 @@
         </option>
         <option>
           <name>OverrideDefFlashBoard</name>
-          <state>0</state>
+          <state>1</state>
         </option>
         <option>
           <name>OCImagesOffset1</name>
diff --git a/demos/device/device_cmsis_rtx/device_cmsis_rtx.ewp b/demos/device/device_cmsis_rtx/device_cmsis_rtx.ewp
index 2eeaa581b..61842e75e 100644
--- a/demos/device/device_cmsis_rtx/device_cmsis_rtx.ewp
+++ b/demos/device/device_cmsis_rtx/device_cmsis_rtx.ewp
@@ -2542,11 +2542,11 @@
         </option>
         <option>
           <name>IlinkIcfOverride</name>
-          <state>0</state>
+          <state>1</state>
         </option>
         <option>
           <name>IlinkIcfFile</name>
-          <state>$TOOLKIT_DIR$\config\linker\NXP\lpc4330_m4.icf</state>
+          <state>$PROJ_DIR$\..\..\..\mcu\lpc43xx\iar\lpc4330_m4_spifi.icf</state>
         </option>
         <option>
           <name>IlinkIcfFileSlave</name>
diff --git a/demos/device/device_freertos/device_freertos.ewd b/demos/device/device_freertos/device_freertos.ewd
index 54fd12662..7b79121b1 100644
--- a/demos/device/device_freertos/device_freertos.ewd
+++ b/demos/device/device_freertos/device_freertos.ewd
@@ -3,7 +3,7 @@
 <project>
   <fileVersion>2</fileVersion>
   <configuration>
-    <name>Board EA4357</name>
+    <name>Board_EA4357</name>
     <toolchain>
       <name>ARM</name>
     </toolchain>
@@ -85,7 +85,7 @@
         </option>
         <option>
           <name>OCDynDriverList</name>
-          <state>JLINK_ID</state>
+          <state>ARMSIM_ID</state>
         </option>
         <option>
           <name>OCLastSavedByProductVersion</name>
@@ -783,7 +783,7 @@
         <option>
           <name>CCJLinkResetList</name>
           <version>6</version>
-          <state>7</state>
+          <state>5</state>
         </option>
         <option>
           <name>CCJLinkInterfaceCmdLine</name>
@@ -1300,7 +1300,7 @@
     </debuggerPlugins>
   </configuration>
   <configuration>
-    <name>Board LPCXpresso1769</name>
+    <name>Board_LPCXpresso1769</name>
     <toolchain>
       <name>ARM</name>
     </toolchain>
@@ -1342,7 +1342,7 @@
         </option>
         <option>
           <name>MemFile</name>
-          <state>$TOOLKIT_DIR$\CONFIG\debugger\NXP\LPC1769.ddf</state>
+          <state></state>
         </option>
         <option>
           <name>RunToEnable</name>
@@ -1382,11 +1382,11 @@
         </option>
         <option>
           <name>OCDynDriverList</name>
-          <state>JLINK_ID</state>
+          <state>ARMSIM_ID</state>
         </option>
         <option>
           <name>OCLastSavedByProductVersion</name>
-          <state>6.50.5.4846</state>
+          <state></state>
         </option>
         <option>
           <name>OCDownloadAttachToProgram</name>
@@ -1414,7 +1414,7 @@
         </option>
         <option>
           <name>FlashLoadersV3</name>
-          <state>$TOOLKIT_DIR$\config\flashloader\NXP\FlashNXPLPC512K_Cortex.board</state>
+          <state></state>
         </option>
         <option>
           <name>OCImagesSuppressCheck1</name>
@@ -2080,7 +2080,7 @@
         <option>
           <name>CCJLinkResetList</name>
           <version>6</version>
-          <state>7</state>
+          <state>5</state>
         </option>
         <option>
           <name>CCJLinkInterfaceCmdLine</name>
@@ -2246,7 +2246,7 @@
         <option>
           <name>CEmuCommPort</name>
           <version>0</version>
-          <state>4</state>
+          <state>0</state>
         </option>
         <option>
           <name>jtago</name>
@@ -2313,7 +2313,7 @@
         </option>
         <option>
           <name>CCPEMicroJtagSpeed</name>
-          <state>5000</state>
+          <state>#UNINITIALIZED#</state>
         </option>
         <option>
           <name>CCJPEMicroShowSettings</name>
@@ -2463,7 +2463,7 @@
         <debug>1</debug>
         <option>
           <name>CThirdPartyDriverDll</name>
-          <state>Browse to your third-party driver</state>
+          <state>###Uninitialized###</state>
         </option>
         <option>
           <name>CThirdPartyLogFileCheck</name>
@@ -2500,16 +2500,16 @@
         </option>
         <option>
           <name>TIPackage</name>
-          <state>C:\ti\ccsv5\ccs_base</state>
+          <state></state>
         </option>
         <option>
           <name>CCXds100InterfaceList</name>
           <version>1</version>
-          <state>6</state>
+          <state>0</state>
         </option>
         <option>
           <name>BoardFile</name>
-          <state>Browse to your board file</state>
+          <state></state>
         </option>
         <option>
           <name>DoLogfile</name>
@@ -2548,7 +2548,7 @@
       </plugin>
       <plugin>
         <file>$TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin</file>
-        <loadFlag>1</loadFlag>
+        <loadFlag>0</loadFlag>
       </plugin>
       <plugin>
         <file>$TOOLKIT_DIR$\plugins\rtos\PowerPac\PowerPacRTOS.ewplugin</file>
@@ -2597,7 +2597,7 @@
     </debuggerPlugins>
   </configuration>
   <configuration>
-    <name>Board NGX4330</name>
+    <name>Board_NGX4330</name>
     <toolchain>
       <name>ARM</name>
     </toolchain>
@@ -2627,11 +2627,11 @@
         </option>
         <option>
           <name>MacOverride</name>
-          <state>0</state>
+          <state>1</state>
         </option>
         <option>
           <name>MacFile</name>
-          <state></state>
+          <state>$PROJ_DIR$\..\..\..\mcu\lpc43xx\iar\lpc18xx_43xx_debug.mac</state>
         </option>
         <option>
           <name>MemOverride</name>
@@ -2679,7 +2679,7 @@
         </option>
         <option>
           <name>OCDynDriverList</name>
-          <state>ARMSIM_ID</state>
+          <state>JLINK_ID</state>
         </option>
         <option>
           <name>OCLastSavedByProductVersion</name>
@@ -2691,7 +2691,7 @@
         </option>
         <option>
           <name>UseFlashLoader</name>
-          <state>0</state>
+          <state>1</state>
         </option>
         <option>
           <name>CLowLevel</name>
@@ -2711,7 +2711,7 @@
         </option>
         <option>
           <name>FlashLoadersV3</name>
-          <state>$TOOLKIT_DIR$\config\flashloader\</state>
+          <state>$PROJ_DIR$\..\..\..\mcu\lpc43xx\iar\FlashLPC18xx_43xx_SPIFI.board</state>
         </option>
         <option>
           <name>OCImagesSuppressCheck1</name>
@@ -2739,7 +2739,7 @@
         </option>
         <option>
           <name>OverrideDefFlashBoard</name>
-          <state>0</state>
+          <state>1</state>
         </option>
         <option>
           <name>OCImagesOffset1</name>
@@ -3368,7 +3368,7 @@
         </option>
         <option>
           <name>CCJLinkInterfaceRadio</name>
-          <state>0</state>
+          <state>1</state>
         </option>
         <option>
           <name>OCJLinkAttachSlave</name>
@@ -3377,7 +3377,7 @@
         <option>
           <name>CCJLinkResetList</name>
           <version>6</version>
-          <state>5</state>
+          <state>7</state>
         </option>
         <option>
           <name>CCJLinkInterfaceCmdLine</name>
@@ -3894,7 +3894,7 @@
     </debuggerPlugins>
   </configuration>
   <configuration>
-    <name>Board rf1ghznode</name>
+    <name>Board_rf1ghznode</name>
     <toolchain>
       <name>ARM</name>
     </toolchain>
@@ -5191,7 +5191,7 @@
     </debuggerPlugins>
   </configuration>
   <configuration>
-    <name>Board LPCXpresso1347</name>
+    <name>Board_LPCXpresso1347</name>
     <toolchain>
       <name>ARM</name>
     </toolchain>
@@ -6488,7 +6488,7 @@
     </debuggerPlugins>
   </configuration>
   <configuration>
-    <name>Board LPCXpresso11u14</name>
+    <name>Board_LPCXpresso11u14</name>
     <toolchain>
       <name>ARM</name>
     </toolchain>
diff --git a/demos/device/device_freertos/device_freertos.ewp b/demos/device/device_freertos/device_freertos.ewp
index d48db2ddc..7259f10b3 100644
--- a/demos/device/device_freertos/device_freertos.ewp
+++ b/demos/device/device_freertos/device_freertos.ewp
@@ -2545,11 +2545,11 @@
         </option>
         <option>
           <name>IlinkIcfOverride</name>
-          <state>0</state>
+          <state>1</state>
         </option>
         <option>
           <name>IlinkIcfFile</name>
-          <state>$TOOLKIT_DIR$\config\linker\NXP\lpc4330_m4.icf</state>
+          <state>$PROJ_DIR$\..\..\..\mcu\lpc43xx\iar\lpc4330_m4_spifi.icf</state>
         </option>
         <option>
           <name>IlinkIcfFileSlave</name>
diff --git a/demos/host/host_cmsis_rtx/host_cmsis_rtx.ewd b/demos/host/host_cmsis_rtx/host_cmsis_rtx.ewd
index bde3ead11..6dddb4ef0 100644
--- a/demos/host/host_cmsis_rtx/host_cmsis_rtx.ewd
+++ b/demos/host/host_cmsis_rtx/host_cmsis_rtx.ewd
@@ -3,7 +3,7 @@
 <project>
   <fileVersion>2</fileVersion>
   <configuration>
-    <name>Board EA4357</name>
+    <name>Board_EA4357</name>
     <toolchain>
       <name>ARM</name>
     </toolchain>
@@ -1300,7 +1300,7 @@
     </debuggerPlugins>
   </configuration>
   <configuration>
-    <name>Board LPCXpresso1769</name>
+    <name>Board_LPCXpresso1769</name>
     <toolchain>
       <name>ARM</name>
     </toolchain>
@@ -1342,7 +1342,7 @@
         </option>
         <option>
           <name>MemFile</name>
-          <state>$TOOLKIT_DIR$\CONFIG\debugger\NXP\LPC1769.ddf</state>
+          <state></state>
         </option>
         <option>
           <name>RunToEnable</name>
@@ -1382,11 +1382,11 @@
         </option>
         <option>
           <name>OCDynDriverList</name>
-          <state>JLINK_ID</state>
+          <state>ARMSIM_ID</state>
         </option>
         <option>
           <name>OCLastSavedByProductVersion</name>
-          <state>6.50.5.4846</state>
+          <state></state>
         </option>
         <option>
           <name>OCDownloadAttachToProgram</name>
@@ -1414,7 +1414,7 @@
         </option>
         <option>
           <name>FlashLoadersV3</name>
-          <state>$TOOLKIT_DIR$\config\flashloader\NXP\FlashNXPLPC512K_Cortex.board</state>
+          <state></state>
         </option>
         <option>
           <name>OCImagesSuppressCheck1</name>
@@ -2080,7 +2080,7 @@
         <option>
           <name>CCJLinkResetList</name>
           <version>6</version>
-          <state>7</state>
+          <state>5</state>
         </option>
         <option>
           <name>CCJLinkInterfaceCmdLine</name>
@@ -2597,7 +2597,7 @@
     </debuggerPlugins>
   </configuration>
   <configuration>
-    <name>Board NGX4330</name>
+    <name>Board_NGX4330</name>
     <toolchain>
       <name>ARM</name>
     </toolchain>
@@ -2627,11 +2627,11 @@
         </option>
         <option>
           <name>MacOverride</name>
-          <state>0</state>
+          <state>1</state>
         </option>
         <option>
           <name>MacFile</name>
-          <state></state>
+          <state>$PROJ_DIR$\..\..\..\mcu\lpc43xx\iar\lpc18xx_43xx_debug.mac</state>
         </option>
         <option>
           <name>MemOverride</name>
@@ -2679,7 +2679,7 @@
         </option>
         <option>
           <name>OCDynDriverList</name>
-          <state>ARMSIM_ID</state>
+          <state>JLINK_ID</state>
         </option>
         <option>
           <name>OCLastSavedByProductVersion</name>
@@ -2691,7 +2691,7 @@
         </option>
         <option>
           <name>UseFlashLoader</name>
-          <state>0</state>
+          <state>1</state>
         </option>
         <option>
           <name>CLowLevel</name>
@@ -2711,7 +2711,7 @@
         </option>
         <option>
           <name>FlashLoadersV3</name>
-          <state>$TOOLKIT_DIR$\config\flashloader\</state>
+          <state>$PROJ_DIR$\..\..\..\mcu\lpc43xx\iar\FlashLPC18xx_43xx_SPIFI.board</state>
         </option>
         <option>
           <name>OCImagesSuppressCheck1</name>
@@ -2739,7 +2739,7 @@
         </option>
         <option>
           <name>OverrideDefFlashBoard</name>
-          <state>0</state>
+          <state>1</state>
         </option>
         <option>
           <name>OCImagesOffset1</name>
@@ -3377,7 +3377,7 @@
         <option>
           <name>CCJLinkResetList</name>
           <version>6</version>
-          <state>5</state>
+          <state>7</state>
         </option>
         <option>
           <name>CCJLinkInterfaceCmdLine</name>
diff --git a/demos/host/host_cmsis_rtx/host_cmsis_rtx.ewp b/demos/host/host_cmsis_rtx/host_cmsis_rtx.ewp
index e2beeab11..7ad6b741c 100644
--- a/demos/host/host_cmsis_rtx/host_cmsis_rtx.ewp
+++ b/demos/host/host_cmsis_rtx/host_cmsis_rtx.ewp
@@ -2017,7 +2017,8 @@
           <state>CORE_M4</state>
           <state>TUSB_CFG_MCU=MCU_LPC43XX</state>
           <state>BOARD=BOARD_NGX4330</state>
-          <state>TUSB_CFG_OS=TUSB_OS_NONE</state>
+          <state>TUSB_CFG_OS=TUSB_OS_CMSIS_RTX</state>
+          <state>TUSB_CFG_OS_TASK_PRIO=osPriorityRealtime</state>
         </option>
         <option>
           <name>CCPreprocFile</name>
@@ -2151,6 +2152,7 @@
           <state>$PROJ_DIR$\..\..\..\boards</state>
           <state>$PROJ_DIR$\..\..\..\tinyusb</state>
           <state>$PROJ_DIR$\..\..\..\vendor\fatfs</state>
+          <state>$PROJ_DIR$\..\..\..\vendor\cmsis_rtos_rtx\INC</state>
         </option>
         <option>
           <name>CCStdIncCheck</name>
@@ -2543,11 +2545,11 @@
         </option>
         <option>
           <name>IlinkIcfOverride</name>
-          <state>0</state>
+          <state>1</state>
         </option>
         <option>
           <name>IlinkIcfFile</name>
-          <state>$TOOLKIT_DIR$\config\linker\NXP\lpc4330_m4.icf</state>
+          <state>$PROJ_DIR$\..\..\..\mcu\lpc43xx\iar\lpc4330_m4_spifi.icf</state>
         </option>
         <option>
           <name>IlinkIcfFileSlave</name>
diff --git a/demos/host/host_freertos/host_freertos.ewd b/demos/host/host_freertos/host_freertos.ewd
index 025e3e8a5..977f980cc 100644
--- a/demos/host/host_freertos/host_freertos.ewd
+++ b/demos/host/host_freertos/host_freertos.ewd
@@ -3,7 +3,7 @@
 <project>
   <fileVersion>2</fileVersion>
   <configuration>
-    <name>Board EA4357</name>
+    <name>Board_EA4357</name>
     <toolchain>
       <name>ARM</name>
     </toolchain>
@@ -85,7 +85,7 @@
         </option>
         <option>
           <name>OCDynDriverList</name>
-          <state>JLINK_ID</state>
+          <state>ARMSIM_ID</state>
         </option>
         <option>
           <name>OCLastSavedByProductVersion</name>
@@ -774,7 +774,7 @@
         </option>
         <option>
           <name>CCJLinkInterfaceRadio</name>
-          <state>1</state>
+          <state>0</state>
         </option>
         <option>
           <name>OCJLinkAttachSlave</name>
@@ -783,7 +783,7 @@
         <option>
           <name>CCJLinkResetList</name>
           <version>6</version>
-          <state>7</state>
+          <state>5</state>
         </option>
         <option>
           <name>CCJLinkInterfaceCmdLine</name>
@@ -856,7 +856,7 @@
         </option>
         <option>
           <name>OCJLinkTraceSource</name>
-          <state>1</state>
+          <state>0</state>
         </option>
         <option>
           <name>OCJLinkTraceSourceDummy</name>
@@ -1251,7 +1251,7 @@
       </plugin>
       <plugin>
         <file>$TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin</file>
-        <loadFlag>1</loadFlag>
+        <loadFlag>0</loadFlag>
       </plugin>
       <plugin>
         <file>$TOOLKIT_DIR$\plugins\rtos\PowerPac\PowerPacRTOS.ewplugin</file>
@@ -1300,7 +1300,7 @@
     </debuggerPlugins>
   </configuration>
   <configuration>
-    <name>Board LPCXpresso1769</name>
+    <name>Board_LPCXpresso1769</name>
     <toolchain>
       <name>ARM</name>
     </toolchain>
@@ -1342,7 +1342,7 @@
         </option>
         <option>
           <name>MemFile</name>
-          <state>$TOOLKIT_DIR$\CONFIG\debugger\NXP\LPC1769.ddf</state>
+          <state></state>
         </option>
         <option>
           <name>RunToEnable</name>
@@ -1382,11 +1382,11 @@
         </option>
         <option>
           <name>OCDynDriverList</name>
-          <state>JLINK_ID</state>
+          <state>ARMSIM_ID</state>
         </option>
         <option>
           <name>OCLastSavedByProductVersion</name>
-          <state>6.50.5.4846</state>
+          <state></state>
         </option>
         <option>
           <name>OCDownloadAttachToProgram</name>
@@ -1414,7 +1414,7 @@
         </option>
         <option>
           <name>FlashLoadersV3</name>
-          <state>$TOOLKIT_DIR$\config\flashloader\NXP\FlashNXPLPC512K_Cortex.board</state>
+          <state></state>
         </option>
         <option>
           <name>OCImagesSuppressCheck1</name>
@@ -2080,7 +2080,7 @@
         <option>
           <name>CCJLinkResetList</name>
           <version>6</version>
-          <state>7</state>
+          <state>5</state>
         </option>
         <option>
           <name>CCJLinkInterfaceCmdLine</name>
@@ -2597,7 +2597,7 @@
     </debuggerPlugins>
   </configuration>
   <configuration>
-    <name>Board NGX4330</name>
+    <name>Board_NGX4330</name>
     <toolchain>
       <name>ARM</name>
     </toolchain>
@@ -2627,11 +2627,11 @@
         </option>
         <option>
           <name>MacOverride</name>
-          <state>0</state>
+          <state>1</state>
         </option>
         <option>
           <name>MacFile</name>
-          <state></state>
+          <state>$PROJ_DIR$\..\..\..\mcu\lpc43xx\iar\lpc18xx_43xx_debug.mac</state>
         </option>
         <option>
           <name>MemOverride</name>
@@ -2691,7 +2691,7 @@
         </option>
         <option>
           <name>UseFlashLoader</name>
-          <state>0</state>
+          <state>1</state>
         </option>
         <option>
           <name>CLowLevel</name>
@@ -2711,7 +2711,7 @@
         </option>
         <option>
           <name>FlashLoadersV3</name>
-          <state>$TOOLKIT_DIR$\config\flashloader\</state>
+          <state>$PROJ_DIR$\..\..\..\mcu\lpc43xx\iar\FlashLPC18xx_43xx_SPIFI.board</state>
         </option>
         <option>
           <name>OCImagesSuppressCheck1</name>
@@ -2739,7 +2739,7 @@
         </option>
         <option>
           <name>OverrideDefFlashBoard</name>
-          <state>0</state>
+          <state>1</state>
         </option>
         <option>
           <name>OCImagesOffset1</name>
@@ -3894,7 +3894,7 @@
     </debuggerPlugins>
   </configuration>
   <configuration>
-    <name>Board MCB4300</name>
+    <name>Board_MCB4300</name>
     <toolchain>
       <name>ARM</name>
     </toolchain>
@@ -3936,7 +3936,7 @@
         </option>
         <option>
           <name>MemFile</name>
-          <state>$TOOLKIT_DIR$\CONFIG\debugger\NXP\LPC4357_M4.ddf</state>
+          <state></state>
         </option>
         <option>
           <name>RunToEnable</name>
@@ -3976,11 +3976,11 @@
         </option>
         <option>
           <name>OCDynDriverList</name>
-          <state>JLINK_ID</state>
+          <state>ARMSIM_ID</state>
         </option>
         <option>
           <name>OCLastSavedByProductVersion</name>
-          <state>6.50.5.4846</state>
+          <state></state>
         </option>
         <option>
           <name>OCDownloadAttachToProgram</name>
@@ -4008,7 +4008,7 @@
         </option>
         <option>
           <name>FlashLoadersV3</name>
-          <state>$TOOLKIT_DIR$\config\flashloader\NXP\FlashNXPLPC18xx_1024K.board</state>
+          <state></state>
         </option>
         <option>
           <name>OCImagesSuppressCheck1</name>
@@ -4665,7 +4665,7 @@
         </option>
         <option>
           <name>CCJLinkInterfaceRadio</name>
-          <state>1</state>
+          <state>0</state>
         </option>
         <option>
           <name>OCJLinkAttachSlave</name>
@@ -4674,7 +4674,7 @@
         <option>
           <name>CCJLinkResetList</name>
           <version>6</version>
-          <state>7</state>
+          <state>5</state>
         </option>
         <option>
           <name>CCJLinkInterfaceCmdLine</name>
@@ -4747,7 +4747,7 @@
         </option>
         <option>
           <name>OCJLinkTraceSource</name>
-          <state>1</state>
+          <state>0</state>
         </option>
         <option>
           <name>OCJLinkTraceSourceDummy</name>
@@ -5142,7 +5142,7 @@
       </plugin>
       <plugin>
         <file>$TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin</file>
-        <loadFlag>1</loadFlag>
+        <loadFlag>0</loadFlag>
       </plugin>
       <plugin>
         <file>$TOOLKIT_DIR$\plugins\rtos\PowerPac\PowerPacRTOS.ewplugin</file>
diff --git a/demos/host/host_freertos/host_freertos.ewp b/demos/host/host_freertos/host_freertos.ewp
index bb850bbf3..16a42e5ee 100644
--- a/demos/host/host_freertos/host_freertos.ewp
+++ b/demos/host/host_freertos/host_freertos.ewp
@@ -2548,11 +2548,11 @@
         </option>
         <option>
           <name>IlinkIcfOverride</name>
-          <state>0</state>
+          <state>1</state>
         </option>
         <option>
           <name>IlinkIcfFile</name>
-          <state>$TOOLKIT_DIR$\config\linker\NXP\lpc4330_m4.icf</state>
+          <state>$PROJ_DIR$\..\..\..\mcu\lpc43xx\iar\lpc4330_m4_spifi.icf</state>
         </option>
         <option>
           <name>IlinkIcfFileSlave</name>
@@ -3754,62 +3754,6 @@
       <name>$PROJ_DIR$\..\..\..\boards\printf_retarget.c</name>
     </file>
   </group>
-  <group>
-    <name>mcu</name>
-    <group>
-      <name>lpc175x_6x</name>
-      <excluded>
-        <configuration>Board_EA4357</configuration>
-        <configuration>Board_NGX4330</configuration>
-        <configuration>Board_MCB4300</configuration>
-      </excluded>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\mcu\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_clkpwr.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\mcu\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_gpio.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\mcu\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_pinsel.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\mcu\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_uart.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\mcu\lpc175x_6x\iar\startup_LPC17xx.s</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\mcu\lpc175x_6x\CMSIS_CORE_LPC17xx\src\system_LPC17xx.c</name>
-      </file>
-    </group>
-    <group>
-      <name>lpc43xx</name>
-      <excluded>
-        <configuration>Board_LPCXpresso1769</configuration>
-      </excluded>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_cgu.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_gpio.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_i2c.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_scu.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_uart.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\mcu\lpc43xx\iar\startup_LPC43xx.s</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\system_LPC43xx.c</name>
-      </file>
-    </group>
-  </group>
   <group>
     <name>fatfs</name>
     <file>
@@ -3872,6 +3816,62 @@
       <name>$PROJ_DIR$\..\..\..\vendor\freertos\freertos\Source\timers.c</name>
     </file>
   </group>
+  <group>
+    <name>mcu</name>
+    <group>
+      <name>lpc175x_6x</name>
+      <excluded>
+        <configuration>Board_EA4357</configuration>
+        <configuration>Board_NGX4330</configuration>
+        <configuration>Board_MCB4300</configuration>
+      </excluded>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\mcu\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_clkpwr.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\mcu\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_gpio.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\mcu\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_pinsel.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\mcu\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_uart.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\mcu\lpc175x_6x\iar\startup_LPC17xx.s</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\mcu\lpc175x_6x\CMSIS_CORE_LPC17xx\src\system_LPC17xx.c</name>
+      </file>
+    </group>
+    <group>
+      <name>lpc43xx</name>
+      <excluded>
+        <configuration>Board_LPCXpresso1769</configuration>
+      </excluded>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_cgu.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_gpio.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_i2c.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_scu.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_uart.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\mcu\lpc43xx\iar\startup_LPC43xx.s</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\system_LPC43xx.c</name>
+      </file>
+    </group>
+  </group>
   <group>
     <name>tinyusb</name>
     <group>
diff --git a/demos/host/host_os_none/host_os_none.ewd b/demos/host/host_os_none/host_os_none.ewd
index d0add27c2..977f980cc 100644
--- a/demos/host/host_os_none/host_os_none.ewd
+++ b/demos/host/host_os_none/host_os_none.ewd
@@ -3,7 +3,7 @@
 <project>
   <fileVersion>2</fileVersion>
   <configuration>
-    <name>Board EA4357</name>
+    <name>Board_EA4357</name>
     <toolchain>
       <name>ARM</name>
     </toolchain>
@@ -85,7 +85,7 @@
         </option>
         <option>
           <name>OCDynDriverList</name>
-          <state>JLINK_ID</state>
+          <state>ARMSIM_ID</state>
         </option>
         <option>
           <name>OCLastSavedByProductVersion</name>
@@ -697,7 +697,7 @@
         </option>
         <option>
           <name>JLinkInitialSpeed</name>
-          <state>5000</state>
+          <state>32</state>
         </option>
         <option>
           <name>CCDoJlinkMultiTarget</name>
@@ -774,7 +774,7 @@
         </option>
         <option>
           <name>CCJLinkInterfaceRadio</name>
-          <state>1</state>
+          <state>0</state>
         </option>
         <option>
           <name>OCJLinkAttachSlave</name>
@@ -783,7 +783,7 @@
         <option>
           <name>CCJLinkResetList</name>
           <version>6</version>
-          <state>7</state>
+          <state>5</state>
         </option>
         <option>
           <name>CCJLinkInterfaceCmdLine</name>
@@ -848,7 +848,7 @@
         </option>
         <option>
           <name>CCSwoClockAuto</name>
-          <state>1</state>
+          <state>0</state>
         </option>
         <option>
           <name>CCSwoClockEdit</name>
@@ -856,7 +856,7 @@
         </option>
         <option>
           <name>OCJLinkTraceSource</name>
-          <state>1</state>
+          <state>0</state>
         </option>
         <option>
           <name>OCJLinkTraceSourceDummy</name>
@@ -1300,7 +1300,7 @@
     </debuggerPlugins>
   </configuration>
   <configuration>
-    <name>Board LPCXpresso1769</name>
+    <name>Board_LPCXpresso1769</name>
     <toolchain>
       <name>ARM</name>
     </toolchain>
@@ -1342,7 +1342,7 @@
         </option>
         <option>
           <name>MemFile</name>
-          <state>$TOOLKIT_DIR$\CONFIG\debugger\NXP\LPC1769.ddf</state>
+          <state></state>
         </option>
         <option>
           <name>RunToEnable</name>
@@ -1382,11 +1382,11 @@
         </option>
         <option>
           <name>OCDynDriverList</name>
-          <state>JLINK_ID</state>
+          <state>ARMSIM_ID</state>
         </option>
         <option>
           <name>OCLastSavedByProductVersion</name>
-          <state>6.50.5.4846</state>
+          <state></state>
         </option>
         <option>
           <name>OCDownloadAttachToProgram</name>
@@ -1414,7 +1414,7 @@
         </option>
         <option>
           <name>FlashLoadersV3</name>
-          <state>$TOOLKIT_DIR$\config\flashloader\NXP\FlashNXPLPC512K_Cortex.board</state>
+          <state></state>
         </option>
         <option>
           <name>OCImagesSuppressCheck1</name>
@@ -1994,7 +1994,7 @@
         </option>
         <option>
           <name>JLinkInitialSpeed</name>
-          <state>5000</state>
+          <state>32</state>
         </option>
         <option>
           <name>CCDoJlinkMultiTarget</name>
@@ -2071,7 +2071,7 @@
         </option>
         <option>
           <name>CCJLinkInterfaceRadio</name>
-          <state>1</state>
+          <state>0</state>
         </option>
         <option>
           <name>OCJLinkAttachSlave</name>
@@ -2080,7 +2080,7 @@
         <option>
           <name>CCJLinkResetList</name>
           <version>6</version>
-          <state>7</state>
+          <state>5</state>
         </option>
         <option>
           <name>CCJLinkInterfaceCmdLine</name>
@@ -2145,7 +2145,7 @@
         </option>
         <option>
           <name>CCSwoClockAuto</name>
-          <state>1</state>
+          <state>0</state>
         </option>
         <option>
           <name>CCSwoClockEdit</name>
@@ -2153,7 +2153,7 @@
         </option>
         <option>
           <name>OCJLinkTraceSource</name>
-          <state>1</state>
+          <state>0</state>
         </option>
         <option>
           <name>OCJLinkTraceSourceDummy</name>
@@ -2597,7 +2597,7 @@
     </debuggerPlugins>
   </configuration>
   <configuration>
-    <name>Board NGX4330</name>
+    <name>Board_NGX4330</name>
     <toolchain>
       <name>ARM</name>
     </toolchain>
@@ -2627,11 +2627,11 @@
         </option>
         <option>
           <name>MacOverride</name>
-          <state>0</state>
+          <state>1</state>
         </option>
         <option>
           <name>MacFile</name>
-          <state></state>
+          <state>$PROJ_DIR$\..\..\..\mcu\lpc43xx\iar\lpc18xx_43xx_debug.mac</state>
         </option>
         <option>
           <name>MemOverride</name>
@@ -2691,7 +2691,7 @@
         </option>
         <option>
           <name>UseFlashLoader</name>
-          <state>0</state>
+          <state>1</state>
         </option>
         <option>
           <name>CLowLevel</name>
@@ -2711,7 +2711,7 @@
         </option>
         <option>
           <name>FlashLoadersV3</name>
-          <state>$TOOLKIT_DIR$\config\flashloader\</state>
+          <state>$PROJ_DIR$\..\..\..\mcu\lpc43xx\iar\FlashLPC18xx_43xx_SPIFI.board</state>
         </option>
         <option>
           <name>OCImagesSuppressCheck1</name>
@@ -2739,7 +2739,7 @@
         </option>
         <option>
           <name>OverrideDefFlashBoard</name>
-          <state>0</state>
+          <state>1</state>
         </option>
         <option>
           <name>OCImagesOffset1</name>
@@ -3238,7 +3238,7 @@
         </option>
         <option>
           <name>OCProbeConfig</name>
-          <state>$TOOLKIT_DIR$\config\debugger\NXP\LPC43xx.ProbeConfig</state>
+          <state></state>
         </option>
         <option>
           <name>IjetProbeConfigRadio</name>
@@ -3291,7 +3291,7 @@
         </option>
         <option>
           <name>JLinkInitialSpeed</name>
-          <state>5000</state>
+          <state>32</state>
         </option>
         <option>
           <name>CCDoJlinkMultiTarget</name>
@@ -3368,7 +3368,7 @@
         </option>
         <option>
           <name>CCJLinkInterfaceRadio</name>
-          <state>1</state>
+          <state>0</state>
         </option>
         <option>
           <name>OCJLinkAttachSlave</name>
@@ -3442,7 +3442,7 @@
         </option>
         <option>
           <name>CCSwoClockAuto</name>
-          <state>1</state>
+          <state>0</state>
         </option>
         <option>
           <name>CCSwoClockEdit</name>
@@ -3894,7 +3894,7 @@
     </debuggerPlugins>
   </configuration>
   <configuration>
-    <name>Board MCB4300</name>
+    <name>Board_MCB4300</name>
     <toolchain>
       <name>ARM</name>
     </toolchain>
@@ -3936,7 +3936,7 @@
         </option>
         <option>
           <name>MemFile</name>
-          <state>$TOOLKIT_DIR$\CONFIG\debugger\NXP\LPC4357_M4.ddf</state>
+          <state></state>
         </option>
         <option>
           <name>RunToEnable</name>
@@ -3976,11 +3976,11 @@
         </option>
         <option>
           <name>OCDynDriverList</name>
-          <state>JLINK_ID</state>
+          <state>ARMSIM_ID</state>
         </option>
         <option>
           <name>OCLastSavedByProductVersion</name>
-          <state>6.50.5.4846</state>
+          <state></state>
         </option>
         <option>
           <name>OCDownloadAttachToProgram</name>
@@ -4008,7 +4008,7 @@
         </option>
         <option>
           <name>FlashLoadersV3</name>
-          <state>$TOOLKIT_DIR$\config\flashloader\NXP\FlashNXPLPC18xx_1024K.board</state>
+          <state></state>
         </option>
         <option>
           <name>OCImagesSuppressCheck1</name>
@@ -4588,7 +4588,7 @@
         </option>
         <option>
           <name>JLinkInitialSpeed</name>
-          <state>5000</state>
+          <state>32</state>
         </option>
         <option>
           <name>CCDoJlinkMultiTarget</name>
@@ -4665,7 +4665,7 @@
         </option>
         <option>
           <name>CCJLinkInterfaceRadio</name>
-          <state>1</state>
+          <state>0</state>
         </option>
         <option>
           <name>OCJLinkAttachSlave</name>
@@ -4674,7 +4674,7 @@
         <option>
           <name>CCJLinkResetList</name>
           <version>6</version>
-          <state>7</state>
+          <state>5</state>
         </option>
         <option>
           <name>CCJLinkInterfaceCmdLine</name>
@@ -4739,7 +4739,7 @@
         </option>
         <option>
           <name>CCSwoClockAuto</name>
-          <state>1</state>
+          <state>0</state>
         </option>
         <option>
           <name>CCSwoClockEdit</name>
@@ -4747,7 +4747,7 @@
         </option>
         <option>
           <name>OCJLinkTraceSource</name>
-          <state>1</state>
+          <state>0</state>
         </option>
         <option>
           <name>OCJLinkTraceSourceDummy</name>
diff --git a/demos/host/host_os_none/host_os_none.ewp b/demos/host/host_os_none/host_os_none.ewp
index 48a0cc8f9..8e56efc1f 100644
--- a/demos/host/host_os_none/host_os_none.ewp
+++ b/demos/host/host_os_none/host_os_none.ewp
@@ -2539,11 +2539,11 @@
         </option>
         <option>
           <name>IlinkIcfOverride</name>
-          <state>0</state>
+          <state>1</state>
         </option>
         <option>
           <name>IlinkIcfFile</name>
-          <state>$TOOLKIT_DIR$\config\linker\NXP\lpc4330_m4.icf</state>
+          <state>$PROJ_DIR$\..\..\..\mcu\lpc43xx\iar\lpc4330_m4_spifi.icf</state>
         </option>
         <option>
           <name>IlinkIcfFileSlave</name>
@@ -3742,6 +3742,18 @@
       <name>$PROJ_DIR$\..\..\..\boards\printf_retarget.c</name>
     </file>
   </group>
+  <group>
+    <name>fatfs</name>
+    <file>
+      <name>$PROJ_DIR$\..\..\..\vendor\fatfs\ccsbcs.c</name>
+    </file>
+    <file>
+      <name>$PROJ_DIR$\..\..\..\vendor\fatfs\diskio.c</name>
+    </file>
+    <file>
+      <name>$PROJ_DIR$\..\..\..\vendor\fatfs\ff.c</name>
+    </file>
+  </group>
   <group>
     <name>mcu</name>
     <group>
@@ -3798,18 +3810,6 @@
       </file>
     </group>
   </group>
-  <group>
-    <name>fatfs</name>
-    <file>
-      <name>$PROJ_DIR$\..\..\..\vendor\fatfs\ccsbcs.c</name>
-    </file>
-    <file>
-      <name>$PROJ_DIR$\..\..\..\vendor\fatfs\diskio.c</name>
-    </file>
-    <file>
-      <name>$PROJ_DIR$\..\..\..\vendor\fatfs\ff.c</name>
-    </file>
-  </group>
   <group>
     <name>tinyusb</name>
     <group>
-- 
cgit v1.3.1