[openfirmware] r1504 - cpu/x86/pc/biosload

[svn at openfirmware.info]

Author: wmb
Date: 2009-11-25 21:51:01 +0100 (Wed, 25 Nov 2009)
New Revision: 1504

Modified:
   cpu/x86/pc/biosload/config-via.fth
   cpu/x86/pc/biosload/devices.fth
   cpu/x86/pc/biosload/fw.bth
Log:
Some minor fixes in the biosload build.





Modified: cpu/x86/pc/biosload/config-via.fth
===================================================================
--- cpu/x86/pc/biosload/config-via.fth	2009-11-25 20:45:24 UTC (rev 1503)
+++ cpu/x86/pc/biosload/config-via.fth	2009-11-25 20:51:01 UTC (rev 1504)
@@ -17,6 +17,17 @@
 \ create use-usb-debug-port
 create pc
 
+\ The disadvantage of the timestamp counter is that it changes speed with
+\ CPU throttling.  The advantage is that it is 64 bits, so no rollover.
+create use-timestamp-counter \ Use CPU's timestamp counter for "ms"
+create use-tsc-timing        \ Use timestamp counter for t( .. )t
+
+\ The advantage of the ACPI counter is that its speed is independent of
+\ CPU throttling.  The disadvantage is that it is 32 bits, so it rolls
+\ over every 20 minutes or so, unless you extend it with an SMI handler.
+\ create use-acpi-timing
+\ create use-acpi-delays
+
 \ create pseudo-nvram
 create resident-packages
 create addresses-assigned  \ Don't reassign PCI addresses

Modified: cpu/x86/pc/biosload/devices.fth
===================================================================
--- cpu/x86/pc/biosload/devices.fth	2009-11-25 20:45:24 UTC (rev 1503)
+++ cpu/x86/pc/biosload/devices.fth	2009-11-25 20:51:01 UTC (rev 1504)
@@ -335,7 +335,9 @@
 [ifdef] olpc
 \ true constant lx?			\ 
 h# fff0.0000   constant rom-pa		\ Physical address of boot ROM
+[ifdef] geode
 fload ${BP}/dev/geode/acpi.fth           \ Power management
+[then]
 fload ${BP}/dev/olpc/kb3700/ecspi.fth      \ EC chip SPI FLASH access
 
 warning @ warning off

Modified: cpu/x86/pc/biosload/fw.bth
===================================================================
--- cpu/x86/pc/biosload/fw.bth	2009-11-25 20:45:24 UTC (rev 1503)
+++ cpu/x86/pc/biosload/fw.bth	2009-11-25 20:51:01 UTC (rev 1504)
@@ -298,9 +298,11 @@
 ;
 
 [ifdef] olpc
+[ifdef] geode
 fload  ${BP}/cpu/x86/pc/olpc/usbpwr.fth
 devalias net /wlan
 [then]
+[then]
 [ifdef] via-demo
 devalias net /wlan
 [then]
@@ -318,7 +320,9 @@
    probe-isa-modem
 [then]
 [ifdef] olpc
+[ifdef] geode
    power-cycle-usb
+[then]
    probe-usb
 [else]
    probe-usb
@@ -337,8 +341,8 @@
 
 : startup  ( -- )
    standalone?  0=  if  exit  then
-\   ." calibrate-ms"  cr
-\   calibrate-ms
+   ." calibrate-ms"  cr
+   calibrate-ms
 
     ." nvramrc" cr
     use-nvramrc?  if  nvramrc safe-evaluate  then