May 2012 - openfirmware - mail.coreboot.org

[commit] r2993 - in cpu/arm: mmp2 olpc
by repository service May 31, 2012

May 31, 2012

Author: wmb Date: Thu May 31 22:07:15 2012 New Revision: 2993 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2993 Log: OLPC XO-1.75 - Added support for 910 MHz and 1 GHz (actually 988 MHz) operating points. Added: cpu/arm/olpc/banner.fth Modified: cpu/arm/mmp2/clocks.fth cpu/arm/mmp2/fuse.fth cpu/arm/olpc/build-fw.fth Modified: cpu/arm/mmp2/clocks.fth ============================================================================== --- cpu/arm/mmp2/clocks.fth Thu May 31 20:33:33 2012 (r2992) +++ cpu/arm/mmp2/clocks.fth Thu May 31 22:07:15 2012 (r2993) @@ -1,5 +1,44 @@ purpose: Change the clock frequency +0 [if] +: set-pll2-520mhz ( -- ) + \ select PLL2 frequency, 520MHz + h# 08600322 h# 414 mpmu! \ PMUM_PLL2_CTRL1 \ Bandgap+charge pump+VCO loading+regulator defaults, 486.3-528.55 PLL2 (bits 10:6) + h# 00FFFE00 h# 34 mpmu! \ PMUM_PLL2_CTRL2 \ refclk divisor and feedback divisors at max, software controls activation + h# 0021da00 h# 34 mpmu! \ PMUM_PLL2_CTRL2 \ refclk divisor=4, feedback divisor=0x76=118, software controls activation + h# 0021db00 h# 34 mpmu! \ PMUM_PLL2_CTRL2 \ same plus enable + h# 28600322 h# 414 mpmu! \ PMUM_PLL2_CTRL1 \ same as above plus release PLL loop filter +; +[then] +: set-pll2-910mhz ( -- ) + \ select PLL2 frequency, 910MHz + h# 086005a2 h# 414 mpmu! \ PMUM_PLL2_CTRL1 \ Bandgap+charge pump+VCO loading+regulator defaults, 486.3-528.55 PLL2 (bits 10:6) + h# 00FFFE00 h# 34 mpmu! \ PMUM_PLL2_CTRL2 \ refclk divisor and feedback divisors at max, software controls activation + h# 00234200 h# 34 mpmu! \ PMUM_PLL2_CTRL2 \ refclk divisor=4, feedback divisor=0xd0=208, software controls activation + h# 00234300 h# 34 mpmu! \ PMUM_PLL2_CTRL2 \ same plus enable + h# 286005a2 h# 414 mpmu! \ PMUM_PLL2_CTRL1 \ same as above plus release PLL loop filter +; +: set-pll2-988mhz ( -- ) + \ select PLL2 frequency, 988MHz + h# 08600622 h# 414 mpmu! \ PMUM_PLL2_CTRL1 \ Bandgap+charge pump+VCO loading+regulator defaults, 971.35-1011.65 PLL2 (bits 10:6) + h# 00FFFE00 h# 34 mpmu! \ PMUM_PLL2_CTRL2 \ refclk divisor and feedback divisors at max, software controls activation + h# 00238a00 h# 34 mpmu! \ PMUM_PLL2_CTRL2 \ refclk divisor=4, feedback divisor=0xe2=226, software controls activation + h# 00238b00 h# 34 mpmu! \ PMUM_PLL2_CTRL2 \ same plus enable + h# 28600622 h# 414 mpmu! \ PMUM_PLL2_CTRL1 \ same as above plus release PLL loop filter +; +: pll2-off ( -- ) + h# 2000.0000 h# 414 +mpmu io-clr \ PLL2_RESETB in PMUM_PLL2_CTRL1 + h# 100 h# 34 +mpmu io-clr \ PLL2_SW_EN in PMUM_PLL2CR +; +: gate-pll2 ( -- ) + h# 4000 h# 1024 +mpmu io-clr \ APMU_PLL2 in PMUM_CGR_PJ + h# 4000 h# 24 +mpmu io-clr \ APMU_PLL2 in PMUM_CGR_SP +; +: ungate-pll2 ( -- ) + h# 4000 h# 1024 +mpmu io-set \ APMU_PLL2 in PMUM_CGR_PJ + h# 4000 h# 24 +mpmu io-set \ APMU_PLL2 in PMUM_CGR_SP +; + : fccr@ ( -- n ) h# 05.0008 io@ ; : fccr! ( n -- ) h# 05.0008 io! ; : pj4-clksel ( n -- ) @@ -25,6 +64,9 @@ : pj4-200mhz ( -- ) 0 pj4-clksel o# 37042301101 pj4-cc! ; \ A 200, D 400, XP 200, B 200, P 200 : pj4-400mhz ( -- ) 0 pj4-clksel o# 37042301100 pj4-cc! ; \ A 200, D 400, XP 200, B 200, P 400 : pj4-800mhz ( -- ) 1 pj4-clksel o# 37042201100 pj4-cc! ; \ A 266, D 400, XP 400, B 400, P 800 +: pj4-910mhz ( -- ) set-pll2-910mhz ungate-pll2 2 pj4-clksel o# 37042201100 pj4-cc! ; \ A 266, D 400, XP 400, B 400, P 910 +: pj4-988mhz ( -- ) set-pll2-988mhz ungate-pll2 2 pj4-clksel o# 37042201100 pj4-cc! ; \ A 266, D 400, XP 400, B 400, P 910 +: .speed ( -- ) t( d# 10,000,000 0 do loop )t ; 0 [if] \ PJ4 versions using voting cvr52ADXBCP @@ -32,4 +74,6 @@ : pj4-200mhz ( -- ) 0 pj4-clksel o# 21742301101 pj4-cc! ; \ A 200, D 400, XP 200, B 200, P 200 : pj4-400mhz ( -- ) 0 pj4-clksel o# 21742301100 pj4-cc! ; \ A 200, D 400, XP 200, B 200, P 400 : pj4-800mhz ( -- ) 1 pj4-clksel o# 21742201100 pj4-cc! ; \ A 266, D 400, XP 400, B 400, P 800 +: pj4-910mhz ( -- ) set-pll2-910mhz 2 pj4-clksel o# 21742201100 pj4-cc! ; \ A 266, D 400, XP 400, B 400, P 910 +: pj4-988mhz ( -- ) set-pll2-988mhz 2 pj4-clksel o# 21742201100 pj4-cc! ; \ A 266, D 400, XP 400, B 400, P 988 [then] Modified: cpu/arm/mmp2/fuse.fth ============================================================================== --- cpu/arm/mmp2/fuse.fth Thu May 31 20:33:33 2012 (r2992) +++ cpu/arm/mmp2/fuse.fth Thu May 31 22:07:15 2012 (r2993) @@ -36,10 +36,11 @@ ; : .3bits ( n -- n' ) dup 7 and .d 3 rshift ; string-array freqs ," 800" ," 910" ," 1001" ," ??? " end-string-array -: .max-freq ( n -- ) ." Max Freq: " 3 and freqs count type ; +: rated-speed ( -- n ) h# 28a4 fuse@ d# 14 rshift 3 and ; +: .max-freq ( -- ) ." Max Freq: " rated-speed freqs count type ; : .block3-brief ( -- ) ." Block 3 - Voltages: " h# 28a0 fuse@ 5 0 do .3bits loop 2/ .3bits drop - h# 28a4 fuse@ d# 14 rshift .max-freq cr + .max-freq cr ; : .block3 ( -- ) ." Block 3" cr Added: cpu/arm/olpc/banner.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/banner.fth Thu May 31 22:07:15 2012 (r2993) @@ -0,0 +1,180 @@ +\ See license at end of file +purpose: Banner customization for this system + +headerless + +[ifdef] get-partition-from-driver +: partition-end ( name$ -- false | d.end true ) + open-dev ?dup if ( ihandle ) + >r ( r: ihandle ) + " offset-low" r@ $call-method ( offset.low r: ihandle ) + " offset-high" r@ $call-method ( d.offset r: ihandle ) + " size" r@ $call-method ( d.offset d.size r: ihandle ) + d+ ( d.end r: ihandle ) + r> close-dev ( d.end ) + true ( d.end true ) + else ( ) + false ( false ) + then ( false | d.end true ) +; + +: .storage ( -- ) + " int:0" partition-end if ( d.size ) + d# 200,000,000. d+ ( d.size' ) \ Round up + d# 1,000,000,000 um/mod ( rem Gb ) + nip .d ." GB " ( ) + else ( ) + ." No " ( ) + then ( ) + ." internal storage" ( ) +; +[then] + +h# 40 buffer: partition-map +: partition-end ( offset -- sector# ) + partition-map + dup le-l@ ( adr start ) + swap la1+ le-l@ + ( sector# ) +; + +0 value internal-disk-present? +0. 2value internal-disk-size +0. 2value internal-partition-end + +: get-internal-disk-info ( -- ) + " int:0" open-dev ?dup if ( ihandle ) + true to internal-disk-present? ( ihandle ) + >r ( r: ihandle ) + " size" r@ $call-method to internal-disk-size ( r: ihandle ) + + h# 1be. " seek" r@ $call-method drop ( r: ihandle ) + partition-map h# 40 " read" r@ $call-method drop ( r: ihandle ) + r> close-dev ( ) + + 0 ( max-sector ) + h# 40 h# 8 do ( max-sector ) + i partition-end max ( max-sector' ) + h# 10 +loop ( max-sector' ) + dup 0< if ( max-sector' ) + 2drop ( ) + else + d# 512 um* to internal-partition-end + then + else ( ) + false to internal-disk-present? + then +; + +: .storage ( -- ) + internal-disk-present? 0= if ( ) + get-internal-disk-info ( ) + then + internal-disk-present? if ( ) + internal-disk-size ( d.size ) + d# 200,000,000. d+ ( d.size' ) \ Round up + d# 1,000,000,000 um/mod ( rem Gb ) + nip .d ." GB " ( ) + else ( ) + ." No " ( ) + then ( ) + ." internal storage" ( ) +; + +: check-internal-partitions ( -- ) + internal-disk-present? 0= if exit then ( ) + internal-partition-end d0= if exit then ( ) + + internal-disk-size internal-partition-end d< if ( ) + red-letters + ." WARNING! OS image larger than internal storage device!" cr + cancel + exit + then + + internal-partition-end d# 1,000,000,000. d+ internal-disk-size d< if + red-letters + ." WARNING! OS image much smaller than internal storage device" cr + cancel + then +; + +: ofw-model$ ( -- adr len ) + " /openprom" find-package drop ( phandle ) + " model" rot get-package-property if ( ) + " ??? ????? ???" ( adr len ) + else ( adr len ) + decode-string 2nip ( adr len' ) + then ( adr len ) +; +: ofw-version$ ( -- adr len ) + ofw-model$ drop 6 + 7 -trailing +; +: .rom ( -- ) + ." OpenFirmware " ofw-version$ type +; + +: .ec + " ec-name" ['] root-node get-package-property 0= if ( adr len ) + get-encoded-string ." EC Firmware " type + then +; + +: .cpu-speed ( -- ) + rated-speed case + 0 of ." 800 MHz" endof + 1 of ." 910 MHz" endof + ." 1 GHz" + endcase +; +: .memory-brief ( -- ) + memory-size dup d# 1024 / ?dup if ( mb gb ) + nip " GiB" rot ( gb$ gb ) + else ( mb ) + " MiB" rot ( mb$ mb ) + then ( m$ m ) + .d type ." memory" ( ) +; + +: (xbanner-basics) ( -- ) + ?spaces cpu-model type ." , " .cpu-speed ." , " .memory-brief + ." , " .storage + ." , S/N " " SN" find-tag if type else ." Unknown" then cr + ?spaces .rom ." " .ec ." " .clock + check-internal-partitions +; +' (xbanner-basics) to banner-basics + +' (banner-warnings) to banner-warnings + +: stop-auto? ( -- flag ) idprom-valid? 0= auto-boot? and ; + +defer gui-banner ' true to gui-banner +: ?gui-banner ( -- ) + stop-auto? if suppress-auto-boot then + + gui-banner drop +; + +headers +\ LICENSE_BEGIN +\ Copyright (c) 2006 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/build-fw.fth ============================================================================== --- cpu/arm/olpc/build-fw.fth Thu May 31 20:33:33 2012 (r2992) +++ cpu/arm/olpc/build-fw.fth Thu May 31 22:07:15 2012 (r2993) @@ -567,7 +567,7 @@ then ; -fload ${BP}/cpu/x86/pc/olpc/via/banner.fth +fload ${BP}/cpu/arm/olpc/banner.fth \- olpc-cl3 devalias keyboard /ap-sp/keyboard \- olpc-cl3 devalias mouse /ap-sp/mouse

