Changeset 3166

Timestamp:

Aug 14, 2012 1:19:12 AM (9 months ago)

Author:

rsmith

Message:

OLPC 1.75 - Fix EC programming breakage

The changes to support the io3790 on the CL4 broke programming on the
1.75. This fixes up the breakage.
It also factors out the dummy read into its own word called edi-start.
Not necessary for the fix but was handy during debugging.

File:

• cpu/arm/olpc/edi.fth (modified) (4 diffs)

cpu/arm/olpc/edi.fth

@@ -19 +19 @@
 : efcfg    ( -- reg# )  kb9010?  if  h# fead  else  h# fea0   then  ;
 : efcmd    ( -- reg# )  kb9010?  if  h# feac  else  h# fea7   then  ;
-: efdat    ( -- reg# )  kb9010?  if  h# feab  else  h# feaa   then  ;
+: efdat    ( -- reg# )  kb9010?  if  h# feab  else  h# feaa   then  ; \ io3731 has different read and write regs
+h# feab constant efdat-in
 : rst8051  ( -- reg# )  kb9010?  if  h# ff14  else  h# f010   then  ;
 : ecreboot ( -- reg# )  kb9010?  if  h# ff01  else  h# f018   then  ;
-
 \ Issues with .py code
 \ A14:A8 should be A15:A8 several places
@@ -141 +141 @@
 
 : finished?  ( b -- flag )
-   kb9010?  if  2 and 0=  else  h# 80 =  then
+   kb9010?  if  2 and 0=  else h# 80 and h# 80 =  then
 ;
 : wait-flash-busy  ( -- )  \ Wait for an erase/programming operation to complete
@@ -221 +221 @@
    h# 90 flash-cmd
    wait-flash-busy
-   efdat edi-b@   \ reg: efdat
-;
+   efdat-in edi-b@   \ reg: efdat
+;
+
 : trim-tune  ( -- )
 \   firmware-id  0=  if
@@ -335 +336 @@
    then
 ;
+
+\ Does a dummy ready and throws away the result.
+\ required to get the EDI interface enabled
+: edi-start ( -- )
+   h# ff22 ['] edi-b@ catch if noop else drop then
+;
+
 : edi-open  ( -- )
    \ slow-edi-clock   \ Target speed between 1 and 2 MHz
    spi-start
 
-   \ dummy read, to activate EDI and can fail so ignore the fail
-   h# ff22 ['] edi-b@ catch if noop else drop then
-   
+   edi-start
+
    set-chip-id