openfirmware October 2011

openfirmware@openfirmware.info

1 participants
103 discussions

[commit] r2568 - cpu/arm/mmp2
by repository service 03 Oct '11

03 Oct '11

Author: wmb Date: Mon Oct 3 23:16:03 2011 New Revision: 2568 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2568 Log: OLPC 1.75 - fixed error in currently-unused code introduced by a recent change. Modified: cpu/arm/mmp2/dramrecal.fth Modified: cpu/arm/mmp2/dramrecal.fth ============================================================================== --- cpu/arm/mmp2/dramrecal.fth Mon Oct 3 23:13:33 2011 (r2567) +++ cpu/arm/mmp2/dramrecal.fth Mon Oct 3 23:16:03 2011 (r2568) @@ -151,8 +151,8 @@ mov pc,r1 c; -: apbc-clr-rst ( offset -- ) +apbc 4 swap io-clr ; -: apbc-set-rst ( offset -- ) +apbc 4 swap io-set ; +: apbc-clr-rst ( offset -- ) 4 swap +apbc io-clr ; +: apbc-set-rst ( offset -- ) 4 swap +apbc io-set ; : disable-apbc-clks ( -- ) \ 3 h# 38 +apbc io-clr \ GPIO @@ -570,10 +570,10 @@ h# b0 d# 15 af! \ Wake SP on rotate key h# 220 d# 71 af! \ Wake SP on KBD CLK falling edge h# 221 d# 160 af! \ Wake SP on TPD CLK falling edge - h# 4c +mpmu h# 20.0000 io-set \ Keypress wakes SP + h# 20.0000 h# 4c +mpmu io-set \ Keypress wakes SP ['] disable-int40 d# 40 interrupt-handler! d# 40 enable-interrupt \ SP to PJ4 communications interrupt - 1 h# 29.00cc 1 io-clr \ Unmask the inter-processor communications interrupt + 1 h# 29.00cc io-clr \ Unmask the inter-processor communications interrupt ; : breadcrumb ( n -- ) h# d000.0110 l! ;

1 0

[commit] r2567 - in cpu/arm: mmp2 olpc/1.75
by repository service 03 Oct '11

03 Oct '11

