diff options
| author | Stephane D'Alu <sdalu@sdalu.com> | 2016-04-28 23:00:24 +0200 |
|---|---|---|
| committer | Stephane D'Alu <sdalu@sdalu.com> | 2016-04-28 23:00:24 +0200 |
| commit | 2789fb3cd85fe8b7cb67a77d6d676d8b84830de2 (patch) | |
| tree | a9faaf05e6ff2c054c8343d84acdabb5bab6a4a2 | |
| parent | 5c02f2370695ad93afda8fdeeea155fdc5e6493b (diff) | |
| download | ChibiOS-Contrib-2789fb3cd85fe8b7cb67a77d6d676d8b84830de2.tar.gz ChibiOS-Contrib-2789fb3cd85fe8b7cb67a77d6d676d8b84830de2.tar.bz2 ChibiOS-Contrib-2789fb3cd85fe8b7cb67a77d6d676d8b84830de2.zip | |
sync with ChibiOS master for ASMXSRC
| -rw-r--r-- | demos/NRF51/OSHCHIP_V1.0/Makefile | 6 | ||||
| -rw-r--r-- | demos/NRF51/RT-WVSHARE_BLE400/Makefile | 6 | ||||
| -rw-r--r-- | os/common/startup/ARMCMx/compilers/GCC/mk/startup_nrf51.mk | 2 |
3 files changed, 9 insertions, 5 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
diff --git a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_nrf51.mk b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_nrf51.mk index 81d53d9..f005ce0 100644 --- a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_nrf51.mk +++ b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_nrf51.mk @@ -2,7 +2,7 @@ STARTUPSRC = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/crt1.c \
$(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/vectors.c
-STARTUPASM = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/crt0_v6m.s
+STARTUPASM = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/crt0_v6m.S
STARTUPINC = $(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/devices/NRF51822 \
$(CHIBIOS)/os/common/ext/CMSIS/include
|