openfirmware June 2011

openfirmware@openfirmware.info

3 participants
87 discussions

[commit] r2292 - cpu/arm/olpc
by repository service 17 Jun '11

17 Jun '11

Author: wmb Date: Fri Jun 17 09:52:21 2011 New Revision: 2292 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2292 Log: OLPC trac #10895 - OFW end of SP-PS2 communications protocol. Added: cpu/arm/olpc/spcmd.fth Added: cpu/arm/olpc/spcmd.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/spcmd.fth Fri Jun 17 09:52:21 2011 (r2292) @@ -0,0 +1,171 @@ +\ See license at end of file +purpose: Communication protocol for application processor to security processor + +\ Interface from pckbd.fth to i8042.fth: +\ set-port ( port# -- ) \ Selects keyboard (port#=0) or mouse (port#=1) +\ get-data ( -- data | -1 ) \ Returns a keyboard or mouse byte, or -1 if none after one second +\ get-data? ( -- false | data true ) \ Non-blocking version of get-data +\ clear-out-buf ( -- ) \ Drains pending data, waiting until 120 ms elapses with no data. Built from get-data? +\ put-get-data ( cmd -- data | -1 ) \ Sends cmd and waits for one response byte +\ Used only by "echo?", which is not called on OLPC. +\ put-data ( data -- ) \ Sends a byte to the keyboard or mouse +\ Used only by "cmd". "cmd" is used by set-scan-set, default-disable-kbd, enable-scan, set-leds, toggle-leds, +\ kbd-reset, (obsolete) olpc-set-ec-keymap. set-scan-set is used only by commented-out code guarded by +\ the non-defined ifdef "fix-keyboard". default-disable-kbd is called only by get-initial-state (NC on OLPC). +\ enable-scan is NC on OLPC. set-leds is called by toggle-leds with is called when you press numlock or +\ scrolllock or capslock, none of which the OLPC keyboard has. + +0 0 " d4290000" " /" begin-package \ AP-SP interface the WTM command queue + +headerless + +" ap-sp" device-name + +0 0 encode-bytes + " olpc,ap-sp" encode-string encode+ +" compatible" property + +my-address my-space h# 1000 encode-reg +" reg" property + +1 " #address-cells" integer-property +0 " #size-cells" integer-property + +: encode-unit ( phys -- adr len ) push-hex (u.) pop-base ; +: decode-unit ( adr len -- phys ) push-hex $number if 0 then pop-base ; + +\ Channel#(port#) Meaning +\ 0 Keyboard +\ 1 Touchpad + +2 constant #ports +#ports constant #queues + +d# 16 constant /q + +0 value queue# +#queues /n* buffer: heads : head ( -- adr ) heads queue# na+ ; +#queues /n* buffer: tails : tail ( -- adr ) tails queue# na+ ; + +#queues /q * buffer: qs : q ( adr -- ) qs queue# /q * + ; + +/q 1- value q-end + +: init-queues ( -- ) + #queues 0 do + i to queue# + 0 head ! 0 tail ! /q 1- to q-end + loop +; +: inc-q-ptr ( pointer-addr -- ) + dup @ q-end >= if 0 swap ! else /c swap +! then +; + +: select-queue ( channel# -- error? ) + to queue# + queue# #queues >= +; + +: enque ( new-entry channel# -- ) + select-queue if drop exit then ( new-entry ) + tail @ head @ 2dup > if - q-end else 1- then ( new-entry tail head ) + <> if q tail @ ca+ c! tail inc-q-ptr else drop then +; + +: deque? ( channel# -- false | entry true ) + select-queue if false exit then + lock[ + head @ tail @ <> if + q head @ ca+ c@ head inc-q-ptr true + else + false + then + ]unlock +; + +0 value reg-base +: reg@ ( offset -- l ) reg-base + l@ ; +: reg! ( l offset -- ) reg-base + l! ; + +: data? ( -- flag ) h# c8 reg@ 1 and ; +: send-rdy ( -- ) h# ff00 h# 40 reg! ; +: poll ( -- ) + lock[ + data? if + h# 80 reg@ wbsplit enque + 1 h# c8 reg! + send-rdy + then + ]unlock +; + +0 instance value port# +: set-port ( port# -- ) to port# ; +: get-data? ( -- false | data true ) + port# deque? ( false | data true ) + poll +; +: get-data ( -- data | -1 ) \ Wait for data from our device + d# 1000 0 do + get-data? if unloop exit then ( data ) + 1 ms + loop + true \ abort" Timeout waiting for data from device" +; +\ Wait until the device stops sending data +: clear-out-buf ( -- ) begin d# 120 ms get-data? while drop repeat ; + +0 value open-count +: open ( -- flag ) + open-count 0= if + my-address my-space h# 1000 " map-in" $call-parent is reg-base + data? 0= if send-rdy then + then + open-count 1+ to open-count + true +; +: close ( -- ) + open-count 1 = if + reg-base h# 1000 " map-out" $call-parent 0 is reg-base + then + open-count 1- 0 max to open-count +; + +: put-data ( byte -- ) port# bwjoin h# 40 reg! ; +: put-get-data ( cmd -- data | -1 ) put-data get-data ; + +new-device + " " " 0" set-args + fload ${BP}/dev/pckbd.fth +finish-device + +new-device + " " " 1" set-args + fload ${BP}/dev/ps2mouse.fth +finish-device + +end-package + +\ LICENSE_BEGIN +\ Copyright (c) 2011 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

