openfirmware October 2011

openfirmware@openfirmware.info

1 participants
103 discussions

[commit] r2578 - in cpu/arm: mmp2 olpc/1.75
by repository service 05 Oct '11

05 Oct '11

Author: wmb Date: Wed Oct 5 00:21:03 2011 New Revision: 2578 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2578 Log: OLPC XO-1.75 - trac #11298 - reinit USB hardware as necessary after suspend/resume. Modified: cpu/arm/mmp2/dramrecal.fth cpu/arm/olpc/1.75/devices.fth cpu/arm/olpc/1.75/usb.fth Modified: cpu/arm/mmp2/dramrecal.fth ============================================================================== --- cpu/arm/mmp2/dramrecal.fth Wed Oct 5 00:14:31 2011 (r2577) +++ cpu/arm/mmp2/dramrecal.fth Wed Oct 5 00:21:03 2011 (r2578) @@ -725,6 +725,7 @@ : str ( -- ) disable-interrupts + suspend-usb timers-off screen-off @@ -770,8 +771,8 @@ screen-on timers-on + resume-usb enable-interrupts - hdd-led-off ; : strp ( -- ) ec-rst-pwr str ec-max-pwr .d ." mW " soc .% space ; Modified: cpu/arm/olpc/1.75/devices.fth ============================================================================== --- cpu/arm/olpc/1.75/devices.fth Wed Oct 5 00:14:31 2011 (r2577) +++ cpu/arm/olpc/1.75/devices.fth Wed Oct 5 00:21:03 2011 (r2578) @@ -334,20 +334,9 @@ then ; -fload ${BP}/cpu/arm/olpc/1.75/usb.fth - fload ${BP}/cpu/arm/marvell/utmiphy.fth -: init-usb ( -- ) - h# 9 h# 28285c io! \ Enable clock to USB block - reset-usb-hub - init-usb-phy -; - -stand-init: Init USB Phy -\ usb-power-on \ The EC now controls the USB power - init-usb -; +fload ${BP}/cpu/arm/olpc/1.75/usb.fth fload ${BP}/dev/olpc/mmp2camera/loadpkg.fth Modified: cpu/arm/olpc/1.75/usb.fth ============================================================================== --- cpu/arm/olpc/1.75/usb.fth Wed Oct 5 00:14:31 2011 (r2577) +++ cpu/arm/olpc/1.75/usb.fth Wed Oct 5 00:21:03 2011 (r2578) @@ -22,9 +22,25 @@ \ Port 3 is left \ Port 4 is right lower " 3,4,2" " usb-hub-test-list" string-property - + : suspend ( -- ) true to first-open? ; + : resume ( -- ) ; end-package +\ Turn on USB power after a delay, to ensure that USB devices are reset correctly on boot +: usb-power-on ( -- ) ; \ The EC controls the USB power +: reset-usb-hub ( -- ) d# 146 gpio-set d# 10 ms d# 146 gpio-set ; + +: init-usb ( -- ) + h# 9 h# 5c pmua! \ Enable clock to USB block + reset-usb-hub + init-usb-phy +; + +stand-init: Init USB Phy +\ usb-power-on \ The EC now controls the USB power + init-usb +; + d# 300 config-int usb-delay \ Milliseconds to wait before probing hub ports devalias u /usb/disk @@ -108,6 +124,24 @@ then ; +: suspend-usb ( -- ) + detach-usb-keyboard + " /usb" " suspend" execute-device-method drop +; +: has-children? ( devspec$ -- flag ) + locate-device if false else child 0<> then +; +: any-usb-devices? ( -- flag ) " /usb/hub" has-children? ; +: resume-usb ( -- ) + init-usb + " /usb" " resume" execute-device-method drop + any-usb-devices? if + d# 2000 ms \ USB misses devices if you probe too soon + then + silent-probe-usb + attach-usb-keyboard +; + \ Unlink every node whose phys.hi component matches port : port-match? ( port -- flag ) get-unit if drop false exit then @@ -128,10 +162,6 @@ previous definitions ; -\ Turn on USB power after a delay, to ensure that USB devices are reset correctly on boot -: usb-power-on ( -- ) ; \ The EC controls the USB power -: reset-usb-hub ( -- ) d# 146 gpio-set d# 10 ms d# 146 gpio-set ; - \ LICENSE_BEGIN \ Copyright (c) 2010 FirmWorks \

1 0

[commit] r2577 - cpu/arm/marvell
by repository service 05 Oct '11

