sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cbfs: Remove prog_locate() for payloads (SELF and FIT)

Browse Source 
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 <jwerner@chromium.org>
Change-Id: I582b37f36fe6f9f26975490a823e85b130ba49a2
Reviewed-on: https://review.coreboot.org/c/coreboot/+/49336
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Julius Werner
2021-01-11 16:07:02 -08:00
parent 1de8708fe5
commit 965846fcd0
9 changed files with 46 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/bootmem.h
View File

@@ -17,6 +17,8 @@
* Start at 0x10000 to make sure that the caller doesn't provide LB_MEM tags.
*/
enum bootmem_type {
BM_MEM_INVALID = 0, /* Invalid type (used in optional arguments). */
BM_MEM_FIRST = 0x10000, /* First entry in this list */
BM_MEM_RAM, /* Memory anyone can use */
BM_MEM_RESERVED, /* Don't use this memory region */

10
src/include/fit_payload.h
View File

@@ -1,10 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
#ifndef __FIT_PAYLOAD_H_
#define __FIT_PAYLOAD_H_
#include <program_loading.h>
void fit_payload(struct prog *payload);
#endif /* __FIT_PAYLOAD_H_ */

11
src/include/program_loading.h
View File

@@ -3,6 +3,7 @@
#define PROGRAM_LOADING_H
#include <bootmem.h>
#include <commonlib/bsd/cbfs_serialized.h>
#include <commonlib/region.h>
#include <stdint.h>
#include <stddef.h>
@@ -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 */