sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sconfig: rename lapic_cluster -> cpu_cluster

Browse Source 
The name lapic_cluster is a bit misleading, since the construct is not local
APIC specific by concept. As implementations and hardware change, be more
generic about our naming. This will allow us to support non-x86 systems without
adding new keywords.

Change-Id: Icd7f5fcf6f54d242eabb5e14ee151eec8d6cceb1
Signed-off-by: Stefan Reinauer <reinauer@google.com>
Signed-off-by: David Hendricks <dhendrix@chromium.org>
Reviewed-on: http://review.coreboot.org/2377
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
This commit is contained in:
Stefan Reinauer
2013-02-12 15:20:54 -08:00
committed by Ronald G. Minnich
parent 398e84c71a
commit 0aa37c488b
218 changed files with 326 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

160
util/sconfig/lex.yy.c_shipped
View File

@@ -377,21 +377,21 @@ struct yy_trans_info
flex_int32_t yy_verify;
flex_int32_t yy_nxt;
};
static yyconst flex_int16_t yy_accept[114] =
static yyconst flex_int16_t yy_accept[116] =
{ 0,
0, 0, 31, 29, 1, 3, 29, 29, 29, 25,
25, 23, 26, 29, 26, 26, 26, 29, 29, 29,
29, 29, 29, 29, 1, 3, 29, 0, 29, 0,
2, 25, 26, 29, 29, 29, 26, 29, 29, 29,
29, 29, 18, 29, 29, 29, 7, 29, 29, 29,
29, 28, 28, 24, 29, 29, 29, 29, 17, 22,
12, 29, 29, 16, 29, 8, 9, 11, 29, 29,
27, 4, 29, 29, 29, 29, 29, 29, 29, 29,
29, 29, 29, 13, 29, 29, 5, 15, 29, 10,
29, 29, 29, 20, 29, 29, 29, 29, 29, 29,
2, 25, 26, 29, 29, 29, 29, 26, 29, 29,
29, 29, 29, 18, 29, 29, 29, 7, 29, 29,
29, 29, 28, 28, 24, 29, 29, 29, 29, 29,
17, 22, 12, 29, 29, 16, 29, 8, 9, 11,
29, 29, 27, 4, 29, 29, 29, 29, 29, 29,
29, 29, 29, 29, 29, 29, 29, 13, 29, 29,
29, 5, 15, 29, 10, 29, 29, 29, 20, 29,
6, 29, 29, 29, 29, 19, 29, 29, 29, 21,
29, 14, 0
29, 29, 29, 29, 6, 29, 29, 29, 29, 29,
19, 29, 14, 21, 0
} ;
static yyconst flex_int32_t yy_ec[256] =
@@ -434,94 +434,94 @@ static yyconst flex_int32_t yy_meta[39] =
1, 1, 1, 1, 1, 1, 1, 1
} ;
static yyconst flex_int16_t yy_base[119] =
static yyconst flex_int16_t yy_base[121] =
{ 0,
0, 0, 179, 0, 176, 180, 174, 37, 41, 38,
139, 0, 44, 161, 54, 72, 57, 39, 157, 47,
54, 152, 137, 0, 169, 180, 81, 165, 74, 166,
180, 0, 80, 98, 153, 142, 87, 139, 134, 144,
144, 138, 144, 129, 129, 136, 0, 132, 126, 132,
136, 0, 180, 0, 142, 122, 126, 133, 0, 0,
0, 128, 118, 0, 122, 0, 0, 0, 121, 112,
0, 0, 125, 118, 110, 116, 121, 106, 100, 116,
108, 110, 115, 117, 98, 89, 0, 0, 87, 98,
94, 91, 77, 0, 83, 77, 70, 79, 67, 63,
0, 0, 181, 0, 178, 182, 176, 37, 41, 38,
141, 0, 44, 163, 54, 78, 60, 45, 159, 42,
47, 154, 139, 0, 171, 182, 77, 167, 69, 168,
182, 0, 82, 104, 155, 144, 133, 93, 140, 135,
145, 145, 139, 145, 130, 130, 137, 0, 133, 127,
133, 137, 0, 182, 0, 143, 123, 136, 126, 133,
0, 0, 0, 128, 118, 0, 122, 0, 0, 0,
121, 112, 0, 0, 125, 124, 117, 109, 115, 120,
105, 90, 101, 99, 91, 93, 98, 0, 80, 76,
73, 0, 0, 72, 89, 83, 69, 65, 0, 72,
0, 70, 61, 58, 65, 0, 40, 52, 49, 0,
22, 0, 180, 40, 123, 125, 127, 129
64, 74, 60, 61, 0, 65, 62, 50, 51, 33,
0, 28, 0, 0, 182, 40, 129, 131, 133, 135
} ;
static yyconst flex_int16_t yy_def[119] =
static yyconst flex_int16_t yy_def[121] =
{ 0,
113, 1, 113, 114, 113, 113, 114, 115, 116, 114,
10, 114, 10, 114, 10, 10, 10, 114, 114, 114,
114, 114, 114, 114, 113, 113, 115, 117, 116, 118,
113, 10, 10, 10, 114, 114, 10, 114, 114, 114,
114, 114, 114, 114, 114, 114, 114, 114, 114, 114,
114, 114, 113, 34, 114, 114, 114, 114, 114, 114,
114, 114, 114, 114, 114, 114, 114, 114, 114, 114,
114, 114, 114, 114, 114, 114, 114, 114, 114, 114,
114, 114, 114, 114, 114, 114, 114, 114, 114, 114,
114, 114, 114, 114, 114, 114, 114, 114, 114, 114,
115, 1, 115, 116, 115, 115, 116, 117, 118, 116,
10, 116, 10, 116, 10, 10, 10, 116, 116, 116,
116, 116, 116, 116, 115, 115, 117, 119, 118, 120,
115, 10, 10, 10, 116, 116, 116, 10, 116, 116,
116, 116, 116, 116, 116, 116, 116, 116, 116, 116,
116, 116, 116, 115, 34, 116, 116, 116, 116, 116,
116, 116, 116, 116, 116, 116, 116, 116, 116, 116,
116, 116, 116, 116, 116, 116, 116, 116, 116, 116,
116, 116, 116, 116, 116, 116, 116, 116, 116, 116,
116, 116, 116, 116, 116, 116, 116, 116, 116, 116,
114, 114, 114, 114, 114, 114, 114, 114, 114, 114,
114, 114, 0, 113, 113, 113, 113, 113
116, 116, 116, 116, 116, 116, 116, 116, 116, 116,
116, 116, 116, 116, 0, 115, 115, 115, 115, 115
} ;
static yyconst flex_int16_t yy_nxt[219] =
static yyconst flex_int16_t yy_nxt[221] =
{ 0,
4, 5, 6, 7, 8, 9, 10, 11, 10, 12,
13, 13, 14, 4, 4, 4, 13, 13, 15, 16,
17, 13, 4, 4, 18, 19, 4, 4, 20, 21,
4, 22, 23, 4, 4, 4, 4, 4, 28, 28,
24, 24, 30, 31, 32, 32, 32, 41, 33, 33,
33, 33, 33, 112, 33, 33, 33, 33, 33, 33,
33, 33, 33, 33, 33, 33, 42, 43, 46, 111,
44, 110, 48, 109, 47, 30, 31, 36, 33, 33,
33, 49, 28, 28, 40, 52, 33, 33, 33, 108,
107, 106, 37, 33, 33, 33, 105, 104, 103, 102,
24, 24, 30, 31, 32, 32, 32, 114, 33, 33,
33, 33, 33, 42, 33, 33, 33, 33, 33, 33,
33, 33, 33, 47, 113, 49, 33, 33, 33, 48,
30, 31, 43, 44, 50, 112, 45, 36, 28, 28,
111, 53, 110, 37, 33, 33, 33, 41, 33, 33,
33, 109, 108, 107, 106, 105, 104, 103, 38, 33,
38, 101, 100, 39, 54, 54, 54, 99, 54, 54,
98, 97, 96, 95, 54, 54, 54, 54, 54, 54,
94, 93, 57, 27, 27, 29, 29, 28, 28, 30,
30, 92, 91, 90, 89, 88, 87, 86, 85, 84,
83, 82, 81, 80, 79, 78, 77, 76, 75, 74,
73, 72, 71, 70, 69, 68, 67, 66, 65, 64,
63, 62, 61, 60, 59, 58, 56, 55, 31, 53,
25, 51, 50, 45, 35, 34, 26, 25, 113, 3,
113, 113, 113, 113, 113, 113, 113, 113, 113, 113,
113, 113, 113, 113, 113, 113, 113, 113, 113, 113,
33, 33, 102, 101, 100, 99, 39, 98, 97, 40,
55, 55, 55, 96, 55, 55, 95, 94, 93, 92,
55, 55, 55, 55, 55, 55, 91, 90, 59, 27,
27, 29, 29, 28, 28, 30, 30, 89, 88, 87,
86, 85, 84, 83, 82, 81, 80, 79, 78, 77,
76, 75, 74, 73, 72, 71, 70, 69, 68, 67,
66, 65, 64, 63, 62, 61, 60, 58, 57, 56,
31, 54, 25, 52, 51, 46, 35, 34, 26, 25,
115, 3, 115, 115, 115, 115, 115, 115, 115, 115,
115, 115, 115, 115, 115, 115, 115, 115, 115, 115,
113, 113, 113, 113, 113, 113, 113, 113, 113, 113,
113, 113, 113, 113, 113, 113, 113, 113
115, 115, 115, 115, 115, 115, 115, 115, 115, 115,
115, 115, 115, 115, 115, 115, 115, 115, 115, 115
} ;
static yyconst flex_int16_t yy_chk[219] =
static yyconst flex_int16_t yy_chk[221] =
{ 0,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 8, 8,
114, 8, 9, 9, 10, 10, 10, 18, 10, 10,
13, 13, 13, 111, 10, 10, 10, 10, 10, 10,
15, 15, 15, 17, 17, 17, 18, 18, 20, 109,
18, 108, 21, 107, 20, 29, 29, 15, 16, 16,
16, 21, 27, 27, 17, 27, 33, 33, 33, 105,
104, 103, 16, 37, 37, 37, 102, 100, 99, 98,
116, 8, 9, 9, 10, 10, 10, 112, 10, 10,
13, 13, 13, 18, 10, 10, 10, 10, 10, 10,
15, 15, 15, 20, 110, 21, 17, 17, 17, 20,
29, 29, 18, 18, 21, 109, 18, 15, 27, 27,
108, 27, 107, 15, 16, 16, 16, 17, 33, 33,
33, 106, 104, 103, 102, 101, 100, 98, 16, 38,
16, 97, 96, 16, 34, 34, 34, 95, 34, 34,
93, 92, 91, 90, 34, 34, 34, 34, 34, 34,
89, 86, 37, 115, 115, 116, 116, 117, 117, 118,
118, 85, 84, 83, 82, 81, 80, 79, 78, 77,
76, 75, 74, 73, 70, 69, 65, 63, 62, 58,
57, 56, 55, 51, 50, 49, 48, 46, 45, 44,
43, 42, 41, 40, 39, 38, 36, 35, 30, 28,
25, 23, 22, 19, 14, 11, 7, 5, 3, 113,
113, 113, 113, 113, 113, 113, 113, 113, 113, 113,
113, 113, 113, 113, 113, 113, 113, 113, 113, 113,
38, 38, 97, 96, 95, 94, 16, 91, 90, 16,
34, 34, 34, 89, 34, 34, 87, 86, 85, 84,
34, 34, 34, 34, 34, 34, 83, 82, 38, 117,
117, 118, 118, 119, 119, 120, 120, 81, 80, 79,
78, 77, 76, 75, 72, 71, 67, 65, 64, 60,
59, 58, 57, 56, 52, 51, 50, 49, 47, 46,
45, 44, 43, 42, 41, 40, 39, 37, 36, 35,
30, 28, 25, 23, 22, 19, 14, 11, 7, 5,
3, 115, 115, 115, 115, 115, 115, 115, 115, 115,
115, 115, 115, 115, 115, 115, 115, 115, 115, 115,
113, 113, 113, 113, 113, 113, 113, 113, 113, 113,
113, 113, 113, 113, 113, 113, 113, 113
115, 115, 115, 115, 115, 115, 115, 115, 115, 115,
115, 115, 115, 115, 115, 115, 115, 115, 115, 115
} ;
static yy_state_type yy_last_accepting_state;
@@ -798,13 +798,13 @@ yy_match:
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
{
yy_current_state = (int) yy_def[yy_current_state];
if ( yy_current_state >= 114 )
if ( yy_current_state >= 116 )
yy_c = yy_meta[(unsigned int) yy_c];
}
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
++yy_cp;
}
while ( yy_base[yy_current_state] != 180 );
while ( yy_base[yy_current_state] != 182 );
yy_find_action:
yy_act = yy_accept[yy_current_state];
@@ -884,7 +884,7 @@ YY_RULE_SETUP
YY_BREAK
case 14:
YY_RULE_SETUP
{yylval.number=APIC_CLUSTER; return(BUS);}
{yylval.number=CPU_CLUSTER; return(BUS);}
YY_BREAK
case 15:
YY_RULE_SETUP
@@ -1242,7 +1242,7 @@ static int yy_get_next_buffer (void)
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
{
yy_current_state = (int) yy_def[yy_current_state];
if ( yy_current_state >= 114 )
if ( yy_current_state >= 116 )
yy_c = yy_meta[(unsigned int) yy_c];
}
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -1270,11 +1270,11 @@ static int yy_get_next_buffer (void)
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
{
yy_current_state = (int) yy_def[yy_current_state];
if ( yy_current_state >= 114 )
if ( yy_current_state >= 116 )
yy_c = yy_meta[(unsigned int) yy_c];
}
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
yy_is_jam = (yy_current_state == 113);
yy_is_jam = (yy_current_state == 115);
return yy_is_jam ? 0 : yy_current_state;
}

