[v2] r4651 - trunk/coreboot-v2/util/newconfig

Author: stepan
Date: 2009-09-22 17:53:02 +0200 (Tue, 22 Sep 2009)
New Revision: 4651

Modified:
   trunk/coreboot-v2/util/newconfig/config.g
Log:
back out some overzealous renames

Signed-off-by: Stefan Reinauer 
Acked-by: Stefan Reinauer

Modified: trunk/coreboot-v2/util/newconfig/config.g
===================================================================
--- trunk/coreboot-v2/util/newconfig/config.g	2009-09-22 12:31:57 UTC (rev 4650)
+++ trunk/coreboot-v2/util/newconfig/config.g	2009-09-22 15:53:02 UTC (rev 4651)
@@ -1647,7 +1647,7 @@
     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 @@
     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 @@
    		]                       {{ 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 @@
     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>>)*