aboutsummaryrefslogtreecommitdiffstats
path: root/demos/KINETIS/RT-MCHCK-K20-SPI/Makefile
diff options
context:
space:
mode:
authorflabbergast <s3+flabbergast@sdfeu.org>2016-03-22 20:14:43 +0000
committerflabbergast <s3+flabbergast@sdfeu.org>2016-03-22 20:15:49 +0000
commitac8960f1a83ea19645ca969e6c525defd8f47ff7 (patch)
tree68d5d030873c2d054549f9c7871bf934d4595d7a /demos/KINETIS/RT-MCHCK-K20-SPI/Makefile
parentad63d7978057b70eacff2fe8617198bf4aedc3b6 (diff)
downloadChibiOS-Contrib-ac8960f1a83ea19645ca969e6c525defd8f47ff7.tar.gz
ChibiOS-Contrib-ac8960f1a83ea19645ca969e6c525defd8f47ff7.tar.bz2
ChibiOS-Contrib-ac8960f1a83ea19645ca969e6c525defd8f47ff7.zip
[KINETIS] Update demos (for HAL changes).
Diffstat (limited to 'demos/KINETIS/RT-MCHCK-K20-SPI/Makefile')
-rw-r--r--demos/KINETIS/RT-MCHCK-K20-SPI/Makefile9
1 files changed, 6 insertions, 3 deletions
diff --git a/demos/KINETIS/RT-MCHCK-K20-SPI/Makefile b/demos/KINETIS/RT-MCHCK-K20-SPI/Makefile
index 34796ce..e38ba95 100644
--- a/demos/KINETIS/RT-MCHCK-K20-SPI/Makefile
+++ b/demos/KINETIS/RT-MCHCK-K20-SPI/Makefile
@@ -89,7 +89,7 @@ PROJECT = ch
CHIBIOS = ../../../../ChibiOS-RT
CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
# Startup files.
-include $(CHIBIOS_CONTRIB)/os/common/ports/ARMCMx/compilers/GCC/mk/startup_k20x.mk
+include $(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_k20x5.mk
# HAL-OSAL files (optional).
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS_CONTRIB)/os/hal/ports/KINETIS/K20x/platform.mk
@@ -102,7 +102,8 @@ include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
include $(CHIBIOS)/test/rt/test.mk
# Define linker script file here
-LDSCRIPT= $(STARTUPLD)/MK20DX128.ld
+# Use BLDR4 for a 4k bootloader, BLDR3 for a 3k bootloader
+LDSCRIPT= $(STARTUPLD)/MK20DX128BLDR4.ld
# C sources that can be compiled in ARM or THUMB mode depending on the global
# setting.
@@ -196,7 +197,9 @@ CPPWARN = -Wall -Wextra -Wundef
#
# List all user C define here, like -D_DEBUG=1
-UDEFS =
+# VTOR moved to after the bootloader; use 0x1000 for a 4k bootloader,
+# 0xc00 for a 3k bootloader
+UDEFS = -DCORTEX_VTOR_INIT=0x00001000
# Define ASM defines here
UADEFS =