Merge pull request #690 from hathach/submodule-on-the-fly

Submodule on the fly

11 files changed, 104 insertions, 102 deletions

diff --git a/examples/device/cdc_msc/ses/nrf5x/nrf5x.emProject b/examples/device/cdc_msc/ses/nrf5x/nrf5x.emProject
index f7714f269..944199138 100644
--- a/examples/device/cdc_msc/ses/nrf5x/nrf5x.emProject
+++ b/examples/device/cdc_msc/ses/nrf5x/nrf5x.emProject
@@ -21,7 +21,7 @@
       build_treat_warnings_as_errors="Yes"
       c_additional_options="-Wno-error=undef;-Wno-error=unused-parameter;-Wno-error=cast-align;-Wno-error=cast-function-type"
       c_preprocessor_definitions="NRF52840_XXAA;__nRF_FAMILY;ARM_MATH_CM4;FLASH_PLACEMENT=1;CFG_TUSB_MCU=OPT_MCU_NRF5X;CFG_TUSB_DEBUG=1"
-      c_user_include_directories="../../src;$(rootDir)/lib/CMSIS_4/CMSIS/Include;$(rootDir)/hw;$(rootDir)/src;$(nrfxDir)/..;$(nrfxDir);$(nrfxDir)/mdk;$(nrfxDir)/hal;$(nrfxDir)/drivers/include;$(nrfxDir)/drivers/src"
+      c_user_include_directories="../../src;$(rootDir)/lib/CMSIS_5/CMSIS/Core/Include;$(rootDir)/hw;$(rootDir)/src;$(nrfxDir)/..;$(nrfxDir);$(nrfxDir)/mdk;$(nrfxDir)/hal;$(nrfxDir)/drivers/include;$(nrfxDir)/drivers/src"
       debug_register_definition_file="nrf52840_Registers.xml"
       debug_target_connection="J-Link"
       gcc_enable_all_warnings="Yes"
diff --git a/examples/device/cdc_msc_freertos/Makefile b/examples/device/cdc_msc_freertos/Makefile
index 3570daa41..36174b5e1 100644
--- a/examples/device/cdc_msc_freertos/Makefile
+++ b/examples/device/cdc_msc_freertos/Makefile
@@ -1,7 +1,7 @@
 include ../../../tools/top.mk
 include ../../make.mk
 
-FREERTOS_SRC = lib/FreeRTOS/FreeRTOS/Source
+FREERTOS_SRC = lib/FreeRTOS-Kernel
 
 INC += \
 	src \
diff --git a/examples/device/cdc_msc_freertos/ses/lpc175x_6x/lpc175x_6x.emProject b/examples/device/cdc_msc_freertos/ses/lpc175x_6x/lpc175x_6x.emProject
index 4dc111f2e..691f8c3b0 100644
--- a/examples/device/cdc_msc_freertos/ses/lpc175x_6x/lpc175x_6x.emProject
+++ b/examples/device/cdc_msc_freertos/ses/lpc175x_6x/lpc175x_6x.emProject
@@ -20,7 +20,7 @@
       arm_target_interface_type="SWD"
       build_treat_warnings_as_errors="No"
       c_preprocessor_definitions="LPC175x_6x;__LPC1700_FAMILY;__LPC176x_SUBFAMILY;ARM_MATH_CM3;FLASH_PLACEMENT=1;CORE_M3;CFG_TUSB_MCU=OPT_MCU_LPC175X_6X"
-      c_user_include_directories=".;../../src;$(rootDir)/hw;$(rootDir)/src;$(rootDir)/hw/mcu/nxp/lpc_driver/lpc_chip_175x_6x/inc;$(rootDir)/lib/FreeRTOS/Source/include;$(rootDir)/lib/FreeRTOS/Source/portable/GCC/ARM_CM3"
+      c_user_include_directories=".;../../src;$(rootDir)/hw;$(rootDir)/src;$(rootDir)/hw/mcu/nxp/lpc_driver/lpc_chip_175x_6x/inc;$(rootDir)/lib/FreeRTOS-Kernel/include;$(rootDir)/lib/FreeRTOS-Kernel/portable/GCC/ARM_CM3"
       debug_register_definition_file="LPC176x5x_Registers.xml"
       debug_target_connection="J-Link"
       gcc_enable_all_warnings="Yes"
