aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicola Mazzucato <nicola.mazzucato@arm.com>2020-03-12 16:40:22 +0000
committerChris Kay <chris@cjkay.com>2020-03-17 21:14:14 +0000
commit31334b6734fb77921571694ccf69065f9a85d4a5 (patch)
tree0fa1e9141a088957403c5f7bac3a869bdb77c922
parentcd80346b551e41274573a94c1b9b71a8425eb414 (diff)
Update firmware version to v2.6.0
Update release version to v2.6.0. Change-Id: I190d1552b57880164939ee4f08ef429f1d542b15 Signed-off-by: Nicola Mazzucato <nicola.mazzucato@arm.com>
-rw-r--r--Makefile2
-rw-r--r--framework/test/test_version.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index cb9c1676..c0859461 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@
# Version
#
export VERSION_MAJOR := 2
-export VERSION_MINOR := 5
+export VERSION_MINOR := 6
export VERSION_PATCH := 0
#
diff --git a/framework/test/test_version.c b/framework/test/test_version.c
index 3676943a..0166c272 100644
--- a/framework/test/test_version.c
+++ b/framework/test/test_version.c
@@ -14,13 +14,13 @@
static void test_version(void)
{
assert(BUILD_VERSION_MAJOR == 2);
- assert(BUILD_VERSION_MINOR == 5);
+ assert(BUILD_VERSION_MINOR == 6);
assert(BUILD_VERSION_PATCH == 0);
}
static void test_version_string(void)
{
- const char *result_string = "v2.5.0";
+ const char *result_string = "v2.6.0";
assert(strcmp(BUILD_VERSION_STRING, result_string) == 0);
}