SOC1-167: Update Arm CC Target

system/testcodes/bootloader/makefile

@@ -42,6 +42,7 @@
 #  - CORTEX_M0PLUS
 CPU_PRODUCT = CORTEX_M0
 
+TARGET = arm-none-eabi
 # Shared software directory
 SOFTWARE_DIR = $(NANOSOC_TECH_DIR)/software
 CMSIS_DIR    = $(SOFTWARE_DIR)/cmsis
@@ -79,6 +80,14 @@ ifeq ($(TOOL_CHAIN),ds5)
   endif
 endif
 
+ifeq ($(TOOL_CHAIN),ds6)
+  ifeq ($(CPU_PRODUCT),CORTEX_M0PLUS)
+    CPU_TYPE        = -mcpu=Cortex-M0plus
+  else
+    CPU_TYPE        = -mcpu=Cortex-M0
+  endif
+endif
+
 ifeq ($(TOOL_CHAIN),gcc)
   ifeq ($(CPU_PRODUCT),CORTEX_M0PLUS)
     CPU_TYPE        = -mcpu=cortex-m0plus
@@ -93,6 +102,10 @@ ifeq ($(TOOL_CHAIN),ds5)
  STARTUP_DIR  = $(DEVICE_DIR)/Source/ARM
 endif
 
+ifeq ($(TOOL_CHAIN),ds6)
+ STARTUP_DIR  = $(DEVICE_DIR)/Source/ARM
+endif
+
 # Startup code directory for gcc
 ifeq ($(TOOL_CHAIN),gcc)
  STARTUP_DIR  = $(DEVICE_DIR)/Source/GCC
@@ -115,7 +128,14 @@ COMPILE_MICROLIB = 0
 # Small Multiply (Cortex-M0/M0+ has small multiplier option)
 COMPILE_SMALLMUL = 0
 
-ARM_CC_OPTIONS   = -c -O3 -g -Otime -I $(DEVICE_DIR)/Include -I $(CORE_DIR) $(USER_DEFINE)
+ifeq ($(TOOL_CHAIN),ds6)
+  ARM_CC_TARGET = --target=arm-$(TARGET)
+else
+  ARM_CC_TARGET = -Otime
+endif
+
+ARM_CC_OPTIONS   = $(ARM_CC_TARGET) -c -O3 -g -I $(DEVICE_DIR)/Include -I $(CORE_DIR) $(USER_DEFINE)
+
 ARM_ASM_OPTIONS  = -g
 ARM_LINK_OPTIONS = "--keep=$(STARTUP_FILE).o(RESET)" "--first=$(STARTUP_FILE).o(RESET)" \
 		--rw_base 0x30000000 --ro_base 0x10000000 --map
@@ -142,9 +162,9 @@ endif
 # ---------------------------------------------------------------------------------------
 # gcc options
 
-GNG_CC      = arm-none-eabi-gcc
-GNU_OBJDUMP = arm-none-eabi-objdump
-GNU_OBJCOPY = arm-none-eabi-objcopy
+GNG_CC      = $(TARGET)-gcc
+GNU_OBJDUMP = $(TARGET)-objdump
+GNU_OBJCOPY = $(TARGET)-objcopy
 
 LINKER_SCRIPT_PATH = $(SOFTWARE_DIR)/common/scripts
 LINKER_SCRIPT = $(LINKER_SCRIPT_PATH)/cmsdk_bootloader.ld