Commit 600576b4 authored by Stefan Tauner's avatar Stefan Tauner
Browse files

Add selfcheck_board_enables()


Check for NULL termination of the array, that each board has the two
main PCI ID sets defined, that coreboot vendor and model fields are either
both set or unset, and that at least either an enable function or a max
decode size is available.

Corresponding to flashrom svn r1821.
Signed-off-by: default avatarStefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
Acked-by: default avatarCarl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
parent 7ba3d6ce
......@@ -2463,6 +2463,36 @@ const struct board_match board_matches[] = {
{ 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, P3, NULL, NULL, 0, NT, NULL}, /* end marker */
};
int selfcheck_board_enables(void)
{
if (board_matches[ARRAY_SIZE(board_matches) - 1].vendor_name != NULL) {
msg_gerr("Board enables table miscompilation!\n");
return 1;
}
int ret = 0;
unsigned int i;
for (i = 0; i < ARRAY_SIZE(board_matches) - 1; i++) {
const struct board_match *b = &board_matches[i];
if (b->vendor_name == NULL || b->board_name == NULL) {
msg_gerr("ERROR: Board enable #%d does not define a vendor and board name.\n"
"Please report a bug at flashrom@flashrom.org\n", i);
ret = 1;
continue;
}
if ((b->first_vendor == 0 || b->first_device == 0 ||
b->second_vendor == 0 || b->second_device == 0) ||
((b->lb_vendor == NULL) ^ (b->lb_part == NULL)) ||
(b->max_rom_decode_parallel == 0 && b->enable == NULL)) {
msg_gerr("ERROR: Board enable for %s %s is misdefined.\n"
"Please report a bug at flashrom@flashrom.org\n",
b->vendor_name, b->board_name);
ret = 1;
}
}
return ret;
}
/* Parse the <vendor>:<board> string specified by the user as part of -p internal:mainboard=<vendor>:<board>.
* Parameters vendor and model will be overwritten. Returns 0 on success.
* Note: strtok modifies the original string, so we work on a copy and allocate memory for the results.
......
......@@ -1758,6 +1758,10 @@ int selfcheck(void)
}
}
#if CONFIG_INTERNAL == 1
ret |= selfcheck_board_enables();
#endif
/* TODO: implement similar sanity checks for other arrays where deemed necessary. */
return ret;
}
......
......@@ -260,6 +260,7 @@ void internal_delay(unsigned int usecs);
#if CONFIG_INTERNAL == 1
/* board_enable.c */
int selfcheck_board_enables(void);
int board_parse_parameter(const char *boardstring, const char **vendor, const char **model);
void w836xx_ext_enter(uint16_t port);
void w836xx_ext_leave(uint16_t port);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment