From 3761870544bf818d4f06720092cf2f7b34c29e4b Mon Sep 17 00:00:00 2001 From: Andrew Tridgell <andrew@tridgell.net> Date: Thu, 8 Jan 2015 13:42:06 +1100 Subject: [PATCH] build: update to build rules from master --- mk/board_avr.mk | 3 +++ mk/board_flymaple.mk | 3 +++ mk/board_native.mk | 3 +++ 3 files changed, 9 insertions(+) diff --git a/mk/board_avr.mk b/mk/board_avr.mk index f1d235708..e3cba572d 100644 --- a/mk/board_avr.mk +++ b/mk/board_avr.mk @@ -124,6 +124,7 @@ endif # The ELF file SKETCHELF = $(BUILDROOT)/$(SKETCH).elf +BUILDELF = $(notdir $(SKETCHELF)) # HEX file SKETCHHEX = $(BUILDROOT)/$(SKETCH).hex @@ -174,6 +175,8 @@ jtag-program: $(SKETCHELF): $(SKETCHOBJS) $(LIBOBJS) $(RULEHDR) $(v)$(LD) $(LDFLAGS) -o $@ $^ $(LIBS) + $(v)cp $(SKETCHELF) $(BUILDELF) + @echo "Firmware is in $(BUILDELF)" # Create the hex file $(SKETCHHEX): $(SKETCHELF) diff --git a/mk/board_flymaple.mk b/mk/board_flymaple.mk index e1c3cd488..2eb068e2a 100644 --- a/mk/board_flymaple.mk +++ b/mk/board_flymaple.mk @@ -102,6 +102,7 @@ LIBOBJS := $(SKETCHLIBOBJS) $(COREOBJS) # The ELF file SKETCHELF = $(BUILDROOT)/$(SKETCH).elf +BUILDELF = $(notdir $(SKETCHELF)) # HEX file SKETCHHEX = $(BUILDROOT)/$(SKETCH).hex @@ -157,6 +158,8 @@ jtag-program: $(SKETCHELF): $(SKETCHOBJS) $(LIBOBJS) $(RULEHDR) $(v)$(LD) $(LDFLAGS) -o $@ $^ $(LIBS) + $(v)cp $(SKETCHELF) . + @echo "Firmware is in $(BUILDELF)" # Create the hex file $(SKETCHHEX): $(SKETCHELF) diff --git a/mk/board_native.mk b/mk/board_native.mk index 9f16057eb..9407f798e 100644 --- a/mk/board_native.mk +++ b/mk/board_native.mk @@ -58,6 +58,7 @@ LIBOBJS := $(SKETCHLIBOBJS) # The ELF file SKETCHELF = $(BUILDROOT)/$(SKETCH).elf +BUILDELF = $(notdir $(SKETCHELF)) # HEX file SKETCHHEX = $(BUILDROOT)/$(SKETCH).hex @@ -95,6 +96,8 @@ $(SKETCHELF): $(SKETCHOBJS) $(LIBOBJS) @echo "Building $(SKETCHELF)" $(RULEHDR) $(v)$(LD) $(LDFLAGS) -o $@ $^ $(LIBS) + $(v)cp $(SKETCHELF) . + @echo "Firmware is in $(BUILDELF)" # # Build sketch objects -- GitLab