openfirmware July 2015

openfirmware@openfirmware.info

1 participants
6 discussions

[commit] r3780 - in cpu/x86/pc/olpc: . via
by repository service 15 Jul '15

15 Jul '15

Author: quozl Date: Thu Jul 16 01:07:22 2015 New Revision: 3780 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3780 Log: OLPC - keyjector, rename bootfw2.zip to fw.zip since bootfw2.zip now has another meaning (XO-1.75 variant of bootfw.zip), and remove the duplicate file Deleted: cpu/x86/pc/olpc/via/keyject.fth Modified: cpu/x86/pc/olpc/HOWTO-keyjector cpu/x86/pc/olpc/keyject.fth Modified: cpu/x86/pc/olpc/HOWTO-keyjector ============================================================================== --- cpu/x86/pc/olpc/HOWTO-keyjector Wed Jul 15 04:08:40 2015 (r3779) +++ cpu/x86/pc/olpc/HOWTO-keyjector Thu Jul 16 01:07:22 2015 (r3780) @@ -19,34 +19,44 @@ The steps are: -* Unpack the tar file containing the new keys into, for example, /home/wmb/Uruguay +* Unpack the tar file containing the new keys into, for example, + /home/wmb/Uruguay -* Note the list of key names, e.g. d0 a1 o1 s1 t1 w1 +* Note the list of key names, e.g. d1 a1 o1 s1 t1 w1 $ cd /home/firmware/q2e34/openfirmware/cpu/x86/pc/olpc/build * Edit ../keyjector.bth : -** Change the "macro: FW_MINOR " line to the keyjector's intermediate version number, e.g. 34x +** Change the "macro: FW_MINOR " line to the keyjector's intermediate + version number, e.g. 34x ** Changing lines like below to the right file and key names. - " /space/bios-crypto/build/k2.public" " s1" $add-dropin + " /home/wmb/Uruguay/s1.public" " s1" $add-dropin * Edit ../keyjector.fth : -** In wrong-sku?, set the list of SKUs. This guards against "hijacking" of other country's laptops. -** In keyject-expired?, set an appropriate expiration date for the keyjector. +** In wrong-sku?, set the list of SKUs. This guards against + "hijacking" of other country's laptops. +** In keyject-expired?, set an appropriate expiration date for the + keyjector. ** In new-key-list$, set the key list. $ ./build keyject -It should build really quickly, because it is using nearly all the same modules as the base build. +It should build really quickly, because it is using nearly all the +same modules as the base build. * Verify the version number in the new file: ** $ xxd q2e34x.rom | tail -4 -* If you have to make a new "real" release so the keyjector has a successor, do so now. +* If you have to make a new "real" release so the keyjector has a + successor, do so now. * Sign the keyjector, naming the .zip file "bootfw.zip". -* Sign the successor firmware, name the .zip file "bootfw2.zip" +* Sign the successor firmware, name the .zip file "fw.zip" + +* Place both in a boot directory on media for testing. + +* Boot with laptop locked or using X game button to force security on. Modified: cpu/x86/pc/olpc/keyject.fth ============================================================================== --- cpu/x86/pc/olpc/keyject.fth Wed Jul 15 04:08:40 2015 (r3779) +++ cpu/x86/pc/olpc/keyject.fth Thu Jul 16 01:07:22 2015 (r3780) @@ -140,12 +140,12 @@ false value new-firmware? : got-firmware? ( dev$ -- flag ) - 2dup ." Looking for new bootfw2.zip on " type cr ( dev$ ) + 2dup ." Looking for new fw.zip on " type cr ( dev$ ) dn-buf place ( ) " \boot" pn-buf place ( ) filesystem-present? 0= if false exit then ( ) null$ cn-buf place ( ) - " bootfw2" bundle-present? 0= if false exit then ( ) + " fw" bundle-present? 0= if false exit then ( ) ." Found" cr ( ) secure? if ( ) load-crypto if ( ) @@ -242,12 +242,12 @@ ?keyject [ifdef] HowItWorks -OLPC signs bootfw.zip containing OFW image A and bootfw2.zip containing OFW image B. +OLPC signs bootfw.zip containing OFW image A and fw.zip containing OFW image B. * A is an OFW with additional keyjector functionality * B is an ordinary OFW Version number B > version number A. -bootfw.zip and bootfw2.zip are presented to a deployment machine in the usual manner, +bootfw.zip and fw.zip are presented to a deployment machine in the usual manner, either on a USB key or as part of a signed OS image. On a deployment machine with firmware X (version X < version A): @@ -263,7 +263,7 @@ so it ! Injects the new keys then it - ! Reads bootfw2.zip, checks its signature, and reflashes with firmware B (version > A) + ! Reads fw.zip, checks its signature, and reflashes with firmware B (version > A) ! Reboots 2) Firmware B starts, performs the normal fw update attempt step,

