Changeset 3359

Timestamp:

Oct 11, 2012 2:55:36 AM (7 months ago)

Author:

quozl

Message:

OLPC - make SPI and EC flash animation scale calculation at run time, tested on XO-4

Files:

• cpu/arm/olpc/1.75/config-a1.fth (modified) (1 diff)
• cpu/arm/olpc/1.75/config.fth (modified) (1 diff)
• cpu/arm/olpc/3.0/config.fth (modified) (1 diff)
• cpu/arm/olpc/4.0/config.fth (modified) (1 diff)
• cpu/arm/olpc/cl4/config.fth (modified) (1 diff)
• cpu/arm/olpc/edi.fth (modified) (2 diffs)
• dev/olpc/spiflash/spiflash.fth (modified) (1 diff)
• dev/olpc/spiflash/spiui.fth (modified) (1 diff)

cpu/arm/olpc/1.75/config-a1.fth

@@ -31 +31 @@
 char 3 constant expected-ec-version
 h# 10000 constant /ec-flash
-d#     1 constant ec-scale
 
 h# 10000 constant l2-#sets

cpu/arm/olpc/1.75/config.fth

@@ -33 +33 @@
 char 4 constant expected-ec-version
 h# 8000 constant /ec-flash
-d#    0 constant ec-scale
 h# 7e80 constant ec-flags-offset   \ don't program or verify this page
 

cpu/arm/olpc/3.0/config.fth

@@ -32 +32 @@
 char 4 constant expected-ec-version
 h# 8000 constant /ec-flash
-d#    0 constant ec-scale
 
 h# 18000 constant console-uart-base

cpu/arm/olpc/4.0/config.fth

@@ -30 +30 @@
 char 7 constant expected-ec-version
 h# ec00 constant /ec-flash
-d#    1 constant ec-scale
 h# eb80 constant ec-flags-offset   \ don't program or verify this page
 

cpu/arm/olpc/cl4/config.fth

@@ -29 +29 @@
 char 7 constant expected-ec-version
 h# ec00 constant /ec-flash
-d#    1 constant ec-scale
 h# eb80 constant ec-flags-offset   \ don't program or verify this page
 

cpu/arm/olpc/edi.fth

@@ -196 +196 @@
 ;
 
+: .edi-progress  ( n -- )
+   /ec-flash h# 8000 >  if  1  else  0  then  rshift    ( dot# )
+   edi-progress                                         ( )
+;
+
 : edi-program-flash  ( adr len offset -- )
    cr                                          ( adr len offset )
@@ -204 +209 @@
          over i +  over i +  edi-program-page  ( adr offset )
       then                                     ( adr offset )
-      i ec-scale rshift edi-progress           ( adr offset )
+      i .edi-progress                          ( adr offset )
    /flash-page +loop                           ( adr offset )
    2drop                                       ( )

dev/olpc/spiflash/spiflash.fth

@@ -298 +298 @@
 \ of them, so it's a good starting point.
 
-0 value flash-scale
-: 2mb-flash  ( -- )  h# 20.0000 to /flash  6 to flash-scale  ;
-: 1mb-flash  ( -- )  h# 10.0000 to /flash  5 to flash-scale  ;
+: 2mb-flash  ( -- )  h# 20.0000 to /flash  ;
+: 1mb-flash  ( -- )  h# 10.0000 to /flash  ;
 
 0 value spi-id#

dev/olpc/spiflash/spiui.fth

@@ -12 +12 @@
 
 : .progress  ( offset -- )
-   flash-scale rshift  dup spi-progress  h# 400 + spi-progress
+   /flash h# 10.0000 >  if  6  else  5  then  rshift    ( dot# )
+   dup spi-progress  h# 400 + spi-progress              ( )
 ;