lib/prog_loading: introduce prog_segment_loaded()
In order to not muddle arch vs chipset implementations provide a generic prog_segment_loaded() which calls platform_segment_loaded() and arch_segment_loaded() in that order. This allows the arch variants to live in src/arch while the chipset/platform code can implement their own. Change-Id: I17b6497219ec904d92bd286f18c9ec96b2b7af25 Signed-off-by: Aaron Durbin <adurbin@chromium.org> Reviewed-on: https://review.coreboot.org/14214 Reviewed-by: Furquan Shaikh <furquan@google.com> Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Andrey Petrov <andrey.petrov@intel.com>
This commit is contained in:
@@ -206,7 +206,7 @@ int cbfs_prog_stage_load(struct prog *pstage)
|
||||
/* Clear area not covered by file. */
|
||||
memset(&load[fsize], 0, stage.memlen - fsize);
|
||||
|
||||
arch_segment_loaded((uintptr_t)load, stage.memlen, SEG_FINAL);
|
||||
prog_segment_loaded((uintptr_t)load, stage.memlen, SEG_FINAL);
|
||||
|
||||
out:
|
||||
prog_set_area(pstage, load, stage.memlen);
|
||||
|
@@ -17,6 +17,18 @@
|
||||
#include <program_loading.h>
|
||||
|
||||
/* For each segment of a program loaded this function is called*/
|
||||
void prog_segment_loaded(uintptr_t start, size_t size, int flags)
|
||||
{
|
||||
platform_segment_loaded(start, size, flags);
|
||||
arch_segment_loaded(start, size, flags);
|
||||
}
|
||||
|
||||
void __attribute__ ((weak)) platform_segment_loaded(uintptr_t start,
|
||||
size_t size, int flags)
|
||||
{
|
||||
/* do nothing */
|
||||
}
|
||||
|
||||
void __attribute__ ((weak)) arch_segment_loaded(uintptr_t start, size_t size,
|
||||
int flags)
|
||||
{
|
||||
|
@@ -197,7 +197,7 @@ int rmodule_load(void *base, struct rmodule *module)
|
||||
return -1;
|
||||
rmodule_clear_bss(module);
|
||||
|
||||
arch_segment_loaded((uintptr_t)module->location,
|
||||
prog_segment_loaded((uintptr_t)module->location,
|
||||
rmodule_memory_size(module), SEG_FINAL);
|
||||
|
||||
return 0;
|
||||
|
@@ -452,7 +452,7 @@ static int load_self_segments(
|
||||
* Each architecture can perform additonal operations
|
||||
* on the loaded segment
|
||||
*/
|
||||
arch_segment_loaded((uintptr_t)dest, ptr->s_memsz,
|
||||
prog_segment_loaded((uintptr_t)dest, ptr->s_memsz,
|
||||
last_non_empty == ptr ? SEG_FINAL : 0);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user