openfirmware

openfirmware@openfirmware.info

3007 discussions

[commit] r3370 - cpu/arm/olpc/4.0
by repository service 13 Oct '12

13 Oct '12

Author: wmb Date: Sat Oct 13 03:44:30 2012 New Revision: 3370 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3370 Log: OLPC XO-4 - reverted bundle suffix from 5 to 4, as we are not going to distinguish between A and B revs of XO-4 in the bundle files. Modified: cpu/arm/olpc/4.0/config.fth Modified: cpu/arm/olpc/4.0/config.fth ============================================================================== --- cpu/arm/olpc/4.0/config.fth Sat Oct 13 03:42:23 2012 (r3369) +++ cpu/arm/olpc/4.0/config.fth Sat Oct 13 03:44:30 2012 (r3370) @@ -23,7 +23,7 @@ : model$ " olpc,XO-4.0" ; : compatible$ " olpc,xo-cl4" ; : ec-platform$ ( -- adr len ) " 7" ; -: bundle-suffix$ ( -- adr len ) " 5" ; +: bundle-suffix$ ( -- adr len ) " 4" ; d# 10001 constant machine-type \ Backwards compatibility with non-device-tree kernel

1 0

[commit] r3369 - cpu/x86/pc/olpc/via
by repository service 13 Oct '12

13 Oct '12

Author: wmb Date: Sat Oct 13 03:42:23 2012 New Revision: 3369 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3369 Log: OLPC - fixed a possible unitialized buffer address in fs-update. Modified: cpu/x86/pc/olpc/via/fsupdate.fth Modified: cpu/x86/pc/olpc/via/fsupdate.fth ============================================================================== --- cpu/x86/pc/olpc/via/fsupdate.fth Sat Oct 13 03:41:13 2012 (r3368) +++ cpu/x86/pc/olpc/via/fsupdate.fth Sat Oct 13 03:42:23 2012 (r3369) @@ -72,6 +72,7 @@ also nand-commands definitions : zblocks: ( "eblock-size" "#eblocks" ... -- ) + load-base to data-buffer ?compare-spec-line get-hex# to /nand-block get-hex# to #image-eblocks @@ -84,8 +85,7 @@ \ Separate the two buffers by enough space for both the compressed \ and uncompressed copies of the data. 4x is overkill, but there \ is plenty of space at load-base - load-base to dma-buffer - load-base /nand-block 4 * + to data-buffer + load-base /nand-block 4 * + to dma-buffer /nand-block /nand-page / to nand-pages/block t-update \ Handle possible timer rollover ;

1 0

[commit] r3368 - cpu/arm/mmp2
by repository service 13 Oct '12

13 Oct '12

