From 9e611e4a33a4004819619789883e9b835dc27dd6 Mon Sep 17 00:00:00 2001
From: dam1n19 <dam1n19@soton.ac.uk>
Date: Tue, 2 May 2023 12:49:35 +0100
Subject: [PATCH] SOC1-167: ASM_TOOL option to bootrom

---
 system/testcodes/bootloader/makefile | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/system/testcodes/bootloader/makefile b/system/testcodes/bootloader/makefile
index e2d4b56..d672601 100644
--- a/system/testcodes/bootloader/makefile
+++ b/system/testcodes/bootloader/makefile
@@ -129,10 +129,12 @@ COMPILE_MICROLIB = 0
 COMPILE_SMALLMUL = 0
 
 ifeq ($(TOOL_CHAIN),ds6)
-  CC_TOOL = armclang
+  CC_TOOL   = armclang
+  ASM_TOOL = armclang -masm=armasm
   ARM_CC_TARGET = --target=arm-$(TARGET)
 else
-  CC_TOOL = armcc
+  CC_TOOL   = armcc
+  ASM_TOOL = armasm
   ARM_CC_TARGET = -Otime
 endif
 
@@ -193,7 +195,7 @@ $(SYSTEM_FILE).o : $(DEVICE_DIR)/Source/$(SYSTEM_FILE).c $(DEPS_LIST)
 	$(CC_TOOL) $(ARM_CC_OPTIONS) $(CPU_TYPE) $< -o  $@
 
 $(STARTUP_FILE).o : $(STARTUP_DIR)/$(STARTUP_FILE).s $(DEPS_LIST)
-	armasm $(ARM_ASM_OPTIONS) $(CPU_TYPE) $< -o  $@
+	$(ASM_TOOL) $(ARM_ASM_OPTIONS) $(CPU_TYPE) $< -o  $@
 
 $(BOOTLOADER).ELF : $(BOOTLOADER).o $(SYSTEM_FILE).o $(STARTUP_FILE).o $(DEPS_LIST)
 	armlink $(ARM_LINK_OPTIONS) $(BOOTLOADER).o $(SYSTEM_FILE).o  $(STARTUP_FILE).o -o $@
-- 
GitLab