Changeset 3395

Show
Ignore:
Timestamp:
06/29/08 03:30:41 (3 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@…>

Location:
trunk/util/flashrom
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • trunk/util/flashrom/chipset_enable.c

    r3393 r3395  
    213213        printf_debug("BOOT BIOS Straps: 0x%x (%s)\n",   bbs, 
    214214                     (bbs == 0x3) ? "LPC" : ((bbs == 0x2) ? "PCI" : "SPI")); 
     215        if (bbs >= 2) 
     216                ich7_detected = 0; 
    215217 
    216218        buc = *(volatile uint8_t *)(rcrb + 0x3414); 

  • trunk/util/flashrom/ichspi.c

    r3393 r3395  
    230230        int write_cmd = 0; 
    231231        int timeout; 
    232         uint32_t temp32; 
     232        uint32_t temp32 = 0; 
    233233        uint16_t temp16; 
    234234        uint32_t a;