4
util/sconfig/main.c
View File

@@ -262,8 +262,8 @@ struct device *new_device(struct device *parent, struct device *busdev, const in
new_d->path = ".type=DEVICE_PATH_APIC,{.apic={ .apic_id = 0x%x }}";
break;
case APIC_CLUSTER:
new_d->path = ".type=DEVICE_PATH_APIC_CLUSTER,{.apic_cluster={ .cluster = 0x%x }}";
case CPU_CLUSTER:
new_d->path = ".type=DEVICE_PATH_CPU_CLUSTER,{.cpu_cluster={ .cluster = 0x%x }}";
break;
case DOMAIN:

2
util/sconfig/sconfig.l
View File

@@ -38,7 +38,7 @@ ioapic {yylval.number=IOAPIC; return(BUS);}
pnp {yylval.number=PNP; return(BUS);}
i2c {yylval.number=I2C; return(BUS);}
lapic {yylval.number=APIC; return(BUS);}
lapic_cluster {yylval.number=APIC_CLUSTER; return(BUS);}
cpu_cluster {yylval.number=CPU_CLUSTER; return(BUS);}
domain {yylval.number=DOMAIN; return(BUS);}
irq {yylval.number=IRQ; return(RESOURCE);}
drq {yylval.number=DRQ; return(RESOURCE);}

4
util/sconfig/sconfig.tab.c_shipped
View File

@@ -132,7 +132,7 @@ static struct device *cur_parent, *cur_bus;
PNP = 269,
I2C = 270,
APIC = 271,
APIC_CLUSTER = 272,
CPU_CLUSTER = 272,
DOMAIN = 273,
IRQ = 274,
DRQ = 275,
@@ -478,7 +478,7 @@ static const char *const yytname[] =
{
"$end", "error", "$undefined", "CHIP", "DEVICE", "REGISTER", "BOOL",
"BUS", "RESOURCE", "END", "EQUALS", "HEX", "STRING", "PCI", "PNP", "I2C",
"APIC", "APIC_CLUSTER", "DOMAIN", "IRQ", "DRQ", "IO", "NUMBER",
"APIC", "CPU_CLUSTER", "DOMAIN", "IRQ", "DRQ", "IO", "NUMBER",
"SUBSYSTEMID", "INHERIT", "IOAPIC_IRQ", "IOAPIC", "PCIINT", "$accept",
"devtree", "$@1", "chipchildren", "devicechildren", "chip", "@2",
"device", "@3", "resource", "registers", "subsystemid", "ioapic_irq", 0

2
util/sconfig/sconfig.tab.h_shipped
View File

@@ -51,7 +51,7 @@
PNP = 269,
I2C = 270,
APIC = 271,
APIC_CLUSTER = 272,
CPU_CLUSTER = 272,
DOMAIN = 273,
IRQ = 274,
DRQ = 275,

2
util/sconfig/sconfig.y
View File

@@ -30,7 +30,7 @@ static struct device *cur_parent, *cur_bus;
int number;
}
%token CHIP DEVICE REGISTER BOOL BUS RESOURCE END EQUALS HEX STRING PCI PNP I2C APIC APIC_CLUSTER DOMAIN IRQ DRQ IO NUMBER SUBSYSTEMID INHERIT IOAPIC_IRQ IOAPIC PCIINT
%token CHIP DEVICE REGISTER BOOL BUS RESOURCE END EQUALS HEX STRING PCI PNP I2C APIC CPU_CLUSTER DOMAIN IRQ DRQ IO NUMBER SUBSYSTEMID INHERIT IOAPIC_IRQ IOAPIC PCIINT
%%
devtree: { cur_parent = cur_bus = head; } chip { postprocess_devtree(); } ;