[commit] r2638 - in cpu/arm: mmp2 olpc/1.75

[repository service]

Author: wmb
Date: Sat Oct 22 06:25:07 2011
New Revision: 2638
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2638

Log:
OLPC XO-1.75 - suspend/resume selftest - moved from memory node to switches node to work around an SMT test problem wherein the suspend/resume test breaks the keyboard on some systems.

Modified:
   cpu/arm/mmp2/rtc.fth
   cpu/arm/olpc/1.75/fw.bth
   cpu/arm/olpc/1.75/probemem.fth

Modified: cpu/arm/mmp2/rtc.fth
==============================================================================
--- cpu/arm/mmp2/rtc.fth	Sat Oct 22 06:03:25 2011	(r2637)
+++ cpu/arm/mmp2/rtc.fth	Sat Oct 22 06:25:07 2011	(r2638)
@@ -46,19 +46,22 @@
    \ it's hard to return a real error code.  We just have to rely
    \ on the operator.
    ." Testing suspend/resume"  cr
-   ." Sleeping for 3 seconds .. "  d# 100 ms
+   ." Sleeping for 3 seconds .. "  d# 1000 ms
    ec-rst-pwr ['] cancel-alarm 3 rtc-wake  str  ec-max-pwr  ( power )
    \ Negative power is consumed from battery, positive is supplied to battery
    dup  d# -250 <  if                                       ( power )
       ." System used too much power during suspend - "  negate .d ." mW" cr  ( )
       true                                                  ( error? )
    else                                                     ( power )
-      drop  false                                           ( error? )
+      ." OKAY"  cr drop  false                              ( error? )
    then                                                     ( error? )
 ;
-dev /memory
-[ifdef] test-s3  ' s3-selftest to test-s3  [then]
-dend
+dev /switches
+: selftest  ( -- error? )
+   s3-selftest  if  true exit  then
+   selftest  
+;
+device-end

\ LICENSE_BEGIN
 \ Copyright (c) 2011 FirmWorks

Modified: cpu/arm/olpc/1.75/fw.bth
==============================================================================
--- cpu/arm/olpc/1.75/fw.bth	Sat Oct 22 06:03:25 2011	(r2637)
+++ cpu/arm/olpc/1.75/fw.bth	Sat Oct 22 06:25:07 2011	(r2638)
@@ -181,11 +181,11 @@
 fload ${BP}/cpu/arm/olpc/1.75/testinstructions.fth

fload ${BP}/cpu/arm/mmp2/dramrecal.fth
-fload ${BP}/cpu/arm/mmp2/rtc.fth       \ Internal RTC, used for wakeups

code halt  ( -- )  wfi   c;

fload ${BP}/cpu/arm/olpc/1.75/switches.fth \ Lid and ebook switches
+fload ${BP}/cpu/arm/mmp2/rtc.fth       \ Internal RTC, used for wakeups
 fload ${BP}/cpu/arm/olpc/1.75/leds.fth     \ LEDs
 fload ${BP}/cpu/x86/pc/olpc/via/factory.fth  \ Manufacturing tools

Modified: cpu/arm/olpc/1.75/probemem.fth
==============================================================================
--- cpu/arm/olpc/1.75/probemem.fth	Sat Oct 22 06:03:25 2011	(r2637)
+++ cpu/arm/olpc/1.75/probemem.fth	Sat Oct 22 06:25:07 2011	(r2638)
@@ -64,8 +64,6 @@
 [then]
 : .chunk  ( adr len -- )  ." Testing address 0x" swap 8u.h ."  length 0x" 8u.h cr  ;

-defer test-s3  ( -- error? )  ' false is test-s3
-
 : test-mem  ( adr len -- )	\ Test a chunk 'o memory
    2>r
    2r@ 0 mem-claim to p-adr		( ) ( r: adr len )
@@ -115,8 +113,7 @@
       then                             ( adr len )
    repeat                              ( adr len )
    2drop                               ( )
-
-   test-s3                             ( error? )
+   false
 ;

device-end