openfirmware August 2012

openfirmware@openfirmware.info

1 participants
154 discussions

[commit] r3139 - dev
by repository service 09 Aug '12

09 Aug '12

Author: quozl Date: Thu Aug 9 02:54:24 2012 New Revision: 3139 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3139 Log: OLPC XO-1.5 XO-1.75 - libertas, add baseband register fetch to show currently used antenna Modified: dev/libertas.fth Modified: dev/libertas.fth ============================================================================== --- dev/libertas.fth Thu Aug 9 01:31:49 2012 (r3138) +++ dev/libertas.fth Thu Aug 9 02:54:24 2012 (r3139) @@ -2194,6 +2194,12 @@ 2 .r ; +: .bpp-antenna ( antenna -- ) + dup h# 30 = if ." 1" drop exit then + dup h# 70 = if ." 2" drop exit then + 2 .r +; + : show-antenna ( -- ) base @ ( base ) get-rssi ( base avg_nf avg_snr nf snr ) @@ -2203,7 +2209,10 @@ get-antenna ( base antenna ) hex ." ant" .antenna ( base ) - ." " + ." rx " + h# 3f bbp-reg@ .bpp-antenna + ." tx " + h# 40 bbp-reg@ .bpp-antenna base ! ;

1 0

[commit] r3138 - cpu/arm/olpc/cl4
by repository service 08 Aug '12

08 Aug '12

Author: wmb Date: Thu Aug 9 01:31:49 2012 New Revision: 3138 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3138 Log: Q7A02 Modified: cpu/arm/olpc/cl4/fw-version.fth Modified: cpu/arm/olpc/cl4/fw-version.fth ============================================================================== --- cpu/arm/olpc/cl4/fw-version.fth Thu Aug 9 01:30:02 2012 (r3137) +++ cpu/arm/olpc/cl4/fw-version.fth Thu Aug 9 01:31:49 2012 (r3138) @@ -1,7 +1,7 @@ \ The overall firmware revision macro: FW_PREFIX Q7 macro: FW_MAJOR A -macro: FW_MINOR 01 +macro: FW_MINOR 02 \ Create a 2-character build/fw-suffix file to personalize your test builds " fw-suffix" $file-exists? [if]

1 0

[commit] r3137 - cpu/arm/mmp2 cpu/arm/olpc cpu/arm/olpc/1.75 cpu/arm/olpc/3.0 cpu/arm/olpc/cl4 ofw/wifi
by repository service 08 Aug '12

08 Aug '12

