[coreboot] [v2] r4187 - in trunk/coreboot-v2: src/config util/newconfig

svn at coreboot.org svn at coreboot.org
Thu Apr 23 00:25:46 CEST 2009


Author: myles
Date: 2009-04-23 00:25:45 +0200 (Thu, 23 Apr 2009)
New Revision: 4187

Modified:
   trunk/coreboot-v2/src/config/nofailovercalculation.lb
   trunk/coreboot-v2/src/config/nofailovercalculation128.lb
   trunk/coreboot-v2/util/newconfig/config.g
Log:
This patch fixes the parser.  '|' has special meaning so [|] is used.

Signed-off-by: Myles Watson <mylesgw at gmail.com>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006 at gmx.net>


Modified: trunk/coreboot-v2/src/config/nofailovercalculation.lb
===================================================================
--- trunk/coreboot-v2/src/config/nofailovercalculation.lb	2009-04-22 22:08:00 UTC (rev 4186)
+++ trunk/coreboot-v2/src/config/nofailovercalculation.lb	2009-04-22 22:25:45 UTC (rev 4187)
@@ -31,8 +31,3 @@
 ##
 default XIP_ROM_SIZE = 64 * 1024
 default XIP_ROM_BASE = ( _ROMBASE - XIP_ROM_SIZE + ROM_IMAGE_SIZE )
-
-## This is needed to work around a parser bug.
-if USE_FALLBACK_IMAGE
-end
-

Modified: trunk/coreboot-v2/src/config/nofailovercalculation128.lb
===================================================================
--- trunk/coreboot-v2/src/config/nofailovercalculation128.lb	2009-04-22 22:08:00 UTC (rev 4186)
+++ trunk/coreboot-v2/src/config/nofailovercalculation128.lb	2009-04-22 22:25:45 UTC (rev 4187)
@@ -31,8 +31,3 @@
 ##
 default XIP_ROM_SIZE = 128 * 1024
 default XIP_ROM_BASE = ( _ROMBASE - XIP_ROM_SIZE + ROM_IMAGE_SIZE )
-
-## This is needed to work around a parser bug.
-if USE_FALLBACK_IMAGE
-end
-

Modified: trunk/coreboot-v2/util/newconfig/config.g
===================================================================
--- trunk/coreboot-v2/util/newconfig/config.g	2009-04-22 22:08:00 UTC (rev 4186)
+++ trunk/coreboot-v2/util/newconfig/config.g	2009-04-22 22:25:45 UTC (rev 4187)
@@ -1709,7 +1709,7 @@
 
     rule expr:		logical			{{ l = logical }}
 			( "&&" logical		{{ l = l and logical }}
-			| "||"  logical		{{ l = l or logical }}
+			| "[|][|]" logical	{{ l = l or logical }}
 			)*			{{ return l }}
 
     rule logical:	factor			{{ n = factor }}





More information about the coreboot mailing list