GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cbfs: Rename TYPE_FIT to TYPE_FIT_PAYLOAD 

There are too many "FIT" in firmware land. In order to reduce possible
confusion of CBFS_TYPE_FIT with the Intel Firmware Interface Table, this
patch renames it to CBFS_TYPE_FIT_PAYLOAD (including the cbfstool
argument, so calling scripts will now need to replace `-t fit` with `-t
fit_payload`).

Signed-off-by: Julius Werner <jwerner@chromium.org>
Change-Id: I826cefce54ade06c6612c8a7bb53e02092e7b11a
Reviewed-on: https://review.coreboot.org/c/coreboot/+/64735
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Yu-Ping Wu <yupingso@google.com>
This commit is contained in:
Julius Werner 2022-05-26 20:29:42 -07:00
parent cc4dd88d2b
commit 0057262b38
8 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/arch/arm/boot.c
View File

@ -13,7 +13,7 @@ void arch_prog_run(struct prog *prog)
cache_sync_instructions();
switch (prog_cbfs_type(prog)) {
case CBFS_TYPE_FIT:
case CBFS_TYPE_FIT_PAYLOAD:
/*
* We only load Linux payloads from the ramstage, so provide a hint to
* the linker that the below functions do not need to be included in

2
src/arch/riscv/boot.c
View File

@ -27,7 +27,7 @@ static void do_arch_prog_run(struct arch_prog_run_args *args)
struct prog *prog = args->prog;
void *fdt = HLS()->fdt;
if (prog_cbfs_type(prog) == CBFS_TYPE_FIT)
if (prog_cbfs_type(prog) == CBFS_TYPE_FIT_PAYLOAD)
fdt = prog_entry_arg(prog);
if (ENV_RAMSTAGE && prog_type(prog) == PROG_PAYLOAD) {

2
src/commonlib/bsd/include/commonlib/bsd/cbfs_serialized.h
View File

@ -23,7 +23,7 @@ enum cbfs_type {
CBFS_TYPE_LEGACY_STAGE = 0x10,
CBFS_TYPE_STAGE = 0x11,
CBFS_TYPE_SELF = 0x20,
CBFS_TYPE_FIT = 0x21,
CBFS_TYPE_FIT_PAYLOAD = 0x21,
CBFS_TYPE_OPTIONROM = 0x30,
CBFS_TYPE_BOOTSPLASH = 0x40,
CBFS_TYPE_RAW = 0x50,

2
src/lib/prog_loaders.c
View File

@ -160,7 +160,7 @@ void payload_load(void)
case CBFS_TYPE_SELF: /* Simple ELF */
selfload_mapped(payload, mapping, BM_MEM_RAM);
break;
case CBFS_TYPE_FIT: /* Flattened image tree */
case CBFS_TYPE_FIT_PAYLOAD: /* Flattened image tree */
if (CONFIG(PAYLOAD_FIT_SUPPORT)) {
fit_payload(payload, mapping);
break;

2
src/security/tpm/tspi/crtm.c
View File

@ -131,7 +131,7 @@ uint32_t tspi_cbfs_measurement(const char *name, uint32_t type, const struct vb2
case CBFS_TYPE_MRC:
case CBFS_TYPE_STAGE:
case CBFS_TYPE_SELF:
case CBFS_TYPE_FIT:
case CBFS_TYPE_FIT_PAYLOAD:
pcr_index = TPM_CRTM_PCR;
break;
default:

2
util/cbfstool/cbfs.h
View File

@ -33,7 +33,7 @@ static struct typedesc_t filetypes[] unused = {
{CBFS_TYPE_CBFSHEADER, "cbfs header"},
{CBFS_TYPE_STAGE, "stage"},
{CBFS_TYPE_SELF, "simple elf"},
{CBFS_TYPE_FIT, "fit"},
{CBFS_TYPE_FIT_PAYLOAD, "fit_payload"},
{CBFS_TYPE_OPTIONROM, "optionrom"},
{CBFS_TYPE_BOOTSPLASH, "bootsplash"},
{CBFS_TYPE_RAW, "raw"},

2
util/cbfstool/cbfstool.c
View File

@ -1196,7 +1196,7 @@ static int cbfstool_convert_mkpayload(struct buffer *buffer,
if (ret != 0) {
ret = parse_fit_to_payload(buffer, &output, param.compression);
if (ret == 0)
header->type = htobe32(CBFS_TYPE_FIT);
header->type = htobe32(CBFS_TYPE_FIT_PAYLOAD);
}
/* If it's not an FIT, see if it's a UEFI FV */

18
util/nvramtool/cbfs.h
View File

@ -24,15 +24,15 @@ typedef uint8_t u8;
Users are welcome to use any other value for their
components */
#define CBFS_TYPE_STAGE 0x10
#define CBFS_TYPE_SELF 0x20
#define CBFS_TYPE_FIT 0x21
#define CBFS_TYPE_OPTIONROM 0x30
#define CBFS_TYPE_BOOTSPLASH 0x40
#define CBFS_TYPE_RAW 0x50
#define CBFS_TYPE_VSA 0x51
#define CBFS_TYPE_MBI 0x52
#define CBFS_TYPE_MICROCODE 0x53
#define CBFS_TYPE_STAGE 0x10
#define CBFS_TYPE_SELF 0x20
#define CBFS_TYPE_FIT_PAYLOAD 0x21
#define CBFS_TYPE_OPTIONROM 0x30
#define CBFS_TYPE_BOOTSPLASH 0x40
#define CBFS_TYPE_RAW 0x50
#define CBFS_TYPE_VSA 0x51
#define CBFS_TYPE_MBI 0x52
#define CBFS_TYPE_MICROCODE 0x53
#define CBFS_COMPONENT_CMOS_DEFAULT 0xaa
#define CBFS_COMPONENT_CMOS_LAYOUT 0x01aa