openfirmware

openfirmware@openfirmware.info

3007 discussions

[commit] r2743 - cpu/arm/olpc/3.0
by repository service 06 Dec '11

06 Dec '11

Author: wmb Date: Tue Dec 6 13:57:38 2011 New Revision: 2743 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2743 Log: Q5A01 Modified: cpu/arm/olpc/3.0/ec-version.fth cpu/arm/olpc/3.0/fw-version.fth Modified: cpu/arm/olpc/3.0/ec-version.fth ============================================================================== --- cpu/arm/olpc/3.0/ec-version.fth Tue Dec 6 13:57:33 2011 (r2742) +++ cpu/arm/olpc/3.0/ec-version.fth Tue Dec 6 13:57:38 2011 (r2743) @@ -7,4 +7,4 @@ \ Temporarily uncomment the line and modify the path as necessary \ macro: GET_EC cp ~rsmith/olpc/ec/ec-code15/image/ecimage.bin ec.img \ macro: GET_EC wget -q http://dev.laptop.org/pub/ec/ec_test.img -O ec.img -\ macro: GET_EC cp no_event.bin ec.img +macro: GET_EC cp /wmb/Documents/OLPC/3.0/ecimage.bin ec.img Modified: cpu/arm/olpc/3.0/fw-version.fth ============================================================================== --- cpu/arm/olpc/3.0/fw-version.fth Tue Dec 6 13:57:33 2011 (r2742) +++ cpu/arm/olpc/3.0/fw-version.fth Tue Dec 6 13:57:38 2011 (r2743) @@ -1,4 +1,4 @@ \ The overall firmware revision macro: FW_PREFIX Q5 macro: FW_MAJOR A -macro: FW_MINOR 00 +macro: FW_MINOR 01

1 0

[commit] r2742 - cpu/arm/olpc
by repository service 06 Dec '11

06 Dec '11

Author: wmb Date: Tue Dec 6 13:57:33 2011 New Revision: 2742 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2742 Log: OLPC XO-3 - Platform ID -> 10000, fixed touchscreen driver. Modified: cpu/arm/olpc/build-fw.fth cpu/arm/olpc/exc7200-touchscreen.fth Modified: cpu/arm/olpc/build-fw.fth ============================================================================== --- cpu/arm/olpc/build-fw.fth Tue Dec 6 13:57:29 2011 (r2741) +++ cpu/arm/olpc/build-fw.fth Tue Dec 6 13:57:33 2011 (r2742) @@ -438,7 +438,8 @@ " /usb" " reset-usb" execute-device-method drop ; -d# 9999 to arm-linux-machine-type \ Marvell Jasper +\+ olpc-cl2 d# 9999 to arm-linux-machine-type \ XO-1.75 +\+ olpc-cl3 d# 10000 to arm-linux-machine-type \ XO-3 \ Add a tag describing the linear frame buffer : mmp-fb-tag, ( -- ) @@ -740,8 +741,8 @@ device-end fload ${BP}/cpu/x86/pc/olpc/gridmap.fth \ Gridded display tools fload ${BP}/cpu/x86/pc/olpc/via/copynand.fth -\ fload ${BP}/cpu/arm/olpc/exc7200-touchscreen.fth \ Touchscreen driver and diagnostic -fload ${BP}/cpu/arm/olpc/rm3150-touchscreen.fth \ Touchscreen driver and diagnostic +\+ olpc-cl3 fload ${BP}/cpu/arm/olpc/exc7200-touchscreen.fth \ Touchscreen driver and diagnostic +\+ olpc-cl2 fload ${BP}/cpu/arm/olpc/rm3150-touchscreen.fth \ Touchscreen driver and diagnostic fload ${BP}/cpu/arm/olpc/roller.fth \ Accelerometer test \ fload ${BP}/cpu/arm/olpc/pinch.fth \ Touchscreen gestures Modified: cpu/arm/olpc/exc7200-touchscreen.fth ============================================================================== --- cpu/arm/olpc/exc7200-touchscreen.fth Tue Dec 6 13:57:29 2011 (r2741) +++ cpu/arm/olpc/exc7200-touchscreen.fth Tue Dec 6 13:57:33 2011 (r2742) @@ -69,7 +69,11 @@ h# 7fff constant touchscreen-max-x h# 7fff constant touchscreen-max-y +: invert-x ( x y -- x' y ) touchscreen-max-x rot - swap ; +: invert-y ( x y -- x y' ) touchscreen-max-y swap - ; + : scale-xy ( x y -- x' y' ) + invert-x invert-y swap screen-w touchscreen-max-x */ swap screen-h touchscreen-max-y */ ;

1 0

[commit] r2741 - dev/olpc/mmp2camera
by repository service 06 Dec '11

