June 2011 - openfirmware - mail.coreboot.org

[commit] r2283 - dev/olpc/kb3700
by repository service June 15, 2011

June 15, 2011

Author: rsmith Date: Wed Jun 15 07:36:10 2011 New Revision: 2283 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2283 Log: OLPC XO 1.75: Add als@ and ec-hash$ EC commands als@ reads the current als reading. ec-hash$ reads the EC commit ID hash. Modified: dev/olpc/kb3700/eccmds.fth Modified: dev/olpc/kb3700/eccmds.fth ============================================================================== --- dev/olpc/kb3700/eccmds.fth Wed Jun 15 07:36:06 2011 (r2282) +++ dev/olpc/kb3700/eccmds.fth Wed Jun 15 07:36:10 2011 (r2283) @@ -62,11 +62,19 @@ 0 d# 16 h# 53 do-ec-cmd-buf ( adr ) d# 16 cscount-max ; + : ec-user$ ( -- adr len ) 0 d# 16 h# 54 do-ec-cmd-buf ( adr ) d# 16 cscount-max ; +: ec-hash$ ( -- adr len ) + 0 d# 16 h# 55 do-ec-cmd-buf ( adr ) + d# 16 cscount-max +; + +: als@ ( -- w ) h# 56 ec-cmd-w@ ; + [ifdef] notdef \ These commands are awaiting documentation on their interfaces #define CMD_READ_EXT_SCI_MASK 0x37 #define CMD_WRITE_EXT_SCI_MASK 0x38

1 0

[commit] r2282 - cpu/arm/olpc/1.75
by repository service June 15, 2011

June 15, 2011

Author: rsmith Date: Wed Jun 15 07:36:06 2011 New Revision: 2282 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2282 Log: XO 1.75: Fix 1.75 builds from a git-svn checkout Modified: cpu/arm/olpc/1.75/sourceurl.fth Modified: cpu/arm/olpc/1.75/sourceurl.fth ============================================================================== --- cpu/arm/olpc/1.75/sourceurl.fth Wed Jun 15 07:36:02 2011 (r2281) +++ cpu/arm/olpc/1.75/sourceurl.fth Wed Jun 15 07:36:06 2011 (r2282) @@ -2,6 +2,6 @@ show-rebuilds? false to show-rebuilds? \ We don't need to see these commands -" if svn info ${BP} 2>/dev/null >/dev/null; then svn info ${BP} | grep URL: | cut -d ' ' -f 2 | tr \\n ' ' >sourceurl; svnversion -n ${BP} >>sourceurl; else git log -1 | grep git-svn-id: >sourceurl; fi" $sh +" if svn info ${BP} 2>/dev/null >/dev/null; then svn info ${BP} | grep URL: | cut -d ' ' -f 2 | tr \\n ' ' >sourceurl; svnversion -n ${BP} >>sourceurl; else git svn info | grep Root: | cut -d ':' -f 2- | tr \\n ' ' > sourceurl ; echo -n 'r' >>sourceurl ; git svn info | grep Revision | cut -d':' -f 2 | tr -d [:space:] >>sourceurl ; fi" $sh to show-rebuilds?

1 0

[commit] r2281 - dev/olpc/kb3700
by repository service June 15, 2011

June 15, 2011

