diff --git a/Makefile b/Makefile index 005ed73d2..7f645a3d3 100644 --- a/Makefile +++ b/Makefile @@ -30,11 +30,7 @@ CXXFLAGS = -std=c++11 -fno-exceptions -fno-rtti -fno-threadsafe-statics products := -ifeq ($(VERBOSE),1) -default: info clean app_size app_memory_map -else default: app.$(EXE) -endif run: app_run .PHONY: info @@ -92,23 +88,6 @@ $(all_objs): $(generated_headers) @echo "LD $@" @$(LD) $^ $(LDFLAGS) -o $@ -.PHONY: %_size -%_size: %.$(EXE) - @echo "========= BUILD OUTPUT ========" - @echo "File: $<" - @$(SIZE) $< | tail -n 1 | awk '{print "Code: " $$1 " bytes";print "Data: " $$2 " bytes"; print "Total: " int(($$1+$$2)/1024) " kB (" $$1 + $$2 " bytes)";}' - @echo "===============================" - -ifdef OBJCOPY -products += $(products:.$(EXE)=.hex) $(products:.$(EXE)=.bin) -%.hex: %.$(EXE) - @echo "OBJCOPY $@" - @$(OBJCOPY) -O ihex $< $@ -%.bin: %.$(EXE) - @echo "OBJCOPY $@" - @$(OBJCOPY) -O binary $< $@ -endif - %.o: %.c @echo "CC $@" @$(CC) $(SFLAGS) $(CFLAGS) -c $< -o $@ diff --git a/build/platform.device.mak b/build/platform.device.mak index 9ad27edfc..cb157bc63 100644 --- a/build/platform.device.mak +++ b/build/platform.device.mak @@ -4,15 +4,3 @@ EXE = elf python/port/port.o: CXXFLAGS += -DMP_PORT_USE_STACK_SYMBOLS=1 -.PHONY: %_run -%_run: %.$(EXE) - $(GDB) -x gdb_script.gdb $< - -.PHONY: %_flash -%_flash: %.bin - @echo "DFU $@" - @echo "INFO About to flash your device. Please plug your device to your computer" - @echo " using an USB cable and press the RESET button the back of your device." - @until dfu-util -l | grep "Internal Flash" > /dev/null 2>&1; do sleep 1;done - @echo "DFU $@" - @dfu-util -i 0 -a 0 -s 0x08000000:leave -D $< diff --git a/build/targets.device.mak b/build/targets.device.mak new file mode 100644 index 000000000..90108de38 --- /dev/null +++ b/build/targets.device.mak @@ -0,0 +1,29 @@ +products += $(products:.$(EXE)=.hex) $(products:.$(EXE)=.bin) + +%.hex: %.$(EXE) + @echo "OBJCOPY $@" + @$(OBJCOPY) -O ihex $< $@ + +%.bin: %.$(EXE) + @echo "OBJCOPY $@" + @$(OBJCOPY) -O binary $< $@ + +.PHONY: %_size +%_size: %.$(EXE) + @echo "========= BUILD OUTPUT ========" + @echo "File: $<" + @$(SIZE) $< | tail -n 1 | awk '{print "Code: " $$1 " bytes";print "Data: " $$2 " bytes"; print "Total: " int(($$1+$$2)/1024) " kB (" $$1 + $$2 " bytes)";}' + @echo "===============================" + +.PHONY: %_run +%_run: %.$(EXE) + $(GDB) -x gdb_script.gdb $< + +.PHONY: %_flash +%_flash: %.bin + @echo "DFU $@" + @echo "INFO About to flash your device. Please plug your device to your computer" + @echo " using an USB cable and press the RESET button the back of your device." + @until dfu-util -l | grep "Internal Flash" > /dev/null 2>&1; do sleep 1;done + @echo "DFU $@" + @dfu-util -i 0 -a 0 -s 0x08000000:leave -D $<