openfirmware

openfirmware@openfirmware.info

3007 discussions

[commit] r2703 - cpu/x86/pc/olpc dev/olpc/spiflash
by repository service 25 Nov '11

25 Nov '11

Author: quozl Date: Fri Nov 25 05:16:14 2011 New Revision: 2703 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2703 Log: OLPC XO-1 XO-1.5 XO-1.75 - show progress bar during automatic OpenFirmware reflashing, two dots per flash block, show not enough power icon ... on XO-1 only the dots are shown because of a smaller icon collection. Tested on XO-1, XO-1.5, XO-1.75. Modified: cpu/x86/pc/olpc/security.fth dev/olpc/spiflash/spiui.fth Modified: cpu/x86/pc/olpc/security.fth ============================================================================== --- cpu/x86/pc/olpc/security.fth Thu Nov 24 07:38:35 2011 (r2702) +++ cpu/x86/pc/olpc/security.fth Fri Nov 25 05:16:14 2011 (r2703) @@ -994,6 +994,7 @@ ['] ?enough-power catch ?dup if visible red-letters + show-no-power ." Unsafe to update firmware now - " .error ." Continuing with old firmware" cr black-letters @@ -1004,6 +1005,7 @@ ec-indexed-io-off? if visible + show-reflash ." Restarting to enable SPI FLASH writing." cr d# 3000 ms ec-ixio-reboot @@ -1013,6 +1015,8 @@ \ Latch alternate? flag for next startup alternate? if [char] A h# 82 cmos! then + show-reflash + ['] show-reflash-dot to spi-progress reflash \ Should power-off and reboot show-x " Reflash returned, unexpectedly" .security-failure Modified: dev/olpc/spiflash/spiui.fth ============================================================================== --- dev/olpc/spiflash/spiui.fth Thu Nov 24 07:38:35 2011 (r2702) +++ dev/olpc/spiflash/spiui.fth Fri Nov 25 05:16:14 2011 (r2703) @@ -8,6 +8,8 @@ h# 4000 constant /chunk \ Convenient sized piece for progress reports +defer spi-progress ' drop to spi-progress ( n -- ) + : write-flash-range ( adr end-offset start-offset -- ) ." Writing" cr ?do ( adr ) @@ -24,6 +26,7 @@ i flash-erase-block dup /flash-block i flash-write ( adr ) then + i 5 rshift dup spi-progress h# 400 + spi-progress ( adr ) /flash-block + ( adr' ) /flash-block +loop ( adr ) cr drop ( )

1 0

[commit] r2702 - in cpu: arm/olpc/1.75 x86/pc/olpc
by repository service 24 Nov '11

24 Nov '11

