aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSoby Mathew <soby.mathew@arm.com>2018-10-10 14:00:34 +0100
committerGitHub <noreply@github.com>2018-10-10 14:00:34 +0100
commitf7a18268ad2201176ffc882b43c900f9d025bde1 (patch)
treeba04f3184ba2789f5f507ff1db916d4cd0a5ebcf
parent52a9e53b8cf253cdcd73265df60d9e8b03e534df (diff)
parentf2c1504621a58a81b5004995f71585b680ed9e5f (diff)
downloadtrusted-firmware-a-f7a18268ad2201176ffc882b43c900f9d025bde1.tar.gz
Merge pull request #1614 from MISL-EBU-System-SW/integration-fix
Fix service CPU image load at BL2 stage and update maintainers list
-rw-r--r--include/plat/marvell/a8k/common/plat_marvell.h2
-rw-r--r--maintainers.rst1
-rw-r--r--plat/marvell/common/marvell_bl2_setup.c10
3 files changed, 12 insertions, 1 deletions
diff --git a/include/plat/marvell/a8k/common/plat_marvell.h b/include/plat/marvell/a8k/common/plat_marvell.h
index a62a7cb089..2aecd3f505 100644
--- a/include/plat/marvell/a8k/common/plat_marvell.h
+++ b/include/plat/marvell/a8k/common/plat_marvell.h
@@ -125,4 +125,6 @@ void marvell_ble_prepare_exit(void);
void marvell_exit_bootrom(uintptr_t base);
int plat_marvell_early_cpu_powerdown(void);
+int bl2_plat_handle_scp_bl2(image_info_t *scp_bl2_image_info);
+
#endif /* __PLAT_MARVELL_H__ */
diff --git a/maintainers.rst b/maintainers.rst
index 383e47b10d..cb4f42041a 100644
--- a/maintainers.rst
+++ b/maintainers.rst
@@ -81,6 +81,7 @@ Marvell platform ports and SoC drivers
:F: docs/plat/marvell/
:F: plat/marvell/
:F: drivers/marvell/
+:F: tools/doimage/
NVidia platform ports
---------------------
diff --git a/plat/marvell/common/marvell_bl2_setup.c b/plat/marvell/common/marvell_bl2_setup.c
index f7149c396a..d33aba477e 100644
--- a/plat/marvell/common/marvell_bl2_setup.c
+++ b/plat/marvell/common/marvell_bl2_setup.c
@@ -105,7 +105,15 @@ int marvell_bl2_handle_post_image_load(unsigned int image_id)
bl_mem_params->ep_info.args.arg0 = 0xffff & read_mpidr();
bl_mem_params->ep_info.spsr = marvell_get_spsr_for_bl33_entry();
break;
-
+#ifdef SCP_BL2_BASE
+ case SCP_BL2_IMAGE_ID:
+ /* The subsequent handling of SCP_BL2 is platform specific */
+ err = bl2_plat_handle_scp_bl2(&bl_mem_params->image_info);
+ if (err) {
+ WARN("Failure in platform-specific handling of SCP_BL2 image.\n");
+ }
+ break;
+#endif
default:
/* Do nothing in default case */
break;