openfirmware June 2011

openfirmware@openfirmware.info

3 participants
87 discussions

[commit] r2273 - clients/lib/arm cpu/arm/olpc/1.75
by repository service 14 Jun '11

14 Jun '11

Author: wmb Date: Tue Jun 14 04:38:55 2011 New Revision: 2273 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2273 Log: OLPC XO-1.75 trac #10884 - Nandblaster for ARM - tweaks to make it compile natively on koji2. Modified: clients/lib/arm/makefile cpu/arm/olpc/1.75/mcnand-version.fth Modified: clients/lib/arm/makefile ============================================================================== --- clients/lib/arm/makefile Tue Jun 14 04:20:57 2011 (r2272) +++ clients/lib/arm/makefile Tue Jun 14 04:38:55 2011 (r2273) @@ -2,10 +2,21 @@ # -fno-builtin has the effect of suppressing some warnings about # functions that conflict with gcc builtins -ARCH=/usr/local/arm -UTILS=$(ARCH)/arm-linux/bin -CC=$(UTILS)/gcc + +ifneq (arm, $(findstring arm,$(shell uname -p))) + # Cross-compiler setup + ARCH := /usr/local/arm + UTILS := $(ARCH)/arm-linux/bin + CC := $(UTILS)/gcc + LD := $(UTILS)/ld +else + CC := gcc +endif + CFLAGS = -I.. -O2 -mcpu=strongarm110 +ifeq (y, $(shell $(CC) -xc -c -fno-stack-protector /dev/null -o /dev/null 2>/dev/null && echo y)) + CFLAGS += -fno-stack-protector +endif all: libobp.a hello start.o Modified: cpu/arm/olpc/1.75/mcnand-version.fth ============================================================================== --- cpu/arm/olpc/1.75/mcnand-version.fth Tue Jun 14 04:20:57 2011 (r2272) +++ cpu/arm/olpc/1.75/mcnand-version.fth Tue Jun 14 04:38:55 2011 (r2273) @@ -3,6 +3,6 @@ \ With a specific ID, mcastnand.bth will download a tarball without .git stuff. \ With "test", mcastnand.bth will clone the git head if build/multicast-nand/ \ is not already present, then you can modify the git subtree as needed. -macro: MCNAND_VERSION 3975692c3311749185ec1ecba706388e3924a284 +macro: MCNAND_VERSION 3537d14318e0eac205dda2f8dcd524f24b9cabe3 \ macro: MCNAND_VERSION test \ macro: MCNAND_VERSION HEAD

1 0

[commit] r2272 - cpu/arm/olpc/1.75
by repository service 14 Jun '11

14 Jun '11

Author: quozl Date: Tue Jun 14 04:20:57 2011 New Revision: 2272 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2272 Log: OLPC XO-1.75 trac #10919 - tune accelerometer selftest based on two more laptop samples. Modified: cpu/arm/olpc/1.75/accelerometer.fth Modified: cpu/arm/olpc/1.75/accelerometer.fth ============================================================================== --- cpu/arm/olpc/1.75/accelerometer.fth Tue Jun 14 04:17:05 2011 (r2271) +++ cpu/arm/olpc/1.75/accelerometer.fth Tue Jun 14 04:20:57 2011 (r2272) @@ -55,9 +55,12 @@ \ The datasheet says the selftest change range is 3 to 32, but we \ give a little headroom on the high end to allow for external -\ vibration. Empirically, on the unit I tested, the measurement -\ was maxed out at 32. Typical is supposed to be 19. -: out-of-range? ( delta -- error? ) 3 d# 40 between 0= ; +\ vibration. Typical is supposed to be 19. +\ Empirically, measured maximums were: +\ - Mitch's unit, 32 +\ - James' A3, 41 (on rubber mat on bare ground) +\ - James' A2, 39 +: out-of-range? ( delta -- error? ) 3 d# 50 between 0= ; : error? ( dx dy dz -- error? ) out-of-range? if ." X axis error" cr 2drop true exit then ( dx dy )

1 0

[commit] r2271 - in cpu: arm arm/olpc/1.75 x86/pc/olpc/via
by repository service 14 Jun '11

14 Jun '11

