openfirmware

openfirmware@openfirmware.info

3007 discussions

[commit] r3133 - cpu/x86/pc/olpc
by repository service 08 Aug '12

08 Aug '12

Author: quozl Date: Wed Aug 8 09:41:24 2012 New Revision: 3133 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3133 Log: OLPC - fsupdate, trivial typo Modified: cpu/x86/pc/olpc/fsupdate.fth Modified: cpu/x86/pc/olpc/fsupdate.fth ============================================================================== --- cpu/x86/pc/olpc/fsupdate.fth Wed Aug 8 09:36:09 2012 (r3132) +++ cpu/x86/pc/olpc/fsupdate.fth Wed Aug 8 09:41:24 2012 (r3133) @@ -158,7 +158,7 @@ ; : fs-update-from-list ( devlist$ -- ) - load-crypto if visible ." Crytpo load failed" cr show-sad security-failure then + load-crypto if visible ." Crypto load failed" cr show-sad security-failure then visible ( devlist$ ) begin dup while ( rem$ )

1 0

[commit] r3132 - in cpu/arm: mmp2 mmp3/thunderstone
by repository service 08 Aug '12

08 Aug '12

Author: quozl Date: Wed Aug 8 09:36:09 2012 New Revision: 3132 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3132 Log: ARM - TWSI, twsi-write takes an address and length, twsi-out takes bytes on stack, but both achieve the same Modified: cpu/arm/mmp2/boardtwsi.fth cpu/arm/mmp2/dsi.fth cpu/arm/mmp2/twsi.fth cpu/arm/mmp3/thunderstone/boardtwsi.fth Modified: cpu/arm/mmp2/boardtwsi.fth ============================================================================== --- cpu/arm/mmp2/boardtwsi.fth Wed Aug 8 09:32:58 2012 (r3131) +++ cpu/arm/mmp2/boardtwsi.fth Wed Aug 8 09:36:09 2012 (r3132) @@ -68,13 +68,13 @@ : init-pals ( -- ) h# b0 4 set-twsi-target \ Set PS parameters address - 0 1 twsi-write \ clear interrupt settings + 0 1 twsi-out \ clear interrupt settings h# 22 4 set-twsi-target \ Device init address - h# 10 1 twsi-write \ Init device + h# 10 1 twsi-out \ Init device h# 20 4 set-twsi-target \ Ambient Light Sensor address - 2 1 twsi-write \ Enable ALS in most sensitive mode, 16-bit data + 2 1 twsi-out \ Enable ALS in most sensitive mode, 16-bit data ; : als@ ( -- n ) h# 22 4 set-twsi-target \ Ambient Light Sensor LSB address Modified: cpu/arm/mmp2/dsi.fth ============================================================================== --- cpu/arm/mmp2/dsi.fth Wed Aug 8 09:32:58 2012 (r3131) +++ cpu/arm/mmp2/dsi.fth Wed Aug 8 09:36:09 2012 (r3132) @@ -6,10 +6,10 @@ : pmua! ( n offset -- ) pmua-pa + io! ; : dsi-twsi! ( l reg# -- ) - >r lbsplit swap 2swap swap r> wbsplit 6 twsi-write + >r lbsplit swap 2swap swap r> wbsplit 6 twsi-out ; : dsi-twsi-w! ( w reg# -- ) - >r wbsplit swap r> wbsplit 4 twsi-write + >r wbsplit swap r> wbsplit 4 twsi-out ; : dsi-twsi@ ( reg# -- l ) wbsplit 2 4 twsi-get bljoin ; : dsi-twsi-w@ ( reg# -- w ) wbsplit 2 2 twsi-get bwjoin ; Modified: cpu/arm/mmp2/twsi.fth ============================================================================== --- cpu/arm/mmp2/twsi.fth Wed Aug 8 09:32:58 2012 (r3131) +++ cpu/arm/mmp2/twsi.fth Wed Aug 8 09:36:09 2012 (r3132) @@ -145,7 +145,7 @@ bbu_ICR_STOP twsi-putbyte ( ) ; : twsi-write ( adr len -- ) - 0= if exit then ( adr len ) + dup 0= if 2drop exit then ( adr len ) slave-address twsi-start ( adr len ) 1- 0 ?do dup c@ 0 twsi-putbyte 1+ loop ( adr' ) Modified: cpu/arm/mmp3/thunderstone/boardtwsi.fth ============================================================================== --- cpu/arm/mmp3/thunderstone/boardtwsi.fth Wed Aug 8 09:32:58 2012 (r3131) +++ cpu/arm/mmp3/thunderstone/boardtwsi.fth Wed Aug 8 09:36:09 2012 (r3132) @@ -68,13 +68,13 @@ : init-pals ( -- ) h# b0 4 set-twsi-target \ Set PS parameters address - 0 1 twsi-write \ clear interrupt settings + 0 1 twsi-out \ clear interrupt settings h# 22 4 set-twsi-target \ Device init address - h# 10 1 twsi-write \ Init device + h# 10 1 twsi-out \ Init device h# 20 4 set-twsi-target \ Ambient Light Sensor address - 2 1 twsi-write \ Enable ALS in most sensitive mode, 16-bit data + 2 1 twsi-out \ Enable ALS in most sensitive mode, 16-bit data ; : als@ ( -- n ) h# 22 4 set-twsi-target \ Ambient Light Sensor LSB address