1 0

[commit] r3779 - in cpu/x86/pc/olpc: . via
by repository service 14 Jul '15

14 Jul '15

Author: quozl Date: Wed Jul 15 04:08:40 2015 New Revision: 3779 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3779 Log: OLPC - merge different keyjects, resolving divergent edits in r3706 r3710 and r2865, now identical. Modified: cpu/x86/pc/olpc/keyject.fth cpu/x86/pc/olpc/via/keyject.fth Modified: cpu/x86/pc/olpc/keyject.fth ============================================================================== --- cpu/x86/pc/olpc/keyject.fth Wed Jul 15 03:48:38 2015 (r3778) +++ cpu/x86/pc/olpc/keyject.fth Wed Jul 15 04:08:40 2015 (r3779) @@ -97,7 +97,7 @@ 2over 2over ($add-tag) ( value$ name$ ) ." Added " type cr ( value$ ) then ( value$ ) - black-letters ( value$ ) + cancel ( value$ ) free-mem ( ) else ( name$ ) ." Warning: key " type ." is not in firmware image dropins" cr ( ) @@ -116,7 +116,7 @@ : keyject-error ( msg$ -- ) cr - red-letters ." Not injecting because: " type cr black-letters + red-letters ." Not injecting because: " type cr cancel cr ." Will update firmware in 20 seconds" cr d# 21 1 do i .d (cr d# 1,000 ms loop @@ -217,7 +217,7 @@ : ?keyject ( -- ) visible - green-letters cr ." Security Key Injector" cr cr black-letters + green-letters cr ." Security Key Injector" cr cr cancel \ Get the new firmware first, so any security checks use the old keys get-new-firmware do-keyject? if Modified: cpu/x86/pc/olpc/via/keyject.fth ============================================================================== --- cpu/x86/pc/olpc/via/keyject.fth Wed Jul 15 03:48:38 2015 (r3778) +++ cpu/x86/pc/olpc/via/keyject.fth Wed Jul 15 04:08:40 2015 (r3779) @@ -22,49 +22,86 @@ ; \ !!! Change the date for each different deployment -: keyject-expired? ( -- flag ) " 20090401T000000Z" expired? ; +: keyject-expired? ( -- flag ) " 20131108T000000Z" expired? ; \ !!! Change the key list for each different deployment : new-key-list$ ( -- ) " o1 s1 d1 w1 a1" ; -\ True if the all the requested tags are already present. +\ True if the requested tags are all present and all correct. \ This prevents endless looping. +0 value already-injected + +: key-differs ( name$ -- ) + ." Key " type ." did differ." cr + false to already-injected +; + +: key-missing ( name$ -- ) + ." Key " type ." was missing." cr + false to already-injected +; + +: key-unknown ( name$ -- ) + ." Key " type ." is unknown, no dropin." cr + \ no action possible, needs keyjector to be recreated. +; + +: key-ok ( name$ -- ) + ." Key " type ." is okay." cr + \ no action desired. +; + +: test-key ( name$ -- ) + 2dup find-tag if ( name$ value$ ) + 2over find-drop-in if ( name$ value$ existing$ ) + $= 0= if ( name$ ) + 2dup key-differs ( name$ ) + else + 2dup key-ok + then ( name$ ) + else ( name$ value$ ) + 2drop 2dup key-unknown ( name$ ) + then ( name$ ) + 2drop ( ) + else ( name$ ) + key-missing ( ) + then ( ) +; + : already-injected? ( -- flag ) - new-key-list$ begin dup while ( $ ) - bl left-parse-string ( $' name$ ) - find-tag if ( $ value$ ) - 2drop ( $ ) - else ( $ ) - 2drop false exit - then ( $ ) - repeat ( $ ) - 2drop true + true to already-injected ( ) + new-key-list$ begin dup while ( $ ) + bl left-parse-string ( $' name$ ) + test-key ( $ ) + repeat ( $ ) + 2drop ( ) + already-injected ( flag ) ; -: inject-key ( keyname$ -- ) - 2dup find-drop-in if ( keyname$ value$ ) - 2over ram-find-tag if ( keyname$ value$ oldvalue$ ) - 2 pick <> if ( keyname$ value$ oldvalue$ ) - 3drop ( keyname$ ) - ." Warning: inconsistent old tag length for " type cr ( ) - exit - then ( keyname$ value$ oldvalue-adr ) - >r 2tuck r> swap move ( valu$ keyname$ ) - green-letters - ." Replaced " type cr ( value$ ) - cancel - else ( keyname$ value$ ) - 2swap ( value$ keyname$ ) - 2over 2over ( value$ keyname$ value$ keyname$ ) - ($add-tag) ( value$ keyname$ ) - green-letters - ." Added " type cr ( value$ ) - cancel - then ( value$ ) - free-mem ( ) - else ( keyname$ ) - ." Warning: Can't find a dropin module for " type cr ( ) - then ( ) +: inject-key ( name$ -- ) + 2dup find-drop-in if ( name$ value$ ) + green-letters ( name$ value$ ) + 2over ram-find-tag if ( name$ value$ oldvalue$ ) + 2 pick <> if ( name$ value$ oldvalue-adr ) + drop ( name$ value$ ) + 2over ($delete-tag) ( name$ value$ ) + 2over ." Deleted " type cr ( name$ value$ ) + 2over 2over 2swap ($add-tag) ( name$ value$ ) + 2swap ." Added " type cr ( value$ ) + else ( name$ value$ oldvalue-adr ) + >r 2tuck r> swap move ( value$ name$ ) + ." Replaced " type cr ( value$ ) + then ( value$ ) + else ( name$ value$ ) + 2swap ( value$ name$ ) + 2over 2over ($add-tag) ( value$ name$ ) + ." Added " type cr ( value$ ) + then ( value$ ) + cancel ( value$ ) + free-mem ( ) + else ( name$ ) + ." Warning: key " type ." is not in firmware image dropins" cr ( ) + then ( ) ; : inject-keys ( -- ) @@ -82,7 +119,7 @@ red-letters ." Not injecting because: " type cr cancel cr ." Will update firmware in 20 seconds" cr - d# 20,000 ms + d# 21 1 do i .d (cr d# 1,000 ms loop ; : do-keyject? ( -- flag )

