aboutsummaryrefslogtreecommitdiff
path: root/plat/hisilicon/hikey960/hikey960_bl1_setup.c
diff options
context:
space:
mode:
authorHaojian Zhuang <haojian.zhuang@linaro.org>2018-01-25 16:13:05 +0800
committerHaojian Zhuang <haojian.zhuang@linaro.org>2018-03-05 13:05:35 +0800
commitd2128731a93e0bd1c3580d045232cf9a984db606 (patch)
tree407aa2b8f6a120d8738e6dcf5e197d0bada01265 /plat/hisilicon/hikey960/hikey960_bl1_setup.c
parent99ffcaf2efac457806d558c7e7bc36cc23144894 (diff)
downloadtrusted-firmware-a-d2128731a93e0bd1c3580d045232cf9a984db606.tar.gz
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>
Diffstat (limited to 'plat/hisilicon/hikey960/hikey960_bl1_setup.c')
-rw-r--r--plat/hisilicon/hikey960/hikey960_bl1_setup.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/plat/hisilicon/hikey960/hikey960_bl1_setup.c b/plat/hisilicon/hikey960/hikey960_bl1_setup.c
index 4f1640da3c..d45cea0fb3 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 @@ unsigned int bl1_plat_get_next_image_id(void)
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 @@ void bl1_plat_set_ep_info(unsigned int image_id,
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);