August 2011 - openfirmware - mail.coreboot.org

[commit] r2405 - cpu/arm/olpc/1.75
by repository service Aug. 2, 2011

Aug. 2, 2011

Author: wmb Date: Tue Aug 2 20:23:11 2011 New Revision: 2405 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2405 Log: OLPC XO-1.75 trac #11099 - the startup jingle was interfering with rocker-triggered selftest. Modified: cpu/arm/olpc/1.75/fw.bth Modified: cpu/arm/olpc/1.75/fw.bth ============================================================================== --- cpu/arm/olpc/1.75/fw.bth Tue Aug 2 19:55:53 2011 (r2404) +++ cpu/arm/olpc/1.75/fw.bth Tue Aug 2 20:23:11 2011 (r2405) @@ -416,6 +416,13 @@ then ( in-factory? ) ; +: ?sound ( -- ) + \ Suppress the jingle if a game key is pressed, because we don't want + \ the jingle to interfere with diags and stuff + -1 game-key? if exit then + ['] sound catch drop +; + : ?games ( -- ) rocker-right game-key? if protect-fw @@ -464,7 +471,7 @@ ?update-ec-flash install-alarm - ['] sound catch drop + ?sound ?games

1 0

[commit] r2404 - dev/olpc/mmp2camera
by repository service Aug. 2, 2011

Aug. 2, 2011

Author: wmb Date: Tue Aug 2 19:55:53 2011 New Revision: 2404 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2404 Log: OLPC XO-1.75 - fixed camera driver - it was broken by the VA != PA conversion. Modified: dev/olpc/mmp2camera/ccic.fth Modified: dev/olpc/mmp2camera/ccic.fth ============================================================================== --- dev/olpc/mmp2camera/ccic.fth Tue Aug 2 07:25:19 2011 (r2403) +++ dev/olpc/mmp2camera/ccic.fth Tue Aug 2 19:55:53 2011 (r2404) @@ -138,6 +138,7 @@ ; : open ( -- flag ) + my-address my-space h# 1000 " map-in" $call-parent to camera-base init ov7670-detected? 0= if false exit then alloc-dma-bufs @@ -252,7 +253,6 @@ : selftest ( -- error? ) open 0= if true exit then - my-address my-space h# 1000 " map-in" $call-parent to camera-base d# 300 ms start-display unmirrored shoot-still ?dup if close exit then ( error? )

1 0

[commit] r2403 - cpu/arm/olpc/1.75
by repository service Aug. 1, 2011

Aug. 1, 2011

Author: quozl Date: Tue Aug 2 07:25:19 2011 New Revision: 2403 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2403 Log: OLPC XO-1.75 - added convenience function for my test bed scripting, previously qrom in XO-1.5. Executes a script via HTTP over WLAN. No functional change. Modified: cpu/arm/olpc/1.75/fw.bth Modified: cpu/arm/olpc/1.75/fw.bth ============================================================================== --- cpu/arm/olpc/1.75/fw.bth Tue Aug 2 06:18:44 2011 (r2402) +++ cpu/arm/olpc/1.75/fw.bth Tue Aug 2 07:25:19 2011 (r2403) @@ -510,6 +510,9 @@ : newec " flash-ec http:\\10.20.0.14\~wmb\ecimage.bin" eval ; +: qz + " qz" $essid " http:\\qz\" included \ qa test bed scripting, james cameron +; : urom " flash! u:\new.rom" eval ; : uec " flash-ec! u:\ecimage.bin" eval ; : erom " flash! ext:\new.rom" eval ;

1 0

[commit] r2402 - cpu/arm/olpc/1.75
by repository service Aug. 1, 2011

Aug. 1, 2011

Author: wmb Date: Tue Aug 2 06:18:44 2011 New Revision: 2402 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2402 Log: OLPC XO-1.75 - changed the paths for newrom and newec convenience functions. No functional change. Modified: cpu/arm/olpc/1.75/fw.bth Modified: cpu/arm/olpc/1.75/fw.bth ============================================================================== --- cpu/arm/olpc/1.75/fw.bth Tue Aug 2 06:10:48 2011 (r2401) +++ cpu/arm/olpc/1.75/fw.bth Tue Aug 2 06:18:44 2011 (r2402) @@ -505,10 +505,10 @@ ; : newrom - " flash! http:\\10.20.0.14\new.rom" eval + " flash! http:\\10.20.0.14\~wmb\new.rom" eval ; : newec - " flash-ec http:\\10.20.0.14\ecimage.bin" eval + " flash-ec http:\\10.20.0.14\~wmb\ecimage.bin" eval ; : urom " flash! u:\new.rom" eval ; : uec " flash-ec! u:\ecimage.bin" eval ;