1 0

[commit] r3778 - cpu/arm/olpc/4.0
by repository service 14 Jul '15

14 Jul '15

Author: quozl Date: Wed Jul 15 03:48:38 2015 New Revision: 3778 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3778 Log: OLPC XO-4 - keyject, customise for SKU322 Modified: cpu/arm/olpc/4.0/keyject.bth Modified: cpu/arm/olpc/4.0/keyject.bth ============================================================================== --- cpu/arm/olpc/4.0/keyject.bth Wed Jul 15 03:48:11 2015 (r3777) +++ cpu/arm/olpc/4.0/keyject.bth Wed Jul 15 03:48:38 2015 (r3778) @@ -22,6 +22,9 @@ build-now fload ${BP}/cpu/arm/olpc/4.0/fw-version.fth +\ for an SKU322 keyjector +macro: FW_MAJOR B +macro: FW_MINOR 42y " macro: FW_VERSION ${FW_PREFIX}${FW_MAJOR}${FW_MINOR}" expand$ eval @@ -165,6 +168,15 @@ " ${BP}/clients/emacs/emacs.hlp" " emacs.hlp" $add-deflated-dropin " ${BP}/clients/emacs/arm/emacs" " emacs" $add-deflated-dropin + \ for an SKU322 keyjector + " ${BP}/cpu/x86/pc/olpc/keyject.fth" " probe+" $add-deflated-dropin + \ Incompressible + " ${BP}/cpu/x86/pc/olpc/o1.public" " o1" $add-dropin + " ${BP}/cpu/x86/pc/olpc/s1.public" " s1" $add-dropin + " ${BP}/cpu/x86/pc/olpc/d1.public" " d1" $add-dropin + " ${BP}/cpu/x86/pc/olpc/w1.public" " w1" $add-dropin + " ${BP}/cpu/x86/pc/olpc/a1.public" " a1" $add-dropin + .( Dropin top is ) ofd @ fsize .x cr /rom pad-file @@ -195,7 +207,8 @@ \ a) It reports the firmware revision for use by external scripts \ b) It provides an olpc.* artifact for the builder dependency management. -writing olpc.version +\ for an SKU322 keyjector +writing keyject.version " ${FW_VERSION}" expand$ 2dup lower ofd @ fputs ofd @ fclose