Author: rsmith Date: Wed Jun 15 07:36:02 2011 New Revision: 2281 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2281 Log: XO-1 Add bat_reset support Needs special EC code Modified: dev/olpc/kb3700/battery.fth Modified: dev/olpc/kb3700/battery.fth ============================================================================== --- dev/olpc/kb3700/battery.fth Wed Jun 15 07:35:59 2011 (r2280) +++ dev/olpc/kb3700/battery.fth Wed Jun 15 07:36:02 2011 (r2281) @@ -7,10 +7,15 @@ [then] \ Names try to match the variable names in EC code + +h# F780 constant ec-bProcessOneWireIndex +h# F7CF constant ec-bHDQ_ACCESS_FLAG2 + h# FA00 constant ec-rambase h# 01 constant ec-pwr_limit h# 09 constant ec-va2 h# 20 constant ec-platformID +h# A5 constant ec-mBAT_STATUS h# FC00 constant ec-gpiobase h# 00 constant ec-gpiofs00 @@ -523,6 +528,14 @@ drop ; +\ Instruct the EC to completely reset the battery +\ subsystem. (XO-1 F series EC code) + +: (bat-reset) ( -- ) + 1 ec-bHDQ_ACCESS_FLAG2 ec! + 4 ec-bProcessOneWireIndex ec! +; + : bat-set-default-status ( val -- ) ds-bank0 1w-recall ds-default-status 1w-write-start @@ -712,6 +725,12 @@ bat-disable-charge ; +: bat-reset + batman-init? + (bat-reset) + batman-stop +; + fload ${BP}/dev/olpc/kb3700/batstat.fth \ LICENSE_BEGIN

1 0

[commit] r2280 - dev/olpc/kb3700
by repository service June 15, 2011

June 15, 2011

Author: rsmith Date: Wed Jun 15 07:35:59 2011 New Revision: 2280 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2280 Log: XO 1.5-1.75 EC Read Vin cmd expanded to return 2 bytes Modified: dev/olpc/kb3700/batstat.fth Modified: dev/olpc/kb3700/batstat.fth ============================================================================== --- dev/olpc/kb3700/batstat.fth Tue Jun 14 23:45:37 2011 (r2279) +++ dev/olpc/kb3700/batstat.fth Wed Jun 15 07:35:59 2011 (r2280) @@ -128,7 +128,8 @@ ; [then] -: mppt-pct 255 * 100 / mppt-limit! ; +: (mppt-pct) 255 * 100 / mppt-limit! ; + : .mppt mppt-limit@ ( pwr_limit ) @@ -136,6 +137,8 @@ ." 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] r2279 - in cpu/arm: mmp2 olpc/1.75
by repository service June 14, 2011

June 14, 2011