@@ -92,39 +92,39 @@
       <folder Name="FreeRTOS">
         <folder Name="Source">
           <folder Name="include">
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/croutine.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/deprecated_definitions.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/event_groups.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/FreeRTOS.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/list.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/message_buffer.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/mpu_prototypes.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/mpu_wrappers.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/portable.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/projdefs.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/queue.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/semphr.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/stack_macros.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/StackMacros.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/stream_buffer.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/task.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/timers.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/croutine.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/deprecated_definitions.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/event_groups.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/FreeRTOS.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/list.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/message_buffer.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/mpu_prototypes.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/mpu_wrappers.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/portable.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/projdefs.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/queue.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/semphr.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/stack_macros.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/StackMacros.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/stream_buffer.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/task.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/timers.h" />
           </folder>
           <folder Name="portable">
             <folder Name="GCC">
               <folder Name="ARM_CM3">
-                <file file_name="../../../../../lib/FreeRTOS/Source/portable/GCC/ARM_CM3/port.c" />
-                <file file_name="../../../../../lib/FreeRTOS/Source/portable/GCC/ARM_CM3/portmacro.h" />
+                <file file_name="../../../../../lib/FreeRTOS-Kernel/portable/GCC/ARM_CM3/port.c" />
+                <file file_name="../../../../../lib/FreeRTOS-Kernel/portable/GCC/ARM_CM3/portmacro.h" />
               </folder>
             </folder>
             <folder Name="MemMang">
-              <file file_name="../../../../../lib/FreeRTOS/Source/portable/MemMang/heap_4.c" />
+              <file file_name="../../../../../lib/FreeRTOS-Kernel/portable/MemMang/heap_4.c" />
             </folder>
           </folder>
-          <file file_name="../../../../../lib/FreeRTOS/Source/list.c" />
-          <file file_name="../../../../../lib/FreeRTOS/Source/queue.c" />
-          <file file_name="../../../../../lib/FreeRTOS/Source/tasks.c" />
-          <file file_name="../../../../../lib/FreeRTOS/Source/timers.c" />
+          <file file_name="../../../../../lib/FreeRTOS-Kernel/list.c" />
+          <file file_name="../../../../../lib/FreeRTOS-Kernel/queue.c" />
+          <file file_name="../../../../../lib/FreeRTOS-Kernel/tasks.c" />
+          <file file_name="../../../../../lib/FreeRTOS-Kernel/timers.c" />
         </folder>
         <file file_name="../../../../../lib/FreeRTOS/freertos_hook.c" />
       </folder>
diff --git a/examples/device/cdc_msc_freertos/ses/nrf5x/nrf5x.emProject b/examples/device/cdc_msc_freertos/ses/nrf5x/nrf5x.emProject
index f01b26d23..e964d6fb5 100644
--- a/examples/device/cdc_msc_freertos/ses/nrf5x/nrf5x.emProject
+++ b/examples/device/cdc_msc_freertos/ses/nrf5x/nrf5x.emProject
@@ -107,39 +107,39 @@
       <folder Name="FreeRTOS">
         <folder Name="Source">
           <folder Name="include">
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/croutine.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/deprecated_definitions.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/event_groups.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/FreeRTOS.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/list.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/message_buffer.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/mpu_prototypes.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/mpu_wrappers.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/portable.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/projdefs.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/queue.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/semphr.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/stack_macros.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/StackMacros.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/stream_buffer.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/task.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/timers.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/croutine.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/deprecated_definitions.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/event_groups.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/FreeRTOS.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/list.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/message_buffer.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/mpu_prototypes.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/mpu_wrappers.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/portable.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/projdefs.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/queue.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/semphr.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/stack_macros.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/StackMacros.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/stream_buffer.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/task.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/timers.h" />
           </folder>
           <folder Name="portable">
             <folder Name="GCC">
               <folder Name="ARM_CM4F">
