openfirmware

openfirmware@openfirmware.info

3007 discussions

[commit] r3103 - cpu/arm/mmp2
by repository service 31 Jul '12

31 Jul '12

Author: wmb Date: Tue Jul 31 07:38:25 2012 New Revision: 3103 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3103 Log: OLPC ARM - SSP SPI driver - sample data from EC on falling edge. Modified: cpu/arm/mmp2/sspspi.fth Modified: cpu/arm/mmp2/sspspi.fth ============================================================================== --- cpu/arm/mmp2/sspspi.fth Tue Jul 31 07:09:03 2012 (r3102) +++ cpu/arm/mmp2/sspspi.fth Tue Jul 31 07:38:25 2012 (r3103) @@ -8,15 +8,17 @@ h# 035000 value ssp-base \ SSP1 : ssp-sscr0 ( -- adr ) ssp-base ; -: ssp-sscr1 ( -- adr ) ssp-base la1+ ; -: ssp-sssr ( -- adr ) ssp-base 2 la+ ; -: ssp-ssdr ( -- adr ) ssp-base 4 la+ ; +: ssp-sscr1 ( -- adr ) ssp-base 4 + ; +: ssp-sssr ( -- adr ) ssp-base 8 + ; +: ssp-ssdr ( -- adr ) ssp-base h# 10 + ; +: ssp-sspsp ( -- adr ) ssp-base h# 2c + ; : ssp-spi-start ( -- ) \ Avoid reinitializing the device after the first time, as that \ seems to cause glitches that confuse the SPI FLASH chip ssp-sscr1 io@ 0= if exit then + h# 01 ssp-sspsp io! h# 07 ssp-sscr0 io! 0 ssp-sscr1 io! h# 87 ssp-sscr0 io!

1 0

[commit] r3102 - in cpu/arm: mmp3 olpc
by repository service 31 Jul '12

31 Jul '12