1 0

[commit] r2992 - cpu/arm/mmp2
by repository service May 31, 2012

May 31, 2012

Author: wmb Date: Thu May 31 20:33:33 2012 New Revision: 2992 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2992 Log: OLPC XO-1.75 - If PLL2 is in use, leave it connected to the CPU cores when suspending. Modified: cpu/arm/mmp2/dramrecal.fth Modified: cpu/arm/mmp2/dramrecal.fth ============================================================================== --- cpu/arm/mmp2/dramrecal.fth Thu May 31 08:47:17 2012 (r2991) +++ cpu/arm/mmp2/dramrecal.fth Thu May 31 20:33:33 2012 (r2992) @@ -286,10 +286,11 @@ \ h# 1b h# 68 pmua! \ PMUA_WTM_CLK_RES_CTRL h# 9 h# 5c +pmua io-set \ PMUA_USB_CLK_RES_CTRL ; +: pll2? ( -- flag ) h# 34 mpmu@ h# 100 and 0<> ; : disable-mpmu-clks ( -- ) - h# a010 h# 1024 mpmu! \ MPMU_ACGR - - h# a010 h# 0024 mpmu! \ MPMU_CGR_SP ??? + pll2? if h# e010 else h# a010 then ( cgr-value ) + dup h# 1024 mpmu! \ MPMU_CGR_PJ + h# 0024 mpmu! \ MPMU_CGR_SP \ h# 2000.0000 h# 414 +mpmu io-clr \ MPMU_PLL2_CTRL1 h# 8000.0000 h# 0040 +mpmu io-clr \ MPMU_ISCCR1