Author: wmb Date: Tue Jun 14 04:17:05 2011 New Revision: 2271 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2271 Log: OLPC XO-1.75 trac #10884 - Nandblaster for ARM. Added: cpu/arm/bootascall.fth cpu/arm/olpc/1.75/mcastnand.bth cpu/arm/olpc/1.75/mcnand-version.fth Modified: cpu/arm/centry.fth cpu/arm/olpc/1.75/config.fth cpu/arm/olpc/1.75/fw.bth cpu/arm/olpc/1.75/olpc.bth cpu/x86/pc/olpc/via/mcastnand.bth Added: cpu/arm/bootascall.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/bootascall.fth Tue Jun 14 04:17:05 2011 (r2271) @@ -0,0 +1,135 @@ +\ See license at end of file +purpose: Return from "booted" programs as if they were Forth words + +variable rp-var +variable sp-var +rs-size buffer: rs-buf +ps-size buffer: ps-buf + +code save-forth-state ( -- ) + \ Copy the entire Forth data stack and return stack areas to a save area. + + \ Copy Data Stack + set r0,`'user# sp-var` + str sp,[up,r0] \ Save data stack pointer + + ldr r1,'user sp0 \ Top of data stack area + dec r1,`ps-size \ Bottom of data stack area + + set r0,`'user# ps-buf` + ldr r2,[up,r0] \ Address of data stack save area + + mov r3,`ps-size #` \ Size of data stack area + begin + decs r3,4 + ldr r0,[r1,r3] + str r0,[r2,r3] + 0= until + + + \ Return Stack + set r0,`'user# rp-var` + str rp,[up,r0] \ Save return stack pointer + + ldr r1,'user rp0 \ Top of return stack area + dec r1,`rs-size \ Bottom of return stack area + + set r0,`'user# rs-buf` + ldr r2,[up,r0] \ Address of return stack save area + + mov r3,`rs-size #` \ Size of return stack area + begin + decs r3,4 + ldr r0,[r1,r3] + str r0,[r2,r3] + 0= until +c; + +: undo-boot-return ( -- ) + ['] (quit) to user-interface +; + +code resume-forth-state ( -- ) + mrs r0,cpsr + orr r0,r0,#0x80 \ Set interrupt disable bit + msr cpsr,r0 + + \ Restore Data Stack + set r0,`'user# sp-var` + ldr sp,[up,r0] \ Save data stack pointer + + ldr r1,'user sp0 \ Top of data stack area + dec r1,`ps-size \ Bottom of data stack area + + set r0,`'user# ps-buf` + ldr r2,[up,r0] \ Address of data stack save area + + mov r3,`ps-size #` \ Size of data stack area + begin + decs r3,4 + ldr r0,[r2,r3] + str r0,[r1,r3] + 0= until + + + \ Restore Return Stack + set r0,`'user# rp-var` + ldr rp,[up,r0] \ Save return stack pointer + + ldr r1,'user rp0 \ Top of return stack area + dec r1,`rs-size \ Bottom of return stack area + + set r0,`'user# rs-buf` + ldr r2,[up,r0] \ Address of return stack save area + + mov r3,`rs-size #` \ Size of return stack area + begin + decs r3,4 + ldr r0,[r2,r3] + str r0,[r1,r3] + 0= until + + mrs r0,cpsr + bic r0,r0,#0x80 \ Clear interrupt disable bit + msr cpsr,r0 + + pop ip,rp +c; + +0 value saved-go-hook +: boot-as-call( ( -- ) + ps-buf drop rs-buf drop + ['] go-hook behavior to saved-go-hook + ['] save-forth-state to go-hook + ['] resume-forth-state to user-interface +; +: )boot-as-call ( -- ) + saved-go-hook to go-hook + ['] (quit) to user-interface +; +ps-buf drop rs-buf drop +: foo boot-as-call( emacs )boot-as-call cr ." Hello" cr ; + +\ 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/centry.fth ============================================================================== --- cpu/arm/centry.fth Tue Jun 14 04:10:25 2011 (r2270) +++ cpu/arm/centry.fth Tue Jun 14 04:17:05 2011 (r2271) @@ -34,7 +34,7 @@ ldr rp,'user rp0 \ Set return stack pointer ldr sp,'user sp0 \ Set data stack pointer - inc sp,1cell \ Account for the top of stack register + \ We don't increment sp because there is one item on the stack, in tos adr ip,'body cif-exec \ Set interpreter pointer c; Modified: cpu/arm/olpc/1.75/config.fth ============================================================================== --- cpu/arm/olpc/1.75/config.fth Tue Jun 14 04:10:25 2011 (r2270) +++ cpu/arm/olpc/1.75/config.fth Tue Jun 14 04:17:05 2011 (r2271) @@ -3,6 +3,7 @@ create olpc create trust-ec-keyboard create use-null-nvram +create use-elf fload ${BP}/cpu/arm/olpc/1.75/addrs.fth fload ${BP}/cpu/arm/mmp2/hwaddrs.fth Modified: cpu/arm/olpc/1.75/fw.bth ============================================================================== --- cpu/arm/olpc/1.75/fw.bth Tue Jun 14 04:10:25 2011 (r2270) +++ cpu/arm/olpc/1.75/fw.bth Tue Jun 14 04:17:05 2011 (r2271) @@ -260,9 +260,7 @@ ' pre-setup-for-linux to linux-pre-hook : show-temperature ( -- ) ; -: boot-as-call( ( -- ) ." Implement boot-as-call" cr ; -: )boot-as-call ( -- ) ; -\ fload ${BP}/cpu/x86/bootascall.fth +fload ${BP}/cpu/arm/bootascall.fth create use-thinmac fload ${BP}/cpu/x86/pc/olpc/wifichannel.fth fload ${BP}/cpu/x86/pc/olpc/via/nbtx.fth Added: cpu/arm/olpc/1.75/mcastnand.bth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/1.75/mcastnand.bth Tue Jun 14 04:17:05 2011 (r2271) @@ -0,0 +1,30 @@ +purpose: Fetch and compile the multicast NAND reflash program + +command: &builder &this +build-now + +fload ${BP}/cpu/arm/olpc/1.75/mcnand-version.fth + +1 [if] + " ${MCNAND_VERSION}" expand$ " test" $= [if] + " multicast-nand/Makefile" $file-exists? 0= [if] + " git clone -q git://dev.laptop.org/users/wmb/multicast-nand" expand$ $sh + [then] + [else] + " rm -rf multicast-nand" $sh + " wget -q -O multicast-nand.tar.gz http://dev.laptop.org/git/users/wmb/multicast-nand/snapshot/multicast-nand-…" expand$ $sh + " tar xfz multicast-nand.tar.gz" $sh + " mv multicast-nand-${MCNAND_VERSION} multicast-nand" expand$ $sh + " rm multicast-nand.tar.gz" $sh + [then] + + " (cd multicast-nand; make BPDIR=../../../../../.. OFW_CPU=arm nandblaster15_rx.bin nandblaster_tx.bin; cp nandblaster15_rx.bin nandblaster_tx.bin ..)" expand$ $sh +[else] + " (cd /home/wmb/Git/multicast-nand; make BPDIR=/home/wmb/ofw.test OFW_CPU=x86 nandblaster15_rx.bin nandblaster_tx.bin;)" $sh + " cp /home/wmb/Git/multicast-nand/*blaster*.bin ." expand$ $sh +[then] + +\ This forces the creation of a .log file, so we don't re-fetch +writing mcastnand.version +" ${MCNAND_VERSION}"n" expand$ ofd @ fputs +ofd @ fclose Added: cpu/arm/olpc/1.75/mcnand-version.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/1.75/mcnand-version.fth Tue Jun 14 04:17:05 2011 (r2271) @@ -0,0 +1,8 @@ +\ The multicast NAND updater code version +\ Use a specific git commit ID for a formal release or "test" for development. +\ With a specific ID, mcastnand.bth will download a tarball without .git stuff. +\ With "test", mcastnand.bth will clone the git head if build/multicast-nand/ +\ is not already present, then you can modify the git subtree as needed. +macro: MCNAND_VERSION 3975692c3311749185ec1ecba706388e3924a284 +\ macro: MCNAND_VERSION test +\ macro: MCNAND_VERSION HEAD Modified: cpu/arm/olpc/1.75/olpc.bth ============================================================================== --- cpu/arm/olpc/1.75/olpc.bth Tue Jun 14 04:10:25 2011 (r2270) +++ cpu/arm/olpc/1.75/olpc.bth Tue Jun 14 04:17:05 2011 (r2271) @@ -3,6 +3,7 @@ command: &builder &this in: ${BP}/cpu/arm/olpc/1.75/build/fw.img in: ${BP}/cpu/arm/olpc/1.75/build/resetvec.img +in: ${BP}/cpu/arm/olpc/1.75/build/mcastnand.bin in: sd8686.bin in: verify.img in: ${BP}/dev/usb2/device/hub/build/hub.fc @@ -143,10 +144,9 @@ " ${BP}/cpu/x86/pc/olpc/images/leds.di" $add-file " ${BP}/cpu/x86/pc/olpc/images/ebook.di" $add-file + " ${BP}/cpu/arm/olpc/1.75/build/nandblaster15_rx.bin" " nb15_rx" $add-deflated-dropin + " ${BP}/cpu/arm/olpc/1.75/build/nandblaster_tx.bin" " nb_tx" $add-deflated-dropin 0 [if] - " ${BP}/cpu/x86/pc/olpc/via/build/nandblaster15_rx.bin" " nb15_rx" $add-deflated-dropin - " ${BP}/cpu/x86/pc/olpc/via/build/nandblaster_tx.bin" " nb_tx" $add-deflated-dropin - " ${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] Modified: cpu/x86/pc/olpc/via/mcastnand.bth ============================================================================== --- cpu/x86/pc/olpc/via/mcastnand.bth Tue Jun 14 04:10:25 2011 (r2270) +++ cpu/x86/pc/olpc/via/mcastnand.bth Tue Jun 14 04:17:05 2011 (r2271) @@ -6,22 +6,22 @@ fload ${BP}/cpu/x86/pc/olpc/via/mcnand-version.fth 1 [if] -" ${MCNAND_VERSION}" expand$ " test" $= [if] - " multicast-nand/Makefile" $file-exists? 0= [if] - " git clone -q git://dev.laptop.org/users/wmb/multicast-nand" expand$ $sh + " ${MCNAND_VERSION}" expand$ " test" $= [if] + " multicast-nand/Makefile" $file-exists? 0= [if] + " git clone -q git://dev.laptop.org/users/wmb/multicast-nand" expand$ $sh + [then] + [else] + " rm -rf multicast-nand" $sh + " wget -q -O multicast-nand.tar.gz http://dev.laptop.org/git/users/wmb/multicast-nand/snapshot/multicast-nand-…" expand$ $sh + " tar xfz multicast-nand.tar.gz" $sh + " mv multicast-nand-${MCNAND_VERSION} multicast-nand" expand$ $sh + " rm multicast-nand.tar.gz" $sh [then] -[else] -" rm -rf multicast-nand" $sh -" wget -q -O multicast-nand.tar.gz http://dev.laptop.org/git/users/wmb/multicast-nand/snapshot/multicast-nand-…" expand$ $sh -" tar xfz multicast-nand.tar.gz" $sh -" mv multicast-nand-${MCNAND_VERSION} multicast-nand" expand$ $sh -" rm multicast-nand.tar.gz" $sh -[then] -" (cd multicast-nand; make BPDIR=../../../../../../.. nandblaster15_rx.bin nandblaster_tx.bin; cp nandblaster15_rx.bin nandblaster_tx.bin ..)" expand$ $sh + " (cd multicast-nand; make BPDIR=../../../../../../.. OFW_CPU=x86 nandblaster15_rx.bin nandblaster_tx.bin; cp nandblaster15_rx.bin nandblaster_tx.bin ..)" expand$ $sh [else] -" (cd /home/wmb/Git/multicast-nand; make BPDIR=/home/wmb/ofw.test nandblaster15_rx.bin nandblaster_tx.bin;)" $sh -" cp /home/wmb/Git/multicast-nand/*blaster*.bin ." expand$ $sh + " (cd /home/wmb/Git/multicast-nand; make BPDIR=/home/wmb/ofw.test OFW_CPU=x86 nandblaster15_rx.bin nandblaster_tx.bin;)" $sh + " cp /home/wmb/Git/multicast-nand/*blaster*.bin ." expand$ $sh [then] \ This forces the creation of a .log file, so we don't re-fetch

