summaryrefslogtreecommitdiff
path: root/util/cbfstool
diff options
context:
space:
mode:
Diffstat (limited to 'util/cbfstool')
-rw-r--r--util/cbfstool/cbfs.h4
-rw-r--r--util/cbfstool/cbfs_image.c4
-rw-r--r--util/cbfstool/cbfstool.c6
3 files changed, 7 insertions, 7 deletions
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);