Fix bug when calling directly recovery Makefile
This commit is contained in:
2 files changed
+14
-2
No files matched your search
@@ -16,11 +16,11 @@
|
|||||||
# Default platform if no platform specified
|
# Default platform if no platform specified
|
||||||
PLATFORM?=PM3RDV4
|
PLATFORM?=PM3RDV4
|
||||||
|
|
||||||
# Standalone Mode info (path depends if make is called at top or from armsrc)
|
# Standalone Mode info (path depends if make is called at top, from armsrc, or from a sibling dir like recovery/bootrom)
|
||||||
# Guard Makefile.hal against implicit rules: (with % to avoid being first goal)
|
# Guard Makefile.hal against implicit rules: (with % to avoid being first goal)
|
||||||
%/Makefile.hal: ;
|
%/Makefile.hal: ;
|
||||||
-include armsrc/Standalone/Makefile.hal
|
-include armsrc/Standalone/Makefile.hal
|
||||||
-include Standalone/Makefile.hal
|
-include ../armsrc/Standalone/Makefile.hal
|
||||||
ifndef DEFAULT_STANDALONE
|
ifndef DEFAULT_STANDALONE
|
||||||
$(error Could not find armsrc/Standalone/Makefile.hal)
|
$(error Could not find armsrc/Standalone/Makefile.hal)
|
||||||
endif
|
endif
|
||||||
|
|||||||
@@ -1,3 +1,15 @@
|
|||||||
|
|
||||||
|
# This Makefile might have been called directly, not via the root Makefile, so:
|
||||||
|
ifeq ($(PLTNAME),)
|
||||||
|
PLATFORM_FILE ?= ../Makefile.platform
|
||||||
|
-include $(PLATFORM_FILE)
|
||||||
|
-include ../.Makefile.options.cache
|
||||||
|
include ../common_arm/Makefile.hal
|
||||||
|
ifeq ($(PLATFORM_CHANGED), true)
|
||||||
|
$(error platform definitions have been changed, please "make clean" at the root of the project)
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
include ../common_arm/Makefile.common
|
include ../common_arm/Makefile.common
|
||||||
|
|
||||||
INSTALLFW = recovery.bin
|
INSTALLFW = recovery.bin
|
||||||
|
|||||||
Reference in new issue
Block a user