diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2008-02-22 11:17:42 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2008-02-22 11:17:42 +0000 |
| commit | fe3c49452942316792f892479c6f3389f0c518a8 (patch) | |
| tree | 7d9e462188b7e7d763b5ddc639f589a3dcc04333 /demos/ARM7-LPC214x-GCC-minimal | |
| parent | 0ea8e4c99fb2626c26136fc7260482b272f03d11 (diff) | |
| download | ChibiOS-fe3c49452942316792f892479c6f3389f0c518a8.tar.gz ChibiOS-fe3c49452942316792f892479c6f3389f0c518a8.tar.bz2 ChibiOS-fe3c49452942316792f892479c6f3389f0c518a8.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@203 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'demos/ARM7-LPC214x-GCC-minimal')
| -rw-r--r-- | demos/ARM7-LPC214x-GCC-minimal/Makefile | 12 | ||||
| -rw-r--r-- | demos/ARM7-LPC214x-GCC-minimal/Makefile.thumb | 10 |
2 files changed, 13 insertions, 9 deletions
diff --git a/demos/ARM7-LPC214x-GCC-minimal/Makefile b/demos/ARM7-LPC214x-GCC-minimal/Makefile index 1fe22d71a..d8ed9ed9b 100644 --- a/demos/ARM7-LPC214x-GCC-minimal/Makefile +++ b/demos/ARM7-LPC214x-GCC-minimal/Makefile @@ -62,8 +62,8 @@ UDEFS = UADEFS =
# List ARM-mode C source files here
-ASRC = ../../ports/ARM7-LPC214x/GCC/chcore.c \
- ../../ports/ARM7-LPC214x/GCC/vic.c \
+ASRC = ../../ports/ARM7-LPC214x/chcore.c \
+ ../../ports/ARM7-LPC214x/vic.c \
../../src/chinit.c ../../src/chdebug.c ../../src/chlists.c ../../src/chdelta.c \
../../src/chschd.c ../../src/chthreads.c ../../src/chsem.c ../../src/chmtx.c \
../../src/chevents.c ../../src/chmsg.c ../../src/chsleep.c ../../src/chqueues.c \
@@ -76,10 +76,11 @@ ASRC = ../../ports/ARM7-LPC214x/GCC/chcore.c \ TSRC =
# List ASM source files here
-ASMSRC = ../../ports/ARM7-LPC214x/GCC/crt0.s
+ASMSRC = ../../ports/ARM7-LPC214x/crt0.s ../../ports/ARM7/chsys.s
# List all user directories here
-UINCDIR = ../../src/include ../../src/lib ../../ports/ARM7-LPC214x/GCC
+UINCDIR = ../../src/include ../../src/lib \
+ ../../ports/ARM7 ../../ports/ARM7-LPC214x
# List the user directory to look for the libraries here
ULIBDIR =
@@ -128,6 +129,7 @@ ODFLAGS = -x --syms # Thumb interwork enabled only if needed because it kills performance.
ifneq ($(TSRC),)
CPFLAGS += -D THUMB_PRESENT
+ ASFLAGS += -D THUMB_PRESENT
ifneq ($(ASRC),)
# Mixed ARM and THUMB case.
CPFLAGS += -mthumb-interwork
@@ -155,7 +157,7 @@ $(AOBJS) : %.o : %.c $(TOBJS) : %.o : %.c
@echo
- $(CC) -c $(CPFLAGS) $(TOPT) -mthumb -I . $(INCDIR) $< -o $@
+ $(CC) -c $(CPFLAGS) $(TOPT) -I . $(INCDIR) $< -o $@
$(ASMOBJS) : %.o : %.s
@echo
diff --git a/demos/ARM7-LPC214x-GCC-minimal/Makefile.thumb b/demos/ARM7-LPC214x-GCC-minimal/Makefile.thumb index b00adef75..621e71853 100644 --- a/demos/ARM7-LPC214x-GCC-minimal/Makefile.thumb +++ b/demos/ARM7-LPC214x-GCC-minimal/Makefile.thumb @@ -67,8 +67,8 @@ ASRC = # List THUMB-mode C sources here
# NOTE: If any module is compiled in thumb mode then -mthumb-interwork is
# enabled for all modules and that lowers performance.
-TSRC = ../../ports/ARM7-LPC214x/GCC/chcore.c \
- ../../ports/ARM7-LPC214x/GCC/vic.c \
+TSRC = ../../ports/ARM7-LPC214x/chcore.c \
+ ../../ports/ARM7-LPC214x/vic.c \
../../src/chinit.c ../../src/chdebug.c ../../src/chlists.c ../../src/chdelta.c \
../../src/chschd.c ../../src/chthreads.c ../../src/chsem.c ../../src/chmtx.c \
../../src/chevents.c ../../src/chmsg.c ../../src/chsleep.c ../../src/chqueues.c \
@@ -76,10 +76,11 @@ TSRC = ../../ports/ARM7-LPC214x/GCC/chcore.c \ board.c main.c
# List ASM source files here
-ASMSRC = ../../ports/ARM7-LPC214x/GCC/crt0.s
+ASMSRC = ../../ports/ARM7-LPC214x/crt0.s ../../ports/ARM7/chsys.s
# List all user directories here
-UINCDIR = ../../src/include ../../src/lib ../../ports/ARM7-LPC214x/GCC
+UINCDIR = ../../src/include ../../src/lib \
+ ../../ports/ARM7 ../../ports/ARM7-LPC214x
# List the user directory to look for the libraries here
ULIBDIR =
@@ -128,6 +129,7 @@ ODFLAGS = -x --syms # Thumb interwork enabled only if needed because it kills performance.
ifneq ($(TSRC),)
CPFLAGS += -D THUMB_PRESENT
+ ASFLAGS += -D THUMB_PRESENT
ifneq ($(ASRC),)
# Mixed ARM and THUMB case.
CPFLAGS += -mthumb-interwork
|