From 609b8e9e3bea2e86be98a0378abbc1c1b2ea6df3 Mon Sep 17 00:00:00 2001
From: Giovanni Di Sirio <gdisirio@gmail.com>
Date: Thu, 23 Jun 2016 09:33:26 +0000
Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@9651
 35acf78f-673a-0410-8e92-d51de3d6d3f4

---
 demos/XMC/RT-XMC1100-XMC_2GO/.cproject              |  2 +-
 demos/XMC/RT-XMC1100-XMC_2GO/.project               |  2 +-
 demos/XMC/RT-XMC1100-XMC_2GO/Makefile               |  2 +-
 .../startup/ARMCMx/compilers/GCC/ld/XMC1100x0064.ld | 21 ++++++++++-----------
 .../ARMCMx/compilers/GCC/mk/startup_xmc1100.mk      |  2 +-
 5 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/demos/XMC/RT-XMC1100-XMC_2GO/.cproject b/demos/XMC/RT-XMC1100-XMC_2GO/.cproject
index 0300ed2c4..bec7583fd 100644
--- a/demos/XMC/RT-XMC1100-XMC_2GO/.cproject
+++ b/demos/XMC/RT-XMC1100-XMC_2GO/.cproject
@@ -39,7 +39,7 @@
 		</cconfiguration>
 	</storageModule>
 	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-		<project id="RT-ARMCM0-GENERIC.null.1703860681" name="RT-ARMCM0-GENERIC"/>
+		<project id="RT-XMC1100-XMC_2GO.null.1703860681" name="RT-XMC1100-XMC_2GO"/>
 	</storageModule>
 	<storageModule moduleId="scannerConfiguration">
 		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
diff --git a/demos/XMC/RT-XMC1100-XMC_2GO/.project b/demos/XMC/RT-XMC1100-XMC_2GO/.project
index 76103619d..a2b3d3f1b 100644
--- a/demos/XMC/RT-XMC1100-XMC_2GO/.project
+++ b/demos/XMC/RT-XMC1100-XMC_2GO/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>RT-ARMCM0-GENERIC</name>
+	<name>RT-XMC1100-XMC_2GO</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/demos/XMC/RT-XMC1100-XMC_2GO/Makefile b/demos/XMC/RT-XMC1100-XMC_2GO/Makefile
index a5a731d17..aee362f1e 100644
--- a/demos/XMC/RT-XMC1100-XMC_2GO/Makefile
+++ b/demos/XMC/RT-XMC1100-XMC_2GO/Makefile
@@ -88,7 +88,7 @@ PROJECT = ch
 # Imported source files and paths
 CHIBIOS = ../../..
 # Startup files.
-include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_xmc1xxx.mk
+include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_xmc1100.mk
 # HAL-OSAL files (optional).
 #include $(CHIBIOS)/os/hal/hal.mk
 #include $(CHIBIOS)/os/hal/ports/STM32/STM32F0xx/platform.mk
diff --git a/os/common/startup/ARMCMx/compilers/GCC/ld/XMC1100x0064.ld b/os/common/startup/ARMCMx/compilers/GCC/ld/XMC1100x0064.ld
index 2fd677946..dcd737b5b 100644
--- a/os/common/startup/ARMCMx/compilers/GCC/ld/XMC1100x0064.ld
+++ b/os/common/startup/ARMCMx/compilers/GCC/ld/XMC1100x0064.ld
@@ -19,7 +19,6 @@
  */
 MEMORY
 {
-    rom0    : org = 0x00000000, len = 8k
     flash0  : org = 0x10001000, len = 64k
     flash1  : org = 0x00000000, len = 0
     flash2  : org = 0x00000000, len = 0
@@ -28,9 +27,9 @@ MEMORY
     flash5  : org = 0x00000000, len = 0
     flash6  : org = 0x00000000, len = 0
     flash7  : org = 0x00000000, len = 0
-    ram0    : org = 0x20000000, len = 16k
-    ram1    : org = 0x00000000, len = 0
-    ram2    : org = 0x00000000, len = 0
+    ram0    : org = 0x20000000, len = 0xC0
+    ram1    : org = 0x200000C0, len = 0x140
+    ram2    : org = 0x20000200, len = 16k - 0x140 - 0xC0
     ram3    : org = 0x00000000, len = 0
     ram4    : org = 0x00000000, len = 0
     ram5    : org = 0x00000000, len = 0
@@ -42,8 +41,8 @@ MEMORY
    and a load region (_LMA suffix).*/
 
 /* Flash region to be used for exception vectors.*/
-REGION_ALIAS("VECTORS_FLASH", rom0);
-REGION_ALIAS("VECTORS_FLASH_LMA", rom0);
+REGION_ALIAS("VECTORS_FLASH", flash0);
+REGION_ALIAS("VECTORS_FLASH_LMA", flash0);
 
 /* Flash region to be used for constructors and destructors.*/
 REGION_ALIAS("XTORS_FLASH", flash0);
@@ -66,21 +65,21 @@ REGION_ALIAS("RAM_INIT_FLASH_LMA", flash0);
 
 /* RAM region to be used for Main stack. This stack accommodates the processing
    of all exceptions and interrupts.*/
-REGION_ALIAS("MAIN_STACK_RAM", ram0);
+REGION_ALIAS("MAIN_STACK_RAM", ram2);
 
 /* RAM region to be used for the process stack. This is the stack used by
    the main() function.*/
-REGION_ALIAS("PROCESS_STACK_RAM", ram0);
+REGION_ALIAS("PROCESS_STACK_RAM", ram2);
 
 /* RAM region to be used for data segment.*/
-REGION_ALIAS("DATA_RAM", ram0);
+REGION_ALIAS("DATA_RAM", ram2);
 REGION_ALIAS("DATA_RAM_LMA", flash0);
 
 /* RAM region to be used for BSS segment.*/
-REGION_ALIAS("BSS_RAM", ram0);
+REGION_ALIAS("BSS_RAM", ram2);
 
 /* RAM region to be used for the default heap.*/
-REGION_ALIAS("HEAP_RAM", ram0);
+REGION_ALIAS("HEAP_RAM", ram2);
 
 /* Generic rules inclusion.*/
 INCLUDE rules.ld
diff --git a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_xmc1100.mk b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_xmc1100.mk
index ccb432457..84cec7eb1 100644
--- a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_xmc1100.mk
+++ b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_xmc1100.mk
@@ -1,4 +1,4 @@
-# List of the ChibiOS generic XMC1xxx startup and CMSIS files.
+# List of the ChibiOS generic XMC1100 startup and CMSIS files.
 STARTUPSRC = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/crt1.c \
              $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/vectors.c
           
-- 
cgit v1.2.3