Author: quozl Date: Thu Nov 24 07:38:35 2011 New Revision: 2702 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2702 Log: OLPC XO-1.75 - automatic EC reflash, use chip icon, show progress bar, show battery icon with sad face if not enough power Modified: cpu/arm/olpc/1.75/ecflash.fth cpu/arm/olpc/1.75/edi.fth cpu/arm/olpc/1.75/fw.bth cpu/x86/pc/olpc/gui.fth Modified: cpu/arm/olpc/1.75/ecflash.fth ============================================================================== --- cpu/arm/olpc/1.75/ecflash.fth Wed Nov 23 06:42:38 2011 (r2701) +++ cpu/arm/olpc/1.75/ecflash.fth Thu Nov 24 07:38:35 2011 (r2702) @@ -101,13 +101,8 @@ else ( adr len ) 2dup load-base swap move ( adr len ) free-mem ( ) - ['] ?enough-power catch ?dup if ( error ) - .error - ." Skipping EC reflash" cr - else - ." Updating EC code" cr - reflash-ec - then + ." Updating EC code" cr + reflash-ec then then ; Modified: cpu/arm/olpc/1.75/edi.fth ============================================================================== --- cpu/arm/olpc/1.75/edi.fth Wed Nov 23 06:42:38 2011 (r2701) +++ cpu/arm/olpc/1.75/edi.fth Thu Nov 24 07:38:35 2011 (r2702) @@ -14,6 +14,7 @@ \ spi-in ( -- byte ) - Receive byte d# 128 constant /flash-page +defer edi-progress ' drop to edi-progress ( n -- ) : edi-cmd,adr ( offset cmd -- ) \ Send command plus 3 address bytes spi-cs-on ( offset cmd ) @@ -140,6 +141,7 @@ dup i + erase-page ( adr offset ) over i + over i + edi-program-page ( adr offset ) then ( adr offset ) + i edi-progress ( adr offset ) /flash-page +loop ( adr offset ) 2drop ( ) ; Modified: cpu/arm/olpc/1.75/fw.bth ============================================================================== --- cpu/arm/olpc/1.75/fw.bth Wed Nov 23 06:42:38 2011 (r2701) +++ cpu/arm/olpc/1.75/fw.bth Thu Nov 24 07:38:35 2011 (r2702) @@ -514,7 +514,18 @@ show-child - update-ec-flash? if show-reflash update-ec-flash then + update-ec-flash? if + ['] ?enough-power catch ?dup if ( error ) + show-no-power + .error + ." Skipping EC reflash, not enough power" cr + d# 1000 ms + else + show-reflash + ['] show-reflash-dot to edi-progress + update-ec-flash + then + then install-alarm ?sound Modified: cpu/x86/pc/olpc/gui.fth ============================================================================== --- cpu/x86/pc/olpc/gui.fth Wed Nov 23 06:42:38 2011 (r2701) +++ cpu/x86/pc/olpc/gui.fth Thu Nov 24 07:38:35 2011 (r2702) @@ -374,11 +374,45 @@ " vga?" $call-screen 0= if dcon-unfreeze dcon-freeze then ; -: show-reflash ( -- ) \ bottom left corner, laptop and ellipsis - d# 0 d# 810 to icon-xy " int" show-icon - d# 450 d# 150 do i d# 844 to icon-xy " bigdot" show-icon d# 100 +loop +: show-no-power ( -- ) \ chip, battery, overlaid sad face + d# 25 d# 772 to icon-xy " spi" show-icon + d# 175 d# 772 to icon-xy " battery" show-icon + d# 175 d# 790 to icon-xy " sad" show-icon ; +d# 834 value bar-y +d# 150 value bar-x +0 value dot-adr + +: read-dot ( -- ) \ rom: is unavailable during reflash + 0 to dot-adr 0 0 to icon-xy ( ) + " darkdot" $get-image if exit then ( ) + prep-565 4drop to dot-adr ( ) +; + +: show-reflash ( -- ) \ bottom left corner, chip and progress dots + d# 25 d# 772 to icon-xy " spi" show-icon + d# 992 bar-x + bar-y to icon-xy " yellowdot" show-icon + read-dot +; + +: show-reflash-dot ( n -- ) \ n to vary h# 0 to h# 8000 + dup h# 400 mod 0= if ( n ) + dot-adr 0= if drop exit then ( n ) + dot-adr swap h# 20 / bar-x + bar-y ( adr x y ) + image-width image-height ( adr x y w h ) + " draw-transparent-rectangle" $call-screen + else + drop + then +; + +0 [if] +: test-reflash-dot + page show-reflash t( h# 8000 0 do i show-reflash-dot h# 80 +loop )t +; +[then] + : show-x ( -- ) " x" show-icon ; : show-sad ( -- ) icon-xy

1 0

[commit] r2701 - cpu/arm/olpc/1.75
by repository service 23 Nov '11

23 Nov '11

Author: quozl Date: Wed Nov 23 06:42:38 2011 New Revision: 2701 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2701 Log: OLPC XO-1.75 - prevent keyboard interrupt during flash or flash-ec, #11488 Modified: cpu/arm/olpc/1.75/devices.fth Modified: cpu/arm/olpc/1.75/devices.fth ============================================================================== --- cpu/arm/olpc/1.75/devices.fth Wed Nov 23 02:03:08 2011 (r2700) +++ cpu/arm/olpc/1.75/devices.fth Wed Nov 23 06:42:38 2011 (r2701) @@ -187,8 +187,10 @@ ols-off ignore-power-button hdd-led-on + disable-interrupts ; : )flash-vulnerable ( -- ) + enable-interrupts hdd-led-off d# 850 ms \ allow time for 8051 to finish reset and power us down ;

1 0

[commit] r2700 - cpu/arm/olpc/1.75
by repository service 23 Nov '11

23 Nov '11

Author: quozl Date: Wed Nov 23 02:03:08 2011 New Revision: 2700 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2700 Log: OLPC XO-1.75 - change architecture device-tree tag Modified: cpu/arm/olpc/1.75/prefw.bth Modified: cpu/arm/olpc/1.75/prefw.bth ============================================================================== --- cpu/arm/olpc/1.75/prefw.bth Tue Nov 22 04:11:39 2011 (r2699) +++ cpu/arm/olpc/1.75/prefw.bth Wed Nov 23 02:03:08 2011 (r2700) @@ -53,7 +53,7 @@ dev / " olpc,XO-1.75" model - " Marvell,Armada 610" encode-string " architecture" property + " OLPC" encode-string " architecture" property \ The clock frequency of the root bus may be irrelevant, since the bus is internal to the SOC \ d# 1,000,000,000 " clock-frequency" integer-property device-end

1 0

[commit] r2699 - ofw/disklabel
by repository service 22 Nov '11

22 Nov '11

Author: quozl Date: Tue Nov 22 04:11:39 2011 New Revision: 2699 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2699 Log: fix hang on " u:f" r/w create-file caused by stack imbalance after handling UFS partition letter Modified: ofw/disklabel/methods.fth Modified: ofw/disklabel/methods.fth ============================================================================== --- ofw/disklabel/methods.fth Mon Nov 21 23:40:32 2011 (r2698) +++ ofw/disklabel/methods.fth Tue Nov 22 04:11:39 2011 (r2699) @@ -197,14 +197,14 @@ over c@ ascii 0 ascii 9 between if ( adr len ) over c@ ascii 0 - to #part ( adr len ) 1 /string ( adr' len' ) - dup 0= if 2drop exit then ( adr len ) + dup 0= if exit then ( adr len ) then \ If the first character is "a".."h", it's a UFS partition letter over c@ lcc ascii a ascii h between if ( adr len ) over c@ to ufs-partition ( adr len ) 1 /string ( adr' len' ) - dup 0= if 2drop exit then ( adr len ) + dup 0= if exit then ( adr len ) then ( adr len ) ; : parse-partition ( -- )

1 0

[commit] r2698 - cpu/arm/olpc/1.75
by repository service 21 Nov '11

21 Nov '11

Author: quozl Date: Mon Nov 21 23:40:32 2011 New Revision: 2698 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2698 Log: Q4C05 Modified: cpu/arm/olpc/1.75/fw-version.fth Modified: cpu/arm/olpc/1.75/fw-version.fth ============================================================================== --- cpu/arm/olpc/1.75/fw-version.fth Mon Nov 21 23:37:37 2011 (r2697) +++ cpu/arm/olpc/1.75/fw-version.fth Mon Nov 21 23:40:32 2011 (r2698) @@ -1,3 +1,3 @@ \ The overall firmware revision macro: FW_MAJOR C -macro: FW_MINOR 04 +macro: FW_MINOR 05

1 0

[commit] r2697 - cpu/arm/olpc/1.75
by repository service 21 Nov '11

21 Nov '11

Author: quozl Date: Mon Nov 21 23:37:37 2011 New Revision: 2697 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2697 Log: OLPC XO-1.75 - adopt EC 0.3.05 from 16th November Modified: cpu/arm/olpc/1.75/ec-version.fth Modified: cpu/arm/olpc/1.75/ec-version.fth ============================================================================== --- cpu/arm/olpc/1.75/ec-version.fth Mon Nov 21 23:33:47 2011 (r2696) +++ cpu/arm/olpc/1.75/ec-version.fth Mon Nov 21 23:37:37 2011 (r2697) @@ -1,5 +1,5 @@ \ The EC microcode -macro: EC_VERSION 4_0_3_04 +macro: EC_VERSION 4_0_3_05 \ Alternate command for getting EC microcode, for testing new versions. \ Temporarily uncomment the line and modify the path as necessary

1 0

[commit] r2696 - cpu/arm/mmp2
by repository service 21 Nov '11

21 Nov '11

Author: wmb Date: Mon Nov 21 23:33:47 2011 New Revision: 2696 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2696 Log: OLPC XO-1.75 - Configurable sleep code, configured for manual memory controller wakeup Modified: cpu/arm/mmp2/dramrecal.fth Modified: cpu/arm/mmp2/dramrecal.fth ============================================================================== --- cpu/arm/mmp2/dramrecal.fth Mon Nov 21 05:09:15 2011 (r2695) +++ cpu/arm/mmp2/dramrecal.fth Mon Nov 21 23:33:47 2011 (r2696) @@ -58,42 +58,92 @@ end-code here ddr-recal - constant /ddr-recal +\ create use-auto-mc-wake \ Let the PMU automatically wake the memory controller +create use-block \ Block memory controller activity in low-level sleep code +create use-self-refresh \ Manually issue self-refresh enter/exit +create use-drivers \ Turn memory drivers off during sleep +\ create use-phy-dll-reset \ Reset the PHY DLL upon wakeup +create use-phy-dll-update \ Update the PHY DLL upon wakeup +create use-dram-dll-reset \ Reset the DRAM DLL upon wakeup +\ create use-delay2 \ Long delay upon wakeup +\ create use-delay3 \ Short delay upon wakeup + label ddr-self-refresh ( r0:memctrl-va -- ) +[ifdef] use-gpio + mov r4, #0xfe000000 + orr r4, r4, 0x19000 \ GPIO 3 + mov r1, 0x8 \ GPIO 3 + str r1, [r4, #0x18] \ Set +[then] + +[ifdef] use-block mov r1, #0x1 \ Block all data requests str r1, [r0, #0x7e0] \ SDRAM_CTRL14 +[then] -[ifdef] notdef2 +[ifdef] use-odt 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] +[ifdef] use-self-refresh mov r1, #0x40 \ Enter Self Refresh value str r1, [r0, #0x120] \ USER_INITIATED_COMMAND0 +[then] +[ifdef] use-drivers ldr r3, [r0, #0x1e0] \ PHY_CTRL8 - bic r1, r3, #0x07700000 \ PHY_ADCM_ZPDRV: 0 PHY_ADCM_ZNDRV: 0 (Disable drivers 6:0) + bic r1, r3, #0x0ff00000 \ PHY_ADCM_ZPDRV: f PHY_ADCM_ZNDRV: f (disable drivers) str r1, [r0, #0x1e0] \ PHY_CTRL8 +[then] dsb \ Data Synchronization Barrier wfi \ Wait for interrupt - str r3, [r0, #0x1e0] \ PHY_CTRL8 - restore previous value +[ifdef] use-gpio + mov r1, 0x8 \ GPIO 3 + str r1, [r4, #0x24] \ Clr +[then] + +[ifdef] use-drivers + str r3, [r0, #0x1e0] \ PHY_CTRL8 - restore previous value (all drivers) +[then] + +[ifdef] use-delay1 + \ Delay to let the memory controller and DRAM DLLs settle + mov r1, #0x600 begin decs r1,1 0= until +[then] +[ifdef] use-phy-dll-reset mov r1, #0x20000000 \ PHY_DLL_RESET str r1, [r0, #0x240] \ PHY_CTRL14 +[then] +[ifdef] use-phy-dll-update mov r1, #0x40000000 \ DLL_UPDATE_EN str r1, [r0, #0x240] \ PHY_CTRL14 +[then] +[ifdef] use-dram-dll-reset + ldr r1, [r0, #0x080] \ PHY_CTRL1 + orr r1, r1, #0x40 \ DLL_RESET + str r1, [r0, #0x080] \ PHY_CTRL1 + mov r1, #0x100 \ USER_LMR0_REQ + orr r1, r1, #0x03000000 \ CHIP_SELECT_0 | CHIP_SELECT_1 + str r1, [r0, #0x120] \ USER_INITIATED_COMMAND0 +[then] + +[ifdef] use-self-refresh mov r1, #0x80 \ Exit Self Refresh value str r1, [r0, #0x120] \ USER_INITIATED_COMMAND0 +[then] -[ifdef] notdef2 +[ifdef] use-odt str r2, [r0, #0x770] \ SDRAM_CTRL7_SDRAM_ODT_CTRL2 - restore previous value [then] -[ifdef] notdef +[ifdef] use-zqcal mov r1, #0x01000000 \ Chip select 0 orr r1, r1, #0x00001000 \ Initiate ZQ calibration long str r1, [r0, #0x120] \ USER_INITIATED_COMMAND0 @@ -107,11 +157,30 @@ 0= until [then] - \ Delay to let the memory controller and DRAM DLLs settle - mov r1, #0x0300 begin decs r1,1 0= until +[ifdef] use-gpio + mov r1, 0x8 \ GPIO 3 + str r1, [r4, #0x18] \ Set +[then] + +[ifdef] use-delay2 + \ Delay to ensure that at least 512 DRAM NOP's happen before the first access + mov r1, #0x600 begin decs r1,1 0= until +[then] +[ifdef] use-delay3 + \ Delay to ensure that at least 512 DRAM NOP's happen before the first access + mov r1, #0x20 begin decs r1,1 0= until +[then] + +[ifdef] use-gpio + mov r1, 0x8 \ GPIO 3 + str r1, [r4, #0x24] \ Clr +[then] + +[ifdef] use-block mov r1, #0x0 \ Unblock data requests str r1, [r0, #0x7e0] \ SDRAM_CTRL14 +[then] mov pc, lr end-code @@ -662,7 +731,9 @@ then h# 0020.0000 or ( apcr idle' ) \ PJ_DIS_MC_SW_REQ - disable idle entry using software register bits +[ifdef] use-auto-mc-wake h# 0010.0000 or ( apcr idle' ) \ PJ_MC_WAKE_EN - wake memory controller when core wakes +[then] 0 h# b0 pmua! ( apcr idle ) \ PMUA_MC_HW_SLP_TYPE - self-refresh power down @@ -736,6 +807,10 @@ ; : str ( -- ) +[ifdef] use-gpio + 3 gpio-dir-out +[then] + disable-interrupts suspend-usb timers-sleep

1 0

[commit] r2695 - dev
by repository service 21 Nov '11

21 Nov '11

Author: quozl Date: Mon Nov 21 05:09:15 2011 New Revision: 2695 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2695 Log: OLPC - instance buffer scan-ssid is d# 34 bytes long, so the maximum length check in set-ssid was invalid, (found during code review only) Modified: dev/libertas.fth Modified: dev/libertas.fth ============================================================================== --- dev/libertas.fth Mon Nov 21 01:23:36 2011 (r2694) +++ dev/libertas.fth Mon Nov 21 05:09:15 2011 (r2695) @@ -1040,7 +1040,7 @@ 2dup " olpc-mesh" $= if passive-scan then 2dup " olpc-NANDblaster" $= if passive-scan then - h# 32 min scan-ssid pack drop + d# 32 min scan-ssid pack drop ; : scan ( adr len -- actual )

1 0

[commit] r2694 - dev/olpc/spiflash
by repository service 21 Nov '11

21 Nov '11

Author: quozl Date: Mon Nov 21 01:23:36 2011 New Revision: 2694 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2694 Log: OLPC - save-mfg-data, restore-mfg-data, use new flash interface, use u:\ instead of disk:\, tested on XO-1, XO-1.5, XO-1.75. Modified: dev/olpc/spiflash/spiui.fth Modified: dev/olpc/spiflash/spiui.fth ============================================================================== --- dev/olpc/spiflash/spiui.fth Sun Nov 20 23:23:51 2011 (r2693) +++ dev/olpc/spiflash/spiui.fth Mon Nov 21 01:23:36 2011 (r2694) @@ -123,41 +123,45 @@ drop ( sn$ ) then ( sn$ ) - " disk:\" "temp place ( sn$' ) + " u:\" "temp place ( sn$' ) - dup 8 > if ( sn$ ) - over 8 "temp $cat ( sn$ ) - 8 /string ( sn$' ) - " ." "temp $cat ( sn$ ) - then ( sn$ ) - "temp $cat ( ) - "temp count ( filename$ ) + dup 8 > if ( sn$ ) + over 8 "temp $cat ( sn$ ) + 8 /string ( sn$' ) + " ." "temp $cat ( sn$ ) + then ( sn$ ) + "temp $cat ( ) + "temp count ( filename$ ) ; : save-mfg-data ( -- ) - make-sn-name ( name$ ) - ." Creating " 2dup type cr + flash-open + make-sn-name ( name$ ) + ." Creating " 2dup type cr ( name$ ) $create-file ( ihandle ) dup 0= abort" Can't create file" >r ( r: ihandle ) mfg-data-buf /flash-block ( adr len r: ihandle ) 2dup mfg-data-offset flash-read ( adr len r: ihandle ) - " write" r@ $call-method ( r: ihandle ) - r> close-dev + " write" r@ $call-method ( wlen r: ihandle ) + r> close-dev ( wlen r: ihandle ) + /flash-block <> abort" Can't write file" ( r: ihandle ) + flash-close ; : restore-mfg-data ( "filename" -- ) + flash-open reading - ifd @ fsize dup /flash-block <> if ( len ) - drop ifd @ fclose ( ) + ifd @ fsize dup /flash-block <> if ( len ) + drop ifd @ fclose ( ) true abort" File is the wrong size - should be 65536 bytes" - then ( len ) - mfg-data-buf swap ( adr len ) - 2dup ifd @ fgets drop ( adr len ) - ifd @ fclose - - flash-write-enable - mfg-data-offset flash-erase-block ( adr len ) - mfg-data-offset flash-write ( ) - flash-write-disable ( ) + then ( len ) + mfg-data-buf swap ( adr len ) + 2dup ifd @ fgets drop ( adr len ) + ifd @ fclose ( adr len ) + flash-write-enable ( adr len ) + mfg-data-offset flash-erase-block ( adr len ) + mfg-data-offset flash-write ( ) + flash-write-disable ( ) + flash-close ( ) ; [then]

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

openfirmware