diff options
| author | Heyi Guo <heyi.guo@linaro.org> | 2018-03-01 18:57:58 +0800 |
|---|---|---|
| committer | Heyi Guo <heyi.guo@linaro.org> | 2018-03-05 14:18:04 +0800 |
| commit | 7d9ee7e3806cb1b1b484805ba723a0202d917a7a (patch) | |
| tree | dcd8a7d4ec57cfd4355dca9b059059e9974b8b3d | |
| parent | c37be00b160da5e8aa1a2950090fc52002d88d95 (diff) | |
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>
| -rw-r--r-- | make_helpers/plat_helpers.mk | 6 | ||||
| -rw-r--r-- | tools/cert_create/Makefile | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/make_helpers/plat_helpers.mk b/make_helpers/plat_helpers.mk index a2f383a5..a7ae9a27 100644 --- a/make_helpers/plat_helpers.mk +++ b/make_helpers/plat_helpers.mk @@ -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})) diff --git a/tools/cert_create/Makefile b/tools/cert_create/Makefile index 437b6927..b0994b8c 100644 --- a/tools/cert_create/Makefile +++ b/tools/cert_create/Makefile @@ -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) |