1 0

[commit] r2991 - cpu/arm/olpc/1.75 cpu/x86/pc/olpc cpu/x86/pc/olpc/via dev/olpc
by repository service May 30, 2012

May 30, 2012

Author: quozl Date: Thu May 31 08:47:17 2012 New Revision: 2991 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2991 Log: OLPC - lid close consistent across models, made into common code, #11095 Added: dev/olpc/lid.fth Modified: cpu/arm/olpc/1.75/switches.fth cpu/x86/pc/olpc/fw.bth cpu/x86/pc/olpc/via/cstate.fth Modified: cpu/arm/olpc/1.75/switches.fth ============================================================================== --- cpu/arm/olpc/1.75/switches.fth Thu May 31 07:28:43 2012 (r2990) +++ cpu/arm/olpc/1.75/switches.fth Thu May 31 08:47:17 2012 (r2991) @@ -36,39 +36,7 @@ ['] all-switch-states catch ; -false value lid-already-down? -0 value lid-down-time -d# 10000 constant lid-shutdown-ms -d# 2000 constant lid-warning-ms -0 value lid-warned? - -: ?lid-shutdown ( -- ) - lid? if - lid-already-down? if - get-msecs lid-down-time - ( ms ) - - dup lid-warning-ms >= lid-warned? 0= and if - ." Lid switch is active - Powering off in 8 seconds" cr - ." Type lid-off to disable this function" cr - true to lid-warned? - then ( ms ) - - lid-shutdown-ms >= if - ." Powering off after 10 seconds of lid down" cr - power-off - then - else - get-msecs to lid-down-time - true to lid-already-down? - then - else - false to lid-already-down? - false to lid-warned? - then -; -: lid-on ( -- ) ['] ?lid-shutdown to do-lid ; -' lid-on to do-lid - +fload ${BP}/dev/olpc/lid.fth end-package \ LICENSE_BEGIN Modified: cpu/x86/pc/olpc/fw.bth ============================================================================== --- cpu/x86/pc/olpc/fw.bth Thu May 31 07:28:43 2012 (r2990) +++ cpu/x86/pc/olpc/fw.bth Thu May 31 08:47:17 2012 (r2991) @@ -479,7 +479,10 @@ " dhcp" ' ip-address set-config-string-default -: c1-idle ( -- ) interrupts-enabled? if halt then ; +: lid? ( -- flag ) h# 30 >hi gpio@ h# 400 and 0= ; +fload ${BP}/dev/olpc/lid.fth + +: c1-idle ( -- ) interrupts-enabled? if halt then do-lid ; ' c1-idle to stdin-idle : fast-boot? ( -- flag ) Modified: cpu/x86/pc/olpc/via/cstate.fth ============================================================================== --- cpu/x86/pc/olpc/via/cstate.fth Thu May 31 07:28:43 2012 (r2990) +++ cpu/x86/pc/olpc/via/cstate.fth Thu May 31 08:47:17 2012 (r2991) @@ -28,42 +28,8 @@ then ; -: lid-down? ( -- flag ) h# 48 acpi-l@ h# 80 and 0= ; -false value lid-already-down? -0 value lid-down-time -d# 10000 constant lid-shutdown-ms -d# 2000 constant lid-warning-ms -0 value lid-warned? - -: ?lid-shutdown ( -- ) - lid-down? if - lid-already-down? if - acpi-timer@ lid-down-time - d# 3580 / ( ms ) - - dup lid-warning-ms >= lid-warned? 0= and if - ." Lid switch is active - Powering off in 8 seconds" cr - ." Type lid-off to disable this function" cr - true to lid-warned? - then ( ms ) - - lid-shutdown-ms >= if - ." Powering off after 10 seconds of lid down" cr - power-off - then - else - acpi-timer@ to lid-down-time - true to lid-already-down? - then - else - false to lid-already-down? - false to lid-warned? - then -; - -defer do-lid -: lid-on ( -- ) ['] ?lid-shutdown to do-lid ; -: lid-off ( -- ) ['] noop to do-lid ; -lid-on +: lid? ( -- flag ) h# 48 acpi-l@ h# 80 and 0= ; +fload ${BP}/dev/olpc/lid.fth defer do-idle ' noop to do-idle Added: dev/olpc/lid.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ dev/olpc/lid.fth Thu May 31 08:47:17 2012 (r2991) @@ -0,0 +1,68 @@ +\ See license at end of file +purpose: lid close triggers power off + +false value lid-already-down? +0 value lid-down-time +d# 10000 constant lid-shutdown-ms +d# 2000 constant lid-warning-ms +0 value lid-warned? + +: ?lid-shutdown ( -- ) + lid? if + lid-already-down? if + get-msecs lid-down-time - ( ms ) + + dup lid-warning-ms >= lid-warned? 0= and if + cr + ." Lid switch is active - powering off in 8 seconds" cr + ." Type lid-off to disable this" cr + true to lid-warned? + then ( ms ) + + lid-shutdown-ms >= if + ." Powering off after 10 seconds of lid down" cr + power-off + then + else + get-msecs to lid-down-time + true to lid-already-down? + then + else + false to lid-already-down? + false to lid-warned? + then +; + +[ifndef] do-lid +defer do-lid +[then] + +: lid-on ( -- ) ['] ?lid-shutdown to do-lid ; +[ifndef] lid-off +: lid-off ( -- ) ['] noop to do-lid ; +[then] +' lid-on to do-lid + +\ 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] r2990 - dev/mmc/sdhci
by repository service May 30, 2012

