July 2012 - openfirmware - mail.coreboot.org

[commit] r3030 - cpu/arm/olpc
by repository service July 2, 2012

July 2, 2012

Author: wmb Date: Tue Jul 3 07:26:24 2012 New Revision: 3030 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3030 Log: OLPC BSL download code - completed code with "test-msp430" word for testing the initial hardware build. Modified: cpu/arm/olpc/bsl.fth Modified: cpu/arm/olpc/bsl.fth ============================================================================== --- cpu/arm/olpc/bsl.fth Tue Jul 3 07:24:13 2012 (r3029) +++ cpu/arm/olpc/bsl.fth Tue Jul 3 07:26:24 2012 (r3030) @@ -3,7 +3,42 @@ \ devalias bsl /uart@NNNN:9600,8,e,1//bsl-protocol -h# fe016000 value bsl-uart-base \ Virtual address of UART; set later + +\ These constants are correct for XO-1.75 and XO-CL4; they might +\ need to be changed for different hardware. See setup-gpios-hack + +h# 17000 +io constant bsl-uart-base \ UART2 + +d# 98 constant bsl-test-gpio# \ GPIO98 is alternate function 0 (the default) +d# 152 constant bsl-rst-gpio# \ SM_BELn, with GPIO152 as alternate function 1 + +\ This is platform-dependent + +: setup-gpios ( -- ) + 3 d# 55 af! 3 d# 56 af! \ Setup pins for UART2 + 0 bsl-test-gpio# af! \ Set to GPIO function + 1 bsl-rst-gpio# af! \ Set to GPIO function (AF0 is SM_BELn for this pin) +; + +0 [if] +\ This is for the test system on which this code was originally developed +: setup-gpios-hack ( -- ) + \ On the test system, the BSL device is driven from the console UART, + \ not a dedicated UART, so we must disconnect that UART from the console mux + fallback-in-ih ?dup if dup remove-input close-dev 0 to fallback-in-ih then + fallback-out-ih ?dup if dup remove-output close-dev 0 to fallback-out-ih then + + h# 16000 +io to bsl-uart-base \ UART4 + + d# 115 to test-gpio# \ Normally UART3 TXD, but repurposed as a GPIO + d# 116 to rst-gpio# \ Normally UART3 RXD, but repurposed as a GPIO + + 0 bsl-test-gpio# af! \ Set to GPIO function instead of UART3 + 0 bsl-rst-gpio# af! \ Set to GPIO function instead of UART3 +; +[then] + +\ 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 @@ -17,53 +52,41 @@ r> to uart-base ; -0 value rst-gpio# -0 value test-gpio# -\ : bsl-config-test ( -- ) -: init-gpios - fallback-in-ih ?dup if dup remove-input close-dev 0 to fallback-in-ih then - fallback-out-ih ?dup if dup remove-output close-dev 0 to fallback-out-ih then - d# 115 to test-gpio# - d# 116 to rst-gpio# - - test-gpio# 0 swap af! - rst-gpio# 0 swap af! -; +\ After this point the code is largely generic : bsl-open ( -- ) - init-gpios + setup-gpios - rst-gpio# gpio-clr - test-gpio# gpio-clr - rst-gpio# gpio-dir-out - test-gpio# gpio-dir-out - h# 16000 +io to bsl-uart-base + bsl-rst-gpio# gpio-clr + bsl-test-gpio# gpio-clr + bsl-rst-gpio# gpio-dir-out + bsl-test-gpio# gpio-dir-out d# 9600 bsl-baud ; : bsl-close ( -- ) - rst-gpio# gpio-dir-in - test-gpio# gpio-dir-in + bsl-rst-gpio# gpio-dir-in + bsl-test-gpio# gpio-dir-in ; : msp430-off ( -- ) - rst-gpio# gpio-clr - test-gpio# gpio-clr + bsl-rst-gpio# gpio-clr + bsl-test-gpio# gpio-clr ; : dly ( -- ) d# 10 ms ; : start-bsl ( -- ) bsl-open d# 250 ms - test-gpio# gpio-set + bsl-test-gpio# gpio-set dly - test-gpio# gpio-clr + bsl-test-gpio# gpio-clr dly - test-gpio# gpio-set + bsl-test-gpio# gpio-set dly - rst-gpio# gpio-set + bsl-rst-gpio# gpio-set dly - test-gpio# gpio-clr + bsl-test-gpio# gpio-clr ; : flush-bsl ( -- ) begin receive? while drop repeat ; : rst-bsl ( -- ) msp430-off start-bsl flush-bsl ; @@ -238,6 +261,16 @@ r> 3drop ; +: force-erase ( -- ) + ." Resetting/erasing" cr + rst-bsl + ['] 00-password catch drop + rst-bsl + ff-password +; + +\ Decoder for TI TXT file format + 0 value next-address 0 value line-#bytes d# 50 buffer: binary-buf @@ -269,7 +302,7 @@ loop ( adr len ) true abort" TI TXT Line too long!" ; -: handle-line ( adr len -- ) +: ti-txt-handle-line ( adr len -- ) dup 0= if 2drop exit then ( adr len ) over c@ case [char] @ of ( adr len ) @@ -282,25 +315,121 @@ -rot program-bytes ( char ) endcase ( ) ; -: force-erase ( -- ) - ." Resetting/erasing" cr - rst-bsl - ['] 00-password catch drop - rst-bsl - ff-password + +\ Decoder for Intel HEX format file +\needs parse-ihex-record fload ${BP}/forth/lib/intelhex.fth + +0 value ihex-hi-adr +: ihex-handle-line ( adr len -- ) + dup 0= if 2drop exit then ( adr len ) + parse-ihex-record ( data-adr data-len offset type ) + case + 0 of \ Data ( data-adr data-len offset ) + ihex-hi-adr + rx-data-block ( ) + endof + 1 of \ End of file ( data-adr data-len offset ) + 3drop ( ) + endof + 2 of \ Segment address ( data-adr data-len offset ) + 2drop le-w@ 4 lshift to ihex-hi-adr ( ) + endof + 3 of \ Start segment address ( data-adr data-len offset ) + 3drop + endof + 4 of \ Extended linear address ( data-adr data-len offset ) + 2drop le-w@ d# 16 lshift to ihex-hi-adr ( ) + endof + 5 of \ Start address ( data-adr data-len offset ) + 3drop + endof + ( default ) true abort" Bogus ihex record type" + endcase ; + d# 100 buffer: line-buf -: $bsl-ti-text-file ( filename$ -- ) - $read-open ( ) - force-erase ( ) +defer bsl-handle-line + +: set-bsl-file-format ( -- ) + ifd @ fgetc case + [char] : of + ['] ihex-handle-line to bsl-handle-line + endof + [char] @ of + ['] ti-txt-handle-line to bsl-handle-line + endof + ( default ) + ifd @ fclose + true abort" Unsupported file format for BSL programming" + endcase + + 0 ifd @ fseek +; + +d# 100 buffer: line-buf +: $flash-bsl ( filename$ -- ) + $read-open ( ) + set-bsl-file-format ( ) + force-erase ( ) ." Programming" cr - begin ( ) + begin ( ) line-buf d# 100 ifd @ read-line abort" Read line failed" - while ( len ) - line-buf swap handle-line ( ) - repeat ( len ) - drop - ifd @ fclose + while ( len ) + line-buf swap ( adr len ) + ['] bsl-handle-line catch ?dup if ( x x throw-code ) + ifd @ fclose throw ( ?? -- ) + then ( ) + repeat ( len ) + drop ( ) + ifd @ fclose ( ) +; + +\ This is a destructive test in that it erases whatever firmware happens +\ to already be in the device. + + +h# 70 value /bsl-chunk +/bsl-chunk buffer: bsl-buf +: bsl-write ( adr len device-adr -- ) + to next-address ( adr len ) + begin dup while ( adr len ) + dup /bsl-chunk min ( adr len thislen ) + third over next-address rx-data-block ( adr len thislen ) + dup next-address + to next-address ( adr len thislen ) + /string ( adr' len' ) + repeat ( adr 0 ) + 2drop ( ) +; +: bsl-verify ( adr len device-adr -- okay? ) + to next-address ( adr len ) + begin dup while ( adr len ) + dup /bsl-chunk min ( adr len thislen ) + bsl-buf over next-address tx-data-block ( adr len thislen ) + third bsl-buf third comp if ( adr len thislen ) + 3drop false exit ( -- false ) + then ( adr len thislen ) + dup next-address + to next-address ( adr len thislen ) + /string ( adr' len' ) + repeat ( adr 0 ) + 2drop ( ) + true ( true ) +; +h# 3000 constant /bsl-test-buf +/bsl-test-buf buffer: bsl-test-buf +0 value bsl-test-init? +: bsl-test-data ( -- adr len ) + bsl-test-init? 0= if + bsl-test-buf /bsl-test-buf bounds ?do + random-long i l! + /l +loop + true to bsl-test-init? + then + bsl-test-buf /bsl-test-buf +; +: test-msp430 ( -- ) + ." 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 ; \ LICENSE_BEGIN