Author: wmb Date: Thu Aug 9 01:30:02 2012 New Revision: 3137 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3137 Log: OLPC ARM - Use software for SHA1 and MD5 hashes instead of the MMP2 hash accelerator, which I haven't gotten to work on MMP3. Added: cpu/arm/mmp2/random.fth Modified: cpu/arm/mmp2/hash.fth cpu/arm/olpc/1.75/crypto-version.fth cpu/arm/olpc/3.0/crypto-version.fth cpu/arm/olpc/cl4/crypto-version.fth cpu/arm/olpc/prefw.fth ofw/wifi/hmacsha1.fth Modified: cpu/arm/mmp2/hash.fth ============================================================================== --- cpu/arm/mmp2/hash.fth Thu Aug 9 01:27:09 2012 (r3136) +++ cpu/arm/mmp2/hash.fth Thu Aug 9 01:30:02 2012 (r3137) @@ -1,6 +1,7 @@ \ See license at end of file purpose: Hashes (MD5, SHA1, SHA-256) using Marvell hardware acceleration +[ifdef] use-mmp2-hashes h# 8101 constant dval : dma>hash ( adr len -- ) 4 round-up 2 rshift h# 29080c io! ( adr ) @@ -119,48 +120,8 @@ : sha1-init use-sha1 hash-init ; : sha1-update hash-update ; : sha1-final hash-final drop to sha1-digest ; - -: ebg-set ( n -- ) h# 292c00 io@ or h# 292c00 io! ; -: ebg-clr ( n -- ) invert h# 292c00 io@ and h# 292c00 io! ; - -0 [if] -\ This is the procedure recommended by the datasheet, but it doesn't work -: init-entropy-digital ( -- ) -\ h# ffffffff ebg-clr \ All off - h# 00008000 ebg-set \ Digital entropy mode - h# 00000400 ebg-clr \ RNG reset - h# 00000200 ebg-set \ Bias power up - d# 400 us - h# 00000100 ebg-set \ Fast OSC enable - h# 00000080 ebg-set \ Slow OSC enable - h# 02000000 ebg-set \ Downsampling ratio - h# 00110000 ebg-set \ Slow OSC divider - h# 00000400 ebg-set \ RNG unreset - h# 00000040 ebg-set \ Post processor enable - h# 00001000 ebg-set -; -[else] -\ This procedure works -: init-entropy ( -- ) \ Using digital method - h# 21117c0 h# 292c00 io! -; [then] -: random-short ( -- w ) - begin h# 292c04 io@ dup 0>= while drop repeat - h# ffff and -; -: random-byte ( -- b ) random-short 2/ h# ff and ; -: random-long ( -- l ) - random-short random-short wljoin -; -alias random random-long - -stand-init: Random number generator - h# 1b h# 68 pmua! \ Ensure WTM clock is enabled - init-entropy -; - \ LICENSE_BEGIN \ Copyright (c) 2010 FirmWorks \ Added: cpu/arm/mmp2/random.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/mmp2/random.fth Thu Aug 9 01:30:02 2012 (r3137) @@ -0,0 +1,67 @@ +\ See license at end of file +purpose: Random numbers using Marvell hardware acceleration + +0 [if] +: ebg-set ( n -- ) h# 292c00 io@ or h# 292c00 io! ; +: ebg-clr ( n -- ) invert h# 292c00 io@ and h# 292c00 io! ; + +\ This is the procedure recommended by the datasheet, but it doesn't work +: init-entropy-digital ( -- ) +\ h# ffffffff ebg-clr \ All off + h# 00008000 ebg-set \ Digital entropy mode + h# 00000400 ebg-clr \ RNG reset + h# 00000200 ebg-set \ Bias power up + d# 400 us + h# 00000100 ebg-set \ Fast OSC enable + h# 00000080 ebg-set \ Slow OSC enable + h# 02000000 ebg-set \ Downsampling ratio + h# 00110000 ebg-set \ Slow OSC divider + h# 00000400 ebg-set \ RNG unreset + h# 00000040 ebg-set \ Post processor enable + h# 00001000 ebg-set +; +[else] +\ This procedure works +: init-entropy ( -- ) \ Using digital method + h# 21117c0 h# 292c00 io! +; +[then] + +: random-short ( -- w ) + begin h# 292c04 io@ dup 0>= while drop repeat + h# ffff and +; +: random-byte ( -- b ) random-short 2/ h# ff and ; +: random-long ( -- l ) + random-short random-short wljoin +; +alias random random-long + +stand-init: Random number generator + h# 1b h# 68 pmua! \ Ensure WTM clock is enabled + init-entropy +; + +\ LICENSE_BEGIN +\ Copyright (c) 2010 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 Modified: cpu/arm/olpc/1.75/crypto-version.fth ============================================================================== --- cpu/arm/olpc/1.75/crypto-version.fth Thu Aug 9 01:27:09 2012 (r3136) +++ cpu/arm/olpc/1.75/crypto-version.fth Thu Aug 9 01:30:02 2012 (r3137) @@ -3,4 +3,4 @@ \ macro: KEYS testkeys \ The bios_verify image -macro: CRYPTO_VERSION 0.5-ARM +macro: CRYPTO_VERSION 0.6-ARM Modified: cpu/arm/olpc/3.0/crypto-version.fth ============================================================================== --- cpu/arm/olpc/3.0/crypto-version.fth Thu Aug 9 01:27:09 2012 (r3136) +++ cpu/arm/olpc/3.0/crypto-version.fth Thu Aug 9 01:30:02 2012 (r3137) @@ -3,4 +3,4 @@ \ macro: KEYS testkeys \ The bios_verify image -macro: CRYPTO_VERSION 0.5-ARM +macro: CRYPTO_VERSION 0.6-ARM Modified: cpu/arm/olpc/cl4/crypto-version.fth ============================================================================== --- cpu/arm/olpc/cl4/crypto-version.fth Thu Aug 9 01:27:09 2012 (r3136) +++ cpu/arm/olpc/cl4/crypto-version.fth Thu Aug 9 01:30:02 2012 (r3137) @@ -3,4 +3,4 @@ \ macro: KEYS testkeys \ The bios_verify image -macro: CRYPTO_VERSION 0.5-ARM +macro: CRYPTO_VERSION 0.6-ARM Modified: cpu/arm/olpc/prefw.fth ============================================================================== --- cpu/arm/olpc/prefw.fth Thu Aug 9 01:27:09 2012 (r3136) +++ cpu/arm/olpc/prefw.fth Thu Aug 9 01:30:02 2012 (r3137) @@ -150,8 +150,9 @@ fload ${BP}/cpu/arm/mmp2/socregs.fth \ MMP2 registers used by many functional units -fload ${BP}/cpu/arm/mmp2/hash.fth \ Hashes - SHA1, SHA-256, MD5 +fload ${BP}/cpu/arm/mmp2/random.fth \ Random numbers fload ${BP}/cpu/x86/pc/olpc/crypto.fth \ Cryptographic image validation +fload ${BP}/cpu/arm/olpc/swhash.fth \ Hashes - SHA1, SHA-256, MD5 fload ${BP}/cpu/x86/pc/olpc/lzip.fth \ Access zip images from memory fload ${BP}/ofw/inet/loadtcp.fth Modified: ofw/wifi/hmacsha1.fth ============================================================================== --- ofw/wifi/hmacsha1.fth Thu Aug 9 01:27:09 2012 (r3136) +++ ofw/wifi/hmacsha1.fth Thu Aug 9 01:30:02 2012 (r3137) @@ -36,27 +36,28 @@ sha1-tkey /sha1-digest ( key$ ) then ; +[ifndef] sha1-n +: sha1-n ( datan$..data1$ n -- digest$ ) + sha1-init + 0 ?do sha1-update loop + sha1-final + sha1-digest /sha1-digest ( digest$ ) +; +[then] : hmac-sha1 ( datan$..data1$ n key$ -- digest$ ) - ?sha1-reset-key ( datan$..data1$ n key$' ) - 2dup key>keypad >r >r ( datan$..data1$ n ) ( R: key$ ) + ?sha1-reset-key 2>r ( datan$..data1$ n ) ( R: key$' ) \ sha1-idigest = SHA1(K XOR ipad, text) - keypad h# 36 xor-keypad ( datan$..data1$ n ) ( R: key$ ) - sha1-init ( datan$..data1$ n ) ( R: key$ ) - keypad /keypad sha1-update ( datan$..data1$ n ) ( R: key$ ) - 0 ?do sha1-update loop ( ) ( R: key$ ) - sha1-final ( ) ( R: key$ ) - sha1-digest sha1-idigest /sha1-digest move ( ) ( R: key$ ) + 2r@ key>keypad ( datan$..data1$ n ) ( R: key$ ) + keypad h# 36 xor-keypad ( datan$..data1$ n ) - \ sha1-digest = SHA1(K XOR opad, sha1-idigest) - r> r> key>keypad ( ) + keypad /keypad rot 1+ sha1-n ( digest$ ) ( R: key$ ) + sha1-idigest swap move ( ) ( R: key$ ) + + 2r> key>keypad ( ) keypad h# 5c xor-keypad - sha1-init - keypad /keypad sha1-update - sha1-idigest /sha1-digest sha1-update - sha1-final - sha1-digest /sha1-digest ( digest$ ) + sha1-idigest /sha1-digest keypad /keypad 2 sha1-n ( digest$ ) ; \ ---------------------------------------------------------------------------- @@ -74,8 +75,8 @@ /sha1-digest buffer: temp \ Last digest /sha1-digest buffer: temp2 \ Current digest : (pbkdf2-sha1) ( passphrase$ ssid$ -- ) - 2over >r >r ( passphrase$ ssid$ ) ( R: passphrase$ ) - pbkdf2-cnt-buf 4 2swap 2 r> r> hmac-sha1 ( passphrase$ digest$ ) + 2over 2>r ( passphrase$ ssid$ ) ( R: passphrase$ ) + pbkdf2-cnt-buf 4 2swap 2 2r> hmac-sha1 ( passphrase$ digest$ ) temp2 swap move ( passphrase$ ) d# 4096 1 do sha1-digest temp /sha1-digest move ( passphrase$ ) @@ -89,8 +90,8 @@ 0 to pbkdf2-cnt begin dup 0> while ( passphrase$ ssid$ psk$ ) pbkdf2-cnt++ ( passphrase$ ssid$ psk$ ) - >r >r 2over 2over (pbkdf2-sha1) ( passphrase$ ssid$ ) ( R: psk$ ) - r> r> 2dup /sha1-digest min sha1-digest -rot move ( passphrase$ ssid$ psk$ ) + 2>r 2over 2over (pbkdf2-sha1) ( passphrase$ ssid$ ) ( R: psk$ ) + 2r> 2dup /sha1-digest min sha1-digest -rot move ( passphrase$ ssid$ psk$ ) /sha1-digest /string ( passphrase$ ssid$ psk$' ) repeat 2drop 2drop 2drop ( ) ; @@ -101,15 +102,14 @@ : sha1-prf ( key$ label$ data$ result$ -- ) 0 prf-cnt c! begin dup 0> while ( key$ label$ data$ result$ ) - >r >r ( key$ label$ data$ ) ( R: result$ ) + 2>r ( key$ label$ data$ ) ( R: result$ ) prf-cnt 1 2over zero$ ( key$ label$ data$ cnt$ data$ zero$ ) ( R: result$ ) 9 pick 9 pick 4 ( key$ label$ data$ cnt$ data$ zero$ label$ n ) ( R: result$ ) d# 14 pick d# 14 pick hmac-sha1 ( key$ label$ data$ digest$ ) ( R: result$ ) - r> r> 2swap 2over rot min move ( key$ label$ data$ result$ ) + 2r> 2swap 2over rot min move ( key$ label$ data$ result$ ) /sha1-digest /string ( key$ label$ data$ result$' ) prf-cnt c@ 1+ prf-cnt c! ( key$ label$ data$ result$ ) repeat 2drop 2drop 2drop 2drop ( ) - ;

