openfirmware

openfirmware@openfirmware.info

3007 discussions

[commit] r3043 - cpu/x86/pc/olpc
by repository service 10 Jul '12

10 Jul '12

Author: quozl Date: Tue Jul 10 05:33:24 2012 New Revision: 3043 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3043 Log: Q2F13 Modified: cpu/x86/pc/olpc/versions.fth Modified: cpu/x86/pc/olpc/versions.fth ============================================================================== --- cpu/x86/pc/olpc/versions.fth Tue Jul 10 04:56:53 2012 (r3042) +++ cpu/x86/pc/olpc/versions.fth Tue Jul 10 05:33:24 2012 (r3043) @@ -2,7 +2,7 @@ \ The overall firmware revision macro: FW_MAJOR F -macro: FW_MINOR 12 +macro: FW_MINOR 13 \ The EC microcode macro: EC_VERSION 1_2_1

1 0

[commit] r3042 - dev
by repository service 10 Jul '12

10 Jul '12

Author: quozl Date: Tue Jul 10 04:56:53 2012 New Revision: 3042 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3042 Log: OLPC - libertas antenna test, remove transmit antenna selection, #11976 Modified: dev/libertas.fth Modified: dev/libertas.fth ============================================================================== --- dev/libertas.fth Sat Jul 7 04:20:04 2012 (r3041) +++ dev/libertas.fth Tue Jul 10 04:56:53 2012 (r3042) @@ -1685,26 +1685,23 @@ ; : rf-antenna ( antenna action -- ) - swap >r >r + swap >r >r ( r: antenna action ) 4 h# 20 ( CMD_802_11_RF_ANTENNA ) prepare-cmd - r> +xw - r> +xw + r> +xw ( r: antenna ) + r> +xw ( ) outbuf-wait drop ; -: set-antenna ( rx tx -- ) - 2 ( ACT_SET_TX ) rf-antenna ( rx ) +: set-antenna ( antenna -- ) 1 ( ACT_SET_RX ) rf-antenna ( ) ; : set-antenna-diversity ( -- ) - h# ffff 2 ( ACT_SET_TX ) rf-antenna h# ffff 1 ( ACT_SET_RX ) rf-antenna ; -: get-antenna ( -- rx tx ) - h# 0 4 ( ACT_GET_RX ) rf-antenna respbuf >fw-data 2+ le-w@ ( rx ) - h# 0 8 ( ACT_GET_TX ) rf-antenna respbuf >fw-data 2+ le-w@ ( rx tx ) +: get-antenna ( -- antenna ) + h# 0 4 ( ACT_GET_RX ) rf-antenna respbuf >fw-data 2+ le-w@ ( antenna ) ; : .hw-spec ( -- ) @@ -2203,9 +2200,9 @@ decimal ." now" .rssi ( base avg_nf avg_snr ) ." avg" .rssi ( base ) - get-antenna swap ( base tx rx ) + get-antenna ( base antenna ) hex - ." rx" .antenna ." tx" .antenna ( base ) + ." ant" .antenna ( base ) ." " base ! ; @@ -2217,18 +2214,17 @@ ; : test-antenna ( -- ) - ." keys: (0,1,2,l,r,d,a,s,q)" cr + ." keys: (0,1,2,3,d,a,s,q)" cr begin d# 100 ms show-antenna key? if cr show-antenna key case h# 71 ( q ) of cr exit endof - h# 1b of cr exit endof - h# 30 ( 0 ) of ." rx/tx to 0/0" 0 0 set-antenna endof - h# 31 ( 1 ) of ." rx/tx to 1/1" 1 1 set-antenna endof - h# 32 ( 2 ) of ." rx/tx to 2/2" 2 2 set-antenna endof - h# 6c ( l ) of ." rx/tx to 1/2" 1 2 set-antenna endof - h# 72 ( r ) of ." rx/tx to 2/1" 2 1 set-antenna endof + h# 1b of cr exit endof + h# 30 ( 0 ) of ." antenna to 0" 0 set-antenna endof + h# 31 ( 1 ) of ." antenna to 1" 1 set-antenna endof + h# 32 ( 2 ) of ." antenna to 2" 2 set-antenna endof + h# 33 ( 3 ) of ." antenna to 3" 3 set-antenna endof h# 64 ( d ) of ." diversity" cr set-antenna-diversity endof h# 61 ( a ) of ." associate" cr close open drop endof h# 73 ( s ) of ta-scan endof

