Changeset 2866

Timestamp:

Feb 15, 2012 9:04:02 AM (15 months ago)

Author:

quozl

Message:

OLPC XO-1 - add diagnostics menu, #11622

Location:

cpu/x86/pc/olpc

Files:

• devices.fth (modified) (1 diff)
• fw.bth (modified) (3 diffs)
• loaddropins.fth (modified) (1 diff)
• olpc.bth (modified) (3 diffs)
• testicons.bth (added)
• testitems.fth (added)

cpu/x86/pc/olpc/devices.fth

@@ -101 +101 @@
    " dropins" device-name
 
-   h# c0000 constant /device
+   h# f0000 constant /device
    fload ${BP}/dev/subrange.fth
 end-package

cpu/x86/pc/olpc/fw.bth

@@ -305 +305 @@
    time&date .date space .time  ."  UTC" cr
 ;
+
 fload ${BP}/cpu/x86/pc/olpc/banner.fth
-
 fload ${BP}/ofw/gui/loadmenu.fth
+fload ${BP}/cpu/x86/pc/olpc/via/mfgtest.fth
+fload ${BP}/cpu/x86/pc/olpc/testitems.fth
+
 false value smt-test?  false value final-test?
 fload ${BP}/cpu/x86/pc/olpc/disptest.fth
@@ -560 +563 @@
    rocker-left game-key?  if
       protect-fw
-      text-on  " test-all" ['] eval guarded
+      text-on  ['] gamekey-auto-menu guarded
       ." Tests complete - powering off" cr  d# 5000 ms  power-off
    then
@@ -656 +659 @@
 
 fload ${BP}/cpu/x86/pc/olpc/diskspeed.fth  \ Mass storage speed test
-
-\ #10778 disable menu
-warning @  warning off
-: menu ;
-warning !
 
 \ This helps with TeraTerm, which sends ESC-O as the arrow key prefix

cpu/x86/pc/olpc/loaddropins.fth

@@ -50 +50 @@
    " ${BP}/cpu/x86/pc/olpc/images/xo.565"       " xo.565"        $add-deflated-dropin
    " ${BP}/cpu/x86/pc/olpc/images/sd.565"       " ext.565"       $add-deflated-dropin
-   " ${BP}/cpu/x86/pc/olpc/images/spi.565"      " spi.565"       $add-deflated-dropin
 
    " ${BP}/ofw/termemu/15x30pc.psf"             " font"          $add-deflated-dropin

cpu/x86/pc/olpc/olpc.bth

@@ -31 +31 @@
 in: ${BP}/cpu/x86/pc/olpc/build/dsdt.aml
 in: ${BP}/cpu/x86/pc/olpc/build/mcastnand.bin
+in: testicons.bin
 
 build-now
@@ -54 +55 @@
    ?do  h# ff ofd @ fputc  loop
 ;
+
+\ Tell the dropin manager to skip the area reserved for manufacturing data
+h# e0000 to reserved-start
+h# f0000 to reserved-end
 
 .( --- Saving as )
@@ -82 +87 @@
 \   " ${BP}/cpu/x86/pc/olpc/build/blaster.bin"   " blaster"         $add-deflated-dropin
 \   " ${BP}/cpu/x86/pc/olpc/build/cloner.bin"    " cloner"          $add-deflated-dropin
+   " testicons/play.565"        " play.565"     $add-deflated-dropin
+   " testicons/quit.565"        " quit.565"     $add-deflated-dropin
+   " testicons/cpu.565"         " cpu.565"      $add-deflated-dropin
+   " testicons/spi.565"         " spi.565"      $add-deflated-dropin
+   " testicons/ram.565"         " ram.565"      $add-deflated-dropin
+   " testicons/sdcard.565"      " sdcard.565"   $add-deflated-dropin
+   " testicons/keyboard.565"    " keyboard.565" $add-deflated-dropin
+   " testicons/display.565"     " display.565"  $add-deflated-dropin
+   " testicons/touchpad.565"    " touchpad.565" $add-deflated-dropin
+   " testicons/audio.565"       " audio.565"    $add-deflated-dropin
+   " testicons/usb.565"         " usb.565"      $add-deflated-dropin
+   " testicons/battery.565"     " battery.565"  $add-deflated-dropin
+   " testicons/camera.565"      " camera.565"   $add-deflated-dropin
+   " testicons/wifi.565"        " wifi.565"     $add-deflated-dropin
+   " testicons/clock.565"       " clock.565"    $add-deflated-dropin
+   " testicons/timer.565"       " timer.565"    $add-deflated-dropin
 
    /rom h# 400 - pad-file       \ rmstart image must start 0x400 from end