Browse Source

Makefile update

Kevin Lee 6 years ago
parent
commit
247becd36f
1 changed files with 9 additions and 12 deletions
  1. 9 12
      STM32L432KC_Template/CMSIS/Device/ST/STM32L4xx/Source/Makefile

+ 9 - 12
STM32L432KC_Template/CMSIS/Device/ST/STM32L4xx/Source/Makefile

@@ -1,8 +1,5 @@
 PROJECT=main
 
-# Selecting Core
-CORTEX_M=4
-
 # Use newlib-nano. To disable it, specify USE_NANO=
 USE_NANO=--specs=nano.specs
 
@@ -21,7 +18,7 @@ SIZE=arm-none-eabi-size
 OBJCOPY=arm-none-eabi-objcopy
 OBJDUMP=arm-none-eabi-objdump
 
-LDSCRIPTS=-L. -T STM32L432KCUx_FLASH.ld
+LDSCRIPT=STM32L432KCUx_FLASH.ld
 
 INCLUDES = \
 	-I../Include \
@@ -33,7 +30,7 @@ SOURCES = main.c \
 	startup_stm32l432xx.s \
 
 # Options for specific architecture
-ARCH_FLAGS=-mthumb -mcpu=cortex-m$(CORTEX_M)
+ARCH_FLAGS=-mthumb -mcpu=cortex-m4
 
 # -Os -flto -ffunction-sections -fdata-sections to compile for code size
 # CFLAGS=$(ARCH_FLAGS) $(INCLUDES) -Os -flto -ffunction-sections -fdata-sections
@@ -43,21 +40,21 @@ CFLAGS=$(ARCH_FLAGS) $(INCLUDES) -g -flto -ffunction-sections -fdata-sections
 # If not using semihosting/retarget:
 # LFLAGS=$(USE_NANO) $(USE_SEMIHOST) -nostartfiles -Wl,--gc-sections,-Map=$(PROJECT).map
 # Else:
-LFLAGS=$(USE_NANO) $(USE_SEMIHOST) -Wl,--gc-sections,-Map=$(PROJECT).map
+LFLAGS=$(USE_NANO) $(USE_SEMIHOST) -Wl,--gc-sections,-Map=$(PROJECT).map -T $(LDSCRIPT)
 
-all: $(PROJECT).bin $(PROJECT).dis $(PROJECT).axf
+all: $(PROJECT).bin $(PROJECT).dis $(PROJECT).elf
 
 # Build ELF w/ symbols
-$(PROJECT).axf: $(SOURCES)
-	$(CC) $^ $(CFLAGS) $(LFLAGS) $(LDSCRIPTS) -o $@
+$(PROJECT).elf: $(SOURCES)
+	$(CC) $^ $(CFLAGS) $(LFLAGS) -o $@
 
 # Generate binary to flash
-$(PROJECT).bin: $(PROJECT).axf
+$(PROJECT).bin: $(PROJECT).elf
 	$(OBJCOPY) -O binary $< $@
 
 # Export dissassembly of binary
-$(PROJECT).dis: $(PROJECT).axf	
+$(PROJECT).dis: $(PROJECT).elf	
 	$(OBJDUMP) -S -d -marm $< -Mforce-thumb > $@
 
 clean: 
-	rm -f *.axf *.bin *.map *.dis *.o
+	rm -f *.elf *.bin *.map *.dis *.o