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

ifdtool: merge region_filenames with region_name(s) 

There is no reason to keep a separate region_filenames array,
so I merge it into region_name(s).

This commit is one separated from the original I6d05418c.

Change-Id: I38489c6d3b3c161e9b0281188e6cdd0b62e38335
Signed-off-by: Bill XIE <persmule@gmail.com>
Reviewed-on: https://review.coreboot.org/21509
Reviewed-by: Nico Huber <nico.h@gmx.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Bill XIE 2017-09-12 11:31:37 +08:00 committed by Nico Huber
parent fa5f99430d
commit 1bf6506e97
2 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
util/ifdtool/ifdtool.c
View File

@ -33,15 +33,15 @@ static int selected_chip = 0;
static int platform = -1; static int platform = -1;
static const struct region_name region_names[MAX_REGIONS] = { static const struct region_name region_names[MAX_REGIONS] = {
{ "Flash Descriptor", "fd" }, { "Flash Descriptor", "fd", "flashregion_0_flashdescriptor.bin" },
{ "BIOS", "bios" }, { "BIOS", "bios", "flashregion_1_bios.bin" },
{ "Intel ME", "me" }, { "Intel ME", "me", "flashregion_2_intel_me.bin" },
{ "GbE", "gbe" }, { "GbE", "gbe", "flashregion_3_gbe.bin" },
{ "Platform Data", "pd" }, { "Platform Data", "pd", "flashregion_4_platform_data.bin" },
{ "Reserved", "res1" }, { "Reserved", "res1", "flashregion_5_reserved.bin" },
{ "Reserved", "res2" }, { "Reserved", "res2", "flashregion_6_reserved.bin" },
{ "Reserved", "res3" }, { "Reserved", "res3", "flashregion_7_reserved.bin" },
{ "EC", "ec" }, { "EC", "ec", "flashregion_8_ec.bin" },
}; };
static fdbar_t *find_fd(char *image, int size) static fdbar_t *find_fd(char *image, int size)
@ -226,24 +226,12 @@ static int region_num(const char *name)
static const char *region_filename(unsigned int region_type) static const char *region_filename(unsigned int region_type)
{ {
static const char *const region_filenames[MAX_REGIONS] = {
"flashregion_0_flashdescriptor.bin",
"flashregion_1_bios.bin",
"flashregion_2_intel_me.bin",
"flashregion_3_gbe.bin",
"flashregion_4_platform_data.bin",
"flashregion_5_reserved.bin",
"flashregion_6_reserved.bin",
"flashregion_7_reserved.bin",
"flashregion_8_ec.bin",
};
if (region_type >= max_regions) { if (region_type >= max_regions) {
fprintf(stderr, "Invalid region type %d.\n", region_type); fprintf(stderr, "Invalid region type %d.\n", region_type);
exit (EXIT_FAILURE); exit (EXIT_FAILURE);
} }
return region_filenames[region_type]; return region_names[region_type].filename;
} }
static void dump_region(unsigned int num, const frba_t *frba) static void dump_region(unsigned int num, const frba_t *frba)

1
util/ifdtool/ifdtool.h
View File

@ -142,4 +142,5 @@ typedef struct {
struct region_name { struct region_name {
const char *pretty; const char *pretty;
const char *terse; const char *terse;
const char *filename;
}; };