[openfirmware] [commit] r3401 - in cpu/arm/olpc: . 4.0

[repository service]

Author: quozl
Date: Wed Oct 31 03:14:54 2012
New Revision: 3401
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3401

Log:
OLPC XO-4 - touchscreen firmware ship, automatic upgrade infrastructure for post-B1, enable full touchscreen diagnostics.

Modified:
   cpu/arm/olpc/4.0/olpc.bth
   cpu/arm/olpc/build-fw.fth
   cpu/arm/olpc/nn-touchscreen.fth
   cpu/arm/olpc/nnflash.fth

Modified: cpu/arm/olpc/4.0/olpc.bth
==============================================================================
--- cpu/arm/olpc/4.0/olpc.bth	Wed Oct 31 00:26:46 2012	(r3400)
+++ cpu/arm/olpc/4.0/olpc.bth	Wed Oct 31 03:14:54 2012	(r3401)
@@ -2,7 +2,7 @@
 
 command: &builder &this
 in: ${BP}/cpu/arm/olpc/4.0/build/ec.img
-\ in: ${BP}/cpu/arm/olpc/4.0/build/nn.hex
+in: ${BP}/cpu/arm/olpc/4.0/build/nn.hex
 in: ${BP}/cpu/arm/olpc/4.0/build/fw.img
 in: ${BP}/cpu/arm/olpc/4.0/build/resetvec.img
 in: ${BP}/cpu/arm/olpc/4.0/build/mcastnand.bin
@@ -155,7 +155,7 @@
    " nandblaster_tx.bin"   " nb_tx"    $add-deflated-dropin
 
    " ec.img"                                    " ecimage.bin"   $add-deflated-dropin
-\   " nn.hex"                                    " nn.hex"        $add-deflated-dropin
+   " nn.hex"                                    " nn.hex"        $add-deflated-dropin
    " ${BP}/clients/emacs/x86/emacs.rc"          " emacs.rc"      $add-deflated-dropin
    " ${BP}/clients/emacs/emacs.hlp"             " emacs.hlp"     $add-deflated-dropin
    " ${BP}/clients/emacs/arm/emacs"             " emacs"         $add-deflated-dropin

Modified: cpu/arm/olpc/build-fw.fth
==============================================================================
--- cpu/arm/olpc/build-fw.fth	Wed Oct 31 00:26:46 2012	(r3400)
+++ cpu/arm/olpc/build-fw.fth	Wed Oct 31 03:14:54 2012	(r3401)
@@ -366,7 +366,7 @@
 fload ${BP}/cpu/arm/mmp2/fuse.fth
 [ifdef] bsl-uart-base
 fload ${BP}/cpu/arm/olpc/bsl.fth
-\ fload ${BP}/cpu/arm/olpc/nnflash.fth
+fload ${BP}/cpu/arm/olpc/nnflash.fth
 [then]
 
 [ifndef] virtual-mode

Modified: cpu/arm/olpc/nn-touchscreen.fth
==============================================================================
--- cpu/arm/olpc/nn-touchscreen.fth	Wed Oct 31 00:26:46 2012	(r3400)
+++ cpu/arm/olpc/nn-touchscreen.fth	Wed Oct 31 03:14:54 2012	(r3401)
@@ -20,11 +20,11 @@
 create nn-version       \ version display
 create nn-watch         \ graphical signal tests
 
-\ create nn-fss           \ optional fixed signal strength test
+create nn-fss           \ optional fixed signal strength test
 \ create nn-ls            \ optional low signals test
-\ create nn-fss-all       \ fixed signal strength test, all power levels
+create nn-fss-all       \ fixed signal strength test, all power levels
 
-\ create nn-components    \ isolate test results to failed component identifier
+create nn-components    \ isolate test results to failed component identifier
 
 d# 15 value xleds
 d# 11 value yleds
@@ -53,7 +53,13 @@
    touch-rst-gpio# dup gpio-set gpio-dir-out
    touch-tck-gpio# dup gpio-clr gpio-dir-out
 ;
-: reset  ( -- )  touch-rst-gpio# dup gpio-clr gpio-set  d# 250 ms  ;
+
+\ Neonode requested 250 ms
+\ we observe for 0.0.0.5
+\ less than 38 ms yields no response to reset,
+\ 40 ms yields 100 ms overall version check, and
+\ 45 ms yields 84 ms overall version check.
+: reset  ( -- )  touch-rst-gpio# dup gpio-clr gpio-set  d# 50 ms  ;
 : hold-reset  ( -- )  touch-rst-gpio# gpio-clr  ;
 : no-data?  ( -- no-data? )  touch-int-gpio# gpio-pin@  ;
 

Modified: cpu/arm/olpc/nnflash.fth
==============================================================================
--- cpu/arm/olpc/nnflash.fth	Wed Oct 31 00:26:46 2012	(r3400)
+++ cpu/arm/olpc/nnflash.fth	Wed Oct 31 03:14:54 2012	(r3401)
@@ -30,6 +30,9 @@
 ;
 
 : update-nn-flash?  ( -- flag )
+   \ XO-4 B1 have clear lightguides incompatible with later versions
+   \ of touchscreen firmware.
+   board-revision h# 4b20  <  if  false exit  then
    nn-image$  nn-up-to-date?  0=
 ;