Changeset 3086

Timestamp:

Jul 27, 2012 4:55:18 AM (10 months ago)

Author:

wmb

Message:

OLPC SPIFLASH driver - handle 2 MB parts.

File:

• dev/olpc/spiflash/spiflash.fth (modified) (3 diffs)

dev/olpc/spiflash/spiflash.fth

@@ -199 +199 @@
    3drop
 ;
+
+: null-write  ( adr len offset -- )  3drop  ;
 
 \ This version is for SST parts, which use an auto-increment
@@ -307 +309 @@
       h# 34  of  ['] common-write  endof
       h# bf  of  ['] sst-write     endof
-      h# 14  of
-         ." The SPI FLASH ID reads as 14.  This is due to an infrequent hardware problem."  cr
-         ." If you power cycle and try again, it will probably work the next time." cr
-         abort
-      endof
-      ( default )  true abort" Unsupported SPI FLASH ID"
+      h# 14  of  ['] common-write  endof     
+\ On some old board the ID would read as 14 when it should have been something else.
+\ On CL4, 14 is the expected ID.
+\         ." The SPI FLASH ID reads as 14.  This is due to an infrequent hardware problem."  cr
+\         ." If you power cycle and try again, it will probably work the next time." cr
+\         abort
+\      endof
+
+\      ( default )  true abort" Unsupported SPI FLASH ID"
+       ( default )  ." Bad SPI FLASH ID " dup . cr  ['] null-write swap
    endcase
    to write-spi-flash
@@ -327 +333 @@
       spi-id#  case
          h# 13  of  ." type 13 - Spansion, Winbond, or ST"  endof
+         h# 14  of  ." type 14 - 2 MB"  endof
          h# 34  of  ." type 34 - Macronyx"  endof
       endcase