06 Dec '11

Author: wmb Date: Tue Dec 6 13:57:29 2011 New Revision: 2741 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2741 Log: OLPC XO-3 - Camera GPIO numbers. Modified: dev/olpc/mmp2camera/platform.fth Modified: dev/olpc/mmp2camera/platform.fth ============================================================================== --- dev/olpc/mmp2camera/platform.fth Tue Dec 6 08:11:23 2011 (r2740) +++ dev/olpc/mmp2camera/platform.fth Tue Dec 6 13:57:29 2011 (r2741) @@ -6,20 +6,29 @@ : camera-smb-setup ( -- ) 1 to smb-dly-us - d# 108 to smb-clock-gpio# - d# 109 to smb-data-gpio# +\+ olpc-cl2 d# 108 to smb-clock-gpio# +\+ olpc-cl2 d# 109 to smb-data-gpio# +\+ olpc-cl3 d# 4 to smb-clock-gpio# +\+ olpc-cl3 d# 5 to smb-data-gpio# h# 42 to smb-slave ; : ov@ ( reg -- data ) camera-smb-setup smb-byte@ ; : ov! ( data reg -- ) camera-smb-setup smb-byte! ; -: reset-sensor ( -- ) d# 102 gpio-clr 1 ms d# 102 gpio-set ; +: reset-sensor ( -- ) +\+ olpc-cl3 d# 10 gpio-clr 1 ms d# 10 gpio-set +\+ olpc-cl2 d# 102 gpio-clr 1 ms d# 102 gpio-set +; [ifdef] cl2-a1 : sensor-power-on ( -- ) d# 145 gpio-set ; : sensor-power-off ( -- ) d# 145 gpio-clr ; [else] -: sensor-power-on ( -- ) d# 150 gpio-set d# 144 gpio-clr ; +: sensor-power-on ( -- ) + d# 150 gpio-set +\+ olpc-cl2 d# 144 gpio-clr +\+ olpc-cl3 d# 9 gpio-clr +; : sensor-power-off ( -- ) ( d# 144 gpio-set ) d# 150 gpio-clr ; \ Leave low for Linux [then]

1 0

[commit] r2740 - cpu/arm/olpc cpu/arm/olpc/3.0 cpu/x86/pc/olpc cpu/x86/pc/olpc/via dev/hdaudio dev/olpc/touchpad ofw/gui
by repository service 06 Dec '11

06 Dec '11