1 0

[commit] r2270 - in cpu: arm/olpc/1.75 x86/pc/olpc x86/pc/olpc/via
by repository service 14 Jun '11

14 Jun '11

Author: wmb Date: Tue Jun 14 04:10:25 2011 New Revision: 2270 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2270 Log: OLPC XO-1.75 trac #10900 - Implemented multi-platform USB/SD imaging support. Modified: cpu/arm/olpc/1.75/fw.bth cpu/x86/pc/olpc/security.fth cpu/x86/pc/olpc/via/fw.bth Modified: cpu/arm/olpc/1.75/fw.bth ============================================================================== --- cpu/arm/olpc/1.75/fw.bth Mon Jun 13 21:12:02 2011 (r2269) +++ cpu/arm/olpc/1.75/fw.bth Tue Jun 14 04:10:25 2011 (r2270) @@ -245,6 +245,7 @@ fload ${BP}/cpu/x86/pc/olpc/sound.fth fload ${BP}/cpu/x86/pc/olpc/guardrtc.fth fload ${BP}/cpu/x86/pc/olpc/security.fth +2 to bundle-suffix stand-init: xid 0 cmos@ dup 1+ 0 cmos! ( n ) Modified: cpu/x86/pc/olpc/security.fth ============================================================================== --- cpu/x86/pc/olpc/security.fth Mon Jun 13 21:12:02 2011 (r2269) +++ cpu/x86/pc/olpc/security.fth Tue Jun 14 04:10:25 2011 (r2270) @@ -436,11 +436,24 @@ : .trying ( name$ -- name$ ) " Trying " ?lease-debug 2dup ?lease-debug-cr ; +0 value bundle-suffix : bundle-present? ( fn$ -- flag ) + \ Try the unadorned name first fn-buf place + bundle-name$ .trying - ['] (boot-read) catch if 2drop false exit then - true + ['] (boot-read) catch 0= if true exit then ( x x ) + 2drop ( ) + + \ Unadorned name not present; try again with architecture-dependent numeric suffix + bundle-suffix push-decimal (.) pop-base ( adr len ) + fn-buf $cat ( ) + + bundle-name$ .trying + ['] (boot-read) catch 0= if true exit then ( x x ) + 2drop ( ) + + false ; \ exp-hashname$ remembers the most recently used hashname to guard against Modified: cpu/x86/pc/olpc/via/fw.bth ============================================================================== --- cpu/x86/pc/olpc/via/fw.bth Mon Jun 13 21:12:02 2011 (r2269) +++ cpu/x86/pc/olpc/via/fw.bth Tue Jun 14 04:10:25 2011 (r2270) @@ -411,6 +411,7 @@ fload ${BP}/cpu/x86/pc/olpc/via/sound.fth fload ${BP}/cpu/x86/pc/olpc/guardrtc.fth fload ${BP}/cpu/x86/pc/olpc/security.fth +1 to bundle-suffix fload ${BP}/cpu/x86/pc/olpc/xpsecure.fth fload ${BP}/ofw/gui/ofpong.fth fload ${BP}/cpu/x86/pc/olpc/life.fth

