From dbdd91bc5bacbc1b583df00880224ced5464c6bd Mon Sep 17 00:00:00 2001
From: Stefan Reinauer <stepan@coresystems.de>
Date: Tue, 22 Sep 2009 15:53:02 +0000
Subject: back out some overzealous renames

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4651 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
---
 util/newconfig/config.g | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'util')

diff --git a/util/newconfig/config.g b/util/newconfig/config.g
index 24983109e3..071a54536d 100644
--- a/util/newconfig/config.g
+++ b/util/newconfig/config.g
@@ -1647,7 +1647,7 @@ parser Config:
     token ACTION:		'action'
     token ADDACTION:		'addaction'
     token ALWAYS:		'always'
-    token CONFIG_ARCH:			'arch'
+    token ARCH:			'arch'
     token BUILDROM:		'buildrom'
     token COMMENT:		'comment'
     token CONFIG:		'config'
@@ -1677,7 +1677,7 @@ parser Config:
     token IRQ:			'irq'
     token LDSCRIPT:		'ldscript'
     token LOADOPTIONS:		'loadoptions'
-    token CONFIG_MAINBOARD:		'mainboard'
+    token MAINBOARD:		'mainboard'
     token MAINBOARDINIT:	'mainboardinit'
     token MAKEDEFINE:		'makedefine'
     token MAKERULE:		'makerule'
@@ -1777,7 +1777,7 @@ parser Config:
 			]                       {{ if (C): part(parttype, partid, 'Config.lb', name) }}
 			partend<<C>> 		
 
-    rule arch<<C>>:	CONFIG_ARCH ID			{{ if (C): setarch(ID) }}
+    rule arch<<C>>:	ARCH ID			{{ if (C): setarch(ID) }}
 			partend<<C>>
     
     rule mainboardinit<<C>>:
@@ -1969,7 +1969,7 @@ parser Config:
     rule payload<<C>>:	PAYLOAD DIRPATH		{{ if (C): payload(DIRPATH) }}
 
     rule mainboard:
-			CONFIG_MAINBOARD PATH		{{ mainboardsetup(PATH) }}
+			MAINBOARD PATH		{{ mainboardsetup(PATH) }}
 
     rule romif<<C>>:	IF ID			{{ c = lookup(ID) }}
 			(romstmt<<C and c>>)* 
-- 
cgit v1.2.3