1 0

[commit] r3131 - cpu/arm/mmp2
by repository service 08 Aug '12

08 Aug '12

Author: quozl Date: Wed Aug 8 09:32:58 2012 New Revision: 3131 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3131 Log: ARM - MFPR, additional entries for MMP3 GPIOs Modified: cpu/arm/mmp2/mfpr.fth Modified: cpu/arm/mmp2/mfpr.fth ============================================================================== --- cpu/arm/mmp2/mfpr.fth Sat Aug 4 09:37:33 2012 (r3130) +++ cpu/arm/mmp2/mfpr.fth Wed Aug 8 09:32:58 2012 (r3131) @@ -31,7 +31,7 @@ 224 w, 228 w, 22C w, 230 w, 234 w, 238 w, 23C w, 240 w, \ 144->151 248 w, 24C w, 254 w, 258 w, 14C w, 150 w, 154 w, 158 w, \ 152->159 250 w, 210 w, 20C w, 208 w, 204 w, 1EC w, 1E8 w, 1E4 w, \ 160->167 - 1E0 w, \ 168 + 1E0 w, 2BC w, 2C0 w, 2C8 w, \ 168->171 : gpio>mfpr ( gpio# -- mfpr-pa ) mfpr-offsets swap wa+ w@ @@ -40,7 +40,7 @@ : dump-mfprs ( -- ) base @ - d# 169 0 do decimal i 3 u.r space i gpio>mfpr io@ 4 hex u.r cr loop + d# 172 0 do decimal i 3 u.r space i gpio>mfpr io@ 4 hex u.r cr loop base ! ;

1 0

[commit] r3130 - in cpu/arm/olpc: 1.75 3.0 cl4
by repository service 04 Aug '12

04 Aug '12

Author: wmb Date: Sat Aug 4 09:37:33 2012 New Revision: 3130 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3130 Log: OLPC ARM - factored UART and SDHCI stuff out of platform versions of fw.bth into separate files, added device node for internal SD on CL4. Added: cpu/arm/olpc/1.75/sdhci.fth cpu/arm/olpc/1.75/uart.fth cpu/arm/olpc/3.0/sdhci.fth cpu/arm/olpc/3.0/uart.fth cpu/arm/olpc/cl4/sdhci.fth cpu/arm/olpc/cl4/uart.fth Modified: cpu/arm/olpc/1.75/fw.bth cpu/arm/olpc/3.0/fw.bth cpu/arm/olpc/cl4/fw.bth Modified: cpu/arm/olpc/1.75/fw.bth ============================================================================== --- cpu/arm/olpc/1.75/fw.bth Fri Aug 3 23:23:39 2012 (r3129) +++ cpu/arm/olpc/1.75/fw.bth Sat Aug 4 09:37:33 2012 (r3130) @@ -21,41 +21,8 @@ : clx-touch? ( -- ) board-revision h# 3a18 >= ; : boot-dev-sel-gpio# ( -- n ) clx-touch? if 2 else d# 56 then ; -fload ${BP}/cpu/arm/olpc/emmc.fth - -\ Setup UART configuration -h# d4018000 to uart-base \ UART3 -devalias com1 /uart@d4018000 - -dev /uart@d4030000 \ UART1 - 0 " linux,unit#" integer-property -device-end - -dev /uart@d4017000 \ UART2 - " disabled" " status" string-property -device-end - -dev /uart@d4018000 \ UART3 - 1 " linux,unit#" integer-property -device-end - -dev /uart@d4016000 \ UART4 - " disabled" " status" string-property -device-end - -\ Device node for internal microSD -dev /sd - new-device - 1 encode-int " reg" property - fload ${BP}/dev/mmc/sdhci/sdmmc.fth - fload ${BP}/dev/mmc/sdhci/selftest.fth - " external" " slot-name" string-property - finish-device -device-end - -devalias int /sd/disk@3 -devalias ext /sd/disk@1 - +fload ${BP}/cpu/arm/olpc/1.75/uart.fth +fload ${BP}/cpu/arm/olpc/1.75/sdhci.fth fload ${BP}/cpu/arm/olpc/1.75/lcdcfg.fth fload ${BP}/cpu/arm/olpc/1.75/usb.fth fload ${BP}/cpu/arm/olpc/rm3150-touchscreen.fth Added: cpu/arm/olpc/1.75/sdhci.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/1.75/sdhci.fth Sat Aug 4 09:37:33 2012 (r3130) @@ -0,0 +1,14 @@ +fload ${BP}/cpu/arm/olpc/emmc.fth + +\ Device node for internal microSD +dev /sd + new-device + 1 encode-int " reg" property + fload ${BP}/dev/mmc/sdhci/sdmmc.fth + fload ${BP}/dev/mmc/sdhci/selftest.fth + " external" " slot-name" string-property + finish-device +device-end + +devalias int /sd/disk@3 +devalias ext /sd/disk@1 Added: cpu/arm/olpc/1.75/uart.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/1.75/uart.fth Sat Aug 4 09:37:33 2012 (r3130) @@ -0,0 +1,19 @@ +\ Setup UART configuration +h# d4018000 to uart-base \ UART3 +devalias com1 /uart@d4018000 + +dev /uart@d4030000 \ UART1 + 0 " linux,unit#" integer-property +device-end + +dev /uart@d4017000 \ UART2 + " disabled" " status" string-property +device-end + +dev /uart@d4018000 \ UART3 + 1 " linux,unit#" integer-property +device-end + +dev /uart@d4016000 \ UART4 + " disabled" " status" string-property +device-end Modified: cpu/arm/olpc/3.0/fw.bth ============================================================================== --- cpu/arm/olpc/3.0/fw.bth Fri Aug 3 23:23:39 2012 (r3129) +++ cpu/arm/olpc/3.0/fw.bth Sat Aug 4 09:37:33 2012 (r3130) @@ -9,29 +9,8 @@ fload ${BP}/cpu/arm/olpc/build-fw.fth -\ Setup UART configuration -h# d4018000 to uart-base \ UART3 -devalias com1 /uart@d4018000 - -dev /uart@d4030000 \ UART1 - 0 " linux,unit#" integer-property -device-end - -dev /uart@d4017000 \ UART2 - " disabled" " status" string-property -device-end - -dev /uart@d4018000 \ UART3 - 1 " linux,unit#" integer-property -device-end - -dev /uart@d4016000 \ UART4 - " disabled" " status" string-property -device-end - -fload ${BP}/cpu/arm/olpc/emmc.fth -devalias int /sd/disk@3 - +fload ${BP}/cpu/arm/olpc/3.0/uart.fth +fload ${BP}/cpu/arm/olpc/3.0/sdhci.fth fload ${BP}/cpu/arm/olpc/3.0/lcdcfg.fth fload ${BP}/cpu/arm/olpc/3.0/usb.fth fload ${BP}/cpu/arm/olpc/exc7200-touchscreen.fth Added: cpu/arm/olpc/3.0/sdhci.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/3.0/sdhci.fth Sat Aug 4 09:37:33 2012 (r3130) @@ -0,0 +1,2 @@ +fload ${BP}/cpu/arm/olpc/emmc.fth +devalias int /sd/disk@3 Added: cpu/arm/olpc/3.0/uart.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/3.0/uart.fth Sat Aug 4 09:37:33 2012 (r3130) @@ -0,0 +1,20 @@ + +\ Setup UART configuration +h# d4018000 to uart-base \ UART3 +devalias com1 /uart@d4018000 + +dev /uart@d4030000 \ UART1 + 0 " linux,unit#" integer-property +device-end + +dev /uart@d4017000 \ UART2 + " disabled" " status" string-property +device-end + +dev /uart@d4018000 \ UART3 + 1 " linux,unit#" integer-property +device-end + +dev /uart@d4016000 \ UART4 + " disabled" " status" string-property +device-end Modified: cpu/arm/olpc/cl4/fw.bth ============================================================================== --- cpu/arm/olpc/cl4/fw.bth Fri Aug 3 23:23:39 2012 (r3129) +++ cpu/arm/olpc/cl4/fw.bth Sat Aug 4 09:37:33 2012 (r3130) @@ -14,48 +14,8 @@ \ true to stand-init-debug? -\ Setup UART configuration -h# d4017000 to uart-base \ UART2 -devalias com1 /uart@d4017000 - -dev /uart@d4030000 \ UART1 - 0 " linux,unit#" integer-property -device-end - -dev /uart@d4017000 \ UART2 - 1 " linux,unit#" integer-property -device-end - -dev /uart@d4018000 \ UART3 - " disabled" " status" string-property -device-end - -dev /uart@d4016000 \ UART4 - " disabled" " status" string-property \ Used for touchscreen BSL -device-end - -dev /sd - new-device - 1 encode-int " reg" property - fload ${BP}/dev/mmc/sdhci/sdmmc.fth - fload ${BP}/dev/mmc/sdhci/selftest.fth - " external" " slot-name" string-property - finish-device -device-end - -devalias ext /sd/disk@1 -\ 2 is WLAN -devalias int /sd/disk@3 -devalias emmc /sd/disk@3 -\ Nothing on channel 4 -devalias int-sd /sd/disk@5 - -stand-init: - boot-dev-sel-gpio# gpio-pin@ 0= if - " int" " /sd/disk@5" $devalias - then -; - +fload ${BP}/cpu/arm/olpc/cl4/uart.fth +fload ${BP}/cpu/arm/olpc/cl4/sdhci.fth fload ${BP}/cpu/arm/olpc/1.75/lcdcfg.fth fload ${BP}/cpu/arm/olpc/1.75/usb.fth \ fload ${BP}/cpu/arm/olpc/nn-touchscreen.fth Added: cpu/arm/olpc/cl4/sdhci.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/cl4/sdhci.fth Sat Aug 4 09:37:33 2012 (r3130) @@ -0,0 +1,30 @@ +dev /sd + new-device + 1 encode-int " reg" property + fload ${BP}/dev/mmc/sdhci/sdmmc.fth + fload ${BP}/dev/mmc/sdhci/selftest.fth + " external" " slot-name" string-property + finish-device +device-end + +dev /sd + new-device + 5 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 +device-end + +devalias ext /sd/disk@1 +\ 2 is WLAN +devalias int /sd/disk@3 +devalias emmc /sd/disk@3 +\ Nothing on channel 4 +devalias int-sd /sd/disk@5 + +stand-init: + boot-dev-sel-gpio# gpio-pin@ 0= if + " int" " /sd/disk@5" $devalias + then +; Added: cpu/arm/olpc/cl4/uart.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/cl4/uart.fth Sat Aug 4 09:37:33 2012 (r3130) @@ -0,0 +1,19 @@ +\ Setup UART configuration +h# d4017000 to uart-base \ UART2 +devalias com1 /uart@d4017000 + +dev /uart@d4030000 \ UART1 + 0 " linux,unit#" integer-property +device-end + +dev /uart@d4017000 \ UART2 + 1 " linux,unit#" integer-property +device-end + +dev /uart@d4018000 \ UART3 + " disabled" " status" string-property +device-end + +dev /uart@d4016000 \ UART4 + " disabled" " status" string-property \ Used for touchscreen BSL +device-end

1 0

[commit] r3129 - forth/lib
by repository service 03 Aug '12

03 Aug '12

Author: wmb Date: Fri Aug 3 23:23:39 2012 New Revision: 3129 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3129 Log: Debugger - added longer stack display to visual mode. Modified: forth/lib/debug.fth Modified: forth/lib/debug.fth ============================================================================== --- forth/lib/debug.fth Fri Aug 3 23:10:03 2012 (r3128) +++ forth/lib/debug.fth Fri Aug 3 23:23:39 2012 (r3129) @@ -126,17 +126,27 @@ 0 value stack-line d# 45 constant stack-column \ 0 0 2value result-loc +0 0 2value full-stack-xy 0 value result-line 0 value result-col : to-stack-location ( -- ) stack-column stack-line at-xy kill-line ; +: show-full-stack ( -- ) + full-stack-xy at-xy kill-line + depth 0< if ." Stack Underflow" exit then \ Don't clear stack here + depth 0= if ." Empty" exit then + depth 7 > if ." .. " then + depth depth 7 - 0 max ?do depth i - 1- pick n. loop +; : show-partial-stack ( -- ) + show-full-stack + to-stack-location ." \ " depth 0< if ." Stack Underflow" sp0 @ sp! exit then depth 0= if ." Empty" exit then - depth 4 > if ." .. " then - depth depth 5 - 0 max ?do depth i - 1- pick n. loop + depth 3 > if ." .. " then + depth depth 4 - 0 max ?do depth i - 1- pick n. loop ; \ : save-result-loc ( -- ) #out @ #line @ to result-loc ; @@ -191,6 +201,7 @@ d# 70 rmargin ! ." Callers: " rp0 @ the-rp na1+ rslist kill-line cr d# 40 rmargin ! + ." Stack: " #out @ #line @ to full-stack-xy cr \ For stack the-ip debug-see cr \ Display the initial stack on the cursor line

1 0

[commit] r3128 - forth/lib
by repository service 03 Aug '12

03 Aug '12

Author: wmb Date: Fri Aug 3 23:10:03 2012 New Revision: 3128 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3128 Log: Debugger - improvements to visual mode - less likely to lose track of the screen position, new L keystroke to force redisplay. Modified: forth/lib/debug.fth Modified: forth/lib/debug.fth ============================================================================== --- forth/lib/debug.fth Fri Aug 3 10:48:38 2012 (r3127) +++ forth/lib/debug.fth Fri Aug 3 23:10:03 2012 (r3128) @@ -118,6 +118,7 @@ ." \ Display Forth return stack as numbers (like the data stack)" cr ." Q Quit: abandon execution of the debugged word" cr ." V Visual: toggle between 2-D and scrolling" cr + ." L Visual: redisplay" cr ; d# 24 constant cmd-column : to-cmd-column ( -- ) cmd-column to-column ; @@ -141,7 +142,7 @@ \ : save-result-loc ( -- ) #out @ #line @ to result-loc ; \ : to-result-loc ( -- ) result-loc at-xy ; : save-result-loc ( -- ) #out @ to result-col #line @ to result-line ; -: to-result-loc ( -- ) result-col result-line at-xy ; +: to-result-loc ( -- ) result-col result-line 2dup at-xy #line ! #out ! ; \ set-package is a hook for Open Firmware. When Open Firmware is loaded, \ set-package should be set to a word that sets the active package to the @@ -187,6 +188,7 @@ page d# 78 rmargin ! .debug-short-help + d# 70 rmargin ! ." Callers: " rp0 @ the-rp na1+ rslist kill-line cr d# 40 rmargin ! the-ip debug-see @@ -235,6 +237,7 @@ : debug-interact ( -- ) save# begin + setup-debug-display step? @ if to-debug-window then show-debug-stack step? @ key? or if @@ -269,6 +272,7 @@ ascii * of the-ip find-cfa dup <ip ! 'unnest ip> ! false endof ascii \ of show-rstack @ 0= show-rstack ! false endof \ toggle return stack display ascii X of hex-stack @ 0= hex-stack ! false endof \ toggle heX stack display + ascii L of true to redisplay? false endof \ Redisplay ascii V of \ toggle Visual (2D) mode scrolling-debug? 0= to scrolling-debug? scrolling-debug? 0= if true to redisplay? then false @@ -284,7 +288,6 @@ : (trace ( -- ) ip@ to the-ip rp@ to the-rp - setup-debug-display debug-interact \ scrolling-debug? 0= if to-result-loc then the-ip token@ dup ['] unnest = swap ['] exit = or if

1 0

[commit] r3127 - cpu/arm/olpc
by repository service 03 Aug '12

03 Aug '12

Author: wmb Date: Fri Aug 3 10:48:38 2012 New Revision: 3127 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3127 Log: Q7A01' - removed startup bailouts, now that things are mostly working. Modified: cpu/arm/olpc/banner.fth cpu/arm/olpc/build-fw.fth Modified: cpu/arm/olpc/banner.fth ============================================================================== --- cpu/arm/olpc/banner.fth Fri Aug 3 10:32:02 2012 (r3126) +++ cpu/arm/olpc/banner.fth Fri Aug 3 10:48:38 2012 (r3127) @@ -65,9 +65,6 @@ ; : .storage ( -- ) -[ifdef] olpc-cl4 -." olpc/banner.fth: Skipping .storage" cr exit -[then] internal-disk-present? 0= if ( ) get-internal-disk-info ( ) then Modified: cpu/arm/olpc/build-fw.fth ============================================================================== --- cpu/arm/olpc/build-fw.fth Fri Aug 3 10:32:02 2012 (r3126) +++ cpu/arm/olpc/build-fw.fth Fri Aug 3 10:48:38 2012 (r3127) @@ -871,9 +871,6 @@ auto-banner? if banner then \+ use-screen-kbd ?text-on -[ifdef] olpc-cl4 - ." Quitting before auto-boot" cr visible banner quit -[then] auto-boot \+ use-screen-kbd close-hotspot

1 0

[commit] r3126 - cpu/arm/olpc/cl4
by repository service 03 Aug '12

03 Aug '12

Author: wmb Date: Fri Aug 3 10:32:02 2012 New Revision: 3126 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3126 Log: Q7A01 Modified: cpu/arm/olpc/cl4/fw-version.fth Modified: cpu/arm/olpc/cl4/fw-version.fth ============================================================================== --- cpu/arm/olpc/cl4/fw-version.fth Fri Aug 3 09:59:01 2012 (r3125) +++ cpu/arm/olpc/cl4/fw-version.fth Fri Aug 3 10:32:02 2012 (r3126) @@ -1,7 +1,7 @@ \ The overall firmware revision macro: FW_PREFIX Q7 macro: FW_MAJOR A -macro: FW_MINOR 00 +macro: FW_MINOR 01 \ Create a 2-character build/fw-suffix file to personalize your test builds " fw-suffix" $file-exists? [if]

1 0

[commit] r3125 - cpu/arm/olpc
by repository service 03 Aug '12

03 Aug '12

Author: wmb Date: Fri Aug 3 09:59:01 2012 New Revision: 3125 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3125 Log: ## Lines starting with '## ' will be removed from the log message. ## File(s) to commit recursively: ## cpu/arm/mmp2/initmmu.fth OLPC XO-1.75 - Fix another screwup in recent checkin that broke XO-1.75 startup. Modified: cpu/arm/olpc/sound.fth Modified: cpu/arm/olpc/sound.fth ============================================================================== --- cpu/arm/olpc/sound.fth Fri Aug 3 09:54:02 2012 (r3124) +++ cpu/arm/olpc/sound.fth Fri Aug 3 09:59:01 2012 (r3125) @@ -23,7 +23,7 @@ h# 240 +pmua constant audio-sram-pwr [then] -: audio-clock! ( -- ) audio-clk pmua! ; +: audio-clock! ( -- ) audio-clk io! ; : audio-clock-off ( -- ) 0 h# 38 sspa! 0 audio-clock!

1 0

[commit] r3124 - cpu/arm/olpc
by repository service 03 Aug '12

03 Aug '12

Author: pgf Date: Fri Aug 3 09:54:02 2012 New Revision: 3124 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3124 Log: bsl.fth: fixes for preserving calibration data Modified: cpu/arm/olpc/bsl.fth Modified: cpu/arm/olpc/bsl.fth ============================================================================== --- cpu/arm/olpc/bsl.fth Fri Aug 3 09:53:53 2012 (r3123) +++ cpu/arm/olpc/bsl.fth Fri Aug 3 09:54:02 2012 (r3124) @@ -3,11 +3,54 @@ \ devalias bsl /uart@NNNN:9600,8,e,1//bsl-protocol +\ the MSP430 BSL has the annoying trait that it will self-erase if +\ an incorrect password is used to access its restricted functions. +\ worse, the self-erase includes the factory-supplied calibration +\ values. happily, if a specific interrupt vector (at address +\ 0xffde) is set to null, using a bad password won't cause an +\ erase. but that still leaves us with the inability to program +\ the flash. +\ +\ there are several cases to consider: +\ +\ - a fresh, blank chip, with calibration data. +\ the password for this chip is all-ff. +\ - a programmed chip, with calibration data. +\ the password for this chip is supplied by neonode. +\ - a mishandled chip: blank, with no calibration data +\ the password for this chip is all-ff. +\ +\ when programming, _always_ finish by writing 0000 to 0xffde. +\ this ensures that a subsequent bad password will preserve +\ calibration data. neonode has already said that their firmware +\ will set that value to 0, but this ensures it for any image +\ written. +\ +\ to erase the chip, and leave it accessible for programming: +\ +\ send an all-ff password, +\ if nak'd, send the neonode password. +\ if nak'd, send the all-ff password (again, in case erase has occurred) +\ if nak'd, we're hosed, give up. +\ +\ \ we were acked (one of those passwords worked) +\ send the 'erase main' command +\ write 0000 to ffde +\ +\ if the calibration data is missing (i.e., all-ff), +\ program and run a calibration program, which should +\ write new calibration values +\ send the 'erase main' command +\ +\ program the new image + \ This is platform-dependent : setup-gpios ( -- ) -\ The pin setup should be done in CForth, but it's complicated by the fact that the touch-enabled CL2 uses GPIO 56 differently from the ordinary one +\ The pin setup should be done in CForth, but it's complicated by +\ the fact that the touch-enabled CL2 uses GPIO 56 differently from +\ the ordinary one [ifdef] olpc-cl2 3 d# 55 af! 3 d# 56 af! [then] \ Setup pins for UART2 0 touch-tck-gpio# af! \ Set to GPIO function 1 touch-rst-gpio# af! \ Set to GPIO function (AF0 is SM_BELn for this pin) @@ -90,7 +133,7 @@ : flush-bsl get-msecs d# 2000 + ( limit ) begin - receive? 0= if exit then ( limit char ) + receive? 0= if drop exit then ( limit char ) drop dup get-msecs - 0< ( limit timeout? ) until drop true abort" BSL flush timeout" @@ -119,7 +162,7 @@ drop true exit ( -- true ) endof h# a0 of ( limit ) - ." NAK!" + \ ." NAK!" drop false exit endof endcase @@ -180,16 +223,24 @@ dup h# 10 frame( ( adr len ) send-xx send-xx ( adr len ) send-data ( ) - )frame + )frame-no-ack ; + + : ff-password ( -- ) - " "(ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff)" + " "(ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff)" rx-password ; : 00-password ( -- ) - " "(00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ff)" + " "(00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00)" rx-password ; + +: neo-password ( -- ) + " "(30 fe 30 fe 00 fe 04 fe 30 fe 08 fe 0c fe 10 fe 14 fe 18 fe 1c fe 30 fe 20 fe 24 fe 28 fe 2c fe)" + rx-password +; + : (erase) ( device-adr code -- ) swap ( device-adr code ) 0 h# 16 frame( ( code device-adr ) @@ -198,8 +249,18 @@ )frame ; : erase-segment ( device-adr -- ) h# a502 (erase) ; -: erase-main ( device-adr -- ) h# a504 (erase) ; +: erase-main ( -- ) h# 8000 h# a504 (erase) ; +: erase-info ( -- ) h# 1000 h# a504 (erase) ; : mass-erase ( -- ) 0 h# a506 (erase) ; + +: erase-check ( device-adr len -- ) + swap ( len device-adr ) + 0 h# 1c frame( ( len device-adr ) + send-summed ( len ) + send-summed + )frame-no-ack +; + : change-baud-rate ( d3 d2 d1 -- ) 0 h# 20 frame( ( d3 d2 d1 ) swap bwjoin send-summed ( d3 ) @@ -269,11 +330,37 @@ r> 3drop ; +: null-ffde! ( -- ) + " "(00 00)" h# ffde rx-data-block +; + +: calibration-missing ( -- missing? ) + h# 1000 h# 100 erase-check ack? +; + +: do-calibration ( -- ) + \ erase-info + \ FIXME +; + : force-erase ( -- ) rst-bsl - ['] 00-password catch drop - rst-bsl - ff-password + ff-password ack? dup 0= if + drop + neo-password ack? dup 0= if + drop + ff-password ack? dup 0= if + drop + ." BSL is locked" exit + then + then + then + erase-main + null-ffde! + + calibration-missing if + do-calibration null-ffde! + then ; \ Decoder for TI TXT file format @@ -310,7 +397,7 @@ true abort" TI TXT Line too long!" ; : ti-txt-handle-line ( adr len -- ) - dup 0= if 2drop exit then ( adr len ) + dup 0= if 2drop cr exit then ( adr len ) over c@ case [char] @ of ( adr len ) 1 /string hex-number to next-address @@ -328,11 +415,17 @@ 0 value ihex-hi-adr : ihex-handle-line ( adr len -- ) - dup 0= if 2drop exit then ( adr len ) + dup 0= if 2drop cr exit then ( adr len ) + \ 2dup type cr parse-ihex-record ( data-adr data-len offset type ) case 0 of \ Data ( data-adr data-len offset ) - ihex-hi-adr + rx-data-block ( ) + ihex-hi-adr + ( data-adr dat-len absaddr ) + \ the BSL protocol needs even lengths, so + \ force the record length to even + \ (yes, this may program write garbage to the extra byte.) + swap dup 1 and if 1 + then swap ( data-adr evenlen absaddr ) + rx-data-block ( ) endof 1 of \ End of file ( data-adr data-len offset ) 3drop ( )

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

openfirmware