Author: wmb Date: Tue Dec 6 08:11:23 2011 New Revision: 2740 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2740 Log: OLPC - fixed hardcoded display resolution in various graphics packages. Modified: cpu/arm/olpc/3.0/lcdcfg.fth cpu/arm/olpc/3.0/usb.fth cpu/arm/olpc/build-fw.fth cpu/arm/olpc/roller.fth cpu/arm/olpc/testitems.fth cpu/x86/pc/olpc/gridmap.fth cpu/x86/pc/olpc/gui.fth cpu/x86/pc/olpc/plot.fth cpu/x86/pc/olpc/via/copynand.fth dev/hdaudio/noiseburst.fth dev/olpc/touchpad/touchpad.fth ofw/gui/graphics.fth ofw/gui/iconmenu.fth ofw/gui/rgb565bmp24.fth Modified: cpu/arm/olpc/3.0/lcdcfg.fth ============================================================================== --- cpu/arm/olpc/3.0/lcdcfg.fth Tue Dec 6 08:11:13 2011 (r2739) +++ cpu/arm/olpc/3.0/lcdcfg.fth Tue Dec 6 08:11:23 2011 (r2740) @@ -4,8 +4,6 @@ d# 8 value hsync \ Sync width d# 1024 value hdisp \ Display width d# 1344 value htotal \ Display + FP + Sync + BP -\ d# 1200 value hdisp \ Display width -\ d# 1256 value htotal \ Display + FP + Sync + BP d# 24 value hbp \ Back porch d# 3 value vsync \ Sync width Modified: cpu/arm/olpc/3.0/usb.fth ============================================================================== --- cpu/arm/olpc/3.0/usb.fth Tue Dec 6 08:11:13 2011 (r2739) +++ cpu/arm/olpc/3.0/usb.fth Tue Dec 6 08:11:23 2011 (r2740) @@ -62,7 +62,10 @@ d# 350 config-int usb-delay \ Milliseconds to wait before probing hub ports -devalias u /usb/disk +devalias otg /usb@d4208000 \ USB OTG (micro) connector +devalias usba /usb@f0003000 \ USB-A connector +devalias o /usb@d4208000/disk \ Disk on USB OTG (micro) connector +devalias u /usb@f0003000/disk \ Disk on USB-A connector \ Like $show-devs, but ignores pagination keystrokes : $nopage-show-devs ( nodename$ -- ) Modified: cpu/arm/olpc/build-fw.fth ============================================================================== --- cpu/arm/olpc/build-fw.fth Tue Dec 6 08:11:13 2011 (r2739) +++ cpu/arm/olpc/build-fw.fth Tue Dec 6 08:11:23 2011 (r2740) @@ -300,8 +300,10 @@ devalias keyboard /keyboard -create 15x30pc " ${BP}/ofw/termemu/15x30pc.psf" $file, -' 15x30pc to romfont +\+ olpc-cl2 create 15x30pc " ${BP}/ofw/termemu/15x30pc.psf" $file, +\+ olpc-cl2 ' 15x30pc to romfont +\+ olpc-cl3 create cp881-16 " ${BP}/ofw/termemu/cp881-16.obf" $file, +\+ olpc-cl3 ' cp881-16 to romfont fload ${BP}/cpu/arm/olpc/sdhci.fth \- cl2-a1 fload ${BP}/cpu/arm/olpc/emmc.fth @@ -442,12 +444,13 @@ : mmp-fb-tag, ( -- ) 8 tag-l, h# 54410008 tag-l, \ ATAG_VIDEOLFB - d# 1200 tag-w, \ Width - d# 900 tag-w, \ Height - d# 24 tag-w, \ Depth - d# 1200 3 * tag-w, \ Pitch - fb-mem-va tag-l, \ Base address - d# 1200 3 * d# 900 * tag-l, \ Total size - perhaps could be larger + screen-wh over tag-w, \ Width ( width height ) + dup tag-w, \ Height ( width height ) + " depth" $call-screen dup tag-w, \ Depth ( width height depth ) + rot * 8 / dup tag-w, \ Pitch ( height pitch ) + fb-mem-va tag-l, \ Base address ( height pitch ) + * tag-l, \ Total size - perhaps could be larger + \ The following assumes depth is 16 bpp 5 tag-b, \ Red size d# 11 tag-b, \ Red position 6 tag-b, \ Green size @@ -694,7 +697,8 @@ d# 18 gpio-pin@ 0= if h# 100 or then \ X d# 19 gpio-pin@ 0= if h# 01 or then \ Square d# 20 gpio-pin@ 0= if h# 40 or then \ Rotate -[else] +[then] +[ifdef] olpc-cl2 [ifdef] use_mmp2_keypad_control d# 15 gpio-pin@ 0= if button-rotate or then ( n ) scan-keypad ( n keypad ) @@ -908,7 +912,7 @@ disable-user-aborts console-start -\- olpc-cl3 read-game-keys + read-game-keys factory-test? 0= if text-off then Modified: cpu/arm/olpc/roller.fth ============================================================================== --- cpu/arm/olpc/roller.fth Tue Dec 6 08:11:13 2011 (r2739) +++ cpu/arm/olpc/roller.fth Tue Dec 6 08:11:23 2011 (r2740) @@ -80,8 +80,8 @@ d# 20 constant ball-radius d# 40 constant ball-diameter -d# 1200 ball-diameter - >fraction constant maxx -d# 900 ball-diameter - >fraction constant maxy +: maxx ( -- n ) screen-wh drop ball-diameter - >fraction ; +: maxy ( -- n ) screen-wh nip ball-diameter - >fraction ; d# 400 >fraction constant maxz : 3swap ( x1 y1 z1 x2 y2 z2 -- x2 y2 z2 x1 y1 z1 ) 5 roll 5 roll 5 roll ; Modified: cpu/arm/olpc/testitems.fth ============================================================================== --- cpu/arm/olpc/testitems.fth Tue Dec 6 08:11:13 2011 (r2739) +++ cpu/arm/olpc/testitems.fth Tue Dec 6 08:11:23 2011 (r2740) @@ -23,7 +23,9 @@ : battery-item ( -- ) " /battery" mfg-test-dev ; : spiflash-item ( -- ) " /flash" mfg-test-dev ; : memory-item ( -- ) " /memory" mfg-test-dev ; -: usb-item ( -- ) " /usb/hub" mfg-test-dev ; +\+ olpc-cl2 : usb-item ( -- ) " /usb/hub" mfg-test-dev ; +\+ olpc-cl3 : otg-item ( -- ) " otg" mfg-test-dev ; +\+ olpc-cl3 : usb-item ( -- ) " usba" mfg-test-dev ; : int-sd-item ( -- ) " int:0" mfg-test-dev ; \- olpc-cl3 : ext-sd-item ( -- ) " ext:0" mfg-test-dev ; : rtc-item ( -- ) " /rtc" mfg-test-dev ; @@ -73,9 +75,13 @@ " RTC (Real-Time Clock)" ['] rtc-item clock.icon 2 4 install-icon - " USB ports" +\+ olpc-cl2 " USB ports" +\+ olpc-cl3 " USB-A port" ['] usb-item usb.icon 3 0 install-icon +\+ olpc-cl3 " USB OTG port" +\+ olpc-cl3 ['] otg-item usb.icon 3 1 install-icon + \ These are last because they require user participation. \ The earlier tests are all included in automatic batch-mode. Modified: cpu/x86/pc/olpc/gridmap.fth ============================================================================== --- cpu/x86/pc/olpc/gridmap.fth Tue Dec 6 08:11:13 2011 (r2739) +++ cpu/x86/pc/olpc/gridmap.fth Tue Dec 6 08:11:23 2011 (r2740) @@ -7,9 +7,19 @@ 9 constant grid-w 9 constant grid-h -d# 128 value #cols +d# 128 value #cols \ Good for 1200x900, may be changed d# 90 value #rows +d# 26 constant status-line + : max-grid ( -- n ) #rows #cols * ; +: set-array-size ( -- ) + screen-wh char-wh nip 2* - grid-h - ( width height ) + grid-h / to #rows ( width ) + dup grid-w / to #cols ( width ) + grid-w #cols * - 2/ ( x-offset ) + grid-h to ulhc ( ) + #rows 1+ grid-h * char-wh nip / 1+ to status-line +; \needs xy+ : xy+ ( x1 y1 x2 y2 -- x3 y3 ) rot + -rot + swap ; \needs xy* : xy* ( x y w h -- x*w y*h ) rot * >r * r> ; @@ -19,6 +29,7 @@ 1 value scale-factor : scale-block# ( eblock# -- ) scale-factor / ; : set-grid-scale ( #eblocks -- ) + set-array-size d# 1000 1 do ( #eblocks ) dup i / max-grid <= if ( #eblocks ) drop ( ) Modified: cpu/x86/pc/olpc/gui.fth ============================================================================== --- cpu/x86/pc/olpc/gui.fth Tue Dec 6 08:11:13 2011 (r2739) +++ cpu/x86/pc/olpc/gui.fth Tue Dec 6 08:11:23 2011 (r2740) @@ -368,16 +368,21 @@ 0 0 2value next-dot-xy d# 463 d# 540 2constant progress-xy +: ?adjust ( x y -- x' y' ) +\ 88 is 1200 1024 - 2/ , 66 is 900 768 - 2/ +\+ olpc-cl3 swap d# 88 - swap d# 66 - ( x' y' ) \ Recenter for XO-3 +; +: set-icon-xy ( x y -- ) ?adjust to icon-xy ; : show-going ( -- ) - background-rgb rgb>565 progress-xy d# 500 d# 100 " fill-rectangle" $call-screen - d# 588 d# 638 to icon-xy " bigdot" show-icon + background-rgb rgb>565 progress-xy ?adjust d# 500 d# 100 " fill-rectangle" $call-screen + d# 588 d# 638 set-icon-xy " bigdot" show-icon " vga?" $call-screen 0= if dcon-unfreeze dcon-freeze then ; : show-no-power ( -- ) \ chip, battery, overlaid sad face - d# 25 d# 772 to icon-xy " spi" show-icon - d# 175 d# 772 to icon-xy " battery" show-icon - d# 175 d# 790 to icon-xy " sad" show-icon + d# 25 d# 772 set-icon-xy " spi" show-icon + d# 175 d# 772 set-icon-xy " battery" show-icon + d# 175 d# 790 set-icon-xy " sad" show-icon ; d# 834 value bar-y @@ -391,8 +396,8 @@ ; : show-reflash ( -- ) \ bottom left corner, chip and progress dots - d# 25 d# 772 to icon-xy " spi" show-icon - d# 992 bar-x + bar-y to icon-xy " yellowdot" show-icon + d# 25 d# 772 set-icon-xy " spi" show-icon + d# 992 bar-x + bar-y set-icon-xy " yellowdot" show-icon read-dot ; @@ -416,7 +421,7 @@ : show-x ( -- ) " x" show-icon ; : show-sad ( -- ) icon-xy - d# 552 d# 283 to icon-xy " sad" show-icon + d# 552 d# 283 set-icon-xy " sad" show-icon to icon-xy ; : show-lock ( -- ) " lock" show-icon ; @@ -425,8 +430,8 @@ : show-minus ( -- ) " minus" show-icon ; : show-child ( -- ) " erase-screen" $call-screen - d# 552 d# 384 to icon-xy " xogray" $show-opaque - progress-xy to next-icon-xy \ For boot progress reports + d# 552 d# 384 set-icon-xy " xogray" $show-opaque + progress-xy ?adjust to next-icon-xy \ For boot progress reports ; 0 [if] Modified: cpu/x86/pc/olpc/plot.fth ============================================================================== --- cpu/x86/pc/olpc/plot.fth Tue Dec 6 08:11:13 2011 (r2739) +++ cpu/x86/pc/olpc/plot.fth Tue Dec 6 08:11:23 2011 (r2740) @@ -76,7 +76,7 @@ : setup-plot ( -- ) h# ffff set-fg 0 set-bg - d# 1200 d# 900 clear-plot - d# 1200 d# 900 d# 100 hgrid - d# 1200 d# 900 d# 100 vgrid + screen-wh clear-plot + screen-wh d# 100 hgrid + screen-wh d# 100 vgrid ; Modified: cpu/x86/pc/olpc/via/copynand.fth ============================================================================== --- cpu/x86/pc/olpc/via/copynand.fth Tue Dec 6 08:11:13 2011 (r2739) +++ cpu/x86/pc/olpc/via/copynand.fth Tue Dec 6 08:11:23 2011 (r2740) @@ -72,8 +72,6 @@ 0 h# ff h# ff rgb>565 constant strange-color \ cyan h# e8 h# e8 h# e8 rgb>565 constant starting-color \ very light gray -d# 26 constant status-line - : gshow-init ( #eblocks -- ) suspend-logging dup set-grid-scale Modified: dev/hdaudio/noiseburst.fth ============================================================================== --- dev/hdaudio/noiseburst.fth Tue Dec 6 08:11:13 2011 (r2739) +++ dev/hdaudio/noiseburst.fth Tue Dec 6 08:11:23 2011 (r2740) @@ -527,10 +527,16 @@ loopback-threshold < ; -d# 1200 constant #impulse-response -#impulse-response /w* buffer: impulse-response +0 value impulse-response +: #impulse-response ( -- samples ) screen-wh drop ; +: ?alloc-impulse-buf ( -- ) + impulse-response 0= if + #impulse-response /w* alloc-mem to impulse-response + then +; : calc-sm-impulse ( offset -- adr ) \ offset is 0 for left or 2 for right + ?alloc-impulse-buf pb + rb #samples ( adr1 adr2 #samples ) #impulse-response 0 do 3dup swap i wa+ swap stereo-mono-covar ( adr1 adr2 #samples d.covar ) @@ -541,6 +547,7 @@ impulse-response ( adr ) ; : calc-stereo-impulse ( offset -- adr ) \ offset is 0 for left or 2 for right + ?alloc-impulse-buf dup pb + swap rb + #samples ( adr1 adr2 #samples ) #impulse-response 0 do 3dup swap i la+ swap stereo-covar ( adr1 adr2 #samples d.covar ) Modified: dev/olpc/touchpad/touchpad.fth ============================================================================== --- dev/olpc/touchpad/touchpad.fth Tue Dec 6 08:11:13 2011 (r2739) +++ dev/olpc/touchpad/touchpad.fth Tue Dec 6 08:11:23 2011 (r2740) @@ -472,8 +472,8 @@ then ( x y ) \ Expand the PT (0..999) to the screen width (1200) packet-type 2 = if ( x y ) - swap d# 1200 d# 1000 */ - swap d# 1200 d# 1000 */ + swap screen-wh drop d# 1000 */ + swap screen-wh drop d# 1000 */ then ( x y ) then ( x y ) Modified: ofw/gui/graphics.fth ============================================================================== --- ofw/gui/graphics.fth Tue Dec 6 08:11:13 2011 (r2739) +++ ofw/gui/graphics.fth Tue Dec 6 08:11:23 2011 (r2740) @@ -24,7 +24,15 @@ \needs screen-ih 0 value screen-ih 0 value mouse-ih -d# 1200 d# 900 2value max-xy +: $call-screen ( ??? adr len -- ??? ) screen-ih $call-method ; +: screen-execute ( ?? xt -- ?? ) screen-ih package( execute )package ; + +\ : screen-wh ( -- x y ) +\ screen-ih package( screen-width screen-height )package +\ ; +: screen-wh ( -- x y ) " dimensions" $call-screen ; + +defer max-xy ' screen-wh to max-xy : max-x ( -- n ) max-xy drop ; : max-y ( -- n ) max-xy nip ; @@ -39,14 +47,6 @@ >r swap r> - >r - r> ; -: $call-screen ( ??? adr len -- ??? ) screen-ih $call-method ; -: screen-execute ( ?? xt -- ?? ) screen-ih package( execute )package ; - -\ : screen-wh ( -- x y ) -\ screen-ih package( screen-width screen-height )package -\ ; -: screen-wh ( -- x y ) " dimensions" $call-screen ; - : (inset-xy) ( x y -- x' y' ) screen-wh max-xy xy- swap 2/ swap 2/ ; defer inset-xy ' (inset-xy) to inset-xy : inset ( x y w h -- x' y' w h ) 2swap inset-xy xy+ 2swap ; Modified: ofw/gui/iconmenu.fth ============================================================================== --- ofw/gui/iconmenu.fth Tue Dec 6 08:11:13 2011 (r2739) +++ ofw/gui/iconmenu.fth Tue Dec 6 08:11:23 2011 (r2740) @@ -506,7 +506,7 @@ ; : setup-menu ( -- ) setup-graphics - ?open-mouse +\ ?open-mouse cursor-off gui-alerts ; Modified: ofw/gui/rgb565bmp24.fth ============================================================================== --- ofw/gui/rgb565bmp24.fth Tue Dec 6 08:11:13 2011 (r2739) +++ ofw/gui/rgb565bmp24.fth Tue Dec 6 08:11:23 2011 (r2740) @@ -78,15 +78,14 @@ ; : raw565bmp24 ( -- ) reading writing - d# 1200 to image-width - d# 900 to image-height + screen-wh to image-height to image-width 565>rects ifd @ fclose ofd @ fclose ; : xraw565bmp24 ( -- ) reading writing - d# 1200 to image-width + screen-wh drop to image-width d# 256 to image-height 565>rects

