diff options
| author | Kévin Redon <kredon@sysmocom.de> | 2019-08-01 17:17:18 +0200 |
|---|---|---|
| committer | Kévin Redon <kredon@sysmocom.de> | 2019-08-01 17:23:23 +0200 |
| commit | d14970f95b26b791c787379fede2eb7e4781eb44 (patch) | |
| tree | dc0f25bdcf01567926573b6b397aa293a6c86a3f /firmware | |
| parent | b1a81c130e7a312daa12c79501c4ea8fc9a97476 (diff) | |
publish: also upload latest
the jenkins script will now upload the versioned output to the
all directory, and a copy named "latest" in the latest directory.
Change-Id: I70114ef8414779e369da5cbf945854c9ace3464e
Diffstat (limited to 'firmware')
| -rw-r--r-- | firmware/Makefile | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/firmware/Makefile b/firmware/Makefile index 646d2f3..a879297 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -44,8 +44,8 @@ MEMORIES ?= flash dfu # Output file basename APP ?= dfu -# Output directories -OUTPUT = $(BOARD)-$(APP)-$(GIT_VERSION) +# Output directories and filename +OUTPUT = $(BOARD)-$(APP) BIN = bin OBJ = obj/$(BOARD) @@ -129,8 +129,6 @@ ALLOW_PEER_ERASE?=0 # Optimization level, put in comment for debugging OPTIMIZATION ?= -Os - - # Flags INCLUDES_USB = -I$(AT91LIB)/usb/include -I$(AT91LIB) @@ -173,8 +171,7 @@ ASFLAGS = -mcpu=cortex-m3 -mthumb -Wall -g $(OPTIMIZATION) $(INCLUDES) -D$(CHIP) LDFLAGS = -mcpu=cortex-m3 -mthumb -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=ResetException -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align -Wl,--warn-unresolved-symbols $(LIB) #LD_OPTIONAL=-Wl,--print-gc-sections -Wl,--stats - -# Append OBJ and BIN directories to output filename +# Append BIN directories to output filename OUTPUT := $(BIN)/$(OUTPUT) #------------------------------------------------------------------------------- @@ -207,8 +204,12 @@ ASM_OBJECTS_$(1) = $(addprefix $(OBJ)/$(1)_, $(ASM_OBJECTS)) $(1): $$(ASM_OBJECTS_$(1)) $$(C_OBJECTS_$(1)) @$(CC) $(LDFLAGS) $(LD_OPTIONAL) -T"libboard/common/resources/$(CHIP)/$$@.ld" -Wl,-Map,$(OUTPUT)-$$@.map -o $(OUTPUT)-$$@.elf $$^ $(LIBS) + cp $(OUTPUT)-$$@.elf $(OUTPUT)-$$@-$(GIT_VERSION).elf + cp $(OUTPUT)-$$@.elf $(OUTPUT)-$$@-latest.elf @$(NM) $(OUTPUT)-$$@.elf >$(OUTPUT)-$$@.elf.txt @$(OBJCOPY) -O binary $(OUTPUT)-$$@.elf $(OUTPUT)-$$@.bin + cp $(OUTPUT)-$$@.bin $(OUTPUT)-$$@-$(GIT_VERSION).bin + cp $(OUTPUT)-$$@.bin $(OUTPUT)-$$@-latest.bin @$(SIZE) $$^ $(OUTPUT)-$$@.elf $$(C_OBJECTS_$(1)): $(OBJ)/$(1)_%.o: %.c Makefile $(OBJ) $(BIN) |