-                <file file_name="../../../../../lib/FreeRTOS/Source/portable/GCC/ARM_CM4F/port.c" />
-                <file file_name="../../../../../lib/FreeRTOS/Source/portable/GCC/ARM_CM4F/portmacro.h" />
+                <file file_name="../../../../../lib/FreeRTOS-Kernel/portable/GCC/ARM_CM4F/port.c" />
+                <file file_name="../../../../../lib/FreeRTOS-Kernel/portable/GCC/ARM_CM4F/portmacro.h" />
               </folder>
             </folder>
             <folder Name="MemMang">
-              <file file_name="../../../../../lib/FreeRTOS/Source/portable/MemMang/heap_4.c" />
+              <file file_name="../../../../../lib/FreeRTOS-Kernel/portable/MemMang/heap_4.c" />
             </folder>
           </folder>
-          <file file_name="../../../../../lib/FreeRTOS/Source/list.c" />
-          <file file_name="../../../../../lib/FreeRTOS/Source/queue.c" />
-          <file file_name="../../../../../lib/FreeRTOS/Source/tasks.c" />
-          <file file_name="../../../../../lib/FreeRTOS/Source/timers.c" />
+          <file file_name="../../../../../lib/FreeRTOS-Kernel/list.c" />
+          <file file_name="../../../../../lib/FreeRTOS-Kernel/queue.c" />
+          <file file_name="../../../../../lib/FreeRTOS-Kernel/tasks.c" />
+          <file file_name="../../../../../lib/FreeRTOS-Kernel/timers.c" />
         </folder>
       </folder>
     </folder>
diff --git a/examples/device/cdc_msc_freertos/ses/samd21/samd21.emProject b/examples/device/cdc_msc_freertos/ses/samd21/samd21.emProject
index b8b099b68..b3db856d3 100644
--- a/examples/device/cdc_msc_freertos/ses/samd21/samd21.emProject
+++ b/examples/device/cdc_msc_freertos/ses/samd21/samd21.emProject
@@ -100,39 +100,39 @@
       <folder Name="FreeRTOS">
         <folder Name="Source">
           <folder Name="include">
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/croutine.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/deprecated_definitions.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/event_groups.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/FreeRTOS.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/list.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/message_buffer.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/mpu_prototypes.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/mpu_wrappers.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/portable.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/projdefs.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/queue.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/semphr.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/stack_macros.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/StackMacros.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/stream_buffer.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/task.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/timers.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/croutine.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/deprecated_definitions.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/event_groups.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/FreeRTOS.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/list.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/message_buffer.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/mpu_prototypes.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/mpu_wrappers.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/portable.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/projdefs.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/queue.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/semphr.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/stack_macros.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/StackMacros.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/stream_buffer.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/task.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/timers.h" />
           </folder>
           <folder Name="portable">
             <folder Name="GCC">
               <folder Name="ARM_CM0">
-                <file file_name="../../../../../lib/FreeRTOS/Source/portable/GCC/ARM_CM0/port.c" />
-                <file file_name="../../../../../lib/FreeRTOS/Source/portable/GCC/ARM_CM0/portmacro.h" />
+                <file file_name="../../../../../lib/FreeRTOS-Kernel/portable/GCC/ARM_CM0/port.c" />
+                <file file_name="../../../../../lib/FreeRTOS-Kernel/portable/GCC/ARM_CM0/portmacro.h" />
               </folder>
             </folder>
             <folder Name="MemMang">
