diff --git a/system/testcodes/bootloader/makefile b/system/testcodes/bootloader/makefile index e2d4b56536179f8a8593cea9931cfc644d9515cc..d672601c6a47efef0663124d7d3fda6a800c5302 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 $@