GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

This patch fixes the parser. '|' has special meaning so [|] is used. 

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


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4187 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Myles Watson 2009-04-22 22:25:45 +00:00
parent 85b851add8
commit 6315274cc8
3 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/config/nofailovercalculation.lb
View File

@ -31,8 +31,3 @@ default _ROMBASE = ( CONFIG_ROM_PAYLOAD_START + PAYLOAD_SIZE )
## ##
default XIP_ROM_SIZE = 64 * 1024 default XIP_ROM_SIZE = 64 * 1024
default XIP_ROM_BASE = ( _ROMBASE - XIP_ROM_SIZE + ROM_IMAGE_SIZE ) 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

5
src/config/nofailovercalculation128.lb
View File

@ -31,8 +31,3 @@ default _ROMBASE = ( CONFIG_ROM_PAYLOAD_START + PAYLOAD_SIZE )
## ##
default XIP_ROM_SIZE = 128 * 1024 default XIP_ROM_SIZE = 128 * 1024
default XIP_ROM_BASE = ( _ROMBASE - XIP_ROM_SIZE + ROM_IMAGE_SIZE ) 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

2
util/newconfig/config.g
View File

@ -1709,7 +1709,7 @@ parser Config:
rule expr: logical {{ l = logical }} rule expr: logical {{ l = logical }}
( "&&" logical {{ l = l and logical }} ( "&&" logical {{ l = l and logical }}
| "||" logical {{ l = l or logical }} | "[|][|]" logical {{ l = l or logical }}
)* {{ return l }} )* {{ return l }}
rule logical: factor {{ n = factor }} rule logical: factor {{ n = factor }}