1 0

[commit] r3029 - cpu/arm/olpc/1.75
by repository service July 2, 2012

July 2, 2012

Author: wmb Date: Tue Jul 3 07:24:13 2012 New Revision: 3029 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3029 Log: OLPC XO-1.75 build - removed diagnostic redefinition of $add-deflated-dropin introduced in last revision. Modified: cpu/arm/olpc/1.75/olpc.bth Modified: cpu/arm/olpc/1.75/olpc.bth ============================================================================== --- cpu/arm/olpc/1.75/olpc.bth Tue Jul 3 07:21:48 2012 (r3028) +++ cpu/arm/olpc/1.75/olpc.bth Tue Jul 3 07:24:13 2012 (r3029) @@ -60,8 +60,6 @@ h# e.0000 to reserved-start h# f.0000 to reserved-end -: $add-deflated-dropin 2dup type ." - " $add-deflated-dropin ofd @ fsize .x cr ; - .( --- Saving as ) " ${FW_VERSION}.rom" expand$ 2dup lower ( adr len ) 2dup type cr ( adr len )

1 0

[commit] r3028 - cpu/arm/olpc/1.75
by repository service July 2, 2012

July 2, 2012

Author: wmb Date: Tue Jul 3 07:21:48 2012 New Revision: 3028 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3028 Log: OLPC XO-1.75 build - rearranged the order of dropin modules as a stopgap measure to fix the build. Space is getting short. Modified: cpu/arm/olpc/1.75/olpc.bth Modified: cpu/arm/olpc/1.75/olpc.bth ============================================================================== --- cpu/arm/olpc/1.75/olpc.bth Sat Jun 30 01:42:38 2012 (r3027) +++ cpu/arm/olpc/1.75/olpc.bth Tue Jul 3 07:21:48 2012 (r3028) @@ -60,6 +60,8 @@ h# e.0000 to reserved-start h# f.0000 to reserved-end +: $add-deflated-dropin 2dup type ." - " $add-deflated-dropin ofd @ fsize .x cr ; + .( --- Saving as ) " ${FW_VERSION}.rom" expand$ 2dup lower ( adr len ) 2dup type cr ( adr len ) @@ -75,59 +77,23 @@ \ " fw.img" " firmware" $add-dropin " resetvec.img" " reset" $add-dropin -\ " ${BP}/dev/usb2/hcd/ehci/build/ehci.fc" " class0c0320" $add-deflated-dropin - " ${BP}/dev/usb2/device/hub/build/hub.fc" " usb,class9" $add-deflated-dropin - " ${BP}/dev/usb2/device/generic/build/generic.fc" " usbdevice" $add-deflated-dropin - " ${BP}/dev/usb2/device/net/build/usbnet.fc" " usbnet" $add-deflated-dropin - " ${BP}/dev/usb2/device/keyboard/build/usbkbd.fc" " usb,class3,1,1" $add-deflated-dropin - " ${BP}/dev/usb2/device/mouse/build/usbmouse.fc" " usb,class3,1,2" $add-deflated-dropin - " ${BP}/dev/usb2/device/serial/build/usbserial.fc" " usbserial" $add-deflated-dropin - " ${BP}/dev/usb2/device/storage/build/usbstorage.fc" " usbstorage" $add-deflated-dropin - " sd8686_helper.bin" " helper_sd.bin" $add-deflated-dropin " sd8686.bin" " sd8686.bin" $add-deflated-dropin - " builton.fth" " probe-" $add-dropin - -0 [if] - " ${BP}/clients/emacs/x86/emacs" " emacs" $add-deflated-dropin - " ${BP}/clients/emacs/x86/emacs.rc" " emacs.rc" $add-deflated-dropin - " ${BP}/clients/emacs/emacs.hlp" " emacs.hlp" $add-deflated-dropin -[then] - - " ${BP}/ofw/inet/telnetd.fth" " telnetd" $add-deflated-dropin - -\ " ${BP}/cpu/x86/pc/olpc/images/warnings.565" " warnings.565" $add-deflated-dropin - " ${BP}/cpu/x86/pc/olpc/images/lightdot.565" " lightdot.565" $add-deflated-dropin - " ${BP}/cpu/x86/pc/olpc/images/yellowdot.565" " yellowdot.565" $add-deflated-dropin - " ${BP}/cpu/x86/pc/olpc/images/darkdot.565" " darkdot.565" $add-deflated-dropin - " ${BP}/cpu/x86/pc/olpc/images/lock.565" " lock.565" $add-deflated-dropin - " ${BP}/cpu/x86/pc/olpc/images/unlock.565" " unlock.565" $add-deflated-dropin - " ${BP}/cpu/x86/pc/olpc/images/plus.565" " plus.565" $add-deflated-dropin - " ${BP}/cpu/x86/pc/olpc/images/minus.565" " minus.565" $add-deflated-dropin - " ${BP}/cpu/x86/pc/olpc/images/x.565" " x.565" $add-deflated-dropin - " ${BP}/cpu/x86/pc/olpc/images/sad.565" " sad.565" $add-deflated-dropin - " ${BP}/cpu/x86/pc/olpc/images/bigdot.565" " bigdot.565" $add-deflated-dropin - - " ${BP}/cpu/x86/pc/olpc/images/check.565" " check.565" $add-deflated-dropin - " ${BP}/cpu/x86/pc/olpc/images/xogray.565" " xogray.565" $add-deflated-dropin - " ${BP}/cpu/x86/pc/olpc/images/ethernet.565" " ethernet.565" $add-deflated-dropin - " ${BP}/cpu/x86/pc/olpc/images/usbkey.565" " disk.565" $add-deflated-dropin - " ${BP}/cpu/x86/pc/olpc/images/wireless.565" " wlan.565" $add-deflated-dropin - " ${BP}/cpu/x86/pc/olpc/images/laptop.565" " int.565" $add-deflated-dropin - " ${BP}/cpu/x86/pc/olpc/images/sd.565" " ext.565" $add-deflated-dropin - " verify.img" " verify" $add-deflated-dropin - " os.public" " ospubkey" $add-dropin \ Incompressible - " fw.public" " fwpubkey" $add-dropin \ Incompressible - " fs.public" " fspubkey" $add-dropin \ Incompressible - " lease.public" " leasepubkey" $add-dropin \ Incompressible - " developer.public" " develpubkey" $add-dropin \ Incompressible " sourceurl" " sourceurl" $add-dropin " ${BP}/cpu/x86/pc/olpc/images/Edge1-8k-EQ-Comp-Amp-Short.wav" " splash" $add-deflated-dropin + " ec.img" " ecimage.bin" $add-deflated-dropin + " ${BP}/clients/emacs/x86/emacs.rc" " emacs.rc" $add-deflated-dropin + " ${BP}/clients/emacs/emacs.hlp" " emacs.hlp" $add-deflated-dropin + " ${BP}/clients/emacs/arm/emacs" " emacs" $add-deflated-dropin + + " nandblaster15_rx.bin" " nb15_rx" $add-deflated-dropin + " nandblaster_tx.bin" " nb_tx" $add-deflated-dropin + \ icons for mfg test gui " testicons/play.565" " play.565" $add-deflated-dropin " testicons/quit.565" " quit.565" $add-deflated-dropin @@ -145,21 +111,52 @@ " testicons/wifi.565" " wifi.565" $add-deflated-dropin " testicons/clock.565" " clock.565" $add-deflated-dropin " testicons/timer.565" " timer.565" $add-deflated-dropin + + " os.public" " ospubkey" $add-dropin \ Incompressible + " fw.public" " fwpubkey" $add-dropin \ Incompressible + " fs.public" " fspubkey" $add-dropin \ Incompressible + " lease.public" " leasepubkey" $add-dropin \ Incompressible + " developer.public" " develpubkey" $add-dropin \ Incompressible + + " builton.fth" " probe-" $add-dropin + +\ " ${BP}/dev/usb2/hcd/ehci/build/ehci.fc" " class0c0320" $add-deflated-dropin + " ${BP}/dev/usb2/device/hub/build/hub.fc" " usb,class9" $add-deflated-dropin + " ${BP}/dev/usb2/device/generic/build/generic.fc" " usbdevice" $add-deflated-dropin + " ${BP}/dev/usb2/device/net/build/usbnet.fc" " usbnet" $add-deflated-dropin + " ${BP}/dev/usb2/device/keyboard/build/usbkbd.fc" " usb,class3,1,1" $add-deflated-dropin + " ${BP}/dev/usb2/device/mouse/build/usbmouse.fc" " usb,class3,1,2" $add-deflated-dropin + " ${BP}/dev/usb2/device/serial/build/usbserial.fc" " usbserial" $add-deflated-dropin + " ${BP}/dev/usb2/device/storage/build/usbstorage.fc" " usbstorage" $add-deflated-dropin + + " ${BP}/ofw/inet/telnetd.fth" " telnetd" $add-deflated-dropin + + " ${BP}/ofw/inet/telnetd.fth" " telnetd" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/bigx.di" $add-file " ${BP}/cpu/x86/pc/olpc/images/bigcheck.di" $add-file " ${BP}/cpu/x86/pc/olpc/images/leds.di" $add-file " ${BP}/cpu/x86/pc/olpc/images/ebook.di" $add-file - " nandblaster15_rx.bin" " nb15_rx" $add-deflated-dropin - " nandblaster_tx.bin" " nb_tx" $add-deflated-dropin -0 [if] - " ${BP}/cpu/x86/pc/olpc/images/tux.565" " tux.565" $add-deflated-dropin - " ${BP}/cpu/x86/pc/olpc/images/settings.565" " settings.565" $add-deflated-dropin -[then] - " ec.img" " ecimage.bin" $add-deflated-dropin - " ${BP}/clients/emacs/x86/emacs.rc" " emacs.rc" $add-deflated-dropin - " ${BP}/clients/emacs/emacs.hlp" " emacs.hlp" $add-deflated-dropin - " ${BP}/clients/emacs/arm/emacs" " emacs" $add-deflated-dropin +\ " ${BP}/cpu/x86/pc/olpc/images/warnings.565" " warnings.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/lightdot.565" " lightdot.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/yellowdot.565" " yellowdot.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/darkdot.565" " darkdot.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/lock.565" " lock.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/unlock.565" " unlock.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/plus.565" " plus.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/minus.565" " minus.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/x.565" " x.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/sad.565" " sad.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/bigdot.565" " bigdot.565" $add-deflated-dropin + + " ${BP}/cpu/x86/pc/olpc/images/check.565" " check.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/xogray.565" " xogray.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/ethernet.565" " ethernet.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/usbkey.565" " disk.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/wireless.565" " wlan.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/laptop.565" " int.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/sd.565" " ext.565" $add-deflated-dropin .( Dropin top is ) ofd @ fsize .x cr

1 0