1 0

[commit] r2739 - cpu/arm/olpc
by repository service 06 Dec '11

06 Dec '11

Author: wmb Date: Tue Dec 6 08:11:13 2011 New Revision: 2739 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2739 Log: OLPC XO-3 - Tweaks to the shared (between 1.75 and 3.0) build-fw.fth file for XO-3. Modified: cpu/arm/olpc/build-fw.fth Modified: cpu/arm/olpc/build-fw.fth ============================================================================== --- cpu/arm/olpc/build-fw.fth Tue Dec 6 08:11:02 2011 (r2738) +++ cpu/arm/olpc/build-fw.fth Tue Dec 6 08:11:13 2011 (r2739) @@ -361,6 +361,7 @@ fload ${BP}/cpu/arm/marvell/utmiphy.fth \+ olpc-cl2 fload ${BP}/cpu/arm/olpc/1.75/usb.fth +\+ olpc-cl3 fload ${BP}/cpu/arm/mmp2/ulpiphy.fth \+ olpc-cl3 fload ${BP}/cpu/arm/olpc/3.0/usb.fth fload ${BP}/dev/olpc/mmp2camera/loadpkg.fth @@ -505,7 +506,8 @@ false ; -: rotate-button? ( -- flag ) d# 15 gpio-pin@ 0= ; +\+ olpc-cl2 : rotate-button? ( -- flag ) d# 15 gpio-pin@ 0= ; +\+ olpc-cl3 false value rotate-button? warning @ warning off : init \ initial-heap add-memory @@ -807,7 +809,7 @@ fload ${BP}/ofw/gui/ofpong.fth fload ${BP}/cpu/x86/pc/olpc/life.fth -" u:\boot\olpc.fth ext:\boot\olpc.fth int:\boot\olpc.fth ext:\zimage /prober /usb/ethernet /usb/wlan" +" u:\boot\olpc.fth ext:\boot\olpc.fth int:\boot\olpc.fth ext:\zimage /prober /usb/ethernet /wlan" ' boot-device set-config-string-default \needs ramdisk " " d# 128 config-string ramdisk @@ -906,7 +908,7 @@ disable-user-aborts console-start - read-game-keys +\- olpc-cl3 read-game-keys factory-test? 0= if text-off then