Author: wmb Date: Sat Oct 13 03:41:13 2012 New Revision: 3368 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3368 Log: OLPC XO-4 - additional info in device tree for the interrupt controller node on MMP3. Modified: cpu/arm/mmp2/irq.fth Modified: cpu/arm/mmp2/irq.fth ============================================================================== --- cpu/arm/mmp2/irq.fth Sat Oct 13 03:40:00 2012 (r3367) +++ cpu/arm/mmp2/irq.fth Sat Oct 13 03:41:13 2012 (r3368) @@ -5,7 +5,12 @@ " interrupt-controller" device-name \ my-address my-space h# 400 reg +[ifdef] mmp3 + h# d4282000 encode-int h# 1000 encode-int encode+ + h# d4284000 encode-int encode+ h# 100 encode-int encode+ " reg" property +[else] my-address my-space h# 1000 reg +[then] 0 value base-adr d# 64 constant #levels @@ -46,6 +51,8 @@ : close ( -- ) ; " mrvl,mmp2-intc" " compatible" string-property +[ifdef] mmp3 " mrvl,mmp3-intc" +compatible [then] + 1 " #address-cells" integer-property 1 " #size-cells" integer-property : encode-unit ( phys.. -- str ) push-hex (u.) pop-base ; @@ -97,100 +104,6 @@ [then] h# 128 h# 11c d# 48 d# 24 make-mux-node \ DMA mux - 16 PDMA, 4 ADMA, 2 VDMA channels -0 [if] -new-device - " interrupt-controller" name - " mrvl,mmp2-mux-intc" +compatible - - 0 0 - h# 150 encode-int encode+ 4 encode-int encode+ - h# 168 encode-int encode+ 4 encode-int encode+ " reg" property - \ h# 150 " mrvl,intc-status" integer-property - \ h# 168 " mrvl,intc-mask" integer-property - - 4 " interrupts" integer-property - d# 2 " mrvl,intc-nr-irqs" integer-property - \ 0: USB_CHARGER 1: PMIC -finish-device - -new-device - " interrupt-controller" name - " mrvl,mmp2-mux-intc" +compatible - - 0 0 - h# 154 encode-int encode+ 4 encode-int encode+ - h# 16c encode-int encode+ 4 encode-int encode+ " reg" property - - 5 " interrupts" integer-property - d# 2 " mrvl,intc-numbers" integer-property - d# 1 " mrvl,clr-mfp-irq" integer-property - \ 0: RTC_ALARM 1: RTC -finish-device - -new-device - " interrupt-controller" name - - " mrvl,mmp2-mux-intc" +compatible - - 0 0 - h# 180 encode-int encode+ 4 encode-int encode+ - h# 17c encode-int encode+ 4 encode-int encode+ " reg" property - - d# 9 " interrupts" integer-property - d# 3 " mrvl,intc-numbers" integer-property - \ 0:KPC (keypad) 1:ROT (rotary) 2: TBALL (trackball) - \ h# 15c " mrvl,intc-status" integer-property - \ h# 174 " mrvl,intc-mask" integer-property -finish-device - -new-device - " interrupt-controller" name - " mrvl,mmp2-mux-intc" +compatible - - 0 0 - h# 158 encode-int encode+ 4 encode-int encode+ - h# 170 encode-int encode+ 4 encode-int encode+ " reg" property - - d# 17 " interrupts" integer-property - d# 5 " mrvl,intc-numbers" integer-property - \ 0: TWSI2 1: TWSI3 2: TWSI4 3: TWSI5 4: TWSI6 -finish-device - -new-device - " interrupt-controller" name - - " mrvl,mmp2-mux-intc" +compatible - - 0 0 - h# 15c encode-int encode+ 4 encode-int encode+ - h# 174 encode-int encode+ 4 encode-int encode+ " reg" property - \ h# 15c " mrvl,intc-status" integer-property - \ h# 174 " mrvl,intc-mask" integer-property - - d# 35 " interrupts" integer-property - d# 15 " mrvl,intc-numbers" integer-property - \ 0: PERF 1: L2_PA_ECC 2: L2_ECC 3: L2_UECC 4: DDR - \ 5: FABRIC0_TO 6: FABRIC1_TO 7: FABRIC2_TO 8: resv 9: THERMAL - \ 10: MAIN_PMU 11: WDT2 12: CORESIGHT 13: COMMTX 14: COMMRX -finish-device - -new-device - " interrupt-controller" name - 0 0 " interrupt-controller" property - " mrvl,mmp2-mux-intc" +compatible - - 0 0 - h# 160 encode-int encode+ 4 encode-int encode+ - h# 178 encode-int encode+ 4 encode-int encode+ " reg" property - - d# 51 " interrupts" integer-property - d# 2 " mrvl,intc-numbers" integer-property - \ 0:HSI_CAWAKE 1:MIPI_HSI_INT1 - \ h# 15c " mrvl,intc-status" integer-property - \ h# 174 " mrvl,intc-mask" integer-property -finish-device -[then] - end-package \ LICENSE_BEGIN

1 0

[commit] r3367 - cpu/x86
by repository service 13 Oct '12

13 Oct '12

