Changeset 2638

Timestamp:

Oct 22, 2011 6:25:07 AM (19 months ago)

Author:

wmb

Message:

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.

Location:

cpu/arm

Files:

• mmp2/rtc.fth (modified) (2 diffs)
• olpc/1.75/fw.bth (modified) (1 diff)
• olpc/1.75/probemem.fth (modified) (2 diffs)

cpu/arm/mmp2/rtc.fth

@@ -47 +47 @@
    \ 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
@@ -54 +54 @@
       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

cpu/arm/olpc/1.75/fw.bth

@@ -182 +182 @@
 
 fload ${BP}/cpu/arm/mmp2/dramrecal.fth
+
+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
-
-code halt  ( -- )  wfi   c;
-
-fload ${BP}/cpu/arm/olpc/1.75/switches.fth \ Lid and ebook switches
 fload ${BP}/cpu/arm/olpc/1.75/leds.fth     \ LEDs
 fload ${BP}/cpu/x86/pc/olpc/via/factory.fth  \ Manufacturing tools

cpu/arm/olpc/1.75/probemem.fth

@@ -65 +65 @@
 : .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
@@ -116 +114 @@
    repeat                              ( adr len )
    2drop                               ( )
-
-   test-s3                             ( error? )
+   false
 ;