aboutsummaryrefslogtreecommitdiffstats
path: root/os
diff options
context:
space:
mode:
authorFabio Utzig <utzig@utzig.org>2016-04-28 18:36:42 -0300
committerFabio Utzig <utzig@utzig.org>2016-04-28 18:36:42 -0300
commit0625a978f75dc589d306f20c4d1ef755938c3cbc (patch)
treea9faaf05e6ff2c054c8343d84acdabb5bab6a4a2 /os
parent5c02f2370695ad93afda8fdeeea155fdc5e6493b (diff)
parent2789fb3cd85fe8b7cb67a77d6d676d8b84830de2 (diff)
downloadChibiOS-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 'os')
-rw-r--r--os/common/startup/ARMCMx/compilers/GCC/mk/startup_nrf51.mk2
1 files changed, 1 insertions, 1 deletions
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