openfirmware

openfirmware@openfirmware.info

3007 discussions

[commit] r3597 - cpu/arm/Linux
by repository service 07 Mar '13

07 Mar '13

Author: rsmith Date: Thu Mar 7 10:10:51 2013 New Revision: 3597 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3597 Log: Revert -mlittle-endian removal in r3596 The _real_ problem was user error. I was trying to compile the arm execuatable with an x86 compiler. -mlittle-endian is a perfectly valid option for the arm-elf-gcc compiler. Thankfully its the default so the removal didn't actually cause a problem. Same sort of thing for the xinflate change in r3596 but I didn't revert that becuase it does make it clearer whats going on and that there are 2 versions of the inflate object. Modified: cpu/arm/Linux/Makefile Modified: cpu/arm/Linux/Makefile ============================================================================== --- cpu/arm/Linux/Makefile Thu Mar 7 09:42:59 2013 (r3596) +++ cpu/arm/Linux/Makefile Thu Mar 7 10:10:51 2013 (r3597) @@ -2,8 +2,7 @@ BP=../../.. -CFLAGS = -O -DARM -# -mlittle-endian +CFLAGS = -O -DARM -mlittle-endian WRTAIL = forth/wrapper WRDIR = ${BP}/${WRTAIL}

1 0

[commit] r3596 - cpu/arm/Linux
by repository service 07 Mar '13

07 Mar '13

Author: rsmith Date: Thu Mar 7 09:42:59 2013 New Revision: 3596 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3596 Log: arm/Linux/Makefile fixup for arm-elf-gcc 3.4.3 - Remove use of -mlittle-endian as it made gcc error. - Use different rules for building the two different versions of inflate.o / xinflate.o - one to use in the wrapper, the other for standalone use in OFW images. Fixes the "ld: error in inflate.o(.eh_frame); no .eh_frame_hdr table will be created" message. Modified: cpu/arm/Linux/Makefile Modified: cpu/arm/Linux/Makefile ============================================================================== --- cpu/arm/Linux/Makefile Thu Mar 7 09:17:32 2013 (r3595) +++ cpu/arm/Linux/Makefile Thu Mar 7 09:42:59 2013 (r3596) @@ -2,7 +2,8 @@ BP=../../.. -CFLAGS = -O -DARM -mlittle-endian +CFLAGS = -O -DARM +# -mlittle-endian WRTAIL = forth/wrapper WRDIR = ${BP}/${WRTAIL} @@ -13,7 +14,7 @@ OBJS = wrapper.o logger.o ${ZIPOBJS} -all: forth inflate.bin +all: forth ../build/inflate.bin # Use forth when you just need to run Forth but don't care what # native instruction set it is on. @@ -30,13 +31,13 @@ armforth.static: ${OBJS} ${CC} ${CFLAGS} ${LFLAGS} -static -o $@ ${OBJS} -inflate.lo: ${ZIPDIR}/inflate.c +xinflate.lo: ${ZIPDIR}/inflate.c ${CC} -c ${CFLAGS} -O $< -o $@ -inflate.o: inflate.lo +xinflate.o: xinflate.lo ${LD} -T inflate.ld $< -o $@ -../build/inflate.bin: inflate.o +../build/inflate.bin: xinflate.o objcopy -O binary $< $@ %.o: ${WRDIR}/%.c

1 0

[commit] r3595 - cpu/x86/Linux
by repository service 07 Mar '13

07 Mar '13

Author: wmb Date: Thu Mar 7 09:17:32 2013 New Revision: 3595 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3595 Log: x86/Linux/Makefile - use different rules for building the two different versions of inflate.o / xinflate.o - one to use in the wrapper, the other for standalone use in OFW images. Modified: cpu/x86/Linux/Makefile Modified: cpu/x86/Linux/Makefile ============================================================================== --- cpu/x86/Linux/Makefile Wed Mar 6 20:53:52 2013 (r3594) +++ cpu/x86/Linux/Makefile Thu Mar 7 09:17:32 2013 (r3595) @@ -43,13 +43,13 @@ ${CC} ${MFLAGS} -o $@ ${OBJS} ${LIBS} @ln -sf forth x86forth -inflate.lo: ${ZIPDIR}/inflate.c +xinflate.lo: ${ZIPDIR}/inflate.c ${CC} -c ${MFLAGS} -Wall -fno-stack-protector -ffreestanding -D_FORTIFY_SOURCE=0 -DNEED_BCOPY -O3 -fpic $< -o $@ -inflate.o: inflate.lo +xinflate.o: xinflate.lo ${LD} -melf_i386 -T inflate.ld $< -o $@ -../build/inflate.bin: inflate.o +../build/inflate.bin: xinflate.o objcopy -O binary $< $@ %.o: ${WRDIR}/%.c

