Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-16 09:34:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change PLATFORM_ROOT to TF_PLATFORM_ROOT

Browse source 
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:
Heyi Guo 2018-03-01 18:57:58 +08:00
parent c37be00b16
commit 7d9ee7e380
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
make_helpers/plat_helpers.mk
View file

@ -15,14 +15,14 @@ ifndef PLAT_HELPERS_MK
$(error "Error: Unknown platform. Please use PLAT=<platform name> to specify the platform")
endif
# PLATFORM_ROOT can be overridden for when building tools directly
PLATFORM_ROOT ?= plat/
# TF_PLATFORM_ROOT can be overridden for when building tools directly
TF_PLATFORM_ROOT ?= plat/
PLAT_MAKEFILE := platform.mk
# Generate the platforms list by recursively searching for all directories
# under /plat containing a PLAT_MAKEFILE. Append each platform with a `|`
# 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_PLATFORMS := $(sort $(notdir ${ALL_PLATFORM_DIRS}))

2
tools/cert_create/Makefile
View file

@ -35,7 +35,7 @@ PLAT_INCLUDE := ../../include/tools_share
else
PLAT_MSG := ${PLAT}
PLATFORM_ROOT := ../../plat/
TF_PLATFORM_ROOT := ../../plat/
include ${MAKE_HELPERS_DIRECTORY}plat_helpers.mk
PLAT_INCLUDE := $(wildcard ${PLAT_DIR}include)