1 0

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

08 Aug '12

Author: wmb Date: Thu Aug 9 01:27:09 2012 New Revision: 3136 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3136 Log: OLPC ARM - Added Realtek audio codec device node. Modified: cpu/arm/mmp2/twsi.fth Modified: cpu/arm/mmp2/twsi.fth ============================================================================== --- cpu/arm/mmp2/twsi.fth Wed Aug 8 09:46:52 2012 (r3135) +++ cpu/arm/mmp2/twsi.fth Thu Aug 9 01:27:09 2012 (r3136) @@ -180,20 +180,27 @@ ; \ baseadr clk irq mux? fast? unit# -\ h# d4011000 1 7 false true N make-twsi-node \ TWSI1 + h# d4011000 1 7 false true 2 make-twsi-node \ TWSI1 \ h# d4031000 2 0 true true N make-twsi-node \ TWSI2 \ h# d4032000 3 1 true true N make-twsi-node \ TWSI3 h# d4033000 4 2 true true 0 make-twsi-node \ TWSI4 \ h# d4038000 d# 30 3 true true N make-twsi-node \ TWSI5 h# d4034000 d# 31 4 true true 1 make-twsi-node \ TWSI6 -0 0 " 30" " /i2c@d4033000" begin-package \ TWSI + +0 0 " 34" " /i2c@d4011000" begin-package \ TWSI1 + " audio-codec" name + " realtek,alc5631" +compatible + my-address my-space 1 reg +end-package + +0 0 " 30" " /i2c@d4033000" begin-package \ TWSI4 " touchscreen" name " raydium_ts" +compatible my-address my-space 1 reg end-package -0 0 " 19" " /i2c@d4034000" begin-package +0 0 " 19" " /i2c@d4034000" begin-package \ TWSI6 " accelerometer" name " lis3lv02d" +compatible my-address my-space 1 reg

