diff --git a/Makefile b/Makefile index 12d7078..e406618 100644 --- a/Makefile +++ b/Makefile @@ -1,16 +1,7 @@ -include Makefile.conf - .PHONY: all compile clean -all: run - -run: compile - $(OPENOCD) -s $(OPENOCD_SCRIPTS) -f board/$(OPENOCD_BOARD) \ - -c "tcl_port disabled" \ - -c "gdb_port disabled" \ - -c "program ./src/raw407cxx.elf" \ - -c reset \ - -c shutdown +all: compile + $(MAKE) -C src flash compile: $(MAKE) -C libs/cmsis diff --git a/src/Makefile b/src/Makefile index 7cbb549..aa275c8 100644 --- a/src/Makefile +++ b/src/Makefile @@ -32,7 +32,15 @@ CXX_OBJ=$(subst .cc,.o,$(CXX_SRC)) OBJ=$(C_OBJ) $(CXX_OBJ) -.PHONY: all clean +.PHONY: flash all clean + +flash: all + $(OPENOCD) -s $(OPENOCD_SCRIPTS) -f board/$(OPENOCD_BOARD) \ + -c "tcl_port disabled" \ + -c "gdb_port disabled" \ + -c "program $(TARGET_ELF)" \ + -c reset \ + -c shutdown all: $(TARGET_BIN) $(TARGET_HEX)