diff options
| author | Neta Zur <neta@marvell.com> | 2017-09-07 15:23:59 +0300 |
|---|---|---|
| committer | Omri Itach <omrii@marvell.com> | 2017-09-07 17:51:04 +0300 |
| commit | 49150c9a1d10050c0d1ed734f4f78b64f665b8b6 (patch) | |
| tree | 64bac0379fe8d1d0bc0a83aa975be84b99ed24c3 | |
| parent | e3c0e5f9c7248105abec46cce71bfdf86e12ea68 (diff) | |
plat: marvell: a8k: add missing check for scp bl2 addr
Commit "plat: marvell: a8k: allow to load scp_bl2 firmware that
doesn't contain PM FW" add scp_bl2 related checks done at runtime.
Nevertheless it occurred that during build with debugs enabled and SCP_BL2
undefined, the build error was triggered. Adding preprocessor checks for
SCP_BL2_BASE fixes that issue.
Signed-off-by: Grzegorz Jaszczyk <jaz@semihalf.com>
Change-Id: I8aa127ef389c7549035b43cb63e67d83edb831c1
Signed-off-by: Neta Zur <neta@marvell.com>
Reviewed-on: http://vgitil04.il.marvell.com:8080/43973
Tested-by: iSoC Platform CI <ykjenk@marvell.com>
Reviewed-by: Omri Itach <omrii@marvell.com>
| -rw-r--r-- | plat/marvell/a8k/common/mss/mss_scp_bootloader.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/plat/marvell/a8k/common/mss/mss_scp_bootloader.c b/plat/marvell/a8k/common/mss/mss_scp_bootloader.c index cad93c14..ba4c3e74 100644 --- a/plat/marvell/a8k/common/mss/mss_scp_bootloader.c +++ b/plat/marvell/a8k/common/mss/mss_scp_bootloader.c @@ -328,7 +328,9 @@ static int split_and_load_bl2_image(void *image) int scp_bootloader_transfer(void *image, unsigned int image_size) { +#ifdef SCP_BL2_BASE assert((uintptr_t) image == SCP_BL2_BASE); +#endif VERBOSE("Concatenated img size %d\n", image_size); |