r405 - cpu/x86/pc/olpc

Author: wmb
Date: 2007-05-20 06:34:30 +0200 (Sun, 20 May 2007)
New Revision: 405

Modified:
   cpu/x86/pc/olpc/banner.fth
   cpu/x86/pc/olpc/fw.bth
   cpu/x86/pc/olpc/loaddropins.fth
Log:
OLPC - Back to using the game keys, and suppress text in fast boot mode.

Modified: cpu/x86/pc/olpc/banner.fth
===================================================================
--- cpu/x86/pc/olpc/banner.fth	2007-05-20 04:32:57 UTC (rev 404)
+++ cpu/x86/pc/olpc/banner.fth	2007-05-20 04:34:30 UTC (rev 405)
@@ -36,7 +36,6 @@
    stop-auto?  if  suppress-auto-boot  then

gui-banner drop
-   banner
 ;

headers

Modified: cpu/x86/pc/olpc/fw.bth
===================================================================
--- cpu/x86/pc/olpc/fw.bth	2007-05-20 04:32:57 UTC (rev 404)
+++ cpu/x86/pc/olpc/fw.bth	2007-05-20 04:34:30 UTC (rev 405)
@@ -436,7 +436,6 @@
 : user-switch?  ( -- flag )
 [ifdef] lx-devel  false exit  [then]
    atest?  if  true exit  then
-true exit
    game-key@  0<>  dup  if
       ." Release the game key to continue" cr
       begin  d# 100 ms  game-key@ 0=  until
@@ -508,12 +507,11 @@
 : startup  ( -- )
    standalone?  0=  if  exit  then

-\   ?bailout
-
    no-page

console-start
    fast-boot?   if
+      stdout off
       probe-pci
       ['] false to interrupt-auto-boot?
       interpreter-init
@@ -521,15 +519,14 @@
       enable-power-button
 [then]
       auto-boot
+      screen-ih stdout !
       open-keyboard
       optional-startup
    else
-      ." Interactive boot" cr
-      ." Keyboard probe" cr
-\     ?bailout
+      banner
+
       open-keyboard
       probe-pci
-      ." USB probe" cr
       optional-startup
       interpreter-init
 [ifndef] lx-devel

Modified: cpu/x86/pc/olpc/loaddropins.fth
===================================================================
--- cpu/x86/pc/olpc/loaddropins.fth	2007-05-20 04:32:57 UTC (rev 404)
+++ cpu/x86/pc/olpc/loaddropins.fth	2007-05-20 04:34:30 UTC (rev 405)
@@ -34,7 +34,7 @@
    " ${BP}/cpu/x86/pc/olpc/images/olpclogo.565" " olpc.565"      $add-deflated-dropin
    " ${BP}/cpu/x86/pc/olpc/images/laptop.565"   " nandflash.565" $add-deflated-dropin
    " ${BP}/cpu/x86/pc/olpc/images/ethernet.565" " ethernet.565"  $add-deflated-dropin
-   " ${BP}/cpu/x86/pc/olpc/images/usbkey.565"   " usbkey.565"    $add-deflated-dropin
+   " ${BP}/cpu/x86/pc/olpc/images/usbkey.565"   " usbdisk.565"   $add-deflated-dropin
    " ${BP}/cpu/x86/pc/olpc/images/wireless.565" " wlan.565"      $add-deflated-dropin
    " ${BP}/cpu/x86/pc/olpc/images/xo.565"       " xo.565"        $add-deflated-dropin
    " ${BP}/cpu/x86/pc/olpc/images/sd.565"       " sdmmc.565"     $add-deflated-dropin