diff options
| author | Grzegorz Jaszczyk <jaz@semihalf.com> | 2017-11-09 18:17:46 +0100 |
|---|---|---|
| committer | Kostya Porotchkin <kostap@marvell.com> | 2017-11-21 12:08:45 +0200 |
| commit | 2367a54c7cf87d2b55b50ba0a9a5272ad12e3a6e (patch) | |
| tree | 34329c4790641d7f16dcb93cdd75b718d09212f2 | |
| parent | bc3abfd20028def1c18969bc51a05910ec85e29e (diff) | |
plat: marvell: a8k: make SCP_BL2 image mandatory for a8k family
Force build with SCP_BL2 on a80x0 boards.
This enforcement ensures that the required service CPU executable is
always incluided in the final system flash image.
Change-Id: I6efe32ec20ab5e193e56273b016a76f646d2c4ee
Signed-off-by: Grzegorz Jaszczyk <jaz@semihalf.com>
Signed-off-by: Konstantin Porotchkin <kostap@marvell.com>
Reviewed-on: http://vgitil04.il.marvell.com:8080/46209
Tested-by: iSoC Platform CI <ykjenk@marvell.com>
Reviewed-by: Yoav Gvili <ygvili@marvell.com>
| -rw-r--r-- | docs/marvell/build.txt | 2 | ||||
| -rw-r--r-- | plat/marvell/a8k/common/a8k_common.mk | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/docs/marvell/build.txt b/docs/marvell/build.txt index c9e635cc..54cbabeb 100644 --- a/docs/marvell/build.txt +++ b/docs/marvell/build.txt @@ -22,7 +22,7 @@ Build Instructions u-boot.bin should be used and not u-boot-spl.bin - Set MSS/SCP image path (only for Armada70x0, Armada80x0):: + Set MSS/SCP image path (mandatory only for Armada80x0):: > export SCP_BL2=path/to/RTOSDemo-cm3.bin diff --git a/plat/marvell/a8k/common/a8k_common.mk b/plat/marvell/a8k/common/a8k_common.mk index 0cb058ac..e6af61a3 100644 --- a/plat/marvell/a8k/common/a8k_common.mk +++ b/plat/marvell/a8k/common/a8k_common.mk @@ -118,5 +118,12 @@ BL31_SOURCES += $(PLAT_COMMON_BASE)/plat_pm_trace.c # It is not needed since Marvell platform already used the new platform APIs. ENABLE_PLAT_COMPAT := 0 +ifndef SCP_BL2 +# Force builds with BL2 image on a80x0 platforms +ifneq ($(findstring a80x0,$(PLAT)),) + $(error "Error: SCP_BL2 image is mandatory for a8k family") +endif +endif + # MSS (SCP) build include $(PLAT_COMMON_BASE)/mss/mss_common.mk |