Author: wmb Date: Thu Jul 12 22:36:46 2012 New Revision: 3058 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3058
Log: OLPC - synchronized keyjector.bth templates with latest olpc.bth files.
Modified: cpu/x86/pc/olpc/keyject.bth cpu/x86/pc/olpc/via/keyject.bth
Modified: cpu/x86/pc/olpc/keyject.bth ============================================================================== --- cpu/x86/pc/olpc/keyject.bth Thu Jul 12 22:35:00 2012 (r3057) +++ cpu/x86/pc/olpc/keyject.bth Thu Jul 12 22:36:46 2012 (r3058) @@ -19,6 +19,7 @@ in: ${BP}/dev/usb2/device/serial/build/usbserial.fc 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 in: ${BP}/dev/olpc/cafecamera/build/cafecamera.fc @@ -29,6 +30,7 @@ in: ${BP}/dev/pci/build/pcibridg.fc in: ${BP}/cpu/x86/pc/olpc/build/dsdt.aml in: ${BP}/cpu/x86/pc/olpc/build/mcastnand.bin +in: testicons.bin
build-now
@@ -54,6 +56,10 @@ ?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 ) " ${FW_VERSION}.rom" expand$ 2dup lower ( adr len ) 2dup type cr ( adr len ) @@ -81,6 +87,22 @@ \ " ${BP}/cpu/x86/pc/olpc/build/multicast-nand/mcastnand.elf" " mcastnand" $add-deflated-dropin \ " ${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 " /space/bios-crypto/build/k2.public" " o1" $add-dropin \ Incompressible @@ -96,7 +118,7 @@ /rom h# 40 - ofd @ fseek 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 signature h# 10 ofd @ fputs
Modified: cpu/x86/pc/olpc/via/keyject.bth ============================================================================== --- cpu/x86/pc/olpc/via/keyject.bth Thu Jul 12 22:35:00 2012 (r3057) +++ cpu/x86/pc/olpc/via/keyject.bth Thu Jul 12 22:36:46 2012 (r3058) @@ -20,6 +20,7 @@ in: ${BP}/dev/usb2/device/serial/build/usbserial.fc 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 in: ${BP}/cpu/x86/pc/olpc/via/build/verify.img @@ -60,6 +61,10 @@ ?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 ) " ${FW_VERSION}.rom" expand$ 2dup lower ( adr len ) 2dup type cr ( adr len ) @@ -70,12 +75,7 @@
dropin-base rom-pa - pad-file
-[ifdef] coreboot-loaded - " romstart.di" $add-file -[else] " romreset.di" $add-file -[then] - " resume.di" $add-file
\ Loads the set of drivers that is common to different output formats @@ -90,7 +90,8 @@ " ${BP}/dev/usb2/device/hub/build/hub.fc" " usb,class9" $add-dropin " ${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 \ " mrv8686.bin" " mrv8686.bin" $add-deflated-dropin @@ -162,8 +163,9 @@
" ${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 " testicons/play.565" " play.565" $add-deflated-dropin @@ -190,6 +192,10 @@ " ${BP}/cpu/x86/pc/olpc/via/build/nandblaster15_rx.bin" " nb15_rx" $add-deflated-dropin " ${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 " /space/bios-crypto/build/k2.public" " s1" $add-dropin @@ -199,11 +205,7 @@
.( 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
/rom h# 400 - pad-file \ rmstart image must start 0x400 from end @@ -213,7 +215,7 @@ /rom h# 40 - ofd @ fseek 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 signature h# 10 ofd @ fputs @@ -245,7 +247,6 @@
/rom h# 2c - ofd @ fseek crcbuf /l ofd @ fputs -[then]
ofd @ fclose