1 0

[commit] r2401 - in cpu: arm/olpc/1.75 x86/pc/olpc/via
by repository service Aug. 1, 2011

Aug. 1, 2011

Author: wmb Date: Tue Aug 2 06:10:48 2011 New Revision: 2401 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2401 Log: OLPC trac #11098 - Sped up fs-update on XO-1.75 by using software sha-256 instead of the slower hardware "accelerated" version. OS31 now fs-update's in 4:00 (4 minutes) instead of 5:30. Modified: cpu/arm/olpc/1.75/fw.bth cpu/x86/pc/olpc/via/fsupdate.fth cpu/x86/pc/olpc/via/fsverify.fth cpu/x86/pc/olpc/via/fw.bth Modified: cpu/arm/olpc/1.75/fw.bth ============================================================================== --- cpu/arm/olpc/1.75/fw.bth Tue Aug 2 05:55:57 2011 (r2400) +++ cpu/arm/olpc/1.75/fw.bth Tue Aug 2 06:10:48 2011 (r2401) @@ -327,6 +327,7 @@ : hdd-led-on ( -- ) d# 10 gpio-set ; : hdd-led-toggle ( -- ) d# 10 gpio-pin@ if hdd-led-off else hdd-led-on then ; +alias fast-hash crypto-hash \ fast-hash uses acceleration when available fload ${BP}/cpu/x86/pc/olpc/via/fsupdate.fth fload ${BP}/cpu/x86/pc/olpc/via/fsverify.fth devalias fsdisk int:0 Modified: cpu/x86/pc/olpc/via/fsupdate.fth ============================================================================== --- cpu/x86/pc/olpc/via/fsupdate.fth Tue Aug 2 05:55:57 2011 (r2400) +++ cpu/x86/pc/olpc/via/fsupdate.fth Tue Aug 2 06:10:48 2011 (r2401) @@ -151,11 +151,7 @@ : check-hash ( -- ) 2>r ( eblock# hashname$ r: hash$ ) data-buffer /nand-block 2swap ( eblock# data$ hashname$ r: hash$ ) - 2dup " sha256" $= if ( eblock# hashname$ r: hash$ ) - 2drop sha-256 ( eblock# calc-hash$ r: hash$ ) - else - crypto-hash ( eblock# calc-hash$ r: hash$ ) - then + fast-hash ( eblock# r: hash$ ) 2r> $= 0= if ( eblock# ) ." Bad hash for eblock# " .x cr cr ." Your USB key may be bad. Please try a different one." cr Modified: cpu/x86/pc/olpc/via/fsverify.fth ============================================================================== --- cpu/x86/pc/olpc/via/fsverify.fth Tue Aug 2 05:55:57 2011 (r2400) +++ cpu/x86/pc/olpc/via/fsverify.fth Tue Aug 2 06:10:48 2011 (r2401) @@ -33,11 +33,7 @@ : verify-hash ( hashname$ hash$ -- okay? ) 2swap ( hash$ hashname$ ) data-buffer /nand-block 2swap ( hash$ data$ hashname$ ) - 2dup " sha256" $= if ( hash$ hashname$ ) - 2drop sha-256 ( hash$ calc-hash$ ) - else ( hash$ hashname$ ) - crypto-hash ( hash$ calc-hash$ ) - then ( hash$ calc-hash$ ) + fast-hash ( hash$ calc-hash$ ) $= ( okay? ) ; Modified: cpu/x86/pc/olpc/via/fw.bth ============================================================================== --- cpu/x86/pc/olpc/via/fw.bth Tue Aug 2 05:55:57 2011 (r2400) +++ cpu/x86/pc/olpc/via/fw.bth Tue Aug 2 06:10:48 2011 (r2401) @@ -498,6 +498,13 @@ fload ${BP}/cpu/x86/pc/olpc/via/blockfifo.fth : hdd-led-toggle ( -- ) h# 4c acpi-l@ h# 400000 xor h# 4c acpi-l! ; : hdd-led-off ( -- ) h# 4c acpi-l@ h# 400000 or h# 4c acpi-l! ; +: fast-hash ( adr len hashname$ -- ) + 2dup " sha256" $= if ( eblock# hashname$ r: hash$ ) + 2drop sha-256 ( eblock# calc-hash$ r: hash$ ) + else + crypto-hash ( eblock# calc-hash$ r: hash$ ) + then +; fload ${BP}/cpu/x86/pc/olpc/via/fsupdate.fth fload ${BP}/cpu/x86/pc/olpc/via/fsverify.fth devalias fsdisk int:0

1 0

[commit] r2400 - cpu/arm/mmp2
by repository service Aug. 1, 2011

Aug. 1, 2011

