openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-07-01 14:11:15 +02:00
Code Issues Releases Wiki Activity

Fix flashrom running on boards with coreboot

Browse Source 
In r1577 we removed the discrimination of coreboot IDs and user-specified
mainboards. The problem is that the board enable code required to find
a board enable if either of these model strings were set. Therefore boards
running coreboot that do not need a board enable failed to execute flashrom
since then. This patch fixes this by handling coreboot IDs and user-supplied
IDs differently again.

Corresponding to flashrom svn r1605.

Signed-off-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
Acked-by: Idwer Vollering <vidwer@gmail.com>
This commit is contained in:
Stefan Tauner
2012-09-24 21:29:29 +00:00
parent 4e6d346c6e
commit fa9fa7131a
3 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
board_enable.c
View File

@ -2499,7 +2499,6 @@ static const struct board_match *board_match_name(const char *vendor, const char
if (partmatch)
return partmatch;
msg_perr("No suitable board enable found for vendor=\"%s\", model=\"%s\".\n", vendor, model);
return NULL;
}
@ -2609,16 +2608,27 @@ void board_handle_before_laptop(void)
board_handle_phase(P2);
}
int board_flash_enable(const char *vendor, const char *model)
int board_flash_enable(const char *vendor, const char *model, const char *cb_vendor, const char *cb_model)
{
const struct board_match *board = NULL;
int ret = 0;
if (vendor && model) {
if (vendor != NULL && model != NULL) {
board = board_match_name(vendor, model);
if (!board) /* if a board was given it has to match, else we abort here. */
if (!board) { /* If a board was given by the user it has to match, else we abort here. */
msg_perr("No suitable board enable found for vendor=\"%s\", model=\"%s\".\n",
vendor, model);
return 1;
} else {
}
}
if (board == NULL && cb_vendor != NULL && cb_model != NULL) {
board = board_match_name(cb_vendor, cb_model);
if (!board) { /* Failure is an option here, because many cb boards don't require an enable. */
msg_pdbg2("No board enable found matching coreboot IDs vendor=\"%s\", model=\"%s\".\n",
cb_vendor, cb_model);
}
}
if (board == NULL) {
board = board_match_pci_ids(P3);
if (!board) /* i.e. there is just no board enable available for this board */
return 0;