Changeset 3180

Timestamp:

Aug 16, 2012 4:01:14 AM (9 months ago)

Author:

rsmith

Message:

OLPC ARM - Refactor EDI start procedure

Reboot after reflash did not work because the EC chip ID (io3731 vs
io3790) was not set in the series of calls that the OFW flash makes.
Refactor the EDI startup so that there is a common EDI enable routine
for other words to call.

Location:

cpu/arm/olpc

Files:

• build-fw.fth (modified) (1 diff)
• edi.fth (modified) (2 diffs)

cpu/arm/olpc/build-fw.fth

@@ -203 +203 @@
 : ignore-power-button  ( -- )
    edi-spi-start
+   edi-open-active
    ['] reset-8051 catch if
       ['] reset-8051 catch if ." Write Protected EC" cr then

cpu/arm/olpc/edi.fth

@@ -336 +336 @@
    then
 ;
-
-\ Does a dummy ready and throws away the result.
-\ required to get the EDI interface enabled
-: edi-start ( -- )
+\ This is used to start EDI from routines where you do not want to
+\ put the EC into reset.  ie the mfg tag reading routines
+: edi-open-active  ( -- )
+   spi-start
+
+   \ Does a dummy ready and throws away the result.
+   \ required to get the EDI interface enabled
    h# ff22 ['] edi-b@ catch if noop else drop then
-;
-
+
+   set-chip-id
+
+   select-flash
+;
+\ Full EDI startup sequece.  Used when you want to reprogram the EC.
 : edi-open  ( -- )
-   \ slow-edi-clock   \ Target speed between 1 and 2 MHz
-   spi-start
-
-   edi-start
-
-   set-chip-id
-
-   \ The first operation often fails so retry it
-   ['] select-flash  catch  if  select-flash  then
+   edi-open-active
+
    reset-8051
 
@@ -361 +361 @@
       trim-tune
    then
-   \ fast-edi-clock   \ Target speed up to 16 MHz
-   \ reset
-;
-: edi-open-active  ( -- )
-   spi-start
-   ['] select-flash  catch  if  select-flash  then
-;
-
+;
 \ LICENSE_BEGIN
 \ Copyright (c) 2011 FirmWorks