diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2016-02-16 10:47:01 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2016-02-16 10:47:01 +0000 |
| commit | 50f9e505e509956d401341762da15c1d8267522e (patch) | |
| tree | 4b7dd9a17b537db71ad538ac8efe22a35cda63d2 /demos/SPC5/NIL-SPC560D-EVB | |
| parent | b786bd2fbc2a1cb9e9945ba60b3ea2f6a7370fea (diff) | |
| download | ChibiOS-50f9e505e509956d401341762da15c1d8267522e.tar.gz ChibiOS-50f9e505e509956d401341762da15c1d8267522e.tar.bz2 ChibiOS-50f9e505e509956d401341762da15c1d8267522e.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8903 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'demos/SPC5/NIL-SPC560D-EVB')
| -rw-r--r-- | demos/SPC5/NIL-SPC560D-EVB/Makefile | 24 | ||||
| -rw-r--r-- | demos/SPC5/NIL-SPC560D-EVB/main.c | 2 |
2 files changed, 16 insertions, 10 deletions
diff --git a/demos/SPC5/NIL-SPC560D-EVB/Makefile b/demos/SPC5/NIL-SPC560D-EVB/Makefile index ae0cf9460..810804d03 100644 --- a/demos/SPC5/NIL-SPC560D-EVB/Makefile +++ b/demos/SPC5/NIL-SPC560D-EVB/Makefile @@ -82,35 +82,41 @@ PROJECT = ch # Imported source files and paths
CHIBIOS = ../../..
+# Startup files.
+include $(CHIBIOS)/os/common/startup/e200/compilers/GCC/mk/startup_spc560dxx.mk
+# HAL-OSAL files (optional).
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/boards/ST_EVB_SPC560D/board.mk
include $(CHIBIOS)/os/hal/ports/SPC5/SPC560Dxx/platform.mk
include $(CHIBIOS)/os/hal/osal/nil/osal.mk
+# RTOS files (optional).
include $(CHIBIOS)/os/nil/nil.mk
-include $(CHIBIOS)/os/nil/ports/e200/compilers/GCC/mk/port_spc560dxx.mk
+include $(CHIBIOS)/os/common/ports/e200/compilers/GCC/mk/port.mk
+# Other files (optional).
include $(CHIBIOS)/test/nil/test.mk
# Define linker script file here
-LDSCRIPT= $(PORTLD)/SPC560D40.ld
+LDSCRIPT= $(STARTUPLD)/SPC560D40.ld
# C sources here.
-CSRC = $(PORTSRC) \
+CSRC = $(STARTUPSRC) \
$(KERNSRC) \
- $(TESTSRC) \
- $(HALSRC) \
+ $(PORTSRC) \
$(OSALSRC) \
+ $(HALSRC) \
$(PLATFORMSRC) \
$(BOARDSRC) \
+ $(TESTSRC) \
main.c
# C++ sources here.
CPPSRC =
# List ASM source files here
-ASMSRC = $(PORTASM)
+ASMSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)
-INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \
- $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \
+INCDIR = $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
+ $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
$(CHIBIOS)/os/various
#
@@ -175,5 +181,5 @@ ULIBS = # End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/ports/e200/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/e200/compilers/GCC
include $(RULESPATH)/rules.mk
diff --git a/demos/SPC5/NIL-SPC560D-EVB/main.c b/demos/SPC5/NIL-SPC560D-EVB/main.c index f730fcf62..e4da88028 100644 --- a/demos/SPC5/NIL-SPC560D-EVB/main.c +++ b/demos/SPC5/NIL-SPC560D-EVB/main.c @@ -14,7 +14,7 @@ limitations under the License.
*/
-#include "nil.h"
+#include "ch.h"
#include "hal.h"
#include "ch_test.h"
|