Author: wmb Date: Sat Oct 13 03:40:00 2012 New Revision: 3367 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3367 Log: x86 kernel - added bscan code word used by new substring variant. Modified: cpu/x86/kerncode.fth Modified: cpu/x86/kerncode.fth ============================================================================== --- cpu/x86/kerncode.fth Sat Oct 13 03:30:13 2012 (r3366) +++ cpu/x86/kerncode.fth Sat Oct 13 03:40:00 2012 (r3367) @@ -657,6 +657,30 @@ 2 # cx shl cx push c; +\ Find the first occurence of bvalue, returning the residual string +code bscan ( adr1 len1 char -- adr' len' ) + si dx mov + cld + bx pop \ bx: char + cx pop \ cx: count + si pop \ si: adr + cx cx or 0<> if + begin + al lods + bl al cmp + loopne + = if + si dec si push ( adr' ) + cx inc cx push ( adr' len' ) + dx si mov + next + then + then + si push ( adr' ) + cx push ( adr' len' ) + dx si mov +c; + code noop (s -- ) c; code n->l (s n.unsigned -- l ) c;

1 0

[commit] r3366 - cpu/x86/pc/olpc ofw/core
by repository service 13 Oct '12

13 Oct '12

Author: wmb Date: Sat Oct 13 03:30:13 2012 New Revision: 3366 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3366 Log: OLPC trac #12106 and #12181 - inflate initrd images from inside a .zip bundle. Modified: cpu/x86/pc/olpc/security.fth ofw/core/infltdi.fth Modified: cpu/x86/pc/olpc/security.fth ============================================================================== --- cpu/x86/pc/olpc/security.fth Sat Oct 13 01:08:50 2012 (r3365) +++ cpu/x86/pc/olpc/security.fth Sat Oct 13 03:30:13 2012 (r3366) @@ -796,7 +796,7 @@ " RD found - " ?lease-debug img$ sig$ sha-valid? if show-unlock - img$ place-ramdisk + img$ $inflated? drop place-ramdisk exit else show-unlock Modified: ofw/core/infltdi.fth ============================================================================== --- ofw/core/infltdi.fth Sat Oct 13 01:08:50 2012 (r3365) +++ ofw/core/infltdi.fth Sat Oct 13 03:30:13 2012 (r3366) @@ -51,12 +51,27 @@ ; ' try-inflate to ?inflate +\ Inflates the image at adr len if it is compressed. +\ The uncompressed image is placed after the compressed image in memory, +\ so sufficient space must be available there. In practice, this +\ usually means that adr should be in the region beginning at load-base . + +: $inflated? ( adr len -- adr' len' true | adr len false ) + over " "(1f8b08)" comp 0= if ( adr len ) + over + 4 round-up tuck ( adr+len adr adr+len ) + inflate true ( adr' len' true ) + else ( adr len ) + false ( adr len false ) + then +; : (?inflate-loaded) ( -- ) - load-base " "(1f8b08)" comp 0= if - load-base loaded + tuck inflate !load-size ( infl-adr ) - loaded move ( ) + loaded $inflated? if ( adr len ) + !load-size loaded move ( ) + else ( adr len ) + 2drop ( ) then ; + ' (?inflate-loaded) to ?inflate-loaded headers \ LICENSE_BEGIN

1 0

[commit] r3365 - dev
by repository service 12 Oct '12

12 Oct '12

Author: wmb Date: Sat Oct 13 01:08:50 2012 New Revision: 3365 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3365 Log: Libertas WLAN driver - changed "0 [if]" to "[ifdef] notdef" because the former doesn't work the way you think when tokenizing FCode. The problem is that the tokenizer emits an FCode for the "0", so the compile-time "[if]" doesn't see a number on the stack. Modified: dev/libertas.fth Modified: dev/libertas.fth ============================================================================== --- dev/libertas.fth Fri Oct 12 08:28:22 2012 (r3364) +++ dev/libertas.fth Sat Oct 13 01:08:50 2012 (r3365) @@ -793,7 +793,7 @@ respbuf >fw-data 4 + le-l@ ; -0 [if] +[ifdef] notdef : reg-access! ( n reg cmd -- ) 8 swap prepare-cmd ACTION_SET +xw @@ -812,7 +812,7 @@ : mac-reg@ ( reg -- n ) 19 ( CMD_MAC_REG_ACCESS ) reg-access@ ; -0 [if] +[ifdef] notdef : bbp-reg! ( n reg -- ) 1a ( CMD_BBP_REG_ACCESS ) reg-access! ;

