openfirmware August 2012

openfirmware@openfirmware.info

1 participants
154 discussions

[commit] r3207 - in cpu/arm: mmp2 olpc
by repository service 20 Aug '12

20 Aug '12

Author: wmb Date: Mon Aug 20 23:55:40 2012 New Revision: 3207 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3207 Log: OLPC ARM - sorted out confusion about which of the two RTC nodes (internal vs. external) gets which device tree properties. Modified: cpu/arm/mmp2/rtc.fth cpu/arm/mmp2/twsi.fth cpu/arm/olpc/rtc.fth Modified: cpu/arm/mmp2/rtc.fth ============================================================================== --- cpu/arm/mmp2/rtc.fth Mon Aug 20 23:53:06 2012 (r3206) +++ cpu/arm/mmp2/rtc.fth Mon Aug 20 23:55:40 2012 (r3207) @@ -1,6 +1,19 @@ \ See license at end of file purpose: Driver for MMP2 internal RTC +0 0 " d4010000" " /" begin-package + " rtc" name + " mrvl,mmp-rtc" +compatible + my-address my-space h# 1000 reg + + d# 1 encode-int 0 encode-int encode+ " interrupts" property + " /interrupt-controller/interrupt-controller@154" encode-phandle " interrupt-parent" property + + " rtc 1Hz" encode-string " rtc alarm" encode-string encode+ " interrupt-names" property + + " /apbc" encode-phandle 0 encode-int encode+ " clocks" property +end-package + \ 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@ ; Modified: cpu/arm/mmp2/twsi.fth ============================================================================== --- cpu/arm/mmp2/twsi.fth Mon Aug 20 23:53:06 2012 (r3206) +++ cpu/arm/mmp2/twsi.fth Mon Aug 20 23:55:40 2012 (r3207) @@ -195,13 +195,6 @@ h# d4034000 d# 31 4 true true 4 make-twsi-node \ TWSI6 -0 0 " 1a" " /i2c@d4011000" begin-package \ TWSI1 - " audio-codec" name - " realtek,alc5631" +compatible - " realtek,rt5631" +compatible - my-address my-space 1 reg -end-package - [ifdef] soon-olpc-cl2 \ this breaks cl4-a1 boards, which ofw calls cl2. 0 0 " 30" " /i2c@d4033000" begin-package \ TWSI4 " touchscreen" name @@ -226,12 +219,6 @@ my-address my-space 1 reg end-package -0 0 " 68" " /i2c@d4031000" begin-package \ TWSI2 - " rtc" name - " idt,idt1338-rtc" +compatible - my-address my-space 1 reg -end-package - 0 0 " " " /" begin-package " twsi" name Modified: cpu/arm/olpc/rtc.fth ============================================================================== --- cpu/arm/olpc/rtc.fth Mon Aug 20 23:53:06 2012 (r3206) +++ cpu/arm/olpc/rtc.fth Mon Aug 20 23:55:40 2012 (r3207) @@ -1,17 +1,9 @@ -purpose: Driver for MMP internal RTC block +purpose: Driver for external IDT1388 RTC chip on XO-1.75 -0 0 " d4010000" " /" begin-package +0 0 " 68" " /i2c@d4031000" begin-package \ TWSI2 " rtc" name - " mrvl,mmp-rtc" +compatible - my-address my-space h# 1000 reg - - d# 1 encode-int 0 encode-int encode+ " interrupts" property - " /interrupt-controller/interrupt-controller@154" encode-phandle " interrupt-parent" property - - " rtc 1Hz" encode-string " rtc alarm" encode-string encode+ " interrupt-names" property - - - " /apbc" encode-phandle 0 encode-int encode+ " clocks" property + " idt,idt1338-rtc" +compatible + my-address my-space 1 reg [ifdef] cl2-a1 : set-address ( -- ) @@ -29,8 +21,6 @@ headerless -headerless - : ?clear h# 3f rtc@ h# 3e rtc@ bwjoin h# 55aa <> if h# 20 8 rtc! \ century