Author: wmb Date: Tue Jul 31 07:09:03 2012 New Revision: 3102 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3102 Log: OLPC CL4 - Use USB2 PHY driver instead of utmiphy driver for MMP3 chip. Added: cpu/arm/mmp3/usb2phy.fth Modified: cpu/arm/olpc/build-fw.fth Added: cpu/arm/mmp3/usb2phy.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/mmp3/usb2phy.fth Tue Jul 31 07:09:03 2012 (r3102) @@ -0,0 +1,74 @@ +\ See license at end of file +purpose: Init USB2 Phy in Marvell SoC + +: +usb2 ( offset -- offset' ) h# 20.7000 + ; + +h# 04 +usb2 constant pll-reg0 +h# 08 +usb2 constant pll-reg1 +h# 10 +usb2 constant tx-reg0 +h# 14 +usb2 constant tx-reg1 +h# 18 +usb2 constant tx-reg2 +h# 20 +usb2 constant rx-reg0 +h# 24 +usb2 constant rx-reg1 +h# 28 +usb2 constant rx-reg2 +\ h# 30 +usb2 constant ana-reg0 +\ h# 34 +usb2 constant ana-reg1 +\ h# 38 +usb2 constant ana-reg2 +\ h# 3c +usb2 constant dig-reg0 +\ h# 40 +usb2 constant dig-reg1 +\ h# 44 +usb2 constant dig-reg2 +\ h# 48 +usb2 constant dig-reg3 +\ h# 4c +usb2 constant test-reg0 +\ h# 50 +usb2 constant test-reg1 +\ h# 54 +usb2 constant test-reg2 +\ h# 58 +usb2 constant charger-reg0 +\ h# 5c +usb2 constant otg-reg0 +\ h# 60 +usb2 constant phy-mono +\ h# 64 +usb2 constant resetve-reg0 +\ h# 78 +usb2 constant icid-reg0 +\ h# 7c +usb2 constant icid-reg1 + +: wait-cal ( spins -- ) + 0 do + pll-reg1 io@ h# 8000 and if unloop exit then \ PLL_READY_MASK + 1 ms + loop + ." PLL calibrate timeout" cr +; + +: init-usb-phy ( -- ) + h# f00 h# 100 +pmua io-clr +\ h# d00 h# 100 +pmua io-set \ Select 26 MHz VCXO clock + h# 200 h# 100 +pmua io-set \ Select crystal + + h# 3fff pll-reg0 io-clr \ REFDIV_MASK_B0 3e00, FBDIV_MASK_B0 01ff + h# 1af0 pll-reg0 io-set \ 0xd << 9 , 0xf0 << 0 + + h# 2773 pll-reg1 io-clr \ PU_PLL_MASK 2000, (LOCK_BYPASS) 1000, ICP_MASK 700, KVCO_MASK 70, CALI12_MASK 3 + h# 3333 pll-reg1 io-set \ 1 1 3 3 3 + + h# 0700 tx-reg0 io-clr \ TX_IMPCAL_VTH_MASK 0700 + h# 0200 tx-reg0 io-set \ 2 + + h# 037f tx-reg1 io-clr \ TX_VDD12_MASK 300 , TX_AMP_MASK 70, TX_CK60_PHSEL_MASK f + h# 0344 tx-reg1 io-set \ 3 4 4 + + h# 0c00 tx-reg2 io-clr \ TX_DRV_SLEWRATE_MASK c00 + h# 0800 tx-reg2 io-set \ 2 << 10 + + h# 00f0 rx-reg0 io-clr \ RX_SQ_THRESH_MASK 00f0 + h# 00a0 rx-reg0 io-set \ a + + h# 0008 rx-reg1 io-set \ 1 << OTG_PU_OTG_SHIFT (3) + + \ Calibrate PHY + d# 200 us + h# 0004 pll-reg1 io-set \ 1 << PLL_VCOCAL_START_SHIFT (2) + d# 400 us + h# 2000 tx-reg0 io-set \ 1 << TX_RCAL_START_SHIFT (13) + d# 40 us + h# 2000 tx-reg0 io-clr \ 1 << TX_RCAL_START_SHIFT (13) + d# 400 us + + d# 100 wait-cal +; Modified: cpu/arm/olpc/build-fw.fth ============================================================================== --- cpu/arm/olpc/build-fw.fth Tue Jul 31 07:03:38 2012 (r3101) +++ cpu/arm/olpc/build-fw.fth Tue Jul 31 07:09:03 2012 (r3102) @@ -293,7 +293,11 @@ then ; +[ifdef] mmp3 +fload ${BP}/cpu/arm/mmp3/usb2phy.fth +[else] fload ${BP}/cpu/arm/marvell/utmiphy.fth +[then] fload ${BP}/cpu/arm/olpc/usb.fth fload ${BP}/dev/olpc/mmp2camera/loadpkg.fth

1 0

[commit] r3101 - cpu/arm/olpc/cl4
by repository service 31 Jul '12

31 Jul '12

Author: wmb Date: Tue Jul 31 07:03:38 2012 New Revision: 3101 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3101 Log: OLPC CL4 - include ecimage.bin in dropins. Modified: cpu/arm/olpc/cl4/olpc.bth Modified: cpu/arm/olpc/cl4/olpc.bth ============================================================================== --- cpu/arm/olpc/cl4/olpc.bth Tue Jul 31 04:18:27 2012 (r3100) +++ cpu/arm/olpc/cl4/olpc.bth Tue Jul 31 07:03:38 2012 (r3101) @@ -1,7 +1,7 @@ purpose: Construct the Open Firmware module collection command: &builder &this -\ in: ${BP}/cpu/arm/olpc/cl4/build/ec.img +in: ${BP}/cpu/arm/olpc/cl4/build/ec.img in: ${BP}/cpu/arm/olpc/cl4/build/fw.img in: ${BP}/cpu/arm/olpc/cl4/build/resetvec.img in: ${BP}/cpu/arm/olpc/cl4/build/mcastnand.bin @@ -151,7 +151,7 @@ " nandblaster15_rx.bin" " nb15_rx" $add-deflated-dropin " nandblaster_tx.bin" " nb_tx" $add-deflated-dropin -\ " ec.img" " ecimage.bin" $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

1 0

[commit] r3100 - cpu/arm/olpc
by repository service 31 Jul '12

31 Jul '12

Author: pgf Date: Tue Jul 31 04:18:27 2012 New Revision: 3100 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3100 Log: edi-open: activate EDI with a dummy read Modified: cpu/arm/olpc/edi.fth Modified: cpu/arm/olpc/edi.fth ============================================================================== --- cpu/arm/olpc/edi.fth Mon Jul 30 10:25:06 2012 (r3099) +++ cpu/arm/olpc/edi.fth Tue Jul 31 04:18:27 2012 (r3100) @@ -334,6 +334,9 @@ : edi-open ( -- ) \ slow-edi-clock \ Target speed between 1 and 2 MHz spi-start + + \ dummy read, to activate EDI + h# ff22 edi-b@ drop set-chip-id

1 0

[commit] r3099 - cpu/x86/pc/olpc/via
by repository service 30 Jul '12

30 Jul '12

Author: quozl Date: Mon Jul 30 10:25:06 2012 New Revision: 3099 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3099 Log: OLPC XO-1.5 XO-1.75 - handle exceptions in open-nand during fs-update, #12025 Modified: cpu/x86/pc/olpc/via/fsupdate.fth Modified: cpu/x86/pc/olpc/via/fsupdate.fth ============================================================================== --- cpu/x86/pc/olpc/via/fsupdate.fth Mon Jul 30 09:58:46 2012 (r3098) +++ cpu/x86/pc/olpc/via/fsupdate.fth Mon Jul 30 10:25:06 2012 (r3099) @@ -290,7 +290,7 @@ ['] noop to show-progress ( adr len ) - open-nand ( adr len ) + ['] open-nand catch ?dup if .error security-failure then ( adr len ) \ clear-context nand-commands t-hms( @@ -309,7 +309,7 @@ ; : fs-update-from-list ( devlist$ -- ) - load-crypto if visible ." Crytpo load failed" cr show-sad security-failure then + load-crypto if visible ." Crypto load failed" cr show-sad security-failure then visible ( devlist$ ) begin dup while ( rem$ )

1 0

[commit] r3098 - cpu/arm/olpc/cl4
by repository service 30 Jul '12

30 Jul '12

Author: wmb Date: Mon Jul 30 09:58:46 2012 New Revision: 3098 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3098 Log: OLPC CL4 - EC platform# is 7 not 6. Modified: cpu/arm/olpc/cl4/config.fth Modified: cpu/arm/olpc/cl4/config.fth ============================================================================== --- cpu/arm/olpc/cl4/config.fth Mon Jul 30 09:41:11 2012 (r3097) +++ cpu/arm/olpc/cl4/config.fth Mon Jul 30 09:58:46 2012 (r3098) @@ -20,7 +20,7 @@ : signature$ " CL4" ; : model$ " olpc,XO-CL4" ; : compatible$ " olpc,xo-cl4" ; -: ec-platform$ ( -- adr len ) " 6" ; +: ec-platform$ ( -- adr len ) " 7" ; d# 10001 constant machine-type \ Backwards compatibility with non-device-tree kernel

1 0

[commit] r3097 - cpu/arm/olpc
by repository service 30 Jul '12

30 Jul '12

Author: wmb Date: Mon Jul 30 09:41:11 2012 New Revision: 3097 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3097 Log: OLPC CL4 - fixed typo in last commit. Modified: cpu/arm/olpc/build-fw.fth Modified: cpu/arm/olpc/build-fw.fth ============================================================================== --- cpu/arm/olpc/build-fw.fth Mon Jul 30 09:34:51 2012 (r3096) +++ cpu/arm/olpc/build-fw.fth Mon Jul 30 09:41:11 2012 (r3097) @@ -840,7 +840,7 @@ \+ use-screen-kbd open-hotspot install-alarm -[ifdef] olpc-clr +[ifdef] olpc-cl4 ." build-fw.fth: not sounding" cr [else] ?sound

1 0

[commit] r3096 - cpu/arm/olpc
by repository service 30 Jul '12

30 Jul '12

Author: wmb Date: Mon Jul 30 09:34:51 2012 New Revision: 3096 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3096 Log: OLPC CL4 - Skip some steps in the startup process that are not working yet. Ifdefs in common files need to be deleted as these steps are made to work. Modified: cpu/arm/olpc/banner.fth cpu/arm/olpc/build-fw.fth cpu/arm/olpc/usb.fth Modified: cpu/arm/olpc/banner.fth ============================================================================== --- cpu/arm/olpc/banner.fth Mon Jul 30 09:30:34 2012 (r3095) +++ cpu/arm/olpc/banner.fth Mon Jul 30 09:34:51 2012 (r3096) @@ -65,6 +65,9 @@ ; : .storage ( -- ) +[ifdef] olpc-cl4 +." olpc/banner.fth: Skipping .storage" cr exit +[then] internal-disk-present? 0= if ( ) get-internal-disk-info ( ) then Modified: cpu/arm/olpc/build-fw.fth ============================================================================== --- cpu/arm/olpc/build-fw.fth Mon Jul 30 09:30:34 2012 (r3095) +++ cpu/arm/olpc/build-fw.fth Mon Jul 30 09:34:51 2012 (r3096) @@ -312,6 +312,9 @@ warning @ warning off : stand-init stand-init +[ifdef] olpc-cl4 +." build-fw.fth: Skipping root node properties" cr exit +[then] root-device model-version$ 2dup model ( name$ ) " OLPC " encode-bytes 2swap encode-string encode+ " banner-name" property @@ -837,7 +840,11 @@ \+ use-screen-kbd open-hotspot install-alarm +[ifdef] olpc-clr + ." build-fw.fth: not sounding" cr +[else] ?sound +[then] ?games @@ -845,7 +852,11 @@ \+ use-screen-kbd ?text-on [ifdef] probe-usb factory-test? if d# 1000 ms then \ Extra USB probe delay in the factory +[ifdef] olpc-cl4 + ." build-fw.fth: not probing usb" cr +[else] probe-usb +[then] report-disk report-keyboard [then] @@ -867,6 +878,9 @@ auto-banner? if banner then \+ use-screen-kbd ?text-on +[ifdef] olpc-cl4 + ." Quitting before auto-boot" cr quit +[then] auto-boot \+ use-screen-kbd close-hotspot Modified: cpu/arm/olpc/usb.fth ============================================================================== --- cpu/arm/olpc/usb.fth Mon Jul 30 09:30:34 2012 (r3095) +++ cpu/arm/olpc/usb.fth Mon Jul 30 09:34:51 2012 (r3096) @@ -29,6 +29,9 @@ : init-usb ( -- ) h# 9 h# 5c pmua! \ Enable clock to USB block reset-usb-hub +[ifdef] olpc-cl4 + ." olpc/usb.fth: Skipping USB phy init!" cr exit +[then] init-usb-phy ;

1 0

[commit] r3095 - cpu/arm/olpc/cl4
by repository service 30 Jul '12

30 Jul '12

Author: wmb Date: Mon Jul 30 09:30:34 2012 New Revision: 3095 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3095 Log: OLPC CL4 - Use 1 MiB SPI FLASH for now. Modified: cpu/arm/olpc/cl4/config.fth Modified: cpu/arm/olpc/cl4/config.fth ============================================================================== --- cpu/arm/olpc/cl4/config.fth Mon Jul 30 09:13:00 2012 (r3094) +++ cpu/arm/olpc/cl4/config.fth Mon Jul 30 09:30:34 2012 (r3095) @@ -10,12 +10,12 @@ fload ${BP}/cpu/arm/mmp2/hwaddrs.fth fload ${BP}/cpu/arm/olpc/addrs.fth -h# 1f.0000 constant mfg-data-offset \ Offset to manufacturing data area in SPI FLASH -h# 20.0000 constant mfg-data-end-offset \ Offset to end of manufacturing data area in SPI FLASH -h# 1e.ffd0 constant crc-offset -h# 1e.ffc0 constant signature-offset +h# 10.0000 constant /rom \ Total size of SPI FLASH -h# 20.0000 constant /rom \ Total size of SPI FLASH +/rom h# 1.0000 - constant mfg-data-offset \ Offset to manufacturing data area in SPI FLASH +/rom constant mfg-data-end-offset \ Offset to end of manufacturing data area in SPI FLASH +mfg-data-offset h# 30 - constant crc-offset \ e.g. 1e.ffd0 +crc-offset h# 10 - constant signature-offset \ e.g. 1e.ffc0 : signature$ " CL4" ; : model$ " olpc,XO-CL4" ;

1 0

[commit] r3094 - cpu/arm/olpc
by repository service 30 Jul '12

30 Jul '12

Author: pgf Date: Mon Jul 30 09:13:00 2012 New Revision: 3094 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3094 Log: bbedi: clock faster on cl4 Modified: cpu/arm/olpc/bbedi.fth Modified: cpu/arm/olpc/bbedi.fth ============================================================================== --- cpu/arm/olpc/bbedi.fth Mon Jul 30 09:12:55 2012 (r3093) +++ cpu/arm/olpc/bbedi.fth Mon Jul 30 09:13:00 2012 (r3094) @@ -106,10 +106,15 @@ begin ands r3,tos,#0x80 \ Test bit +[ifdef] olpc-cl4 + strne r0,[r1,#0x18] \ Set MOSI if bit is non0 + streq r0,[r1,#0x24] \ Clr MOSI if bit is 0 +[else] strne r0,[r1,#0x18] \ Set MOSI if bit is non0 strne r0,[r1,#0x18] \ Set MOSI if bit is non0 \ Twice for delay - setup time to CLK streq r0,[r1,#0x24] \ Clr MOSI if bit is 0 streq r0,[r1,#0x24] \ Clr MOSI if bit is 0 \ Twice for delay - setup time to CLK +[then] str r4,[r1,#0x18] \ Set CLK str r4,[r1,#0x24] \ Clr CLK

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

openfirmware