1 0

[commit] r3364 - cpu/arm/olpc cpu/x86/pc/olpc dev/olpc/spiflash
by repository service 12 Oct '12

12 Oct '12

Author: quozl Date: Fri Oct 12 08:28:22 2012 New Revision: 3364 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3364 Log: OLPC - rewrite SPI and EC flash animation scale calculation following review Modified: cpu/arm/olpc/build-fw.fth cpu/arm/olpc/edi.fth cpu/x86/pc/olpc/gui.fth cpu/x86/pc/olpc/security.fth dev/olpc/spiflash/spiui.fth Modified: cpu/arm/olpc/build-fw.fth ============================================================================== --- cpu/arm/olpc/build-fw.fth Fri Oct 12 00:55:19 2012 (r3363) +++ cpu/arm/olpc/build-fw.fth Fri Oct 12 08:28:22 2012 (r3364) @@ -853,8 +853,7 @@ ." Skipping EC reflash, not enough power" cr d# 1000 ms else - show-reflash - ['] show-reflash-dot to edi-progress + jots ['] jot to edi-progress update-ec-flash then then Modified: cpu/arm/olpc/edi.fth ============================================================================== --- cpu/arm/olpc/edi.fth Fri Oct 12 00:55:19 2012 (r3363) +++ cpu/arm/olpc/edi.fth Fri Oct 12 08:28:22 2012 (r3364) @@ -50,7 +50,7 @@ \ end KB9010 stuff... d# 128 constant /flash-page -defer edi-progress ' drop to edi-progress ( n -- ) +defer edi-progress ' 2drop to edi-progress ( offset size -- ) : edi-cmd,adr ( offset cmd -- ) \ Send command plus 3 address bytes spi-cs-on ( offset cmd ) @@ -195,11 +195,6 @@ wait-flash-busy ( ) ; -: .edi-progress ( n -- ) - /ec-flash h# 8000 > if 1 else 0 then rshift ( dot# ) - edi-progress ( ) -; - : edi-program-flash ( adr len offset -- ) cr ( adr len offset ) swap 0 ?do ( adr offset ) @@ -208,7 +203,7 @@ dup i + erase-page ( adr offset ) over i + over i + edi-program-page ( adr offset ) then ( adr offset ) - i .edi-progress ( adr offset ) + i /ec-flash edi-progress ( adr offset ) /flash-page +loop ( adr offset ) 2drop ( ) ; Modified: cpu/x86/pc/olpc/gui.fth ============================================================================== --- cpu/x86/pc/olpc/gui.fth Fri Oct 12 00:55:19 2012 (r3363) +++ cpu/x86/pc/olpc/gui.fth Fri Oct 12 08:28:22 2012 (r3364) @@ -390,9 +390,13 @@ d# 175 d# 790 ?adjust-y to icon-xy " sad" show-icon ; -d# 834 value bar-y +d# 32 value #dots +d# 820 value bar-y d# 150 value bar-x +d# 1200 d# 26 - value bar-x-last 0 value dot-adr +0 value dot-spacing +0 value last-dot# : read-dot ( -- ) \ rom: is unavailable during reflash 0 to dot-adr 0 0 to icon-xy ( ) @@ -400,26 +404,34 @@ prep-565 4drop to dot-adr ( ) ; -: show-reflash ( -- ) \ bottom left corner, chip and progress dots +: jots ( -- ) \ bottom left corner, chip and progress dots d# 25 d# 772 set-icon-xy " spi" show-icon - d# 992 bar-x + bar-y set-icon-xy " yellowdot" show-icon + bar-x-last bar-y set-icon-xy " yellowdot" show-icon read-dot + -1 to last-dot# + bar-x-last bar-x - #dots / to dot-spacing ; -: show-reflash-dot ( n -- ) \ n to vary h# 0 to h# 8000 - dup h# 400 mod 0= if ( n ) - dot-adr 0= if drop exit then ( n ) - dot-adr swap h# 20 / bar-x + bar-y ( adr x y ) - image-width image-height ( adr x y w h ) - " draw-transparent-rectangle" $call-screen +: jot ( offset size -- ) + dot-adr 0= if 2drop exit then ( offset size ) + #dots swap */ ( dot# ) + dup last-dot# <> if ( dot# ) + dup to last-dot# ( dot# ) + dot-adr swap ( adr dot# ) + dot-spacing * bar-x + bar-y ( adr x y ) + image-width image-height ( adr x y w h ) + " draw-transparent-rectangle" $call-screen ( ) else drop then ; 0 [if] -: test-reflash-dot - page show-reflash t( h# 8000 0 do i show-reflash-dot h# 80 +loop )t +: test-jots-flash \ XO-4 B1 13ms + page jots t( /flash 0 do i /flash jot /flash-page +loop )t +; +: test-jots-ec \ XO-4 B1 3ms + page jots t( /ec-flash 0 do i /ec-flash jot /flash-page +loop )t ; [then] Modified: cpu/x86/pc/olpc/security.fth ============================================================================== --- cpu/x86/pc/olpc/security.fth Fri Oct 12 00:55:19 2012 (r3363) +++ cpu/x86/pc/olpc/security.fth Fri Oct 12 08:28:22 2012 (r3364) @@ -1006,7 +1006,7 @@ ec-indexed-io-off? if visible - show-reflash + jots ." Restarting to enable SPI FLASH writing." cr d# 3000 ms ec-ixio-reboot @@ -1016,8 +1016,7 @@ \ Latch alternate? flag for next startup alternate? if [char] A h# 82 cmos! then - show-reflash - ['] show-reflash-dot to spi-progress + jots ['] jot to spi-progress reflash \ Should power-off and reboot show-x " Reflash returned, unexpectedly" .security-failure Modified: dev/olpc/spiflash/spiui.fth ============================================================================== --- dev/olpc/spiflash/spiui.fth Fri Oct 12 00:55:19 2012 (r3363) +++ dev/olpc/spiflash/spiui.fth Fri Oct 12 08:28:22 2012 (r3364) @@ -8,12 +8,7 @@ h# 4000 constant /chunk \ Convenient sized piece for progress reports -defer spi-progress ' drop to spi-progress ( n -- ) - -: .progress ( offset -- ) - /flash h# 10.0000 > if 6 else 5 then rshift ( dot# ) - dup spi-progress h# 400 + spi-progress ( ) -; +defer spi-progress ' 2drop to spi-progress ( offset size -- ) : write-flash-range ( adr end-offset start-offset -- ) ." Writing" cr @@ -31,7 +26,7 @@ i flash-erase-block dup /flash-block i flash-write ( adr ) then - i .progress ( adr ) + i /flash spi-progress ( adr ) /flash-block + ( adr' ) /flash-block +loop ( adr ) cr drop ( ) @@ -196,7 +191,7 @@ [then] \ Don't write the block containing the manufacturing data - mfg-data-offset .progress + mfg-data-offset /flash spi-progress flash-buf mfg-data-end-offset + /flash mfg-data-end-offset write-flash-range \ Write last part ; @@ -221,7 +216,7 @@ write-firmware verify-firmware then - /flash .progress + /flash dup spi-progress flash-write-disable else .verify-msg