1 0

[commit] r2269 - in cpu/arm: mmp2 olpc/1.75
by repository service 13 Jun '11

13 Jun '11

Author: wmb Date: Mon Jun 13 21:12:02 2011 New Revision: 2269 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2269 Log: OLPC XO-1.75 trac #10919 - Implemented automatic accelerometer selftest and integrated it into the menu system. Modified: cpu/arm/mmp2/twsi.fth cpu/arm/olpc/1.75/accelerometer.fth cpu/arm/olpc/1.75/mfgtest.fth Modified: cpu/arm/mmp2/twsi.fth ============================================================================== --- cpu/arm/mmp2/twsi.fth Mon Jun 13 19:20:35 2011 (r2268) +++ cpu/arm/mmp2/twsi.fth Mon Jun 13 21:12:02 2011 (r2269) @@ -153,6 +153,11 @@ child-address set-twsi-target 0 swap twsi-get ; +: smbus-out-in ( out ... #outs #ins -- in ... ) + child-address set-twsi-target + twsi-get +; + : decode-unit ( adr len -- low high ) parse-2int ; : encode-unit ( low high -- adr len ) >r <# u#s drop [char] , hold r> u#s u#> ; end-package Modified: cpu/arm/olpc/1.75/accelerometer.fth ============================================================================== --- cpu/arm/olpc/1.75/accelerometer.fth Mon Jun 13 19:20:35 2011 (r2268) +++ cpu/arm/olpc/1.75/accelerometer.fth Mon Jun 13 21:12:02 2011 (r2269) @@ -1,30 +1,97 @@ -0 0 " " " /" begin-package + +hex +0 0 " 6,3a" " /twsi" begin-package " accelerometer" name +my-address my-space encode-phys " reg" property + \ This is for the stand-alone accelerometer chip LIS33DETR \ We could call this just once in open if we had a TWSI parent node : set-address ( -- ) h# 3a 6 set-twsi-target ; -: accelerometer-on ( -- ) - set-address - h# 47 h# 20 twsi-b! \ Power up, X,Y,Z -; -: accelerometer-off ( -- ) - set-address - h# 07 h# 20 twsi-b! \ Power up, X,Y,Z -; +: acc-reg@ ( reg# -- b ) 1 1 " smbus-out-in" $call-parent ; +: acc-reg! ( b reg# -- ) 2 0 " smbus-out-in" $call-parent ; +: ctl1! ( b -- ) h# 20 acc-reg! ; +: accelerometer-on ( -- ) h# 47 ctl1! ; +: accelerometer-off ( -- ) h# 07 ctl1! ; : bext ( b -- n ) dup h# 80 and if h# ffffff00 or then ; : acceleration@ ( -- x y z ) - set-address - h# 29 twsi-b@ bext - h# 2b twsi-b@ bext - h# 2d twsi-b@ bext + h# 29 acc-reg@ bext + h# 2b acc-reg@ bext + h# 2d acc-reg@ bext +; +: t+ ( x1 y1 z1 x2 y2 z2 -- x3 y3 z3 ) + >r >r >r ( x1 y1 z1 r: z2 y2 x2 ) + rot r> + ( y1 z1 x3 r: z2 y2 ) + rot r> + ( z1 x3 y3 r: z2 ) + rot r> + ( x3 y3 z3 ) ; +: t- ( x1 y1 z1 x2 y2 z2 -- x3 y3 z3 ) + >r >r >r ( x1 y1 z1 r: z2 y2 x2 ) + rot r> - ( y1 z1 x3 r: z2 y2 ) + rot r> - ( z1 x3 y3 r: z2 ) + rot r> - ( x3 y3 z3 ) +; +\ Averaging a lot of samples reduces the effect of vibration +: average-acceleration@ ( -- x y z ) + acceleration@ ( x y z ) + d# 127 0 do + acceleration@ t+ ( x' y' z' ) + loop + rot 7 >>a + rot 7 >>a + rot 7 >>a +; + +: delay ( -- ) d# 30 ms ; : open ( -- flag ) + my-address my-space " set-address" $call-parent ['] accelerometer-on catch 0= ; : close ( -- ) accelerometer-off ; + +\ The datasheet says the selftest change range is 3 to 32, but we +\ give a little headroom on the high end to allow for external +\ vibration. Empirically, on the unit I tested, the measurement +\ was maxed out at 32. Typical is supposed to be 19. +: out-of-range? ( delta -- error? ) 3 d# 40 between 0= ; + +: error? ( dx dy dz -- error? ) + out-of-range? if ." X axis error" cr 2drop true exit then ( dx dy ) + out-of-range? if ." Y axis error" cr drop true exit then ( dx ) + out-of-range? if ." X axis error" cr true exit then ( ) + false +; + +: selftest ( -- error? ) + open 0= if true exit then + + \ Use the device's selftest function to force a change in one direction + delay ( ) + average-acceleration@ ( x y z ) + h# 4f ctl1! delay ( x y z ) \ Set the STM bit + average-acceleration@ t- ( dx dy dz ) + \ STM applies negative bias to Y, but our deltas are inverted + \ because we subtract the new measurement from the old. + rot negate -rot ( dx' dy dz ) + negate ( dx dy dz' ) + error? if accelerometer-off true exit then + + \ Use the device's selftest function to force a change in the opposite direction + accelerometer-on delay ( ) \ Back to normal - STM and STP both off + average-acceleration@ ( x y z ) + h# 57 ctl1! delay ( x y z ) \ Set the STP bit + average-acceleration@ t- ( dx dy dz ) + \ STP applies negative bias to X and Z, but our deltas are inverted + \ because we subtract the new measurement from the old. + swap negate swap ( dx dy' dz ) + error? if accelerometer-off true exit then + + accelerometer-off + false +; + end-package Modified: cpu/arm/olpc/1.75/mfgtest.fth ============================================================================== --- cpu/arm/olpc/1.75/mfgtest.fth Mon Jun 13 19:20:35 2011 (r2268) +++ cpu/arm/olpc/1.75/mfgtest.fth Mon Jun 13 21:12:02 2011 (r2269) @@ -138,8 +138,8 @@ : timer-item ( -- ) " /timer" mfg-test-dev ; : touchpad-item ( -- ) " /ec-spi/mouse" mfg-test-dev ; : keyboard-item ( -- ) " /ec-spi/keyboard" mfg-test-dev ; -: switch-item ( -- ) " /switches" mfg-test-dev ; -: leds-item ( -- ) " /leds" mfg-test-dev ; +: switch-item ( -- ) " /switches" mfg-test-dev " /accelerometer" mfg-test-dev ; +: leds-item ( -- ) " /leds" mfg-test-dev ; \ XXX need to test sensors like accelerometer and compass : olpc-menu-items ( -- ) @@ -193,7 +193,7 @@ " LEDs" ['] leds-item leds.icon 3 3 install-icon - " Switches" + " Switches and Accelerometer" ['] switch-item ebook.icon 3 4 install-icon ;

