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>

diff --git a/make_helpers/plat_helpers.mk b/make_helpers/plat_helpers.mk
index a2f383a51e2146f47849707bf49e9e6ac4f4c3c2..a7ae9a279cf174dbe5dd7ccfd0410e87c0c3ca52 100644 (file)
--- 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 437b692788bcd6367cb252bba5acb095465a29e7..b0994b8cace0e41d06ff97b8fdfbc879265397b1 100644 (file)
--- 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)