[openfirmware] r1579 - cpu/x86/pc/olpc/via dev/olpc/kb3700

[svn at openfirmware.info]

Author: wmb
Date: 2009-12-11 10:31:05 +0100 (Fri, 11 Dec 2009)
New Revision: 1579

Modified:
   cpu/x86/pc/olpc/via/factory.fth
   dev/olpc/kb3700/battery.fth
Log:
OLPC selftests - fixed booting bug introduced by 1575 and 1576.


Modified: cpu/x86/pc/olpc/via/factory.fth
===================================================================
--- cpu/x86/pc/olpc/via/factory.fth	2009-12-11 07:32:02 UTC (rev 1578)
+++ cpu/x86/pc/olpc/via/factory.fth	2009-12-11 09:31:05 UTC (rev 1579)
@@ -25,9 +25,6 @@
       0                       ( station# )
    then                       ( station# )
    to test-station
-   test-station 6 <>  if
-      ['] test-station to (diagnostic-mode?)
-   then
 ;
 
 : set-boot-device  ( -- )

Modified: dev/olpc/kb3700/battery.fth
===================================================================
--- dev/olpc/kb3700/battery.fth	2009-12-11 07:32:02 UTC (rev 1578)
+++ dev/olpc/kb3700/battery.fth	2009-12-11 09:31:05 UTC (rev 1579)
@@ -863,7 +863,8 @@
 
 : interactive-test  ( -- error? )
    test-battery      if  true exit  then
-   diagnostic-mode? 1 <>   if   \ Skip this test in SMT
+   " test-station" $find  if  execute  else  2drop 0  then  ( station# )
+   1 <>   if                                 \ Skip this test in SMT
       test-discharging  if  true exit  then
    then
    test-charging     if  true exit  then