Merge pull request #1277 from hzhuang1/testing/bl2_el3_v0.6

hikey: migrate to BL2_EL3

diff --cc plat/hisilicon/hikey/hikey_bl1_setup.c
index 52dcf6b1e1f356b1a0c8834d41e4d6a6e93960d1,cdfbb16cff7cbded33c698aedcf1a5bd5b6e1a1c..69b194a53af1daf33568511347258e2fdf1de04d
--- 1/plat/hisilicon/hikey/hikey_bl1_setup.c
--- 2/plat/hisilicon/hikey/hikey_bl1_setup.c
+++ b/plat/hisilicon/hikey/hikey_bl1_setup.c
@@@ -572,10 -178,10 +178,10 @@@ image_desc_t *bl1_plat_get_image_desc(u
  void bl1_plat_set_ep_info(unsigned int image_id,
                entry_point_info_t *ep_info)
  {
 -      unsigned int data = 0;
 +      uint64_t data = 0;
  
        if (image_id == BL2_IMAGE_ID)
-               return;
+               panic();
        inv_dcache_range(NS_BL1U_BASE, NS_BL1U_SIZE);
        __asm__ volatile ("mrs  %0, cpacr_el1" : "=r"(data));
        do {

diff --cc plat/hisilicon/hikey/include/platform_def.h
Simple merge

diff --cc plat/hisilicon/hikey/platform.mk
index 36629140558e99e97bdc95f36d1d40061552a24d,81bf1f52447bea2b27e3944c0c1b48eb208c9ec6..38eb148cf5b51ffc11e353baa35b75d399a1c4fa
--- 1/plat/hisilicon/hikey/platform.mk
--- 2/plat/hisilicon/hikey/platform.mk
+++ b/plat/hisilicon/hikey/platform.mk
@@@ -7,9 -7,12 +7,12 @@@
  # Enable version2 of image loading
  LOAD_IMAGE_V2 :=      1
  
+ # Non-TF Boot ROM
+ BL2_AT_EL3    :=      1
+ 
  # On Hikey, the TSP can execute from TZC secure area in DRAM (default)
  # or SRAM.
 -HIKEY_TSP_RAM_LOCATION        :=      dram
 +HIKEY_TSP_RAM_LOCATION        ?=      dram
  ifeq (${HIKEY_TSP_RAM_LOCATION}, dram)
    HIKEY_TSP_RAM_LOCATION_ID = HIKEY_DRAM_ID
  else ifeq (${HIKEY_TSP_RAM_LOCATION}, sram)

diff --cc plat/hisilicon/hikey960/include/platform_def.h
Simple merge

diff --cc plat/hisilicon/hikey960/platform.mk
index ffe10738f5d5e4f40943141ee3cf2963d5454290,1dcf5c8eadd0e42de20871f7d39f41396ef9e018..8b03e555db63183346a91c8791aba35eb2cd5dee
--- 1/plat/hisilicon/hikey960/platform.mk
--- 2/plat/hisilicon/hikey960/platform.mk
+++ b/plat/hisilicon/hikey960/platform.mk
@@@ -7,8 -7,11 +7,11 @@@
  # Enable version2 of image loading
  LOAD_IMAGE_V2 :=      1
  
+ # Non-TF Boot ROM
+ BL2_AT_EL3    :=      1
+ 
  # On Hikey960, the TSP can execute from TZC secure area in DRAM.
 -HIKEY960_TSP_RAM_LOCATION     :=      dram
 +HIKEY960_TSP_RAM_LOCATION     ?=      dram
  ifeq (${HIKEY960_TSP_RAM_LOCATION}, dram)
    HIKEY960_TSP_RAM_LOCATION_ID = HIKEY960_DRAM_ID
  else ifeq (${HIKEY960_TSP_RAM_LOCATION}, sram)