r391 - cpu/x86/pc/olpc

Author: wmb
Date: 2007-05-16 12:07:06 +0200 (Wed, 16 May 2007)
New Revision: 391

Modified:
   cpu/x86/pc/olpc/fw.bth
   cpu/x86/pc/olpc/versions.fth
Log:
Q2C12 - Backed out game key changes again, but kept the other stuff since C11.

Modified: cpu/x86/pc/olpc/fw.bth
===================================================================
--- cpu/x86/pc/olpc/fw.bth	2007-05-16 09:22:10 UTC (rev 390)
+++ cpu/x86/pc/olpc/fw.bth	2007-05-16 10:07:06 UTC (rev 391)
@@ -436,6 +436,7 @@
 : 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

Modified: cpu/x86/pc/olpc/versions.fth
===================================================================
--- cpu/x86/pc/olpc/versions.fth	2007-05-16 09:22:10 UTC (rev 390)
+++ cpu/x86/pc/olpc/versions.fth	2007-05-16 10:07:06 UTC (rev 391)
@@ -2,14 +2,14 @@

\ The overall firmware revision
 macro: FW_MAJOR C
-macro: FW_MINOR 11
+macro: FW_MINOR 12

\ The EC microcode
 macro: EC_VERSION c11

\ Alternate command for getting EC microcode, for testing new versions.
 \ Temporarily uncomment the line and modify the path as necessary
-\ macro: GET_EC cp ~/pqc10t.bin ec.img
+\ macro: GET_EC cp ./c11t-1.bin ec.img

\ The wireless LAN module firmware
 macro: WLAN_RPM ${WLAN_VERSION}-1.olpc1