1 0

[commit] r3777 - cpu/arm/olpc/4.0
by repository service 14 Jul '15

14 Jul '15

Author: quozl Date: Wed Jul 15 03:48:11 2015 New Revision: 3777 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3777 Log: OLPC XO-4 - keyject, copy from olpc.bth Added: cpu/arm/olpc/4.0/keyject.bth Added: cpu/arm/olpc/4.0/keyject.bth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/4.0/keyject.bth Wed Jul 15 03:48:11 2015 (r3777) @@ -0,0 +1,227 @@ +purpose: Construct the Open Firmware module collection + +command: &builder &this +in: ${BP}/cpu/arm/olpc/4.0/build/ec.img +in: ${BP}/cpu/arm/olpc/4.0/build/nn.hex +in: ${BP}/cpu/arm/olpc/4.0/build/fw.img +in: ${BP}/cpu/arm/olpc/4.0/build/resetvec.img +in: ${BP}/cpu/arm/olpc/4.0/build/mcastnand.bin +in: sd8686.bin +in: mv8787.bin +in: verify.img +in: ${BP}/dev/usb2/device/hub/build/hub.fc +in: ${BP}/dev/usb2/device/generic/build/generic.fc +in: ${BP}/dev/usb2/device/net/build/usbnet.fc +in: ${BP}/dev/usb2/device/keyboard/build/usbkbd.fc +in: ${BP}/dev/usb2/device/mouse/build/usbmouse.fc +in: ${BP}/dev/usb2/device/serial/build/usbserial.fc +in: ${BP}/dev/usb2/device/storage/build/usbstorage.fc +in: testicons.bin +in: ${BP}/clients/emacs/arm/emacs +in: cforth.img +build-now + +fload ${BP}/cpu/arm/olpc/4.0/fw-version.fth + +" macro: FW_VERSION ${FW_PREFIX}${FW_MAJOR}${FW_MINOR}" expand$ eval + +fload ${BP}/cpu/arm/olpc/4.0/config.fth + +\ Always re-create the builton.fth file when we make a new rom.img +fload ${BP}/cpu/x86/pc/builton.bth +fload ${BP}/cpu/arm/olpc/sourceurl.fth + +fload ${BP}/forth/lib/crc32.fth + +hex + +: pad-file ( location -- ) + ofd @ fsize + 2dup u< abort" The ROM image is too large" + ?do h# ff ofd @ fputc loop +; + +fload ${BP}/cpu/arm/marvell/tim.fth + +\ Marvell Non-Trusted Image Module image creation script for XO-4.0 platform. + +tim: 00030400 0 OLPC PXA212x + flash: SPI'10 + timh: TIMH 0 d101f000 + image: OBMI 2000 d1000000 cforth.img + reserved: + \ Disable USB download/init by enabling the FFUART for download + \ This works around a PHY init erratum for the B0 chip + uart: 00004646 1 + term: + end-reserved +end-tim + +h# 20.0000 to reserved-start +h# 20.0000 to reserved-end + +.( --- Saving as ) +" ${FW_VERSION}.rom" expand$ 2dup lower ( adr len ) +2dup type cr ( adr len ) +$new-file + tim$ ofd @ fputs + + dropin-offset pad-file + +\ Loads the set of drivers that is common to different output formats + + " ${BP}/cpu/arm/build/inflate.bin" " inflate" $add-dropin + " fw.img" " firmware" $add-deflated-dropin +\ " fw.img" " firmware" $add-dropin + " resetvec.img" " reset" $add-dropin + + " ${BP}/cpu/arm/mmp3/gic.fth" " mmp3-gic-" $add-dropin +\ " ${BP}/dev/usb2/hcd/ehci/build/ehci.fc" " class0c0320" $add-deflated-dropin + " ${BP}/dev/usb2/device/hub/build/hub.fc" " usb,class9" $add-deflated-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,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 + + " sd8686_helper.bin" " helper_sd.bin" $add-deflated-dropin + " sd8686.bin" " sd8686.bin" $add-deflated-dropin + " mv8787.bin" " mv8787.bin" $add-deflated-dropin + + " builton.fth" " probe-" $add-dropin + +0 [if] + " ${BP}/clients/emacs/x86/emacs" " emacs" $add-deflated-dropin + " ${BP}/clients/emacs/x86/emacs.rc" " emacs.rc" $add-deflated-dropin + " ${BP}/clients/emacs/emacs.hlp" " emacs.hlp" $add-deflated-dropin +[then] + + " ${BP}/ofw/inet/telnetd.fth" " telnetd" $add-deflated-dropin + +\ " ${BP}/cpu/x86/pc/olpc/images/warnings.565" " warnings.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/lightdot.565" " lightdot.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/yellowdot.565" " yellowdot.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/darkdot.565" " darkdot.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/lock.565" " lock.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/unlock.565" " unlock.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/plus.565" " plus.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/minus.565" " minus.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/x.565" " x.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/sad.565" " sad.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/bigdot.565" " bigdot.565" $add-deflated-dropin + + " ${BP}/cpu/x86/pc/olpc/images/check.565" " check.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/xogray.565" " xogray.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" " disk.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/wireless.565" " wlan.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/laptop.565" " int.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/sd.565" " ext.565" $add-deflated-dropin + + " verify.img" " verify" $add-deflated-dropin + " os.public" " ospubkey" $add-dropin \ Incompressible + " fw.public" " fwpubkey" $add-dropin \ Incompressible + " fs.public" " fspubkey" $add-dropin \ Incompressible + " lease.public" " leasepubkey" $add-dropin \ Incompressible + " developer.public" " develpubkey" $add-dropin \ Incompressible + + " sourceurl" " sourceurl" $add-dropin + + " ${BP}/cpu/x86/pc/olpc/images/Edge1-8k-EQ-Comp-Amp-Short.wav" " splash" $add-deflated-dropin + + \ icons for mfg test gui + " 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/images/bigx.di" $add-file + " ${BP}/cpu/x86/pc/olpc/images/bigcheck.di" $add-file + " ${BP}/cpu/x86/pc/olpc/images/leds.di" $add-file + " ${BP}/cpu/x86/pc/olpc/images/ebook.di" $add-file + + \ icons for boot menu + " ${BP}/cpu/x86/pc/olpc/images/android.565" " android.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/xos.565" " xos.565" $add-deflated-dropin + + " nandblaster15_rx.bin" " nb15_rx" $add-deflated-dropin + " nandblaster_tx.bin" " nb_tx" $add-deflated-dropin + + " ec.img" " ecimage.bin" $add-deflated-dropin + " nn.hex" " nn.hex" $add-deflated-dropin + " ${BP}/clients/emacs/x86/emacs.rc" " emacs.rc" $add-deflated-dropin + " ${BP}/clients/emacs/emacs.hlp" " emacs.hlp" $add-deflated-dropin + " ${BP}/clients/emacs/arm/emacs" " emacs" $add-deflated-dropin + +.( Dropin top is ) ofd @ fsize .x cr + +/rom pad-file + +\ Insert the revision signature +h# 10 buffer: signature +signature h# 10 blank +signature$ signature swap move +" ${FW_VERSION}" expand$ signature 6 + swap move +" ${FW_PREFIX}${FW_MAJOR}" expand$ signature d# 13 + swap move +signature-offset ofd @ fseek +signature h# 10 ofd @ fputs + +/l buffer: crcbuf +/rom buffer: filebuf + +\ Read the entire image, compute the CRC, and store it in the CRC location +0 ofd @ fseek +filebuf /rom ofd @ fgets /rom <> abort" Can't read back image" +0 crctab filebuf /rom ($crc) crcbuf ! + +crc-offset ofd @ fseek +crcbuf /l ofd @ fputs + +ofd @ fclose + +\ Creating olpc.version serves two purposes: +\ a) It reports the firmware revision for use by external scripts +\ b) It provides an olpc.* artifact for the builder dependency management. + +writing olpc.version +" ${FW_VERSION}" expand$ 2dup lower ofd @ fputs +ofd @ fclose + + + +\ LICENSE_BEGIN +\ Copyright (c) 2010 FirmWorks +\ +\ Permission is hereby granted, free of charge, to any person obtaining +\ a copy of this software and associated documentation files (the +\ "Software"), to deal in the Software without restriction, including +\ without limitation the rights to use, copy, modify, merge, publish, +\ distribute, sublicense, and/or sell copies of the Software, and to +\ permit persons to whom the Software is furnished to do so, subject to +\ the following conditions: +\ +\ The above copyright notice and this permission notice shall be +\ included in all copies or substantial portions of the Software. +\ +\ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +\ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +\ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +\ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +\ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +\ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +\ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +\ +\ LICENSE_END +

