Changeset 3395 for trunk/util/flashrom/chipset_enable.c

Timestamp:

06/29/08 03:30:41 (5 months ago)

Author:

stuge

Message:

flashrom: Fix ICH7 non-SPI that broke in r3393

r3393 assumed that ICH7 always used SPI. This patch resets ich7_detected back
to 0 when BOOT BIOS Straps indicate something else than SPI.

Also fixes a build error in ichspi.c with gcc 4.2.2.

Signed-off-by: Peter Stuge <peter@…>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@…>

Files:

• trunk/util/flashrom/chipset_enable.c (modified) (1 diff)

trunk/util/flashrom/chipset_enable.c

@@ -213 +213 @@
         printf_debug("BOOT BIOS Straps: 0x%x (%s)\n",   bbs,
                      (bbs == 0x3) ? "LPC" : ((bbs == 0x2) ? "PCI" : "SPI"));
+        if (bbs >= 2)
+                ich7_detected = 0;
 
         buc = *(volatile uint8_t *)(rcrb + 0x3414);