May 30, 2012

Author: wmb Date: Thu May 31 07:28:43 2012 New Revision: 2990 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2990 Log: SDHCI - OLPC trac #11844 - fixed SD card detection on XO-1. The chipset's SDHCI controller requires you to turn on some enable bits before the card insertion bits become visible. Modified: dev/mmc/sdhci/sdhci.fth Modified: dev/mmc/sdhci/sdhci.fth ============================================================================== --- dev/mmc/sdhci/sdhci.fth Tue May 29 20:44:37 2012 (r2989) +++ dev/mmc/sdhci/sdhci.fth Thu May 31 07:28:43 2012 (r2990) @@ -88,6 +88,26 @@ \ : led-on ( -- ) h# 28 cb@ 1 or h# 28 cb! ; \ : led-off ( -- ) h# 28 cb@ 1 invert and h# 28 cb! ; +\ We leave the remove and insert interrupt enables on because the +\ hardware has a bug that blocks the card detection status bits +\ unless the interrupt enables are on. +0 instance value intstat-count +: intstat-on ( -- ) + intstat-count 0= if + h# 00cb h# 34 cw! \ normal interrupt status en reg + \ Enable: Remove, Insert, DMA Interrupt, Transfer Complete, CMD Complete + \ Disable: Card Interrupt, Read Ready, Write Ready, Block Gap + h# f1ff h# 36 cw! \ error interrupt status en reg + then + intstat-count 1+ to intstat-count +; +: intstat-off ( -- ) + intstat-count 1- 0 max to intstat-count + intstat-count 0= if + h# c0 h# 34 cl! \ Remove, Insert on, others off + then +; + \ There is no need to use the debounced version (the 3.0000 bits). \ We poll for the card when the SDMMC driver opens, rather than \ sitting around waiting for insertion/removal events. @@ -95,11 +115,13 @@ defer card-inserted? : sdhci-card-inserted? ( -- flag ) + intstat-on get-msecs d# 500 + begin ( time-limit ) \ When the stable bit is set, we can believe the answer present-state@ h# 20000 and if ( time-limit ) drop ( ) present-state@ h# 10000 and 0<> ( flag ) + intstat-off ( flag ) exit ( -- flag ) then ( time-limit ) dup get-msecs - 0< ( time-limit timeout? ) @@ -107,6 +129,7 @@ drop ( ) ." SD Card detect unstable!" cr ( ) false ( flag ) + intstat-off ( flag ) ; ' sdhci-card-inserted? to card-inserted? : write-protected? ( -- flag ) @@ -170,17 +193,6 @@ : data-timeout! ( n -- ) h# 2e cb! ; -\ We leave the remove and insert interrupt enables on because the -\ hardware has a bug that blocks the card detection status bits -\ unless the interrupt enables are on. -: intstat-on ( -- ) - h# 00cb h# 34 cw! \ normal interrupt status en reg - \ Enable: Remove, Insert, DMA Interrupt, Transfer Complete, CMD Complete - \ Disable: Card Interrupt, Read Ready, Write Ready, Block Gap - h# f1ff h# 36 cw! \ error interrupt status en reg -; -: intstat-off ( -- ) h# c0 h# 34 cl! ; \ Remove, Insert on, others off - : setup-host ( -- ) reset-host internal-clock-on

