summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSandrine Bailleux <sandrine.bailleux@arm.com>2018-04-26 16:10:38 +0200
committerSandrine Bailleux <sandrine.bailleux@arm.com>2018-04-27 13:16:05 +0100
commit77610c4f1a59f2233e257ed7734136446684890b (patch)
tree44f5b67cfca580849f6318b2d85bd77e1342da63
parent7b14fdc6f08d049781e7b097fd49d595c39c5358 (diff)
Build: Introduce defaults.mk
Move default values of build options in defaults.mk and include the latter from the top Makefile. Change-Id: I533d9f28649dbfe5b61a12975c3198e216b60d64 Signed-off-by: Sandrine Bailleux <sandrine.bailleux@arm.com>
-rw-r--r--Makefile36
-rw-r--r--defaults.mk40
2 files changed, 50 insertions, 26 deletions
diff --git a/Makefile b/Makefile
index fe36d89..270b1e8 100644
--- a/Makefile
+++ b/Makefile
@@ -32,31 +32,18 @@
VERSION_MAJOR := 0
VERSION_MINOR := 1
-#
-# Default values for build configurations
-#
+################################################################################
+# Default values for build configurations, and their dependencies
+################################################################################
+
+include defaults.mk
-# Build verbosity
-V := 0
-# Debug build
-DEBUG := 0
-# Use of shell colors
-SHELL_COLOR := 0
-# Build architecture
-ARCH := aarch64
-# Build platform
-DEFAULT_PLAT := fvp
PLAT := ${DEFAULT_PLAT}
-# Base commit to perform code check on
-BASE_COMMIT := origin/master
-# Use non volatile memory for storing results
-USE_NVM := 0
-# Whether a new test session should be started every time or whether the
-# framework should try to resume a previous one if it was interrupted
-NEW_TEST_SESSION := 1
-# Whether the Firmware Update images (i.e. NS_BL1U and NS_BL2U images) should be
-# built. The platform makefile is free to override this value.
-FIRMWARE_UPDATE := 0
+
+# Assertions enabled for DEBUG builds by default
+ENABLE_ASSERTIONS := ${DEBUG}
+
+################################################################################
# Do not check the coding style on C library files
CHECK_PATHS = $(shell ls -I include -I lib -I tools) \
@@ -80,9 +67,6 @@ else
LOG_LEVEL := 20
endif
-# Assertions enabled for DEBUG builds by default
-ENABLE_ASSERTIONS := ${DEBUG}
-
# Default build string (git branch and commit)
ifeq (${BUILD_STRING},)
BUILD_STRING := $(shell git log -n 1 --pretty=format:"%h")
diff --git a/defaults.mk b/defaults.mk
new file mode 100644
index 0000000..0d06b6e
--- /dev/null
+++ b/defaults.mk
@@ -0,0 +1,40 @@
+#
+# Copyright (c) 2018, ARM Limited and Contributors. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+# Default, static values for build variables, listed in alphabetic order.
+# Dependencies between build options, if any, are handled in the top-level
+# Makefile, after this file is included. This ensures that the former is better
+# poised to handle dependencies, as all build variables would have a default
+# value by then.
+
+# The Target build architecture. Supported values are: aarch64, aarch32.
+ARCH := aarch64
+
+# Base commit to perform code check on
+BASE_COMMIT := origin/master
+
+# Debug/Release build
+DEBUG := 0
+
+# Build platform
+DEFAULT_PLAT := fvp
+
+# Whether the Firmware Update images (i.e. NS_BL1U and NS_BL2U images) should be
+# built. The platform makefile is free to override this value.
+FIRMWARE_UPDATE := 0
+
+# Whether a new test session should be started every time or whether the
+# framework should try to resume a previous one if it was interrupted
+NEW_TEST_SESSION := 1
+
+# Use of shell colors
+SHELL_COLOR := 0
+
+# Use non volatile memory for storing results
+USE_NVM := 0
+
+# Build verbosity
+V := 0