andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

plat: marvell: armada: scp_bl2: allow loading up to 8 images 

Extend possible images to 8, additionaly add another type which will be
used with platform containing up to 3 CPs.

Change-Id: Ib68092d11af9801e344d02de839f53127e056e46
Signed-off-by: Grzegorz Jaszczyk <jaz@semihalf.com>
This commit is contained in:
Grzegorz Jaszczyk 2019-04-04 14:38:55 +02:00 committed by Marcin Wojtas
parent 8164605513
commit 621146d851
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plat/marvell/common/mss/mss_scp_bl2_format.h
View File

@ -8,7 +8,7 @@
#ifndef MSS_SCP_BL2_FORMAT_H
#define MSS_SCP_BL2_FORMAT_H
#define MAX_NR_OF_FILES 5
#define MAX_NR_OF_FILES 8
#define FILE_MAGIC 0xddd01ff
#define HEADER_VERSION 0x1
@ -31,6 +31,7 @@ enum cm3_t {
MSS_CP3,
MG_CP0,
MG_CP1,
MG_CP2,
};
typedef struct img_header {

8
plat/marvell/common/mss/mss_scp_bootloader.c
View File

@ -250,7 +250,13 @@ static int load_img_to_cm3(enum cm3_t cm3_type,
break;
case MG_CP0:
case MG_CP1:
case MG_CP2:
cp_index = cm3_type - MG_CP0;
if (bl2_plat_get_cp_count(0) <= cp_index) {
NOTICE("Skipping MG CP%d related image\n",
cp_index);
break;
}
NOTICE("Load image to CP%d MG\n", cp_index);
ret = mg_image_load(single_img, image_size,
MG_CM3_SRAM_BASE(cp_index));
@ -288,7 +294,7 @@ static int split_and_load_bl2_image(void *image)
}
if (file_hdr->nr_of_imgs > MAX_NR_OF_FILES) {
ERROR("SCP_BL2 concatenated image contains to many images\n");
ERROR("SCP_BL2 concatenated image contains too many images\n");
return -1;
}