Changeset 2153

Timestamp:

Jan 27, 2011 1:13:35 AM (2 years ago)

Author:

quozl

Message:

Remove machine signature check as it serves no purpose ... flashing
wrong file is prevented by the changed crc-offset in addrs.fth. Move
unused check-firmware-image into [if].

File:

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

dev/olpc/spiflash/spiui.fth

@@ -43 +43 @@
 \ Perform a series of sanity checks on the new firmware image.
 
-: check-firmware-image  ( adr len -- adr len )
-   dup /flash <>  abort" Wrong image length"      ( adr len )
-   2dup +  h# 40 -                                ( adr len signature-adr )
-   dup " CL1" comp  abort" No firmware signature" ( adr len signature-adr )
-   ." Firmware: " h# 10 type                      ( adr len )
-   \ XXX add some more sanity checks
-;
-
 [ifdef] load-base
 : flash-buf  load-base  ;
@@ -77 +69 @@
 
    ." Got firmware version: "
-   flash-buf h# f.ffc0 +  dup  h# 10  type cr  ( adr )
-   " CL1" comp  abort" Wrong machine type"
+   flash-buf h# f.ffc0 +  h# 10  type cr
 
    ?crc
@@ -281 +272 @@
 : erase-firmware  ( -- )
    h# 100000 /flash-block  do   (cr i .x  i flash-erase-block  /flash-block +loop  cr
+;
+
+: check-firmware-image  ( adr len -- adr len )
+   dup /flash <>  abort" Wrong image length"      ( adr len )
+   2dup +  h# 40 -                                ( adr len signature-adr )
+   dup " CL1" comp  abort" No firmware signature" ( adr len signature-adr )
+   ." Firmware: " h# 10 type                      ( adr len )
+   \ XXX add some more sanity checks
 ;