1 0

[commit] r2989 - dev/olpc/touchpad
by repository service May 29, 2012

May 29, 2012

Author: wmb Date: Tue May 29 20:44:37 2012 New Revision: 2989 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2989 Log: OLPC trac #11902 - ALPS touchpad driver - use mouse emulation mode on initial open so the menu works, switching to ALPS mode only during selftest. Modified: dev/olpc/touchpad/touchpad.fth Modified: dev/olpc/touchpad/touchpad.fth ============================================================================== --- dev/olpc/touchpad/touchpad.fth Fri May 25 03:24:28 2012 (r2988) +++ dev/olpc/touchpad/touchpad.fth Tue May 29 20:44:37 2012 (r2989) @@ -72,17 +72,21 @@ touchpad-id h# ffff and h# 0067 = ; +variable mode \ 0 - unknown 1 - GS 2 - PT 3 - mouse + \ Ref: 5.2.10 (2-1) of Hybrid-GP2B-T-1.pdf -: advanced-mode ( -- ) stream-off stream-off stream-off stream-off ; \ 4 f5 commands +: advanced-mode ( -- ) stream-off stream-off stream-off stream-off 0 mode ! ; \ 4 f5 commands \ Ref: 5.2.10 (2-2) of Hybrid-GP2B-T-1.pdf -: mouse-mode ( -- ) h# ff read2 drop drop ; \ Response is 0,aa +: mouse-mode ( -- ) \ Response is 0,aa + h# ff read2 drop drop + stream-mode 3 mode ! +; \ Send the common "three f2 commands" prefix. "f2" is normally the \ "identify" command; the response (for a mouse-like device) is 0x00 : alps-prefix ( -- ) 3 0 do h# f2 read1 drop loop ; -variable mode \ 0 - unknown 1 - GS 2 - PT 3 - mouse 0 instance value packet-type \ Ref: 5.2.10 (3) of Hybrid-GP2B-T-1.pdf @@ -104,16 +108,16 @@ : start ( -- ) setup olpc-touchpad? if - 0 mode ! advanced-mode stream-on + advanced-mode stream-on else - stream-mode 3 mode ! + mouse-mode then ; \ Substitute "start" for "stream-mode" in the driver's open \ method, so we can use advance-mode for the ALPS touchpad. -patch start stream-mode open +patch mouse-mode stream-mode open \ I have been unable to get this to work. The response is always @@ -543,6 +547,8 @@ if track then exit-test? until + mouse-mode \ Restore the standard mouse mode so the menu will work + close cursor-on page

