aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSandrine Bailleux <sandrine.bailleux@arm.com>2013-12-02 15:41:25 +0000
committerDan Handley <dan.handley@arm.com>2013-12-12 16:06:48 +0000
commitba6980a8db0215ba42c103b80f8981cfda80171c (patch)
treebac9dcc41298aa6f1a278bf78e5284ed70680d80
parentee12f6f7497882fdcc8acc7774c516739296799e (diff)
downloadarm-trusted-firmware-ba6980a8db0215ba42c103b80f8981cfda80171c.tar.gz
Move RUN_IMAGE constant from bl1.h to bl_common.h
RUN_IMAGE constant is used by all bootloader stages. Change-Id: I1b4e28d8fcf3ad1363f202c859f5efab0f320efe
-rw-r--r--bl31/aarch64/bl31_entrypoint.S1
-rw-r--r--common/bl_common.c1
-rw-r--r--include/bl1.h6
-rw-r--r--include/bl_common.h9
4 files changed, 9 insertions, 8 deletions
diff --git a/bl31/aarch64/bl31_entrypoint.S b/bl31/aarch64/bl31_entrypoint.S
index 593cc1d..2a4c979 100644
--- a/bl31/aarch64/bl31_entrypoint.S
+++ b/bl31/aarch64/bl31_entrypoint.S
@@ -28,7 +28,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <bl1.h>
#include <bl_common.h>
#include <platform.h>
#include <arch.h>
diff --git a/common/bl_common.c b/common/bl_common.c
index 8183337..d6ee954 100644
--- a/common/bl_common.c
+++ b/common/bl_common.c
@@ -37,7 +37,6 @@
#include <platform.h>
#include <semihosting.h>
#include <bl_common.h>
-#include <bl1.h>
/***********************************************************
* Memory for sharing data while changing exception levels.
diff --git a/include/bl1.h b/include/bl1.h
index 9920cb8..ddb5ecf 100644
--- a/include/bl1.h
+++ b/include/bl1.h
@@ -33,12 +33,6 @@
#include <bl_common.h>
-/******************************************************************************
- * Function ID of the only SMC that the BL1 exception handlers service.
- * The chosen value is the first function ID of the ARM SMC64 range.
- *****************************************************************************/
-#define RUN_IMAGE 0xC0000000
-
#ifndef __ASSEMBLY__
/******************************************
diff --git a/include/bl_common.h b/include/bl_common.h
index 0af98d6..995b5e6 100644
--- a/include/bl_common.h
+++ b/include/bl_common.h
@@ -71,6 +71,15 @@
******************************************************************************/
#define CASSERT(cond, msg) typedef char msg[(cond) ? 0 : -1]
+/******************************************************************************
+ * Opcode passed in x0 to tell next EL that we want to run an image.
+ * Corresponds to the function ID of the only SMC that the BL1 exception
+ * handlers service. That's why the chosen value is the first function ID of
+ * the ARM SMC64 range.
+ *****************************************************************************/
+#define RUN_IMAGE 0xC0000000
+
+
#ifndef __ASSEMBLY__
/*******************************************************************************
* Structure used for telling the next BL how much of a particular type of