From 2e681601b10c26e0293f285dfcb17d006349e450 Mon Sep 17 00:00:00 2001 From: Carl-Daniel Hailfinger Date: Thu, 8 Sep 2011 00:00:29 +0000 Subject: 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 Acked-by: Stefan Tauner --- it87spi.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'it87spi.c') diff --git a/it87spi.c b/it87spi.c index 46779ee..5fe74ce 100644 --- a/it87spi.c +++ b/it87spi.c @@ -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. */ -- cgit v1.1