Author: wmb Date: Mon Oct 3 23:13:33 2011 New Revision: 2567 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2567 Log: OLPC XO-1.75 - Added suspend/resume test to "test /memory", cleaning up rtc.fth in the process. Modified: cpu/arm/mmp2/dramrecal.fth cpu/arm/mmp2/rtc.fth cpu/arm/olpc/1.75/probemem.fth Modified: cpu/arm/mmp2/dramrecal.fth ============================================================================== --- cpu/arm/mmp2/dramrecal.fth Mon Oct 3 22:57:06 2011 (r2566) +++ cpu/arm/mmp2/dramrecal.fth Mon Oct 3 23:13:33 2011 (r2567) @@ -296,7 +296,6 @@ 1 swap lshift and 0<> ( flag ) ; -: icu@ ( offset -- value ) h# 28.2000 + io@ ; : .masked ( irq# -- ) dup /l* h# 10c + icu@ ( irq# masked ) 1 and if ( irq# ) @@ -571,10 +570,10 @@ h# b0 d# 15 af! \ Wake SP on rotate key h# 220 d# 71 af! \ Wake SP on KBD CLK falling edge h# 221 d# 160 af! \ Wake SP on TPD CLK falling edge - h# 4c mpmu@ h# 20.0000 or h# 4c mpmu! \ Keypress wakes SP + h# 4c +mpmu h# 20.0000 io-set \ Keypress wakes SP ['] disable-int40 d# 40 interrupt-handler! d# 40 enable-interrupt \ SP to PJ4 communications interrupt - h# 2900cc io@ 1 invert and h# 2900cc io! \ Unmask the communications interrupt + 1 h# 29.00cc 1 io-clr \ Unmask the inter-processor communications interrupt ; : breadcrumb ( n -- ) h# d000.0110 l! ; Modified: cpu/arm/mmp2/rtc.fth ============================================================================== --- cpu/arm/mmp2/rtc.fth Mon Oct 3 22:57:06 2011 (r2566) +++ cpu/arm/mmp2/rtc.fth Mon Oct 3 23:13:33 2011 (r2567) @@ -1,96 +1,34 @@ +\ See license at end of file purpose: Driver for MMP2 internal RTC -\ This code was written as a test/demonstration of using -\ the MMP2 internal RTC to generate alarm interrupts. -\ It is not currently used by anything, and should it -\ ever be needed, it should be put in a device node. +\ Interrupt 5 combines two interrupt inputs, RTC INT (bit 1) and RTC ALARM (bit 0) +: int5-mask ( -- offset ) h# 16c +icu ; +: int5-status@ ( -- value ) h# 154 icu@ ; -: int5-mask! ( value -- ) h# 28.216c io! ; -: int5-mask@ ( -- value ) h# 28.216c io@ ; -: int5-status@ ( -- value ) h# 28.2154 io@ ; -: enable-rtc ( -- ) h# 81 h# 01.5000 io! ; +: enable-rtc ( -- ) h# 81 0 apbc! ; \ Turn on the clock for the internal RTC : enable-rtc-wakeup ( -- ) - h# 004c mpmu@ h# 2.0010 or h# 004c mpmu! - h# 104c mpmu@ h# 2.0010 or h# 104c mpmu! + h# 2.0010 h# 104c +mpmu io-set ; : soc-rtc@ ( offset -- value ) h# 01.0000 + io@ ; : soc-rtc! ( value offset -- value ) h# 01.0000 + io! ; : cancel-alarm ( -- ) 0 8 soc-rtc! - int5-mask@ 1 or int5-mask! \ Mask alarm + 1 int5-mask io-set \ Mask alarm ; -: take-alarm ( -- ) - ." Alarm fired" cr - cancel-alarm -; -: alarm-in-3 ( -- ) - enable-rtc \ Turn on clocks - - int5-mask@ 1 invert and int5-mask! \ Unmask alarm - enable-rtc-wakeup - 0 soc-rtc@ d# 3 + 4 soc-rtc! \ Set alarm for 3 seconds from now - 7 8 soc-rtc! \ Ack old interrupts and enable new ones - ['] take-alarm 5 interrupt-handler! - 5 enable-interrupt -; -: alarm-in-1 ( -- ) - enable-rtc \ Turn on clocks - - int5-mask@ 1 invert and int5-mask! \ Unmask alarm - enable-rtc-wakeup - 0 soc-rtc@ d# 1 + 4 soc-rtc! \ Set alarm for 3 seconds from now - 7 8 soc-rtc! \ Ack old interrupts and enable new ones - ['] cancel-alarm 5 interrupt-handler! - 5 enable-interrupt -; -: wake1 ( -- ) - enable-rtc \ Turn on clocks - - int5-mask@ 1 invert and int5-mask! \ Unmask alarm - enable-rtc-wakeup - 0 soc-rtc@ d# 2 + 4 soc-rtc! \ Set alarm for 2 seconds from now - 7 8 soc-rtc! \ Ack old interrupts and enable new ones - ['] cancel-alarm 5 interrupt-handler! - 5 enable-interrupt -; -: alarm1 ( -- ) - enable-rtc \ Turn on clocks +: take-alarm ( -- ) ." Alarm fired" cr cancel-alarm ; +: rtc-wake ( handler-xt #seconds -- ) + enable-rtc ( handler-xt #seconds ) \ Turn on clocks - int5-mask@ 1 invert and int5-mask! \ Unmask alarm - enable-rtc-wakeup - 0 soc-rtc@ d# 1 + 4 soc-rtc! \ Set alarm for 3 seconds from now - 7 8 soc-rtc! \ Ack old interrupts and enable new ones - ['] take-alarm 5 interrupt-handler! - 5 enable-interrupt -; -: test1 - 0 - begin - alarm1 - str - (cr dup . 1+ - d# 500 ms - key? until -; -: test2 - 0 - begin - wake1 - str - (cr dup . 1+ - d# 500 ms - key? until -; -: test3 - 0 - begin - wake1 - str - cr dup . 1+ - d# 500 ms - key? until -; -: test4 + 1 int5-mask io-clr ( handler-xt #seconds ) \ Unmask alarm + enable-rtc-wakeup ( handler-xt #seconds ) + 0 soc-rtc@ + 4 soc-rtc! ( handler-xt ) \ Set alarm for 2 seconds from now + 7 8 soc-rtc! ( handler-xt ) \ Ack old interrupts and enable new ones + 5 interrupt-handler! ( ) + 5 enable-interrupt ( ) +; +: wake1 ( -- ) ['] cancel-alarm 1 rtc-wake ; +: alarm-in-3 ( -- ) ['] take-alarm 3 rtc-wake ; +: wakeup-loop ( -- ) d# 1000000 0 do 0 d# 13 at-xy i .d 5 0 do @@ -101,11 +39,47 @@ loop 5 +loop ; +alias test4 wakeup-loop -\ test3 -\ wake1 str cr - -\ patch noop cr take-alarm test1 -\ patch (cr cr take-alarm test1 +: s3-selftest ( -- error? ) + \ The general failure mode here is that it won't wake up, so + \ it's hard to return a real error code. We just have to rely + \ on the operator. + ." Testing suspend/resume" cr + ." Sleeping for 3 seconds .. " d# 100 ms + ec-rst-pwr ['] cancel-alarm 3 rtc-wake str ec-max-pwr ( power ) + \ Negative power is consumed from battery, positive is supplied to battery + dup d# -250 < if ( power ) + ." System used too much power during suspend - " negate .d ." mW" cr ( ) + true ( error? ) + else ( power ) + drop false ( error? ) + then ( error? ) +; +dev /memory +[ifdef] test-s3 ' s3-selftest to test-s3 [then] +dend -\ : cx cr d# 400 ms ; patch cx cr take-alarm test1 +\ 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/probemem.fth ============================================================================== --- cpu/arm/olpc/1.75/probemem.fth Mon Oct 3 22:57:06 2011 (r2566) +++ cpu/arm/olpc/1.75/probemem.fth Mon Oct 3 23:13:33 2011 (r2567) @@ -60,6 +60,8 @@ [then] : .chunk ( adr len -- ) ." Testing address 0x" swap 8u.h ." length 0x" 8u.h cr ; +defer test-s3 ( -- error? ) ' false is test-s3 + : test-mem ( adr len -- ) \ Test a chunk 'o memory 2>r 2r@ 0 mem-claim to p-adr ( ) ( r: adr len ) @@ -101,12 +103,12 @@ 2dup .chunk ( adr len this-len r: this-padr ) test-mem ( adr len ) mem-fail? if ( adr len ) - 2drop true exit ( -- error ) + 2drop true exit ( -- error? ) then ( adr len ) repeat ( adr len ) 2drop ( ) - mem-fail? + test-s3 ( error? ) ; device-end

