[openfirmware] r1127 - in cpu/x86/pc: . olpc

[svn at openfirmware.info]

Author: wmb
Date: 2009-03-31 02:44:18 +0200 (Tue, 31 Mar 2009)
New Revision: 1127

Modified:
   cpu/x86/pc/biosints.fth
   cpu/x86/pc/olpc/fw.bth
   cpu/x86/pc/olpc/gamekeys.fth
Log:
OLPC - In manufacturing, change the boot order so that SD is after NAND.


Modified: cpu/x86/pc/biosints.fth
===================================================================
--- cpu/x86/pc/biosints.fth	2009-03-24 17:54:51 UTC (rev 1126)
+++ cpu/x86/pc/biosints.fth	2009-03-31 00:44:18 UTC (rev 1127)
@@ -1165,6 +1165,7 @@
 0 0 " " " /" begin-package
    " xp" device-name
    : open
+      bypass-bios-boot?  if  false exit  then
       " sd:1" ntfs?  if
          " sd:0" set-hd-boot
          true exit

Modified: cpu/x86/pc/olpc/fw.bth
===================================================================
--- cpu/x86/pc/olpc/fw.bth	2009-03-24 17:54:51 UTC (rev 1126)
+++ cpu/x86/pc/olpc/fw.bth	2009-03-31 00:44:18 UTC (rev 1127)
@@ -515,6 +515,18 @@
 \   .built cr
 ;
 
+: ?factory-boot-sequence  ( -- flag )
+   \ TS is the "test station" tag.  Its value is set to "DL" at the
+   \ end of manufacturing test.
+   " TS" find-tag  if  ( adr len )
+      ?-null  " DL" $=  0=  if
+         " disk:\boot\olpc.fth nand:\boot\olpc.fth /xp sd:\boot\olpc.fth /prober /usb/wlan"
+         to boot-device
+      then
+   then
+;
+
+
 : console-start  ( -- )
 [ifdef] rom-loaded
    video-map cr
@@ -589,6 +601,7 @@
    no-page
 
    ?factory-mode
+   ?factory-boot-sequence
 
    console-start
 

Modified: cpu/x86/pc/olpc/gamekeys.fth
===================================================================
--- cpu/x86/pc/olpc/gamekeys.fth	2009-03-24 17:54:51 UTC (rev 1126)
+++ cpu/x86/pc/olpc/gamekeys.fth	2009-03-31 00:44:18 UTC (rev 1127)
@@ -60,3 +60,5 @@
    drop  (cr kill-line
 ;
 ' (hold-message) to hold-message
+
+: bypass-bios-boot?  ( -- flag )  button-square game-key?  ;