From 0057262b38724ea9236335de7856dd287e440cf8 Mon Sep 17 00:00:00 2001 From: Julius Werner Date: Thu, 26 May 2022 20:29:42 -0700 Subject: 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 Change-Id: I826cefce54ade06c6612c8a7bb53e02092e7b11a Reviewed-on: https://review.coreboot.org/c/coreboot/+/64735 Tested-by: build bot (Jenkins) Reviewed-by: Yu-Ping Wu --- src/arch/arm/boot.c | 2 +- src/arch/riscv/boot.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/arch') diff --git a/src/arch/arm/boot.c b/src/arch/arm/boot.c index b18473b924..7d9f960dbc 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 119039d2e7..a59f9d15ec 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) { -- cgit v1.2.3