[openfirmware] [commit] r2808 - in cpu/arm: mmp2 olpc

[repository service]

Author: quozl
Date: Tue Jan 10 03:55:17 2012
New Revision: 2808
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2808

Log:
OLPC XO-1.75 - fix build error, move suspend and resume test out of rtc.fth into build-fw.fth to access final-test? word.

Modified:
   cpu/arm/mmp2/rtc.fth
   cpu/arm/olpc/build-fw.fth

Modified: cpu/arm/mmp2/rtc.fth
==============================================================================
--- cpu/arm/mmp2/rtc.fth	Tue Jan 10 03:29:32 2012	(r2807)
+++ cpu/arm/mmp2/rtc.fth	Tue Jan 10 03:55:17 2012	(r2808)
@@ -56,14 +56,6 @@
       ." OKAY"  cr drop  false                              ( error? )
    then                                                     ( error? )
 ;
-dev /switches
-: selftest  ( -- error? )
-   final-test?  0=  if
-      s3-selftest  if  true exit  then
-   then
-   selftest
-;
-device-end

\ LICENSE_BEGIN
 \ Copyright (c) 2011 FirmWorks

Modified: cpu/arm/olpc/build-fw.fth
==============================================================================
--- cpu/arm/olpc/build-fw.fth	Tue Jan 10 03:29:32 2012	(r2807)
+++ cpu/arm/olpc/build-fw.fth	Tue Jan 10 03:55:17 2012	(r2808)
@@ -647,6 +647,18 @@
 warning !
 device-end

+\ Add suspend resume test except in final
+dev /switches
+warning @ warning off
+: selftest  ( -- error? )
+   final-test?  0=  if
+      s3-selftest  if  true exit  then
+   then
+   selftest
+;
+warning !
+device-end
+
 \ When reprogramming this machine's SPI FLASH, rebooting the EC is unnecessary 
 : no-kbc-reboot  ['] noop to spi-reprogrammed  ;
 : kbc-on ;