andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1294 from iwishguo/master 

Change PLATFORM_ROOT to TF_PLATFORM_ROOT
This commit is contained in:
davidcunado-arm 2018-03-21 19:20:43 +00:00 committed by GitHub
parent 6d8db46bec 7d9ee7e380
commit 60bb5258f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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)