diff options
| author | Sandrine Bailleux <sandrine.bailleux@arm.com> | 2014-06-05 17:37:59 +0100 |
|---|---|---|
| committer | Sandrine Bailleux <sandrine.bailleux@arm.com> | 2014-06-05 17:39:40 +0100 |
| commit | 96a470a28d2f71f4b6448a4c39d0891feafbeacf (patch) | |
| tree | a028b3965c231d26e5aaef586b5ab9441c0674a3 | |
| parent | 4be58a282d7e3dd7164a25d9ecc7791c4f047afb (diff) | |
juno: Clean a few details in BL2 & BL3-1 plat setup code
Change-Id: Id1cd218baf4e35ad2e82e413b030ac96763a8104
| -rw-r--r-- | plat/juno/bl2_plat_setup.c | 10 | ||||
| -rw-r--r-- | plat/juno/bl31_plat_setup.c | 6 |
2 files changed, 9 insertions, 7 deletions
diff --git a/plat/juno/bl2_plat_setup.c b/plat/juno/bl2_plat_setup.c index 5f70322..8ce09c9 100644 --- a/plat/juno/bl2_plat_setup.c +++ b/plat/juno/bl2_plat_setup.c @@ -67,9 +67,6 @@ extern unsigned long __COHERENT_RAM_END__; #define BL2_COHERENT_RAM_BASE (unsigned long)(&__COHERENT_RAM_START__) #define BL2_COHERENT_RAM_LIMIT (unsigned long)(&__COHERENT_RAM_END__) -/* Pointer to memory visible to both BL2 and BL3-1 for passing data */ -extern unsigned char **bl2_el_change_mem_ptr; - /* Data structure which holds the extents of the trusted RAM for BL2 */ static meminfo_t bl2_tzram_layout __attribute__ ((aligned(PLATFORM_CACHE_LINE_SIZE), @@ -254,7 +251,7 @@ void bl2_plat_flush_bl31_params(void) * Perform the very early platform specific architectural setup here. At the * moment this is only intializes the mmu in a quick and dirty way. ******************************************************************************/ -void bl2_plat_arch_setup() +void bl2_plat_arch_setup(void) { configure_mmu_el1(bl2_tzram_layout.total_base, bl2_tzram_layout.total_size, @@ -264,7 +261,6 @@ void bl2_plat_arch_setup() BL2_COHERENT_RAM_LIMIT); } - /******************************************************************************* * Before calling this function BL31 is loaded in memory and its entrypoint * is set by load_image. This is a placeholder for the platform to change @@ -272,7 +268,7 @@ void bl2_plat_arch_setup() * On Juno we are only setting the security state, entrypoint ******************************************************************************/ void bl2_plat_set_bl31_ep_info(image_info_t *bl31_image_info, - entry_point_info_t *bl31_ep_info) + entry_point_info_t *bl31_ep_info) { SET_SECURITY_STATE(bl31_ep_info->h.attr, SECURE); bl31_ep_info->spsr = SPSR_64(MODE_EL3, MODE_SP_ELX, @@ -287,7 +283,7 @@ void bl2_plat_set_bl31_ep_info(image_info_t *bl31_image_info, * On Juno we are only setting the security state, entrypoint ******************************************************************************/ void bl2_plat_set_bl32_ep_info(image_info_t *bl32_image_info, - entry_point_info_t *bl32_ep_info) + entry_point_info_t *bl32_ep_info) { SET_SECURITY_STATE(bl32_ep_info->h.attr, SECURE); /* diff --git a/plat/juno/bl31_plat_setup.c b/plat/juno/bl31_plat_setup.c index 1ab2d98..71861d3 100644 --- a/plat/juno/bl31_plat_setup.c +++ b/plat/juno/bl31_plat_setup.c @@ -107,6 +107,12 @@ void bl31_early_platform_setup(bl31_params_t *from_bl2, /* Initialize the console to provide early debug support */ console_init(PL011_UART0_BASE); + /* + * Check params passed from BL2 should not be NULL, + * We are not checking plat_params_from_bl2 as NULL as we are not + * using it on Juno + */ + assert(from_bl2 != NULL); assert(from_bl2->h.type == PARAM_BL31); assert(from_bl2->h.version >= VERSION_1); |