1 0

[commit] r3206 - dev/mmc/sdhci
by repository service 20 Aug '12

20 Aug '12

Author: wmb Date: Mon Aug 20 23:53:06 2012 New Revision: 3206 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3206 Log: SDHCI - handle host controllers that spuriously set the transfer interrupt bit during cmd13. Modified: dev/mmc/sdhci/sdhci.fth Modified: dev/mmc/sdhci/sdhci.fth ============================================================================== --- dev/mmc/sdhci/sdhci.fth Mon Aug 20 12:37:59 2012 (r3205) +++ dev/mmc/sdhci/sdhci.fth Mon Aug 20 23:53:06 2012 (r3206) @@ -92,10 +92,16 @@ \ hardware has a bug that blocks the card detection status bits \ unless the interrupt enables are on. 0 instance value intstat-count +: xfer-int-on ( -- ) h# 34 cw@ 2 or h# 34 cw! ; +: xfer-int-off ( -- ) h# 34 cw@ 2 invert and h# 34 cw! ; + : intstat-on ( -- ) intstat-count 0= if - h# 00cb h# 34 cw! \ normal interrupt status en reg - \ Enable: Remove, Insert, DMA Interrupt, Transfer Complete, CMD Complete + \ Enable: Remove, Insert, DMA Interrupt, CMD Complete + \ Transfer complete is handled separately because some host controllers + \ (e.g. Marvell MMP3) set it spuriously during commands that shouldn't set it. + h# 00c9 h# 34 cw! \ normal interrupt status en reg + \ Disable: Card Interrupt, Read Ready, Write Ready, Block Gap h# f1ff h# 36 cw! \ error interrupt status en reg then @@ -218,6 +224,7 @@ true " dma-map-in" $call-parent ( padr ) \ Prepare DMA buffer dup to dma-padr ( padr ) \ Remember for later 0 cl! \ Set address + xfer-int-on ; : dma-setup ( #blocks adr -- ) @@ -374,6 +381,10 @@ : cmd ( arg cmd mode -- ) debug? if ." CMD: " over 4 u.r space then + + \ R1B-class commands have an implied data transfer phase + over h# ff and h# 1b = if xfer-int-on then + over add-cmd wait-ready h# c cw! ( arg cmd ) \ Mode @@ -451,6 +462,7 @@ : mmc-switch ( arg -- ) \ CMD6 for MMC - no data h# 061b 0 cmd response h# 80 and if ." MMC SWITCH_ERROR" cr then 2 wait \ This command appears to have a transfer-complete + xfer-int-off ; : deselect-card ( -- ) 0 h# 0700 0 cmd ; \ CMD7 - with null RCA @@ -461,6 +473,7 @@ \ commands, so we must clear that bit if it is set. d# 16 ms \ Give the operation time to complete isr@ isr! + xfer-int-off ; : send-if-cond ( -- ) h# 1aa h# 081a 0 cmd ( response h# 1aa <> if ." Error" then ) ; \ CMD8 R7 (SD) @@ -1063,12 +1076,9 @@ then ; -: wait-dat ( -- ) d# 10 ms begin 2 ms present-state@ 4 and 0= until ; - \ Wait for completion : r/w-blocks-end ( in? -- error? ) drop - wait-dat wait-dma-done intstat-on wait-write-done intstat-off ; @@ -1080,11 +1090,18 @@ : r/w-blocks-start ( addr block# #blocks in? fresh? -- error? ) wait-dma-done ( addr block# #blocks fresh? in? ) + + \ wait-write-done used to be after dma-setup in an attempt to overlap + \ work with waiting time, but that doesn't work now that dma-setup + \ enables transfer interrupts, which can happen spuriously during + \ wait-write-done on some host controllers. + wait-write-done if 3drop 2drop true exit then ( addr block# #blocks fresh? in? ) + 2 pick 0= if 3drop 2drop false exit then \ Prevents hangs intstat-on ( addr block# #blocks fresh? in? ) 2 pick >r >r >r ( addr block# #blocks r: #blocks fresh? in? ) rot dma-setup ( block# r: #blocks fresh? in? ) - wait-write-done if drop r> r> r> 3drop true exit then ( block# ) + address-shift lshift r> if ( block# r: #blocks fresh? ) r> drop ( block# r: #blocks ) r> issue-read ( ) @@ -1097,8 +1114,6 @@ false ( error? ) ; : fresh-write-blocks-start ( addr block# #blocks -- error? ) - intstat-on - wait-dat false true r/w-blocks-start ;