05 Oct '11

Author: wmb Date: Wed Oct 5 00:14:31 2011 New Revision: 2577 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2577 Log: OLPC XO-1.75 - utmiphy.fth - factoring changes, no functional difference. Modified: cpu/arm/marvell/utmiphy.fth Modified: cpu/arm/marvell/utmiphy.fth ============================================================================== --- cpu/arm/marvell/utmiphy.fth Tue Oct 4 21:42:35 2011 (r2576) +++ cpu/arm/marvell/utmiphy.fth Wed Oct 5 00:14:31 2011 (r2577) @@ -1,15 +1,14 @@ \ See license at end of file purpose: Init UTMI USB Phy in Marvell SoC -h# 207004 constant utmi-ctrl -h# 207008 constant utmi-pll -h# 20700c constant utmi-tx -h# 207010 constant utmi-rx -h# 207014 constant utmi-ivref -h# 207018 constant utmi-t0 +: +utmi ( offset -- offset' ) h# 20.7000 + ; -: regset ( mask adr -- ) tuck io@ or swap io! ; -: regclr ( mask adr -- ) tuck io@ swap invert and swap io! ; +h# 04 +utmi constant utmi-ctrl +h# 08 +utmi constant utmi-pll +h# 0c +utmi constant utmi-tx +h# 10 +utmi constant utmi-rx +h# 14 +utmi constant utmi-ivref +h# 18 +utmi constant utmi-t0 : wait-cal ( spins -- ) 0 do @@ -36,39 +35,39 @@ [then] \ Turn on the USB PHY power - h# 1810.0000 utmi-ctrl regset \ INPKT_DELAY_SOF, PU_REF - h# 2 utmi-ctrl regset \ PLL_PWR_UP + h# 1810.0000 utmi-ctrl io-set \ INPKT_DELAY_SOF, PU_REF + h# 2 utmi-ctrl io-set \ PLL_PWR_UP d# 10 ms - h# 1 utmi-ctrl regset \ PWR_UP + h# 1 utmi-ctrl io-set \ PWR_UP 1 ms \ Linux code does this, perhaps redundantly - h# 1800.0000 utmi-ctrl regset \ INPKT_DELAY_SOF, PU_REF + h# 1800.0000 utmi-ctrl io-set \ INPKT_DELAY_SOF, PU_REF - h# 0000.8000 utmi-t0 regclr \ REG_FIFO_SQ_RST + h# 0000.8000 utmi-t0 io-clr \ REG_FIFO_SQ_RST \ Configure the PLLs - pll-clr utmi-pll regclr \ PLLCALI12, PLLVDD18, PLLVDD12, KVCO, ICP, FBDIV, REFDIV, - pll-set utmi-pll regset \ 3 3 3 3 1 ee b + pll-clr utmi-pll io-clr \ PLLCALI12, PLLVDD18, PLLVDD12, KVCO, ICP, FBDIV, REFDIV, + pll-set utmi-pll io-set \ 3 3 3 3 1 ee b 1 ms - tx-clr utmi-tx regclr \ TXVDD12, CK60_PHSEL, IMPCAL_VTH - tx-set utmi-tx regset \ 3 4 0 + tx-clr utmi-tx io-clr \ TXVDD12, CK60_PHSEL, IMPCAL_VTH + tx-set utmi-tx io-set \ 3 4 0 - rx-clr utmi-rx regclr \ RX_SQ_THRESH - rx-set utmi-rx regset \ 7 + rx-clr utmi-rx io-clr \ RX_SQ_THRESH + rx-set utmi-rx io-set \ 7 d# 1000 wait-cal d# 200 us - h# 0020.0000 utmi-pll regset \ VCOCAL_START + h# 0020.0000 utmi-pll io-set \ VCOCAL_START d# 40 us - h# 0020.0000 utmi-pll regclr + h# 0020.0000 utmi-pll io-clr d# 200 us - h# 0000.1000 utmi-tx regset \ REG_RCAL_START + h# 0000.1000 utmi-tx io-set \ REG_RCAL_START d# 40 us - h# 0000.1000 utmi-tx regclr + h# 0000.1000 utmi-tx io-clr d# 1000 wait-cal \ ." UTMI calibration done" cr

1 0

[commit] r2576 - in cpu/arm: mmp2 olpc/1.75
by repository service 04 Oct '11

04 Oct '11