1 0

[commit] r2268 - cpu/arm/mmp2
by repository service 13 Jun '11

13 Jun '11

Author: wmb Date: Mon Jun 13 19:20:35 2011 New Revision: 2268 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2268 Log: OLPC XO-1.75 trac #10892 - added random-byte for use in UUID generation. Modified: cpu/arm/mmp2/hash.fth Modified: cpu/arm/mmp2/hash.fth ============================================================================== --- cpu/arm/mmp2/hash.fth Mon Jun 13 11:51:27 2011 (r2267) +++ cpu/arm/mmp2/hash.fth Mon Jun 13 19:20:35 2011 (r2268) @@ -146,6 +146,7 @@ begin h# d4292c04 l@ 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 ;

1 0

[commit] r2267 - in cpu: arm arm/olpc/1.75 x86/pc/olpc
by repository service 13 Jun '11

13 Jun '11

Author: wmb Date: Mon Jun 13 11:51:27 2011 New Revision: 2267 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2267 Log: OLPC XO-1.75 trac #10892 - fixed crash re-executing cifs-connect - caused by memory tests overwriting the crypto code. Modified: cpu/arm/linux.fth cpu/arm/olpc/1.75/fw.bth cpu/x86/pc/olpc/crypto.fth Modified: cpu/arm/linux.fth ============================================================================== --- cpu/arm/linux.fth Mon Jun 13 06:41:52 2011 (r2266) +++ cpu/arm/linux.fth Mon Jun 13 11:51:27 2011 (r2267) @@ -14,17 +14,21 @@ \ If we have already loaded a RAMdisk in high memory, its base is the memory limit ramdisk-adr ?dup if exit then - " /memory" find-package 0= abort" No /memory node" ( phandle ) - " available" rot get-package-property abort" No memory node available property" ( $ ) - \ Find the memory piece that starts at 0 - begin dup 8 >= while ( $ ) - decode-int h# 1000 u<= if ( $ ) \ Found the one we want - decode-int ( $ limit ) - nip nip exit - then ( $ ) - decode-int drop ( $ ) - repeat ( $ ) - 2drop true abort" No suitable memory piece" + 0 0 ( size base ) + " /memory" find-package 0= abort" No /memory node" ( size base phandle ) + " available" rot get-package-property abort" No memory node available property" ( limit size $ ) + \ Find the largest memory piece + begin dup 8 >= while ( size base $ ) + 2 decode-ints ( size base $ size1 base1 ) + 5 pick 2 pick <= if ( size base $ size1 base1 ) + 2>r 2nip 2r> ( $ size1 base1 ) + 2swap ( size' base' $ ) + else ( size base $ size1 base1 ) + 2drop ( size base $ ) + then ( size base $ ) + repeat ( size base $ ) + 2drop ( size base ) + + ( limit ) ; : add-root-dev ( cmdline$ -- cmdline$' ) Modified: cpu/arm/olpc/1.75/fw.bth ============================================================================== --- cpu/arm/olpc/1.75/fw.bth Mon Jun 13 06:41:52 2011 (r2266) +++ cpu/arm/olpc/1.75/fw.bth Mon Jun 13 11:51:27 2011 (r2267) @@ -26,6 +26,7 @@ : usb-quiet ( -- ) [ ' linux-hook behavior compile, ] \ Chain to old behavior + unload-crypto " /usb" " reset-usb" execute-device-method drop ; Modified: cpu/x86/pc/olpc/crypto.fth ============================================================================== --- cpu/x86/pc/olpc/crypto.fth Mon Jun 13 06:41:52 2011 (r2266) +++ cpu/x86/pc/olpc/crypto.fth Mon Jun 13 11:51:27 2011 (r2267) @@ -5,6 +5,7 @@ h# d0000 constant verify-bss \ The address the code is linked to run at h# 10000 constant /verify-bss h# 9c000 constant verify-stack +0 value /verify 0 value crypto-loaded? : load-crypto ( -- error? ) @@ -12,10 +13,17 @@ " verify" find-drop-in 0= if ." Can't find crypto code" cr true exit then ( prog$ ) - 2dup verify-base swap move free-mem ( ) + dup to /verify ( prog$ ) + verify-base /verify 0 mem-claim drop ( prog$ ) + 2dup verify-base swap move free-mem ( ) true to crypto-loaded? false ; +: unload-crypto ( -- ) + crypto-loaded? 0= if exit then + verify-base /verify mem-release + false to crypto-loaded? +; : signature-bad? ( data$ sig$ key$ hashname$ -- mismatch? ) $cstr

