1
0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-26 23:11:19 +01:00

Merge pull request #1724 from LudwigOrtmann/flash-all

make: remove dependency from flash to all
This commit is contained in:
Hinnerk van Bruinehsen 2014-10-31 11:08:55 +01:00
commit 1cc71e81f8
2 changed files with 11 additions and 2 deletions

View File

@ -178,7 +178,16 @@ distclean:
-@for i in $(USEPKG) ; do "$(MAKE)" -C $(RIOTBASE)/pkg/$$i distclean ; done
-@rm -rf $(BINDIRBASE)
flash: all
flash: $(filter all all-%, $(MAKECMDGOALS))
@if [ ! -f $${HEXFILE} ]; then \
echo ""; \
echo ""; \
echo "You need to create a hex file before you can flash it."; \
echo "Unless you know otherwise, 'make all' usually does what you want."; \
echo ""; \
echo ""; \
exit 1; \
fi
$(FLASHER) $(FFLAGS)
term:

View File

@ -16,7 +16,7 @@ export AR ?= $(PREFIX)ar
export AS ?= $(PREFIX)as
export LINK ?= $(PREFIX)gcc
export SIZE ?= $(PREFIX)size
export OBJCOPY = true
export OBJCOPY = $(PREFIX)objcopy
export DEBUGGER = gdb
export TERMPROG = $(ELF)