diff options
| author | Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> | 2011-09-08 00:00:29 +0000 |
|---|---|---|
| committer | Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> | 2011-09-08 00:00:29 +0000 |
| commit | 2e681601b10c26e0293f285dfcb17d006349e450 (patch) | |
| tree | c4bbc8a1958eeae3521810d75d2b90f4bd85625c /it87spi.c | |
| parent | cb24ddbe128eb2ad7ef6e0ef11c4cec461dbbe44 (diff) | |
| download | ast2050-flashrom-2e681601b10c26e0293f285dfcb17d006349e450.zip ast2050-flashrom-2e681601b10c26e0293f285dfcb17d006349e450.tar.gz | |
Change programmer selection in cli and generic code
Bugfix: Do not accept multiple conflicting --programmer selections.
Restriction: Do not accept multiple --programmer selections even if
there is no conflict.
Unexport the programmer variable.
programmer_init requires the programmer as first parameter.
The default programmer selection is now part of cli_classic.
Corresponding to flashrom svn r1433.
Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
Diffstat (limited to 'it87spi.c')
| -rw-r--r-- | it87spi.c | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -129,10 +129,8 @@ static uint16_t it87spi_probe(uint16_t port) enter_conf_mode_ite(port); /* NOLDN, reg 0x24, mask out lowest bit (suspend) */ tmp = sio_read(port, 0x24) & 0xFE; - /* If IT87SPI was not explicitly selected, we want to check - * quickly if LPC->SPI translation is active. - */ - if ((programmer == PROGRAMMER_INTERNAL) && !(tmp & (0x0E))) { + /* Check if LPC->SPI translation is active. */ + if (!(tmp & 0x0e)) { msg_pdbg("No IT87* serial flash segment enabled.\n"); exit_conf_mode_ite(port); /* Nothing to do. */ |