1 0

[commit] r2266 - in cpu: arm/olpc/1.75 x86/pc/olpc/via
by repository service 13 Jun '11

13 Jun '11

Author: quozl Date: Mon Jun 13 06:41:52 2011 New Revision: 2266 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2266 Log: OLPC - fix trivial spelling error in SD card instructions Modified: cpu/arm/olpc/1.75/testinstructions.fth cpu/x86/pc/olpc/via/testinstructions.fth Modified: cpu/arm/olpc/1.75/testinstructions.fth ============================================================================== --- cpu/arm/olpc/1.75/testinstructions.fth Sun Jun 12 10:58:36 2011 (r2265) +++ cpu/arm/olpc/1.75/testinstructions.fth Mon Jun 13 06:41:52 2011 (r2266) @@ -500,7 +500,7 @@ ; : disconnect-ext-sd ( -- ) draw-top - " Disonnect external SD card to continue.." message + " Disconnect external SD card to continue.." message ['] ext-sd-card-top red-888 highlight ; Modified: cpu/x86/pc/olpc/via/testinstructions.fth ============================================================================== --- cpu/x86/pc/olpc/via/testinstructions.fth Sun Jun 12 10:58:36 2011 (r2265) +++ cpu/x86/pc/olpc/via/testinstructions.fth Mon Jun 13 06:41:52 2011 (r2266) @@ -474,7 +474,7 @@ ; : disconnect-ext-sd ( -- ) draw-top - " Disonnect external SD card to continue.." message + " Disconnect external SD card to continue.." message ['] ext-sd-card-top red-888 highlight ;

