[openfirmware] [commit] r3327 - cpu/x86/pc/olpc dev/olpc/spiflash

[repository service]

Author: quozl
Date: Wed Sep 26 05:50:52 2012
New Revision: 3327
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3327

Log:
OLPC XO-1 - fix inability to reflash, caused by EC being halted to find the flash size before the enough power check, but on XO-1 the flash need not change size, might also affect XO-1.5 (not yet tested).

Modified:
   cpu/x86/pc/olpc/config.fth
   dev/olpc/spiflash/spiui.fth

Modified: cpu/x86/pc/olpc/config.fth
==============================================================================
--- cpu/x86/pc/olpc/config.fth	Wed Sep 26 05:48:31 2012	(r3326)
+++ cpu/x86/pc/olpc/config.fth	Wed Sep 26 05:50:52 2012	(r3327)
@@ -2,6 +2,7 @@
 purpose: Establish configuration definitions
 
 create olpc             \ OLPC-specific build
+create olpc-cl1
 
 \ --- The environment that "boots" us ---
 \ - Image Format - Example Media - previous stage bootloader

Modified: dev/olpc/spiflash/spiui.fth
==============================================================================
--- dev/olpc/spiflash/spiui.fth	Wed Sep 26 05:48:31 2012	(r3326)
+++ dev/olpc/spiflash/spiui.fth	Wed Sep 26 05:50:52 2012	(r3327)
@@ -72,7 +72,9 @@
 [ifndef] 2meg  h# 20.0000 constant 2meg  [then]
 
 : ?image-valid   ( len -- )
+[ifndef] olpc-cl1
    flash-open   \ Sets /flash to the size of the SPI FLASH device
+[then]
    /flash <> abort" Image file is the wrong length"
 
    ." Got firmware version: "