1 0

[commit] r2291 - forth/lib
by repository service 16 Jun '11

16 Jun '11

Author: wmb Date: Thu Jun 16 20:04:29 2011 New Revision: 2291 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2291 Log: Changed "0 [if]" to "[ifdef] notdef" because the FCode tokenizer doesn't like the former. Modified: forth/lib/isin.fth Modified: forth/lib/isin.fth ============================================================================== --- forth/lib/isin.fth Thu Jun 16 09:52:44 2011 (r2290) +++ forth/lib/isin.fth Thu Jun 16 20:04:29 2011 (r2291) @@ -42,7 +42,7 @@ \ Computes (1 - (theta^2 / divisor) * last) : sin-step ( last divisor -- next ) thetasq swap / times one min one swap - ; -0 [if] +[ifdef] notdef \ Cos \ 1 - t^2/(2) + t^4/(2..4) - t^6/2..6) + t^8/(2..8) \ 1 - (t^2/(1*2)) * (1 - (t^2/(3*4)) * (1 - (t^2/(5*6)) * (1 - (t^2/(7*8)))) @@ -77,7 +77,7 @@ ; -0 [if] +[ifdef] notdef : reduce-to-quarter-cycle ( -- ) \ Move a cycle/4 to the left until negative, then fix #cycle/4 - dup 0<= if #cycle/4 + (sin) exit then ( theta' ) \ Quadrant 1

1 0

OpenFirmware instead of grub
by Andrew Holt (SE) 16 Jun '11

16 Jun '11

Hi, Is it possible to boot Open Firmware directly from a hard drive, and then use it to boot linux, instead of using grub ? Thanks, Andrew ============================= Andrew Holt Senior Software Engineer Email: andrew.holt(a)electrans.com Phone: 0151 347 2270 Mobile: 07841 340608 Skype: andrewtholt De Omnibus Dubitandum =============================

2 1

[commit] r2290 - cpu/arm/olpc/1.75
by repository service 16 Jun '11

16 Jun '11

Author: quozl Date: Thu Jun 16 09:52:44 2011 New Revision: 2290 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2290 Log: OLPC XO-1.75 - make tuning for accelerometer easier for the time being. Modified: cpu/arm/olpc/1.75/accelerometer.fth Modified: cpu/arm/olpc/1.75/accelerometer.fth ============================================================================== --- cpu/arm/olpc/1.75/accelerometer.fth Thu Jun 16 03:56:06 2011 (r2289) +++ cpu/arm/olpc/1.75/accelerometer.fth Thu Jun 16 09:52:44 2011 (r2290) @@ -60,7 +60,8 @@ \ - 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= ; +d# 50 value max-delta +: out-of-range? ( delta -- error? ) 3 max-delta between 0= ; : error? ( dx dy dz -- error? ) out-of-range? if ." X axis error" cr 2drop true exit then ( dx dy )

1 0

[commit] r2289 - cpu/arm/olpc/1.75 dev/olpc/kb3700
by repository service 16 Jun '11

16 Jun '11

