hikey960: migrate to bl2_el3
Since non-TF ROM is used in HiKey960 platform (Hisilicon Hi3660 SoC),
replace BL1 by BL2_EL3 in normal boot mode.
When flush images in recovery mode, keep to use BL1.
Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro.org>
diff --git a/plat/hisilicon/hikey960/hikey960_bl1_setup.c b/plat/hisilicon/hikey960/hikey960_bl1_setup.c
index 4f1640d..d45cea0 100644
--- a/plat/hisilicon/hikey960/hikey960_bl1_setup.c
+++ b/plat/hisilicon/hikey960/hikey960_bl1_setup.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2017-2018, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -668,9 +668,6 @@
case BOOT_MODE_RECOVERY:
ret = NS_BL1U_IMAGE_ID;
break;
- case BOOT_MODE_NORMAL:
- ret = BL2_IMAGE_ID;
- break;
default:
WARN("Invalid boot mode is found:%d\n", mode);
panic();
@@ -697,8 +694,8 @@
unsigned int data = 0;
uintptr_t tmp = HIKEY960_NS_TMP_OFFSET;
- if (image_id == BL2_IMAGE_ID)
- return;
+ if (image_id != NS_BL1U_IMAGE_ID)
+ panic();
/* Copy NS BL1U from 0x1AC1_8000 to 0x1AC9_8000 */
memcpy((void *)tmp, (void *)HIKEY960_NS_IMAGE_OFFSET,
NS_BL1U_SIZE);