September 2012 - openfirmware - mail.coreboot.org

[commit] r3315 - cpu/x86/pc/olpc
by repository service Sept. 19, 2012

Sept. 19, 2012

Author: wmb Date: Wed Sep 19 07:07:59 2012 New Revision: 3315 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3315 Log: OLPC XO-4 - Fixed bug introduced by svn 3291. In order to use the bootfw.zip approach to upgrade from Q7B01 to another revision, the filename needs to be /boot/44.zip . This checkin fixes that, so Q7B02 will use the correct /boot/bootfw4.zip . Modified: cpu/x86/pc/olpc/security.fth Modified: cpu/x86/pc/olpc/security.fth ============================================================================== --- cpu/x86/pc/olpc/security.fth Wed Sep 19 04:58:34 2012 (r3314) +++ cpu/x86/pc/olpc/security.fth Wed Sep 19 07:07:59 2012 (r3315) @@ -443,11 +443,11 @@ ; 0 value bundle-suffix : bundle-present? ( fn$ -- flag ) + fn-buf place + \ unadorned names not supported from XO-4 onwards bundle-suffix 4 < if \ Try the unadorned name first - fn-buf place - bundle-name$ .trying ['] (boot-read) catch 0= if true exit then ( x x ) 2drop ( )

1 0

[commit] r3314 - cpu/arm/olpc
by repository service Sept. 19, 2012

Sept. 19, 2012

Author: quozl Date: Wed Sep 19 04:58:34 2012 New Revision: 3314 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3314 Log: OLPC XO-4 - Neonode, do not timeout test /touchscreen, #12113, add averaged response curve data collection. Modified: cpu/arm/olpc/nn-touchscreen.fth Modified: cpu/arm/olpc/nn-touchscreen.fth ============================================================================== --- cpu/arm/olpc/nn-touchscreen.fth Tue Sep 18 05:27:06 2012 (r3313) +++ cpu/arm/olpc/nn-touchscreen.fth Wed Sep 19 04:58:34 2012 (r3314) @@ -467,6 +467,55 @@ 41 0 do ." y " i .d 1 i test-fss-axis-all loop ; +[then] + + + +0 [if] \ fixed signal strength test, averaged, all power levels + +d# 100 value n \ number of tests to average + +xleds yleds max 2* constant /sums +create sums +/sums 4 * allot +: 0sums sums /sums 4 * erase ; + +: rc-signal ( n -- ) + dup /sums > abort" sum index too large" + pbuf 5 + over + c@ ( n signal ) + swap 4 * sums + ( signal address ) + dup @ ( signal address sum ) + rot + swap ! ( ) +; + +: rc-sample ( axis power -- ) + swap h# 0f h# 03 h# ee 5 bytes-out + h# 0f d# 20 anticipate + pbuf 2+ c@ h# 0f = if + pbuf 4 + c@ 0 do ( ) + i rc-signal + loop + then +; + +: rc-axis ( axis power -- ) + 0sums ( axis power ) + n 0 do 2dup rc-sample loop ( axis power ) + 2drop ( ) + pbuf 4 + c@ 0 do i 4 * sums + @ n / .d loop cr ( ) +; + +: rc + 41 0 do ." x " i .d 0 i rc-axis loop + 41 0 do ." y " i .d 1 i rc-axis loop +; + +[then] + + + +0 [if] \ fixed signal strength test, all power levels, as a response curve + : >scaled ( x y -- x' y' ) d# 3750 * d# 1000 / d# 900 swap - swap d# 1850 * d# 100 / swap @@ -743,10 +792,11 @@ defer (ev) ( x y -- ) \ touch event handler for tests ' noop to (ev) 0 value remaining +d# 30000 value test-timeout : ev ( handler -- ) to (ev) - get-msecs d# 30000 + ( to ) + get-msecs test-timeout + ( to ) begin in? if pbuf 2+ c@ h# 04 = if \ touch notification event @@ -964,6 +1014,7 @@ faults if close true exit then then + test-station 6 = if d# 86400.000 to test-timeout then scribble close false

1 0

[commit] r3313 - cpu/arm/olpc
by repository service Sept. 18, 2012

Sept. 18, 2012

Author: quozl Date: Tue Sep 18 05:27:06 2012 New Revision: 3313 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3313 Log: OLPC XO-4 - Neonode, do not process fixed signal strength response packets unless they are present, probably fixes a Data Abort when the controller ceases to respond. Modified: cpu/arm/olpc/nn-touchscreen.fth Modified: cpu/arm/olpc/nn-touchscreen.fth ============================================================================== --- cpu/arm/olpc/nn-touchscreen.fth Mon Sep 17 09:39:42 2012 (r3312) +++ cpu/arm/olpc/nn-touchscreen.fth Tue Sep 18 05:27:06 2012 (r3313) @@ -22,11 +22,10 @@ \ create nn-fss \ optional fixed signal strength test \ create nn-ls \ optional low signals test +\ create nn-fss-all \ fixed signal strength test, all power levels \ create nn-components \ isolate test results to failed component identifier -\ create nn-ir-pcb-rev-b \ support for revision b of the ir pcb assembly - d# 15 value xleds d# 11 value yleds @@ -455,10 +454,12 @@ : test-fss-axis-all ( axis power -- ) swap h# 0f h# 03 h# ee 5 bytes-out h# 0f d# 20 anticipate - pbuf 4 + c@ 0 do ( ) - pbuf 5 + i + c@ - .d - loop cr + pbuf 2+ c@ h# 0f = if + pbuf 4 + c@ 0 do ( ) + pbuf 5 + i + c@ + .d + loop cr + then ; : test-fss-all @@ -480,14 +481,16 @@ h# 0f h# 03 h# ee 5 bytes-out ( r: power ) h# 0f d# 20 anticipate r> ( power) - pbuf 4 + c@ 0 do ( power ) - pbuf 5 + i + c@ ( power signal ) - over swap ( power x y ) - >scaled - - i 4 lshift >pseudo -rot 9 9 ( color x y w h ) - fill-rectangle-noff ( ) - loop ( power ) + pbuf 2+ c@ h# 0f = if + pbuf 4 + c@ 0 do ( power ) + pbuf 5 + i + c@ ( power signal ) + over swap ( power x y ) + >scaled + + i 4 lshift >pseudo -rot 9 9 ( color x y w h ) + fill-rectangle-noff ( ) + loop ( power ) + then ( power ) drop ; @@ -693,11 +696,12 @@ dup to axis# ( axis# ) fs swap h# 0f h# 03 h# ee 5 bytes-out h# 0f d# 200 anticipate - - pbuf 4 + c@ 0 do ( ) - i pbuf 5 + over + c@ ( signal# level ) - watch-fss-signal ( ) - loop + pbuf 2+ c@ h# 0f = if + pbuf 4 + c@ 0 do ( ) + i pbuf 5 + over + c@ ( signal# level ) + watch-fss-signal ( ) + loop + then ; : watch-fss

1 0

[commit] r3312 - in cpu/arm/olpc: 4.0 cl4
by repository service Sept. 17, 2012

Sept. 17, 2012

Author: wmb Date: Mon Sep 17 09:39:42 2012 New Revision: 3312 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3312 Log: OLPC ARM - EC version 7.0.2.02 Modified: cpu/arm/olpc/4.0/ec-version.fth cpu/arm/olpc/cl4/ec-version.fth Modified: cpu/arm/olpc/4.0/ec-version.fth ============================================================================== --- cpu/arm/olpc/4.0/ec-version.fth Mon Sep 17 03:22:53 2012 (r3311) +++ cpu/arm/olpc/4.0/ec-version.fth Mon Sep 17 09:39:42 2012 (r3312) @@ -1,6 +1,6 @@ \ The EC microcode macro: EC_PLATFORM cl4 -macro: EC_VERSION 7_0_2_01 +macro: EC_VERSION 7_0_2_02 \ Alternate command for getting EC microcode, for testing new versions. \ Temporarily uncomment the line and modify the path as necessary Modified: cpu/arm/olpc/cl4/ec-version.fth ============================================================================== --- cpu/arm/olpc/cl4/ec-version.fth Mon Sep 17 03:22:53 2012 (r3311) +++ cpu/arm/olpc/cl4/ec-version.fth Mon Sep 17 09:39:42 2012 (r3312) @@ -1,6 +1,6 @@ \ The EC microcode macro: EC_PLATFORM cl4 -macro: EC_VERSION 7_0_1_08 +macro: EC_VERSION 7_0_2_02 \ Alternate command for getting EC microcode, for testing new versions. \ Temporarily uncomment the line and modify the path as necessary

1 0

[commit] r3311 - cpu/arm/olpc
by repository service Sept. 17, 2012

Sept. 17, 2012

Author: quozl Date: Mon Sep 17 03:22:53 2012 New Revision: 3311 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3311 Log: OLPC XO-4 - Neonode, tools for signal path resposnse curve plots Modified: cpu/arm/olpc/nn-touchscreen.fth Modified: cpu/arm/olpc/nn-touchscreen.fth ============================================================================== --- cpu/arm/olpc/nn-touchscreen.fth Mon Sep 17 01:21:05 2012 (r3310) +++ cpu/arm/olpc/nn-touchscreen.fth Mon Sep 17 03:22:53 2012 (r3311) @@ -450,6 +450,58 @@ +[ifdef] nn-fss-all \ fixed signal strength test, all power levels + +: test-fss-axis-all ( axis power -- ) + swap h# 0f h# 03 h# ee 5 bytes-out + h# 0f d# 20 anticipate + pbuf 4 + c@ 0 do ( ) + pbuf 5 + i + c@ + .d + loop cr +; + +: test-fss-all + 41 0 do ." x " i .d 0 i test-fss-axis-all loop + 41 0 do ." y " i .d 1 i test-fss-axis-all loop +; + +: >scaled ( x y -- x' y' ) + d# 3750 * d# 1000 / d# 900 swap - + swap d# 1850 * d# 100 / swap +; + +: >pseudo ( level -- colour ) \ a red-yellow-green pseudocolour bar + d# 256 over - 2* d# 255 min swap 2* d# 255 min 0 rgb>565 +; + +: (plot-response) ( power axis -- ) + over >r ( power axis r: power ) + h# 0f h# 03 h# ee 5 bytes-out ( r: power ) + h# 0f d# 20 anticipate + r> ( power) + pbuf 4 + c@ 0 do ( power ) + pbuf 5 + i + c@ ( power signal ) + over swap ( power x y ) + >scaled + + i 4 lshift >pseudo -rot 9 9 ( color x y w h ) + fill-rectangle-noff ( ) + loop ( power ) + drop +; + +: plot-response + black 0 0 screen-w screen-h fill-rectangle-noff + 41 1 do i 0 (plot-response) loop + 41 1 do i 1 (plot-response) loop + key drop +; + +[then] + + + [ifdef] nn-ls \ low signals test : test-ls-axis ( axis -- ) h# 0d h# 02 h# ee 4 bytes-out

1 0

[commit] r3310 - in cpu: arm x86/pc
by repository service Sept. 16, 2012

Sept. 16, 2012

Author: wmb Date: Mon Sep 17 01:21:05 2012 New Revision: 3310 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3310 Log: Linux support - align the ramdisk and flattened device tree addresses. OLPC Trac #12107. The problem happened when secure-booting an initrd whose size was not a multiple of 4. Modified: cpu/arm/linux.fth cpu/x86/pc/linux.fth Modified: cpu/arm/linux.fth ============================================================================== --- cpu/arm/linux.fth Sat Sep 15 10:32:54 2012 (r3309) +++ cpu/arm/linux.fth Mon Sep 17 01:21:05 2012 (r3310) @@ -114,7 +114,8 @@ [ifdef] flatten-device-tree use-fdt? if make-usable-property - ramdisk-adr ?dup 0= if load-base then /fdt-max - to linux-params + ramdisk-adr ?dup 0= if load-base then + /fdt-max - 4 round-down to linux-params linux-params /fdt-max flatten-device-tree else args-buf cscount linux-params set-parameters @@ -130,9 +131,9 @@ defer load-ramdisk defer place-ramdisk : linux-place-ramdisk ( adr len -- ) - to /ramdisk ( adr ) + aligned to /ramdisk ( adr ) - load-base /ramdisk - ( adr new-ramdisk-adr ) + load-base /ramdisk - 4 round-down ( adr new-ramdisk-adr ) tuck /ramdisk move ( new-ramdisk-adr ) \ dup to linux-memtop to ramdisk-adr Modified: cpu/x86/pc/linux.fth ============================================================================== --- cpu/x86/pc/linux.fth Sat Sep 15 10:32:54 2012 (r3309) +++ cpu/x86/pc/linux.fth Mon Sep 17 01:21:05 2012 (r3310) @@ -207,7 +207,7 @@ h# 22c +lp l@ ( adr ramdisk-limit ) ?dup if 1+ else h# 8000.0000 then ( adr ramdisk-limit ) - memory-limit umin /ramdisk - ( adr new-ramdisk-adr ) + memory-limit umin /ramdisk - 4 round-down ( adr new-ramdisk-adr ) tuck /ramdisk move ( new-ramdisk-adr ) dup then ( ramdisk-adr memtop )

1 0

[commit] r3309 - cpu/arm/olpc/4.0
by repository service Sept. 15, 2012

Sept. 15, 2012

Author: wmb Date: Sat Sep 15 10:32:54 2012 New Revision: 3309 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3309 Log: Q7B01 - for XO-4 B1 and later Modified: cpu/arm/olpc/4.0/fw-version.fth Modified: cpu/arm/olpc/4.0/fw-version.fth ============================================================================== --- cpu/arm/olpc/4.0/fw-version.fth Sat Sep 15 09:44:13 2012 (r3308) +++ cpu/arm/olpc/4.0/fw-version.fth Sat Sep 15 10:32:54 2012 (r3309) @@ -1,7 +1,7 @@ \ The overall firmware revision macro: FW_PREFIX Q7 macro: FW_MAJOR B -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] r3308 - in cpu/arm/olpc/4.0: . build
by repository service Sept. 15, 2012

