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

fvp: Remove call to bl2_get_ns_mem_layout() function 

On FVP platforms, for now it is assumed that the normal-world
bootloader is already sitting in its final memory location.
Therefore, BL2 doesn't need to load it and so it doesn't need
to know the extents of the non-trusted DRAM.

Change-Id: I33177ab43ca242edc8958f2fa8d994e7cf3e0843
This commit is contained in:
Sandrine Bailleux 2013-11-19 17:14:22 +00:00 committed by Dan Handley
parent 295538bc37
commit 942f405357
1 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
plat/fvp/bl2_plat_setup.c
View File

@ -62,19 +62,11 @@ static meminfo bl2_tzram_layout
__attribute__ ((aligned(PLATFORM_CACHE_LINE_SIZE), __attribute__ ((aligned(PLATFORM_CACHE_LINE_SIZE),
section("tzfw_coherent_mem"))); section("tzfw_coherent_mem")));
/* Data structure which holds the extents of the non-trusted DRAM for BL2*/
static meminfo dram_layout;
meminfo bl2_get_sec_mem_layout(void) meminfo bl2_get_sec_mem_layout(void)
{ {
return bl2_tzram_layout; return bl2_tzram_layout;
} }
meminfo bl2_get_ns_mem_layout(void)
{
return dram_layout;
}
/******************************************************************************* /*******************************************************************************
* BL1 has passed the extents of the trusted SRAM that should be visible to BL2 * BL1 has passed the extents of the trusted SRAM that should be visible to BL2
* in x0. This memory layout is sitting at the base of the free trusted SRAM. * in x0. This memory layout is sitting at the base of the free trusted SRAM.
@ -98,24 +90,13 @@ void bl2_early_platform_setup(meminfo *mem_layout,
} }
/******************************************************************************* /*******************************************************************************
* Not much to do here aprt from finding out the extents of non-trusted DRAM * Perform platform specific setup. For now just initialize the memory location
* which will be used for loading the non-trusted software images. We are * to use for passing arguments to BL31.
* relying on pre-iniitialized zi memory so there is nothing to zero out like
* in BL1. This is 'cause BL2 is raw PIC binary. Its load address is determined
* at runtime. The ZI section might be lost if its not already there.
******************************************************************************/ ******************************************************************************/
void bl2_platform_setup() void bl2_platform_setup()
{ {
dram_layout.total_base = DRAM_BASE;
dram_layout.total_size = DRAM_SIZE;
dram_layout.free_base = DRAM_BASE;
dram_layout.free_size = DRAM_SIZE;
dram_layout.attr = 0;
/* Use the Trusted DRAM for passing args to BL31 */ /* Use the Trusted DRAM for passing args to BL31 */
bl2_el_change_mem_ptr = (unsigned char **) TZDRAM_BASE; bl2_el_change_mem_ptr = (unsigned char **) TZDRAM_BASE;
return;
} }
/******************************************************************************* /*******************************************************************************