tbbr: Use USE_TBBR_DEFS=1 by default

Change-Id: I2885b0d8cb9bb16da1fa96a30e46cccde434dc42
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>

diff --git a/docs/user-guide.rst b/docs/user-guide.rst
index e6f0eae6df09e2a43ff7ca5de5c236dfda173181..4c2b49223d82e02eeecc6d142020a980becce3e1 100644 (file)
--- a/docs/user-guide.rst
+++ b/docs/user-guide.rst
@@ -1197,12 +1197,12 @@ command:
 
     make PLAT=<platform> [DEBUG=1] [V=1] certtool
 
-For platforms that do not require their own IDs in certificate files,
-the generic 'cert\_create' tool can be built with the following command:
+For platforms that require their own IDs in certificate files, the generic
+'cert\_create' tool can be built with the following command:
 
 ::
 
-    make USE_TBBR_DEFS=1 [DEBUG=1] [V=1] certtool
+    make USE_TBBR_DEFS=0 [DEBUG=1] [V=1] certtool
 
 ``DEBUG=1`` builds the tool in debug mode. ``V=1`` makes the build process more
 verbose. The following command should be used to obtain help about the tool:

diff --git a/make_helpers/defaults.mk b/make_helpers/defaults.mk
index 31500d874a5015a8a943ac5ab489aa06756e547c..0234f5375da7a10a78c6b052c3b2cfb151a85901 100644 (file)
--- a/make_helpers/defaults.mk
+++ b/make_helpers/defaults.mk
@@ -166,14 +166,14 @@ SPIN_ON_BL1_EXIT          := 0
 # Flags to build TF with Trusted Boot support
 TRUSTED_BOARD_BOOT             := 0
 
-# Build option to choose whether Trusted firmware uses Coherent memory or not.
+# Build option to choose whether Trusted Firmware uses Coherent memory or not.
 USE_COHERENT_MEM               := 1
 
-# Build option to choose wheter Trusted firmware uses library at ROM
-USE_ROMLIB                             := 0
+# Build option to choose whether Trusted Firmware uses library at ROM
+USE_ROMLIB                     := 0
 
 # Use tbbr_oid.h instead of platform_oid.h
-USE_TBBR_DEFS                  = $(ERROR_DEPRECATED)
+USE_TBBR_DEFS                  := 1
 
 # Build verbosity
 V                              := 0