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

[repository service]

Author: quozl
Date: Thu Sep  6 01:08:36 2012
New Revision: 3291
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3291

Log:
OLPC XO-4 - security, deprecate unadorned bundle names from XO-4 onwards, #12091

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

Modified: cpu/x86/pc/olpc/security.fth
==============================================================================
--- cpu/x86/pc/olpc/security.fth	Thu Sep  6 01:04:16 2012	(r3290)
+++ cpu/x86/pc/olpc/security.fth	Thu Sep  6 01:08:36 2012	(r3291)
@@ -443,12 +443,15 @@
 ;
 0 value bundle-suffix
 : bundle-present?  ( fn$ -- flag )
-   \ Try the unadorned name first
-   fn-buf place
+   \ unadorned names not supported from XO-4 onwards
+   bundle-suffix 4 < if
+      \ Try the unadorned name first
+      fn-buf place
 
-   bundle-name$  .trying
-   ['] (boot-read) catch  0=  if  true exit  then   ( x x )
-   2drop                                            ( )
+      bundle-name$  .trying
+      ['] (boot-read) catch  0=  if  true exit  then   ( x x )
+      2drop                                            ( )
+   then
 
    \ Unadorned name not present; try again with architecture-dependent numeric suffix
    bundle-suffix push-decimal (.) pop-base   ( adr len )