[openfirmware] [commit] r2679 - cpu/x86/pc/olpc cpu/x86/pc/olpc/via dev

[repository service]

Author: quozl
Date: Thu Nov 10 05:32:25 2011
New Revision: 2679
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2679

Log:
OLPC - show RTC in banner, cache banner internal storage result, show value of RTC in test. #11424

Modified:
   cpu/x86/pc/olpc/banner.fth
   cpu/x86/pc/olpc/fw.bth
   cpu/x86/pc/olpc/via/banner.fth
   cpu/x86/pc/olpc/via/fw.bth
   dev/ds1385r.fth

Modified: cpu/x86/pc/olpc/banner.fth
==============================================================================
--- cpu/x86/pc/olpc/banner.fth	Wed Nov  9 06:00:22 2011	(r2678)
+++ cpu/x86/pc/olpc/banner.fth	Thu Nov 10 05:32:25 2011	(r2679)
@@ -27,7 +27,7 @@
 : (xbanner-basics)  ( -- )
    ?spaces  cpu-model type  ." , "   .memory
    ." , S/N "  " SN" find-tag  if  type  else  ." Unknown"  then  cr
-   ?spaces  .rom  ."    " .ec  cr
+   ?spaces  .rom  ."    " .ec  ."    " .clock
 ;
 ' (xbanner-basics) to banner-basics
 

Modified: cpu/x86/pc/olpc/fw.bth
==============================================================================
--- cpu/x86/pc/olpc/fw.bth	Wed Nov  9 06:00:22 2011	(r2678)
+++ cpu/x86/pc/olpc/fw.bth	Thu Nov 10 05:32:25 2011	(r2679)
@@ -300,6 +300,9 @@
 : user-ok  "ok"  ;  \ This is supposed to check for authorization
 true value user-mode?
 
+: .clock  ( -- )
+   time&date .date space .time  ."  UTC" cr
+;
 fload ${BP}/cpu/x86/pc/olpc/banner.fth
 
 fload ${BP}/ofw/gui/loadmenu.fth
@@ -453,9 +456,6 @@
    ntp-timestamp  abort" Can't contact NTP server"
    ntp>time&date
 ;
-: .clock  ( -- )
-   time&date .date space .time  ."  UTC" cr
-;
 : ntp-set-clock  ( -- )
    ntp-time&date  " set-time"  clock-node @ $call-method
    .clock

Modified: cpu/x86/pc/olpc/via/banner.fth
==============================================================================
--- cpu/x86/pc/olpc/via/banner.fth	Wed Nov  9 06:00:22 2011	(r2678)
+++ cpu/x86/pc/olpc/via/banner.fth	Thu Nov 10 05:32:25 2011	(r2679)
@@ -65,7 +65,9 @@
 ;
 
 : .storage  ( -- )
-   get-internal-disk-info        ( )
+   internal-disk-present? 0=  if ( )
+      get-internal-disk-info     ( )
+   then
    internal-disk-present?  if    ( )
       internal-disk-size         ( d.size )
       d# 200,000,000.  d+        ( d.size' )  \ Round up
@@ -120,7 +122,7 @@
    ?spaces  cpu-model type  ." , "   .memory
    ." , " .storage
    ." , S/N "  " SN" find-tag  if  type  else  ." Unknown"  then  cr
-   ?spaces  .rom  ."    " .ec  cr
+   ?spaces  .rom  ."    " .ec  ."    " .clock
    check-internal-partitions
 ;
 ' (xbanner-basics) to banner-basics

Modified: cpu/x86/pc/olpc/via/fw.bth
==============================================================================
--- cpu/x86/pc/olpc/via/fw.bth	Wed Nov  9 06:00:22 2011	(r2678)
+++ cpu/x86/pc/olpc/via/fw.bth	Thu Nov 10 05:32:25 2011	(r2679)
@@ -311,6 +311,9 @@
 : user-ok  "ok"  ;  \ This is supposed to check for authorization
 true value user-mode?
 
+: .clock  ( -- )
+   time&date .date space .time  ."  UTC" cr
+;
 fload ${BP}/cpu/x86/pc/olpc/via/banner.fth
 
 fload ${BP}/ofw/gui/loadmenu.fth
@@ -525,9 +528,6 @@
    ntp-timestamp  abort" Can't contact NTP server"
    ntp>time&date
 ;
-: .clock  ( -- )
-   time&date .date space .time  ."  UTC" cr
-;
 : ntp-set-clock  ( -- )
    ntp-time&date  " set-time"  clock-node @ $call-method
    .clock

Modified: dev/ds1385r.fth
==============================================================================
--- dev/ds1385r.fth	Wed Nov  9 06:00:22 2011	(r2678)
+++ dev/ds1385r.fth	Thu Nov 10 05:32:25 2011	(r2679)
@@ -157,6 +157,9 @@
    open drop
    check-battery  \ Don't display the message here because "open" will do it
    check-tick or
+   get-time .date space .time cr
+   get-time 2nip 2nip nip
+   d# 2011 < dup  if  ." Date in RTC is too early" cr  then
    close
 ;