aboutsummaryrefslogtreecommitdiffstats
path: root/os/common
diff options
context:
space:
mode:
authorFabio Utzig <utzig@utzig.org>2016-04-24 18:10:31 -0300
committerFabio Utzig <utzig@utzig.org>2016-04-24 18:10:31 -0300
commita59c04c5cf26f4cd84ee86860ed1f9894cb0c2b3 (patch)
tree68081aa2fca3aa3ad2b615916f12c7b55bd6ccc0 /os/common
parent38acc79534b8a3c9268f637f47797c4a1328db9d (diff)
parent39e3a31d9438fe5a9f058c54747b737d53d7e86e (diff)
downloadChibiOS-Contrib-a59c04c5cf26f4cd84ee86860ed1f9894cb0c2b3.tar.gz
ChibiOS-Contrib-a59c04c5cf26f4cd84ee86860ed1f9894cb0c2b3.tar.bz2
ChibiOS-Contrib-a59c04c5cf26f4cd84ee86860ed1f9894cb0c2b3.zip
Merge pull request #60 from flabbergast/kinetis-mk
Update kinetis makefiles (license, asm, m0->m0plus, shell.mk).
Diffstat (limited to 'os/common')
-rw-r--r--os/common/startup/ARMCMx/compilers/GCC/mk/startup_k20x.mk2
-rw-r--r--os/common/startup/ARMCMx/compilers/GCC/mk/startup_kl2x.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_k20x.mk b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_k20x.mk
index 410e607..0c2ec7d 100644
--- a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_k20x.mk
+++ b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_k20x.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_v7m.s
+STARTUPASM = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/crt0_v7m.S
STARTUPINC = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC \
$(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/devices/K20x \
diff --git a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_kl2x.mk b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_kl2x.mk
index ada23f6..ca67f10 100644
--- a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_kl2x.mk
+++ b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_kl2x.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)/os/common/startup/ARMCMx/compilers/GCC \
$(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/devices/KL2x \