From dc37dab7fda215b996867eff5c4511b09f7aa37a Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Wed, 9 Sep 2015 16:46:00 +0200 Subject: 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 Reviewed-on: http://review.coreboot.org/11626 Reviewed-by: Aaron Durbin Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel --- util/cbfstool/cbfs_image.c | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) (limited to 'util/cbfstool/cbfs_image.c') diff --git a/util/cbfstool/cbfs_image.c b/util/cbfstool/cbfs_image.c index c40bd66411..c2f0b37c53 100644 --- a/util/cbfstool/cbfs_image.c +++ b/util/cbfstool/cbfs_image.c @@ -52,31 +52,6 @@ /* Type and format */ -struct typedesc_t { - uint32_t type; - const char *name; -}; - -static const struct typedesc_t types_cbfs_entry[] = { - {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"}, - {0, NULL} -}; - static const struct typedesc_t types_cbfs_compression[] = { {CBFS_COMPRESS_NONE, "none"}, {CBFS_COMPRESS_LZMA, "LZMA"}, @@ -102,7 +77,7 @@ static int lookup_type_by_name(const struct typedesc_t *desc, const char *name) static const char *get_cbfs_entry_type_name(uint32_t type) { - return lookup_name_by_type(types_cbfs_entry, type, "(unknown)"); + return lookup_name_by_type(filetypes, type, "(unknown)"); } int cbfs_parse_comp_algo(const char *name) -- cgit v1.2.3