1 0

[commit] r3041 - in cpu/arm: . olpc
by repository service 07 Jul '12

07 Jul '12

Author: wmb Date: Sat Jul 7 04:20:04 2012 New Revision: 3041 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3041 Log: OLPC ARM - move the flattened device tree and the initrd to the end of memory, ensuring that they don't collide with one another (OLPC trac #11998). Modified: cpu/arm/linux.fth cpu/arm/olpc/build-fw.fth Modified: cpu/arm/linux.fth ============================================================================== --- cpu/arm/linux.fth Sat Jul 7 04:18:02 2012 (r3040) +++ cpu/arm/linux.fth Sat Jul 7 04:20:04 2012 (r3041) @@ -9,6 +9,7 @@ 0 value linux-memtop +defer mapped-limit defer memory-limit \ Find the end of the largest piece of memory : (memory-limit) ( -- limit ) @@ -32,6 +33,7 @@ + ( limit ) ; ' (memory-limit) to memory-limit \ Override by platform code if necessary +' memory-limit to mapped-limit \ Override by platform code if necessary \ see http://www.simtec.co.uk/products/SWLINUX/files/booting_article.html @@ -92,6 +94,7 @@ true value use-fdt? : use-fdt ( -- ) true to use-fdt? ; +h# 10000 constant /fdt-max : linux-fixup ( -- ) [ifdef] linux-logo linux-logo [then] \ use-fdt? 0= if @@ -104,8 +107,8 @@ arm-linux-machine-type to r1 [ifdef] flatten-device-tree use-fdt? if - load-base h# 40000 - to linux-params - linux-params h# 40000 flatten-device-tree + ramdisk-adr ?dup 0= if mapped-limit then /fdt-max - to linux-params + linux-params /fdt-max flatten-device-tree else args-buf cscount linux-params set-parameters then @@ -122,7 +125,7 @@ : linux-place-ramdisk ( adr len -- ) to /ramdisk ( adr ) - dup memory-limit umin /ramdisk - ( adr new-ramdisk-adr ) + mapped-limit /ramdisk - ( adr new-ramdisk-adr ) tuck /ramdisk move ( new-ramdisk-adr ) \ dup to linux-memtop to ramdisk-adr Modified: cpu/arm/olpc/build-fw.fth ============================================================================== --- cpu/arm/olpc/build-fw.fth Sat Jul 7 04:18:02 2012 (r3040) +++ cpu/arm/olpc/build-fw.fth Sat Jul 7 04:20:04 2012 (r3041) @@ -490,6 +490,8 @@ \ We give everything up to that address to Linux. : olpc-memory-limit ( -- adr ) extra-mem-va >physical ; ' olpc-memory-limit to memory-limit +: olpc-mapped-limit ( -- adr ) dma-mem-va >physical ; +' olpc-mapped-limit to mapped-limit \+ olpc-cl2 d# 9999 to arm-linux-machine-type \ XO-1.75 \+ olpc-cl3 d# 10000 to arm-linux-machine-type \ XO-3

1 0

[commit] r3040 - cpu/arm/olpc
by repository service 07 Jul '12

07 Jul '12

