From 4f5bed5210a82eb5f422b72514f9c123a2234876 Mon Sep 17 00:00:00 2001 From: Patrick Rudolph Date: Wed, 2 May 2018 09:44:08 +0200 Subject: cbfs: Rename CBFS_TYPE_PAYLOAD to CBFS_TYPE_SELF MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In preparation of having FIT payloads, which aren't converted to simple ELF, rename the CBFS type payload to actually show the format the payload is encoded in. Another type CBFS_TYPE_FIT will be added to have two different payload formats. For now this is only a cosmetic change. Change-Id: I39ee590d063b3e90f6153fe655aa50e58d45e8b0 Signed-off-by: Patrick Rudolph Reviewed-on: https://review.coreboot.org/25986 Tested-by: build bot (Jenkins) Reviewed-by: Jonathan Neuschäfer Reviewed-by: Aaron Durbin Reviewed-by: Julius Werner --- payloads/libpayload/include/cbfs_core.h | 2 +- payloads/libpayload/libcbfs/cbfs.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'payloads/libpayload') diff --git a/payloads/libpayload/include/cbfs_core.h b/payloads/libpayload/include/cbfs_core.h index 1f155df0ca..da9860458c 100644 --- a/payloads/libpayload/include/cbfs_core.h +++ b/payloads/libpayload/include/cbfs_core.h @@ -67,7 +67,7 @@ components */ #define CBFS_TYPE_STAGE 0x10 -#define CBFS_TYPE_PAYLOAD 0x20 +#define CBFS_TYPE_SELF 0x20 #define CBFS_TYPE_OPTIONROM 0x30 #define CBFS_TYPE_BOOTSPLASH 0x40 #define CBFS_TYPE_RAW 0x50 diff --git a/payloads/libpayload/libcbfs/cbfs.c b/payloads/libpayload/libcbfs/cbfs.c index 3cce799fe3..f087eaa9a1 100644 --- a/payloads/libpayload/libcbfs/cbfs.c +++ b/payloads/libpayload/libcbfs/cbfs.c @@ -158,7 +158,7 @@ int cbfs_execute_stage(struct cbfs_media *media, const char *name) void *cbfs_load_payload(struct cbfs_media *media, const char *name) { return (struct cbfs_payload *)cbfs_get_file_content( - media, name, CBFS_TYPE_PAYLOAD, NULL); + media, name, CBFS_TYPE_SELF, NULL); } struct cbfs_file *cbfs_find(const char *name) { -- cgit v1.2.3