Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-19 19:14:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

uniphier: terminate boot if SCP_BL2 image is missing in SCP boot mode

Browse source 
Skipping SCP_BL2 image is just a temporary workaround. If on-chip SCP
needs to work, BL2 should load the SCP_BL2 image.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
This commit is contained in:
Masahiro Yamada 2018-10-04 14:54:49 +09:00
parent 9aabd11a42
commit 8be7850fd6
3 changed files with 0 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
plat/socionext/uniphier/uniphier.h
View file

@ -41,7 +41,6 @@ int uniphier_nand_init(uintptr_t *block_dev_spec);
int uniphier_usb_init(unsigned int soc, uintptr_t *block_dev_spec); int uniphier_usb_init(unsigned int soc, uintptr_t *block_dev_spec);
int uniphier_io_setup(unsigned int soc); int uniphier_io_setup(unsigned int soc);
int uniphier_check_image(unsigned int image_id);
struct image_info; struct image_info;
struct image_info *uniphier_get_image_info(unsigned int image_id); struct image_info *uniphier_get_image_info(unsigned int image_id);

10
plat/socionext/uniphier/uniphier_bl2_setup.c
View file

@ -88,16 +88,6 @@ void bl2_el3_plat_arch_setup(void)
break; break;
} }
if (!skip_scp) {
ret = uniphier_check_image(SCP_BL2_IMAGE_ID);
if (ret) {
WARN("SCP_BL2 image not found. SCP_BL2 load will be skipped.\n");
WARN("You must setup SCP by other means.\n");
skip_scp = 1;
uniphier_bl2_kick_scp = 0;
}
}
if (skip_scp) { if (skip_scp) {
struct image_info *image_info; struct image_info *image_info;

18
plat/socionext/uniphier/uniphier_io_storage.c
View file

@ -335,21 +335,3 @@ int plat_get_image_source(unsigned int image_id, uintptr_t *dev_handle,
return io_dev_init(*dev_handle, init_params); return io_dev_init(*dev_handle, init_params);
} }
int uniphier_check_image(unsigned int image_id)
{
uintptr_t dev_handle, image_spec, image_handle;
int ret;
ret = plat_get_image_source(image_id, &dev_handle, &image_spec);
if (ret)
return ret;
ret = io_open(dev_handle, image_spec, &image_handle);
if (ret)
return ret;
io_close(image_handle);
return 0;
}