Author: wmb Date: Tue Oct 4 21:42:35 2011 New Revision: 2576 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2576 Log: OLPC XO-1.75 - trac #11124 - added fuse display commands .fuses and .fuses-all . Added: cpu/arm/mmp2/fuse.fth Modified: cpu/arm/olpc/1.75/devices.fth Added: cpu/arm/mmp2/fuse.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/mmp2/fuse.fth Tue Oct 4 21:42:35 2011 (r2576) @@ -0,0 +1,99 @@ +\ See license at end of file +purpose: Display MMP2 fuse settings + +: fuse@ ( offset -- ) h# 29.0000 + io@ ; + +[ifdef] notdef +: .4b ( n -- n' ) u# u# u# u# [char] . hold ; +: .fuse-bin ( n -- ) + base @ >r binary + <# .4b .4b .4b .4b .4b .4b .4b u# u# u# u# u#> type + r> base ! +; +: .3digits ( n -- ) <# u# u# u# u#> type ; +: .fuse#s ( long# -- ) + ." Fuses" + push-decimal + d# 32 * dup .3digits ." -" d# 31 + .3digits + pop-base + ." : " +; +: .block-binary ( reg #regs -- ) + 0 do ( reg ) + i .fuse#s ( reg ) + dup fuse@ .fuse-bin cr la1+ ( reg' ) + loop ( reg ) + drop ( ) +; +[then] +: .2hex ( n -- ) push-hex <# u# u# u#> type pop-base ; +: .8hex ( n -- ) push-hex <# u# u# u# u# u# u# u# u# u#> type pop-base ; +: .block-hex ( reg #regs -- ) + 0 do ( reg ) + dup fuse@ .8hex space la1+ ( reg ) + loop ( reg ) + drop ( ) +; +: .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 ; +: .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 +; +: .block3 ( -- ) + ." Block 3" cr + ." Voltages: " h# 28a0 fuse@ 5 0 do .3bits loop 2/ .3bits cr + ." Lifecycle:" h# 2888 fuse@ ( n ) + ." CM " .3bits ." DM " .3bits ." DD " .3bits ." FA " .3bits cr ( n' ) + + ." JTAG disable: " .3bits drop ." SW version " h# 2898 2 .block-hex cr ( ) + + ." ISP_DIS: " h# 28a4 fuse@ .3bits ." DIS_TMP_FA: " .3bits + 8 rshift + dup .max-freq space 2 rshift + d# 16 rshift + ." HW Lock: " dup 1 and .d 1 rshift + ." SW Lock: " 1 and .d cr +; + +: ind ( -- ) 4 spaces ; +: .block0-brief ( -- ) ." Block 0 - SoC Config " h# 2904 4 .block-hex cr ; +: .fuses ( -- ) .block0-brief .block3-brief ; +: .fuses-all ( -- ) + ." Block 0 - SoC Config" cr ind h# 2904 4 .block-hex cr + ." Block 1 - WTM Root Key (RKEK)" cr ind h# 2924 8 .block-hex cr + ." Block 2 - OEM Platform Key Hash" cr ind h# 2944 8 .block-hex cr + .block3 + ." Block 5 - Chip ID" cr ind h# 29e8 fuse@ .8hex space h# 29ec fuse@ .8hex cr + ." Block 6 - OEM JTAG Key Hash" cr ind h# 2964 8 .block-hex cr +\ ." Block 7 - OEM JTAG Key HASH ECC" h# 29a8 fuse@ .8hex space h# 298c fuse@ .8hex cr +\ ." Block 7 - USB ECC" h# fuse@ d# 16 rshift .2hexits cr + ." Block 7 - USB ID" cr ind h# 2998 fuse@ .8hex space h# 299c fuse@ .8hex cr + ." Block 8 - EC 521 low" cr ind h# 28a8 8 .block-hex cr + ." Block 9 - EC 521 high" cr ind h# 28c8 4 .block-hex h# 29f0 4 .block-hex cr +; + +\ 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/1.75/devices.fth ============================================================================== --- cpu/arm/olpc/1.75/devices.fth Tue Oct 4 20:18:25 2011 (r2575) +++ cpu/arm/olpc/1.75/devices.fth Tue Oct 4 21:42:35 2011 (r2576) @@ -396,6 +396,7 @@ ; fload ${BP}/cpu/arm/mmp2/thermal.fth +fload ${BP}/cpu/arm/mmp2/fuse.fth \ LICENSE_BEGIN \ Copyright (c) 2010 FirmWorks

