From 965846fcd0657bead026056e9bdc3625a534552e Mon Sep 17 00:00:00 2001 From: Julius Werner Date: Mon, 11 Jan 2021 16:07:02 -0800 Subject: cbfs: Remove prog_locate() for payloads (SELF and FIT) This patch removes the prog_locate() call for all instances of loading payload formats (SELF and FIT), as the previous patch did for stages. Signed-off-by: Julius Werner Change-Id: I582b37f36fe6f9f26975490a823e85b130ba49a2 Reviewed-on: https://review.coreboot.org/c/coreboot/+/49336 Reviewed-by: Aaron Durbin Tested-by: build bot (Jenkins) --- src/include/program_loading.h | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'src/include/program_loading.h') diff --git a/src/include/program_loading.h b/src/include/program_loading.h index 7ceecc40f2..f936c618ad 100644 --- a/src/include/program_loading.h +++ b/src/include/program_loading.h @@ -3,6 +3,7 @@ #define PROGRAM_LOADING_H #include +#include #include #include #include @@ -45,7 +46,7 @@ struct prog { * payload. For architectures that use a bounce buffer * then it would represent the bounce buffer. */ enum prog_type type; - uint32_t cbfs_type; + enum cbfs_type cbfs_type; const char *name; struct region_device rdev; /* Entry to program with optional argument. It's up to the architecture @@ -70,7 +71,7 @@ static inline enum prog_type prog_type(const struct prog *prog) return prog->type; } -static inline uint32_t prog_cbfs_type(const struct prog *prog) +static inline enum cbfs_type prog_cbfs_type(const struct prog *prog) { return prog->cbfs_type; } @@ -197,5 +198,11 @@ void payload_run(void); */ bool selfload_check(struct prog *payload, enum bootmem_type dest_type); bool selfload(struct prog *payload); +/* Like selfload_check() but with the payload data already mapped to memory. */ +bool selfload_mapped(struct prog *payload, void *mapping, + enum bootmem_type dest_type); + +/* Load a FIT payload. The payload data must already be mapped to memory. */ +void fit_payload(struct prog *payload, void *data); #endif /* PROGRAM_LOADING_H */ -- cgit v1.2.3