1 0

[commit] r3594 - forth/wrapper
by repository service 06 Mar '13

06 Mar '13

Author: wmb Date: Wed Mar 6 20:53:52 2013 New Revision: 3594 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3594 Log: wrapper.c - added commentary telling another way to accomplish the same result as mprotect()ing the dictionary memory to make it executable. Modified: forth/wrapper/wrapper.c Modified: forth/wrapper/wrapper.c ============================================================================== --- forth/wrapper/wrapper.c Wed Mar 6 19:55:27 2013 (r3593) +++ forth/wrapper/wrapper.c Wed Mar 6 20:53:52 2013 (r3594) @@ -2201,6 +2201,13 @@ return 0L; #endif #if defined(__linux__) && defined(ARM) + /* There is another way to achieve the goal of making the */ + /* dictionary executable. You can add "-Wl,-z,execstack" */ + /* to the cc command line or add "-z execstack" to the ld */ + /* command line. mprotect() is perhaps more precise, making */ + /* only the dictionary executable while leaving the stack */ + /* protected, although that is probably pointless since */ + /* the whole point of this program is code injection. */ mprotect(adr, len, PROT_READ | PROT_WRITE | PROT_EXEC); __clear_cache(adr, adr+len); return 0L;

1 0

[commit] r3593 - dev/mmc/sdhci/mv8686
by repository service 06 Mar '13

06 Mar '13

Author: wmb Date: Wed Mar 6 19:55:27 2013 New Revision: 3593 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3593 Log: OLPC XO-1.5 - fixed build problem introduced by Bluetooth driver. The problem is that the bluetooth driver uses some Forth words that don't have FCode equivalents, but the WLAN driver stack is in FCode form on XO-1.5. The easy fix is to omit the bluetooth driver for XO-1.5. As a result, if you try to use an 8787 module in an XO-1.5, the Bluetooth diagnostic won't work. That doesn't violate any known use case, since the BT diag's purpose is factory testing of XO-4s. Added: dev/mmc/sdhci/mv8686/bluetooth-pkg.fth Modified: dev/mmc/sdhci/mv8686/loadpkg.fth Added: dev/mmc/sdhci/mv8686/bluetooth-pkg.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ dev/mmc/sdhci/mv8686/bluetooth-pkg.fth Wed Mar 6 19:55:27 2013 (r3593) @@ -0,0 +1,6 @@ +new-device +2 to my-space +my-space 1 reg +" bluetooth" name +fload ${BP}/dev/bluetooth/marvell-hci.fth \ Bluetooth driver +finish-device Modified: dev/mmc/sdhci/mv8686/loadpkg.fth ============================================================================== --- dev/mmc/sdhci/mv8686/loadpkg.fth Wed Mar 6 19:45:09 2013 (r3592) +++ dev/mmc/sdhci/mv8686/loadpkg.fth Wed Mar 6 19:55:27 2013 (r3593) @@ -16,10 +16,3 @@ fload ${BP}/dev/mmc/sdhci/mv8686/libertas-interface.fth \ Marvell "Libertas" common code fload ${BP}/dev/libertas.fth \ Marvell "Libertas" common code finish-device - -new-device -2 to my-space -my-space 1 reg -" bluetooth" name -fload ${BP}/dev/bluetooth/marvell-hci.fth \ Bluetooth driver -finish-device

1 0

[commit] r3592 - dev/bluetooth
by repository service 06 Mar '13

06 Mar '13

