Skip to content
Snippets Groups Projects
Unverified Commit 8060f552 authored by Kaspar Schleiser's avatar Kaspar Schleiser Committed by GitHub
Browse files

Merge pull request #8846 from cladmi/pr/make/default_goal

Makefile.include: FIX .DEFAULT_GOAL not being all
parents 39fec304 655186c9
No related branches found
No related tags found
No related merge requests found
# Globally set default goal to `all`
.DEFAULT_GOAL := all
# include Makefile.local if it exists # include Makefile.local if it exists
-include Makefile.local -include Makefile.local
...@@ -460,8 +463,7 @@ $(CURDIR)/eclipsesym.xml: ...@@ -460,8 +463,7 @@ $(CURDIR)/eclipsesym.xml:
# Export variables used throughout the whole make system: # Export variables used throughout the whole make system:
include $(RIOTMAKE)/vars.inc.mk include $(RIOTMAKE)/vars.inc.mk
# Include build targets for selected tools after the default RIOT targets have # Include build targets for selected tools
# been defined (-> so the `all` will be always the first target)
include $(RIOTMAKE)/tools/targets.inc.mk include $(RIOTMAKE)/tools/targets.inc.mk
# Warn if the selected board and drivers don't provide all needed features: # Warn if the selected board and drivers don't provide all needed features:
...@@ -590,4 +592,9 @@ CFLAGS += -include '$(RIOTBUILD_CONFIG_HEADER_C)' ...@@ -590,4 +592,9 @@ CFLAGS += -include '$(RIOTBUILD_CONFIG_HEADER_C)'
# include mcuboot support # include mcuboot support
include $(RIOTMAKE)/mcuboot.mk include $(RIOTMAKE)/mcuboot.mk
# Sanity check, 'all' should be the default goal
ifneq (all, $(.DEFAULT_GOAL))
$(error .DEFAULT_GOAL := $(.DEFAULT_GOAL))
endif
endif # BOARD=none endif # BOARD=none
...@@ -26,9 +26,6 @@ export OPENOCD_EXTRA_INIT ...@@ -26,9 +26,6 @@ export OPENOCD_EXTRA_INIT
.PHONY: flash .PHONY: flash
flash: $(RIOTCPU)/$(CPU)/dist/wdog-disable.bin flash: $(RIOTCPU)/$(CPU)/dist/wdog-disable.bin
# Reset the default goal.
.DEFAULT_GOAL :=
export OPENOCD_CONFIG ?= $(RIOTBOARD)/common/frdm/dist/old-openocd-$(CPU_FAMILY).cfg export OPENOCD_CONFIG ?= $(RIOTBOARD)/common/frdm/dist/old-openocd-$(CPU_FAMILY).cfg
endif endif
......
...@@ -61,9 +61,6 @@ export PRE_FLASH_CHECK_SCRIPT = $(RIOTCPU)/$(CPU)/dist/check-fcfield-elf.sh ...@@ -61,9 +61,6 @@ export PRE_FLASH_CHECK_SCRIPT = $(RIOTCPU)/$(CPU)/dist/check-fcfield-elf.sh
.PHONY: flash .PHONY: flash
flash: $(RIOTCPU)/$(CPU)/dist/wdog-disable.bin flash: $(RIOTCPU)/$(CPU)/dist/wdog-disable.bin
# Reset the default goal.
.DEFAULT_GOAL :=
# this board uses openocd # this board uses openocd
include $(RIOTMAKE)/tools/openocd.inc.mk include $(RIOTMAKE)/tools/openocd.inc.mk
......
...@@ -15,9 +15,6 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) ...@@ -15,9 +15,6 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*)))
.PHONY: flash .PHONY: flash
flash: $(RIOTCPU)/$(CPU)/dist/wdog-disable.bin flash: $(RIOTCPU)/$(CPU)/dist/wdog-disable.bin
# Reset the default goal.
.DEFAULT_GOAL :=
# We need special handling of the watchdog if we want to speed up the flash # We need special handling of the watchdog if we want to speed up the flash
# verification by using the MCU to compute the image checksum after flashing. # verification by using the MCU to compute the image checksum after flashing.
# wdog-disable.bin is a precompiled binary which will disable the watchdog and # wdog-disable.bin is a precompiled binary which will disable the watchdog and
......
...@@ -44,7 +44,4 @@ USEMODULE += periph_wdog ...@@ -44,7 +44,4 @@ USEMODULE += periph_wdog
$(RIOTCPU)/$(CPU)/dist/wdog-disable.bin: $(RIOTCPU)/$(CPU)/dist/wdog-disable.s $(RIOTCPU)/$(CPU)/dist/wdog-disable.bin: $(RIOTCPU)/$(CPU)/dist/wdog-disable.s
$(Q)$(MAKE) -C $(RIOTCPU)/$(CPU)/dist/ $(notdir $@) $(Q)$(MAKE) -C $(RIOTCPU)/$(CPU)/dist/ $(notdir $@)
# Reset the default goal to not make wdog-disable.bin the default target.
.DEFAULT_GOAL :=
include $(RIOTMAKE)/arch/cortexm.inc.mk include $(RIOTMAKE)/arch/cortexm.inc.mk
...@@ -87,6 +87,3 @@ else ...@@ -87,6 +87,3 @@ else
echo "No report found"; \ echo "No report found"; \
fi fi
endif endif
# Reset the default goal.
.DEFAULT_GOAL :=
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment