aboutsummaryrefslogtreecommitdiff
path: root/plat/hisilicon/hikey960/include/platform_def.h
diff options
context:
space:
mode:
authorVictor Chong <victor.chong@linaro.org>2017-09-14 01:27:19 +0900
committerVictor Chong <victor.chong@linaro.org>2017-09-14 01:27:19 +0900
commitfe116c65f56184d728c999a15b2c4123175c7120 (patch)
tree2d7dfdc846570e8816646f4b95565ae02f87a024 /plat/hisilicon/hikey960/include/platform_def.h
parent5ad0de14e9a87406a34352efffb3140478b6041f (diff)
downloadtrusted-firmware-a-fe116c65f56184d728c999a15b2c4123175c7120.tar.gz
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: Victor Chong <victor.chong@linaro.org>
Diffstat (limited to 'plat/hisilicon/hikey960/include/platform_def.h')
-rw-r--r--plat/hisilicon/hikey960/include/platform_def.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/plat/hisilicon/hikey960/include/platform_def.h b/plat/hisilicon/hikey960/include/platform_def.h
index 2fae666bf4..202952c5ea 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)