Author: wmb Date: Wed Mar 6 19:45:09 2013 New Revision: 3592 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3592 Log: Bluetooth driver - added commentary and license text; no functional change. Modified: dev/bluetooth/marvell-hci.fth Modified: dev/bluetooth/marvell-hci.fth ============================================================================== --- dev/bluetooth/marvell-hci.fth Wed Mar 6 19:42:03 2013 (r3591) +++ dev/bluetooth/marvell-hci.fth Wed Mar 6 19:45:09 2013 (r3592) @@ -1,18 +1,13 @@ +\ See license at end of file +purpose: Driver for Marvell Bluetooth Host Controller (HCI) -\ h# 00 constant config-reg \ 03 for 8688 -\ h# 02 constant host-int-mask-reg \ 04 for 8688 -\ h# 03 constant host-intstatus-reg \ 05 for 8688 -\ h# 30 constant card-status-reg \ 20 for 8688 -\ h# 40 constant sq-read-base-addr-a0-reg \ 10 for 8688 -\ h# 41 constant sq-read-base-addr-a1-reg \ 11 for 8688 -\ h# 5c constant card-revision-reg \ ?? for 8688 -\ h# 60 constant card-fw-status0-reg \ 40 for 8688 -\ h# 61 constant card-fw-status1-reg \ 41 for 8688 -\ h# 62 constant card-rx-len-reg \ 42 for 8688 -\ h# 63 constant card-rx-unit-reg \ 43 for 8688 -\ h# 78 constant ioport0-reg \ 00 for 8688 -\ h# 79 constant ioport1-reg \ 01 for 8688 -\ h# 7a constant ioport2-reg \ 02 for 8688 +\ At present, this driver is only useful for diagnostic purposes, +\ primarily supporting inquiry and scan. Infrastructure for other +\ HCI commands is present, but the overall structure for pairing +\ devices and using them is not there. + +\ Most of this is generic to all Bluetooth HCIs; +\ only a tiny fraction is Marvell-specific h# 200 value SDIO_BLOCK_SIZE @@ -55,7 +50,7 @@ cdump cr ; h# 01 set-event -: inquiry-result \ b.nresp { bdaddr b.pscan-rep-mode b.pscan-period-mode b.pscan-mode b.dev-class[3] w.clock-offset } +: inquiry-result \ b.nresp { bdaddr b.pscan-rep-mode b.pscan-period-mode b.pscan-mode b.dev-class[3] w.clock-offset } cdump cr ; h# 02 set-event @@ -979,3 +974,27 @@ \ Major: Computer 100, Phone 200, LAN AP 300, AV 400, Peripheral 500, Imaging 600, Wearable 700, Toy 800, Misc 000, Uncategorized 1f00 \ Minor: major-dependent, e.g. 204 is cell phone \ P2030 phone: 51 04 8c 68 30 2c Class: 5a0204 + +\ LICENSE_BEGIN +\ Copyright (c) 2013 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] r3591 - in dev: . mmc/sdhci/mv8686 usb2/device/wlan
by repository service 06 Mar '13

06 Mar '13