Author: wmb Date: Tue Aug 2 05:55:57 2011 New Revision: 2400 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2400 Log: OLPC XO-1.75 - trac #11089 - changed the SSP SPI driver to avoid glitches that confuse the SPI FLASH chip. Modified: cpu/arm/mmp2/sspspi.fth Modified: cpu/arm/mmp2/sspspi.fth ============================================================================== --- cpu/arm/mmp2/sspspi.fth Tue Aug 2 05:31:12 2011 (r2399) +++ cpu/arm/mmp2/sspspi.fth Tue Aug 2 05:55:57 2011 (r2400) @@ -12,8 +12,11 @@ : ssp-sssr ( -- adr ) ssp-base 2 la+ ; : ssp-ssdr ( -- adr ) ssp-base 4 la+ ; - : ssp-spi-start ( -- ) + \ Avoid reinitializing the device after the first time, as that + \ seems to cause glitches that confuse the SPI FLASH chip + ssp-sscr1 io@ 0= if exit then + h# 07 ssp-sscr0 io! 0 ssp-sscr1 io! h# 87 ssp-sscr0 io! @@ -127,16 +130,8 @@ : ssp-spi-out ( b -- ) ssp-spi-out-in drop ; : ssp-spi-in ( -- b ) 0 ssp-spi-out-in ; -: safe-spi-start - ssp-spi-start - \ The following clears out some glitches so the chip will respond - \ to the ab-id command. - 0 spi-cmd spi-cs-off - 0 spi-cmd spi-cs-off -; - : use-ssp-spi ( -- ) - ['] safe-spi-start to spi-start + ['] ssp-spi-start to spi-start ['] ssp-spi-in to spi-in ['] ssp-spi-out to spi-out ['] ssp-spi-cs-on to spi-cs-on

1 0

[commit] r2399 - dev/olpc/spiflash
by repository service Aug. 1, 2011

Aug. 1, 2011

Author: wmb Date: Tue Aug 2 05:31:12 2011 New Revision: 2399 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2399 Log: OLPC - SPI FLASH high level driver - reverted svn 2396 because a) The changes therein caused an unwanted message to appear in the case where the retry code was automatically recovering from the id error and b) Knowing the precise value of the bad ID did not turn out to be interesting The actual problem has been fixed and will be checked in next. Modified: dev/olpc/spiflash/spiflash.fth Modified: dev/olpc/spiflash/spiflash.fth ============================================================================== --- dev/olpc/spiflash/spiflash.fth Tue Aug 2 01:56:30 2011 (r2398) +++ dev/olpc/spiflash/spiflash.fth Tue Aug 2 05:31:12 2011 (r2399) @@ -280,7 +280,7 @@ ." If you power cycle and try again, it will probably work the next time." cr abort endof - ( default ) ." Unsupported SPI FLASH ID " dup .x cr abort + ( default ) true abort" Unsupported SPI FLASH ID" endcase to write-spi-flash 0 spi-write-status \ Turn off write protect bits

1 0

[commit] r2398 - cpu/arm/olpc/1.75 dev/usb2/hcd
by repository service Aug. 1, 2011

Aug. 1, 2011