Author: wmb Date: Sat Jul 7 04:18:02 2012 New Revision: 3040 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3040 Log: OLPC - revert the SD node rearrangement portion of revision 3023, to fix Linux booting on older kernels (OLPC trac #11998). Modified: cpu/arm/olpc/build-fw.fth cpu/arm/olpc/sdhci.fth cpu/arm/olpc/sdregs.fth Modified: cpu/arm/olpc/build-fw.fth ============================================================================== --- cpu/arm/olpc/build-fw.fth Fri Jul 6 09:46:38 2012 (r3039) +++ cpu/arm/olpc/build-fw.fth Sat Jul 7 04:18:02 2012 (r3040) @@ -357,8 +357,8 @@ fload ${BP}/cpu/arm/olpc/emmc.fth [then] -devalias int /sd/sdhci@d4281000/disk -devalias ext /sd/sdhci@d4280000/disk +devalias int /sd/disk@3 +devalias ext /sd/disk@1 devalias net /wlan \ XXX should report-net in case of USB Ethernet fload ${BP}/dev/olpc/kb3700/spicmd.fth \ EC SPI Command Protocol Modified: cpu/arm/olpc/sdhci.fth ============================================================================== --- cpu/arm/olpc/sdhci.fth Fri Jul 6 09:46:38 2012 (r3039) +++ cpu/arm/olpc/sdhci.fth Sat Jul 7 04:18:02 2012 (r3040) @@ -1,22 +1,16 @@ purpose: Load file for SDHCI (Secure Digital Host Controller Interface) -0 0 " " " /" begin-package +0 0 " d4280000" " /" begin-package fload ${BP}/cpu/arm/olpc/sdregs.fth fload ${BP}/dev/mmc/sdhci/sdhci.fth - " simple-bus" +compatible - h# d4280000 encode-int h# d4280000 encode-int encode+ h# 2000 encode-int encode+ " ranges" property - 1 " #address-cells" integer-property - 1 " #size-cells" integer-property - d# 1 to power-off-time \ A2 and A3 have turn-off clamps \ true to avoid-high-speed? hex - : slot# ( -- n ) slot h# d4280000 - h# 800 / 1+ ; : olpc-card-inserted? ( -- flag ) - slot# 1 = if d# 31 gpio-pin@ 0= else true then + slot 1 = if d# 31 gpio-pin@ 0= else true then ; ' olpc-card-inserted? to card-inserted? @@ -24,72 +18,35 @@ : gpio-power-on ( -- ) sdhci-card-power-on \ The CL3 version below actually works for CL2 >= B1 -\+ olpc-cl2 d# 36 slot# - gpio-set -\+ olpc-cl3 slot# 2 = if d# 34 gpio-set then +\+ olpc-cl2 d# 36 slot - gpio-set +\+ olpc-cl3 slot 2 = if d# 34 gpio-set then ; ' gpio-power-on to card-power-on : gpio-power-off ( -- ) -\+ olpc-cl2 d# 36 slot# - gpio-clr -\+ olpc-cl3 slot# 2 = if d# 34 gpio-clr then +\+ olpc-cl2 d# 36 slot - gpio-clr +\+ olpc-cl3 slot 2 = if d# 34 gpio-clr then sdhci-card-power-off ; ' gpio-power-off to card-power-off \+ olpc-cl2 new-device -\+ olpc-cl2 h# d428.0000 h# 800 reg -\+ olpc-cl2 8 encode-int " bus-width" property -\+ olpc-cl2 " mrvl,pxav3-mmc" encode-string " compatible" property -\+ olpc-cl2 d# 31 encode-int " clk-delay-cycles" property -\+ olpc-cl2 fload ${BP}/dev/mmc/sdhci/slot.fth -\+ olpc-cl2 d# 39 " interrupts" integer-property - -\+ olpc-cl2 " /pmua" encode-phandle 3 encode-int encode+ " clocks" property -\+ olpc-cl2 " PXA-SDHCLK" " clock-names" string-property - -\+ olpc-cl2 new-device -\+ olpc-cl2 fload ${BP}/dev/mmc/sdhci/sdmmc.fth -\+ olpc-cl2 fload ${BP}/dev/mmc/sdhci/selftest.fth -\+ olpc-cl2 " external" " slot-name" string-property -\+ olpc-cl2 finish-device +\+ olpc-cl2 1 encode-int " reg" property +\+ olpc-cl2 fload ${BP}/dev/mmc/sdhci/sdmmc.fth +\+ olpc-cl2 fload ${BP}/dev/mmc/sdhci/selftest.fth +\+ olpc-cl2 " external" " slot-name" string-property \+ olpc-cl2 finish-device new-device - h# d428.0800 h# 800 reg - 8 encode-int " bus-width" property - " sdhci-pxav3" +compatible - " mrvl,pxav3-mmc" +compatible - d# 31 encode-int " clk-delay-cycles" property - 0 0 " non-removable" property - d# 52 " interrupts" integer-property - - " /pmua" encode-phandle 4 encode-int encode+ " clocks" property - " PXA-SDHCLK" " clock-names" string-property - - fload ${BP}/dev/mmc/sdhci/slot.fth - new-device - fload ${BP}/dev/mmc/sdhci/mv8686/loadpkg.fth - finish-device + 2 encode-int " reg" property + fload ${BP}/dev/mmc/sdhci/mv8686/loadpkg.fth finish-device new-device - h# d428.1000 h# 800 reg - 0 0 " non-removable" property - 8 encode-int " bus-width" property - " sdhci-pxav3" +compatible - " mrvl,pxav3-mmc" +compatible - d# 31 encode-int " clk-delay-cycles" property - d# 53 " interrupts" integer-property - - " /pmua" encode-phandle d# 14 encode-int encode+ " clocks" property - " PXA-SDHCLK" " clock-names" string-property - - fload ${BP}/dev/mmc/sdhci/slot.fth - new-device - fload ${BP}/dev/mmc/sdhci/sdmmc.fth - fload ${BP}/dev/mmc/sdhci/selftest.fth - " internal" " slot-name" string-property - finish-device + 3 encode-int " reg" property + fload ${BP}/dev/mmc/sdhci/sdmmc.fth + fload ${BP}/dev/mmc/sdhci/selftest.fth + " internal" " slot-name" string-property finish-device end-package Modified: cpu/arm/olpc/sdregs.fth ============================================================================== --- cpu/arm/olpc/sdregs.fth Fri Jul 6 09:46:38 2012 (r3039) +++ cpu/arm/olpc/sdregs.fth Sat Jul 7 04:18:02 2012 (r3040) @@ -4,11 +4,11 @@ 0 instance value slot 0 instance value chip -\ my-space /regs reg +my-space /regs reg : map-regs ( -- ) chip if exit then - slot /regs " map-in" $call-parent + slot 1- h# 800 * my-space + /regs " map-in" $call-parent to chip ; : unmap-regs ( -- )

1 0

[commit] r3039 - cpu/arm/olpc
by repository service 06 Jul '12

06 Jul '12

Author: quozl Date: Fri Jul 6 09:46:38 2012 New Revision: 3039 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3039 Log: TI BSL downloader - reverse polarity of test result report, cleanup messages, report timeout of flush, and initialise UART2 APB clocks and UART enable bit Modified: cpu/arm/olpc/bsl.fth Modified: cpu/arm/olpc/bsl.fth ============================================================================== --- cpu/arm/olpc/bsl.fth Wed Jul 4 18:18:52 2012 (r3038) +++ cpu/arm/olpc/bsl.fth Fri Jul 6 09:46:38 2012 (r3039) @@ -41,7 +41,12 @@ \ These are MMP2/3 dependent : bsl-baud ( baud-rate -- ) \ 9600,8,e,1 - uart-base >r bsl-uart-base to uart-base baud h# 1b 3 uart! r> to uart-base + uart-base >r ( baud-rate r: uart-base ) + bsl-uart-base to uart-base + h# 13 h# 30 apbc! \ enable the uart2 clocks + h# 40 1 uart! \ uart unit enable + baud h# 1b 3 uart! ( r: uart-base ) + r> to uart-base ( ) ; : bsl-send ( char -- ) uart-base >r bsl-uart-base to uart-base uemit r> to uart-base ; @@ -88,7 +93,16 @@ dly bsl-test-gpio# gpio-clr ; -: flush-bsl ( -- ) begin receive? while drop repeat ; + +: flush-bsl + get-msecs d# 2000 + ( limit ) + begin + receive? 0= if exit then ( limit char ) + drop dup get-msecs - 0< ( limit timeout? ) + until + drop true abort" BSL flush timeout" +; + : rst-bsl ( -- ) msp430-off start-bsl flush-bsl ; d# 1000 constant timeout @@ -102,6 +116,7 @@ until ( limit ) drop true abort" BSL data timeout" ; + : ack? ( -- okay? ) get-msecs timeout + ( limit ) begin ( limit ) @@ -262,7 +277,6 @@ ; : force-erase ( -- ) - ." Resetting/erasing" cr rst-bsl ['] 00-password catch drop rst-bsl @@ -368,6 +382,7 @@ : $flash-bsl ( filename$ -- ) $read-open ( ) set-bsl-file-format ( ) + ." Resetting/erasing" cr force-erase ( ) ." Programming" cr begin ( ) @@ -428,7 +443,7 @@ ." Erasing ..." force-erase cr ." Writing ..." bsl-test-data h# 8000 bsl-write cr ( ) ." Verifying ..." bsl-test-data h# 8000 bsl-verify cr ( okay? ) - if ." FAILED!" else ." Good" then cr + if ." Good" else ." FAILED!" then cr ; \ LICENSE_BEGIN

1 0

[commit] r3038 - dev ofw/core
by repository service 04 Jul '12

04 Jul '12

Author: wmb Date: Wed Jul 4 18:18:52 2012 New Revision: 3038 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3038 Log: PCI bus driver - fixed a problem introduced by svn 3021 (the code change to make phandles relative wasn't complete). Modified: dev/pcibus.fth ofw/core/ofwcore.fth Modified: dev/pcibus.fth ============================================================================== --- dev/pcibus.fth Wed Jul 4 06:30:17 2012 (r3037) +++ dev/pcibus.fth Wed Jul 4 18:18:52 2012 (r3038) @@ -1048,27 +1048,12 @@ then ; -\ XXX In order to implement put-package-property with standard words, -\ we would have to: -\ a) Save my-self and set it to 0 -\ b) Get the package's "reg" property value with get-package-property -\ c) Convert the first entry therein to a string of the form "@D,F" -\ d) Pass that string to find-device to make that package the active package -\ e) Create the property -\ f) Restore my-self - -: put-package-property ( value$ name$ phandle -- ) - current token@ >r context token@ >r execute ( value$ name$ ) - (property) - r> context token! r> current token! -; - 0 value aa-adr 0 value aa-len : init-aa-property ( -- ) 0 0 encode-bytes to aa-len to aa-adr ; : finish-aa-property ( phandle -- ) aa-len if - >r aa-adr aa-len " assigned-addresses" r> put-package-property + >r aa-adr aa-len " assigned-addresses" r> set-package-property else drop then Modified: ofw/core/ofwcore.fth ============================================================================== --- ofw/core/ofwcore.fth Wed Jul 4 06:30:17 2012 (r3037) +++ ofw/core/ofwcore.fth Wed Jul 4 18:18:52 2012 (r3038) @@ -2162,6 +2162,12 @@ (push-package) get-property (pop-package) ; +: set-package-property ( value$ name$ phandle -- ) + current token@ >r context token@ >r (select-package) ( value$ name$ ) + (property) + r> context token! r> current token! +; + \ Used when executing from an open package instance. Finds a property \ associated with the current package. : get-my-property ( adr len -- true | adr' len' false )