Author: wmb Date: Wed Mar 6 19:42:03 2013 New Revision: 3591 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3591 Log: OLPC - WLAN driver - fixed build problem on XO-1 introduced by recent changes to support Bluetooth. Added: dev/mmc/sdhci/mv8686/libertas-interface.fth Modified: dev/libertas.fth dev/mmc/sdhci/mv8686/loadpkg.fth dev/usb2/device/wlan/fw8388.fth dev/usb2/device/wlan/usb8388.bth dev/usb2/device/wlan/usb8388.fth Modified: dev/libertas.fth ============================================================================== --- dev/libertas.fth Wed Mar 6 19:09:26 2013 (r3590) +++ dev/libertas.fth Wed Mar 6 19:42:03 2013 (r3591) @@ -47,10 +47,10 @@ \ Override as necessary : init-buf ( -- ) - outbuf 0= if /outbuf " alloc-buffer" $call-parent to outbuf then + outbuf 0= if /outbuf alloc-buffer to outbuf then ; : free-buf ( -- ) - outbuf if outbuf /outbuf " free-buffer" $call-parent 0 to outbuf then + outbuf if outbuf /outbuf free-buffer 0 to outbuf then ; \ ======================================================================= @@ -175,7 +175,7 @@ drop : outbuf-out ( -- error? ) - outbuf dup >fw-len le-w@ " cmd-out" $call-parent + outbuf dup >fw-len le-w@ cmd-out ; @@ -608,9 +608,9 @@ ; : check-for-rx ( -- ) - " got-packet?" $call-parent if ( error | buf len type 0 ) + got-packet? if ( error | buf len type 0 ) 0= if process-rx then ( ) - " recycle-packet" $call-parent ( ) + recycle-packet ( ) then ( ) ; @@ -697,8 +697,10 @@ \ ========================================================================= : reset-wlan ( -- ) +\ XXX wlan-reset evaluate + driver-is-not-ready - " reset-host-bus" $call-parent + reset-host-bus ; : sleep ( -- ) reset-wlan ; : wake ( -- ) ; @@ -712,8 +714,15 @@ respbuf >fw-data false ; +\ Sometimes get-hw-spec fails the first time after +\ the driver is reopened with the firmware still active. +\ This has been seen with the 8388 USB version. +: retry-get-hw-spec ( -- true | adr false ) + get-hw-spec dup if drop get-hw-spec then +; + : set-fw-params ( -- ) - get-hw-spec 0= if ( adr ) + retry-get-hw-spec 0= if ( adr ) \ is 802.11n capable? dup d# 34 + le-l@ h# 800 and if @@ -1231,7 +1240,7 @@ drop d# 1000 ms \ retry while busy repeat ( adr len scan-adr scan-len err? r: chan ) r> drop ( adr len scan-adr scan-len err? ) - if 4drop false exit then ( adr len scan-adr scan-len ) + if 2drop 2drop false exit then ( adr len scan-adr scan-len ) rot min >r ( adr scan-adr r: actual ) swap r@ move ( r: actual ) r> ( actual ) @@ -1799,7 +1808,7 @@ mac-adr$ mac-adr$ broadcast-mac$ 0 h# c0 set-802.11-header h# 0002 0 +pkt-data le-w! \ Reason code: auth no longer valid packet-buf /802.11-header 2 + wrap-802.11 ( adr len ) - " data-out" $call-parent + data-out r> set-tx-ctrl ; @@ -2127,17 +2136,15 @@ repeat drop ; -\ Maybe handle this in parent's close method -: release-bus-resources ( -- ) " release-bus-resources" $call-parent ; - : open ( -- ok? ) my-args parse-args + set-parent-channel " " set-ssid \ Instance buffers aren't necessarily initially 0 - my-space " set-address" $call-parent \ Set SDIO function number if necessary opencount @ 0= if init-buf + setup-transport if free-buf false exit then ds-ready to driver-state - " multifunction?" $call-parent if init-function then + multifunction? if init-function then ?make-mac-address-property if release-bus-resources free-buf false exit then set-fw-params my-args " supplicant" $open-package to supplicant-ih @@ -2169,7 +2176,7 @@ ['] 2drop to ?process-eapol mac-off supplicant-ih ?dup if close-package 0 to supplicant-ih then - " multifunction?" $call-parent if shutdown-function then + multifunction? if shutdown-function then release-bus-resources driver-is-not-ready then @@ -2180,16 +2187,16 @@ : write-force ( adr len -- actual ) tuck ( actual adr len ) wrap-ethernet ( actual adr' len' ) - " data-out" $call-parent ( actual ) + data-out ( actual ) ; : read-force ( adr len -- actual ) - " got-packet?" $call-parent 0= if ( adr len ) + got-packet? 0= if ( adr len ) 2drop -2 exit then ( adr len [ error | buf actual type 0 ] ) if \ receive error ( adr len ) - " recycle-packet" $call-parent ( adr len ) + recycle-packet ( adr len ) 2drop -1 exit then ( adr len buf actual type ) @@ -2202,7 +2209,7 @@ 2drop -2 \ No data then ( actual ) - " recycle-packet" $call-parent ( actual ) + recycle-packet ( actual ) ; 0 instance value /packet @@ -2235,7 +2242,7 @@ " "(01 08 02 04 0b 16 0c 12 18 24 32 04 30 48 e0 ec)" ( tags-adr tags-len ) tuck 6 +pkt-data swap move ( tags-size ) packet-buf swap /802.11-header + 6 + wrap-802.11 ( adr len ) - " data-out" $call-parent + data-out ; : authenticate-reply ( -- ) @@ -2245,7 +2252,7 @@ 0 4 +pkt-data le-w! \ Status - okay packet-buf /802.11-header 6 + wrap-802.11 ( adr len ) - " data-out" $call-parent + data-out ; defer handle-data ' noop is handle-data @@ -2292,7 +2299,7 @@ packet-buf swap /802.11-header + 6 + wrap-802.11 ( len padr plen ) begin backlog 8 >= while process-mgmt-frame repeat backlog 1+ to backlog - " data-out" " $call-parent ( len ) + data-out ( len ) throttle ; Added: dev/mmc/sdhci/mv8686/libertas-interface.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ dev/mmc/sdhci/mv8686/libertas-interface.fth Wed Mar 6 19:42:03 2013 (r3591) @@ -0,0 +1,14 @@ +: alloc-buffer ( len -- adr ) " alloc-buffer" $call-parent ; +: free-buffer ( adr len -- ) " free-buffer" $call-parent ; +: cmd-out ( adr len -- ) " cmd-out" $call-parent ; +: data-out ( adr len -- ) " data-out" $call-parent ; +: got-packet? ( -- false | error true | buf len type 0 true ) " got-packet?" $call-parent ; +: recycle-packet ( -- ) " recycle-packet" $call-parent ; +: reset-host-bus ( -- ) " reset-host-bus" $call-parent ; +: data-out ( adr len -- ) " data-out" $call-parent ; +: release-bus-resources ( -- ) " release-bus-resources" $call-parent ; +: multifunction? ( -- flag ) " multifunction?" $call-parent ; +: set-parent-channel ( -- ) my-space " set-address" $call-parent ; +: setup-transport ( -- error? ) false ; \ Done by parent + +\ : x-cmd-out ( adr len -- ) /fw-transport + cmd-out ; Modified: dev/mmc/sdhci/mv8686/loadpkg.fth ============================================================================== --- dev/mmc/sdhci/mv8686/loadpkg.fth Wed Mar 6 19:09:26 2013 (r3590) +++ dev/mmc/sdhci/mv8686/loadpkg.fth Wed Mar 6 19:42:03 2013 (r3591) @@ -13,6 +13,7 @@ new-device 1 to my-space my-space 1 reg +fload ${BP}/dev/mmc/sdhci/mv8686/libertas-interface.fth \ Marvell "Libertas" common code fload ${BP}/dev/libertas.fth \ Marvell "Libertas" common code finish-device Modified: dev/usb2/device/wlan/fw8388.fth ============================================================================== --- dev/usb2/device/wlan/fw8388.fth Wed Mar 6 19:09:26 2013 (r3590) +++ dev/usb2/device/wlan/fw8388.fth Wed Mar 6 19:42:03 2013 (r3591) @@ -84,11 +84,11 @@ : wait-cmd-fw-dl-ack ( -- acked? ) d# 100 0 do ( ) - got-packet? if ( error | buf len type 0 ) + bulk-in-ready? if ( error | buf len type 0 ) if ( ) false ( acked? ) - else ( buf len type ) - drop cmd-fw-dl-ok? ( acked? ) + else ( buf len ) + cmd-fw-dl-ok? ( acked? ) then ( acked? ) recycle-packet ( acked? ) unloop exit @@ -99,12 +99,12 @@ ; : download-fw-init ( -- ) - fw-buf /boot-cmd erase - boot-magic fw-buf >boot-magic le-l! - cmd-fw-dl fw-buf >boot-cmd c! + outbuf /boot-cmd erase + boot-magic outbuf >boot-magic le-l! + cmd-fw-dl outbuf >boot-cmd c! 5 0 do - fw-buf /boot-cmd packet-out drop + outbuf /boot-cmd packet-out drop wait-cmd-fw-dl-ack if leave then loop ; @@ -118,8 +118,8 @@ : wait-fw-dl-ack ( -- ) d# 500 0 do ( ) - got-packet? if ( error | buf len tupe 0 ) - 0= if drop process-dl-resp then ( ) + bulk-in-ready? if ( error | buf len 0 ) + 0= if process-dl-resp then ( ) recycle-packet ( ) leave then ( ) @@ -130,11 +130,11 @@ : (download-fw) ( adr len -- ) bounds begin ( end start ) dl-seq++ \ Increment sequence number - dup fw-buf /dl-header move \ Move header to outbuf - dl-seq fw-buf >dl-seq le-l! \ Add sequence number to outbuf - dup /dl-header + fw-buf >dl-data 2 pick >dl-len le-l@ dup >r move - \ Move payload to fw-buf - fw-buf r@ /dl-header + 4 + packet-out drop + dup outbuf /dl-header move \ Move header to outbuf + dl-seq outbuf >dl-seq le-l! \ Add sequence number to outbuf + dup /dl-header + outbuf >dl-data 2 pick >dl-len le-l@ dup >r move + \ Move payload to outbuf + outbuf r@ /dl-header + 4 + packet-out drop \ Send command wait-fw-dl-ack \ Wait for ACK r> + /dl-header + \ Advance pointer @@ -180,11 +180,16 @@ ; : load-all-fw ( -- error? ) - d# 2048 dma-alloc to fw-buf + fw-loaded? if false exit then wlan-fw find-fw ( adr len ) - dup if download-fw else 2drop true then - fw-buf d# 2048 dma-free + dup if download-fw else 2drop true then ( error? ) + dup 0= to fw-loaded? ( error? ) ; +: (setup-transport) ( -- error? ) + setup-bus-io ?dup if exit then + load-all-fw dup if release-bus-resources then ( error? ) +; +' (setup-transport) to setup-transport \ LICENSE_BEGIN \ Copyright (c) 2007 FirmWorks Modified: dev/usb2/device/wlan/usb8388.bth ============================================================================== --- dev/usb2/device/wlan/usb8388.bth Wed Mar 6 19:09:26 2013 (r3590) +++ dev/usb2/device/wlan/usb8388.bth Wed Mar 6 19:42:03 2013 (r3591) @@ -13,8 +13,8 @@ fload ${BP}/dev/usb2/device/common.fth \ USB device driver common routines fload ${BP}/dev/usb2/device/wlan/common.fth \ Ethernet common variables and routines fload ${BP}/dev/usb2/device/wlan/usb8388.fth \ USB I/O interface for Marvell 8388 -fload ${BP}/dev/usb2/device/wlan/fw8388.fth \ Marvell firmware download for USB fload ${BP}/dev/libertas.fth \ Marvell "Libertas" common code +fload ${BP}/dev/usb2/device/wlan/fw8388.fth \ Marvell firmware download for USB \ fload ${BP}/dev/usb2/device/wlan/wlan.fth \ External interface methods end0 Modified: dev/usb2/device/wlan/usb8388.fth ============================================================================== --- dev/usb2/device/wlan/usb8388.fth Wed Mar 6 19:09:26 2013 (r3590) +++ dev/usb2/device/wlan/usb8388.fth Wed Mar 6 19:42:03 2013 (r3591) @@ -70,6 +70,7 @@ ?dup 0= if ( dadr dlen ) decode-header 0 ( dadr dlen type 0 ) then ( error | buf len 0 ) + true else ( ) false ( false ) then ( false | error true | buf len 0 true ) @@ -95,7 +96,8 @@ : release-bus-resources ( -- ) end-bulk-in end-out-ring ; -: reset-host-bus ( -- ) " wlan-reset" evaluate ; +false value fw-loaded? +: reset-host-bus ( -- ) " wlan-reset" evaluate false to fw-loaded? ; 0 value vid 0 value pid @@ -108,8 +110,13 @@ ; init -XXX need open and close methods and open needs to call setup-bus-io -XXX need alloc-buffer and free-buffer method + +: open ( -- okay? ) setup-bus-io 0= ; +: close ( -- ) ; +: alloc-buffer ( len -- adr ) /fw-transport + dma-alloc /fw-transport + ; +: free-buffer ( adr len -- ) /fw-transport negate /string dma-free ; + +defer setup-transport ( -- error? ) ' true to setup-transport \ LICENSE_BEGIN \ Copyright (c) 2009 FirmWorks

