diff options
| author | Ben Peled <bpeled@marvell.com> | 2019-03-27 16:26:02 +0200 |
|---|---|---|
| committer | Marcin Wojtas <mw@semihalf.com> | 2020-07-30 15:15:52 +0200 |
| commit | 5bc3643e57963c9b61a40be2fe5ae6166fd6fdb8 (patch) | |
| tree | f4403a20cdca4becf51180ac49406b2513136b3c | |
| parent | ebf307bfefccf57f3cbdc1a03c3d37afa1896193 (diff) | |
| download | platform_external_arm-trusted-firmware-5bc3643e57963c9b61a40be2fe5ae6166fd6fdb8.tar.gz platform_external_arm-trusted-firmware-5bc3643e57963c9b61a40be2fe5ae6166fd6fdb8.tar.bz2 platform_external_arm-trusted-firmware-5bc3643e57963c9b61a40be2fe5ae6166fd6fdb8.zip | |
plat: marvell: t9130: pass actual CP count for load_image
Add CN913x case to bl2_plat_get_cp_count.
Fix loading of cp1/2 image. This is a preparation
patch for adding CN913x SoC family support.
Change-Id: Id84a30203d20572fc0dfd3f91ea395c199a85fe9
Signed-off-by: Ben Peled <bpeled@marvell.com>
| -rw-r--r-- | include/drivers/marvell/mochi/cp110_setup.h | 1 | ||||
| -rw-r--r-- | plat/marvell/armada/a8k/common/mss/mss_bl2_setup.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/include/drivers/marvell/mochi/cp110_setup.h b/include/drivers/marvell/mochi/cp110_setup.h index f8cd26b12..11dc4e020 100644 --- a/include/drivers/marvell/mochi/cp110_setup.h +++ b/include/drivers/marvell/mochi/cp110_setup.h @@ -24,6 +24,7 @@ #define MVEBU_3900_DEV_ID (0x6025) #define MVEBU_80X0_DEV_ID (0x8040) #define MVEBU_80X0_CP115_DEV_ID (0x8045) +#define MVEBU_CN9130_DEV_ID (0x7025) #define MVEBU_CP110_SA_DEV_ID (0x110) #define MVEBU_CP110_REF_ID_A1 1 #define MVEBU_CP110_REF_ID_A2 2 diff --git a/plat/marvell/armada/a8k/common/mss/mss_bl2_setup.c b/plat/marvell/armada/a8k/common/mss/mss_bl2_setup.c index c2cd93357..b919cb337 100644 --- a/plat/marvell/armada/a8k/common/mss/mss_bl2_setup.c +++ b/plat/marvell/armada/a8k/common/mss/mss_bl2_setup.c @@ -138,6 +138,8 @@ uint32_t bl2_plat_get_cp_count(int ap_idx) if (revision == MVEBU_80X0_DEV_ID || revision == MVEBU_80X0_CP115_DEV_ID) return 2; + else if (revision == MVEBU_CN9130_DEV_ID) + return CP_COUNT; else return 1; } |