diff options
| author | Julius Werner <jwerner@chromium.org> | 2022-05-26 20:29:42 -0700 |
|---|---|---|
| committer | Julius Werner <jwerner@chromium.org> | 2022-06-01 19:45:08 +0000 |
| commit | 0057262b38724ea9236335de7856dd287e440cf8 (patch) | |
| tree | d58abd4cd922411fee4ef04bf4e126d169898851 /src | |
| parent | cc4dd88d2b21551f842302751255c6704b28bc52 (diff) | |
| download | coreboot-0057262b38724ea9236335de7856dd287e440cf8.tar.gz coreboot-0057262b38724ea9236335de7856dd287e440cf8.tar.bz2 coreboot-0057262b38724ea9236335de7856dd287e440cf8.zip | |
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/arch/arm/boot.c | 2 | ||||
| -rw-r--r-- | src/arch/riscv/boot.c | 2 | ||||
| -rw-r--r-- | src/commonlib/bsd/include/commonlib/bsd/cbfs_serialized.h | 2 | ||||
| -rw-r--r-- | src/lib/prog_loaders.c | 2 | ||||
| -rw-r--r-- | src/security/tpm/tspi/crtm.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/arch/arm/boot.c b/src/arch/arm/boot.c index b18473b924fa..7d9f960dbc98 100644 --- a/src/arch/arm/boot.c +++ b/src/arch/arm/boot.c @@ -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 diff --git a/src/arch/riscv/boot.c b/src/arch/riscv/boot.c index 119039d2e7f7..a59f9d15ec53 100644 --- a/src/arch/riscv/boot.c +++ b/src/arch/riscv/boot.c @@ -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) { diff --git a/src/commonlib/bsd/include/commonlib/bsd/cbfs_serialized.h b/src/commonlib/bsd/include/commonlib/bsd/cbfs_serialized.h index dc80ed0d3db8..be5c9cdc00a7 100644 --- a/src/commonlib/bsd/include/commonlib/bsd/cbfs_serialized.h +++ b/src/commonlib/bsd/include/commonlib/bsd/cbfs_serialized.h @@ -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, diff --git a/src/lib/prog_loaders.c b/src/lib/prog_loaders.c index 0b68805bc0d1..0139ca4099e3 100644 --- a/src/lib/prog_loaders.c +++ b/src/lib/prog_loaders.c @@ -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; diff --git a/src/security/tpm/tspi/crtm.c b/src/security/tpm/tspi/crtm.c index 41f6a9483a41..24133d9f9fc5 100644 --- a/src/security/tpm/tspi/crtm.c +++ b/src/security/tpm/tspi/crtm.c @@ -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: |