-              <file file_name="../../../../../lib/FreeRTOS/Source/portable/MemMang/heap_4.c" />
+              <file file_name="../../../../../lib/FreeRTOS-Kernel/portable/MemMang/heap_4.c" />
             </folder>
           </folder>
-          <file file_name="../../../../../lib/FreeRTOS/Source/list.c" />
-          <file file_name="../../../../../lib/FreeRTOS/Source/queue.c" />
-          <file file_name="../../../../../lib/FreeRTOS/Source/tasks.c" />
-          <file file_name="../../../../../lib/FreeRTOS/Source/timers.c" />
+          <file file_name="../../../../../lib/FreeRTOS-Kernel/list.c" />
+          <file file_name="../../../../../lib/FreeRTOS-Kernel/queue.c" />
+          <file file_name="../../../../../lib/FreeRTOS-Kernel/tasks.c" />
+          <file file_name="../../../../../lib/FreeRTOS-Kernel/timers.c" />
         </folder>
         <file file_name="../../../../../lib/FreeRTOS/freertos_hook.c" />
       </folder>
diff --git a/examples/device/cdc_msc_freertos/ses/samd51/samd51.emProject b/examples/device/cdc_msc_freertos/ses/samd51/samd51.emProject
index d84d070c0..77ff38b62 100644
--- a/examples/device/cdc_msc_freertos/ses/samd51/samd51.emProject
+++ b/examples/device/cdc_msc_freertos/ses/samd51/samd51.emProject
@@ -104,39 +104,39 @@
       <folder Name="FreeRTOS">
         <folder Name="Source">
           <folder Name="include">
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/croutine.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/deprecated_definitions.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/event_groups.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/FreeRTOS.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/list.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/message_buffer.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/mpu_prototypes.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/mpu_wrappers.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/portable.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/projdefs.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/queue.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/semphr.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/stack_macros.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/StackMacros.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/stream_buffer.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/task.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/timers.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/croutine.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/deprecated_definitions.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/event_groups.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/FreeRTOS.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/list.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/message_buffer.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/mpu_prototypes.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/mpu_wrappers.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/portable.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/projdefs.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/queue.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/semphr.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/stack_macros.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/StackMacros.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/stream_buffer.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/task.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/timers.h" />
           </folder>
           <folder Name="portable">
             <folder Name="GCC">
               <folder Name="ARM_CM4F">
-                <file file_name="../../../../../lib/FreeRTOS/Source/portable/GCC/ARM_CM4F/port.c" />
-                <file file_name="../../../../../lib/FreeRTOS/Source/portable/GCC/ARM_CM4F/portmacro.h" />
+                <file file_name="../../../../../lib/FreeRTOS-Kernel/portable/GCC/ARM_CM4F/port.c" />
+                <file file_name="../../../../../lib/FreeRTOS-Kernel/portable/GCC/ARM_CM4F/portmacro.h" />
               </folder>
             </folder>
             <folder Name="MemMang">
-              <file file_name="../../../../../lib/FreeRTOS/Source/portable/MemMang/heap_4.c" />
+              <file file_name="../../../../../lib/FreeRTOS-Kernel/portable/MemMang/heap_4.c" />
             </folder>
           </folder>
-          <file file_name="../../../../../lib/FreeRTOS/Source/list.c" />
-          <file file_name="../../../../../lib/FreeRTOS/Source/queue.c" />
-          <file file_name="../../../../../lib/FreeRTOS/Source/tasks.c" />
-          <file file_name="../../../../../lib/FreeRTOS/Source/timers.c" />
+          <file file_name="../../../../../lib/FreeRTOS-Kernel/list.c" />
+          <file file_name="../../../../../lib/FreeRTOS-Kernel/queue.c" />
+          <file file_name="../../../../../lib/FreeRTOS-Kernel/tasks.c" />
+          <file file_name="../../../../../lib/FreeRTOS-Kernel/timers.c" />
         </folder>
         <file file_name="../../../../../lib/FreeRTOS/freertos_hook.c" />
       </folder>
