Commit fe116c65 authored by Victor Chong's avatar Victor Chong
Browse files

hikey*: Undef BL32_BASE when building without SPD



Otherwise, BL2 tries to load a BL32 image and triggers
assert(result == 0)
in
plat_get_image_source()
in hikey{960}_io_storage.c
in a debug build, or displays
ERROR:   BL2: Failed to load image
in a release build.
Signed-off-by: default avatarVictor Chong <victor.chong@linaro.org>
parent 5ad0de14
...@@ -135,6 +135,13 @@ ...@@ -135,6 +135,13 @@
#error "Currently unsupported HIKEY_TSP_LOCATION_ID value" #error "Currently unsupported HIKEY_TSP_LOCATION_ID value"
#endif #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_BASE (BL2_BASE)
#define NS_BL1U_SIZE (0x00010000) #define NS_BL1U_SIZE (0x00010000)
#define NS_BL1U_LIMIT (NS_BL1U_BASE + NS_BL1U_SIZE) #define NS_BL1U_LIMIT (NS_BL1U_BASE + NS_BL1U_SIZE)
......
...@@ -94,6 +94,13 @@ ...@@ -94,6 +94,13 @@
#error "Currently unsupported HIKEY960_TSP_LOCATION_ID value" #error "Currently unsupported HIKEY960_TSP_LOCATION_ID value"
#endif #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_BASE (BL31_LIMIT) /* 1AC9_8000 */
#define NS_BL1U_SIZE (0x00100000) #define NS_BL1U_SIZE (0x00100000)
#define NS_BL1U_LIMIT (NS_BL1U_BASE + NS_BL1U_SIZE) #define NS_BL1U_LIMIT (NS_BL1U_BASE + NS_BL1U_SIZE)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment