diff options
| author | Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at> | 2012-09-24 21:29:29 +0000 |
|---|---|---|
| committer | Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at> | 2012-09-24 21:29:29 +0000 |
| commit | c2e376126c6f1008241141cc858474a431203511 (patch) | |
| tree | 183ed67b551d6e3c31010bed83cb7e6bc0db2af2 /programmer.h | |
| parent | ce53d0bb564e9c67463aebd79d929cf8c7e20b90 (diff) | |
| download | flashrom-c2e376126c6f1008241141cc858474a431203511.zip flashrom-c2e376126c6f1008241141cc858474a431203511.tar.gz | |
Fix flashrom running on boards with coreboot
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>
Diffstat (limited to 'programmer.h')
| -rw-r--r-- | programmer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/programmer.h b/programmer.h index 51b9c40..dedec67 100644 --- a/programmer.h +++ b/programmer.h @@ -256,7 +256,7 @@ void sio_write(uint16_t port, uint8_t reg, uint8_t data); void sio_mask(uint16_t port, uint8_t reg, uint8_t data, uint8_t mask); void board_handle_before_superio(void); void board_handle_before_laptop(void); -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); /* chipset_enable.c */ int chipset_flash_enable(void); |