Author: rsmith Date: Thu Jun 16 03:56:06 2011 New Revision: 2289 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2289 Log: OLPC XO-1.75: Implement ec-power-off and ec-power-cycle Modified: cpu/arm/olpc/1.75/devices.fth dev/olpc/kb3700/eccmds.fth Modified: cpu/arm/olpc/1.75/devices.fth ============================================================================== --- cpu/arm/olpc/1.75/devices.fth Thu Jun 16 03:56:03 2011 (r2288) +++ cpu/arm/olpc/1.75/devices.fth Thu Jun 16 03:56:06 2011 (r2289) @@ -165,8 +165,8 @@ fload ${BP}/cpu/x86/pc/olpc/mfgtree.fth \ Manufacturing data in device tree fload ${BP}/dev/olpc/kb3700/eccmds.fth -: ec-power-off ( -- ) reset-ec begin wfi again ; -' ec-power-off to power-off +: stand-power-off ( -- ) ec-power-off begin wfi again ; +' stand-power-off to power-off fload ${BP}/dev/olpc/kb3700/batstat.fth \ Battery status reports fload ${BP}/cpu/arm/olpc/1.75/boardrev.fth \ Board revision decoding Modified: dev/olpc/kb3700/eccmds.fth ============================================================================== --- dev/olpc/kb3700/eccmds.fth Thu Jun 16 03:56:03 2011 (r2288) +++ dev/olpc/kb3700/eccmds.fth Thu Jun 16 03:56:06 2011 (r2289) @@ -56,6 +56,9 @@ d# 16 cscount-max ; +: ec-power-cycle ( -- ) h# 4b ec-cmd ; +: ec-power-off ( -- ) h# 4c ec-cmd ; + : ec-echo ( ... n -- ... ) dup h# 52 do-ec-cmd ; : ec-date$ ( -- adr len ) @@ -86,8 +89,6 @@ #define CMD_WRITE_LOCATION 0x45 #define RSP_KEYBOARD_DATA 0x48 #define RSP_TOUCHPAD_DATA 0x49 -#define CMD_POWER_CYCLE 0x4b -#define CMD_POWER_OFF 0x4c #define CMD_RESET_EC_SOFT 0x4d #define CMD_ENABLE_MOUSE 0x4f [then]

1 0

[commit] r2288 - dev/olpc/kb3700
by repository service 16 Jun '11

16 Jun '11

Author: rsmith Date: Thu Jun 16 03:56:03 2011 New Revision: 2288 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2288 Log: OLPC XO-1.5,1.75: Remove mppt-pct The Intersil charger only has 0x20 graduations of resolution in current limit so setting this in percent doesn't make as much sense as it did when the max was 0xff. Was only used in manual testing/debug and now all that is done with 'mppt-limit!' . Modified: dev/olpc/kb3700/batstat.fth Modified: dev/olpc/kb3700/batstat.fth ============================================================================== --- dev/olpc/kb3700/batstat.fth Wed Jun 15 23:06:00 2011 (r2287) +++ dev/olpc/kb3700/batstat.fth Thu Jun 16 03:56:03 2011 (r2288) @@ -128,17 +128,12 @@ ; [then] -: (mppt-pct) 255 * 100 / mppt-limit! ; - - : .mppt mppt-limit@ ( pwr_limit ) vin@ ( pwr_limit VA2 ) ." Vin: " .d ." PWM: " . ; -: mppt-pct (mppt-pct) .mppt cr ; - : watch-mppt ( -- ) begin (cr .mppt kill-line d# 500 ms key? until key drop

1 0

[commit] r2287 - cpu/arm/olpc/1.75
by repository service 15 Jun '11

15 Jun '11

Author: wmb Date: Wed Jun 15 23:06:00 2011 New Revision: 2287 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2287 Log: Fixed yet another cross-compilation problem in nandblaster. Modified: cpu/arm/olpc/1.75/mcnand-version.fth Modified: cpu/arm/olpc/1.75/mcnand-version.fth ============================================================================== --- cpu/arm/olpc/1.75/mcnand-version.fth Wed Jun 15 23:00:08 2011 (r2286) +++ cpu/arm/olpc/1.75/mcnand-version.fth Wed Jun 15 23:06:00 2011 (r2287) @@ -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 bee3e761ec20c9e42778db4e72c3200ee888a419 +macro: MCNAND_VERSION c535151a3f7f396006eb0d5ebd25d135351ffc06 \ macro: MCNAND_VERSION test \ macro: MCNAND_VERSION HEAD

1 0

[commit] r2286 - in clients/lib: . arm
by repository service 15 Jun '11

15 Jun '11

