diff --git a/Makefile b/Makefile index 23d222e..5ab69dc 100644 --- a/Makefile +++ b/Makefile @@ -74,13 +74,6 @@ else ifeq ($(BOARD),MAPLE_MINI) LDSCRIPT = $(OPENCM3_DIR)/lib/stm32/f1/stm32f103xb.ld endif -# verify if opencm3 has been downloaded -OPENCM3_DIR_EXISTS = $(shell [ -f $(LDSCRIPT) ] && echo 1 || echo 0 ) -ifeq ($(OPENCM3_DIR_EXISTS), 0) -$(info run "git submodule init" and "git submodule update" before runnig make) -$(error libopencm3 repository is not initialized) -endif - # device micro-controller and board DEFS += -DSTM32F1 -D$(BOARD) @@ -183,7 +176,7 @@ list: $(BINARY).list %.map %.list: %.elf $(Q)$(OBJDUMP) -S $(<) > $(@) -%.elf: $(LDSCRIPT) $(OPENCM3_LIB)/lib$(STM32F1_LIB).a $(OBJ) $(LIB_OBJ) +%.elf: $(OPENCM3_LIB)/lib$(STM32F1_LIB).a $(OBJ) $(LIB_OBJ) $(info linking $(@)) $(Q)$(LD) $(LDFLAGS) $(OBJ) $(LIB_OBJ) $(LDLIBS) -o $(@) $(Q)size $(@) @@ -213,6 +206,11 @@ $(OPENCM3_LIB)/lib$(STM32F1_LIB).a: $(info compiling libopencm3 library) $(Q)$(MAKE) -C $(OPENCM3_DIR) +# ensure opencm3 has been downloaded and compiled +$(LDSCRIPT): + git submodule init + git submodule update + flash: $(BINARY).hex $(info flashing $(<) using SWD) ifeq ($(SWD_ADAPTER),STLINKV2)