diff --git a/FreeRTOS/Demo/RX100-RSK_GCC_e2studio/.HardwareDebuglinker b/FreeRTOS/Demo/RX100-RSK_GCC_e2studio/.HardwareDebuglinker
deleted file mode 100644
index a232c8ba1d..0000000000
--- a/FreeRTOS/Demo/RX100-RSK_GCC_e2studio/.HardwareDebuglinker
+++ /dev/null
@@ -1,130 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/FreeRTOS/Demo/RX100-RSK_GCC_e2studio/.cproject b/FreeRTOS/Demo/RX100-RSK_GCC_e2studio/.cproject
index 44af9f60e9..b11ab2f34c 100644
--- a/FreeRTOS/Demo/RX100-RSK_GCC_e2studio/.cproject
+++ b/FreeRTOS/Demo/RX100-RSK_GCC_e2studio/.cproject
@@ -1,39 +1,36 @@
-
-
-
+
-
-
+
+
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
\ No newline at end of file
diff --git a/FreeRTOS/Demo/RX100-RSK_GCC_e2studio/.info b/FreeRTOS/Demo/RX100-RSK_GCC_e2studio/.info
deleted file mode 100644
index de616905aa..0000000000
--- a/FreeRTOS/Demo/RX100-RSK_GCC_e2studio/.info
+++ /dev/null
@@ -1,7 +0,0 @@
-TOOL_CHAIN=KPIT GNURX-ELF Toolchain
-VERSION=v12.03
-TC_INSTALL=C:\devtools\renesas\e2studio\GNURXv12.03-ELF\rx-elf\
-GCC_STRING=4.7-GNURX_v12.03
-VERISON_IDE=3.06.02.080
-E2STUDIO_VERSION=2.0.1.4
-ACTIVE_CONFIGURATION=HardwareDebug
diff --git a/FreeRTOS/Demo/RX100-RSK_GCC_e2studio/.project b/FreeRTOS/Demo/RX100-RSK_GCC_e2studio/.project
index 411200c3c7..def506936c 100644
--- a/FreeRTOS/Demo/RX100-RSK_GCC_e2studio/.project
+++ b/FreeRTOS/Demo/RX100-RSK_GCC_e2studio/.project
@@ -6,64 +6,14 @@
- com.renesas.cdt.core.genmakebuilder
+ org.eclipse.xtext.ui.shared.xtextBuilder
+
+
+
+
+ org.eclipse.cdt.managedbuilder.core.genmakebuilder
+ clean,full,incremental,
-
- ?name?
-
-
-
- org.eclipse.cdt.make.core.append_environment
- true
-
-
- org.eclipse.cdt.make.core.autoBuildTarget
- all
-
-
- org.eclipse.cdt.make.core.buildArguments
-
-
-
- org.eclipse.cdt.make.core.buildCommand
- make
-
-
- org.eclipse.cdt.make.core.buildLocation
- ${workspace_loc:/RTOSDemo_GCC/HardwareDebug}
-
-
- org.eclipse.cdt.make.core.cleanBuildTarget
- clean
-
-
- org.eclipse.cdt.make.core.contents
- org.eclipse.cdt.make.core.configurationIds
-
-
- org.eclipse.cdt.make.core.enableAutoBuild
- false
-
-
- org.eclipse.cdt.make.core.enableCleanBuild
- true
-
-
- org.eclipse.cdt.make.core.enableFullBuild
- true
-
-
- org.eclipse.cdt.make.core.fullBuildTarget
- all
-
-
- org.eclipse.cdt.make.core.stopOnError
- true
-
-
- org.eclipse.cdt.make.core.useDefaultBuildCmd
- true
-
@@ -75,9 +25,153 @@
org.eclipse.cdt.core.cnature
- com.renesas.cdt.core.kpitcnature
- com.renesas.cdt.core.kpitccnature
org.eclipse.cdt.managedbuilder.core.managedBuildNature
org.eclipse.cdt.managedbuilder.core.ScannerConfigNature
+ org.eclipse.xtext.ui.shared.xtextNature
+
+
+ RTOSDemo/Common_Demo
+ 2
+ PARENT-1-PROJECT_LOC/Common/Minimal
+
+
+ RTOSDemo/FreeRTOS_Kernel
+ 2
+ PARENT-2-PROJECT_LOC/Source
+
+
+ RTOSDemo/Common_Demo/include
+ 2
+ PARENT-1-PROJECT_LOC/Common/include
+
+
+
+
+ 1641985948666
+ RTOSDemo/Common_Demo
+ 5
+
+ org.eclipse.ui.ide.multiFilter
+ 1.0-name-matches-false-false-blocktim.c
+
+
+
+ 1641985948676
+ RTOSDemo/Common_Demo
+ 5
+
+ org.eclipse.ui.ide.multiFilter
+ 1.0-name-matches-false-false-death.c
+
+
+
+ 1641985948686
+ RTOSDemo/Common_Demo
+ 5
+
+ org.eclipse.ui.ide.multiFilter
+ 1.0-name-matches-false-false-GenQTest.c
+
+
+
+ 1641985948695
+ RTOSDemo/Common_Demo
+ 5
+
+ org.eclipse.ui.ide.multiFilter
+ 1.0-name-matches-false-false-recmutex.c
+
+
+
+ 1641986134225
+ RTOSDemo/FreeRTOS_Kernel
+ 5
+
+ org.eclipse.ui.ide.multiFilter
+ 1.0-name-matches-false-false-list.c
+
+
+
+ 1641986134230
+ RTOSDemo/FreeRTOS_Kernel
+ 5
+
+ org.eclipse.ui.ide.multiFilter
+ 1.0-name-matches-false-false-queue.c
+
+
+
+ 1641986134239
+ RTOSDemo/FreeRTOS_Kernel
+ 5
+
+ org.eclipse.ui.ide.multiFilter
+ 1.0-name-matches-false-false-tasks.c
+
+
+
+ 1641986134247
+ RTOSDemo/FreeRTOS_Kernel
+ 5
+
+ org.eclipse.ui.ide.multiFilter
+ 1.0-name-matches-false-false-timers.c
+
+
+
+ 1641986134255
+ RTOSDemo/FreeRTOS_Kernel
+ 9
+
+ org.eclipse.ui.ide.multiFilter
+ 1.0-name-matches-false-false-include
+
+
+
+ 1641986134264
+ RTOSDemo/FreeRTOS_Kernel
+ 9
+
+ org.eclipse.ui.ide.multiFilter
+ 1.0-name-matches-false-false-portable
+
+
+
+ 1641986175888
+ RTOSDemo/FreeRTOS_Kernel/portable
+ 9
+
+ org.eclipse.ui.ide.multiFilter
+ 1.0-name-matches-false-false-GCC
+
+
+
+ 1641986175893
+ RTOSDemo/FreeRTOS_Kernel/portable
+ 9
+
+ org.eclipse.ui.ide.multiFilter
+ 1.0-name-matches-false-false-MemMang
+
+
+
+ 1641986235230
+ RTOSDemo/FreeRTOS_Kernel/portable/GCC
+ 9
+
+ org.eclipse.ui.ide.multiFilter
+ 1.0-name-matches-false-false-RX100
+
+
+
+ 1641986201826
+ RTOSDemo/FreeRTOS_Kernel/portable/MemMang
+ 5
+
+ org.eclipse.ui.ide.multiFilter
+ 1.0-name-matches-false-false-heap_4.c
+
+
+
diff --git a/FreeRTOS/Demo/RX100-RSK_GCC_e2studio/.settings/Project_Generation_Prefrences.prefs b/FreeRTOS/Demo/RX100-RSK_GCC_e2studio/.settings/Project_Generation_Prefrences.prefs
deleted file mode 100644
index 83f7426190..0000000000
--- a/FreeRTOS/Demo/RX100-RSK_GCC_e2studio/.settings/Project_Generation_Prefrences.prefs
+++ /dev/null
@@ -1,22 +0,0 @@
-#Mon Mar 11 11:21:23 GMT 2013
-Library\ Generator\ Command=rx-elf-libgen
-com.renesas.cdt.core.Assembler.option.includeFileDirectories="${workspace_loc\:/${ProjName}}\\src";
-com.renesas.cdt.core.Compiler.option.includeFileDir.316833280="${TCINSTALL}\\rx-elf\\optlibinc";
-com.renesas.cdt.core.LibraryGenerator.option.ctype=true
-com.renesas.cdt.core.LibraryGenerator.option.libraryType=Project-Built
-com.renesas.cdt.core.LibraryGenerator.option.math=false
-com.renesas.cdt.core.LibraryGenerator.option.selectLibrary=Optimized
-com.renesas.cdt.core.LibraryGenerator.option.stdio=false
-com.renesas.cdt.core.LibraryGenerator.option.stdlib=true
-com.renesas.cdt.core.LibraryGenerator.option.string=true
-com.renesas.cdt.core.Linker.option.userDefinedOptions=[Ljava.lang.String;@13ec853
-com.renesas.cdt.rx.HardwareDebug.Compiler.option.cpuType=RX100
-com.renesas.cdt.rx.HardwareDebug.Compiler.option.cpuType.2018307272=RX100
-com.renesas.cdt.rx.HardwareDebug.Compiler.option.dataEndian=Little-endian data
-com.renesas.cdt.rx.HardwareDebug.Compiler.option.disableFPUInstructions=false
-com.renesas.cdt.rx.HardwareDebug.Compiler.option.genCodeForRX610=false
-com.renesas.cdt.rx.HardwareDebug.Compiler.option.generateRXas100output=false
-com.renesas.cdt.rx.HardwareDebug.Compiler.option.make64bitDouble=false
-com.renesas.cdt.rx.HardwareDebug.Linker.option.archiveLibraryFiles=${ProjName};gcc;
-com.renesas.cdt.rx.HardwareDebug.Linker.option.archiveSearchDirectories.770090581="${CONFIGDIR}";"${TCINSTALL}\\lib\\gcc\\rx-elf\\\\${GCC_VERSION}";
-eclipse.preferences.version=1
diff --git a/FreeRTOS/Demo/RX100-RSK_GCC_e2studio/.settings/language.settings.xml b/FreeRTOS/Demo/RX100-RSK_GCC_e2studio/.settings/language.settings.xml
new file mode 100644
index 0000000000..5ad8482852
--- /dev/null
+++ b/FreeRTOS/Demo/RX100-RSK_GCC_e2studio/.settings/language.settings.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/FreeRTOS/Demo/RX100-RSK_GCC_e2studio/CreateProjectDirectoryStructure.bat b/FreeRTOS/Demo/RX100-RSK_GCC_e2studio/CreateProjectDirectoryStructure.bat
deleted file mode 100644
index 2fc474125e..0000000000
--- a/FreeRTOS/Demo/RX100-RSK_GCC_e2studio/CreateProjectDirectoryStructure.bat
+++ /dev/null
@@ -1,52 +0,0 @@
-REM This file should be executed from the command line prior to the first
-REM build. It will be necessary to refresh the Eclipse project once the
-REM .bat file has been executed (normally just press F5 to refresh).
-
-REM Copies all the required files from their location within the standard
-REM FreeRTOS directory structure to under the Eclipse project directory.
-REM This permits the Eclipse project to be used in 'managed' mode and without
-REM having to setup any linked resources.
-
-REM Standard paths
-SET FREERTOS_SOURCE=..\..\Source
-SET COMMON_SOURCE=..\Common\minimal
-SET COMMON_INCLUDE=..\Common\include
-
-REM Have the files already been copied?
-IF EXIST RTOSDemo\FreeRTOS_Source Goto END
-
- REM Create the required directory structure.
- MD RTOSDemo\FreeRTOS_Source
- MD RTOSDemo\FreeRTOS_Source\include
- MD RTOSDemo\FreeRTOS_Source\portable
- MD RTOSDemo\FreeRTOS_Source\portable\MemMang
- MD RTOSDemo\FreeRTOS_Source\portable\GCC
- MD RTOSDemo\FreeRTOS_Source\portable\GCC\RX100
- MD RTOSDemo\Common_Demo_Tasks
- MD RTOSDemo\Common_Demo_Tasks\include
-
- REM Copy the core kernel files into the project directory
- copy %FREERTOS_SOURCE%\tasks.c RTOSDemo\FreeRTOS_Source
- copy %FREERTOS_SOURCE%\queue.c RTOSDemo\FreeRTOS_Source
- copy %FREERTOS_SOURCE%\list.c RTOSDemo\FreeRTOS_Source
- copy %FREERTOS_SOURCE%\timers.c RTOSDemo\FreeRTOS_Source
-
- REM Copy the common header files into the project directory
- copy %FREERTOS_SOURCE%\include\*.* RTOSDemo\FreeRTOS_Source\include
-
- REM Copy the portable layer files into the project directory
- copy %FREERTOS_SOURCE%\portable\GCC\RX100\*.* RTOSDemo\FreeRTOS_Source\portable\GCC\RX100
-
- REM Copy the memory allocation files into the project directory
- copy %FREERTOS_SOURCE%\portable\MemMang\heap_4.c RTOSDemo\FreeRTOS_Source\portable\MemMang
-
- REM Copy the files that define the common demo tasks.
- copy %COMMON_SOURCE%\death.c RTOSDemo\Common_Demo_Tasks
- copy %COMMON_SOURCE%\blocktim.c RTOSDemo\Common_Demo_Tasks
- copy %COMMON_SOURCE%\GenQTest.c RTOSDemo\Common_Demo_Tasks
- copy %COMMON_SOURCE%\recmutex.c RTOSDemo\Common_Demo_Tasks
-
- REM Copy the common demo file headers.
- copy %COMMON_INCLUDE%\*.h RTOSDemo\Common_Demo_Tasks\include
-
-: END
diff --git a/FreeRTOS/Demo/RX100-RSK_GCC_e2studio/RTOSDemo/FreeRTOSConfig.h b/FreeRTOS/Demo/RX100-RSK_GCC_e2studio/RTOSDemo/FreeRTOSConfig.h
index 5b91afe53a..5edd37ce12 100644
--- a/FreeRTOS/Demo/RX100-RSK_GCC_e2studio/RTOSDemo/FreeRTOSConfig.h
+++ b/FreeRTOS/Demo/RX100-RSK_GCC_e2studio/RTOSDemo/FreeRTOSConfig.h
@@ -20,20 +20,10 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*
* https://www.FreeRTOS.org
- * https://aws.amazon.com/freertos
+ * https://github.com/FreeRTOS
*
*/
-
-/*
- * The following #error directive is to remind users that a batch file must be
- * executed prior to this project being built. The batch file *cannot* be
- * executed from within the IDE! Once it has been executed, re-open or refresh
- * the Eclipse project and remove the #error line below.
- */
-#error Ensure CreateProjectDirectoryStructure.bat has been executed before building. See comment immediately above.
-
-
#ifndef FREERTOS_CONFIG_H
#define FREERTOS_CONFIG_H
diff --git a/FreeRTOS/Demo/RX100-RSK_GCC_e2studio/RTOSDemo/linker_scriptHardwareDebug.ld b/FreeRTOS/Demo/RX100-RSK_GCC_e2studio/RTOSDemo/linker_scriptHardwareDebug.ld
new file mode 100644
index 0000000000..fb4cace965
--- /dev/null
+++ b/FreeRTOS/Demo/RX100-RSK_GCC_e2studio/RTOSDemo/linker_scriptHardwareDebug.ld
@@ -0,0 +1,127 @@
+MEMORY
+{
+ RAM : ORIGIN = 0x0, LENGTH = 20480
+ ROM : ORIGIN = 0xFFFE0000, LENGTH = 131072
+}
+
+SECTIONS
+{
+ .fvectors 0xFFFFFFD0 : AT (0xFFFFFFD0)
+ {
+ KEEP(*(.fvectors))
+ } > ROM
+ .option_bytes 0xFFFFFF88 : AT (0xFFFFFF88)
+ {
+ KEEP(*(.option_bytes))
+ } > ROM
+ .endian_bytes 0xFFFFFF80 : AT (0xFFFFFF80)
+ {
+ KEEP(*(.endian_bytes))
+ } > ROM
+ .text 0xFFFE0000 : AT (0xFFFE0000)
+ {
+ *(.text)
+ *(.text.*)
+ *(P)
+ etext = .;
+ } > ROM
+ .rvectors :
+ {
+ _rvectors_start = .;
+ *(.rvectors)
+ _rvectors_end = .;
+ } > ROM
+ .init :
+ {
+ *(.init)
+ __preinit_array_start = .;
+ *(.preinit_array)
+ __preinit_array_end = .;
+ __init_array_start = (. + 3) & ~ 3;
+ *(.init_array)
+ *(SORT(.init_array.*))
+ __init_array_end = .;
+ __fini_array_start = .;
+ *(.fini_array)
+ *(SORT(.fini_array.*))
+ __fini_array_end = .;
+ } > ROM
+ .fini :
+ {
+ *(.fini)
+ } > ROM
+ .got :
+ {
+ *(.got)
+ *(.got.plt)
+ } > ROM
+ .rodata :
+ {
+ *(.rodata)
+ *(.rodata.*)
+ *(C_1)
+ *(C_2)
+ *(C)
+ _erodata = .;
+ } > ROM
+ .eh_frame_hdr :
+ {
+ *(.eh_frame_hdr)
+ } > ROM
+ .eh_frame :
+ {
+ *(.eh_frame)
+ } > ROM
+ .jcr :
+ {
+ *(.jcr)
+ } > ROM
+ .tors :
+ {
+ __CTOR_LIST__ = .;
+ ___ctors = .;
+ *(.ctors)
+ ___ctors_end = .;
+ __CTOR_END__ = .;
+ __DTOR_LIST__ = .;
+ ___dtors = .;
+ *(.dtors)
+ ___dtors_end = .;
+ __DTOR_END__ = .;
+ _mdata = .;
+ } > ROM
+ .data 0x200 : AT (_mdata)
+ {
+ _data = .;
+ *(.data)
+ *(.data.*)
+ *(D)
+ *(D_1)
+ *(D_2)
+ _edata = .;
+ } > RAM
+ .gcc_exc :
+ {
+ *(.gcc_exc)
+ } > RAM
+ .bss :
+ {
+ _bss = .;
+ *(.bss)
+ *(.bss.**)
+ *(COMMON)
+ *(B)
+ *(B_1)
+ *(B_2)
+ _ebss = .;
+ _end = .;
+ } > RAM
+ .ustack 0x1FF : AT (0x1FF)
+ {
+ _ustack = .;
+ } > RAM
+ .istack 0x1FB : AT (0x1FB)
+ {
+ _istack = .;
+ } > RAM
+}
diff --git a/FreeRTOS/Demo/RX100-RSK_GCC_e2studio/custom.bat b/FreeRTOS/Demo/RX100-RSK_GCC_e2studio/custom.bat
deleted file mode 100644
index e69de29bb2..0000000000