1 0

[commit] r2988 - cpu/arm/olpc/1.75
by repository service May 24, 2012

May 24, 2012

Author: quozl Date: Fri May 25 03:24:28 2012 New Revision: 2988 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2988 Log: Q4D15 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 May 24 06:35:09 2012 (r2987) +++ cpu/arm/olpc/1.75/fw-version.fth Fri May 25 03:24:28 2012 (r2988) @@ -1,4 +1,4 @@ \ The overall firmware revision macro: FW_PREFIX Q4 macro: FW_MAJOR D -macro: FW_MINOR 14 +macro: FW_MINOR 15

1 0

[commit] r2987 - in cpu: arm/olpc x86/pc/olpc x86/pc/olpc/via
by repository service May 23, 2012

May 23, 2012

Author: quozl Date: Thu May 24 06:35:09 2012 New Revision: 2987 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2987 Log: OLPC - add .os command for test bed management Modified: cpu/arm/olpc/build-fw.fth cpu/x86/pc/olpc/fw.bth cpu/x86/pc/olpc/via/fw.bth Modified: cpu/arm/olpc/build-fw.fth ============================================================================== --- cpu/arm/olpc/build-fw.fth Thu May 24 01:44:52 2012 (r2986) +++ cpu/arm/olpc/build-fw.fth Thu May 24 06:35:09 2012 (r2987) @@ -1058,6 +1058,7 @@ : qz " qz" $essid " http:\\qz\" included \ qa test bed scripting, james cameron ; +: .os " more int:\boot\olpc_build" eval ; : urom " flash! u:\new.rom" eval ; : uec " flash-ec! u:\ecimage.bin" eval ; : erom " flash! ext:\new.rom" eval ; Modified: cpu/x86/pc/olpc/fw.bth ============================================================================== --- cpu/x86/pc/olpc/fw.bth Thu May 24 01:44:52 2012 (r2986) +++ cpu/x86/pc/olpc/fw.bth Thu May 24 06:35:09 2012 (r2987) @@ -653,6 +653,7 @@ : qz " qz" $essid " http:\\qz\" included \ qa test bed scripting, james cameron ; +: .os " more int:\boot\olpc_build" eval ; \ Fancy battery charge logger. fload ${BP}/cpu/x86/pc/olpc/charge.fth Modified: cpu/x86/pc/olpc/via/fw.bth ============================================================================== --- cpu/x86/pc/olpc/via/fw.bth Thu May 24 01:44:52 2012 (r2986) +++ cpu/x86/pc/olpc/via/fw.bth Thu May 24 06:35:09 2012 (r2987) @@ -746,6 +746,7 @@ : qz " qz" $essid " http:\\qz\" included \ qa test bed scripting, james cameron ; +: .os " more int:\boot\olpc_build" eval ; : no-usb-delay " dev /usb false to delay? dend" evaluate ; : null-fsdisk " dev /null : size 0 8 ; : write-blocks-start 3drop false ; : write-blocks-end false ; dend" evaluate

