summaryrefslogtreecommitdiff
path: root/make_helpers
diff options
context:
space:
mode:
authordanh-arm <dan.handley@arm.com>2017-05-24 14:20:20 +0100
committerGitHub <noreply@github.com>2017-05-24 14:20:20 +0100
commite715e676e36eda6ef23469b63adb14a98ccce3e0 (patch)
tree9d9b740e84f4fed8fee0f60251298feeb2d6744a /make_helpers
parentc1de3fdd32ff1848286fbe642a15f148f6bbf9a3 (diff)
parent232c6b34b5d2147be8765ced7b827ee5b1c1bcb5 (diff)
Merge pull request #938 from masahir0y/tools_share
Collect headers shared between TF and host-tools into include/tools_share
Diffstat (limited to 'make_helpers')
-rw-r--r--make_helpers/build_macros.mk2
-rw-r--r--make_helpers/defaults.mk3
2 files changed, 4 insertions, 1 deletions
diff --git a/make_helpers/build_macros.mk b/make_helpers/build_macros.mk
index 36f220e0..34d82c9a 100644
--- a/make_helpers/build_macros.mk
+++ b/make_helpers/build_macros.mk
@@ -54,7 +54,7 @@ endef
# Convenience function for verifying option has a boolean value
# $(eval $(call assert_boolean,FOO)) will assert FOO is 0 or 1
define assert_boolean
- $(and $(patsubst 0,,$(value $(1))),$(patsubst 1,,$(value $(1))),$(error $(1) must be boolean))
+ $(if $(filter-out 0 1,$($1)),$(error $1 must be boolean))
endef
0-9 := 0 1 2 3 4 5 6 7 8 9
diff --git a/make_helpers/defaults.mk b/make_helpers/defaults.mk
index 18c41e05..a31e59c0 100644
--- a/make_helpers/defaults.mk
+++ b/make_helpers/defaults.mk
@@ -128,6 +128,9 @@ TRUSTED_BOARD_BOOT := 0
# Build option to choose whether Trusted firmware uses Coherent memory or not.
USE_COHERENT_MEM := 1
+# Use tbbr_oid.h instead of platform_oid.h
+USE_TBBR_DEFS = $(ERROR_DEPRECATED)
+
# Build verbosity
V := 0