1 0

[commit] r3205 - cpu/x86/pc/olpc/via
by repository service 20 Aug '12

20 Aug '12

Author: quozl Date: Mon Aug 20 12:37:59 2012 New Revision: 3205 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3205 Log: OLPC - fs-update, use zdata file size not spec file size for sanity-check, #12055 Modified: cpu/x86/pc/olpc/via/fsupdate.fth Modified: cpu/x86/pc/olpc/via/fsupdate.fth ============================================================================== --- cpu/x86/pc/olpc/via/fsupdate.fth Mon Aug 20 12:21:04 2012 (r3204) +++ cpu/x86/pc/olpc/via/fsupdate.fth Mon Aug 20 12:37:59 2012 (r3205) @@ -133,6 +133,7 @@ then ( ) ( r: ) ; +0 2value file-bytes : data: ( "filename" -- ) safe-parse-word ( filename$ ) nb-zd-#sectors -1 <> if ( filename$ ) @@ -146,11 +147,11 @@ drop ." Can't open " image-name$ type cr true " " ?nand-abort then to filefd ( ) + filefd file-size " Can't size file" ?nand-abort to file-bytes linefeed filefd force-line-delimiter true to secure-fsupdate? ; -0 2value file-bytes : size: ( "bytes" -- ) ?compare-spec-line get-dhex# ( d.size ) @@ -308,8 +309,6 @@ ['] open-nand catch ?dup if .error security-failure then ( adr len ) - [ also nand-commands ] dup s>d to file-bytes [ previous ] - \ clear-context nand-commands t-hms( also nand-commands ( adr len )

1 0

[commit] r3204 - cpu/x86/pc/olpc/via
by repository service 20 Aug '12

20 Aug '12

Author: quozl Date: Mon Aug 20 12:21:04 2012 New Revision: 3204 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3204 Log: OLPC - fs-update, fix sanity-check for signed install, #12055 Modified: cpu/x86/pc/olpc/via/fsupdate.fth Modified: cpu/x86/pc/olpc/via/fsupdate.fth ============================================================================== --- cpu/x86/pc/olpc/via/fsupdate.fth Mon Aug 20 11:59:52 2012 (r3203) +++ cpu/x86/pc/olpc/via/fsupdate.fth Mon Aug 20 12:21:04 2012 (r3204) @@ -152,6 +152,7 @@ 0 2value file-bytes : size: ( "bytes" -- ) + ?compare-spec-line get-dhex# ( d.size ) file-bytes d<> ( invalid? ) " Inconsistent size of zdata file" ?nand-abort @@ -307,6 +308,8 @@ ['] open-nand catch ?dup if .error security-failure then ( adr len ) + [ also nand-commands ] dup s>d to file-bytes [ previous ] + \ clear-context nand-commands t-hms( also nand-commands ( adr len )

1 0

[commit] r3203 - cpu/arm/olpc
by repository service 20 Aug '12

20 Aug '12

Author: quozl Date: Mon Aug 20 11:59:52 2012 New Revision: 3203 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3203 Log: OLPC XO-1.75 XO-4 - first audio open left 4 on stack, found at ok prompt, regression introduced r3117. Modified: cpu/arm/olpc/sound.fth Modified: cpu/arm/olpc/sound.fth ============================================================================== --- cpu/arm/olpc/sound.fth Mon Aug 20 11:44:00 2012 (r3202) +++ cpu/arm/olpc/sound.fth Mon Aug 20 11:59:52 2012 (r3203) @@ -56,7 +56,7 @@ h# 100 audio-clk io-set dly \ Disable isolation 4 audio-clk io-set \ Start audio SRAM redundancy repair - begin 4 audio-clk io@ 4 and 0= until \ And wait until done + begin audio-clk io@ 4 and 0= until \ And wait until done \ Bring audio island out of reset 1 audio-dsa io-set