1 0

[commit] r2738 - dev/usb2/hcd/ehci
by repository service 06 Dec '11

06 Dec '11

Author: wmb Date: Tue Dec 6 08:11:02 2011 New Revision: 2738 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2738 Log: USB - added some access words - currently unused - for the ULPI viewport register. Added: dev/usb2/hcd/ehci/ulpi.fth Added: dev/usb2/hcd/ehci/ulpi.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ dev/usb2/hcd/ehci/ulpi.fth Tue Dec 6 08:11:02 2011 (r2738) @@ -0,0 +1,75 @@ +\ See license at end of file +purpose: Support for ULPI Viewports + +\ ULPI is a hardware interface between a USB controller and external PHY. +\ The semantics of the interface mimics that of the UTMI+ hardware interface, +\ but the ULPI interface has fewer pins and is thus better-suited for +\ external PHYs. The UTMI+ interface was optimized for controller and PHY +\ on the same chip. +\ UTMI+ has a number of hardware control signals that change infrequently. +\ ULPI implements those almost-static signals with bits in PHY-resident +\ registers. Typically that is transparent to software, as the ULPI side +\ of the hardware interface does the work of translating the UTMI hardware +\ signaling into register accesses across the ULPI interconnect. However, +\ it is possible to read and write those registers explicitly, e.g. for +\ debugging. The "ULPI Viewport" register in the EHCI register block lets +\ you do that + +\ Low-level access to the viewport registers +: view@ ( -- n ) h# 30 op-reg@ ; +: view! ( -- n ) h# 30 op-reg! ; + +\ Wait for the indicated viewport register bit to go to 0. +: ulpi-poll ( bit -- ) + d# 10000 0 do ( bit ) + dup view@ and if ( bit ) + drop unloop exit ( -- ) + then ( bit ) + d# 5 us ( bit ) + loop ( bit ) + drop true abort" ULPI poll timeout" +; +\ Wakeup the ULPI interface if it is not in "synchronized" state +: ?ulpi-wakeup ( -- ) + view@ h# 0800.0000 and 0= if \ SYNC state + h# 8000.0000 view! \ wakeup + h# 8000.0000 ulpi-poll \ wait for wakeup + then +; +\ Read a register in the ULPI PHY +: ulpi@ ( reg -- n ) + ?ulpi-wakeup ( reg ) + d# 16 lshift h# 4000.0000 or view! ( ) \ address and RUN bit + h# 4000.0000 ulpi-poll ( ) + view@ 8 rshift h# ff and ( n ) +; +\ Write a register in the ULPI PHY +: ulpi! ( n reg -- ) + ?ulpi-wakeup ( n reg ) + d# 16 lshift or h# 4000.0000 or view! ( ) \ address and WRITE bit and RUN bit + h# 4000.0000 ulpi-poll ( ) +; + +\ 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] r2737 - cpu/arm/olpc
by repository service 06 Dec '11