Author: wmb Date: Tue Jun 14 23:45:37 2011 New Revision: 2279 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2279 Log: OLPC XO-1.75 - auto-reboot after rewriting SPI FLASH, for consistency with earlier systems. Modified: cpu/arm/mmp2/sspspi.fth cpu/arm/olpc/1.75/fw.bth Modified: cpu/arm/mmp2/sspspi.fth ============================================================================== --- cpu/arm/mmp2/sspspi.fth Tue Jun 14 20:55:35 2011 (r2278) +++ cpu/arm/mmp2/sspspi.fth Tue Jun 14 23:45:37 2011 (r2279) @@ -141,7 +141,7 @@ ['] ssp-spi-out to spi-out ['] ssp-spi-cs-on to spi-cs-on ['] ssp-spi-cs-off to spi-cs-off - ['] noop to spi-reprogrammed + ['] reset-all to spi-reprogrammed ['] noop to spi-reprogrammed-no-reboot \ use-spi-flash-read ['] fast-spi-flash-read to flash-read Modified: cpu/arm/olpc/1.75/fw.bth ============================================================================== --- cpu/arm/olpc/1.75/fw.bth Tue Jun 14 20:55:35 2011 (r2278) +++ cpu/arm/olpc/1.75/fw.bth Tue Jun 14 23:45:37 2011 (r2279) @@ -152,7 +152,7 @@ fload ${BP}/cpu/x86/pc/olpc/via/factory.fth \ Manufacturing tools \ When reprogramming this machine's SPI FLASH, rebooting the EC is unnecessary -: no-kbc-reboot ; +: no-kbc-reboot ['] noop to spi-reprogrammed ; : kbc-on ; \ Pseudo device that appears in the boot order before net booting

1 0

[commit] r2278 - in cpu: arm/olpc/1.75 x86/pc/olpc
by repository service June 14, 2011

June 14, 2011

Author: wmb Date: Tue Jun 14 20:55:35 2011 New Revision: 2278 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2278 Log: OLPC XO-1.75 - fixed a residual assumption that SPI FLASH is memory mapped. Had it not been fixed, it would have broken efface-md in the security code. Modified: cpu/arm/olpc/1.75/fw.bth cpu/x86/pc/olpc/security.fth Modified: cpu/arm/olpc/1.75/fw.bth ============================================================================== --- cpu/arm/olpc/1.75/fw.bth Tue Jun 14 20:38:01 2011 (r2277) +++ cpu/arm/olpc/1.75/fw.bth Tue Jun 14 20:55:35 2011 (r2278) @@ -229,7 +229,6 @@ 0 value ec-indexed-io-off? \ !!! : ec-indexed-io-off ( -- ) ; \ !!! : ec-ixio-reboot ( -- ) ; \ !!! -: flash-base ( -- ) true abort" The stuff that relies on flash-base in security.fth needs to be reworked!" ; \ idt1338 rtc and ram address map \ 00 -> 0f rtc Modified: cpu/x86/pc/olpc/security.fth ============================================================================== --- cpu/x86/pc/olpc/security.fth Tue Jun 14 20:38:01 2011 (r2277) +++ cpu/x86/pc/olpc/security.fth Tue Jun 14 20:55:35 2011 (r2278) @@ -1300,7 +1300,7 @@ : efface-md ( -- ) " md" find-tag 0= if exit then ( data$ ) - + 2 + flash-base - ( flash-offset ) + + 2 + mfg-data-top - mfg-data-end-offset + ( flash-offset ) spi-start spi-identify ( flash-offset ) " MD" rot write-spi-flash ( ) spi-reprogrammed ( )

1 0

[commit] r2277 - cpu/arm/olpc/1.75
by repository service June 14, 2011

June 14, 2011

Author: wmb Date: Tue Jun 14 20:38:01 2011 New Revision: 2277 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2277 Log: OLPC XO-1.75 trac #11000 - Implemented show-temperature so fs-update will display the temperature. Modified: cpu/arm/olpc/1.75/fw.bth Modified: cpu/arm/olpc/1.75/fw.bth ============================================================================== --- cpu/arm/olpc/1.75/fw.bth Tue Jun 14 20:17:23 2011 (r2276) +++ cpu/arm/olpc/1.75/fw.bth Tue Jun 14 20:38:01 2011 (r2277) @@ -272,7 +272,7 @@ ; ' pre-setup-for-linux to linux-pre-hook -: show-temperature ( -- ) ; +: show-temperature ( -- ) space cpu-temperature .d ; fload ${BP}/cpu/arm/bootascall.fth create use-thinmac fload ${BP}/cpu/x86/pc/olpc/wifichannel.fth

1 0

[commit] r2276 - in cpu/arm: mmp2 olpc/1.75
by repository service June 14, 2011

June 14, 2011

Author: wmb Date: Tue Jun 14 20:17:23 2011 New Revision: 2276 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2276 Log: OLPC XO-1.75 trac #11000 - Implemented cpu-temperature Added: cpu/arm/mmp2/thermal.fth Modified: cpu/arm/olpc/1.75/devices.fth Added: cpu/arm/mmp2/thermal.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/mmp2/thermal.fth Tue Jun 14 20:17:23 2011 (r2276) @@ -0,0 +1,50 @@ +\ See license at end of file +purpose: Driver for the MMP2 thermal sensor + +h# d4013200 value thermal-base +: init-thermal-sensor ( -- ) + thermal-base l@ h# 400 and if exit then + 3 h# d4015090 l! \ Enable clocks to thermal sensor + h# 10000 thermal-base l! \ Enable sensing +; + +: cpu-temperature ( -- celcius ) + 0 ( acc ) + d# 100 0 do ( acc ) \ Accumulate 100 samples + thermal-base l@ ( acc reg ) + h# 3ff and ( acc val ) + + ( acc' ) + loop ( acc ) + + \ Now we have raw value * 100 + \ The formula (from the Linux driver) is Celcius = (raw - 529.4) / 1.96 + + d# 52940 - d# 196 / ( celcius ) +; +stand-init: Thermal sensor + init-thermal-sensor +; + +\ 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 Modified: cpu/arm/olpc/1.75/devices.fth ============================================================================== --- cpu/arm/olpc/1.75/devices.fth Tue Jun 14 07:30:53 2011 (r2275) +++ cpu/arm/olpc/1.75/devices.fth Tue Jun 14 20:17:23 2011 (r2276) @@ -379,6 +379,8 @@ extra-mem-pa /extra-mem add-memory ; +fload ${BP}/cpu/arm/mmp2/thermal.fth + \ LICENSE_BEGIN \ Copyright (c) 2010 FirmWorks \

1 0

[commit] r2275 - cpu/arm/olpc/1.75
by repository service June 14, 2011

June 14, 2011

Author: quozl Date: Tue Jun 14 07:30:53 2011 New Revision: 2275 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2275 Log: OLPC XO-1.75 trac #10989 - fix for RTC year increment on reboot, by remapping CMOS to RTC RAM addresses. Modified: cpu/arm/olpc/1.75/fw.bth Modified: cpu/arm/olpc/1.75/fw.bth ============================================================================== --- cpu/arm/olpc/1.75/fw.bth Tue Jun 14 04:42:19 2011 (r2274) +++ cpu/arm/olpc/1.75/fw.bth Tue Jun 14 07:30:53 2011 (r2275) @@ -230,15 +230,28 @@ : ec-indexed-io-off ( -- ) ; \ !!! : ec-ixio-reboot ( -- ) ; \ !!! : flash-base ( -- ) true abort" The stuff that relies on flash-base in security.fth needs to be reworked!" ; + +\ idt1338 rtc and ram address map +\ 00 -> 0f rtc +\ 10 -> 3f cmos + +: >rtc ( index -- rtc-address ) h# 3f and h# 10 + ; + : cmos@ ( index -- data ) - h# 38 mod 8 + " rtc@" clock-node @ ( index adr len ih ) + >rtc " rtc@" clock-node @ ( index adr len ih ) ['] $call-method catch if 4drop 0 then ; : cmos! ( data index -- ) - h# 38 mod 8 + " rtc!" clock-node @ ( data index adr len ih ) - ['] $call-method catch if 2drop 3drop then + >rtc " rtc!" clock-node @ ( data index adr len ih ) + ['] $call-method catch if 2drop 3drop then ; +\ cmos address map +\ 80 audio volume +\ 81 audio volume +\ 82 alternate boot +\ 83 xid + : dimmer ( -- ) screen-ih if " dimmer" screen-ih $call-method then ; : brighter ( -- ) screen-ih if " brighter" screen-ih $call-method then ; @@ -248,7 +261,7 @@ 2 to bundle-suffix stand-init: xid - 0 cmos@ dup 1+ 0 cmos! ( n ) + h# 83 cmos@ dup 1+ h# 83 cmos! ( n ) d# 24 lshift ( new-xid ) " dev /obp-tftp to rpc-xid dend" evaluate ;

1 0

[commit] r2274 - clients/lib
by repository service June 14, 2011

June 14, 2011

Author: wmb Date: Tue Jun 14 04:42:19 2011 New Revision: 2274 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2274 Log: OLPC XO-1.75 trac #10884 - Nandblaster for ARM - more tweaks to make it compile natively on koji2. Modified: clients/lib/printf.c Modified: clients/lib/printf.c ============================================================================== --- clients/lib/printf.c Tue Jun 14 04:38:55 2011 (r2273) +++ clients/lib/printf.c Tue Jun 14 04:42:19 2011 (r2274) @@ -4,6 +4,7 @@ #include "1275.h" +#include <string.h> #include <stdarg.h> #include "stdio.h" @@ -226,7 +227,7 @@ va_start(args, fmt); (void)_printf(fmt, args); va_end(args); - exit(); + exit(1); } // LICENSE_BEGIN

1 0