1 0

[commit] r2575 - cpu/x86/pc/olpc
by repository service 04 Oct '11

04 Oct '11

Author: wmb Date: Tue Oct 4 20:18:25 2011 New Revision: 2575 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2575 Log: OLPC - in enable-security, change the hardcoded address for the wp tag to be relative to mfg-data-top, thus allowing it to work for XO-1.75 too. Modified: cpu/x86/pc/olpc/setwp.fth Modified: cpu/x86/pc/olpc/setwp.fth ============================================================================== --- cpu/x86/pc/olpc/setwp.fth Tue Oct 4 03:02:09 2011 (r2574) +++ cpu/x86/pc/olpc/setwp.fth Tue Oct 4 20:18:25 2011 (r2575) @@ -10,9 +10,10 @@ \ require a full erase. That is faster and safer than copying out the \ data, erasing the block and rewriting it. +: wp-loc$ ( -- adr len ) mfg-data-top 2- 2 ; : enable-security ( "serialnumber" -- ) board-revision h# b48 < abort" Only supported on B4 and later" - h# fffefffe 2 " wp" $= if ." wp is already set" cr exit then + wp-loc$ " wp" $= if ." wp is already set" cr exit then " SN" find-tag 0= abort" No serial number (SN tag); enabling security would brick me." ( sn$ ) -null ( sn$' ) safe-parse-word ( sn$ confirmation$ ) @@ -22,10 +23,10 @@ 0= abort" Canceled" " U#" find-tag 0= abort" No U# tag; enabling security would brick me." 2drop - h# fffefffe 2 " ww" $= 0= abort" No ww tag" + wp-loc$ " ww" $= 0= abort" No ww tag" spi-start spi-identify " wp" h# efffe write-spi-flash - h# fffefffe 2 " wp" $= if ." Succeeded" cr then + wp-loc$ " wp" $= if ." Succeeded" cr then spi-reprogrammed ;

1 0

[commit] r2574 - cpu/arm/olpc/1.75 dev/olpc/kb3700
by repository service 04 Oct '11

04 Oct '11

Author: wmb Date: Tue Oct 4 03:02:09 2011 New Revision: 2574 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2574 Log: OLPC XO-1.75 - trac #11292 - OFW no longer supports routing the keyboard and mouse through the EC. Modified: cpu/arm/olpc/1.75/fw.bth dev/olpc/kb3700/spicmd.fth Modified: cpu/arm/olpc/1.75/fw.bth ============================================================================== --- cpu/arm/olpc/1.75/fw.bth Tue Oct 4 02:42:45 2011 (r2573) +++ cpu/arm/olpc/1.75/fw.bth Tue Oct 4 03:02:09 2011 (r2574) @@ -266,15 +266,9 @@ fload ${BP}/dev/logdev.fth fload ${BP}/cpu/x86/pc/olpc/disptest.fth -dev /ec-spi/keyboard -fload ${BP}/dev/olpc/keyboard/selftest.fth \ Keyboard diagnostic -device-end dev /ap-sp/keyboard fload ${BP}/dev/olpc/keyboard/selftest.fth \ Keyboard diagnostic device-end -dev /ec-spi/mouse -fload ${BP}/dev/olpc/touchpad/syntpad.fth \ Touchpad diagnostic -device-end dev /ap-sp/mouse fload ${BP}/dev/olpc/touchpad/syntpad.fth \ Touchpad diagnostic device-end @@ -380,21 +374,10 @@ fload ${BP}/dev/hdaudio/noiseburst.fth \ audio-test support package -: select-keyboard ( -- ) - " /ap-sp/keyboard" open-dev ?dup 0= if exit then >r ( r: ih ) - " kbd-reset" r@ $call-method ( failed? ) - 0= if - " keyboard" " /ap-sp/keyboard" $devalias - " mouse" " /ap-sp/mouse" $devalias - else - " keyboard" " /ec-spi/keyboard" $devalias - " mouse" " /ec-spi/mouse" $devalias - then - r> close-dev -; +devalias keyboard /ap-sp/keyboard +devalias mouse /ap-sp/mouse : console-start ( -- ) - select-keyboard install-mux-io cursor-off true to text-on? Modified: dev/olpc/kb3700/spicmd.fth ============================================================================== --- dev/olpc/kb3700/spicmd.fth Tue Oct 4 02:42:45 2011 (r2573) +++ dev/olpc/kb3700/spicmd.fth Tue Oct 4 03:02:09 2011 (r2574) @@ -491,17 +491,6 @@ drop ( ) ; -new-device - " " " 3" set-args - fload ${BP}/dev/pckbd.fth -finish-device - -new-device - " " " 4" set-args - fload ${BP}/dev/ps2mouse.fth -finish-device - - end-package \ LICENSE_BEGIN