1 0

[commit] r2566 - cpu/arm/mmp2
by repository service 03 Oct '11

03 Oct '11

Author: wmb Date: Mon Oct 3 22:57:06 2011 New Revision: 2566 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2566 Log: Added license text to a file. Modified: cpu/arm/mmp2/socregs.fth Modified: cpu/arm/mmp2/socregs.fth ============================================================================== --- cpu/arm/mmp2/socregs.fth Mon Oct 3 22:56:16 2011 (r2565) +++ cpu/arm/mmp2/socregs.fth Mon Oct 3 22:57:06 2011 (r2566) @@ -25,3 +25,27 @@ : apbc@ ( offset -- l ) +apbc io@ ; : apbc! ( l offset -- ) +apbc io! ; + +\ 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] r2565 - in cpu/arm: mmp2 olpc/1.75
by repository service 03 Oct '11

03 Oct '11

Author: wmb Date: Mon Oct 3 22:56:16 2011 New Revision: 2565 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2565 Log: OLPC XO-1.75 - Moved register access words for SoC-level cross-function registers into a separate file. Added: cpu/arm/mmp2/socregs.fth Modified: cpu/arm/olpc/1.75/prefw.bth Added: cpu/arm/mmp2/socregs.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/mmp2/socregs.fth Mon Oct 3 22:56:16 2011 (r2565) @@ -0,0 +1,27 @@ +\ See license at end of file +purpose: Register access words for MMP2 registers used by many functional units + +: +io ( offset -- va ) io-va + ; +: io! ( value offset -- ) +io l! ; +: io@ ( offset -- value ) +io l@ ; + +: +apbc ( offset -- io-offset ) h# 01.5000 + ; \ APB Clock Unit +: +pmua ( offset -- io-offset ) h# 28.2800 + ; \ CPU Power Management Unit +: +mpmu ( offset -- io-offset ) h# 05.0000 + ; \ Main Power Management Unit +: +scu ( offset -- io-offset ) h# 28.2c00 + ; \ System Control Unit +: +icu ( offset -- io-offset ) h# 28.2000 + ; \ Interrupt Controller Unit + +: io-set ( mask offset -- ) dup io@ rot or swap io! ; +: io-clr ( mask offset -- ) dup io@ rot invert and swap io! ; + +: icu@ ( offset -- value ) +icu io@ ; +: icu! ( value offset -- ) +icu io! ; + +: mpmu@ ( offset -- l ) +mpmu io@ ; +: mpmu! ( l offset -- ) +mpmu io! ; + +: pmua@ ( offset -- l ) +pmua io@ ; +: pmua! ( l offset -- ) +pmua io! ; + +: apbc@ ( offset -- l ) +apbc io@ ; +: apbc! ( l offset -- ) +apbc io! ; Modified: cpu/arm/olpc/1.75/prefw.bth ============================================================================== --- cpu/arm/olpc/1.75/prefw.bth Mon Oct 3 18:44:20 2011 (r2564) +++ cpu/arm/olpc/1.75/prefw.bth Mon Oct 3 22:56:16 2011 (r2565) @@ -163,26 +163,7 @@ fload ${BP}/forth/lib/selstr.fth -\ : +io ( offset -- va ) io-va + ; -: +io ( offset -- va ) dup h# 0040.0000 >= if debug-me then io-va + ; -: io! ( value offset -- ) +io l! ; -: io@ ( offset -- value ) +io l@ ; - -: +apbc ( offset -- io-offset ) h# 01.5000 + ; -: +pmua ( offset -- io-offset ) h# 28.2800 + ; -: +mpmu ( offset -- io-offset ) h# 05.0000 + ; -: +scu ( offset -- io-offset ) h# 28.2c00 + ; -: +icu ( offset -- io-offset ) h# 28.2000 + ; - -: io-set ( mask offset -- ) dup io@ rot or swap io! ; -: io-clr ( mask offset -- ) dup io@ rot invert and swap io! ; - - -: mpmu@ ( offset -- l ) +mpmu io@ ; -: mpmu! ( l offset -- ) +mpmu io! ; - -: pmua@ ( offset -- l ) +pmua io@ ; -: pmua! ( l offset -- ) +pmua io! ; +fload ${BP}/cpu/arm/mmp2/socregs.fth \ MMP2 registers used by many functional units fload ${BP}/cpu/arm/mmp2/hash.fth \ Hashes - SHA1, SHA-256, MD5 fload ${BP}/cpu/x86/pc/olpc/crypto.fth \ Cryptographic image validation

