commit de9fead883ffe255598943ae2976d0f133999f2e
author Sandrine Bailleux <sandrine.bailleux@arm.com> Wed Apr 22 06:35:15 2020 +0000
committer TrustedFirmware Code Review <review@review.trustedfirmware.org> Wed Apr 22 06:35:15 2020 +0000
tree ef3d71c4bb411e270d8592943be14ce860e00eae
parent 64caa9f8792567cc1dea1bc2b486477518123d3f
parent 55e2b0c0d5f2e481bb94283cba53e309611ce674

Merge "fdts: a5ds: Fix for the system timer issue." into integration

Makefile

diff --git a/Makefile b/Makefile
index d605ae9..f01a9ae 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@
 # Trusted Firmware Version
 #
 VERSION_MAJOR			:= 2
-VERSION_MINOR			:= 2
+VERSION_MINOR			:= 3
 
 # Default goal is build all images
 .DEFAULT_GOAL			:= all

docs/Makefile

diff --git a/docs/Makefile b/docs/Makefile
index eed3a08..3dd7ebc 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2019, ARM Limited. All rights reserved.
+# Copyright (c) 2019-2020, ARM Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
@@ -7,7 +7,7 @@
 #
 
 # You can set these variables from the command line.
-SPHINXOPTS    =
+SPHINXOPTS    = -W
 SPHINXBUILD   = sphinx-build
 SPHINXPROJ    = TrustedFirmware-A
 SOURCEDIR     = .