diff options
| author | davidcunado-arm <david.cunado@arm.com> | 2017-09-14 09:37:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-14 09:37:53 +0100 |
| commit | edbd7bb7dcfb0faddb512d6f1808d303631d303a (patch) | |
| tree | a59b5a863acd33c89d0467d0e0ac1e0622a52716 | |
| parent | b4567c125d4dc80fb3f1f7c065d0731496ae6811 (diff) | |
| parent | fe116c65f56184d728c999a15b2c4123175c7120 (diff) | |
Merge pull request #1098 from vchong/boot_without_spd
hikey*: boot without spd
| -rw-r--r-- | plat/hisilicon/hikey/hikey_bl2_setup.c | 2 | ||||
| -rw-r--r-- | plat/hisilicon/hikey/include/platform_def.h | 7 | ||||
| -rw-r--r-- | plat/hisilicon/hikey960/hikey960_bl2_setup.c | 2 | ||||
| -rw-r--r-- | plat/hisilicon/hikey960/include/platform_def.h | 7 |
4 files changed, 16 insertions, 2 deletions
diff --git a/plat/hisilicon/hikey/hikey_bl2_setup.c b/plat/hisilicon/hikey/hikey_bl2_setup.c index 968da9bd..86c205d3 100644 --- a/plat/hisilicon/hikey/hikey_bl2_setup.c +++ b/plat/hisilicon/hikey/hikey_bl2_setup.c @@ -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); diff --git a/plat/hisilicon/hikey/include/platform_def.h b/plat/hisilicon/hikey/include/platform_def.h index 0c736ab1..01806542 100644 --- a/plat/hisilicon/hikey/include/platform_def.h +++ b/plat/hisilicon/hikey/include/platform_def.h @@ -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) diff --git a/plat/hisilicon/hikey960/hikey960_bl2_setup.c b/plat/hisilicon/hikey960/hikey960_bl2_setup.c index b8d7f9e9..b50ed87f 100644 --- a/plat/hisilicon/hikey960/hikey960_bl2_setup.c +++ b/plat/hisilicon/hikey960/hikey960_bl2_setup.c @@ -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); diff --git a/plat/hisilicon/hikey960/include/platform_def.h b/plat/hisilicon/hikey960/include/platform_def.h index 2fae666b..202952c5 100644 --- a/plat/hisilicon/hikey960/include/platform_def.h +++ b/plat/hisilicon/hikey960/include/platform_def.h @@ -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) |