openfirmware

openfirmware@openfirmware.info

3007 discussions

[commit] r2162 - cpu/arm/mmp2
by repository service 03 Feb '11

03 Feb '11

Author: wmb Date: Thu Feb 3 02:00:19 2011 New Revision: 2162 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2162 Log: OLPC XO-1.75 - Added a device node for the Marvell Armada 610 TWSI hardware. Modified: cpu/arm/mmp2/twsi.fth Modified: cpu/arm/mmp2/twsi.fth ============================================================================== --- cpu/arm/mmp2/twsi.fth Thu Feb 3 01:59:11 2011 (r2161) +++ cpu/arm/mmp2/twsi.fth Thu Feb 3 02:00:19 2011 (r2162) @@ -91,41 +91,32 @@ : twsi-get ( register-address .. #reg-bytes #data-bytes -- data-byte ... ) >r ( reg-adr .. #regs r: #data-bytes ) - \ Handle the case where the device does not require that a write register address be sent - slave-address ( reg-adr .. #regs slave-address r: #data-bytes ) - over 0= if ( reg-adr .. #regs slave-address r: #data-bytes ) - r@ if ( reg-adr .. #regs slave-address r: #data-bytes ) - 1 or ( reg-adr .. #regs slave-address' r: #data-bytes ) - then ( reg-adr .. #regs slave-address' r: #data-bytes ) - then ( reg-adr .. #regs slave-address' r: #data-bytes ) - - twsi-start ( reg-adr .. #regs r: #data-bytes ) - - \ Abort the transaction if both #reg-bytes and #data-bytes are 0 - dup r@ or 0= if ( #regs r: #data-bytes ) - iue+scle bbu_ICR_MA or cr! ( #regs r: #data-bytes ) \ Master abort - r> 2drop exit ( -- ) - then ( reg-adr .. #regs r: #data-bytes ) - - \ Send register addresses, if any - 0 ?do 0 twsi-putbyte loop ( r: #data-bytes ) - - \ If no result data requested, quit now - r> dup 0= if ( #data-bytes ) - drop ( ) - iue+scle bbu_ICR_STOP or cr! ( ) - exit - then ( #data-bytes ) - - \ Otherwise send the read address with another start bit - slave-address 1 or bbu_ICR_START twsi-putbyte ( #data-bytes ) - sr@ sr! \ clear ITE and IRF status bits ( #data-bytes ) - \ Bug on line 367 of bbu_TWSI.s - writes SR without first reading it - - 1- 0 ?do 0 twsi-getbyte loop ( bytes ) - - \ Set the stop bit on the final byte - bbu_ICR_STOP bbu_ICR_ACKNAK or twsi-getbyte ( bytes ) + ?dup if ( reg-adr .. #regs slave-address r: #data-bytes ) + slave-address ( reg-adr .. #regs slave-address r: #data-bytes ) + twsi-start ( reg-adr .. #regs r: #data-bytes ) + + \ Send register addresses + 0 ?do 0 twsi-putbyte loop ( r: #data-bytes ) + + \ If no result data requested, quit now + r@ 0= if ( r: #data-bytes ) + r> drop ( ) + iue+scle bbu_ICR_STOP or cr! ( ) + exit + then ( r: #data-bytes ) + then ( r: #data-bytes ) + + r> ?dup if ( #data-bytes ) + \ Send the read address with a (or another) start bit + slave-address 1 or bbu_ICR_START twsi-putbyte ( #data-bytes ) + sr@ sr! \ clear ITE and IRF status bits ( #data-bytes ) + \ Bug on line 367 of bbu_TWSI.s - writes SR without first reading it + + 1- 0 ?do 0 twsi-getbyte loop ( bytes ) + + \ Set the stop bit on the final byte + bbu_ICR_STOP bbu_ICR_ACKNAK or twsi-getbyte ( bytes ) + then ; : twsi-write ( byte .. #bytes -- ) @@ -137,3 +128,20 @@ : twsi-b@ ( reg -- byte ) 1 1 twsi-get ; : twsi-b! ( byte reg -- ) 2 twsi-write ; + +0 0 " " " /" begin-package +" twsi" name + +0 0 instance 2value child-address +: open ( -- okay? ) true ; +: close ( -- ) ; +: set-address ( target channel -- ) to child-address ; +2 " #address-cells" integer-property +0 " #size-cells" integer-property +: get ( #bytes -- bytes ... ) + child-address set-twsi-target + 0 swap twsi-get +; +: decode-unit ( adr len -- low high ) parse-2int ; +: encode-unit ( low high -- adr len ) >r <# u#s drop [char] , hold r> u#s u#> ; +end-package

1 0

[commit] r2161 - cpu/arm/olpc/1.75
by repository service 03 Feb '11

03 Feb '11

Author: wmb Date: Thu Feb 3 01:59:11 2011 New Revision: 2161 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2161 Log: EETI EXC7200 Touchscreen driver - initial revision. Added: cpu/arm/olpc/1.75/exc7200-touchscreen.fth Added: cpu/arm/olpc/1.75/exc7200-touchscreen.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/1.75/exc7200-touchscreen.fth Thu Feb 3 01:59:11 2011 (r2161) @@ -0,0 +1,290 @@ +\ See license at end of file +purpose: Driver and diagnostic for EETI EXC7200 Multitouch I2C Touchscreen + +0 0 " 4,8" " /twsi" begin-package +my-space encode-int my-address encode-int encode+ " reg" property +" touchscreen" name +: open ( -- okay? ) + my-unit " set-address" $call-parent true +; +: close ( -- ) ; +: get-touch? ( -- false | x y z down? contact# true ) + d# 99 gpio-pin@ if false exit then + d# 10 " get" $call-parent ( 4 flags xlo xhi ylo yhi zlo zhi 0 0 ) + 2drop bwjoin >r bwjoin >r bwjoin >r ( 4 flags r: z y x ) + swap 4 <> if ( flags r: z y x ) + r> r> r> 4drop false exit ( -- false ) + then + dup h# 82 and h# 82 <> if ( flags r: z y x ) + r> r> r> 4drop false exit ( -- false ) + then ( flags r: z y x ) + + r> r> r> 3 roll ( x y z flags ) + dup 1 and 0<> ( x y z flags down? ) + swap 2 rshift h# 1f and ( x y z down? contact# ) + true ( x y z down? contact# true ) +; + + +h# f800 constant red +h# 07e0 constant green +h# 001f constant blue +h# ffe0 constant yellow +h# f81f constant magenta +h# 07ff constant cyan +h# ffff constant white +h# 0000 constant black + +variable pixcolor + +h# 4 value y-offset +0 value screen-w +0 value screen-h +0 value /line +2 value /pixel + + +variable ptr + +\ The following code receives and decodes touchpad packets + +: show-packets ( adr len -- ) + push-hex + bounds ?do + i 6 bounds ?do i c@ 3 u.r loop cr + 6 +loop + pop-base +; +: last-10 ( -- ) + ptr @ load-base - d# 60 > if + ptr @ d# 60 - d# 60 + else + load-base ptr @ over - + then + show-packets +; + +h# 7fff constant touchscreen-max-x +h# 7fff constant touchscreen-max-y + +: scale-xy ( x y -- x' y' ) + swap screen-w touchscreen-max-x */ + swap screen-h touchscreen-max-y */ +; + +\ Try to receive a mouse report packet. If one arrives within +\ 20 milliseconds, return true and the decoded information. +\ Otherwise return false. +: pad? ( -- false | x y z down? contact# true ) + get-touch? if ( x dy buttons ) + 2>r >r scale-xy r> 2r> ( x' y' z down? contact# ) + true + else + false + then +; + +\ Display raw data from the device, stopping when a key is typed. +: show-pad ( -- ) + begin + pad? if . . . . . cr then + key? until +; + +: button ( color x -- ) + screen-h d# 50 - d# 200 d# 30 fill-rectangle-noff +; +d# 300 d# 300 2constant target-wh +: left-target ( -- x y w h ) 0 0 target-wh ; +: right-target ( -- x y w h ) screen-w screen-h target-wh xy- target-wh ; +false value left-hit? +false value right-hit? +: inside? ( mouse-x,y x y w h -- flag ) + >r >r ( mouse-x mouse-y x y r: h w ) + xy- ( dx dy ) + swap r> u< ( dy x-inside? ) + swap r> u< ( x-inside? y-inside? ) + and ( flag ) +; + +: draw-left-target ( -- ) green left-target fill-rectangle-noff ; +: draw-right-target ( -- ) red right-target fill-rectangle-noff ; + +: ?hit-target ( -- ) + pixcolor @ cyan = if \ touch1 ( x y ) + 2dup left-target inside? if ( x y ) + yellow left-target fill-rectangle-noff ( x y ) + true to left-hit? ( x y ) + exit + then ( x y ) + then ( x y ) + pixcolor @ yellow = if \ touch2 ( x y ) + 2dup right-target inside? if ( x y ) + yellow right-target fill-rectangle-noff ( x y ) + true to right-hit? ( x y ) + exit + then ( x y ) + then ( x y ) +; + +: track-init ( -- ) + " dimensions" $call-screen to screen-h to screen-w + screen-ih package( bytes/line )package to /line + load-base ptr ! +; + +: dot ( x y -- ) + swap screen-w 3 - min swap y-offset + screen-h 3 - min ( x' y' ) + pixcolor @ -rot 3 3 ( color x y w h ) + fill-rectangle-noff ( ) +; + +: background ( -- ) + black 0 0 screen-w screen-h fill-rectangle-noff + final-test? if + false to left-hit? + false to right-hit? + draw-left-target + draw-right-target + else + 0 d# 27 at-xy ." Touchscreen test. Type a key to exit" cr + then +; + +: setcolor ( contact# -- ) + case + 0 of cyan endof + 1 of yellow endof + 2 of magenta endof + 3 of blue endof + ( default ) white swap + endcase + + pixcolor ! +; +0 value pressure + +: track ( x y z down? contact# -- ) + setcolor ( x y z down? ) + 0= if + pixcolor @ black " replace-color" $call-screen + 3drop exit + then ( x y z ) + to pressure ( x y ) + +\ dup 5 and 5 = if background load-base ptr ! then + + final-test? if ( x y ) + ?hit-target ( x y ) + then ( x y ) + + dot +; + +: handle-key ( -- exit? ) + key upc case + [char] P of + cursor-on + cr last-10 + key drop + background + false + endof + + ( key ) true swap + endcase +; + +false value selftest-failed? \ Success/failure flag for final test mode +: exit-test? ( -- flag ) + final-test? if ( ) + \ If the targets have been hit, we exit with successa + left-hit? right-hit? and if ( ) + false to selftest-failed? ( ) + true ( flag ) + exit + then ( ) + + \ Otherwise we give the tester a chance to bail out by typing a key, + \ thus indicating failure + key? 0= if false exit then ( ) + key drop ( ) + true to selftest-failed? ( ) + true ( flag ) + exit + then ( ) + + \ If not final test mode, we only exit via a key - no targets + key? if handle-key else false then ( exit ? ) +; +: touchscreen-present? ( -- flag ) + d# 10 " get" ['] $call-parent catch if ( x x x ) + 3drop false + else ( n n n n n n n n n n ) + 4drop 4drop 2drop true + then +; + +: selftest ( -- error? ) + open 0= if + ." Touchscreen open failed" true exit + then + + touchscreen-present? 0= if + ." Touchscreen doesn't respond" true exit + then + + \ Being able to open the touchpad is good enough in SMT mode + smt-test? if close false exit then + + final-test? 0= if + ." Touchscreen test will start in 4 seconds" cr + d# 4000 ms + then + + cursor-off track-init + + \ Consume already-queued keys to prevent premature exit + begin key? while key drop repeat + + \ Consume already-queued trackpad events to prevent premature exit + begin pad? while 2drop 3drop repeat + + background + begin + ['] pad? catch ?dup if .error close true exit then + if track then + exit-test? until + + close + cursor-on + page + final-test? if selftest-failed? else false then +; + + +end-package + +\ LICENSE_BEGIN +\ Copyright (c) 2011 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] r2160 - dev/olpc/touchpad
by repository service 03 Feb '11

03 Feb '11

Author: wmb Date: Thu Feb 3 00:30:28 2011 New Revision: 2160 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2160 Log: Synaptics touchpad driver - removed more dead code and fixed bogus comments left over from the ALPS driver. Modified: dev/olpc/touchpad/syntpad.fth Modified: dev/olpc/touchpad/syntpad.fth ============================================================================== --- dev/olpc/touchpad/syntpad.fth Mon Jan 31 01:36:17 2011 (r2159) +++ dev/olpc/touchpad/syntpad.fth Thu Feb 3 00:30:28 2011 (r2160) @@ -2,23 +2,6 @@ \ Add this code to the existing mouse driver dev /mouse -variable 'get-data 'get-data off -variable 'get-data? 'get-data? off - -: setup ( -- ) - 'get-data @ 0= if - " get-data" my-parent ihandle>phandle find-method if - 'get-data ! - then - then - 'get-data? @ 0= if - " get-data?" my-parent ihandle>phandle find-method if - 'get-data? ! - then - then -; - - h# f800 constant red h# 07e0 constant green h# 001f constant blue @@ -41,24 +24,13 @@ \ existing Open Firmware mouse driver: \ open initializes the port and resets the device -\ cmd sends a command byte and waits for the ack -\ read1 reads 1 response byte -\ read2 reads 2 response bytes -\ mouse1:1 command e6 \ mouse2:1 command e7 \ stream-on command f4 -\ stream-off command f5 +\ stream-mode command ea,f4 \ mouse-status command e9 and reads 3 response bytes -\ set-resolution command e8 then sends another command byte -\ get-data? reads a data byte if one is available -\ get-data waits for and reads a data byte - +\ stream-poll? ( -- false | dx dy buttons true ) variable ptr -0 value show-raw? - -\ Runs the special Device ID command and checks for the ALPS return code -\ Ref: 5.2.10 (1) of Hybrid-GP2B-T-1.pdf \ The Synaptics touchpad version is 64.02.30 @@ -67,20 +39,18 @@ 0 bljoin ; -\ Put the device into advanced mode and enable it +\ Put the device into streaming mode and enable it : start ( -- ) - setup stream-mode ; \ The normal mouse driver uses remote mode, but this device \ doesn't support remote mode, so patch the mouse driver -\ "open" routine to substitute "noop" for "remote-mode". +\ "open" routine to substitute "start" for "remote-mode". patch start remote-mode open -\ The following code receives and decodes touchpad packets in the -\ various special formats +\ The following code receives and decodes touchpad packets : show-packets ( adr len -- ) push-hex @@ -112,7 +82,7 @@ r> ( buttons ) ; -\ Try to receive a GS-format packet. If one arrives within +\ Try to receive a mouse report packet. If one arrives within \ 20 milliseconds, return true and the decoded information. \ Otherwise return false. : pad? ( -- false | x y buttons true ) @@ -123,8 +93,7 @@ then ; -\ Switch the device to glide format and display -\ the data that it sends. Stop when a key is typed. +\ Display raw data from the device, stopping when a key is typed. : show-pad ( -- ) start begin

1 0

[commit] r2159 - cpu/arm/olpc/1.75 cpu/x86/pc/biosload cpu/x86/pc/olpc cpu/x86/pc/olpc/via dev/olpc/spiflash
by repository service 31 Jan '11

31 Jan '11

Author: quozl Date: Mon Jan 31 01:36:17 2011 New Revision: 2159 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2159 Log: Change machine signature check to use a value stored in dictionary instead of SPI FLASH. #10616. Not tested on XO-1.75 A2. Tested on XO-1.5. (Build broken on XO-1 as of 2152, reset-port undefined). Modified: cpu/arm/olpc/1.75/config.fth cpu/arm/olpc/1.75/olpc.bth cpu/x86/pc/biosload/config-olpc.fth cpu/x86/pc/olpc/config.fth cpu/x86/pc/olpc/olpc.bth cpu/x86/pc/olpc/via/config.fth cpu/x86/pc/olpc/via/olpc.bth dev/olpc/spiflash/spiui.fth Modified: cpu/arm/olpc/1.75/config.fth ============================================================================== --- cpu/arm/olpc/1.75/config.fth Fri Jan 28 04:00:03 2011 (r2158) +++ cpu/arm/olpc/1.75/config.fth Mon Jan 31 01:36:17 2011 (r2159) @@ -6,3 +6,5 @@ fload ${BP}/cpu/arm/olpc/1.75/addrs.fth fload ${BP}/cpu/arm/mmp2/hwaddrs.fth + +create machine-signature ," CL2" Modified: cpu/arm/olpc/1.75/olpc.bth ============================================================================== --- cpu/arm/olpc/1.75/olpc.bth Fri Jan 28 04:00:03 2011 (r2158) +++ cpu/arm/olpc/1.75/olpc.bth Mon Jan 31 01:36:17 2011 (r2159) @@ -182,7 +182,7 @@ /rom h# 40 - ofd @ fseek h# 10 buffer: signature signature h# 10 blank -" CL2" signature swap move +machine-signature count signature swap move " ${FW_VERSION}" expand$ signature 6 + swap move " Q4${FW_MAJOR}" expand$ signature d# 13 + swap move signature h# 10 ofd @ fputs Modified: cpu/x86/pc/biosload/config-olpc.fth ============================================================================== --- cpu/x86/pc/biosload/config-olpc.fth Fri Jan 28 04:00:03 2011 (r2158) +++ cpu/x86/pc/biosload/config-olpc.fth Mon Jan 31 01:36:17 2011 (r2159) @@ -28,6 +28,8 @@ create use-null-nvram create no-floppy-node +create machine-signature ," CL1" + fload ${BP}/cpu/x86/pc/biosload/addrs.fth \ LICENSE_BEGIN Modified: cpu/x86/pc/olpc/config.fth ============================================================================== --- cpu/x86/pc/olpc/config.fth Fri Jan 28 04:00:03 2011 (r2158) +++ cpu/x86/pc/olpc/config.fth Mon Jan 31 01:36:17 2011 (r2159) @@ -37,6 +37,8 @@ create use-null-nvram \ Don't store configuration variables \ create use-flash-nvram \ Store configuration variables in firmware FLASH +create machine-signature ," CL1" + fload ${BP}/cpu/x86/pc/olpc/addrs.fth \ LICENSE_BEGIN Modified: cpu/x86/pc/olpc/olpc.bth ============================================================================== --- cpu/x86/pc/olpc/olpc.bth Fri Jan 28 04:00:03 2011 (r2158) +++ cpu/x86/pc/olpc/olpc.bth Mon Jan 31 01:36:17 2011 (r2159) @@ -88,7 +88,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/config.fth ============================================================================== --- cpu/x86/pc/olpc/via/config.fth Fri Jan 28 04:00:03 2011 (r2158) +++ cpu/x86/pc/olpc/via/config.fth Mon Jan 31 01:36:17 2011 (r2159) @@ -49,6 +49,8 @@ create use-null-nvram \ Don't store configuration variables \ create use-flash-nvram \ Store configuration variables in firmware FLASH +create machine-signature ," CL1" + fload ${BP}/cpu/x86/pc/olpc/via/addrs.fth \ LICENSE_BEGIN Modified: cpu/x86/pc/olpc/via/olpc.bth ============================================================================== --- cpu/x86/pc/olpc/via/olpc.bth Fri Jan 28 04:00:03 2011 (r2158) +++ cpu/x86/pc/olpc/via/olpc.bth Mon Jan 31 01:36:17 2011 (r2159) @@ -204,7 +204,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 Modified: dev/olpc/spiflash/spiui.fth ============================================================================== --- dev/olpc/spiflash/spiui.fth Fri Jan 28 04:00:03 2011 (r2158) +++ dev/olpc/spiflash/spiui.fth Mon Jan 31 01:36:17 2011 (r2159) @@ -69,7 +69,7 @@ ." Got firmware version: " flash-buf h# f.ffc0 + dup h# 10 type cr ( adr ) - h# ffff.ffc0 3 comp abort" Wrong machine signature" + machine-signature count comp abort" Wrong machine signature" ?crc @@ -277,7 +277,7 @@ : check-firmware-image ( adr len -- adr len ) dup /flash <> abort" Wrong image length" ( adr len ) 2dup + h# 40 - ( adr len signature-adr ) - h# ffff.ffc0 3 comp abort" Wrong machine signature" + machine-signature count comp abort" Wrong machine signature" ( adr len signature-adr ) ." Firmware: " h# 10 type ( adr len ) \ XXX add some more sanity checks

1 0

[commit] r2158 - dev/olpc/spiflash
by repository service 28 Jan '11

28 Jan '11

Author: quozl Date: Fri Jan 28 04:00:03 2011 New Revision: 2158 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2158 Log: Reinstate machine signature check using prefix of model property as used by the device tree. Tested by attempting to flash Q4A12 on XO-1.5. #10616. Modified: dev/olpc/spiflash/spiui.fth Modified: dev/olpc/spiflash/spiui.fth ============================================================================== --- dev/olpc/spiflash/spiui.fth Thu Jan 27 20:05:17 2011 (r2157) +++ dev/olpc/spiflash/spiui.fth Fri Jan 28 04:00:03 2011 (r2158) @@ -68,7 +68,8 @@ /flash <> abort" Image file is the wrong length" ." Got firmware version: " - flash-buf h# f.ffc0 + h# 10 type cr + flash-buf h# f.ffc0 + dup h# 10 type cr ( adr ) + h# ffff.ffc0 3 comp abort" Wrong machine signature" ?crc @@ -276,7 +277,8 @@ : check-firmware-image ( adr len -- adr len ) dup /flash <> abort" Wrong image length" ( adr len ) 2dup + h# 40 - ( adr len signature-adr ) - dup " CL1" comp abort" No firmware signature" ( adr len signature-adr ) + h# ffff.ffc0 3 comp abort" Wrong machine signature" + ( adr len signature-adr ) ." Firmware: " h# 10 type ( adr len ) \ XXX add some more sanity checks ;

1 0

[commit] r2157 - in cpu/arm: . build
by repository service 27 Jan '11

27 Jan '11

Author: tooch Date: Thu Jan 27 20:05:17 2011 New Revision: 2157 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2157 Log: Add pld{w} to ARM assembler. One more arm/build/Makefile tweak. Modified: cpu/arm/assem.fth cpu/arm/build/Makefile cpu/arm/disassem.fth Modified: cpu/arm/assem.fth ============================================================================== --- cpu/arm/assem.fth Thu Jan 27 02:22:27 2011 (r2156) +++ cpu/arm/assem.fth Thu Jan 27 20:05:17 2011 (r2157) @@ -681,6 +681,12 @@ : amode-lsr ( -- ) init-operands (amode-ls) {!} !op ; +: amode-pld ( -- ) + \ Like amode-ls and friends except r16 vice r12. + 0080.0000 iop + ['] get-off12 get-ea !op +; + : get-off8 ( -- ) \ Get the offset for [ldr|str][h\sh\sb] instructions. get-whatever case @@ -835,6 +841,7 @@ d# 28 set-field \ put the condition code in. ; : {cond/s} ( opcode -- ) {cond} {s} ; +: {uncond} ( opcode -- ) is newword ; : parse-inc ( l-flag -- ) \ Parse the increment tag for ldm and stm. There MUST be a two letter @@ -864,11 +871,14 @@ set-parse rem$ lower ( ) 5 ?match if execute exit then + 4 ?match if execute exit then 3 ?match if execute exit then \ Don't try a 2-character match if the string length is 3, because, \ for example, "blt" (i.e. b{lt}) would then match "bl" instead of "b". - rem-len 3 <> if 2 ?match if execute then then + rem-len 3 <> if + 2 ?match if execute exit then + then 1 ?match if execute exit then @@ -1043,6 +1053,9 @@ : dmb ( -- ) h# f57ff050 asm, ; : isb ( -- ) h# f57ff060 asm, ; +: pld ( -- ) h# f550.f000 {uncond} amode-pld ; +: pldw ( -- ) h# f510.f000 {uncond} amode-pld ; + : # ( -- adt-immed ) adt-immed ; : reg ( -- adt-reg ) adt-reg ; Modified: cpu/arm/build/Makefile ============================================================================== --- cpu/arm/build/Makefile Thu Jan 27 02:22:27 2011 (r2156) +++ cpu/arm/build/Makefile Thu Jan 27 20:05:17 2011 (r2157) @@ -1,8 +1,8 @@ -BASEDIR= `(cd ../../../; pwd;)` +BASEDIR= $(shell cd ../../../; pwd) OS := $(shell uname) HOSTCPU= $(shell ${BASEDIR}/forth/lib/hostcpu.sh) -HOSTDIR= ../../${HOSTCPU}/${OS} +HOSTDIR= ${BASEDIR}/cpu/${HOSTCPU}/${OS} BUILDSH= ${BASEDIR}/forth/lib/build.sh all: basefw.dic @@ -20,9 +20,6 @@ build: ${HOSTDIR}/forth ${HOSTDIR}/armforth @ln -sf ${BUILDSH} build -# build: ../${OS}/forth -# @ln -sf ../${OS}/forth $@ - %.dic: FORCE build ./build $@ @@ -35,4 +32,5 @@ # Don't use *.dic so as not to remove builder.dic clean: - rm -f tools.dic kernel.dic basefw.dic *.log headers *~ inflate.bin build + rm -f tools.dic kernel.dic basefw.dic *.log headers *~ inflate.bin build *.tag + Modified: cpu/arm/disassem.fth ============================================================================== --- cpu/arm/disassem.fth Thu Jan 27 02:22:27 2011 (r2156) +++ cpu/arm/disassem.fth Thu Jan 27 20:05:17 2011 (r2157) @@ -441,6 +441,11 @@ ['] .ldc/stc compile, \ 6 ['] .coproc compile, \ 7 +: .pld ( -- ) + d#22 bit? if ." pld" else ." pldw" then + op-col .[ .rn ,.addr-mode .] +; + : uncond-op ( -- op ) d# 4 bit? ; : uncond-op1 ( -- op1 ) d# 20 8bits ; : uncond-op2 ( -- op2 ) d# 4 4bits ; @@ -452,6 +457,10 @@ 5 of ." dmb" endof 6 of ." isb" endof endcase endof + h# 51 of .pld endof + h# 55 of .pld endof + h# 59 of .pld endof + h# 5d of .pld endof ." ?" endcase ;

1 0

[commit] r2156 - cpu/arm/olpc/1.75
by repository service 27 Jan '11

27 Jan '11

Author: wmb Date: Thu Jan 27 02:22:27 2011 New Revision: 2156 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2156 Log: Q4A13 Modified: cpu/arm/olpc/1.75/fw-version.fth Modified: cpu/arm/olpc/1.75/fw-version.fth ============================================================================== --- cpu/arm/olpc/1.75/fw-version.fth Thu Jan 27 02:16:42 2011 (r2155) +++ cpu/arm/olpc/1.75/fw-version.fth Thu Jan 27 02:22:27 2011 (r2156) @@ -1,3 +1,4 @@ \ The overall firmware revision macro: FW_MAJOR A -macro: FW_MINOR 12 +macro: FW_MINOR 13 +

1 0

[commit] r2155 - dev/usb2/hcd
by repository service 27 Jan '11

27 Jan '11

Author: wmb Date: Thu Jan 27 02:16:42 2011 New Revision: 2155 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2155 Log: USB - handle overcurrent conditions more gracefully. Modified: dev/usb2/hcd/probehub.fth Modified: dev/usb2/hcd/probehub.fth ============================================================================== --- dev/usb2/hcd/probehub.fth Thu Jan 27 02:15:15 2011 (r2154) +++ dev/usb2/hcd/probehub.fth Thu Jan 27 02:16:42 2011 (r2155) @@ -13,6 +13,21 @@ : reset-hub-port ( port -- ) PORT_RESET DR_PORT " set-feature" $call-parent drop d# 20 ms ; : clear-status-change ( port -- ) C_PORT_CONNECTION DR_PORT " clear-feature" $call-parent drop ; : parent-set-target ( dev -- ) " set-target" $call-parent ; +: hub-error? ( -- error? ) + hub-buf 4 0 DR_HUB " get-status" $call-parent ( actual usberror ) + nip if ( ) + ." Failed to get hub status" cr + true ( true ) + else ( ) + hub-buf 2+ c@ 2 and if ( ) + ." USB Hub shut down due to over-current" cr ( ) + true ( true ) + else ( ) + false ( false ) + then ( error? ) + then ( error? ) +; + : get-port-status ( port -- error? ) hub-buf 4 2 pick DR_PORT " get-status" $call-parent ( port actual usberror ) nip if ( port ) @@ -28,6 +43,11 @@ drop false exit ( -- false ) then ( port ) + hub-buf c@ 8 and if ( port ) + ." Hub port " . ." is over current" cr + false exit ( -- false ) + then + hub-buf 2+ c@ 1 and if ( port ) \ Status changed clear-status-change ( ) @@ -58,17 +78,17 @@ " setup-new-node" $call-parent if execute then ( ) ; -: hub-#ports ( -- n ) +: hub-#ports ( -- #ports ) hub-buf 8 0 0 HUB DR_HUB " get-desc" $call-parent nip if ." Failed to get hub descriptor" cr 0 exit then - hub-buf 2 + c@ 1+ ( #ports ) + hub-buf 2 + c@ ( #ports ) ; : hub-delay ( -- #2ms ) hub-buf 5 + c@ ; : power-hub-ports ( #ports -- ) - 1 ?do i power-hub-port loop ( ) + 1+ 1 ?do i power-hub-port loop ( ) hub-delay 2* ms ( ) @@ -88,25 +108,36 @@ external : probe-hub ( dev -- ) dup parent-set-target ( hub-dev ) - hub-#ports ( hub-dev #ports ) + hub-#ports dup 0= if ( hub-dev #ports ) + 2drop exit ( -- ) + then ( hub-dev #ports ) - " configuration#" get-int-property + " configuration#" get-int-property ( hub-dev #ports config# ) " set-config" $call-parent ( hub-dev #ports usberr ) if drop ." Failed to set config for hub at " u. cr exit then ( hub-dev #ports ) - dup power-hub-ports ( hub-dev #ports ) + dup power-hub-ports ( hub-dev #ports ) - 1 ?do ( hub-dev ) - dup i safe-probe-hub-port ( hub-dev ) - loop ( hub-dev ) - drop ( ) + hub-error? if 2drop exit then ( hub-dev #ports ) + + 1+ 1 ?do ( hub-dev ) + dup i safe-probe-hub-port ( hub-dev ) + loop ( hub-dev ) + drop ( ) ; : probe-hub-xt ( -- adr ) ['] probe-hub ; : do-reprobe-hub ( dev -- ) dup parent-set-target ( hub-dev ) - hub-#ports 1 ?do ( hub-dev ) + + hub-#ports dup 0= if ( hub-dev #ports ) + 2drop exit ( -- ) + then ( hub-dev #ports ) + + hub-error? if 2drop exit then ( hub-dev #ports ) + + 1+ 1 ?do ( hub-dev ) dup i port-status-changed? if ( hub-dev connected? ) if ( hub-dev ) dup i safe-probe-hub-port ( hub-dev )

1 0

[commit] r2154 - in dev/usb2/hcd: ehci ohci uhci
by repository service 27 Jan '11

27 Jan '11

Author: wmb Date: Thu Jan 27 02:15:15 2011 New Revision: 2154 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2154 Log: USB - reprobe on open even if the stack is already open. This makes probing work when a USB keyboard is attached and in use, thus keeping the stack open. Modified: dev/usb2/hcd/ehci/probe.fth dev/usb2/hcd/ohci/probe.fth dev/usb2/hcd/uhci/probe.fth Modified: dev/usb2/hcd/ehci/probe.fth ============================================================================== --- dev/usb2/hcd/ehci/probe.fth Thu Jan 27 01:13:35 2011 (r2153) +++ dev/usb2/hcd/ehci/probe.fth Thu Jan 27 02:15:15 2011 (r2154) @@ -138,8 +138,8 @@ do-resume then suspended? if do-resume then - probe-root-hub then + probe-root-hub open-count 1+ to open-count true ; Modified: dev/usb2/hcd/ohci/probe.fth ============================================================================== --- dev/usb2/hcd/ohci/probe.fth Thu Jan 27 01:13:35 2011 (r2153) +++ dev/usb2/hcd/ohci/probe.fth Thu Jan 27 02:15:15 2011 (r2154) @@ -121,9 +121,8 @@ init-ohci-regs then alloc-dma-buf - - probe-root-hub then + probe-root-hub open-count 1+ to open-count true ; Modified: dev/usb2/hcd/uhci/probe.fth ============================================================================== --- dev/usb2/hcd/uhci/probe.fth Thu Jan 27 01:13:35 2011 (r2153) +++ dev/usb2/hcd/uhci/probe.fth Thu Jan 27 02:15:15 2011 (r2154) @@ -67,9 +67,8 @@ suspended? if do-resume then alloc-dma-buf - - probe-root-hub then + probe-root-hub open-count 1+ to open-count true ;

1 0

[commit] r2153 - dev/olpc/spiflash
by repository service 27 Jan '11

27 Jan '11

Author: quozl Date: Thu Jan 27 01:13:35 2011 New Revision: 2153 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2153 Log: Remove machine signature check as it serves no purpose ... flashing wrong file is prevented by the changed crc-offset in addrs.fth. Move unused check-firmware-image into [if]. Modified: dev/olpc/spiflash/spiui.fth Modified: dev/olpc/spiflash/spiui.fth ============================================================================== --- dev/olpc/spiflash/spiui.fth Thu Jan 27 00:40:25 2011 (r2152) +++ dev/olpc/spiflash/spiui.fth Thu Jan 27 01:13:35 2011 (r2153) @@ -42,14 +42,6 @@ \ Perform a series of sanity checks on the new firmware image. -: check-firmware-image ( adr len -- adr len ) - dup /flash <> abort" Wrong image length" ( adr len ) - 2dup + h# 40 - ( adr len signature-adr ) - dup " CL1" comp abort" No firmware signature" ( adr len signature-adr ) - ." Firmware: " h# 10 type ( adr len ) - \ XXX add some more sanity checks -; - [ifdef] load-base : flash-buf load-base ; [else] @@ -76,8 +68,7 @@ /flash <> abort" Image file is the wrong length" ." Got firmware version: " - flash-buf h# f.ffc0 + dup h# 10 type cr ( adr ) - " CL1" comp abort" Wrong machine type" + flash-buf h# f.ffc0 + h# 10 type cr ?crc @@ -282,6 +273,14 @@ h# 100000 /flash-block do (cr i .x i flash-erase-block /flash-block +loop cr ; +: check-firmware-image ( adr len -- adr len ) + dup /flash <> abort" Wrong image length" ( adr len ) + 2dup + h# 40 - ( adr len signature-adr ) + dup " CL1" comp abort" No firmware signature" ( adr len signature-adr ) + ." Firmware: " h# 10 type ( adr len ) + \ XXX add some more sanity checks +; + : reprogram-firmware ( adr len -- ) check-firmware-image ( adr len ) /flash-block /string ( adr+ len- ) \ Remove EC ucode from the beginning

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

openfirmware