[openfirmware] [commit] r2278 - in cpu: arm/olpc/1.75 x86/pc/olpc

[repository service]

Author: wmb
Date: Tue Jun 14 20:55:35 2011
New Revision: 2278
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2278

Log:
OLPC XO-1.75 - fixed a residual assumption that SPI FLASH is memory mapped.  Had it not been fixed, it would have broken efface-md in the security code.

Modified:
   cpu/arm/olpc/1.75/fw.bth
   cpu/x86/pc/olpc/security.fth

Modified: cpu/arm/olpc/1.75/fw.bth
==============================================================================
--- cpu/arm/olpc/1.75/fw.bth	Tue Jun 14 20:38:01 2011	(r2277)
+++ cpu/arm/olpc/1.75/fw.bth	Tue Jun 14 20:55:35 2011	(r2278)
@@ -229,7 +229,6 @@
 0 value ec-indexed-io-off?    \ !!!
 : ec-indexed-io-off  ( -- )  ;  \ !!!
 : ec-ixio-reboot  ( -- )  ;   \ !!!
-: flash-base  ( -- )  true abort" The stuff that relies on flash-base in security.fth needs to be reworked!"  ;
 
 \ idt1338 rtc and ram address map
 \     00 -> 0f  rtc

Modified: cpu/x86/pc/olpc/security.fth
==============================================================================
--- cpu/x86/pc/olpc/security.fth	Tue Jun 14 20:38:01 2011	(r2277)
+++ cpu/x86/pc/olpc/security.fth	Tue Jun 14 20:55:35 2011	(r2278)
@@ -1300,7 +1300,7 @@
 
 : efface-md  ( -- )
    " md" find-tag  0=  if exit then  ( data$ )
-   + 2 +  flash-base -               ( flash-offset )
+   + 2 +  mfg-data-top -  mfg-data-end-offset +   ( flash-offset )
    spi-start spi-identify            ( flash-offset )
    " MD" rot write-spi-flash         ( )
    spi-reprogrammed                  ( )