1 0

[commit] r2573 - in cpu/arm: mmp2 olpc/1.75
by repository service 04 Oct '11

04 Oct '11

Author: wmb Date: Tue Oct 4 02:42:45 2011 New Revision: 2573 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2573 Log: OLPC XO-1.75 - trac #11095 - implemented lid switch power-off. Modified: cpu/arm/mmp2/timer.fth cpu/arm/olpc/1.75/switches.fth Modified: cpu/arm/mmp2/timer.fth ============================================================================== --- cpu/arm/mmp2/timer.fth Tue Oct 4 02:05:46 2011 (r2572) +++ cpu/arm/mmp2/timer.fth Tue Oct 4 02:42:45 2011 (r2573) @@ -168,8 +168,13 @@ then ; code wfi ( -- ) wfi c; + +defer do-lid +: lid-off ( -- ) ['] noop to do-lid ; +lid-off + : safe-idle ( -- ) can-idle? if wfi then - \ do-lid + do-lid ; ' safe-idle to stdin-idle Modified: cpu/arm/olpc/1.75/switches.fth ============================================================================== --- cpu/arm/olpc/1.75/switches.fth Tue Oct 4 02:05:46 2011 (r2572) +++ cpu/arm/olpc/1.75/switches.fth Tue Oct 4 02:42:45 2011 (r2573) @@ -36,6 +36,39 @@ ['] 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 + end-package \ LICENSE_BEGIN

1 0

[commit] r2572 - cpu/arm/olpc/1.75 dev ofw/wifi
by repository service 04 Oct '11

04 Oct '11