1 0

[commit] r3363 - dev
by repository service 11 Oct '12

11 Oct '12

Author: wmb Date: Fri Oct 12 00:55:19 2012 New Revision: 3363 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3363 Log: WLAN - fix test-antenna 'a' command Modified: dev/libertas.fth Modified: dev/libertas.fth ============================================================================== --- dev/libertas.fth Fri Oct 12 00:53:24 2012 (r3362) +++ dev/libertas.fth Fri Oct 12 00:55:19 2012 (r3363) @@ -2282,11 +2282,16 @@ : reset ( -- flag ) reset-nic ; +: do-disassociate ( -- ) + " target-mac$" $call-supplicant disassociate +; + +\ adr len is the result of (scan) - a list of APs and their characteristics : test-association ( adr len -- error? ) - " OLPCOFW" " select-ssid?" $call-supplicant if - " (do-associate)" $call-supplicant if + " OLPCOFW" " select-ssid?" $call-supplicant if ( ) + " (do-associate)" $call-supplicant if ( ) \ Success - " target-mac$" $call-supplicant disassociate + do-disassociate " true to ssid-reset?" ['] evaluate catch if 2drop then false else @@ -2332,6 +2337,11 @@ : scan-wifi ( -- ) (scan-wifi) drop ; +: reassociate ( -- ) + do-disassociate + do-associate if ." succeeded" else ." failed" then cr +; + : .rssi ( snr nf -- ) 2dup swap + ." rssi" 4 .r ( snr nf ) ." snr" 3 .r ." nf" 4 .r ( ) @@ -2422,7 +2432,7 @@ then ; -: ta-a ." associate " close open drop ; +: ta-a ." associate " reassociate ; : test-antenna ( -- ) ta-init

1 0

[commit] r3362 - dev/mmc/sdhci
by repository service 11 Oct '12

11 Oct '12

Author: wmb Date: Fri Oct 12 00:53:24 2012 New Revision: 3362 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3362 Log: SDHCI - fixed ok copy int:\foo int:\bar which was hanging Modified: dev/mmc/sdhci/slot.fth Modified: dev/mmc/sdhci/slot.fth ============================================================================== --- dev/mmc/sdhci/slot.fth Thu Oct 11 09:50:31 2012 (r3361) +++ dev/mmc/sdhci/slot.fth Fri Oct 12 00:53:24 2012 (r3362) @@ -2,12 +2,22 @@ 0 " #address-cells" integer-property 0 " #size-cells" integer-property +[ifdef] my-clock-on +0 value open-count +[then] + : open - [ifdef] my-clock-on my-clock-on [then] +[ifdef] my-clock-on + open-count 0= if my-clock-on then + open-count 1+ to open-count +[then] true ; : close - [ifdef] my-clock-off my-clock-off [then] +[ifdef] my-clock-off + open-count 1 = if my-clock-off then + open-count 1- 0 max to open-count +[then] ; : r/w-blocks " r/w-blocks" $call-parent ;

1 0

[commit] r3361 - dev
by repository service 11 Oct '12

11 Oct '12

Author: quozl Date: Thu Oct 11 09:50:31 2012 New Revision: 3361 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3361 Log: OLPC WLAN driver - report 802.11n firmware capability when present, tested on XO-4 B1 with 8686 and 8787 Modified: dev/libertas.fth Modified: dev/libertas.fth ============================================================================== --- dev/libertas.fth Thu Oct 11 08:03:46 2012 (r3360) +++ dev/libertas.fth Thu Oct 11 09:50:31 2012 (r3361) @@ -646,7 +646,8 @@ ." 802.11" dup h# 400 and if ." a" then dup h# 100 and if ." b" then - dup h# 200 and if ." g" then ." ;" + dup h# 200 and if ." g" then + dup h# 800 and if ." n" then ." ;" dup h# 1 and if ." WPA;" then dup h# 2 and if ." PS;" then dup h# 8 and if ." EEPROM does not exit;" then

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

openfirmware