diff --git a/examples/device/cdc_msc_freertos/src/FreeRTOSConfig.h b/examples/device/cdc_msc_freertos/src/FreeRTOSConfig.h
index 494452d43..7b2b93d7b 100644
--- a/examples/device/cdc_msc_freertos/src/FreeRTOSConfig.h
+++ b/examples/device/cdc_msc_freertos/src/FreeRTOSConfig.h
@@ -71,6 +71,7 @@ extern uint32_t SystemCoreClock;
 #define configUSE_TIME_SLICING                  0
 #define configUSE_NEWLIB_REENTRANT              0
 #define configENABLE_BACKWARD_COMPATIBILITY     1
+#define configSTACK_ALLOCATION_FROM_SEPARATE_HEAP   0
 
 #define configSUPPORT_STATIC_ALLOCATION         1
 #define configSUPPORT_DYNAMIC_ALLOCATION        0
diff --git a/examples/device/cdc_msc_freertos/src/freertos_hook.c b/examples/device/cdc_msc_freertos/src/freertos_hook.c
index 423bad4d3..df15a8de7 100644
--- a/examples/device/cdc_msc_freertos/src/freertos_hook.c
+++ b/examples/device/cdc_msc_freertos/src/freertos_hook.c
@@ -37,7 +37,7 @@ void vApplicationMallocFailedHook(void)
   TU_ASSERT(false, );
 }
 
-void vApplicationStackOverflowHook(xTaskHandle pxTask, signed char *pcTaskName)
+void vApplicationStackOverflowHook(xTaskHandle pxTask, char *pcTaskName)
 {
   (void) pxTask;
   (void) pcTaskName;
diff --git a/examples/device/hid_composite_freertos/Makefile b/examples/device/hid_composite_freertos/Makefile
index cef1af5a6..db7dfd345 100644
--- a/examples/device/hid_composite_freertos/Makefile
+++ b/examples/device/hid_composite_freertos/Makefile
@@ -1,7 +1,7 @@
 include ../../../tools/top.mk
 include ../../make.mk
 
-FREERTOS_SRC = lib/FreeRTOS/FreeRTOS/Source
+FREERTOS_SRC = lib/FreeRTOS-Kernel
 
 INC += \
 	src \
diff --git a/examples/device/hid_composite_freertos/src/FreeRTOSConfig.h b/examples/device/hid_composite_freertos/src/FreeRTOSConfig.h
index 494452d43..7b2b93d7b 100644
--- a/examples/device/hid_composite_freertos/src/FreeRTOSConfig.h
+++ b/examples/device/hid_composite_freertos/src/FreeRTOSConfig.h
@@ -71,6 +71,7 @@ extern uint32_t SystemCoreClock;
 #define configUSE_TIME_SLICING                  0
 #define configUSE_NEWLIB_REENTRANT              0
 #define configENABLE_BACKWARD_COMPATIBILITY     1
+#define configSTACK_ALLOCATION_FROM_SEPARATE_HEAP   0
 
 #define configSUPPORT_STATIC_ALLOCATION         1
 #define configSUPPORT_DYNAMIC_ALLOCATION        0
diff --git a/examples/device/hid_composite_freertos/src/freertos_hook.c b/examples/device/hid_composite_freertos/src/freertos_hook.c
index 423bad4d3..df15a8de7 100644
--- a/examples/device/hid_composite_freertos/src/freertos_hook.c
+++ b/examples/device/hid_composite_freertos/src/freertos_hook.c
@@ -37,7 +37,7 @@ void vApplicationMallocFailedHook(void)
   TU_ASSERT(false, );
 }
 
-void vApplicationStackOverflowHook(xTaskHandle pxTask, signed char *pcTaskName)
+void vApplicationStackOverflowHook(xTaskHandle pxTask, char *pcTaskName)
 {
   (void) pxTask;
   (void) pcTaskName;