1 0

[commit] r2986 - cpu/x86/pc/biosload
by repository service May 23, 2012

May 23, 2012

Author: wmb Date: Thu May 24 01:44:52 2012 New Revision: 2986 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2986 Log: Biosload version - commented out build dependency on Marvell wlan firmware, which is needed only for a few builds. Modified: cpu/x86/pc/biosload/ofw.bth Modified: cpu/x86/pc/biosload/ofw.bth ============================================================================== --- cpu/x86/pc/biosload/ofw.bth Thu May 24 01:44:15 2012 (r2985) +++ cpu/x86/pc/biosload/ofw.bth Thu May 24 01:44:52 2012 (r2986) @@ -26,8 +26,8 @@ in: ${BP}/dev/mmc/sdhci/build/sdhci2.fc in: ${BP}/dev/mmc/sdhci/build/sdhci.fc in: ${BP}/dev/mmc/sdhci/build/sdmmc.fc -in: ${BP}/dev/mmc/sdhci/mv8686/build/mv8686.fc -in: sd8686.bin +\ in: ${BP}/dev/mmc/sdhci/mv8686/build/mv8686.fc +\ in: sd8686.bin build-now

1 0

[commit] r2985 - cpu/arm/olpc/1.75 cpu/arm/olpc/3.0 cpu/x86/pc/olpc/via dev/geode
by repository service May 23, 2012

May 23, 2012

