e200 make files adjustments

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@11126 35acf78f-673a-0410-8e92-d51de3d6d3f4

12 files changed, 13 insertions, 12 deletions

diff --git a/demos/SPC5/RT-SPC56EC-EVB/.cproject b/demos/SPC5/RT-SPC56EC-EVB/.cproject
index b413bf050..9de951541 100644
--- a/demos/SPC5/RT-SPC56EC-EVB/.cproject
+++ b/demos/SPC5/RT-SPC56EC-EVB/.cproject
@@ -119,13 +119,13 @@
 	<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>

 	<storageModule moduleId="scannerConfiguration">

 		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>

-		<scannerConfigBuildInfo instanceId="0.665946016">

+		<scannerConfigBuildInfo instanceId="0.665946016.1671286799">

 			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>

 		</scannerConfigBuildInfo>

 		<scannerConfigBuildInfo instanceId="0.665946016.1671286799.1895127004">

 			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>

 		</scannerConfigBuildInfo>

-		<scannerConfigBuildInfo instanceId="0.665946016.1671286799">

+		<scannerConfigBuildInfo instanceId="0.665946016">

 			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>

 		</scannerConfigBuildInfo>

 	</storageModule>

diff --git a/demos/SPC5/RT-SPC56EC-EVB/Makefile-ghs b/demos/SPC5/RT-SPC56EC-EVB/Makefile-ghs
index 25c3fe317..6f3a9c59c 100644
--- a/demos/SPC5/RT-SPC56EC-EVB/Makefile-ghs
+++ b/demos/SPC5/RT-SPC56EC-EVB/Makefile-ghs
@@ -86,6 +86,8 @@ CONFDIR  := .
 BUILDDIR := ./build-ghs

 DEPDIR   := ./.dep-ghs

 

+# Licensing files.

+include $(CHIBIOS)/os/license/license.mk

 # Startup files.

 include $(CHIBIOS)/os/common/startup/e200/compilers/GHS/mk/startup_spc56ecxx.mk

 # HAL-OSAL files (optional).

diff --git a/demos/SPC5/RT-SPC56EC-EVB/main.c b/demos/SPC5/RT-SPC56EC-EVB/main.c
index 98b1028bb..1a4d14785 100644
--- a/demos/SPC5/RT-SPC56EC-EVB/main.c
+++ b/demos/SPC5/RT-SPC56EC-EVB/main.c
@@ -139,5 +139,4 @@ int main(void) {
     chThdWait(shelltp);               /* Waiting termination.             */

     chThdSleepMilliseconds(1000);

   }

-  return 0;

 }

diff --git a/os/common/ports/e200/compilers/GHS/mk/port.mk b/os/common/ports/e200/compilers/GHS/mk/port.mk
index 8e2cfffc6..f58e5a81d 100644
--- a/os/common/ports/e200/compilers/GHS/mk/port.mk
+++ b/os/common/ports/e200/compilers/GHS/mk/port.mk
@@ -8,6 +8,6 @@ PORTINC = $(CHIBIOS)/os/common/ports/e200 \
           $(CHIBIOS)/os/common/ports/e200/compilers/GHS

 

 # Shared variables

-ALLXASMSRC += $(PORTASM)

+ALLASMSRC  += $(PORTASM)

 ALLCSRC    += $(PORTSRC)

 ALLINC     += $(PORTINC)

diff --git a/os/common/startup/e200/compilers/GHS/mk/startup_spc560bcxx.mk b/os/common/startup/e200/compilers/GHS/mk/startup_spc560bcxx.mk
index 9ebe8e5b6..6d42e601e 100644
--- a/os/common/startup/e200/compilers/GHS/mk/startup_spc560bcxx.mk
+++ b/os/common/startup/e200/compilers/GHS/mk/startup_spc560bcxx.mk
@@ -11,6 +11,6 @@ STARTUPINC = ${CHIBIOS}/os/common/startup/e200/compilers/GHS \
 STARTUPLD  = ${CHIBIOS}/os/common/startup/e200/compilers/GHS/ld

 

 # Shared variables

-ALLXASMSRC += $(STARTUPASM)

+ALLASMSRC  += $(STARTUPASM)

 ALLCSRC    += $(STARTUPSRC)

 ALLINC     += $(STARTUPINC)

diff --git a/os/common/startup/e200/compilers/GHS/mk/startup_spc560bxx.mk b/os/common/startup/e200/compilers/GHS/mk/startup_spc560bxx.mk
index 91d97a729..51fe2e2d0 100644
--- a/os/common/startup/e200/compilers/GHS/mk/startup_spc560bxx.mk
+++ b/os/common/startup/e200/compilers/GHS/mk/startup_spc560bxx.mk
@@ -11,6 +11,6 @@ STARTUPINC = ${CHIBIOS}/os/common/startup/e200/compilers/GHS \
 STARTUPLD  = ${CHIBIOS}/os/common/startup/e200/compilers/GHS/ld

 

 # Shared variables

-ALLXASMSRC += $(STARTUPASM)

+ALLASMSRC  += $(STARTUPASM)

 ALLCSRC    += $(STARTUPSRC)

 ALLINC     += $(STARTUPINC)

