summaryrefslogtreecommitdiff
path: root/util/cbfstool/common.c
diff options
context:
space:
mode:
authorPatrick Georgi <pgeorgi@chromium.org>2015-09-09 16:46:00 +0200
committerPatrick Georgi <pgeorgi@google.com>2015-09-14 16:27:36 +0000
commitdc37dab7fda215b996867eff5c4511b09f7aa37a (patch)
tree5300408976f1e5b8c0e4a8cbf48773ba92a27b13 /util/cbfstool/common.c
parent98e0ac00b9cd5a1ba87b2e965584a37078c58e42 (diff)
cbfstool: drop extra copy of filetype->string map
We had two mappings of filetype IDs to strings. We shouldn't. Change-Id: I08e478b92f3316139f14294e50ede657c7d5fb01 Signed-off-by: Patrick Georgi <pgeorgi@chromium.org> Reviewed-on: http://review.coreboot.org/11626 Reviewed-by: Aaron Durbin <adurbin@chromium.org> Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Diffstat (limited to 'util/cbfstool/common.c')
-rw-r--r--util/cbfstool/common.c24
1 files changed, 1 insertions, 23 deletions
diff --git a/util/cbfstool/common.c b/util/cbfstool/common.c
index d72db38ed4..f8ce2f9e12 100644
--- a/util/cbfstool/common.c
+++ b/util/cbfstool/common.c
@@ -177,28 +177,6 @@ const char *arch_to_string(uint32_t a)
return ret;
}
-static struct filetypes_t {
- uint32_t type;
- const char *name;
-} filetypes[] = {
- {CBFS_COMPONENT_STAGE, "stage"},
- {CBFS_COMPONENT_PAYLOAD, "payload"},
- {CBFS_COMPONENT_OPTIONROM, "optionrom"},
- {CBFS_COMPONENT_BOOTSPLASH, "bootsplash"},
- {CBFS_COMPONENT_RAW, "raw"},
- {CBFS_COMPONENT_VSA, "vsa"},
- {CBFS_COMPONENT_MBI, "mbi"},
- {CBFS_COMPONENT_MICROCODE, "microcode"},
- {CBFS_COMPONENT_FSP, "fsp"},
- {CBFS_COMPONENT_MRC, "mrc"},
- {CBFS_COMPONENT_CMOS_DEFAULT, "cmos default"},
- {CBFS_COMPONENT_CMOS_LAYOUT, "cmos layout"},
- {CBFS_COMPONENT_SPD, "spd"},
- {CBFS_COMPONENT_MRC_CACHE, "mrc_cache"},
- {CBFS_COMPONENT_DELETED, "deleted"},
- {CBFS_COMPONENT_NULL, "null"}
-};
-
void print_supported_filetypes(void)
{
int i, number = ARRAY_SIZE(filetypes);
@@ -213,7 +191,7 @@ void print_supported_filetypes(void)
uint64_t intfiletype(const char *name)
{
size_t i;
- for (i = 0; i < (sizeof(filetypes) / sizeof(struct filetypes_t)); i++)
+ for (i = 0; i < (sizeof(filetypes) / sizeof(struct typedesc_t)); i++)
if (strcmp(filetypes[i].name, name) == 0)
return filetypes[i].type;
return -1;