Author: quozl Date: Thu May 24 01:44:15 2012 New Revision: 2985 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2985 Log: OLPC - remove USB serial adapter keyboard support from all models, #11871 #11887 Modified: cpu/arm/olpc/1.75/usb.fth cpu/arm/olpc/3.0/usb.fth cpu/x86/pc/olpc/via/usb.fth dev/geode/usb.fth Modified: cpu/arm/olpc/1.75/usb.fth ============================================================================== --- cpu/arm/olpc/1.75/usb.fth Thu May 24 01:44:04 2012 (r2984) +++ cpu/arm/olpc/1.75/usb.fth Thu May 24 01:44:15 2012 (r2985) @@ -96,7 +96,6 @@ alias p2 probe-usb 0 value usb-keyboard-ih -0 value usb-serial-ih : attach-usb-keyboard ( -- ) " usb-keyboard" expand-alias if ( devspec$ ) @@ -118,34 +117,16 @@ then ; -: attach-usb-serial ( -- ) - " /usb/serial" open-dev ?dup if - to usb-serial-ih - usb-serial-ih add-input - then -; - -: detach-usb-serial ( -- ) - usb-serial-ih if - usb-serial-ih remove-input - usb-serial-ih close-dev - 0 to usb-serial-ih - then -; - : ?usb-keyboard ( -- ) attach-usb-keyboard - attach-usb-serial ; : usb-quiet ( -- ) detach-usb-keyboard - detach-usb-serial " /usb" " reset-usb" execute-device-method drop ; : suspend-usb ( -- ) - detach-usb-serial detach-usb-keyboard " /usb" " sleep" execute-device-method drop ; @@ -161,7 +142,6 @@ then silent-probe-usb attach-usb-keyboard - attach-usb-serial ; \ Unlink every node whose phys.hi component matches port Modified: cpu/arm/olpc/3.0/usb.fth ============================================================================== --- cpu/arm/olpc/3.0/usb.fth Thu May 24 01:44:04 2012 (r2984) +++ cpu/arm/olpc/3.0/usb.fth Thu May 24 01:44:15 2012 (r2985) @@ -159,9 +159,6 @@ : ?usb-keyboard ( -- ) attach-usb-keyboard - " /usb/serial" open-dev ?dup if - add-input - then ; : usb-quiet ( -- ) Modified: cpu/x86/pc/olpc/via/usb.fth ============================================================================== --- cpu/x86/pc/olpc/via/usb.fth Thu May 24 01:44:04 2012 (r2984) +++ cpu/x86/pc/olpc/via/usb.fth Thu May 24 01:44:15 2012 (r2985) @@ -85,9 +85,6 @@ : ?usb-keyboard ( -- ) attach-usb-keyboard - " /usb/serial" open-dev ?dup if - add-input - then ; : suspend-usb ( -- ) detach-usb-keyboard Modified: dev/geode/usb.fth ============================================================================== --- dev/geode/usb.fth Thu May 24 01:44:04 2012 (r2984) +++ dev/geode/usb.fth Thu May 24 01:44:15 2012 (r2985) @@ -74,9 +74,6 @@ : ?usb-keyboard ( -- ) attach-usb-keyboard - " /usb/serial" open-dev ?dup if - add-input - then ; \ Unlink every node whose phys.hi component matches port

1 0

[commit] r2984 - cpu/x86/pc/biosload
by repository service May 23, 2012

May 23, 2012

Author: wmb Date: Thu May 24 01:44:04 2012 New Revision: 2984 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2984 Log: Biosload version - removed redundant loading of files that are now present in basefw.dic . Modified: cpu/x86/pc/biosload/devices.fth Modified: cpu/x86/pc/biosload/devices.fth ============================================================================== --- cpu/x86/pc/biosload/devices.fth Mon May 21 10:59:18 2012 (r2983) +++ cpu/x86/pc/biosload/devices.fth Thu May 24 01:44:04 2012 (r2984) @@ -197,10 +197,6 @@ [then] fload ${BP}/ofw/core/countdwn.fth \ Startup countdown -fload ${BP}/forth/lib/pattern.fth \ Text string pattern matching -fload ${BP}/forth/lib/tofile.fth \ to-file and append-to-file -\ XXX remove the OS file commands from tools.dic -fload ${BP}/ofw/core/filecmds.fth \ File commands: dir, del, ren, etc. [ifdef] pseudo-nvram fload ${BP}/cpu/x86/pc/biosload/filenv.fth

1 0