summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouglas Raillard <douglas.raillard@arm.com>2017-03-08 16:49:31 +0000
committerDouglas Raillard <douglas.raillard@arm.com>2017-04-03 18:59:22 +0100
commitf9608bc8f8c171f0a2a7c07ed749e552e09839da (patch)
tree7af1926b3fe879498c1ed2247bd69b1d2c37497f
parentddc1c56f0b12af6171c11a5a8073c34becfedde2 (diff)
Fix ARM_BL31_IN_DRAM build
Some header files using the ULL() macro were not directly including utils.h where the macro definition resides. As a consequence, a linker script with values using this macro did not see the macro definition and kept the "ULL(<value>)" call in the preprocessed file, which lead to link error. Files using ULL() macro now include utils.h directly. Change-Id: I433a7f36bd21a156c20e69bc2a2bb406140ebdf9 Signed-off-by: Douglas Raillard <douglas.raillard@arm.com>
-rw-r--r--include/plat/arm/board/common/board_css_def.h1
-rw-r--r--include/plat/arm/common/arm_def.h1
-rw-r--r--include/plat/arm/soc/common/soc_css_def.h1
-rw-r--r--plat/arm/board/fvp/include/platform_def.h1
4 files changed, 4 insertions, 0 deletions
diff --git a/include/plat/arm/board/common/board_css_def.h b/include/plat/arm/board/common/board_css_def.h
index 65e3d32d..4b5e84dd 100644
--- a/include/plat/arm/board/common/board_css_def.h
+++ b/include/plat/arm/board/common/board_css_def.h
@@ -33,6 +33,7 @@
#include <common_def.h>
#include <soc_css_def.h>
+#include <utils.h>
#include <v2m_def.h>
/*
diff --git a/include/plat/arm/common/arm_def.h b/include/plat/arm/common/arm_def.h
index 8ce718af..43e0eb89 100644
--- a/include/plat/arm/common/arm_def.h
+++ b/include/plat/arm/common/arm_def.h
@@ -34,6 +34,7 @@
#include <common_def.h>
#include <platform_def.h>
#include <tbbr_img_def.h>
+#include <utils.h>
#include <xlat_tables_defs.h>
diff --git a/include/plat/arm/soc/common/soc_css_def.h b/include/plat/arm/soc/common/soc_css_def.h
index e83144ec..3b4cc79f 100644
--- a/include/plat/arm/soc/common/soc_css_def.h
+++ b/include/plat/arm/soc/common/soc_css_def.h
@@ -32,6 +32,7 @@
#define __SOC_CSS_DEF_H__
#include <common_def.h>
+#include <utils.h>
/*
diff --git a/plat/arm/board/fvp/include/platform_def.h b/plat/arm/board/fvp/include/platform_def.h
index bf5e03b0..4088e986 100644
--- a/plat/arm/board/fvp/include/platform_def.h
+++ b/plat/arm/board/fvp/include/platform_def.h
@@ -35,6 +35,7 @@
#include <board_arm_def.h>
#include <common_def.h>
#include <tzc400.h>
+#include <utils.h>
#include <v2m_def.h>
#include "../fvp_def.h"