andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1098 from vchong/boot_without_spd 

hikey*: boot without spd
This commit is contained in:
davidcunado-arm 2017-09-14 09:37:53 +01:00 committed by GitHub
parent b4567c125d fe116c65f5
commit edbd7bb7dc
4 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plat/hisilicon/hikey/hikey_bl2_setup.c
View File

@ -244,7 +244,7 @@ bl31_params_t *bl2_plat_get_bl31_params(void)
VERSION_1, 0);
/* Fill BL3-2 related information if it exists */
#if BL32_BASE
#ifdef BL32_BASE
bl2_to_bl31_params->bl32_ep_info = &bl31_params_mem.bl32_ep_info;
SET_PARAM_HEAD(bl2_to_bl31_params->bl32_ep_info, PARAM_EP,
VERSION_1, 0);

7
plat/hisilicon/hikey/include/platform_def.h
View File

@ -135,6 +135,13 @@
#error "Currently unsupported HIKEY_TSP_LOCATION_ID value"
#endif
/* BL32 is mandatory in AArch32 */
#ifndef AARCH32
#ifdef SPD_none
#undef BL32_BASE
#endif /* SPD_none */
#endif
#define NS_BL1U_BASE (BL2_BASE)
#define NS_BL1U_SIZE (0x00010000)
#define NS_BL1U_LIMIT (NS_BL1U_BASE + NS_BL1U_SIZE)

2
plat/hisilicon/hikey960/hikey960_bl2_setup.c
View File

@ -91,7 +91,7 @@ bl31_params_t *bl2_plat_get_bl31_params(void)
VERSION_1, 0);
/* Fill BL3-2 related information if it exists */
#if BL32_BASE
#ifdef BL32_BASE
bl2_to_bl31_params->bl32_ep_info = &bl31_params_mem.bl32_ep_info;
SET_PARAM_HEAD(bl2_to_bl31_params->bl32_ep_info, PARAM_EP,
VERSION_1, 0);

7
plat/hisilicon/hikey960/include/platform_def.h
View File

@ -94,6 +94,13 @@
#error "Currently unsupported HIKEY960_TSP_LOCATION_ID value"
#endif
/* BL32 is mandatory in AArch32 */
#ifndef AARCH32
#ifdef SPD_none
#undef BL32_BASE
#endif /* SPD_none */
#endif
#define NS_BL1U_BASE (BL31_LIMIT) /* 1AC9_8000 */
#define NS_BL1U_SIZE (0x00100000)
#define NS_BL1U_LIMIT (NS_BL1U_BASE + NS_BL1U_SIZE)