[openfirmware] [commit] r3584 - cpu/x86/pc/olpc

[repository service]

Author: quozl
Date: Tue Mar  5 05:26:45 2013
New Revision: 3584
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3584

Log:
OLPC - add support for not rebooting on tag change on XO-1.75 and XO-4.  This used to be  ' noop to spi-reprogrammed , but this was broken with the addition of CP and AP tag support in XO-1.75.  Manufacturing scripts use ($add-tag) and ($delete-tag) followed by (put-mfg-data) and so bypass this already.  #12578.

Modified:
   cpu/x86/pc/olpc/setwp.fth

Modified: cpu/x86/pc/olpc/setwp.fth
==============================================================================
--- cpu/x86/pc/olpc/setwp.fth	Tue Mar  5 04:40:13 2013	(r3583)
+++ cpu/x86/pc/olpc/setwp.fth	Tue Mar  5 05:26:45 2013	(r3584)
@@ -64,18 +64,20 @@
    ec-flags-buf /flash-page erase
    ec-flags-buf set-cp
    ec-flags-buf set-ap
-   ec-flags-buf ?reflash-ec-flags
+   ec-flags-buf ?reflash-ec-flags  \ may not return
 ;
 [else]
 : ?sync-ec  ;
 [then]
 
 \ Write mfg data from RAM to FLASH
+true value commit-tag
+: tags(  false to commit-tag  ;
+: )tags  ?sync-ec  spi-reprogrammed  ;
 : put-mfg-data  ( -- )
    spi-start spi-identify
    (put-mfg-data)
-   ?sync-ec
-   spi-reprogrammed
+   commit-tag  if  )tags  then
 ;
 
 \ Find RAM address of tag, given FLASH address