Changeset 3058

Timestamp:

Jul 12, 2012 10:36:46 PM (11 months ago)

Author:

wmb

Message:

OLPC - synchronized keyjector.bth templates with latest olpc.bth files.

Location:

cpu/x86/pc/olpc

Files:

• keyject.bth (modified) (5 diffs)
• via/keyject.bth (modified) (9 diffs)

cpu/x86/pc/olpc/keyject.bth

@@ -20 +20 @@
 in: ${BP}/dev/usb2/device/storage/build/usbstorage.fc
 in: ${BP}/dev/usb2/device/keyboard/build/usbkbd.fc
+in: ${BP}/dev/usb2/device/mouse/build/usbmouse.fc
 in: ${BP}/dev/usb2/device/wlan/build/usb8388.fc
 in: ${BP}/dev/olpc/cafenand/build/cafenand.fc
@@ -30 +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 +56 @@
    ?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 +88 @@
 \   " ${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
 
    " ${BP}/cpu/x86/pc/olpc/keyject.fth"          " probe+"          $add-deflated-dropin
@@ -97 +119 @@
 h# 10 buffer: signature
 signature h# 10 blank
-" CL1"                    signature         swap move
+machine-signature count   signature         swap move
 " ${FW_VERSION}" expand$  signature     6 + swap move
 " Q2${FW_MAJOR}" expand$  signature d# 13 + swap move

cpu/x86/pc/olpc/via/keyject.bth

@@ -21 +21 @@
 in: ${BP}/dev/usb2/device/storage/build/usbstorage.fc
 in: ${BP}/dev/usb2/device/keyboard/build/usbkbd.fc
+in: ${BP}/dev/usb2/device/mouse/build/usbmouse.fc
 in: ${BP}/clients/memtest86/memtest
 in: ${BP}/clients/emacs/x86/emacs
@@ -61 +62 @@
 ;
 
+\ Tell the dropin manager to skip the area reserved for manufacturing data
+h# e0000 to reserved-start
+h# f0000 to reserved-end
+
 .( --- Saving as )
 " ${FW_VERSION}.rom" expand$  2dup lower  ( adr len )
@@ -71 +76 @@
    dropin-base rom-pa -  pad-file
 
-[ifdef] coreboot-loaded
-   " romstart.di"           $add-file
-[else]
    " romreset.di"           $add-file
-[then]
-
    " resume.di"             $add-file
 
@@ -91 +91 @@
    " ${BP}/dev/usb2/device/generic/build/generic.fc"  " usbdevice"  $add-deflated-dropin
    " ${BP}/dev/usb2/device/net/build/usbnet.fc"       " usbnet"     $add-deflated-dropin
-   " ${BP}/dev/usb2/device/keyboard/build/usbkbd.fc"  " usb,class3,1" $add-dropin
+   " ${BP}/dev/usb2/device/keyboard/build/usbkbd.fc" " usb,class3,1,1" $add-deflated-dropin
+   " ${BP}/dev/usb2/device/mouse/build/usbmouse.fc"  " usb,class3,1,2" $add-deflated-dropin
    " ${BP}/dev/usb2/device/serial/build/usbserial.fc" " usbserial"  $add-deflated-dropin
    " ${BP}/dev/usb2/device/storage/build/usbstorage.fc" " usbstorage"   $add-deflated-dropin
@@ -163 +164 @@
    " ${BP}/cpu/x86/pc/olpc/images/Edge1-8k-EQ-Comp-Amp-Short.wav"  " splash"   $add-deflated-dropin
 
-   " ${BP}/cpu/x86/pc/olpc/via/build/dsdt.aml"      " dsdt"            $add-deflated-dropin
-\  " ${BP}/cpu/x86/pc/olpc/via/build/ssdt.aml"      " ssdt"            $add-deflated-dropin
+   " ${BP}/cpu/x86/pc/olpc/via/build/dsdt.aml"        " dsdt"            $add-deflated-dropin
+   " ${BP}/cpu/x86/pc/olpc/via/build/dsdt-c2only.aml" " dsdt-c2only"     $add-deflated-dropin
+\  " ${BP}/cpu/x86/pc/olpc/via/build/ssdt.aml"        " ssdt"            $add-deflated-dropin
 
    \ icons for mfg test gui
@@ -191 +193 @@
    " ${BP}/cpu/x86/pc/olpc/via/build/nandblaster_tx.bin" " nb_tx"      $add-deflated-dropin
 
+   " ${BP}/cpu/x86/pc/olpc/images/winlogo.565"   " winlogo.565"    $add-deflated-dropin
+   " ${BP}/cpu/x86/pc/olpc/images/tux.565"       " tux.565"        $add-deflated-dropin
+   " ${BP}/cpu/x86/pc/olpc/images/settings.565"  " settings.565"   $add-deflated-dropin
+
    " ${BP}/cpu/x86/pc/olpc/keyject.fth"          " probe+"          $add-deflated-dropin
    " /space/bios-crypto/build/k2.public"         " o1"              $add-dropin  \ Incompressible
@@ -200 +206 @@
 .( Dropin top is )  ofd @ fsize  .x cr
 
-[ifdef] coreboot-loaded
-   /rom h# 10000 - pad-file     \ coreboot init image must be in last FLASH block
-   " coreboot.img"   $add-file
-[else]
-   /rom h# 10000 - pad-file     \ coreboot init image must be in last FLASH block
+\   /rom h# 10000 - pad-file    \ coreboot init image must be in last FLASH block
 \  " cforth.img"     $add-file  \ Small Forth that runs from cache
 
@@ -214 +216 @@
 h# 10 buffer: signature
 signature h# 10 blank
-" CL1"                    signature         swap move
+machine-signature count   signature         swap move
 " ${FW_VERSION}" expand$  signature     6 + swap move
 " Q3${FW_MAJOR}" expand$  signature d# 13 + swap move
@@ -246 +248 @@
 /rom h# 2c - ofd @ fseek
 crcbuf /l ofd @ fputs
-[then]
 
 ofd @ fclose