1 0

[commit] r3202 - cpu/x86/pc/olpc/via
by repository service 20 Aug '12

20 Aug '12

Author: quozl Date: Mon Aug 20 11:44:00 2012 New Revision: 3202 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3202 Log: OLPC - fs-update, sanity-check file size if the zdata file contains a size: header line, abort if invalid, ignore if missing, #12055 Modified: cpu/x86/pc/olpc/via/fsupdate.fth Modified: cpu/x86/pc/olpc/via/fsupdate.fth ============================================================================== --- cpu/x86/pc/olpc/via/fsupdate.fth Mon Aug 20 11:35:44 2012 (r3201) +++ cpu/x86/pc/olpc/via/fsupdate.fth Mon Aug 20 11:44:00 2012 (r3202) @@ -8,6 +8,11 @@ push-hex $number pop-base " Bad number" ?nand-abort ; +: get-dhex# ( -- d ) + 0 safe-parse-word + push-hex $dnumber pop-base " Bad number" ?nand-abort +; + 0 value min-eblock# 0 value max-eblock# @@ -145,6 +150,13 @@ true to secure-fsupdate? ; +0 2value file-bytes +: size: ( "bytes" -- ) + get-dhex# ( d.size ) + file-bytes d<> ( invalid? ) + " Inconsistent size of zdata file" ?nand-abort +; + : erase-all ( -- ) #image-eblocks show-writing ; @@ -259,6 +271,9 @@ false to secure-fsupdate? ( file$ ) r/o open-file ( fd error? ) " Can't open file" ?nand-abort ( fd ) + dup file-size ( fd [size.d] error? ) + " Can't size file" ?nand-abort ( fd size.d ) + [ also nand-commands ] to file-bytes [ previous ] linefeed over force-line-delimiter ( fd )

1 0

[commit] r3201 - cpu/x86 cpu/x86/pc/olpc ofw/core
by repository service 20 Aug '12

20 Aug '12

Author: quozl Date: Mon Aug 20 11:35:44 2012 New Revision: 3201 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3201 Log: core - rename the loaded file size variable file-size to load-size, as it conflicts with a standard word file-size, rename other references in tree. Modified: cpu/x86/pc/olpc/lzip.fth cpu/x86/small.bth ofw/core/bootparm.fth Modified: cpu/x86/pc/olpc/lzip.fth ============================================================================== --- cpu/x86/pc/olpc/lzip.fth Sun Aug 19 05:43:23 2012 (r3200) +++ cpu/x86/pc/olpc/lzip.fth Mon Aug 20 11:35:44 2012 (r3201) @@ -21,7 +21,7 @@ : open ( -- flag ) 0 to seek-ptr ( ) load-base to base-adr ( ) - file-size @ to image-size ( ) + load-size @ to image-size ( ) my-args dup if ( adr len ) " zip-file-system" find-package 0= if ( adr len ph ) 2drop false exit Modified: cpu/x86/small.bth ============================================================================== --- cpu/x86/small.bth Sun Aug 19 05:43:23 2012 (r3200) +++ cpu/x86/small.bth Mon Aug 20 11:35:44 2012 (r3201) @@ -187,9 +187,9 @@ alias wpoke w! alias lpoke l! 0 value load-base -variable file-size -: loaded load-base file-size @ ; -: !load-size file-size ! ; +variable load-size +: loaded load-base load-size @ ; +: !load-size load-size ! ; defer ?inflate-loaded ' noop is ?inflate-loaded alias external noop Modified: ofw/core/bootparm.fth ============================================================================== --- ofw/core/bootparm.fth Sun Aug 19 05:43:23 2012 (r3200) +++ ofw/core/bootparm.fth Mon Aug 20 11:35:44 2012 (r3201) @@ -56,11 +56,11 @@ headers \needs load-base 0 config-int load-base \ The default value can be changed later -variable file-size -: loaded ( -- adr len ) load-base file-size @ ; +variable load-size +: loaded ( -- adr len ) load-base load-size @ ; headerless -: !load-size ( len -- ) file-size ! ; +: !load-size ( len -- ) load-size ! ; d# 1024 buffer: path-buf headers

