diff options
Diffstat (limited to 'make_helpers')
| -rw-r--r-- | make_helpers/defaults.mk | 8 | ||||
| -rw-r--r-- | make_helpers/plat_helpers.mk | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/make_helpers/defaults.mk b/make_helpers/defaults.mk index a80a4915..751f8343 100644 --- a/make_helpers/defaults.mk +++ b/make_helpers/defaults.mk @@ -1,5 +1,5 @@ # -# Copyright (c) 2016-2017, ARM Limited and Contributors. All rights reserved. +# Copyright (c) 2016-2018, ARM Limited and Contributors. All rights reserved. # # SPDX-License-Identifier: BSD-3-Clause # @@ -98,9 +98,9 @@ KEY_ALG := rsa # Flag to enable new version of image loading LOAD_IMAGE_V2 := 0 -# Use the new console API that allows registering more than one console instance -# at once. Use = instead of := to dynamically default to ERROR_DEPRECATED. -MULTI_CONSOLE_API = $(ERROR_DEPRECATED) +# Enable use of the console API allowing multiple consoles to be registered +# at the same time. +MULTI_CONSOLE_API := 0 # NS timer register save and restore NS_TIMER_SWITCH := 0 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})) |