From ba6980a8db0215ba42c103b80f8981cfda80171c Mon Sep 17 00:00:00 2001
From: Sandrine Bailleux <sandrine.bailleux@arm.com>
Date: Mon, 2 Dec 2013 15:41:25 +0000
Subject: [PATCH] Move RUN_IMAGE constant from bl1.h to bl_common.h

RUN_IMAGE constant is used by all bootloader stages.

Change-Id: I1b4e28d8fcf3ad1363f202c859f5efab0f320efe
---
 bl31/aarch64/bl31_entrypoint.S | 1 -
 common/bl_common.c             | 1 -
 include/bl1.h                  | 6 ------
 include/bl_common.h            | 9 +++++++++
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/bl31/aarch64/bl31_entrypoint.S b/bl31/aarch64/bl31_entrypoint.S
index 593cc1d0..2a4c979d 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 8183337c..d6ee954f 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 9920cb80..ddb5ecfb 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 0af98d68..995b5e6c 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
-- 
2.30.2