diff options
| author | Patrick Rudolph <patrick.rudolph@9elements.com> | 2018-05-02 09:44:08 +0200 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2018-05-04 10:30:24 +0000 |
| commit | 4f5bed5210a82eb5f422b72514f9c123a2234876 (patch) | |
| tree | 880ac32c920dfe2f022b86285682dd82b9599e40 /payloads | |
| parent | 41aa5ec2d672f84c9e1651654ecd289c9d2b24b2 (diff) | |
cbfs: Rename CBFS_TYPE_PAYLOAD to CBFS_TYPE_SELF
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 <patrick.rudolph@9elements.com>
Reviewed-on: https://review.coreboot.org/25986
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
Diffstat (limited to 'payloads')
| -rw-r--r-- | payloads/coreinfo/cbfs_module.c | 6 | ||||
| -rw-r--r-- | payloads/libpayload/include/cbfs_core.h | 2 | ||||
| -rw-r--r-- | payloads/libpayload/libcbfs/cbfs.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/payloads/coreinfo/cbfs_module.c b/payloads/coreinfo/cbfs_module.c index d9f7b24fd7..ee759352bf 100644 --- a/payloads/coreinfo/cbfs_module.c +++ b/payloads/coreinfo/cbfs_module.c @@ -28,7 +28,7 @@ #define COMPONENT_BOOTBLOCK 0x01 #define COMPONENT_CBFSHEADER 0x02 #define COMPONENT_STAGE 0x10 -#define COMPONENT_PAYLOAD 0x20 +#define COMPONENT_SELF 0x20 #define COMPONENT_OPTIONROM 0x30 #define COMPONENT_RAW 0x50 #define COMPONENT_MICROCODE 0x53 @@ -187,8 +187,8 @@ static int cbfs_module_redraw(WINDOW * win) case COMPONENT_STAGE: mvwprintw(win, row++, 38, "stage"); break; - case COMPONENT_PAYLOAD: - mvwprintw(win, row++, 38, "payload"); + case COMPONENT_SELF: + mvwprintw(win, row++, 38, "simple ELF"); break; case COMPONENT_OPTIONROM: mvwprintw(win, row++, 38, "optionrom"); 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) { |