06 Dec '11

Author: wmb Date: Tue Dec 6 08:10:57 2011 New Revision: 2737 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2737 Log: OLPC XO-3 - Support for XO-3 EC image. Modified: cpu/arm/olpc/ecflash.fth Modified: cpu/arm/olpc/ecflash.fth ============================================================================== --- cpu/arm/olpc/ecflash.fth Tue Dec 6 08:10:51 2011 (r2736) +++ cpu/arm/olpc/ecflash.fth Tue Dec 6 08:10:57 2011 (r2737) @@ -101,6 +101,8 @@ load-base /ec-flash ofd @ fputs ofd @ fclose ; +\+ olpc-cl2 : ec-platform$ ( -- adr len ) " 4" ; +\+ olpc-cl3 : ec-platform$ ( -- adr len ) " 5" ; : ec-up-to-date? ( img$ -- flag ) \ If the new image has an invalid length, the old one is considered up to date dup /ec-flash <> if @@ -109,10 +111,10 @@ + h# 100 - cscount ( version&date$ ) \ If the new image has an invalid signature, the old one is considered up to date dup d# 25 < if 2drop true exit then ( version&date$ ) - bl left-parse-string " XO-EC" $= 0= if 2drop true exit then ( version&date$ ) - bl left-parse-string " 4" $= 0= if 2drop true exit then ( version&date$ ) - bl left-parse-string 2nip ( version$ ) - ec-name$ $caps-compare 0<= ( flag ) + bl left-parse-string " XO-EC" $= 0= if 2drop true exit then ( version&date$ ) + bl left-parse-string ec-platform$ $= 0= if 2drop true exit then ( version&date$ ) + bl left-parse-string 2nip ( version$ ) + ec-name$ $caps-compare 0<= ( flag ) ; : update-ec-flash ( -- ) @@ -130,8 +132,10 @@ : update-ec-flash? ( -- flag ) " ecimage.bin" find-drop-in if ( adr len ) - 2dup ec-up-to-date? 0= ( adr len flag ) - >r free-mem r> ( flag ) + 2dup ec-up-to-date? 0= ( adr len flag ) + >r free-mem r> ( flag ) + else ( ) + false then ;