1 0

[commit] r3037 - cpu/arm/olpc/1.75
by repository service 04 Jul '12

04 Jul '12

Author: wmb Date: Wed Jul 4 06:30:17 2012 New Revision: 3037 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3037 Log: Q4D19 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 Wed Jul 4 06:29:30 2012 (r3036) +++ cpu/arm/olpc/1.75/fw-version.fth Wed Jul 4 06:30:17 2012 (r3037) @@ -1,4 +1,4 @@ \ The overall firmware revision macro: FW_PREFIX Q4 macro: FW_MAJOR D -macro: FW_MINOR 18 +macro: FW_MINOR 19

1 0

[commit] r3036 - in cpu/arm/olpc: . 1.75
by repository service 04 Jul '12

04 Jul '12

Author: wmb Date: Wed Jul 4 06:29:30 2012 New Revision: 3036 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3036 Log: OLPC XO-1.75 - support EC version for new build - using the same EC image for both existing and new boards. Modified: cpu/arm/olpc/1.75/ec-version.fth cpu/arm/olpc/build-fw.fth Modified: cpu/arm/olpc/1.75/ec-version.fth ============================================================================== --- cpu/arm/olpc/1.75/ec-version.fth Tue Jul 3 08:28:56 2012 (r3035) +++ cpu/arm/olpc/1.75/ec-version.fth Wed Jul 4 06:29:30 2012 (r3036) @@ -1,6 +1,6 @@ \ The EC microcode macro: EC_PLATFORM cl2 -macro: EC_VERSION 4_0_4_03 +macro: EC_VERSION 4_0_5_00 \ Alternate command for getting EC microcode, for testing new versions. \ Temporarily uncomment the line and modify the path as necessary Modified: cpu/arm/olpc/build-fw.fth ============================================================================== --- cpu/arm/olpc/build-fw.fth Tue Jul 3 08:28:56 2012 (r3035) +++ cpu/arm/olpc/build-fw.fth Wed Jul 4 06:29:30 2012 (r3036) @@ -204,7 +204,7 @@ [else] h# 8000 value /ec-flash : clx-touch? ( -- ) board-revision h# 3a18 >= ; -\+ olpc-cl2 : expected-ec-version clx-touch? if [char] 6 else [char] 4 then ; +\+ olpc-cl2 char 4 value expected-ec-version \+ olpc-cl3 char 5 value expected-ec-version [then]