1 0

[commit] r2564 - cpu/x86/pc/olpc/via
by repository service 03 Oct '11

03 Oct '11

Author: wmb Date: Mon Oct 3 18:44:20 2011 New Revision: 2564 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2564 Log: XO-1.5 - fixed a stack comment in probemem.fth; no functional change. Modified: cpu/x86/pc/olpc/via/probemem.fth Modified: cpu/x86/pc/olpc/via/probemem.fth ============================================================================== --- cpu/x86/pc/olpc/via/probemem.fth Sat Oct 1 21:53:08 2011 (r2563) +++ cpu/x86/pc/olpc/via/probemem.fth Mon Oct 3 18:44:20 2011 (r2564) @@ -105,7 +105,7 @@ then ( rem$ ) repeat 2drop ( ) - test-s3 ( ) + test-s3 ( error? ) ; device-end

1 0

[commit] r2563 - cpu/arm/mmp2
by repository service 01 Oct '11

01 Oct '11

Author: wmb Date: Sat Oct 1 21:53:08 2011 New Revision: 2563 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2563 Log: OLPC XO-1.75 - commented-out ODT turn off/on in self-refresh code; appears to be unnecessary based on testing of q4b10mp.rom . Modified: cpu/arm/mmp2/dramrecal.fth Modified: cpu/arm/mmp2/dramrecal.fth ============================================================================== --- cpu/arm/mmp2/dramrecal.fth Sat Oct 1 21:51:55 2011 (r2562) +++ cpu/arm/mmp2/dramrecal.fth Sat Oct 1 21:53:08 2011 (r2563) @@ -62,9 +62,11 @@ mov r1, #0x1 \ Block all data requests str r1, [r0, #0x7e0] \ SDRAM_CTRL14 +[ifdef] notdef2 ldr r2, [r0, #0x770] \ SDRAM_CTRL7_SDRAM_ODT_CTRL2 orr r1, r2, #0x03000000 \ PAD_TERM_SWITCH_MODE: Termination disabled str r1, [r0, #0x770] \ SDRAM_CTRL7_SDRAM_ODT_CTRL2 +[then] mov r1, #0x40 \ Enter Self Refresh value str r1, [r0, #0x120] \ USER_INITIATED_COMMAND0 @@ -87,7 +89,9 @@ mov r1, #0x80 \ Exit Self Refresh value str r1, [r0, #0x120] \ USER_INITIATED_COMMAND0 +[ifdef] notdef2 str r2, [r0, #0x770] \ SDRAM_CTRL7_SDRAM_ODT_CTRL2 - restore previous value +[then] [ifdef] notdef mov r1, #0x01000000 \ Chip select 0