1 0

[commit] r2736 - cpu/arm/olpc/3.0
by repository service 06 Dec '11

06 Dec '11

Author: wmb Date: Tue Dec 6 08:10:51 2011 New Revision: 2736 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2736 Log: OLPC XO-3 - Added LCD power-on sequence. Modified: cpu/arm/olpc/3.0/lcdcfg.fth Modified: cpu/arm/olpc/3.0/lcdcfg.fth ============================================================================== --- cpu/arm/olpc/3.0/lcdcfg.fth Tue Dec 6 08:10:40 2011 (r2735) +++ cpu/arm/olpc/3.0/lcdcfg.fth Tue Dec 6 08:10:51 2011 (r2736) @@ -34,7 +34,24 @@ alias depth bpp width >bytes constant /scanline -: init-xo-display ; : bright! ( level -- ) drop ; : backlight-on ( -- ) ; : backlight-off ( -- ) ; +: lcd-power-on ( -- ) + d# 138 gpio-set \ LCDVCC_EN + d# 135 gpio-set \ STBY# + d# 500 us + d# 130 gpio-set \ LCD_RESET# + d# 129 gpio-set \ EN_LCD_PWR + d# 50 ms \ Frame time + d# 130 gpio-clr \ LCD_RESET# (pulse low) + d# 50 us \ Pulse needs to be at least 50 us + d# 130 gpio-set \ LCD_RESET# (end of pulse) + + d# 120 ms + backlight-on +; +: init-xo-display ; \ CForth has already turned it on + +: set-source ( flag -- ) drop ; \ No DCON +true constant vga? \ No DCON, hence never frozen