Sept. 15, 2012

Author: wmb Date: Sat Sep 15 09:44:13 2012 New Revision: 3308 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3308 Log: OLPC XO-4 - Initial revision of build directory for 2 MB XO-4 OFW images for B-level systems. Added: cpu/arm/olpc/4.0/ cpu/arm/olpc/4.0/build/ cpu/arm/olpc/4.0/build/Makefile cpu/arm/olpc/4.0/cforth-version.fth cpu/arm/olpc/4.0/cforth.bth cpu/arm/olpc/4.0/config.fth cpu/arm/olpc/4.0/crypto-version.fth cpu/arm/olpc/4.0/ec-version.fth cpu/arm/olpc/4.0/ec.bth cpu/arm/olpc/4.0/fw-version.fth cpu/arm/olpc/4.0/fw.bth cpu/arm/olpc/4.0/mcastnand.bth cpu/arm/olpc/4.0/mcnand-version.fth cpu/arm/olpc/4.0/mv8787.bth cpu/arm/olpc/4.0/olpc.bth cpu/arm/olpc/4.0/prefw.bth cpu/arm/olpc/4.0/resetvec.bth cpu/arm/olpc/4.0/sd8686.bth cpu/arm/olpc/4.0/verify.bth cpu/arm/olpc/4.0/wlan-version.fth Added: cpu/arm/olpc/4.0/build/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/4.0/build/Makefile Sat Sep 15 09:44:13 2012 (r3308) @@ -0,0 +1,70 @@ +ROMNAME=olpc + +BASEDIR= `(cd ../../../../..; pwd;)` + +OS := $(shell uname) +HOSTCPU= $(shell ${BASEDIR}/forth/lib/hostcpu.sh) +HOSTDIR= ../../../../${HOSTCPU}/${OS} +BUILDSH= ${BASEDIR}/forth/lib/build.sh + +TAGFILES= ../../../build/*.tag *.tag +CLIENTDIR=../../../../../clients +CLIENTPROGS=${CLIENTDIR}/emacs/arm/emacs + +all: ${ROMNAME}.rom tags + +${ROMNAME}.tag: ${ROMNAME}.rom + +tags: ${ROMNAME}.tag + @${BASEDIR}/forth/lib/toctags ${BASEDIR} ${TAGFILES} + +${ROMNAME}.rom: FORCE build ${CLIENTPROGS} ${HOSTDIR}/forth ${HOSTDIR}/armforth + ./build $@ + +${HOSTDIR}/forth: + @make -C ${HOSTDIR} forth + +${HOSTDIR}/armforth: + @make -C ${HOSTDIR} armforth + +../../build/inflate.bin: + @make -C ../../build inflate.bin + +${CLIENTDIR}/emacs/arm/emacs: + @make -C ${CLIENTDIR}/emacs/arm emacs + +build: + @ln -sf ${BUILDSH} build + +clean: + rm -f *.dic *.log headers *~ *.elf *.di *.img builton.fth build *.rom *.version tags *.tag + +clean-all: clean + @make -C ../../build clean + @make -C ${HOSTDIR} clean + +.PHONY: FORCE clean all clean-all + +# LICENSE_BEGIN +# Copyright (c) 2009 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 Added: cpu/arm/olpc/4.0/cforth-version.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/4.0/cforth-version.fth Sat Sep 15 09:44:13 2012 (r3308) @@ -0,0 +1,17 @@ +\ This file controls which CForth source version to include in the OFW build +\ and the method for fetching it + +\ If CFORTH_VERSION is "modify", the repository will be cloned with git+ssh: so can push changes. +\ You need ssh access to the server. +\ macro: CFORTH_VERSION modify + +\ If CFORTH_VERSION is "clone", the repository will be cloned with git:. You won't be able to +\ push changes, but you will get the full metadata so you can use commands like git grep. +\ You don't need ssh access to the server. +\ macro: CFORTH_VERSION clone + +\ Otherwise, the source code will be will be downloaded as a tarball via gitweb. +\ macro: CFORTH_VERSION 59859f04454bc2574ab68cf0fd76ebdbc5f26fb6 +macro: CFORTH_VERSION HEAD + +macro: CFORTH_BUILD_DIR cforth/build/arm-xo-cl4 Added: cpu/arm/olpc/4.0/cforth.bth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/4.0/cforth.bth Sat Sep 15 09:44:13 2012 (r3308) @@ -0,0 +1,7 @@ +purpose: Fetch and compile CForth for the Security Processor + +command: &builder &this +build-now + +fload ${BP}/cpu/arm/olpc/4.0/cforth-version.fth +fload ${BP}/cpu/arm/olpc/build-cforth.fth Added: cpu/arm/olpc/4.0/config.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/4.0/config.fth Sat Sep 15 09:44:13 2012 (r3308) @@ -0,0 +1,33 @@ +create debug-startup +create olpc +create olpc-cl4 +create olpc-xo4 +create trust-ec-keyboard +create use-null-nvram +create use-elf +create has-sp-kbd +create has-dcon + +fload ${BP}/cpu/arm/mmp3/soc-config.fth +fload ${BP}/cpu/arm/mmp2/hwaddrs.fth +fload ${BP}/cpu/arm/olpc/addrs.fth + +h# 20.0000 constant /rom \ Total size of SPI FLASH + +: mfg-data-offset /rom h# 1.0000 - ; \ Offset to start of manufacturing data area in SPI FLASH +: mfg-data-end-offset /rom ; \ Offset to end of manufacturing data area in SPI FLASH +: crc-offset mfg-data-offset h# 30 - ; \ e.g. 1e.ffd0 +: signature-offset crc-offset h# 10 - ; \ e.g. 1e.ffc0 + +: signature$ " CL4" ; +: model$ " olpc,XO-4.0" ; +: compatible$ " olpc,xo-cl4" ; +: ec-platform$ ( -- adr len ) " 7" ; + +d# 10001 constant machine-type \ Backwards compatibility with non-device-tree kernel + +char 7 constant expected-ec-version +h# ec00 constant /ec-flash +h# eb80 constant ec-flags-offset \ don't program or verify this page + +fload ${BP}/cpu/arm/olpc/cl4/gpiopins.fth Added: cpu/arm/olpc/4.0/crypto-version.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/4.0/crypto-version.fth Sat Sep 15 09:44:13 2012 (r3308) @@ -0,0 +1,6 @@ +\ The public keys +macro: KEYS mpkeys +\ macro: KEYS testkeys + +\ The bios_verify image +macro: CRYPTO_VERSION 0.6-ARM Added: cpu/arm/olpc/4.0/ec-version.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/4.0/ec-version.fth Sat Sep 15 09:44:13 2012 (r3308) @@ -0,0 +1,9 @@ +\ The EC microcode +macro: EC_PLATFORM cl4 +macro: EC_VERSION 7_0_2_01 + +\ Alternate command for getting EC microcode, for testing new versions. +\ Temporarily uncomment the line and modify the path as necessary +\ macro: GET_EC cp ~rsmith/olpc/ec/ec-code15/image/ecimage.bin ec.img +\ macro: GET_EC wget -q http://dev.laptop.org/pub/ec/ec_test.img -O ec.img +\ macro: GET_EC cp no_event.bin ec.img Added: cpu/arm/olpc/4.0/ec.bth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/4.0/ec.bth Sat Sep 15 09:44:13 2012 (r3308) @@ -0,0 +1,7 @@ +purpose: Fetch the EC (Embedded Controller, i.e. KB3700) microcode + +command: &builder &this +build-now + +fload ${BP}/cpu/arm/olpc/4.0/ec-version.fth +fload ${BP}/cpu/arm/olpc/fetch-ec.fth Added: cpu/arm/olpc/4.0/fw-version.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/4.0/fw-version.fth Sat Sep 15 09:44:13 2012 (r3308) @@ -0,0 +1,10 @@ +\ The overall firmware revision +macro: FW_PREFIX Q7 +macro: FW_MAJOR B +macro: FW_MINOR 00 + +\ Create a 2-character build/fw-suffix file to personalize your test builds +" fw-suffix" $file-exists? [if] + " fw-suffix" $read-file 2 min " ${FW_MINOR}%s" expand$ sprintf + " FW_MINOR" $set-macro +[then] Added: cpu/arm/olpc/4.0/fw.bth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/4.0/fw.bth Sat Sep 15 09:44:13 2012 (r3308) @@ -0,0 +1,29 @@ +purpose: Build OFW Forth dictionary for OLPC XO-4 +\ See license at end of file + +dictionary: ${BP}/cpu/arm/olpc/4.0/build/prefw.dic +command: &armforth &dictionary &this +build-now + +" fw.tag" r/w create-file drop tag-file ! + +h# 16000 +io constant bsl-uart-base \ UART4 +h# 88 constant bsl-uart-clock-offset \ APBC_UART4_CLK_RST + +fload ${BP}/cpu/arm/olpc/build-fw.fth + +\ true to stand-init-debug? + +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/cl4/usb.fth +fload ${BP}/cpu/arm/olpc/nn-touchscreen.fth +fload ${BP}/cpu/arm/olpc/cl4/switches.fth +fload ${BP}/cpu/arm/olpc/cl4/leds.fth +fload ${BP}/cpu/arm/olpc/cl4/testitems.fth +fload ${BP}/cpu/arm/olpc/cl4/testinstructions.fth +fload ${BP}/cpu/arm/olpc/gpio-gamekeys.fth +fload ${BP}/cpu/arm/olpc/test-tweaks.fth + +fload ${BP}/cpu/arm/olpc/save-fw.fth Added: cpu/arm/olpc/4.0/mcastnand.bth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/4.0/mcastnand.bth Sat Sep 15 09:44:13 2012 (r3308) @@ -0,0 +1,7 @@ +purpose: Fetch and compile the multicast NAND reflash program + +command: &builder &this +build-now + +fload ${BP}/cpu/arm/olpc/4.0/mcnand-version.fth +fload ${BP}/cpu/arm/olpc/build-mcnand.fth Added: cpu/arm/olpc/4.0/mcnand-version.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/4.0/mcnand-version.fth Sat Sep 15 09:44:13 2012 (r3308) @@ -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 e9c0662 +\ macro: MCNAND_VERSION test +\ macro: MCNAND_VERSION HEAD Added: cpu/arm/olpc/4.0/mv8787.bth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/4.0/mv8787.bth Sat Sep 15 09:44:13 2012 (r3308) @@ -0,0 +1,8 @@ +purpose: Fetch the firmware for the Marvell 8686 wireless LAN module + +command: &builder &this +build-now + +fload ${BP}/cpu/arm/olpc/4.0/wlan-version.fth + +fload ${BP}/cpu/arm/olpc/build-wlan.fth Added: cpu/arm/olpc/4.0/olpc.bth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/4.0/olpc.bth Sat Sep 15 09:44:13 2012 (r3308) @@ -0,0 +1,219 @@ +purpose: Construct the Open Firmware module collection + +command: &builder &this +in: ${BP}/cpu/arm/olpc/4.0/build/ec.img +in: ${BP}/cpu/arm/olpc/4.0/build/fw.img +in: ${BP}/cpu/arm/olpc/4.0/build/resetvec.img +in: ${BP}/cpu/arm/olpc/4.0/build/mcastnand.bin +in: sd8686.bin +in: verify.img +in: ${BP}/dev/usb2/device/hub/build/hub.fc +in: ${BP}/dev/usb2/device/generic/build/generic.fc +in: ${BP}/dev/usb2/device/net/build/usbnet.fc +in: ${BP}/dev/usb2/device/keyboard/build/usbkbd.fc +in: ${BP}/dev/usb2/device/mouse/build/usbmouse.fc +in: ${BP}/dev/usb2/device/serial/build/usbserial.fc +in: ${BP}/dev/usb2/device/storage/build/usbstorage.fc +in: testicons.bin +in: ${BP}/clients/emacs/arm/emacs +in: cforth.img +build-now + +fload ${BP}/cpu/arm/olpc/4.0/fw-version.fth + +" macro: FW_VERSION ${FW_PREFIX}${FW_MAJOR}${FW_MINOR}" expand$ eval + +fload ${BP}/cpu/arm/olpc/4.0/config.fth + +\ Always re-create the builton.fth file when we make a new rom.img +fload ${BP}/cpu/x86/pc/builton.bth +fload ${BP}/cpu/arm/olpc/sourceurl.fth + +fload ${BP}/forth/lib/crc32.fth + +hex + +: pad-file ( location -- ) + ofd @ fsize + 2dup u< abort" The ROM image is too large" + ?do h# ff ofd @ fputc loop +; + +fload ${BP}/cpu/arm/marvell/tim.fth + +\ Marvell Non-Trusted Image Module image creation script for XO-4.0 platform. + +tim: 00030400 0 OLPC PXA212x + flash: SPI'10 + timh: TIMH 0 d101f000 + image: OBMI 2000 d1000000 cforth.img + reserved: + \ Disable USB download/init by enabling the FFUART for download + \ This works around a PHY init erratum for the B0 chip + uart: 00004646 1 + term: + end-reserved +end-tim + +h# 20.0000 to reserved-start +h# 20.0000 to reserved-end + +.( --- Saving as ) +" ${FW_VERSION}.rom" expand$ 2dup lower ( adr len ) +2dup type cr ( adr len ) +$new-file + tim$ ofd @ fputs + + dropin-offset pad-file + +\ Loads the set of drivers that is common to different output formats + + " ${BP}/cpu/arm/build/inflate.bin" " inflate" $add-dropin + " fw.img" " firmware" $add-deflated-dropin +\ " 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 +\ " mv8787.bin" " mv8787.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 + + \ icons for mfg test gui + " testicons/play.565" " play.565" $add-deflated-dropin + " testicons/quit.565" " quit.565" $add-deflated-dropin + " testicons/cpu.565" " cpu.565" $add-deflated-dropin + " testicons/spi.565" " spi.565" $add-deflated-dropin + " testicons/ram.565" " ram.565" $add-deflated-dropin + " testicons/sdcard.565" " sdcard.565" $add-deflated-dropin + " testicons/keyboard.565" " keyboard.565" $add-deflated-dropin + " testicons/display.565" " display.565" $add-deflated-dropin + " testicons/touchpad.565" " touchpad.565" $add-deflated-dropin + " testicons/audio.565" " audio.565" $add-deflated-dropin + " testicons/usb.565" " usb.565" $add-deflated-dropin + " testicons/battery.565" " battery.565" $add-deflated-dropin + " testicons/camera.565" " camera.565" $add-deflated-dropin + " testicons/wifi.565" " wifi.565" $add-deflated-dropin + " testicons/clock.565" " clock.565" $add-deflated-dropin + " testicons/timer.565" " timer.565" $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 + + " 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 + +.( Dropin top is ) ofd @ fsize .x cr + +/rom pad-file + +\ Insert the revision signature +h# 10 buffer: signature +signature h# 10 blank +signature$ signature swap move +" ${FW_VERSION}" expand$ signature 6 + swap move +" ${FW_PREFIX}${FW_MAJOR}" expand$ signature d# 13 + swap move +signature-offset ofd @ fseek +signature h# 10 ofd @ fputs + +/l buffer: crcbuf +/rom buffer: filebuf + +\ Read the entire image, compute the CRC, and store it in the CRC location +0 ofd @ fseek +filebuf /rom ofd @ fgets /rom <> abort" Can't read back image" +0 crctab filebuf /rom ($crc) crcbuf ! + +crc-offset ofd @ fseek +crcbuf /l ofd @ fputs + +ofd @ fclose + +\ Creating olpc.version serves two purposes: +\ a) It reports the firmware revision for use by external scripts +\ b) It provides an olpc.* artifact for the builder dependency management. + +writing olpc.version +" ${FW_VERSION}" expand$ 2dup lower ofd @ fputs +ofd @ fclose + + + +\ 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 + Added: cpu/arm/olpc/4.0/prefw.bth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/4.0/prefw.bth Sat Sep 15 09:44:13 2012 (r3308) @@ -0,0 +1,13 @@ +purpose: Build OFW Forth dictionary for OLPC XO-4 +\ See license at end of file + +dictionary: ${BP}/cpu/arm/build/basefw.dic +command: &armforth &dictionary &this +build-now + +\ This line must be in this file instead of in prefw.fth so the definitions +\ in config.fth will be tagged. +" prefw.tag" r/w create-file drop tag-file ! + +fload ${BP}/cpu/arm/olpc/4.0/config.fth +fload ${BP}/cpu/arm/olpc/prefw.fth Added: cpu/arm/olpc/4.0/resetvec.bth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/4.0/resetvec.bth Sat Sep 15 09:44:13 2012 (r3308) @@ -0,0 +1,7 @@ +purpose: Build script for low-level startup code + +command: &builder &this +build-now + +fload ${BP}/cpu/arm/olpc/4.0/config.fth +fload ${BP}/cpu/arm/olpc/resetvec.fth Added: cpu/arm/olpc/4.0/sd8686.bth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/4.0/sd8686.bth Sat Sep 15 09:44:13 2012 (r3308) @@ -0,0 +1,8 @@ +purpose: Fetch the firmware for the Marvell 8686 wireless LAN module + +command: &builder &this +build-now + +fload ${BP}/cpu/arm/olpc/4.0/wlan-version.fth + +fload ${BP}/cpu/arm/olpc/build-wlan.fth Added: cpu/arm/olpc/4.0/verify.bth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/4.0/verify.bth Sat Sep 15 09:44:13 2012 (r3308) @@ -0,0 +1,7 @@ +purpose: Fetch the Crypto code and keys + +command: &builder &this +build-now + +fload ${BP}/cpu/arm/olpc/4.0/crypto-version.fth +fload ${BP}/cpu/arm/olpc/build-crypto.fth Added: cpu/arm/olpc/4.0/wlan-version.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/4.0/wlan-version.fth Sat Sep 15 09:44:13 2012 (r3308) @@ -0,0 +1,16 @@ +\ The wireless LAN module firmware + +\ Thin firmware version +macro: WLAN_SUBDIR thinfirm/ +macro: WLAN_PREFIX lbtf_sdio- +macro: WLAN_VERSION 9.0.7.p2 + +\ Non-thin version +\ macro: WLAN_SUBDIR +\ macro: WLAN_PREFIX sd8686- +\ macro: WLAN_VERSION 9.70.20.p0 + +\ Alternate command for getting WLAN firmware, for testing new versions. +\ Temporarily uncomment the line and modify the path as necessary +\ macro: GET_WLAN cp "/c/Documents and Settings/Mitch Bradley/My Documents/OLPC/DiskImages/sd8686-9.70.7.p0.bin" sd8686.bin; cp "/c/Documents and Settings/Mitch Bradley/My Documents/OLPC/DiskImages/sd8686_helper.bin" sd8686_helper.bin +\ macro: GET_WLAN wget http://dev.laptop.org/pub/firmware/libertas/thinfirm/lbtf_sdio-9.0.7.p2.bin -O sd8686.bin

1 0

[commit] r3307 - dev/olpc/spiflash
by repository service Sept. 15, 2012

Sept. 15, 2012

Author: wmb Date: Sat Sep 15 09:32:29 2012 New Revision: 3307 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3307 Log: OLPC XO-4 - Removed temporary upgrade-to-2m code, as it is now being done in a script in manufacturing. Modified: dev/olpc/spiflash/spiui.fth Modified: dev/olpc/spiflash/spiui.fth ============================================================================== --- dev/olpc/spiflash/spiui.fth Fri Sep 14 08:22:45 2012 (r3306) +++ dev/olpc/spiflash/spiui.fth Sat Sep 15 09:32:29 2012 (r3307) @@ -70,24 +70,9 @@ ; [ifndef] 2meg h# 20.0000 constant 2meg [then] -: +1m ( offset -- offset' ) 1meg + ; - -\ This is for upgrading an XO-4 with a 2 MiB FLASH part from -\ a 1 MiB installed OFW image to a 2 MiB OFW image. -\ After flash-open, /flash is the size of the physical SPI FLASH device. -\ On exit, /flash is the size of the image, i.e. the amount to program. -\ /rom is the size of the image that is currently running. -: ?upgrade-to-2mb ( len -- len ) - flash-open \ Sets /flash according to the device installed - dup 2meg = /rom 1meg = and /flash 2meg = and if - signature-offset +1m to signature-offset - mfg-data-offset +1m to mfg-data-offset - crc-offset +1m to crc-offset - then -; : ?image-valid ( len -- ) - flash-open \ Sets /flash according to the device installed + flash-open \ Sets /flash to the size of the SPI FLASH device /flash <> abort" Image file is the wrong length" ." Got firmware version: "

1 0

[commit] r3306 - cpu/arm/olpc/cl4
by repository service Sept. 14, 2012

Sept. 14, 2012

Author: wmb Date: Fri Sep 14 08:22:45 2012 New Revision: 3306 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3306 Log: Q7A15 Modified: cpu/arm/olpc/cl4/fw-version.fth Modified: cpu/arm/olpc/cl4/fw-version.fth ============================================================================== --- cpu/arm/olpc/cl4/fw-version.fth Fri Sep 14 08:20:45 2012 (r3305) +++ cpu/arm/olpc/cl4/fw-version.fth Fri Sep 14 08:22:45 2012 (r3306) @@ -1,7 +1,7 @@ \ The overall firmware revision macro: FW_PREFIX Q7 macro: FW_MAJOR A -macro: FW_MINOR 14 +macro: FW_MINOR 15 \ Create a 2-character build/fw-suffix file to personalize your test builds " fw-suffix" $file-exists? [if]

1 0