Remove concept of top/bottom image loading
This concept is no longer required since we now support loading of
images at fixed addresses only.
The image loader now automatically detects the position of the image
inside the current memory layout and updates the layout such that
memory fragmentation is minimised.
The 'attr' field of the meminfo data structure, which used to hold
the bottom/top loading information, has been removed. Also the 'next'
field has been removed as it wasn't used anywhere.
The 'init_bl2_mem_layout()' function has been moved out of common
code and put in BL1-specific code. It has also been renamed into
'bl1_init_bl2_mem_layout'.
Fixes ARM-software/tf-issues#109
Change-Id: I3f54642ce7b763d5ee3b047ad0ab59eabbcf916d
diff --git a/plat/fvp/bl2_fvp_setup.c b/plat/fvp/bl2_fvp_setup.c
index a030bd5..5a10733 100644
--- a/plat/fvp/bl2_fvp_setup.c
+++ b/plat/fvp/bl2_fvp_setup.c
@@ -171,12 +171,7 @@
console_init(PL011_UART0_BASE);
/* Setup the BL2 memory layout */
- bl2_tzram_layout.total_base = mem_layout->total_base;
- bl2_tzram_layout.total_size = mem_layout->total_size;
- bl2_tzram_layout.free_base = mem_layout->free_base;
- bl2_tzram_layout.free_size = mem_layout->free_size;
- bl2_tzram_layout.attr = mem_layout->attr;
- bl2_tzram_layout.next = 0;
+ bl2_tzram_layout = *mem_layout;
/* Initialize the platform config for future decision making */
fvp_config_setup();
@@ -276,8 +271,6 @@
(TSP_SEC_MEM_BASE + TSP_SEC_MEM_SIZE) - BL32_BASE;
bl32_meminfo->free_size =
(TSP_SEC_MEM_BASE + TSP_SEC_MEM_SIZE) - BL32_BASE;
- bl32_meminfo->attr = BOT_LOAD;
- bl32_meminfo->next = 0;
}
@@ -290,6 +283,4 @@
bl33_meminfo->total_size = DRAM_SIZE - DRAM1_SEC_SIZE;
bl33_meminfo->free_base = DRAM_BASE;
bl33_meminfo->free_size = DRAM_SIZE - DRAM1_SEC_SIZE;
- bl33_meminfo->attr = 0;
- bl33_meminfo->attr = 0;
}