1 0

[commit] r2735 - cpu/arm/olpc/3.0
by repository service 06 Dec '11

06 Dec '11

Author: wmb Date: Tue Dec 6 08:10:40 2011 New Revision: 2735 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2735 Log: OLPC XO-3 - Included EC image in dropins. Modified: cpu/arm/olpc/3.0/olpc.bth Modified: cpu/arm/olpc/3.0/olpc.bth ============================================================================== --- cpu/arm/olpc/3.0/olpc.bth Tue Dec 6 08:10:34 2011 (r2734) +++ cpu/arm/olpc/3.0/olpc.bth Tue Dec 6 08:10:40 2011 (r2735) @@ -152,7 +152,7 @@ " nandblaster15_rx.bin" " nb15_rx" $add-deflated-dropin " nandblaster_tx.bin" " nb_tx" $add-deflated-dropin -\ " ec.img" " ecimage.bin" $add-deflated-dropin + " ec.img" " ecimage.bin" $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

1 0

[commit] r2734 - in cpu/arm: mmp2 olpc/3.0
by repository service 06 Dec '11

06 Dec '11

Author: wmb Date: Tue Dec 6 08:10:34 2011 New Revision: 2734 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2734 Log: OLPC XO-3 - USB SPH / ULPI PHY now working. Added: cpu/arm/mmp2/ulpiphy.fth Modified: cpu/arm/olpc/3.0/usb.fth Added: cpu/arm/mmp2/ulpiphy.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/mmp2/ulpiphy.fth Tue Dec 6 08:10:34 2011 (r2734) @@ -0,0 +1,38 @@ +\ See license at end of file +purpose: Access to miscellaneous control/enable registers for the ULPI PHY portion of the USB SPH controller + +h# 3800 io2-va + constant usbsph-misc-va +: usbsph-misc@ ( -- n ) usbsph-misc-va 4 + l@ ; +: usbsph-misc! ( n -- ) usbsph-misc-va 4 + l! ; +: usbsph-int@ ( -- n ) usbsph-misc-va h# 28 + l@ ; +: usbsph-int! ( n -- ) usbsph-misc-va h# 28 + l! ; +: usbsph-ctrl@ ( -- n ) usbsph-misc-va h# 30 + l@ ; +: usbsph-ctrl! ( n -- ) usbsph-misc-va h# 30 + l! ; +: ulpi-on ( -- ) h# 0800.0000 usbsph-misc! ; +: ulpi-resume-interrupt-on ( -- ) 2 usbsph-int! ; +: ulpi-clock-on ( -- ) usbsph-ctrl@ 1 or usbsph-ctrl! ; +: ulpi-clock-select ( -- ) usbsph-ctrl@ h# 400 or usbsph-ctrl! ; + +\ 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 Modified: cpu/arm/olpc/3.0/usb.fth ============================================================================== --- cpu/arm/olpc/3.0/usb.fth Tue Dec 6 08:10:23 2011 (r2733) +++ cpu/arm/olpc/3.0/usb.fth Tue Dec 6 08:10:34 2011 (r2734) @@ -20,7 +20,7 @@ : wake ( -- ) ; end-package -0 0 " f0001000" " /" begin-package \ USB Host Controller 1 - ULPI +0 0 " f0003000" " /" begin-package \ USB Host Controller 1 - ULPI h# 200 constant /regs my-address my-space /regs reg : my-map-in ( len -- adr ) @@ -44,6 +44,9 @@ ; : reset-usb-hub ( -- ) d# 146 gpio-clr d# 10 ms d# 146 gpio-set \ Resets ULPI hub + ulpi-clock-on + ulpi-clock-select + ulpi-on ; : init-usb ( -- )

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

openfirmware