mirror of
https://github.com/RIOT-OS/RIOT.git
synced 2025-12-26 23:11:19 +01:00
Merge pull request #8846 from cladmi/pr/make/default_goal
Makefile.include: FIX .DEFAULT_GOAL not being all
This commit is contained in:
commit
8060f55227
@ -1,3 +1,6 @@
|
||||
# Globally set default goal to `all`
|
||||
.DEFAULT_GOAL := all
|
||||
|
||||
# include Makefile.local if it exists
|
||||
-include Makefile.local
|
||||
|
||||
@ -460,8 +463,7 @@ $(CURDIR)/eclipsesym.xml:
|
||||
# Export variables used throughout the whole make system:
|
||||
include $(RIOTMAKE)/vars.inc.mk
|
||||
|
||||
# Include build targets for selected tools after the default RIOT targets have
|
||||
# been defined (-> so the `all` will be always the first target)
|
||||
# Include build targets for selected tools
|
||||
include $(RIOTMAKE)/tools/targets.inc.mk
|
||||
|
||||
# Warn if the selected board and drivers don't provide all needed features:
|
||||
@ -590,4 +592,9 @@ CFLAGS += -include '$(RIOTBUILD_CONFIG_HEADER_C)'
|
||||
|
||||
# include mcuboot support
|
||||
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
|
||||
|
||||
@ -26,9 +26,6 @@ export OPENOCD_EXTRA_INIT
|
||||
.PHONY: flash
|
||||
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
|
||||
endif
|
||||
|
||||
|
||||
@ -61,9 +61,6 @@ export PRE_FLASH_CHECK_SCRIPT = $(RIOTCPU)/$(CPU)/dist/check-fcfield-elf.sh
|
||||
.PHONY: flash
|
||||
flash: $(RIOTCPU)/$(CPU)/dist/wdog-disable.bin
|
||||
|
||||
# Reset the default goal.
|
||||
.DEFAULT_GOAL :=
|
||||
|
||||
# this board uses openocd
|
||||
include $(RIOTMAKE)/tools/openocd.inc.mk
|
||||
|
||||
|
||||
@ -15,9 +15,6 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*)))
|
||||
.PHONY: flash
|
||||
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
|
||||
# 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
|
||||
|
||||
@ -44,7 +44,4 @@ USEMODULE += periph_wdog
|
||||
$(RIOTCPU)/$(CPU)/dist/wdog-disable.bin: $(RIOTCPU)/$(CPU)/dist/wdog-disable.s
|
||||
$(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
|
||||
|
||||
@ -87,6 +87,3 @@ else
|
||||
echo "No report found"; \
|
||||
fi
|
||||
endif
|
||||
|
||||
# Reset the default goal.
|
||||
.DEFAULT_GOAL :=
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user