diff options
| author | Damien George | 2014-05-03 17:46:45 +0100 |
|---|---|---|
| committer | Damien George | 2014-05-03 17:46:45 +0100 |
| commit | aad1204b8ed77a1466f03d848aa1c32dfff1dc24 (patch) | |
| tree | 169befa6d664849d8ef35aba4f83426a38722e81 /stmhal/Makefile | |
| parent | 51315614e1998b837079a1b256d0ca38220d619d (diff) | |
stmhal: Change names: flash to firmware, flashboard to deploy.
Since firmware lives in a build directory which already specifies the
board name, no real reason to also have the firmware have the board
name.
Diffstat (limited to 'stmhal/Makefile')
| -rw-r--r-- | stmhal/Makefile | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/stmhal/Makefile b/stmhal/Makefile index 26f15cfcd..4cd33b958 100644 --- a/stmhal/Makefile +++ b/stmhal/Makefile @@ -195,25 +195,21 @@ OBJ += $(addprefix $(BUILD)/, $(SRC_FATFS:.c=.o)) OBJ += $(addprefix $(BUILD)/, $(SRC_CC3K:.c=.o)) OBJ += $(BUILD)/pins_$(BOARD).o -all: $(BUILD)/flash.dfu +all: $(BUILD)/firmware.dfu -.PHONY: flashboard +.PHONY: deploy -flashboard: $(BUILD)/flash.dfu +deploy: $(BUILD)/firmware.dfu $(ECHO) "Writing $< to the board" $(Q)$(DFU_UTIL) -a 0 -D $< -$(BUILD)/flash.dfu: $(BUILD)/flash0.bin $(BUILD)/flash1.bin +$(BUILD)/firmware.dfu: $(BUILD)/firmware.elf $(ECHO) "Create $@" - $(Q)$(PYTHON) $(DFU) -b 0x08000000:$(BUILD)/flash0.bin -b 0x08020000:$(BUILD)/flash1.bin $@ + $(Q)$(OBJCOPY) -O binary -j .isr_vector $^ $(BUILD)/firmware0.bin + $(Q)$(OBJCOPY) -O binary -j .text -j .data $^ $(BUILD)/firmware1.bin + $(Q)$(PYTHON) $(DFU) -b 0x08000000:$(BUILD)/firmware0.bin -b 0x08020000:$(BUILD)/firmware1.bin $@ -$(BUILD)/flash0.bin: $(BUILD)/flash.elf - $(Q)$(OBJCOPY) -O binary -j .isr_vector $^ $@ - -$(BUILD)/flash1.bin: $(BUILD)/flash.elf - $(Q)$(OBJCOPY) -O binary -j .text -j .data $^ $@ - -$(BUILD)/flash.elf: $(OBJ) +$(BUILD)/firmware.elf: $(OBJ) $(ECHO) "LINK $@" $(Q)$(LD) $(LDFLAGS) -o $@ $(OBJ) $(LIBS) $(Q)$(SIZE) $@ |