Author: wmb Date: Tue Oct 4 02:05:46 2011 New Revision: 2572 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2572 Log: OLPC XO-1.75 - WLAN and LED selftest - reduced the overhead of the association test part of the WLAN selftest, and eliminated the console scanning messages that occur during the WLAN LED selftest. Modified: cpu/arm/olpc/1.75/leds.fth dev/libertas.fth ofw/wifi/eapol.fth Modified: cpu/arm/olpc/1.75/leds.fth ============================================================================== --- cpu/arm/olpc/1.75/leds.fth Mon Oct 3 23:36:09 2011 (r2571) +++ cpu/arm/olpc/1.75/leds.fth Tue Oct 4 02:05:46 2011 (r2572) @@ -19,7 +19,7 @@ ols-led-ec-control ols-assy-mode-on - " /wlan" test-dev " /wlan" test-dev \ Twice for longer flashing + " /wlan:quiet" test-dev " /wlan:quiet" test-dev \ Twice for longer flashing d# 20 0 do hdd-led-on d# 100 ms hdd-led-off d# 100 ms loop ols-assy-mode-off Modified: dev/libertas.fth ============================================================================== --- dev/libertas.fth Mon Oct 3 23:36:09 2011 (r2571) +++ dev/libertas.fth Tue Oct 4 02:05:46 2011 (r2572) @@ -1865,11 +1865,14 @@ \ Normal operation should have force-open? be false. false instance value force-open? +false instance value quiet? + : parse-args ( $ -- ) false to use-promiscuous? begin ?dup while ascii , left-parse-string 2dup " debug" $= if debug-on then + 2dup " quiet" $= if true to quiet? then \ Used by LED selftest 2dup " promiscuous" $= if true to use-promiscuous? then " force" $= if true to force-open? then repeat drop @@ -2088,9 +2091,8 @@ : reset ( -- flag ) reset-nic ; -: test-association ( -- error? ) - passive-scan - " OLPCOFW" " scan-ssid?" $call-supplicant if +: test-association ( adr len -- error? ) + " OLPCOFW" " select-ssid?" $call-supplicant if " (do-associate)" $call-supplicant if \ Success " target-mac$" $call-supplicant disassociate @@ -2103,7 +2105,6 @@ \ There is no OLPCOFW access point, so we don't try associating false then - active-scan ; : (scan-wifi) ( -- error? ) @@ -2123,9 +2124,15 @@ ." ERROR: No access points seen" cr true then - else ( adr len ) - drop .ssids ( ) - test-association ( error? ) + else ( adr len ) + \ Quiet mode is for the benefit of the LEDs test, so we can flash + \ the WLAN LEDS without distracting messages appearing on the screen + quiet? if ( adr len ) + 2drop false ( error? ) + else + over .ssids ( adr len ) + test-association ( error? ) + then ( error? ) then then Modified: ofw/wifi/eapol.fth ============================================================================== --- ofw/wifi/eapol.fth Mon Oct 3 23:36:09 2011 (r2571) +++ ofw/wifi/eapol.fth Tue Oct 4 02:05:46 2011 (r2572) @@ -581,7 +581,7 @@ swap /string ( adr' len' ) ( R: ie-type ) r> (find-ie) ( adr' len' true | false ) ; -: find-ssid ( ssid$ adr -- adr' true | false ) +: find-ssid ( ssid$ scanbuf-adr -- ap-adr' true | false ) false swap ( ssid$ flag adr ) dup 3 + ( ssid$ flag 'ap ) swap 2 + c@ ( ssid$ flag 'ap #ap ) @@ -725,7 +725,7 @@ kt-wep of wep-ok? endof ( default ) pmk-ok? swap endcase - dup if ." found" else ." Keys in wifi-cfg are not valid" then cr + dup 0= if ." Keys in wifi-cfg are not valid - " then ; h# 0050.f201 constant wpa-tag @@ -777,19 +777,36 @@ valid? 0= or ; +: (select-ssid?) ( ssid$ -- found? ) + scanbuf find-ssid 0= if false exit then ( ap-adr ) + init-common-rates ( ap-adr ) + ssid-valid? 0= if false exit then ( ) + true valid! ( ) + report-associate-info ( ) + true ( found? ) +; +: select-ssid? ( volatile-scanbuf-adr,len ssid$ -- found? ) + ssid! ( volatile-scanbuf$ ) + dup /buf > if ( volatile-scanbuf$ ) + ." Scan buffer too long" cr ( volatile-scanbuf$ ) + 2drop false exit ( -- found? ) + then ( volatile-scanbuf$ ) + scanbuf swap move ( ) + ssid$ (select-ssid?) ( found? ) +; + : scan-ssid? ( ssid$ -- found? ) - dup 0= if 2drop false exit then - ssid! - ssid$ " set-ssid" $call-parent - ??cr ." Scan for: " ssid$ type space - scanbuf /buf scan 0= if ." not found" cr false exit then - debug? if scanbuf .scan then - ssid$ scanbuf find-ssid 0= if ." not found" cr false exit then - init-common-rates - ssid-valid? 0= if exit then - true valid! - report-associate-info - true + dup 0= if 2drop false exit then ( ssid$ ) + ssid! ( ) + ssid$ " set-ssid" $call-parent ( ) + ??cr ." Scan for: " ssid$ type space ( ) + scanbuf /buf scan if ( ) + debug? if scanbuf .scan then ( ) + ssid$ (select-ssid?) ( found? ) + dup if ." found" else ." failed" then cr + else ( ) + ." not found" cr false ( found? ) + then ( found? ) ; : try-scan ( -- okay? ) wifi-ssid$ scan-ssid? if true exit then

1 0

[commit] r2571 - cpu/arm/olpc/1.75
by repository service 03 Oct '11

03 Oct '11

Author: wmb Date: Mon Oct 3 23:36:09 2011 New Revision: 2571 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2571 Log: OLPC XO-1.75 - Removed some redundant code. Modified: cpu/arm/olpc/1.75/devices.fth Modified: cpu/arm/olpc/1.75/devices.fth ============================================================================== --- cpu/arm/olpc/1.75/devices.fth Mon Oct 3 23:27:28 2011 (r2570) +++ cpu/arm/olpc/1.75/devices.fth Mon Oct 3 23:36:09 2011 (r2571) @@ -4,26 +4,8 @@ \ h# 30000 +io to uart-base \ UART1 base address on MMP2 d# 26000000 to uart-clock-frequency -: init-clocks - -1 h# 51024 io! \ PMUM_CGR_PJ - everything on - h# 07 h# 15064 io! \ APBC_AIB_CLK_RST - reset, functional and APB clock on - h# 03 h# 15064 io! \ APBC_AIB_CLK_RST - release reset, functional and APB clock on - h# 13 h# 1502c io! \ APBC_UART1_CLK_RST - VCTCXO, functional and APB clock on (26 mhz) - h# 13 h# 15034 io! \ APBC_UART3_CLK_RST - VCTCXO, functional and APB clock on (26 mhz) - h# c1 h# 1e0c8 io! \ GPIO29 = af1 for UART1 RXD - h# c1 h# 1e0cc io! \ GPIO30 = af1 for UART1 TXD - h# c4 h# 1e260 io! \ GPIO115 = af4 for UART3 RXD - h# c4 h# 1e264 io! \ GPIO116 = af4 for UART3 TXD -; - -: inituarts ( -- ) - init-clocks - - h# 40 1 uart! \ Marvell-specific UART Enable bit - 3 3 uart! \ 8 bits, no parity - 7 2 uart! \ Clear and enable FIFOs - d# 115200 baud -; +\ CForth has already set up the serial port +: inituarts ( -- ) ; fload ${BP}/forth/lib/sysuart.fth \ Set console I/O vectors to UART

