Skip to content

Commit

Permalink
update Makefile
Browse files Browse the repository at this point in the history
  • Loading branch information
Xuxingliang committed Nov 11, 2018
1 parent 0bf34da commit 666daba
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 31 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,7 @@
DebugConfig/
RTE/
OUT/
*.hex
*.bin
*.elf
*.list
2 changes: 2 additions & 0 deletions .vscode/c_cpp_properties.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
{
"name": "Win32",
"includePath": [
"C:\\Users\\xxl\\AppData\\Local\\Arduino15\\packages\\esp8266\\tools\\**",
"C:\\Users\\xxl\\AppData\\Local\\Arduino15\\packages\\esp8266\\hardware\\esp8266\\2.4.2\\**",
"${workspaceFolder}/**"
],
"defines": [
Expand Down
14 changes: 5 additions & 9 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,12 @@
"version": "0.2.0",
"configurations": [
{
"type": "cortex-debug",
"request": "launch",
"servertype": "jlink",
"cwd": "${workspaceRoot}",
"executable": "${workspaceRoot}/src/ad5791ref_stm32f030.elf",
"name": "Debug (J-Link)",
"device": "STM32F103RB",
"interface": "swd",
"ipAddress": null,
"serialNumber": null,
"executable": "${workspaceRoot}/src/ad5791ref.elf",
"name": "Debug Microcontroller",
"request": "launch",
"type": "cortex-debug",
"servertype": "stutil"
}
]
}
4 changes: 3 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
"ad5791.h": "c",
"stm32f0xx.h": "c",
"stm32f0xx_rcc.h": "c",
"uart.h": "c"
"uart.h": "c",
"xshell.h": "c",
"xprintf.h": "c"
},
}
31 changes: 10 additions & 21 deletions src/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#STM32 makefile template
PROJECT = ad5791ref_stm32f030
PROJECT = ad5791ref

CPU_FLAG = -mthumb -mcpu=cortex-m0 -march=armv6-m -mfloat-abi=soft
LDSCRIPT := ./STM32F030F4.ld
Expand All @@ -11,15 +11,6 @@ SOURCE += $(wildcard ../stm32f0xxlib/STM32F0xx_StdPeriph_Driver/src/*.c)

SOURCE_ASM := ../src/startup_stm32f030.s

TARGET := $(PROJECT)
TARGET_ELF := $(TARGET).elf
TARGET_BIN := $(TARGET).bin
TARGET_HEX := $(TARGET).hex
OBJCPFLAGS_ELF_TO_BIN = -Obinary
OBJCPFLAGS_ELF_TO_HEX = -O ihex
OBJCPFLAGS_BIN_TO_HEX = -Ibinary -Oihex
OBJCPFLAGS_HEX_TO_BIN = -Iihex -Obinary

INC_DIR := -I./
INC_DIR += -I../src
INC_DIR += -I../stm32f0xxlib/CMSIS/Include
Expand All @@ -39,7 +30,7 @@ OBJDUMP = arm-none-eabi-objdump
CCFLAGS := -D STM32F030 -D USE_STDPERIPH_DRIVER
CCFLAGS += $(CPU_FLAG) -Wall -g '-std=gnu99' -O2 -fno-common
CCFLAGS += $(INC_DIR)
ASFLAGS += $(CPU_FLAG) -Wall
ASFLAGS += $(CPU_FLAG) #-Wall

LDFLAGS := -T $(LDSCRIPT) -nostartfiles -Wl,--gc-sections
LDFLAGS += $(CPU_FLAG) -Xlinker -Map=$(PROJECT).map
Expand All @@ -50,19 +41,19 @@ ASM_OBJS := $(SOURCE_ASM:%.s=%.o)
COMPILE = $(CC) $(CCFLAGS) -c $< -o $@
ASSEMBLE = $(AS) $(ASFLAGS) -c $< -o $@
LINK = $(LD) $+ $(LDFLAGS) $(LDLIBS) -o $@
ELF_TO_BIN = $(OBJCP) $(OBJCPFLAGS_ELF_TO_BIN) $< $@
ELF_TO_HEX = $(OBJCP) $(OBJCPFLAGS_ELF_TO_HEX) $< $@

.PHONY: all clean printf

all: $(TARGET_ELF)
all: $(PROJECT).bin
@echo "build done"

$(TARGET_ELF): $(C_OBJS) $(ASM_OBJS)
$(PROJECT).bin: $(PROJECT).elf
$(OBJDUMP) -S $(PROJECT).elf > $(PROJECT).list
$(OBJCP) -Oihex $(PROJECT).elf $(PROJECT).hex
$(OBJCP) -Obinary $(PROJECT).elf $(PROJECT).bin

$(PROJECT).elf: $(C_OBJS) $(ASM_OBJS)
$(LINK)
$(ELF_TO_HEX)
$(ELF_TO_BIN)
$(OBJDUMP) -S $(TARGET_ELF) > $(PROJECT).list

$(C_OBJS):%.o:%.c
$(COMPILE)
Expand All @@ -71,10 +62,8 @@ $(ASM_OBJS):%.o:%.s
$(ASSEMBLE)

clean:
rm -f $(TARGET_HEX)
rm -f $(TARGET_BIN)
rm -f $(TARGET_ELF)
rm -f $(C_OBJS) $(ASM_OBJS)
rm -f $(PROJECT).list $(PROJECT).map $(PROJECT).elf $(PROJECT).hex $(PROJECT).bin
@echo "clean done"

flash: $(TARGET_BIN)
Expand Down

0 comments on commit 666daba

Please sign in to comment.