1 0

[commit] r2562 - cpu/x86
by repository service 01 Oct '11

01 Oct '11

Author: wmb Date: Sat Oct 1 21:51:55 2011 New Revision: 2562 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2562 Log: OLPC XO-1.5 - fixed typo in firfilter.fth that was causing build failures. Modified: cpu/x86/firfilter.fth Modified: cpu/x86/firfilter.fth ============================================================================== --- cpu/x86/firfilter.fth Sat Oct 1 21:50:52 2011 (r2561) +++ cpu/x86/firfilter.fth Sat Oct 1 21:51:55 2011 (r2562) @@ -146,7 +146,7 @@ r> 3drop ( ) ; -: upsample6 ( inbuf /inbuf outbuf -- ) 2 8khz>khz ; +: upsample6 ( inbuf /inbuf outbuf -- ) 2 8khz>48khz ; 0 [if] \ Here is some Matlab/Octave code to compute the weights

1 0

[commit] r2561 - cpu/arm/olpc/1.75 cpu/x86/pc/olpc cpu/x86/pc/olpc/via dev/olpc/spiflash
by repository service 01 Oct '11

01 Oct '11

Author: wmb Date: Sat Oct 1 21:50:52 2011 New Revision: 2561 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2561 Log: OLPC - fixed build problem for XO-1 and XO-1.5 introduces by recent changes to spiui.fth Modified: cpu/arm/olpc/1.75/devices.fth cpu/x86/pc/olpc/devices.fth cpu/x86/pc/olpc/via/devices.fth dev/olpc/spiflash/spiui.fth Modified: cpu/arm/olpc/1.75/devices.fth ============================================================================== --- cpu/arm/olpc/1.75/devices.fth Sat Oct 1 21:49:30 2011 (r2560) +++ cpu/arm/olpc/1.75/devices.fth Sat Oct 1 21:50:52 2011 (r2561) @@ -128,8 +128,6 @@ fload ${BP}/dev/olpc/spiflash/spiflash.fth \ SPI FLASH programming -: ignore-power-button ; \ XXX implement me - fload ${BP}/cpu/arm/mmp2/sspspi.fth \ Synchronous Serial Port SPI interface \ Create the top-level device node to access the entire boot FLASH device @@ -185,14 +183,29 @@ fload ${BP}/cpu/arm/olpc/1.75/bbedi.fth fload ${BP}/cpu/arm/olpc/1.75/edi.fth -[ifdef] load-base -: flash-buf load-base ; -[else] -/flash buffer: flash-buf -[then] +load-base constant flash-buf fload ${BP}/cpu/arm/olpc/1.75/ecflash.fth +: ec-spi-reprogrammed ( -- ) + edi-spi-start + set-ec-reboot + unreset-8051 +; + +: ignore-power-button ( -- ) + edi-spi-start + ['] reset-8051 catch if reset-8051 then + use-ssp-spi + ['] ec-spi-reprogrammed to spi-reprogrammed +; +: flash-vulnerable( ( -- ) + hdd-led-on +; +: )flash-vulnerable ( -- ) + hdd-led-off +; + fload ${BP}/dev/olpc/spiflash/spiui.fth \ User interface for SPI FLASH programming \ fload ${BP}/dev/olpc/spiflash/recover.fth \ XO-to-XO SPI FLASH recovery : ofw-fw-filename$ " disk:\boot\olpc.rom" ; Modified: cpu/x86/pc/olpc/devices.fth ============================================================================== --- cpu/x86/pc/olpc/devices.fth Sat Oct 1 21:49:30 2011 (r2560) +++ cpu/x86/pc/olpc/devices.fth Sat Oct 1 21:50:52 2011 (r2561) @@ -317,6 +317,10 @@ fload ${BP}/dev/olpc/kb3700/battery.fth \ Battery status reports +load-base constant flash-buf +: flash-vulnerable( ( -- ) ignore-power-button ; +: )flash-vulnerable ( -- ) ; + fload ${BP}/dev/olpc/spiflash/spiui.fth \ User interface for SPI FLASH programming fload ${BP}/dev/olpc/spiflash/recover.fth \ XO-to-XO SPI FLASH recovery : ofw-fw-filename$ " disk:\boot\olpc.rom" ; Modified: cpu/x86/pc/olpc/via/devices.fth ============================================================================== --- cpu/x86/pc/olpc/via/devices.fth Sat Oct 1 21:49:30 2011 (r2560) +++ cpu/x86/pc/olpc/via/devices.fth Sat Oct 1 21:50:52 2011 (r2561) @@ -288,6 +288,15 @@ fload ${BP}/dev/olpc/kb3700/battery.fth \ Battery status reports +load-base constant flash-buf +: flash-vulnerable( ( -- ) + hdd-led-on + ignore-power-button +; +: )flash-vulnerable ( -- ) + hdd-led-off +; + fload ${BP}/dev/olpc/spiflash/spiui.fth \ User interface for SPI FLASH programming fload ${BP}/cpu/x86/pc/olpc/via/recover.fth \ XO-to-XO SPI FLASH recovery Modified: dev/olpc/spiflash/spiui.fth ============================================================================== --- dev/olpc/spiflash/spiui.fth Sat Oct 1 21:49:30 2011 (r2560) +++ dev/olpc/spiflash/spiui.fth Sat Oct 1 21:50:52 2011 (r2561) @@ -42,6 +42,10 @@ \ Perform a series of sanity checks on the new firmware image. +[ifndef] flash-buf +/flash buffer: flash-buf +[then] + 0 value file-loaded? : crc ( adr len -- crc ) 0 crctab 2swap ($crc) ; @@ -185,23 +189,9 @@ ." or about 5 minutes if the host is running OFW." cr ; -: ec-spi-reprogrammed ( -- ) - edi-spi-start - set-ec-reboot - unreset-8051 -; - -: ignore-power-button ( -- ) - edi-spi-start - ['] reset-8051 catch if reset-8051 then - use-ssp-spi - ['] ec-spi-reprogrammed to spi-reprogrammed -; - : reflash ( -- ) \ Flash from data already in memory ?file - hdd-led-on - ignore-power-button + flash-vulnerable( flash-write-enable write-firmware @@ -217,7 +207,7 @@ else .verify-msg then - hdd-led-off + )flash-vulnerable ; defer fw-filename$ ' null$ to fw-filename$

