diff options
| -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 | ||||
| -rw-r--r-- | src/commonlib/include/commonlib/cbfs_serialized.h | 2 | ||||
| -rw-r--r-- | util/cbfstool/cbfs.h | 4 | ||||
| -rw-r--r-- | util/cbfstool/cbfs_image.c | 4 | ||||
| -rw-r--r-- | util/cbfstool/cbfstool.c | 6 | ||||
| -rw-r--r-- | util/nvramtool/cbfs.h | 2 |
8 files changed, 14 insertions, 14 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) { diff --git a/src/commonlib/include/commonlib/cbfs_serialized.h b/src/commonlib/include/commonlib/cbfs_serialized.h index 9273b35958..53b701ad71 100644 --- a/src/commonlib/include/commonlib/cbfs_serialized.h +++ b/src/commonlib/include/commonlib/cbfs_serialized.h @@ -67,7 +67,7 @@ #define CBFS_TYPE_DELETED 0x00000000 #define CBFS_TYPE_DELETED2 0xffffffff #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/util/cbfstool/cbfs.h b/util/cbfstool/cbfs.h index 2964304772..1a4f101b57 100644 --- a/util/cbfstool/cbfs.h +++ b/util/cbfstool/cbfs.h @@ -171,7 +171,7 @@ struct cbfs_payload { #define CBFS_COMPONENT_BOOTBLOCK 0x01 #define CBFS_COMPONENT_CBFSHEADER 0x02 #define CBFS_COMPONENT_STAGE 0x10 -#define CBFS_COMPONENT_PAYLOAD 0x20 +#define CBFS_COMPONENT_SELF 0x20 #define CBFS_COMPONENT_OPTIONROM 0x30 #define CBFS_COMPONENT_BOOTSPLASH 0x40 #define CBFS_COMPONENT_RAW 0x50 @@ -204,7 +204,7 @@ static struct typedesc_t filetypes[] unused = { {CBFS_COMPONENT_BOOTBLOCK, "bootblock"}, {CBFS_COMPONENT_CBFSHEADER, "cbfs header"}, {CBFS_COMPONENT_STAGE, "stage"}, - {CBFS_COMPONENT_PAYLOAD, "payload"}, + {CBFS_COMPONENT_SELF, "simple elf"}, {CBFS_COMPONENT_OPTIONROM, "optionrom"}, {CBFS_COMPONENT_BOOTSPLASH, "bootsplash"}, {CBFS_COMPONENT_RAW, "raw"}, diff --git a/util/cbfstool/cbfs_image.c b/util/cbfstool/cbfs_image.c index 306fc291bd..e5334831fd 100644 --- a/util/cbfstool/cbfs_image.c +++ b/util/cbfstool/cbfs_image.c @@ -1328,7 +1328,7 @@ int cbfs_export_entry(struct cbfs_image *image, const char *entry_name, buffer_delete(&buffer); return -1; } - } else if (ntohl(entry->type) == CBFS_COMPONENT_PAYLOAD) { + } else if (ntohl(entry->type) == CBFS_COMPONENT_SELF) { if (cbfs_payload_make_elf(&buffer, arch)) { buffer_delete(&buffer); return -1; @@ -1522,7 +1522,7 @@ int cbfs_print_entry_info(struct cbfs_image *image, struct cbfs_file *entry, CBFS_SUBHEADER(entry), fp); break; - case CBFS_COMPONENT_PAYLOAD: + case CBFS_COMPONENT_SELF: payload = (struct cbfs_payload_segment *) CBFS_SUBHEADER(entry); while (payload) { diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c index d4de409a85..27e4caeb93 100644 --- a/util/cbfstool/cbfstool.c +++ b/util/cbfstool/cbfstool.c @@ -410,7 +410,7 @@ static int cbfs_add_component(const char *filename, if (type == CBFS_COMPONENT_STAGE) attrs->position = htonl(offset + sizeof(struct cbfs_stage)); - else if (type == CBFS_COMPONENT_PAYLOAD) + else if (type == CBFS_COMPONENT_SELF) attrs->position = htonl(offset + sizeof(struct cbfs_payload)); else @@ -737,7 +737,7 @@ static int cbfs_add_payload(void) { return cbfs_add_component(param.filename, param.name, - CBFS_COMPONENT_PAYLOAD, + CBFS_COMPONENT_SELF, param.baseaddress, param.headeroffset, cbfstool_convert_mkpayload); @@ -757,7 +757,7 @@ static int cbfs_add_flat_binary(void) } return cbfs_add_component(param.filename, param.name, - CBFS_COMPONENT_PAYLOAD, + CBFS_COMPONENT_SELF, param.baseaddress, param.headeroffset, cbfstool_convert_mkflatpayload); diff --git a/util/nvramtool/cbfs.h b/util/nvramtool/cbfs.h index 3a5bddbbda..212aff96a6 100644 --- a/util/nvramtool/cbfs.h +++ b/util/nvramtool/cbfs.h @@ -67,7 +67,7 @@ typedef uint8_t u8; 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 |