1 0

[commit] r3590 - cpu/arm/olpc/4.0
by repository service 06 Mar '13

06 Mar '13

Author: rsmith Date: Wed Mar 6 19:09:26 2013 New Revision: 3590 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3590 Log: Q7B23 Modified: cpu/arm/olpc/4.0/fw-version.fth Modified: cpu/arm/olpc/4.0/fw-version.fth ============================================================================== --- cpu/arm/olpc/4.0/fw-version.fth Tue Mar 5 06:25:21 2013 (r3589) +++ cpu/arm/olpc/4.0/fw-version.fth Wed Mar 6 19:09:26 2013 (r3590) @@ -1,7 +1,7 @@ \ The overall firmware revision macro: FW_PREFIX Q7 macro: FW_MAJOR B -macro: FW_MINOR 22 +macro: FW_MINOR 23 \ Create a 2-character build/fw-suffix file to personalize your test builds " fw-suffix" $file-exists? [if]

1 0

[commit] r3589 - cpu/arm/mmp3
by repository service 05 Mar '13

05 Mar '13

Author: quozl Date: Tue Mar 5 06:25:21 2013 New Revision: 3589 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3589 Log: OLPC XO-4 - fix scaling of battery temperature when using .thermal , a regression introduced in r3400. Add a command for testing the low range of the first sensor. Remove some dead code. Modified: cpu/arm/mmp3/thermal.fth Modified: cpu/arm/mmp3/thermal.fth ============================================================================== --- cpu/arm/mmp3/thermal.fth Tue Mar 5 06:05:16 2013 (r3588) +++ cpu/arm/mmp3/thermal.fth Tue Mar 5 06:25:21 2013 (r3589) @@ -133,21 +133,32 @@ dup ts@ h# 0800.0000 invert and swap ts! ; -: ts-watchdog-enable ( n -- ) - dup ts@ h# 0400.0d00 or swap ts! \ 100.5C +h# 0400.0d00 value ts-watchdog-mask \ 100.5C +: ts-watchdog-on ( n -- ) + dup ts@ ts-watchdog-mask or swap ts! +; + +: ts-watchdog-off ( n -- ) + dup ts@ ts-watchdog-mask invert and swap ts! ; : init-thermal-sensor ( -- ) ts-clocks 0 ts-range-high - 0 ts-watchdog-enable - \ WDT reset will cause system hang, per errata 472630, - \ but on XO-4 A2 and XO-4 B1 is detected by EC + 0 ts-watchdog-on + \ WDT reset causes SoC hang, per errata 472630, on XO-4 A2 and B1, + \ but is detected and handled by EC 1 ts-range-low 2 ts-range-low 3 0 do i ts-auto-read loop ; +\ for testing, swing our normally highrange sensor back to lowrange +: 0ts-low + 0 ts-watchdog-off + 0 ts-range-low +; + \ read and average the two sensors on lowrange duty : cpu-temperature ( -- celcius ) 1 ts-read gc>c @@ -171,7 +182,7 @@ 1 ts@ gc>c .c.c \ FIXME: show <n and >n too here 2 ts@ gc>c .c.c ." cpu: " cpu-temperature .c - ." battery: " bat-temp .c + ." battery: " .bat-temp ." C " pop-base ; @@ -211,7 +222,6 @@ i tsense-regx-bits count type space then loop cr - \ dup d# 12 rshift h# 7ff and dup if 4 spaces ." reserved=" . cr else drop then 4 spaces dup 8 rshift h# f and ." wdog_tshld=" .tc cr 4 spaces dup 4 rshift h# f and ." int_tshld=" .tc cr 4 spaces dup h# f and ." temp_value=" .tc cr @@ -248,27 +258,6 @@ h# 0c20.0000 h# 03.b004 io! \ lowrange, en_wdog, auto_read_en, wdog_tshld 26C ; - -[ifdef] notyet \ FIXME -: test-thermal - .thermal cr - - \ save the threshold set by cforth - thermal-base 4 + io@ >r - - \ temporarily set the threshold close to current value - thermal-base io@ h# 3ff and 8 + wd-thresh! - - begin - (cr .thermal kill-line d# 500 ms key? - until key drop cr - - \ restore the threshold - r> wd-thresh! - .thermal cr -; -[then] - stand-init: Thermal sensor init-thermal-sensor ;

1 0

[commit] r3588 - cpu/x86/pc/olpc
by repository service 05 Mar '13

05 Mar '13

Author: quozl Date: Tue Mar 5 06:05:16 2013 New Revision: 3588 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3588 Log: OLPC - change name of flag variable, to avoid having it look like a verb, in r3584. Modified: cpu/x86/pc/olpc/setwp.fth Modified: cpu/x86/pc/olpc/setwp.fth ============================================================================== --- cpu/x86/pc/olpc/setwp.fth Tue Mar 5 06:04:54 2013 (r3587) +++ cpu/x86/pc/olpc/setwp.fth Tue Mar 5 06:05:16 2013 (r3588) @@ -71,13 +71,13 @@ [then] \ Write mfg data from RAM to FLASH -true value commit-tag -: tags( false to commit-tag ; +true value autocommit? +: tags( false to autocommit? ; : )tags ?sync-ec spi-reprogrammed ; : put-mfg-data ( -- ) spi-start spi-identify (put-mfg-data) - commit-tag if )tags then + autocommit? if )tags then ; \ Find RAM address of tag, given FLASH address

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

openfirmware