Author: wmb Date: Wed Jun 15 23:00:08 2011 New Revision: 2286 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2286 Log: client library - Use -fno-builtin to eliminate "conflicting type" warnings, and then eliminated the use of size_t in favor of "int", because size_t requires a dependency on external include files. Modified: clients/lib/arm/makefile clients/lib/mem.c clients/lib/strings.c clients/lib/types.h Modified: clients/lib/arm/makefile ============================================================================== --- clients/lib/arm/makefile Wed Jun 15 22:38:20 2011 (r2285) +++ clients/lib/arm/makefile Wed Jun 15 23:00:08 2011 (r2286) @@ -13,7 +13,7 @@ CC := gcc endif -CFLAGS = -I.. -O2 -mcpu=strongarm110 +CFLAGS = -I.. -O2 -mcpu=strongarm110 -fno-builtin ifeq (y, $(shell $(CC) -xc -c -fno-stack-protector /dev/null -o /dev/null 2>/dev/null && echo y)) CFLAGS += -fno-stack-protector endif Modified: clients/lib/mem.c ============================================================================== --- clients/lib/mem.c Wed Jun 15 22:38:20 2011 (r2285) +++ clients/lib/mem.c Wed Jun 15 23:00:08 2011 (r2286) @@ -3,14 +3,14 @@ #include "1275.h" VOID -memcpy(char *to, char *from, size_t len) +memcpy(char *to, char *from, int len) { while (len--) *to++ = *from++; } VOID -memset(char *cp, int c, size_t len) +memset(char *cp, int c, int len) { while (len--) *(cp + len) = c; Modified: clients/lib/strings.c ============================================================================== --- clients/lib/strings.c Wed Jun 15 22:38:20 2011 (r2285) +++ clients/lib/strings.c Wed Jun 15 23:00:08 2011 (r2286) @@ -16,7 +16,7 @@ } int -strncmp(const char *s, const char *t, size_t len) +strncmp(const char *s, const char *t, int len) { int i; @@ -28,24 +28,24 @@ return((int) (s[i] - t[i])); } -size_t +int strlen(const char *s) { int i; for (i = 0; s[i] != '\0'; ++i) ; - return((size_t) i); + return((int) i); } -size_t -strnlen(const char *s, size_t maxlen) +int +strnlen(const char *s, int maxlen) { int i; for (i = 0; i < maxlen && s[i] != '\0'; ++i) ; - return((size_t) i); + return((int) i); } char * @@ -114,9 +114,9 @@ return(temp); } -void *memchr(const void *s, int c, int len) +const void *memchr(const void *s, int c, int len) { - unsigned char *p = s; + const unsigned char *p = s; while (len--) { if (*p == (unsigned char)c) return p; Modified: clients/lib/types.h ============================================================================== --- clients/lib/types.h Wed Jun 15 22:38:20 2011 (r2285) +++ clients/lib/types.h Wed Jun 15 23:00:08 2011 (r2286) @@ -5,6 +5,4 @@ #define LONG long #define NULL 0 -typedef unsigned int size_t; - VOID fatal(char *fmt, ...);

1 0

[commit] r2285 - cpu/arm/olpc/1.75
by repository service 15 Jun '11

15 Jun '11

Author: wmb Date: Wed Jun 15 22:38:20 2011 New Revision: 2285 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2285 Log: Use new git commit of nandblaster, which actually has the changes to which the last commit alludes. Modified: cpu/arm/olpc/1.75/mcnand-version.fth Modified: cpu/arm/olpc/1.75/mcnand-version.fth ============================================================================== --- cpu/arm/olpc/1.75/mcnand-version.fth Wed Jun 15 22:23:53 2011 (r2284) +++ cpu/arm/olpc/1.75/mcnand-version.fth Wed Jun 15 22:38:20 2011 (r2285) @@ -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 46352660d19d20ebc69d8c0bd5e4d3bbf5185501 +macro: MCNAND_VERSION bee3e761ec20c9e42778db4e72c3200ee888a419 \ macro: MCNAND_VERSION test \ macro: MCNAND_VERSION HEAD

1 0

[commit] r2284 - cpu/arm/olpc/1.75
by repository service 15 Jun '11

15 Jun '11

Author: wmb Date: Wed Jun 15 22:23:53 2011 New Revision: 2284 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2284 Log: Use new git commit of nandblaster, with fewer compiler include dependencies. Modified: cpu/arm/olpc/1.75/mcnand-version.fth Modified: cpu/arm/olpc/1.75/mcnand-version.fth ============================================================================== --- cpu/arm/olpc/1.75/mcnand-version.fth Wed Jun 15 07:36:10 2011 (r2283) +++ cpu/arm/olpc/1.75/mcnand-version.fth Wed Jun 15 22:23:53 2011 (r2284) @@ -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 3537d14318e0eac205dda2f8dcd524f24b9cabe3 +macro: MCNAND_VERSION 46352660d19d20ebc69d8c0bd5e4d3bbf5185501 \ macro: MCNAND_VERSION test \ macro: MCNAND_VERSION HEAD

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