1 0

[commit] r2560 - cpu/arm/olpc/1.75
by repository service 01 Oct '11

01 Oct '11

Author: wmb Date: Sat Oct 1 21:49:30 2011 New Revision: 2560 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2560 Log: OLPC XO-1.75 - this change goes with svn 2556 to implement YCrCv support. Modified: cpu/arm/olpc/1.75/lcd.fth Modified: cpu/arm/olpc/1.75/lcd.fth ============================================================================== --- cpu/arm/olpc/1.75/lcd.fth Sat Oct 1 19:48:05 2011 (r2559) +++ cpu/arm/olpc/1.75/lcd.fth Sat Oct 1 21:49:30 2011 (r2560) @@ -85,9 +85,8 @@ \ 5:YUV422packed 6:YUV422planar 7:YUV420planar 8:SmartPanelCmd \ 9:Palette4bpp A:Palette8bpp B:RGB888A : set-video-mode ( mode -- ) - d# 20 lshift ( x00000 ) h# 190 lcd@ ( x00000 regval ) - h# f00000 invert and ( x00000 regval' ) + h# f0.000e invert and ( x00000 regval' ) or ( regval' ) h# 190 lcd! ( ) ; @@ -95,14 +94,17 @@ : video-off ( -- ) h# 190 lcd@ 1 invert and h# 190 lcd! ; : set-video-dma-adr ( adr -- ) h# 0c0 lcd! ; -\ Assumes RGB565 -: start-video ( adr w h -- ) - clear-unused-regs normal-hsv ( adr w h ) - over 2* h# 0e0 lcd! ( adr w h ) \ Pitch - width * 2 bytes/pixel - placement ( adr ) - set-video-dma-adr ( ) \ Video buffer - 0 set-video-mode ( ) \ RGB565 - d# 255 set-video-alpha ( ) \ Opaque video +defer foo ' noop to foo + +: start-video ( adr w h ycrcb? -- ) + >r ( adr w h r: ycrcb? ) + clear-unused-regs normal-hsv ( adr w h r: ycrcb? ) + over 2* h# 0e0 lcd! ( adr w h r: ycrcb? ) \ Pitch - width * 2 bytes/pixel for RGB565, width for YCrCr4:2:2 + placement ( adr r: ycrcb? ) + set-video-dma-adr ( r: ycrcb? ) \ Video buffer + r> if h# 50.000e else 0 then set-video-mode ( ) + d# 255 set-video-alpha ( ) \ Opaque video + foo video-on ; : stop-video ( -- ) video-off ;

1 0

[commit] r2559 - dev/olpc/mmp2camera
by repository service 01 Oct '11

01 Oct '11

Author: wmb Date: Sat Oct 1 19:48:05 2011 New Revision: 2559 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2559 Log: Deleted a platform-specific file that is now shared. This completes the refactoring of the camera drivers for XO-1, XO-1.5, and XO-1.75. Deleted: dev/olpc/mmp2camera/ov.fth

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

openfirmware October 2011