[openfirmware] r1295 - cpu/x86/pc/olpc

[svn at openfirmware.info]

Author: wmb
Date: 2009-08-12 08:42:55 +0200 (Wed, 12 Aug 2009)
New Revision: 1295

Modified:
   cpu/x86/pc/olpc/nandcastui.fth
   cpu/x86/pc/olpc/versions.fth
Log:
OLPC trac 9434 - Prevent secure XO from accepting non-secure
NANDblaster transmission.



Modified: cpu/x86/pc/olpc/nandcastui.fth
===================================================================
--- cpu/x86/pc/olpc/nandcastui.fth	2009-08-12 00:17:48 UTC (rev 1294)
+++ cpu/x86/pc/olpc/nandcastui.fth	2009-08-12 06:42:55 UTC (rev 1295)
@@ -26,7 +26,7 @@
 ;
 
 : secure$  ( -- adr len )
-   secure?  if  " secure"  else  null$  then
+   secure? security-off? 0= and  if  " secure"  else  null$  then
 ;
 
 d# 20 value redundancy

Modified: cpu/x86/pc/olpc/versions.fth
===================================================================
--- cpu/x86/pc/olpc/versions.fth	2009-08-12 00:17:48 UTC (rev 1294)
+++ cpu/x86/pc/olpc/versions.fth	2009-08-12 06:42:55 UTC (rev 1295)
@@ -2,7 +2,7 @@
 
 \ The overall firmware revision
 macro: FW_MAJOR E
-macro: FW_MINOR 41a
+macro: FW_MINOR 41c
 
 \ The EC microcode
 macro: EC_VERSION e34
@@ -26,6 +26,6 @@
 \ With a specific ID, mcastnand.bth will download a tarball without .git stuff.
 \ With "test", mcastnand.bth will clone the git head if build/multicast-nand/
 \ is not already present, then you can modify the git subtree as needed.
-macro: MCNAND_VERSION d2ad2d7714959dd91c0bed3bacb60243b22d7d03
+macro: MCNAND_VERSION b9a9d22b6037c3891f9cf8eabeaf7cd9efbd5241
 \ macro: MCNAND_VERSION test
 \ macro: MCNAND_VERSION HEAD