1 0

[commit] r3200 - cpu/arm/olpc/cl4
by repository service 19 Aug '12

19 Aug '12

Author: wmb Date: Sun Aug 19 05:43:23 2012 New Revision: 3200 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3200 Log: Q7A05 Modified: cpu/arm/olpc/cl4/fw-version.fth Modified: cpu/arm/olpc/cl4/fw-version.fth ============================================================================== --- cpu/arm/olpc/cl4/fw-version.fth Sat Aug 18 22:14:58 2012 (r3199) +++ cpu/arm/olpc/cl4/fw-version.fth Sun Aug 19 05:43:23 2012 (r3200) @@ -1,7 +1,7 @@ \ The overall firmware revision macro: FW_PREFIX Q7 macro: FW_MAJOR A -macro: FW_MINOR 04 +macro: FW_MINOR 05 \ Create a 2-character build/fw-suffix file to personalize your test builds " fw-suffix" $file-exists? [if]

1 0

[commit] r3199 - cpu/arm/olpc
by repository service 18 Aug '12

18 Aug '12

Author: wmb Date: Sat Aug 18 22:14:58 2012 New Revision: 3199 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3199 Log: OLPC ARM - Fixed misleading comment in driver for internal RTC. Modified: cpu/arm/olpc/rtc.fth Modified: cpu/arm/olpc/rtc.fth ============================================================================== --- cpu/arm/olpc/rtc.fth Sat Aug 18 19:14:17 2012 (r3198) +++ cpu/arm/olpc/rtc.fth Sat Aug 18 22:14:58 2012 (r3199) @@ -1,4 +1,4 @@ -purpose: Driver for external IDT1338 RTC chip on XO-1.75 +purpose: Driver for MMP internal RTC block 0 0 " d4010000" " /" begin-package " rtc" name

1 0

[commit] r3198 - in cpu/arm/olpc: 1.75 cl4
by repository service 18 Aug '12

18 Aug '12

Author: wmb Date: Sat Aug 18 19:14:17 2012 New Revision: 3198 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3198 Log: OLPC ARM - Added device node for OLS LED for Linux driver binding. Modified: cpu/arm/olpc/1.75/leds.fth cpu/arm/olpc/cl4/leds.fth Modified: cpu/arm/olpc/1.75/leds.fth ============================================================================== --- cpu/arm/olpc/1.75/leds.fth Sat Aug 18 09:05:11 2012 (r3197) +++ cpu/arm/olpc/1.75/leds.fth Sat Aug 18 19:14:17 2012 (r3198) @@ -1,6 +1,11 @@ \ See license at end of file purpose: Driver/selftest for OLPC XO-1.75 LEDs +0 0 " " " /" begin-package + " ols" device-name + " olpc,xo-light-sensor" +compatible +end-package + 0 0 " 0" " /" begin-package 0 0 reg \ So test-all will run the test " leds" device-name Modified: cpu/arm/olpc/cl4/leds.fth ============================================================================== --- cpu/arm/olpc/cl4/leds.fth Sat Aug 18 09:05:11 2012 (r3197) +++ cpu/arm/olpc/cl4/leds.fth Sat Aug 18 19:14:17 2012 (r3198) @@ -1,6 +1,11 @@ \ See license at end of file purpose: Driver/selftest for OLPC XO-1.75 LEDs +0 0 " " " /" begin-package + " ols" device-name + " olpc,xo-light-sensor" +compatible +end-package + 0 0 " 0" " /" begin-package 0 0 reg \ So test-all will run the test

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
16
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

openfirmware August 2012