Merge pull request #1757 from antonio-nino-diaz-arm/an/includes

Move BL1 and BL2 private defines to bl_common.h

diff --cc plat/arm/common/arm_bl1_setup.c
index 73fee607f0633ad6a42bfaf005cba1f74989bb6a,1a0385a776fb2d5b585283a226233f79235b674c..3a8b5c27546d236239fd4b092cca8921e7d7053a
--- 1/plat/arm/common/arm_bl1_setup.c
--- 2/plat/arm/common/arm_bl1_setup.c
+++ b/plat/arm/common/arm_bl1_setup.c
@@@ -16,10 -16,9 +16,8 @@@
  #include <lib/xlat_tables/xlat_tables_compat.h>
  #include <plat/common/platform.h>
  
 -#include <arm_def.h>
  #include <plat_arm.h>
  
- #include "../../../bl1/bl1_private.h"
- 
  /* Weak definitions may be overridden in specific ARM standard platform */
  #pragma weak bl1_early_platform_setup
  #pragma weak bl1_plat_arch_setup

diff --cc plat/arm/css/sgi/sgi_plat.c
index 387be36baafdee3a3fe0e7554d6afd9a94d2c346,2515e3b1b689d63c8c5e5516885790230fcc3011..ca90aada9facde0355dd77cf9e530193be84e653
--- 1/plat/arm/css/sgi/sgi_plat.c
--- 2/plat/arm/css/sgi/sgi_plat.c
+++ b/plat/arm/css/sgi/sgi_plat.c
@@@ -14,8 -14,9 +14,7 @@@
  #include <plat/common/platform.h>
  #include <services/secure_partition.h>
  
 -#include <arm_def.h>
 -#include <arm_spm_def.h>
  #include <plat_arm.h>
- #include "../../../../bl1/bl1_private.h"
  
  #if USE_COHERENT_MEM
  /*