1 0

[commit] r3135 - cpu/arm/olpc/cl4
by repository service 08 Aug '12

08 Aug '12

Author: quozl Date: Wed Aug 8 09:46:52 2012 New Revision: 3135 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3135 Log: OLPC XO-4 - Neonode, add GPIO for Data Ready signal, is low when I2C is readable, goes high on receipt of I2C address. Modified: cpu/arm/olpc/cl4/gpiopins.fth Modified: cpu/arm/olpc/cl4/gpiopins.fth ============================================================================== --- cpu/arm/olpc/cl4/gpiopins.fth Wed Aug 8 09:42:36 2012 (r3134) +++ cpu/arm/olpc/cl4/gpiopins.fth Wed Aug 8 09:46:52 2012 (r3135) @@ -62,6 +62,7 @@ d# 12 constant touch-hd-gpio# d# 139 constant touch-tck-gpio# d# 98 constant touch-rst-gpio# +d# 99 constant touch-scr-gpio# d# 3 constant soc-sel-gpio#

1 0

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

08 Aug '12

Author: quozl Date: Wed Aug 8 09:42:36 2012 New Revision: 3134 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3134 Log: OLPC - oatstime, fix a typo, add name based virtual host support Modified: cpu/x86/pc/olpc/oatstime.fth Modified: cpu/x86/pc/olpc/oatstime.fth ============================================================================== --- cpu/x86/pc/olpc/oatstime.fth Wed Aug 8 09:41:24 2012 (r3133) +++ cpu/x86/pc/olpc/oatstime.fth Wed Aug 8 09:42:36 2012 (r3134) @@ -4,6 +4,9 @@ \ Set this to the name or IP address of the deployment's OATS server : server$ " 192.168.200.57" ; \ DNS name or IP address +\ Set this to the HTTP/1.1 name-based virtual host name of the OATS server +: host$ " antitheft.laptop.org" ; + \ Replace this key with a deployment-specific one create oats-pubkey " "(30 82 01 0a 02 82 01 01 00 cf 2c 9a 49 81 a9 dd)" $, @@ -306,7 +309,7 @@ server$ " set-server" $call-http d# 80 " connect" $call-http 0= abort" Can't connect to server" " POST /antitheft/1/ HTTP/1.1" http-write-line - " Host: antitheft.laptop.org" http-write-line + host$ " Host: %s" sprintf http-write-line " Content-Type: application/x-www-form-urlencoded" http-write-line dup " Content-Length: %d" sprintf http-write-line ( msg$ ) " " http-write-line ( msg$ ) @@ -341,7 +344,7 @@ d# 0 d# 59 numfield >r ( rem$ r: y m d h m ) d# 0 d# 59 numfield >r ( rem$ r: y m d h m s ) - 1 cut$ " Z" $= 0= abort" Expecting T in time" ( rem$ r: y m d h m s ) + 1 cut$ " Z" $= 0= abort" Expecting Z in time" ( rem$ r: y m d h m s ) 0<> abort" Junk after time" drop ( r: y m d h m s ) r> r> r> r> r> r> ;

1 0

[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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

openfirmware August 2012