GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Patrick Georgi 2015-09-09 16:46:00 +02:00 committed by Patrick Georgi
parent 98e0ac00b9
commit dc37dab7fd
3 changed files with 26 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
util/cbfstool/cbfs.h
View File

@ -175,6 +175,30 @@ struct cbfs_payload {
*/ */
#define CBFS_COMPONENT_NULL 0xFFFFFFFF #define CBFS_COMPONENT_NULL 0xFFFFFFFF
struct typedesc_t {
uint32_t type;
const char *name;
};
static struct typedesc_t filetypes[] unused = {
{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"}
};
#define CBFS_SUBHEADER(_p) ( (void *) ((((uint8_t *) (_p)) + ntohl((_p)->offset))) ) #define CBFS_SUBHEADER(_p) ( (void *) ((((uint8_t *) (_p)) + ntohl((_p)->offset))) )
/* cbfs_image.c */ /* cbfs_image.c */

27
util/cbfstool/cbfs_image.c
View File

@ -52,31 +52,6 @@
/* Type and format */ /* 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[] = { static const struct typedesc_t types_cbfs_compression[] = {
{CBFS_COMPRESS_NONE, "none"}, {CBFS_COMPRESS_NONE, "none"},
{CBFS_COMPRESS_LZMA, "LZMA"}, {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) 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) int cbfs_parse_comp_algo(const char *name)

24
util/cbfstool/common.c
View File

@ -177,28 +177,6 @@ const char *arch_to_string(uint32_t a)
return ret; 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) void print_supported_filetypes(void)
{ {
int i, number = ARRAY_SIZE(filetypes); int i, number = ARRAY_SIZE(filetypes);
@ -213,7 +191,7 @@ void print_supported_filetypes(void)
uint64_t intfiletype(const char *name) uint64_t intfiletype(const char *name)
{ {
size_t i; 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) if (strcmp(filetypes[i].name, name) == 0)
return filetypes[i].type; return filetypes[i].type;
return -1; return -1;