1 0

[commit] r3035 - cpu/arm/olpc
by repository service 03 Jul '12

03 Jul '12

Author: wmb Date: Tue Jul 3 08:28:56 2012 New Revision: 3035 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3035 Log: OLPC XO-1.75 - support new EC version. Modified: cpu/arm/olpc/build-fw.fth cpu/arm/olpc/ecflash.fth Modified: cpu/arm/olpc/build-fw.fth ============================================================================== --- cpu/arm/olpc/build-fw.fth Tue Jul 3 08:19:40 2012 (r3034) +++ cpu/arm/olpc/build-fw.fth Tue Jul 3 08:28:56 2012 (r3035) @@ -197,6 +197,19 @@ load-base constant flash-buf + +[ifdef] cl2-a1 +h# 10000 value /ec-flash +char 3 value expected-ec-version +[else] +h# 8000 value /ec-flash +: clx-touch? ( -- ) board-revision h# 3a18 >= ; +\+ olpc-cl2 : expected-ec-version clx-touch? if [char] 6 else [char] 4 then ; +\+ olpc-cl3 char 5 value expected-ec-version +[then] + +[ifndef] cl2-a1 +[then] fload ${BP}/cpu/arm/olpc/ecflash.fth : ec-spi-reprogrammed ( -- ) @@ -340,7 +353,6 @@ fload ${BP}/cpu/arm/olpc/sdhci.fth [ifndef] cl2-a1 -: clx-touch? ( -- ) board-revision h# 3a18 >= ; : boot-dev-gpio# ( -- n ) clx-touch? if 2 else d# 56 then ; fload ${BP}/cpu/arm/olpc/emmc.fth [then] Modified: cpu/arm/olpc/ecflash.fth ============================================================================== --- cpu/arm/olpc/ecflash.fth Tue Jul 3 08:19:40 2012 (r3034) +++ cpu/arm/olpc/ecflash.fth Tue Jul 3 08:28:56 2012 (r3035) @@ -1,16 +1,6 @@ \ See license at end of file purpose: Reflash the EC code - -[ifdef] cl2-a1 -h# 10000 value /ec-flash -char 3 value expected-ec-version -[else] -h# 8000 value /ec-flash -\+ olpc-cl2 char 4 value expected-ec-version -\+ olpc-cl3 char 5 value expected-ec-version -[then] - : check-signature ( adr -- ) /ec-flash + h# 100 - ( adr' ) dup " XO-EC" comp abort" Bad signature in EC image" ( adr )

