diff options
| author | Myles Watson <mylesgw@gmail.com> | 2009-04-22 22:25:45 +0000 |
|---|---|---|
| committer | Myles Watson <mylesgw@gmail.com> | 2009-04-22 22:25:45 +0000 |
| commit | 6315274cc89642bad0ff5518b0907a569814ac4c (patch) | |
| tree | 68d7678fec5c65c934eb4d6ed0fffd18aa7a0acb | |
| parent | 85b851add801eee5de517d32a92048bb223d4054 (diff) | |
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
| -rw-r--r-- | src/config/nofailovercalculation.lb | 5 | ||||
| -rw-r--r-- | src/config/nofailovercalculation128.lb | 5 | ||||
| -rw-r--r-- | util/newconfig/config.g | 2 |
3 files changed, 1 insertions, 11 deletions
diff --git a/src/config/nofailovercalculation.lb b/src/config/nofailovercalculation.lb index cab1a7f219..2705326499 100644 --- a/src/config/nofailovercalculation.lb +++ b/src/config/nofailovercalculation.lb @@ -31,8 +31,3 @@ default _ROMBASE = ( CONFIG_ROM_PAYLOAD_START + PAYLOAD_SIZE ) ## 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 - diff --git a/src/config/nofailovercalculation128.lb b/src/config/nofailovercalculation128.lb index a817a68679..b000e78864 100644 --- a/src/config/nofailovercalculation128.lb +++ b/src/config/nofailovercalculation128.lb @@ -31,8 +31,3 @@ default _ROMBASE = ( CONFIG_ROM_PAYLOAD_START + PAYLOAD_SIZE ) ## 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 - diff --git a/util/newconfig/config.g b/util/newconfig/config.g index a8130c8c66..b8bd38c857 100644 --- a/util/newconfig/config.g +++ b/util/newconfig/config.g @@ -1709,7 +1709,7 @@ parser Config: 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 }} |