Change PLATFORM_ROOT to TF_PLATFORM_ROOT
Since we use "?=" to set PLATFORM_ROOT, it is better to change the name to be more special, or else it may be overridden by some environment variables, such as in some CI build environments. Signed-off-by: Heyi Guo <heyi.guo@linaro.org>
This commit is contained in:
parent
c37be00b16
commit
7d9ee7e380
|
@ -15,14 +15,14 @@ ifndef PLAT_HELPERS_MK
|
||||||
$(error "Error: Unknown platform. Please use PLAT=<platform name> to specify the platform")
|
$(error "Error: Unknown platform. Please use PLAT=<platform name> to specify the platform")
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# PLATFORM_ROOT can be overridden for when building tools directly
|
# TF_PLATFORM_ROOT can be overridden for when building tools directly
|
||||||
PLATFORM_ROOT ?= plat/
|
TF_PLATFORM_ROOT ?= plat/
|
||||||
PLAT_MAKEFILE := platform.mk
|
PLAT_MAKEFILE := platform.mk
|
||||||
|
|
||||||
# Generate the platforms list by recursively searching for all directories
|
# Generate the platforms list by recursively searching for all directories
|
||||||
# under /plat containing a PLAT_MAKEFILE. Append each platform with a `|`
|
# under /plat containing a PLAT_MAKEFILE. Append each platform with a `|`
|
||||||
# char and strip out the final '|'.
|
# char and strip out the final '|'.
|
||||||
ALL_PLATFORM_MK_FILES := $(call rwildcard,${PLATFORM_ROOT},${PLAT_MAKEFILE})
|
ALL_PLATFORM_MK_FILES := $(call rwildcard,${TF_PLATFORM_ROOT},${PLAT_MAKEFILE})
|
||||||
ALL_PLATFORM_DIRS := $(patsubst %/,%,$(dir ${ALL_PLATFORM_MK_FILES}))
|
ALL_PLATFORM_DIRS := $(patsubst %/,%,$(dir ${ALL_PLATFORM_MK_FILES}))
|
||||||
ALL_PLATFORMS := $(sort $(notdir ${ALL_PLATFORM_DIRS}))
|
ALL_PLATFORMS := $(sort $(notdir ${ALL_PLATFORM_DIRS}))
|
||||||
|
|
||||||
|
|
|
@ -35,7 +35,7 @@ PLAT_INCLUDE := ../../include/tools_share
|
||||||
else
|
else
|
||||||
PLAT_MSG := ${PLAT}
|
PLAT_MSG := ${PLAT}
|
||||||
|
|
||||||
PLATFORM_ROOT := ../../plat/
|
TF_PLATFORM_ROOT := ../../plat/
|
||||||
include ${MAKE_HELPERS_DIRECTORY}plat_helpers.mk
|
include ${MAKE_HELPERS_DIRECTORY}plat_helpers.mk
|
||||||
|
|
||||||
PLAT_INCLUDE := $(wildcard ${PLAT_DIR}include)
|
PLAT_INCLUDE := $(wildcard ${PLAT_DIR}include)
|
||||||
|
|
Loading…
Reference in New Issue