1 0

[commit] r3034 - cpu/arm/olpc
by repository service 03 Jul '12

03 Jul '12

Author: wmb Date: Tue Jul 3 08:19:40 2012 New Revision: 3034 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3034 Log: TI BSL downloader - changed some names to avoid conflicts. Modified: cpu/arm/olpc/bsl.fth Modified: cpu/arm/olpc/bsl.fth ============================================================================== --- cpu/arm/olpc/bsl.fth Tue Jul 3 08:17:12 2012 (r3033) +++ cpu/arm/olpc/bsl.fth Tue Jul 3 08:19:40 2012 (r3034) @@ -44,7 +44,7 @@ uart-base >r bsl-uart-base to uart-base baud h# 1b 3 uart! r> to uart-base ; -: send ( char -- ) uart-base >r bsl-uart-base to uart-base uemit r> to uart-base ; +: bsl-send ( char -- ) uart-base >r bsl-uart-base to uart-base uemit r> to uart-base ; : receive? ( -- false | char true ) uart-base >r bsl-uart-base to uart-base @@ -122,7 +122,7 @@ ; : bsl-sync ( -- ) d# 4 0 do - h# 80 send ack? if unloop exit then + h# 80 bsl-send ack? if unloop exit then loop true abort" BSL unresponsive" ; @@ -131,7 +131,7 @@ : +sum ( w -- ) checksum xor to checksum ; : send-summed ( w -- ) - dup +sum wbsplit swap send send + dup +sum wbsplit swap bsl-send bsl-send ; : send-length ( n -- ) dup 1 and abort" BSL odd length!" @@ -153,7 +153,7 @@ bounds ?do i le-w@ send-summed /w +loop ; : )frame-no-ack ( -- ) - checksum h# ffff xor wbsplit swap send send + checksum h# ffff xor wbsplit swap bsl-send bsl-send ; : )frame ( -- ) )frame-no-ack @@ -346,7 +346,6 @@ endcase ; -d# 100 buffer: line-buf defer bsl-handle-line : set-bsl-file-format ( -- ) @@ -365,16 +364,16 @@ 0 ifd @ fseek ; -d# 100 buffer: line-buf +d# 100 buffer: bsl-line-buf : $flash-bsl ( filename$ -- ) $read-open ( ) set-bsl-file-format ( ) force-erase ( ) ." Programming" cr begin ( ) - line-buf d# 100 ifd @ read-line abort" Read line failed" + bsl-line-buf d# 100 ifd @ read-line abort" Read line failed" while ( len ) - line-buf swap ( adr len ) + bsl-line-buf swap ( adr len ) ['] bsl-handle-line catch ?dup if ( x x throw-code ) ifd @ fclose throw ( ?? -- ) then ( )

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

openfirmware