1 0

[commit] r2265 - cpu/x86/pc/olpc
by repository service 12 Jun '11

12 Jun '11

Author: wmb Date: Sun Jun 12 10:58:36 2011 New Revision: 2265 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2265 Log: OLPC XO-1.75 trac #10951 - added code for secure reflash of EC code. Compiles cleanly but as yet untested. The code closely parallels the existing code for secure firmware reflashing. Modified: cpu/x86/pc/olpc/security.fth Modified: cpu/x86/pc/olpc/security.fth ============================================================================== --- cpu/x86/pc/olpc/security.fth Sun Jun 12 10:52:58 2011 (r2264) +++ cpu/x86/pc/olpc/security.fth Sun Jun 12 10:58:36 2011 (r2265) @@ -877,7 +877,7 @@ ofw-version$ drop 1+ ((fw-version)) ; -: firmware-up-to-date? ( img$ -- ) +: firmware-up-to-date? ( img$ -- flag ) /flash <> if show-x " Invalid Firmware image" .security-failure then ( adr ) h# f.ffc7 + ((fw-version)) ( file-version# ) ofw-version-int ( file-version# rom-version# ) @@ -892,13 +892,76 @@ drop ; +[ifdef] reflash-ec +: ec-up-to-date? ( img$ -- flag ) + /ec-flash <> if show-x " Invalid EC Firmware image" .security-failure then ( adr ) + /ec-flash + h# 100 - cscount ( version&date$ ) + \ If the new image has an invalid signature, the old one is considered up to date + dup d# 25 < if 2drop true exit then ( version&date$ ) + over " XO-EC 4 " comp if 2drop true exit then ( version&date$ ) + bl right-split-string 2drop ( date$ ) + d# 16 <> if 2drop true exit then ( date-adr ) + ec-date$ comp 0<= ( flag ) +; + +defer ec-reflash-off? ' false to ec-reflash-off? +: do-ec-update ( img$ -- ) + +\ Keep .error from printing an input stream position report +\ which makes a buffer@<address> show up in the error message + ['] noop to show-error + + visible + + tuck load-base swap move ( len ) + load-base swap ( adr len ) + + ['] ?ec-image-valid catch ?dup if ( x x ) + 2drop + visible + red-letters + ." Bad EC firmware image file - " .error + ." Continuing with old EC firmware" cr + black-letters + exit + then + + d# 12,000 wait-until \ Wait for EC to notice the battery + + ['] ?enough-power catch ?dup if + visible + red-letters + ." Unsafe to update EC firmware now - " .error + ." Continuing with old EC firmware" cr + black-letters + exit + then + + " Updating EC firmware" ?lease-debug-cr + + ec-indexed-io-off? if + visible + ." Restarting to enable EC FLASH writing." cr + d# 3000 ms + ec-ixio-reboot + security-failure + then + + \ Latch alternate? flag for next startup + alternate? if [char] A h# 82 cmos! then + + reflash-ec \ Should power-off and reboot + show-x + " EC reflash returned, unexpectedly" .security-failure +; +[then] : do-firmware-update ( img$ -- ) -\ Keep .error from printing an input sream position report +\ Keep .error from printing an input stream position report \ which makes a buffer@<address> show up in the error message - ['] noop to show-error + ['] noop to show-error - visible + visible tuck flash-buf swap move ( len ) @@ -1053,9 +1116,29 @@ r> close-file drop false ( false ) ; -: load-from-device ( devname$ -- done? ) +[ifdef] reflash-ec +: ?ec-update ( -- ) + null$ cn-buf place + " ecfw" bundle-present? if + " EC FW found - " ?lease-debug - show-dot + img$ ec-up-to-date? if + show-plus + " current EC FW is up-to-date" ?lease-debug-cr + else + show-minus + " new - " ?lease-debug + fwkey$ to pubkey$ + img$ sig$ fw-valid? if + img$ do-ec-update + then + show-lock + then + then +; +[then] + +: ?fw-update ( -- ) null$ cn-buf place " bootfw" bundle-present? if " FW found - " ?lease-debug @@ -1073,7 +1156,11 @@ show-lock then then - +; +: load-from-device ( -- done? ) + show-dot + ?ec-update ( devnam) + ?fw-update ( ) ?rtc-update show-dot

