aboutsummaryrefslogtreecommitdiff
path: root/arch/src/Makefile
diff options
context:
space:
mode:
authorChris Kay <chris.kay@arm.com>2018-06-19 14:06:57 +0100
committerronald-cron-arm <39518861+ronald-cron-arm@users.noreply.github.com>2018-09-17 11:30:58 +0100
commit6984683d086f422b9c0b3a5ee72d4f3d06628a76 (patch)
tree8305206dd0110fe5153e1cd564265bca8a9a72ff /arch/src/Makefile
parent8f40dea9a22013569f7374893153bce5daf94c39 (diff)
bs: Add support for Arm Compiler 6
Change-Id: Ib5a9f055b147433a55bbd09be69ae86e6dbf62f9 Signed-off-by: Chris Kay <chris.kay@arm.com>
Diffstat (limited to 'arch/src/Makefile')
-rw-r--r--arch/src/Makefile9
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/src/Makefile b/arch/src/Makefile
index 7e620049..c766542e 100644
--- a/arch/src/Makefile
+++ b/arch/src/Makefile
@@ -6,15 +6,22 @@
#
include $(BS_DIR)/cpu.mk
+include $(BS_DIR)/toolchain.mk
BS_LIB_NAME = arch
BS_LIB_SOURCES_armv7-m += armv7-m/exception.S
-BS_LIB_SOURCES_armv7-m += armv7-m/reset.S
+BS_LIB_SOURCES_armv7-m += armv7-m/config.S
BS_LIB_SOURCES_armv7-m += arm_nvic.c
BS_LIB_SOURCES_armv7-m += arm_main.c
BS_LIB_SOURCES_armv7-m += arm_mm.c
+ifeq ($(BS_LINKER),ARM)
+ BS_LIB_SOURCES_armv7-m += armv7-m/reset_arm.S
+else
+ BS_LIB_SOURCES_armv7-m += armv7-m/reset_newlib.S
+endif
+
BS_LIB_INCLUDES_armv7-m += $(TOP_DIR)/cmsis/CMSIS/Core/Include/
BS_LIB_SOURCES_host += host.c