Author: quozl Date: Tue Dec 13 01:00:41 2011 New Revision: 2762 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2762
Log: OLPC - remove use of storage LED now that reflash animation is done and kernel implementation is complete
Modified: cpu/arm/olpc/build-fw.fth cpu/arm/olpc/ecflash.fth cpu/x86/pc/olpc/devices.fth cpu/x86/pc/olpc/setwp.fth cpu/x86/pc/olpc/via/devices.fth cpu/x86/pc/olpc/via/fsupdate.fth dev/olpc/kb3700/eccmds.fth
Modified: cpu/arm/olpc/build-fw.fth ============================================================================== --- cpu/arm/olpc/build-fw.fth Fri Dec 9 21:57:17 2011 (r2761) +++ cpu/arm/olpc/build-fw.fth Tue Dec 13 01:00:41 2011 (r2762) @@ -194,24 +194,13 @@ ['] ec-spi-reprogrammed to spi-reprogrammed ; : flash-vulnerable( ( -- ) - 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 ; -: fs-vulnerable( ( -- ) - ols-off - hdd-led-on -; -: )fs-vulnerable ( -- ) - hdd-led-off - ols-on -;
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
Modified: cpu/arm/olpc/ecflash.fth ============================================================================== --- cpu/arm/olpc/ecflash.fth Fri Dec 9 21:57:17 2011 (r2761) +++ cpu/arm/olpc/ecflash.fth Tue Dec 13 01:00:41 2011 (r2762) @@ -44,10 +44,8 @@ dup load-base /flash-page comp ( adr different? ) if edi-open ( adr ) - hdd-led-on ( adr ) ec-flags-offset erase-page ( adr ) ec-flags-offset edi-program-page ( ) - hdd-led-off set-ec-reboot unreset-8051 \ should not return ec-power-cycle @@ -57,7 +55,6 @@ ; : ignore-ec-flags ( adr -- ) ec-flags-offset + /flash-page erase ; : reflash-ec - hdd-led-on [ifdef] cl2-a1 " enter-updater" $call-ec ." Erasing ..." cr " erase-flash" $call-ec cr @@ -75,7 +72,6 @@ load-base load-base /ec-flash + /ec-flash comp abort" Miscompare!" cr - hdd-led-off [ifndef] cl2-a1 ." Restarting EC and rebooting" cr set-ec-reboot
Modified: cpu/x86/pc/olpc/devices.fth ============================================================================== --- cpu/x86/pc/olpc/devices.fth Fri Dec 9 21:57:17 2011 (r2761) +++ cpu/x86/pc/olpc/devices.fth Tue Dec 13 01:00:41 2011 (r2762) @@ -320,8 +320,6 @@ load-base constant flash-buf : flash-vulnerable( ( -- ) ignore-power-button ; : )flash-vulnerable ( -- ) ; -: fs-vulnerable( ( -- ) ; -: )fs-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
Modified: cpu/x86/pc/olpc/setwp.fth ============================================================================== --- cpu/x86/pc/olpc/setwp.fth Fri Dec 9 21:57:17 2011 (r2761) +++ cpu/x86/pc/olpc/setwp.fth Tue Dec 13 01:00:41 2011 (r2762) @@ -33,9 +33,7 @@ \ Set and clear the write-protect tag by copying, erasing, rewriting
: (put-mfg-data) - hdd-led-on mfg-data-buf mfg-data-end-offset mfg-data-offset write-flash-range - hdd-led-off ;
: ram-find-tag ( name$ -- false | data$ true )
Modified: cpu/x86/pc/olpc/via/devices.fth ============================================================================== --- cpu/x86/pc/olpc/via/devices.fth Fri Dec 9 21:57:17 2011 (r2761) +++ cpu/x86/pc/olpc/via/devices.fth Tue Dec 13 01:00:41 2011 (r2762) @@ -290,17 +290,9 @@
load-base constant flash-buf : flash-vulnerable( ( -- ) - hdd-led-on ignore-power-button ; : )flash-vulnerable ( -- ) - hdd-led-off -; -: fs-vulnerable( ( -- ) - hdd-led-on -; -: )fs-vulnerable ( -- ) - hdd-led-off ;
fload ${BP}/dev/olpc/spiflash/spiui.fth \ User interface for SPI FLASH programming
Modified: cpu/x86/pc/olpc/via/fsupdate.fth ============================================================================== --- cpu/x86/pc/olpc/via/fsupdate.fth Fri Dec 9 21:57:17 2011 (r2761) +++ cpu/x86/pc/olpc/via/fsupdate.fth Tue Dec 13 01:00:41 2011 (r2762) @@ -67,7 +67,6 @@ also nand-commands definitions
: zblocks: ( "eblock-size" "#eblocks" ... -- ) - fs-vulnerable( ?compare-spec-line get-hex# to /nand-block get-hex# to #image-eblocks @@ -90,7 +89,6 @@ \ Asynchronous writes " write-blocks-end" $call-nand ( error? ) " Write error" ?nand-abort - )fs-vulnerable release-inflater fexit ; @@ -214,7 +212,6 @@ dup written ( eblock# ) show-written ( ) show-temperature - hdd-led-toggle ;
previous definitions
Modified: dev/olpc/kb3700/eccmds.fth ============================================================================== --- dev/olpc/kb3700/eccmds.fth Fri Dec 9 21:57:17 2011 (r2761) +++ dev/olpc/kb3700/eccmds.fth Tue Dec 13 01:00:41 2011 (r2762) @@ -85,18 +85,7 @@ : als@ ( -- w ) h# 56 ec-cmd-w@ ; : ols-led-on ( -- ) h# 57 ec-cmd ; : ols-led-off ( -- ) h# 58 ec-cmd ; -: ols-assy-mode-on ( -- ) h# 59 ec-cmd ; -: ols-assy-mode-off ( -- ) h# 5a ec-cmd ; : ols-led-ec-control ( -- ) h# 5b ec-cmd ; -: ols-off - ols-led-on - ols-led-ec-control - ols-assy-mode-on -; -: ols-on - ols-led-ec-control - ols-assy-mode-off -;
: ec-min-pwr ( -- ) h# 5d ec-cmd-w@ w->n ; : ec-max-pwr ( -- ) h# 5e ec-cmd-w@ w->n ;