1 0

[commit] r3776 - cpu/x86/pc/olpc/sstools
by repository service 08 Jul '15

08 Jul '15

Author: quozl Date: Thu Jul 9 04:30:09 2015 New Revision: 3776 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3776 Log: OLPC XO-4 - screenshot feature extensions, cache of shots Modified: cpu/x86/pc/olpc/sstools/bmp.fth Modified: cpu/x86/pc/olpc/sstools/bmp.fth ============================================================================== --- cpu/x86/pc/olpc/sstools/bmp.fth Wed Jul 1 07:55:06 2015 (r3775) +++ cpu/x86/pc/olpc/sstools/bmp.fth Thu Jul 9 04:30:09 2015 (r3776) @@ -1,4 +1,4 @@ -\ dump XO-1 frame buffer in BMP24 format +\ dump XO-4 frame buffer in BMP24 format dev /display : fb-va ( -- fb ) frame-buffer-adr ; @@ -14,19 +14,20 @@ h# 36 constant /bmp-hdr /bmp-hdr buffer: bmp-hdr +0 value fb-va-orig 0 value fb-va : put-plane ( -- ) - " fb-va" screen-ih $call-method to fb-va + fb-va-orig to fb-va bmp-height 0 do bmp-width 0 ?do - fb-va w@ ( rgb565 ) - 565>rgb ( r g b ) - ofd @ fputc - ofd @ fputc - ofd @ fputc - fb-va wa1+ to fb-va + fb-va w@ ( rgb565 ) + 565>rgb ( r g b ) + ofd @ fputc + ofd @ fputc + ofd @ fputc + fb-va wa1+ to fb-va loop loop ; @@ -58,6 +59,7 @@ writing screen-wh to bmp-height to bmp-width + " fb-va" screen-ih $call-method to fb-va-orig put-header put-plane ofd @ fclose @@ -72,3 +74,94 @@ ['] evaluate catch ?dup if nip nip .error then screen-ih add-output ; + +\ special screenshots to cache, then later save + +: red-on ols-led-on ; +: red-off ols-led-off ols-led-ec-control ; +: red-blinks ( n -- ) 0 do red-on d# 50 ms red-off d# 200 ms loop ; +: orange-on led-storage-gpio# gpio-set ols-led-on ols-assy-mode-on ; +: orange-off led-storage-gpio# gpio-clr ols-led-off ols-assy-mode-off ; + +0 value cb-va \ base of cache +0 value /cb-va \ size of image +0 value #cb \ number of images in cache + +: .cb ( -- ) ." you have " #cb .d ." images in cache" cr ; + +: cb-wipe ( -- ) + screen-wh to bmp-height to bmp-width + " fb-va" screen-ih $call-method to fb-va-orig + bmp-height bmp-width * 2* to /cb-va + load-base to cb-va + 0 to #cb + .cb +; + +: >cb ( #cb -- cb-va' ) + cb-va swap /cb-va * + +; + +: cb-show ( -- ) + fb-va-orig #cb >cb /cb-va move \ save screen beyond cache + #cb 0 ?do + i >cb fb-va-orig /cb-va move \ show an image + key drop \ wait for a key + loop + #cb >cb fb-va-orig /cb-va move \ restore screen + .cb +; + +: saving ( #cb fn$ -- ) + writing ( #cb ) + >cb to fb-va-orig ( ) + put-header + put-plane + ofd @ fclose +; + +: cb-save ( -- ) + #cb 0 ?do + i + ts$ + " u:\" + " saving %s%s.bmp" sprintf + 2dup type cr + orange-on + ['] evaluate catch ?dup if nip nip .error then + orange-off + d# 1000 ms \ hack to enforce unique file name + loop + .cb +; + +: ?cb-wait-key-up + red-on + begin gpio-rotate-button? 0= until + red-off d# 200 ms +; + +: cb-key-down ( -- ) + ?cb-wait-key-up \ wait for key release + #cb 1+ red-blinks \ blink red led to show cache size + fb-va-orig #cb >cb /cb-va move \ save image to cache + #cb 1+ to #cb \ increment image counter + red-off \ turn off the led +; + +: cb-help + cr + ." XO-4 screenshot to cache utility 2015-06-19" cr + " commands" cr + cr + ." .cb show how many images are in cache" cr + ." cb-wipe empty the cache" cr + ." cb-show show the cache, one by one" cr + ." cb-save save the cache to USB drive" cr + cr +; +cb-help +cb-wipe + +: cb-alarm ( -- ) gpio-rotate-button? if cb-key-down then ; +' cb-alarm d# 100 alarm \ schedule regular asynchronous task

1 0

[commit] r3775 - dev
by repository service 30 Jun '15

30 Jun '15

Author: quozl Date: Wed Jul 1 07:55:06 2015 New Revision: 3775 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3775 Log: OLPC XO-4 - get-hdmi-edid was returning extra zero on stack underneath string Modified: dev/edid.fth Modified: dev/edid.fth ============================================================================== --- dev/edid.fth Mon May 18 00:38:23 2015 (r3774) +++ dev/edid.fth Wed Jul 1 07:55:06 2015 (r3775) @@ -368,11 +368,11 @@ then ; : get-hdmi-edid ( -- adr len ) - " /hdmi-ddc" open-dev dup if ( ih ) + " /hdmi-ddc" open-dev ?dup if ( ih ) " edid$" 2 pick $call-method ( ih adr len ) rot close-dev ( adr len ) - else - " " + else ( ) + " " ( adr len ) then ; : choose-hdmi-resolution ( -- )

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

openfirmware July 2015