diff options
| author | Fabio Utzig <utzig@utzig.org> | 2016-04-28 18:36:42 -0300 |
|---|---|---|
| committer | Fabio Utzig <utzig@utzig.org> | 2016-04-28 18:36:42 -0300 |
| commit | 0625a978f75dc589d306f20c4d1ef755938c3cbc (patch) | |
| tree | a9faaf05e6ff2c054c8343d84acdabb5bab6a4a2 /demos | |
| parent | 5c02f2370695ad93afda8fdeeea155fdc5e6493b (diff) | |
| parent | 2789fb3cd85fe8b7cb67a77d6d676d8b84830de2 (diff) | |
| download | ChibiOS-Contrib-0625a978f75dc589d306f20c4d1ef755938c3cbc.tar.gz ChibiOS-Contrib-0625a978f75dc589d306f20c4d1ef755938c3cbc.tar.bz2 ChibiOS-Contrib-0625a978f75dc589d306f20c4d1ef755938c3cbc.zip | |
Merge pull request #64 from sdalu/aSm
sync with ChibiOS master for ASMXSRC
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/NRF51/OSHCHIP_V1.0/Makefile | 6 | ||||
| -rw-r--r-- | demos/NRF51/RT-WVSHARE_BLE400/Makefile | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/demos/NRF51/OSHCHIP_V1.0/Makefile b/demos/NRF51/OSHCHIP_V1.0/Makefile index 5462b48..6333de9 100644 --- a/demos/NRF51/OSHCHIP_V1.0/Makefile +++ b/demos/NRF51/OSHCHIP_V1.0/Makefile @@ -141,9 +141,11 @@ TCSRC = TCPPSRC =
# List ASM source files here
-ASMSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)
+ASMSRC =
+ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)
-INCDIR = $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
+INCDIR = $(CHIBIOS)/os/license \
+ $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
$(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
$(CHIBIOS)/os/various
diff --git a/demos/NRF51/RT-WVSHARE_BLE400/Makefile b/demos/NRF51/RT-WVSHARE_BLE400/Makefile index 1b4f545..d9d0e95 100644 --- a/demos/NRF51/RT-WVSHARE_BLE400/Makefile +++ b/demos/NRF51/RT-WVSHARE_BLE400/Makefile @@ -141,9 +141,11 @@ TCSRC = TCPPSRC =
# List ASM source files here
-ASMSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)
+ASMSRC =
+ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)
-INCDIR = $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
+INCDIR = $(CHIBIOS)/os/license \
+ $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
$(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
$(CHIBIOS)/os/various
|