diff --git a/os/common/startup/e200/compilers/GHS/mk/startup_spc560dxx.mk b/os/common/startup/e200/compilers/GHS/mk/startup_spc560dxx.mk
index 516324909..8ffda956b 100644
--- a/os/common/startup/e200/compilers/GHS/mk/startup_spc560dxx.mk
+++ b/os/common/startup/e200/compilers/GHS/mk/startup_spc560dxx.mk
@@ -11,6 +11,6 @@ STARTUPINC = ${CHIBIOS}/os/common/startup/e200/compilers/GHS \
 STARTUPLD  = ${CHIBIOS}/os/common/startup/e200/compilers/GHS/ld

 

 # Shared variables

-ALLXASMSRC += $(STARTUPASM)

+ALLASMSRC  += $(STARTUPASM)

 ALLCSRC    += $(STARTUPSRC)

 ALLINC     += $(STARTUPINC)

diff --git a/os/common/startup/e200/compilers/GHS/mk/startup_spc560pxx.mk b/os/common/startup/e200/compilers/GHS/mk/startup_spc560pxx.mk
index a9aed3d58..acd202aa3 100644
--- a/os/common/startup/e200/compilers/GHS/mk/startup_spc560pxx.mk
+++ b/os/common/startup/e200/compilers/GHS/mk/startup_spc560pxx.mk
@@ -11,6 +11,6 @@ STARTUPINC = ${CHIBIOS}/os/common/startup/e200/compilers/GHS \
 STARTUPLD  = ${CHIBIOS}/os/common/startup/e200/compilers/GHS/ld

 

 # Shared variables

-ALLXASMSRC += $(STARTUPASM)

+ALLASMSRC  += $(STARTUPASM)

 ALLCSRC    += $(STARTUPSRC)

 ALLINC     += $(STARTUPINC)

diff --git a/os/common/startup/e200/compilers/GHS/mk/startup_spc563mxx.mk b/os/common/startup/e200/compilers/GHS/mk/startup_spc563mxx.mk
index 6bd0f3179..be60849e1 100644
--- a/os/common/startup/e200/compilers/GHS/mk/startup_spc563mxx.mk
+++ b/os/common/startup/e200/compilers/GHS/mk/startup_spc563mxx.mk
@@ -11,6 +11,6 @@ STARTUPINC = ${CHIBIOS}/os/common/startup/e200/compilers/GHS \
 STARTUPLD  = ${CHIBIOS}/os/common/startup/e200/compilers/GHS/ld

 

 # Shared variables

-ALLXASMSRC += $(STARTUPASM)

+ALLASMSRC  += $(STARTUPASM)

 ALLCSRC    += $(STARTUPSRC)

 ALLINC     += $(STARTUPINC)

diff --git a/os/common/startup/e200/compilers/GHS/mk/startup_spc564axx.mk b/os/common/startup/e200/compilers/GHS/mk/startup_spc564axx.mk
index d1dd6a262..cd40e66e3 100644
--- a/os/common/startup/e200/compilers/GHS/mk/startup_spc564axx.mk
+++ b/os/common/startup/e200/compilers/GHS/mk/startup_spc564axx.mk
@@ -11,6 +11,6 @@ STARTUPINC = ${CHIBIOS}/os/common/startup/e200/compilers/GHS \
 STARTUPLD  = ${CHIBIOS}/os/common/startup/e200/compilers/GHS/ld

 

 # Shared variables

-ALLXASMSRC += $(STARTUPASM)

+ALLASMSRC  += $(STARTUPASM)

 ALLCSRC    += $(STARTUPSRC)

 ALLINC     += $(STARTUPINC)

diff --git a/os/common/startup/e200/compilers/GHS/mk/startup_spc56ecxx.mk b/os/common/startup/e200/compilers/GHS/mk/startup_spc56ecxx.mk
index 5bc703153..b4dcc2d5b 100644
--- a/os/common/startup/e200/compilers/GHS/mk/startup_spc56ecxx.mk
+++ b/os/common/startup/e200/compilers/GHS/mk/startup_spc56ecxx.mk
@@ -11,6 +11,6 @@ STARTUPINC = ${CHIBIOS}/os/common/startup/e200/compilers/GHS \
 STARTUPLD  = ${CHIBIOS}/os/common/startup/e200/compilers/GHS/ld

 

 # Shared variables

-ALLXASMSRC += $(STARTUPASM)

+ALLASMSRC  += $(STARTUPASM)

 ALLCSRC    += $(STARTUPSRC)

 ALLINC     += $(STARTUPINC)

diff --git a/os/common/startup/e200/compilers/GHS/mk/startup_spc56elxx.mk b/os/common/startup/e200/compilers/GHS/mk/startup_spc56elxx.mk
index c800d6b00..85a447f48 100644
--- a/os/common/startup/e200/compilers/GHS/mk/startup_spc56elxx.mk
+++ b/os/common/startup/e200/compilers/GHS/mk/startup_spc56elxx.mk
@@ -11,6 +11,6 @@ STARTUPINC = ${CHIBIOS}/os/common/startup/e200/compilers/GHS \
 STARTUPLD  = ${CHIBIOS}/os/common/startup/e200/compilers/GHS/ld

 

 # Shared variables

-ALLXASMSRC += $(STARTUPASM)

+ALLASMSRC  += $(STARTUPASM)

 ALLCSRC    += $(STARTUPSRC)

 ALLINC     += $(STARTUPINC)