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 /util | |
| parent | cc4dd88d2b21551f842302751255c6704b28bc52 (diff) | |
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 'util')
| -rw-r--r-- | util/cbfstool/cbfs.h | 2 | ||||
| -rw-r--r-- | util/cbfstool/cbfstool.c | 2 | ||||
| -rw-r--r-- | util/nvramtool/cbfs.h | 18 |
3 files changed, 11 insertions, 11 deletions
diff --git a/util/cbfstool/cbfs.h b/util/cbfstool/cbfs.h index 21a5d6f8c5..e1f705e6fe 100644 --- a/util/cbfstool/cbfs.h +++ b/util/cbfstool/cbfs.h @@ -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"}, diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c index cebfef6bb4..b2d5cdbda8 100644 --- a/util/cbfstool/cbfstool.c +++ b/util/cbfstool/cbfstool.c @@ -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 */ diff --git a/util/nvramtool/cbfs.h b/util/nvramtool/cbfs.h index 35b98cffd4..0bded53b44 100644 --- a/util/nvramtool/cbfs.h +++ b/util/nvramtool/cbfs.h @@ -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 |