Author: quozl Date: Tue Aug 2 01:56:30 2011 New Revision: 2398 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2398 Log: OLPC XO-1.75 - change final function USB test order for CL2 to match CL1B, remove test mask, implement a test sequence property. Modified: cpu/arm/olpc/1.75/usb.fth dev/usb2/hcd/probehub.fth Modified: cpu/arm/olpc/1.75/usb.fth ============================================================================== --- cpu/arm/olpc/1.75/usb.fth Mon Aug 1 21:11:37 2011 (r2397) +++ cpu/arm/olpc/1.75/usb.fth Tue Aug 2 01:56:30 2011 (r2398) @@ -16,11 +16,15 @@ : otg-set-host-mode 3 h# a8 ehci-reg! ; \ Force host mode ' otg-set-host-mode to set-host-mode - \ Port 1 on the hub (bit 0) is connected to unused pins on the - \ WLAN connector, so testing it is confusing - h# e " hub-port-mask" integer-property + \ Port 1 on the hub is connected to unused pins on the WLAN connector, + \ so testing it is confusing + \ Port 2 is right upper + \ Port 3 is left + \ Port 4 is right lower + h# 03.04.02.00 " hub-port-seq" integer-property + end-package - + d# 300 config-int usb-delay \ Milliseconds to wait before probing hub ports devalias u /usb/disk Modified: dev/usb2/hcd/probehub.fth ============================================================================== --- dev/usb2/hcd/probehub.fth Mon Aug 1 21:11:37 2011 (r2397) +++ dev/usb2/hcd/probehub.fth Tue Aug 2 01:56:30 2011 (r2398) @@ -188,46 +188,57 @@ probe-teardown ( error? ) ; -0 value hub-test-mask +: (hub-selftest) ( port -- stop? ) + >r + hub-dev parent-set-target ( ) + r@ get-port-status if ( ) + ." Get-port-status failed for hub port " r@ u. cr + r> drop true exit ( -- true ) + then ( ) + hub-buf c@ 8 and if \ Connected ( ) + ." Hub port " r@ u. ." in over current" cr + r> drop true exit ( -- true ) + then ( ) + hub-buf c@ 1 and if \ Connected ( ) + ." Hub port " r@ u. ." in use" cr ( ) + else ( ) + diagnostic-mode? if ( ) + ." Please connect a device to USB hub port " r@ u. cr ( ) + r@ wait-hub-connect if r> drop true exit then ( ) + else ( ) + ." Fisheye pattern out to USB hub port " r@ u. cr ( ) + r@ 4 test-hub-port ( ) + d# 2,000 ms ( ) + r@ untest-hub-port ( ) + r@ reset-hub-port r@ power-hub-port ( ) + then ( ) + then ( ) + r> drop false +; + : hub-selftest ( hub-dev -- error? ) - to hub-dev ( ) + to hub-dev ( ) + + " hub-port-seq" get-inherited-property if ( ) + hub-#ports 1+ 1 ?do ( ) + i (hub-selftest) if true unloop exit then + loop ( ) + else ( propval$ ) + decode-int nip nip ( seq ) + + 4 0 do + dup h# ff000000 and d# 24 rshift h# ff and ( seq port ) + dup if ( seq port ) + (hub-selftest) if true exit then + else + drop + then ( seq ) + d# 8 lshift ( seq' ) + loop + then - " hub-port-mask" get-inherited-property if ( ) - -1 ( mask ) - else ( propval$ ) - decode-int nip nip ( mask ) - then ( mask ) - to hub-test-mask ( ) - - hub-#ports 1+ 1 ?do ( ) - 1 i 1- lshift hub-test-mask and if - hub-dev parent-set-target ( ) - i get-port-status if ( ) - ." Get-port-status failed for hub port " i u. cr - true unloop exit ( -- true ) - then ( ) - hub-buf c@ 8 and if \ Connected ( ) - ." Hub port " i u. ." in over current" cr - true unloop exit ( -- true ) - then ( ) - hub-buf c@ 1 and if \ Connected ( ) - ." Hub port " i u. ." in use" cr ( ) - else ( ) - diagnostic-mode? if ( ) - ." Please connect a device to USB hub port " i u. cr ( ) - i wait-hub-connect if true unloop exit then ( ) - else ( ) - ." Fisheye pattern out to USB hub port " i u. cr ( ) - i 4 test-hub-port ( ) - d# 2,000 ms ( ) - i untest-hub-port ( ) - i reset-hub-port i power-hub-port ( ) - then ( ) - then ( ) - then ( ) - loop ( ) - \ Mabye need to reset the entire hub here - false ( false ) + \ Maybe need to reset the entire hub here + false ( false ) ; : hub-selftest-xt ( -- xt ) ['] hub-selftest ;

1 0

[commit] r2397 - cpu/arm/mmp2
by repository service Aug. 1, 2011

Aug. 1, 2011

Author: wmb Date: Mon Aug 1 21:11:37 2011 New Revision: 2397 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2397 Log: OLPC XO-1.75 - Fixed problem in hardware-accelerated hashing function introduced by the virtual != physical change, thus fixing fs-update . Modified: cpu/arm/mmp2/hash.fth Modified: cpu/arm/mmp2/hash.fth ============================================================================== --- cpu/arm/mmp2/hash.fth Fri Jul 29 04:24:25 2011 (r2396) +++ cpu/arm/mmp2/hash.fth Mon Aug 1 21:11:37 2011 (r2397) @@ -4,7 +4,7 @@ h# 8101 constant dval : dma>hash ( adr len -- ) 4 round-up 2 rshift h# 29080c io! ( adr ) - h# 290808 io! ( ) + >physical h# 290808 io! ( ) dval h# 290800 io! ( ) \ begin h# 290814 io@ 1 and until ; @@ -74,7 +74,7 @@ repeat ( adr len ) 2drop ; -: hash-final ( -- ) +: hash-final ( -- adr len ) #hashed set-msg-size ( ) #hash-buf h# 291810 io! ( ) #hash-buf if @@ -83,7 +83,7 @@ 7 hash-control! \ Final, with hardware padding hash-go dma-stop - h# 291820 /hash-digest + h# 291820 +io /hash-digest ; : hash1 ( adr len -- ) hash-init ( adr len )

1 0