1 0

[commit] r2264 - cpu/arm
by repository service 12 Jun '11

12 Jun '11

Author: wmb Date: Sun Jun 12 10:52:58 2011 New Revision: 2264 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2264 Log: ARM kernel - fixed bug in comp relating to sign of result. Modified: cpu/arm/kerncode.fth Modified: cpu/arm/kerncode.fth ============================================================================== --- cpu/arm/kerncode.fth Sun Jun 12 10:50:54 2011 (r2263) +++ cpu/arm/kerncode.fth Sun Jun 12 10:52:58 2011 (r2264) @@ -1108,18 +1108,10 @@ 0<> while ldrb r2,[r0],#1 ldrb r3,[r1],#1 - cmp r2,r3 -[ifdef] fixme -0<> if + cmp r3,r2 movgt tos,#1 mvnlt tos,#0 nxtne -then -[else] - movgt tos,#1 - mvnlt tos,#0 - nxtne -[then] repeat mov tos,#0 c; @@ -1143,18 +1135,10 @@ cmp r3,#0x5b \ ascii [ inclt r3,#0x20 then - cmp r2,r3 -[ifdef] fixme -0<> if - movgt tos,#1 - mvnlt tos,#0 - nxtne -then -[else] + cmp r3,r2 movgt tos,#1 mvnlt tos,#0 nxtne -[then] repeat mov tos,#0 c;

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

openfirmware June 2011