1 0

[commit] r2570 - cpu/arm/mmp2 dev/olpc/kb3700
by repository service 03 Oct '11

03 Oct '11

Author: wmb Date: Mon Oct 3 23:27:28 2011 New Revision: 2570 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2570 Log: OLPC XO-1.75 - Use apbc! instead of explict numeric address. Modified: cpu/arm/mmp2/devices.fth cpu/arm/mmp2/keypad.fth cpu/arm/mmp2/mfpr.fth cpu/arm/mmp2/spimaster.fth cpu/arm/mmp2/thermal.fth dev/olpc/kb3700/spicmd.fth Modified: cpu/arm/mmp2/devices.fth ============================================================================== --- cpu/arm/mmp2/devices.fth Mon Oct 3 23:17:21 2011 (r2569) +++ cpu/arm/mmp2/devices.fth Mon Oct 3 23:27:28 2011 (r2570) @@ -3,13 +3,13 @@ d# 26000000 to uart-clock-frequency : init-clocks - -1 h# 051024 io! \ PMUM_CGR_PJ - everything on - h# 07 h# 015064 io! \ APBC_AIB_CLK_RST - reset, functional and APB clock on - h# 03 h# 015064 io! \ APBC_AIB_CLK_RST - release reset, functional and APB clock on - h# 13 h# 015034 io! \ APBC_UART3_CLK_RST - VCTCXO, functional and APB clock on (26 mhz) - h# c1 h# 01e120 io! \ GPIO51 = af1 for UART3 RXD - h# c1 h# 01e124 io! \ GPIO52 = af1 for UART3 TXD - h# 1b h# 282854 io! \ SD0 clocks + -1 h# 1024 mpmu! \ PMUM_CGR_PJ - everything on + h# 07 h# 64 apbc! \ APBC_AIB_CLK_RST - reset, functional and APB clock on + h# 03 h# 64 apbc! \ APBC_AIB_CLK_RST - release reset, functional and APB clock on + h# 13 h# 34 apbc! \ APBC_UART3_CLK_RST - VCTCXO, functional and APB clock on (26 mhz) + h# c1 d# 51 af! \ GPIO51 = af1 for UART3 RXD + h# c1 d# 51 af! \ GPIO52 = af1 for UART3 TXD + h# 1b h# 54 pmua! \ SD0 clocks ; : inituarts ( -- ) Modified: cpu/arm/mmp2/keypad.fth ============================================================================== --- cpu/arm/mmp2/keypad.fth Mon Oct 3 23:17:21 2011 (r2569) +++ cpu/arm/mmp2/keypad.fth Mon Oct 3 23:27:28 2011 (r2570) @@ -2,8 +2,8 @@ purpose: Driver for Armada 610/MMP2 keypad controller : keypad-on ( -- ) - 5 h# 015018 io! \ Clock on with reset asserted - 1 h# 015018 io! \ Clock on, release reset + 5 h# 18 apbc! \ Clock on with reset asserted + 1 h# 18 apbc! \ Clock on, release reset 1 ms ; : kp! ( n offset -- ) h# 012000 + io! ; Modified: cpu/arm/mmp2/mfpr.fth ============================================================================== --- cpu/arm/mmp2/mfpr.fth Mon Oct 3 23:17:21 2011 (r2569) +++ cpu/arm/mmp2/mfpr.fth Mon Oct 3 23:27:28 2011 (r2570) @@ -1,8 +1,8 @@ purpose: Pin multiplexing for ARMADA 610 chip (no board details) : aib-unlock - h# baba h# 015068 io! \ Unlock sequence - h# eb10 h# 01506c io! + h# baba h# 68 apbc! \ Unlock sequence + h# eb10 h# 6c apbc! ; : acgr-clocks-on ( -- ) h# 0818.F33C acgr-pa io! \ Turn on all clocks Modified: cpu/arm/mmp2/spimaster.fth ============================================================================== --- cpu/arm/mmp2/spimaster.fth Mon Oct 3 23:17:21 2011 (r2569) +++ cpu/arm/mmp2/spimaster.fth Mon Oct 3 23:27:28 2011 (r2570) @@ -39,10 +39,10 @@ enable ; -: ssp1-clk-on 7 h# 015050 io! 3 h# 015050 io! ; -\ : ssp2-clk-on 7 h# 015054 io! 3 h# 015052 io! ; -\ : ssp3-clk-on 7 h# 015058 io! 3 h# 015058 io! ; -\ : ssp4-clk-on 7 h# 01505c io! 3 h# 01505c io! ; +: ssp1-clk-on 7 h# 50 apbc! 3 h# 50 apbc! ; +\ : ssp2-clk-on 7 h# 54 apbc! 3 h# 52 apbc! ; +\ : ssp3-clk-on 7 h# 58 apbc! 3 h# 58 apbc! ; +\ : ssp4-clk-on 7 h# 5c apbc! 3 h# 5c apbc! ; : wb ( byte -- ) ssp-ssdr rl! ; : rb ( -- byte ) ssp-ssdr rl@ . ; Modified: cpu/arm/mmp2/thermal.fth ============================================================================== --- cpu/arm/mmp2/thermal.fth Mon Oct 3 23:17:21 2011 (r2569) +++ cpu/arm/mmp2/thermal.fth Mon Oct 3 23:27:28 2011 (r2570) @@ -4,8 +4,8 @@ h# 013200 value thermal-base : init-thermal-sensor ( -- ) thermal-base io@ h# 400 and if exit then - 3 h# 015090 io! \ Enable clocks to thermal sensor - h# 10000 thermal-base io! \ Enable sensing + 7 h# 90 apbc! 3 h# 90 apbc! \ Enable clocks to thermal sensor + h# 10000 thermal-base io! \ Enable sensing ; \ thermal watchdog is enabled by CForth Modified: dev/olpc/kb3700/spicmd.fth ============================================================================== --- dev/olpc/kb3700/spicmd.fth Mon Oct 3 23:17:21 2011 (r2569) +++ dev/olpc/kb3700/spicmd.fth Mon Oct 3 23:27:28 2011 (r2570) @@ -114,10 +114,10 @@ enable ; -\ : ssp1-clk-on 7 h# 015050 io! 3 h# 015050 io! ; -\ : ssp2-clk-on 7 h# 015054 io! 3 h# 015052 io! ; -: ssp3-clk-on 7 h# 015058 io! 3 h# 015058 io! ; -\ : ssp4-clk-on 7 h# 01505c io! 3 h# 01505c io! ; +\ : ssp1-clk-on 7 h# 50 apbc! 3 h# 50 apbc! ; +\ : ssp2-clk-on 7 h# 54 apbc! 3 h# 52 apbc! ; +: ssp3-clk-on 7 h# 58 apbc! 3 h# 58 apbc! ; +\ : ssp4-clk-on 7 h# 5c apbc! 3 h# 5c apbc! ; : wb ( byte -- ) ssp-ssdr rl! ; \ Debugging tool : rb ( -- byte ) ssp-ssdr rl@ . ; \ Debugging tool

1 0

[commit] r2569 - dev
by repository service 03 Oct '11

03 Oct '11

Author: wmb Date: Mon Oct 3 23:17:21 2011 New Revision: 2569 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2569 Log: Libertas WLAN driver - access ssid-reset? in a way that works both from FCode and hard-compiled. Modified: dev/libertas.fth Modified: dev/libertas.fth ============================================================================== --- dev/libertas.fth Mon Oct 3 23:16:03 2011 (r2568) +++ dev/libertas.fth Mon Oct 3 23:17:21 2011 (r2569) @@ -2094,7 +2094,7 @@ " (do-associate)" $call-supplicant if \ Success " target-mac$" $call-supplicant disassociate - true to ssid-reset? + " true to ssid-reset?" ['] evaluate catch if 2drop then false else true

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

openfirmware October 2011