aboutsummaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorPatrick Georgi <patrick.georgi@coresystems.de>2010-04-08 12:46:18 +0000
committerPatrick Georgi <patrick.georgi@coresystems.de>2010-04-08 12:46:18 +0000
commit2bbd0c29261d985e21dc69a731c895ee2791eb4b (patch)
tree8e9e638d1ba41bc7a8241a8fda535ee7a99004f9 /util
parent109a1de1ef8d79ebdae79e94638bcce545d8a8dd (diff)
downloadcoreboot-2bbd0c29261d985e21dc69a731c895ee2791eb4b.tar.gz
coreboot-2bbd0c29261d985e21dc69a731c895ee2791eb4b.tar.xz
coreboot-2bbd0c29261d985e21dc69a731c895ee2791eb4b.zip
sconfig: Mangle - to _ for struct names, too.
Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de> Acked-by: Patrick Georgi <patrick.georgi@coresystems.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5375 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'util')
-rw-r--r--util/sconfig/sconfig.tab.c_shipped17
-rwxr-xr-xutil/sconfig/sconfig.y1
2 files changed, 10 insertions, 8 deletions
diff --git a/util/sconfig/sconfig.tab.c_shipped b/util/sconfig/sconfig.tab.c_shipped
index d73a503a1..341421b1d 100644
--- a/util/sconfig/sconfig.tab.c_shipped
+++ b/util/sconfig/sconfig.tab.c_shipped
@@ -562,7 +562,7 @@ static const yytype_int8 yyrhs[] =
static const yytype_uint16 yyrline[] =
{
0, 132, 132, 152, 152, 154, 154, 154, 156, 156,
- 156, 158, 158, 214, 214, 293, 311
+ 156, 158, 158, 215, 215, 294, 312
};
#endif
@@ -1511,6 +1511,7 @@ yyreduce:
char *c;
for (c = (yyval.device)->name_underscore; *c; c++) {
if (*c == '/') *c = '_';
+ if (*c == '-') *c = '_';
}
(yyval.device)->type = chip;
(yyval.device)->chip = (yyval.device);
@@ -1536,7 +1537,7 @@ yyreduce:
case 12:
/* Line 1455 of yacc.c */
-#line 186 "/home/Patrick/work/coreboot/util/sconfig/sconfig.y"
+#line 187 "/home/Patrick/work/coreboot/util/sconfig/sconfig.y"
{
cur_parent = (yyvsp[(3) - (5)].device)->parent;
@@ -1569,7 +1570,7 @@ yyreduce:
case 13:
/* Line 1455 of yacc.c */
-#line 214 "/home/Patrick/work/coreboot/util/sconfig/sconfig.y"
+#line 215 "/home/Patrick/work/coreboot/util/sconfig/sconfig.y"
{
(yyval.device) = new_dev();
(yyval.device)->bustype = (yyvsp[(2) - (4)].number);
@@ -1625,7 +1626,7 @@ yyreduce:
case 14:
/* Line 1455 of yacc.c */
-#line 264 "/home/Patrick/work/coreboot/util/sconfig/sconfig.y"
+#line 265 "/home/Patrick/work/coreboot/util/sconfig/sconfig.y"
{
cur_parent = (yyvsp[(5) - (7)].device)->parent;
cur_bus = (yyvsp[(5) - (7)].device)->bus;
@@ -1659,7 +1660,7 @@ yyreduce:
case 15:
/* Line 1455 of yacc.c */
-#line 294 "/home/Patrick/work/coreboot/util/sconfig/sconfig.y"
+#line 295 "/home/Patrick/work/coreboot/util/sconfig/sconfig.y"
{
struct resource *r = malloc(sizeof(struct resource));
memset (r, 0, sizeof(struct resource));
@@ -1680,7 +1681,7 @@ yyreduce:
case 16:
/* Line 1455 of yacc.c */
-#line 312 "/home/Patrick/work/coreboot/util/sconfig/sconfig.y"
+#line 313 "/home/Patrick/work/coreboot/util/sconfig/sconfig.y"
{
struct reg *r = malloc(sizeof(struct reg));
memset (r, 0, sizeof(struct reg));
@@ -1711,7 +1712,7 @@ yyreduce:
/* Line 1455 of yacc.c */
-#line 1715 "/home/Patrick/work/coreboot/util/sconfig/sconfig.tab.c_shipped"
+#line 1716 "/home/Patrick/work/coreboot/util/sconfig/sconfig.tab.c_shipped"
default: break;
}
YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -1923,7 +1924,7 @@ yyreturn:
/* Line 1675 of yacc.c */
-#line 339 "/home/Patrick/work/coreboot/util/sconfig/sconfig.y"
+#line 340 "/home/Patrick/work/coreboot/util/sconfig/sconfig.y"
void pass0(FILE *fil, struct device *ptr) {
if ((ptr->type == device) && (ptr->id != 0) && (!ptr->used))
diff --git a/util/sconfig/sconfig.y b/util/sconfig/sconfig.y
index 180ea8a73..06fd20664 100755
--- a/util/sconfig/sconfig.y
+++ b/util/sconfig/sconfig.y
@@ -163,6 +163,7 @@ chip: CHIP STRING /* == path */ {
char *c;
for (c = $<device>$->name_underscore; *c; c++) {
if (*c == '/') *c = '_';
+ if (*c == '-') *c = '_';
}
$<device>$->type = chip;
$<device>$->chip = $<device>$;