util/sconfig: Remove lapic devices from devicetree parsers
This is all handled at runtime now, so there is no need to have the
ability to statically add lapics to the devicetree.
Change-Id: I0746eb808a2956ac75f76c8189a9ecf190e33ce9
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/69378
Reviewed-by: Elyes Haouas <ehaouas@noos.fr>
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
diff --git a/util/sconfig/lex.yy.c_shipped b/util/sconfig/lex.yy.c_shipped
index 479366d..8d26db5 100644
--- a/util/sconfig/lex.yy.c_shipped
+++ b/util/sconfig/lex.yy.c_shipped
@@ -349,8 +349,8 @@
(yy_hold_char) = *yy_cp; \
*yy_cp = '\0'; \
(yy_c_buf_p) = yy_cp;
-#define YY_NUM_RULES 52
-#define YY_END_OF_BUFFER 53
+#define YY_NUM_RULES 51
+#define YY_END_OF_BUFFER 52
/* This struct is not used in this scanner,
but its presence is necessary. */
struct yy_trans_info
@@ -358,32 +358,31 @@
flex_int32_t yy_verify;
flex_int32_t yy_nxt;
};
-static const flex_int16_t yy_accept[214] =
+static const flex_int16_t yy_accept[209] =
{ 0,
- 0, 0, 53, 51, 1, 3, 51, 51, 51, 46,
- 46, 43, 47, 51, 47, 47, 47, 47, 47, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 44,
- 51, 1, 3, 51, 0, 51, 51, 0, 2, 46,
- 47, 51, 51, 51, 10, 51, 51, 47, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 36, 51,
- 51, 51, 51, 51, 51, 16, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 50, 50, 51, 0, 45,
- 51, 51, 51, 26, 51, 51, 35, 40, 51, 51,
- 51, 51, 51, 23, 51, 51, 34, 51, 51, 51,
+ 0, 0, 52, 50, 1, 3, 50, 50, 50, 45,
+ 45, 42, 46, 50, 46, 46, 46, 46, 46, 50,
+ 50, 50, 50, 50, 50, 50, 50, 50, 43, 50,
+ 1, 3, 50, 0, 50, 50, 0, 2, 45, 46,
+ 50, 50, 50, 10, 50, 50, 46, 50, 50, 50,
+ 50, 50, 50, 50, 50, 50, 50, 35, 50, 50,
+ 50, 50, 50, 16, 50, 50, 50, 50, 50, 50,
+ 50, 50, 50, 49, 49, 50, 0, 44, 50, 50,
+ 50, 25, 50, 50, 34, 39, 50, 50, 50, 50,
+ 50, 23, 50, 50, 33, 50, 50, 50, 17, 7,
- 51, 17, 7, 51, 20, 22, 51, 9, 51, 51,
- 30, 51, 31, 8, 51, 0, 48, 51, 4, 51,
- 51, 51, 51, 51, 51, 32, 51, 51, 51, 51,
- 51, 33, 29, 51, 51, 51, 51, 51, 49, 49,
- 6, 51, 51, 51, 13, 51, 51, 51, 51, 51,
- 24, 51, 51, 15, 51, 51, 51, 51, 5, 27,
- 51, 51, 18, 51, 21, 51, 14, 51, 51, 51,
- 51, 51, 28, 38, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 11, 51, 51, 51, 51, 12, 51,
- 19, 51, 51, 51, 51, 37, 51, 51, 51, 25,
+ 50, 20, 22, 50, 9, 50, 50, 29, 50, 30,
+ 8, 50, 0, 47, 50, 4, 50, 50, 50, 50,
+ 50, 50, 31, 50, 50, 50, 50, 32, 28, 50,
+ 50, 50, 50, 50, 48, 48, 6, 50, 50, 50,
+ 13, 50, 50, 50, 50, 50, 50, 50, 15, 50,
+ 50, 50, 50, 5, 26, 50, 50, 18, 50, 21,
+ 50, 14, 50, 50, 50, 50, 50, 27, 37, 50,
+ 50, 50, 50, 50, 50, 50, 50, 50, 11, 50,
+ 50, 50, 50, 12, 50, 19, 50, 50, 50, 50,
+ 36, 50, 50, 50, 24, 50, 50, 38, 50, 50,
- 51, 51, 39, 51, 51, 51, 51, 51, 51, 42,
- 51, 41, 0
+ 50, 50, 50, 50, 41, 50, 40, 0
} ;
static const YY_CHAR yy_ec[256] =
@@ -426,140 +425,140 @@
1, 1, 1, 1, 1, 1, 1, 1, 1, 1
} ;
-static const flex_int16_t yy_base[221] =
+static const flex_int16_t yy_base[216] =
{ 0,
- 0, 0, 286, 0, 283, 287, 281, 39, 43, 40,
- 245, 0, 46, 268, 56, 60, 64, 67, 72, 56,
- 256, 74, 263, 71, 77, 82, 258, 81, 245, 0,
- 0, 275, 287, 110, 271, 115, 119, 272, 287, 0,
- 116, 119, 259, 248, 0, 247, 236, 125, 243, 238,
- 248, 246, 250, 237, 239, 243, 243, 237, 243, 228,
- 228, 229, 231, 230, 232, 0, 109, 228, 222, 222,
- 122, 232, 224, 230, 128, 0, 287, 145, 242, 0,
- 235, 228, 214, 227, 217, 224, 0, 0, 214, 220,
- 217, 208, 216, 0, 214, 204, 0, 208, 212, 202,
+ 0, 0, 282, 0, 279, 283, 277, 39, 43, 40,
+ 241, 0, 46, 264, 56, 60, 64, 67, 72, 56,
+ 252, 74, 71, 77, 82, 255, 81, 242, 0, 0,
+ 272, 283, 110, 268, 115, 119, 269, 283, 0, 116,
+ 119, 256, 245, 0, 244, 233, 125, 240, 235, 245,
+ 243, 247, 234, 236, 240, 240, 234, 240, 225, 227,
+ 229, 228, 230, 0, 109, 226, 220, 220, 122, 230,
+ 222, 228, 128, 0, 283, 145, 240, 0, 233, 226,
+ 212, 225, 215, 222, 0, 0, 212, 218, 215, 206,
+ 214, 0, 212, 202, 0, 211, 201, 200, 0, 0,
- 201, 0, 0, 204, 0, 0, 210, 0, 202, 201,
- 0, 192, 0, 0, 219, 218, 0, 189, 0, 202,
- 201, 194, 198, 188, 184, 0, 194, 182, 188, 193,
- 194, 0, 0, 181, 188, 175, 178, 167, 0, 287,
- 0, 179, 183, 175, 0, 174, 176, 172, 174, 179,
- 0, 163, 168, 0, 161, 161, 160, 157, 0, 0,
- 169, 171, 0, 155, 172, 158, 0, 165, 169, 150,
- 150, 157, 0, 0, 156, 148, 147, 23, 157, 143,
- 153, 143, 135, 0, 139, 133, 131, 136, 0, 125,
- 0, 119, 125, 128, 120, 0, 135, 101, 109, 0,
+ 203, 0, 0, 209, 0, 201, 200, 0, 191, 0,
+ 0, 218, 217, 0, 188, 0, 201, 200, 193, 197,
+ 187, 183, 0, 193, 181, 187, 194, 0, 0, 181,
+ 188, 175, 178, 167, 0, 283, 0, 179, 183, 175,
+ 0, 174, 176, 172, 174, 179, 163, 168, 0, 161,
+ 161, 160, 157, 0, 0, 169, 171, 0, 155, 172,
+ 158, 0, 165, 169, 150, 150, 157, 0, 0, 156,
+ 148, 147, 23, 157, 143, 153, 143, 135, 0, 139,
+ 133, 131, 136, 0, 125, 0, 119, 125, 128, 120,
+ 0, 135, 101, 109, 0, 94, 88, 0, 72, 74,
- 94, 88, 0, 72, 74, 70, 66, 49, 37, 0,
- 47, 0, 287, 49, 161, 163, 165, 167, 169, 171
+ 70, 66, 49, 37, 0, 47, 0, 283, 49, 161,
+ 163, 165, 167, 169, 171
} ;
-static const flex_int16_t yy_def[221] =
+static const flex_int16_t yy_def[216] =
{ 0,
- 213, 1, 213, 214, 213, 213, 214, 215, 216, 214,
- 10, 214, 10, 214, 10, 10, 10, 10, 10, 214,
- 214, 214, 214, 214, 214, 214, 214, 214, 214, 214,
- 214, 213, 213, 215, 217, 218, 216, 219, 213, 10,
- 10, 10, 214, 214, 214, 214, 214, 10, 214, 214,
- 214, 214, 214, 214, 214, 214, 214, 214, 214, 214,
- 214, 214, 214, 214, 214, 214, 214, 214, 214, 214,
- 214, 214, 214, 214, 214, 214, 213, 218, 220, 42,
- 214, 214, 214, 214, 214, 214, 214, 214, 214, 214,
- 214, 214, 214, 214, 214, 214, 214, 214, 214, 214,
+ 208, 1, 208, 209, 208, 208, 209, 210, 211, 209,
+ 10, 209, 10, 209, 10, 10, 10, 10, 10, 209,
+ 209, 209, 209, 209, 209, 209, 209, 209, 209, 209,
+ 208, 208, 210, 212, 213, 211, 214, 208, 10, 10,
+ 10, 209, 209, 209, 209, 209, 10, 209, 209, 209,
+ 209, 209, 209, 209, 209, 209, 209, 209, 209, 209,
+ 209, 209, 209, 209, 209, 209, 209, 209, 209, 209,
+ 209, 209, 209, 209, 208, 213, 215, 41, 209, 209,
+ 209, 209, 209, 209, 209, 209, 209, 209, 209, 209,
+ 209, 209, 209, 209, 209, 209, 209, 209, 209, 209,
- 214, 214, 214, 214, 214, 214, 214, 214, 214, 214,
- 214, 214, 214, 214, 214, 213, 214, 214, 214, 214,
- 214, 214, 214, 214, 214, 214, 214, 214, 214, 214,
- 214, 214, 214, 214, 214, 214, 214, 214, 214, 213,
- 214, 214, 214, 214, 214, 214, 214, 214, 214, 214,
- 214, 214, 214, 214, 214, 214, 214, 214, 214, 214,
- 214, 214, 214, 214, 214, 214, 214, 214, 214, 214,
- 214, 214, 214, 214, 214, 214, 214, 214, 214, 214,
- 214, 214, 214, 214, 214, 214, 214, 214, 214, 214,
- 214, 214, 214, 214, 214, 214, 214, 214, 214, 214,
+ 209, 209, 209, 209, 209, 209, 209, 209, 209, 209,
+ 209, 209, 208, 209, 209, 209, 209, 209, 209, 209,
+ 209, 209, 209, 209, 209, 209, 209, 209, 209, 209,
+ 209, 209, 209, 209, 209, 208, 209, 209, 209, 209,
+ 209, 209, 209, 209, 209, 209, 209, 209, 209, 209,
+ 209, 209, 209, 209, 209, 209, 209, 209, 209, 209,
+ 209, 209, 209, 209, 209, 209, 209, 209, 209, 209,
+ 209, 209, 209, 209, 209, 209, 209, 209, 209, 209,
+ 209, 209, 209, 209, 209, 209, 209, 209, 209, 209,
+ 209, 209, 209, 209, 209, 209, 209, 209, 209, 209,
- 214, 214, 214, 214, 214, 214, 214, 214, 214, 214,
- 214, 214, 0, 213, 213, 213, 213, 213, 213, 213
+ 209, 209, 209, 209, 209, 209, 209, 0, 208, 208,
+ 208, 208, 208, 208, 208
} ;
-static const flex_int16_t yy_nxt[328] =
+static const flex_int16_t yy_nxt[324] =
{ 0,
4, 5, 6, 7, 8, 9, 10, 11, 10, 12,
13, 13, 14, 4, 4, 4, 15, 13, 16, 17,
- 18, 19, 20, 21, 22, 23, 24, 4, 25, 26,
- 4, 27, 28, 4, 29, 4, 4, 4, 4, 30,
- 35, 35, 185, 36, 38, 39, 40, 40, 40, 31,
- 41, 41, 41, 41, 41, 186, 41, 41, 41, 41,
- 41, 41, 41, 41, 41, 212, 41, 41, 41, 211,
- 41, 41, 41, 41, 41, 41, 54, 210, 41, 41,
- 41, 44, 57, 46, 48, 55, 209, 62, 45, 47,
- 63, 208, 49, 207, 51, 50, 52, 64, 65, 206,
+ 18, 19, 20, 21, 22, 4, 23, 4, 24, 25,
+ 4, 26, 27, 4, 28, 4, 4, 4, 4, 29,
+ 34, 34, 180, 35, 37, 38, 39, 39, 39, 30,
+ 40, 40, 40, 40, 40, 181, 40, 40, 40, 40,
+ 40, 40, 40, 40, 40, 207, 40, 40, 40, 206,
+ 40, 40, 40, 40, 40, 40, 53, 205, 40, 40,
+ 40, 43, 56, 45, 47, 54, 204, 60, 44, 46,
+ 61, 203, 48, 202, 50, 49, 51, 62, 63, 201,
- 68, 58, 59, 205, 66, 60, 67, 72, 53, 69,
- 73, 35, 35, 70, 76, 74, 79, 79, 204, 31,
- 38, 39, 41, 41, 41, 80, 80, 80, 203, 80,
- 80, 41, 41, 41, 202, 80, 80, 80, 80, 80,
- 80, 103, 104, 108, 109, 113, 79, 79, 114, 115,
- 201, 200, 199, 198, 197, 196, 195, 194, 193, 192,
- 85, 34, 34, 37, 37, 35, 35, 78, 78, 38,
- 38, 79, 79, 191, 190, 189, 188, 187, 184, 183,
- 182, 181, 180, 179, 178, 177, 176, 175, 174, 173,
- 172, 171, 170, 169, 168, 167, 166, 165, 164, 163,
+ 66, 57, 58, 200, 64, 59, 65, 70, 52, 67,
+ 71, 34, 34, 68, 74, 72, 77, 77, 199, 30,
+ 37, 38, 40, 40, 40, 78, 78, 78, 198, 78,
+ 78, 40, 40, 40, 197, 78, 78, 78, 78, 78,
+ 78, 100, 101, 105, 106, 110, 77, 77, 111, 112,
+ 196, 195, 194, 193, 192, 191, 190, 189, 188, 187,
+ 83, 33, 33, 36, 36, 34, 34, 76, 76, 37,
+ 37, 77, 77, 186, 185, 184, 183, 182, 179, 178,
+ 177, 176, 175, 174, 173, 172, 171, 170, 169, 168,
+ 167, 166, 165, 164, 163, 162, 161, 160, 159, 158,
- 162, 161, 160, 159, 158, 157, 156, 155, 154, 153,
- 152, 151, 150, 149, 148, 147, 146, 145, 144, 143,
- 142, 141, 140, 139, 138, 137, 136, 135, 134, 133,
- 132, 131, 130, 129, 128, 127, 126, 125, 124, 123,
- 122, 121, 120, 119, 118, 117, 116, 112, 111, 110,
- 107, 106, 105, 102, 101, 100, 99, 98, 97, 96,
- 95, 94, 93, 92, 91, 90, 89, 88, 87, 86,
- 84, 83, 82, 81, 39, 77, 32, 75, 71, 61,
- 56, 43, 42, 33, 32, 213, 3, 213, 213, 213,
- 213, 213, 213, 213, 213, 213, 213, 213, 213, 213,
+ 157, 156, 155, 154, 153, 152, 151, 150, 149, 148,
+ 147, 146, 145, 144, 143, 142, 141, 140, 139, 138,
+ 137, 136, 135, 134, 133, 132, 131, 130, 129, 128,
+ 127, 126, 125, 124, 123, 122, 121, 120, 119, 118,
+ 117, 116, 115, 114, 113, 109, 108, 107, 104, 103,
+ 102, 99, 98, 97, 96, 95, 94, 93, 92, 91,
+ 90, 89, 88, 87, 86, 85, 84, 82, 81, 80,
+ 79, 38, 75, 31, 73, 69, 55, 42, 41, 32,
+ 31, 208, 3, 208, 208, 208, 208, 208, 208, 208,
+ 208, 208, 208, 208, 208, 208, 208, 208, 208, 208,
- 213, 213, 213, 213, 213, 213, 213, 213, 213, 213,
- 213, 213, 213, 213, 213, 213, 213, 213, 213, 213,
- 213, 213, 213, 213, 213, 213, 213
+ 208, 208, 208, 208, 208, 208, 208, 208, 208, 208,
+ 208, 208, 208, 208, 208, 208, 208, 208, 208, 208,
+ 208, 208, 208
} ;
-static const flex_int16_t yy_chk[328] =
+static const flex_int16_t yy_chk[324] =
{ 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, 1, 1,
- 8, 8, 178, 8, 9, 9, 10, 10, 10, 214,
- 10, 10, 13, 13, 13, 178, 10, 10, 10, 10,
- 10, 10, 15, 15, 15, 211, 16, 16, 16, 209,
- 17, 17, 17, 18, 18, 18, 20, 208, 19, 19,
- 19, 15, 22, 16, 17, 20, 207, 24, 15, 16,
- 24, 206, 17, 205, 18, 17, 19, 24, 25, 204,
+ 8, 8, 173, 8, 9, 9, 10, 10, 10, 209,
+ 10, 10, 13, 13, 13, 173, 10, 10, 10, 10,
+ 10, 10, 15, 15, 15, 206, 16, 16, 16, 204,
+ 17, 17, 17, 18, 18, 18, 20, 203, 19, 19,
+ 19, 15, 22, 16, 17, 20, 202, 23, 15, 16,
+ 23, 201, 17, 200, 18, 17, 19, 23, 24, 199,
- 26, 22, 22, 202, 25, 22, 25, 28, 19, 26,
- 28, 34, 34, 26, 34, 28, 36, 36, 201, 36,
- 37, 37, 41, 41, 41, 42, 42, 42, 199, 42,
- 42, 48, 48, 48, 198, 42, 42, 42, 42, 42,
- 42, 67, 67, 71, 71, 75, 78, 78, 75, 78,
- 197, 195, 194, 193, 192, 190, 188, 187, 186, 185,
- 48, 215, 215, 216, 216, 217, 217, 218, 218, 219,
- 219, 220, 220, 183, 182, 181, 180, 179, 177, 176,
- 175, 172, 171, 170, 169, 168, 166, 165, 164, 162,
- 161, 158, 157, 156, 155, 153, 152, 150, 149, 148,
+ 25, 22, 22, 197, 24, 22, 24, 27, 19, 25,
+ 27, 33, 33, 25, 33, 27, 35, 35, 196, 35,
+ 36, 36, 40, 40, 40, 41, 41, 41, 194, 41,
+ 41, 47, 47, 47, 193, 41, 41, 41, 41, 41,
+ 41, 65, 65, 69, 69, 73, 76, 76, 73, 76,
+ 192, 190, 189, 188, 187, 185, 183, 182, 181, 180,
+ 47, 210, 210, 211, 211, 212, 212, 213, 213, 214,
+ 214, 215, 215, 178, 177, 176, 175, 174, 172, 171,
+ 170, 167, 166, 165, 164, 163, 161, 160, 159, 157,
+ 156, 153, 152, 151, 150, 148, 147, 146, 145, 144,
- 147, 146, 144, 143, 142, 138, 137, 136, 135, 134,
- 131, 130, 129, 128, 127, 125, 124, 123, 122, 121,
- 120, 118, 116, 115, 112, 110, 109, 107, 104, 101,
- 100, 99, 98, 96, 95, 93, 92, 91, 90, 89,
- 86, 85, 84, 83, 82, 81, 79, 74, 73, 72,
- 70, 69, 68, 65, 64, 63, 62, 61, 60, 59,
- 58, 57, 56, 55, 54, 53, 52, 51, 50, 49,
- 47, 46, 44, 43, 38, 35, 32, 29, 27, 23,
- 21, 14, 11, 7, 5, 3, 213, 213, 213, 213,
- 213, 213, 213, 213, 213, 213, 213, 213, 213, 213,
+ 143, 142, 140, 139, 138, 134, 133, 132, 131, 130,
+ 127, 126, 125, 124, 122, 121, 120, 119, 118, 117,
+ 115, 113, 112, 109, 107, 106, 104, 101, 98, 97,
+ 96, 94, 93, 91, 90, 89, 88, 87, 84, 83,
+ 82, 81, 80, 79, 77, 72, 71, 70, 68, 67,
+ 66, 63, 62, 61, 60, 59, 58, 57, 56, 55,
+ 54, 53, 52, 51, 50, 49, 48, 46, 45, 43,
+ 42, 37, 34, 31, 28, 26, 21, 14, 11, 7,
+ 5, 3, 208, 208, 208, 208, 208, 208, 208, 208,
+ 208, 208, 208, 208, 208, 208, 208, 208, 208, 208,
- 213, 213, 213, 213, 213, 213, 213, 213, 213, 213,
- 213, 213, 213, 213, 213, 213, 213, 213, 213, 213,
- 213, 213, 213, 213, 213, 213, 213
+ 208, 208, 208, 208, 208, 208, 208, 208, 208, 208,
+ 208, 208, 208, 208, 208, 208, 208, 208, 208, 208,
+ 208, 208, 208
} ;
static yy_state_type yy_last_accepting_state;
@@ -824,13 +823,13 @@
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 >= 214 )
+ if ( yy_current_state >= 209 )
yy_c = yy_meta[yy_c];
}
yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
++yy_cp;
}
- while ( yy_base[yy_current_state] != 287 );
+ while ( yy_base[yy_current_state] != 283 );
yy_find_action:
yy_act = yy_accept[yy_current_state];
@@ -950,87 +949,87 @@
YY_BREAK
case 24:
YY_RULE_SETUP
-{yylval.number=APIC; return(BUS);}
+{yylval.number=CPU_CLUSTER; return(BUS);}
YY_BREAK
case 25:
YY_RULE_SETUP
-{yylval.number=CPU_CLUSTER; return(BUS);}
+{yylval.number=CPU; return(BUS);}
YY_BREAK
case 26:
YY_RULE_SETUP
-{yylval.number=CPU; return(BUS);}
+{yylval.number=DOMAIN; return(BUS);}
YY_BREAK
case 27:
YY_RULE_SETUP
-{yylval.number=DOMAIN; return(BUS);}
+{yylval.number=GENERIC; return(BUS);}
YY_BREAK
case 28:
YY_RULE_SETUP
-{yylval.number=GENERIC; return(BUS);}
+{yylval.number=MMIO; return(BUS);}
YY_BREAK
case 29:
YY_RULE_SETUP
-{yylval.number=MMIO; return(BUS);}
+{yylval.number=SPI; return(BUS);}
YY_BREAK
case 30:
YY_RULE_SETUP
-{yylval.number=SPI; return(BUS);}
+{yylval.number=USB; return(BUS);}
YY_BREAK
case 31:
YY_RULE_SETUP
-{yylval.number=USB; return(BUS);}
+{yylval.number=GPIO; return(BUS);}
YY_BREAK
case 32:
YY_RULE_SETUP
-{yylval.number=GPIO; return(BUS);}
+{yylval.number=MDIO; return(BUS);}
YY_BREAK
case 33:
YY_RULE_SETUP
-{yylval.number=MDIO; return(BUS);}
+{yylval.number=IRQ; return(RESOURCE);}
YY_BREAK
case 34:
YY_RULE_SETUP
-{yylval.number=IRQ; return(RESOURCE);}
+{yylval.number=DRQ; return(RESOURCE);}
YY_BREAK
case 35:
YY_RULE_SETUP
-{yylval.number=DRQ; return(RESOURCE);}
+{yylval.number=IO; return(RESOURCE);}
YY_BREAK
case 36:
YY_RULE_SETUP
-{yylval.number=IO; return(RESOURCE);}
+{return(IOAPIC_IRQ);}
YY_BREAK
case 37:
YY_RULE_SETUP
-{return(IOAPIC_IRQ);}
+{return(INHERIT);}
YY_BREAK
case 38:
YY_RULE_SETUP
-{return(INHERIT);}
+{return(SUBSYSTEMID);}
YY_BREAK
case 39:
YY_RULE_SETUP
-{return(SUBSYSTEMID);}
+{return(END);}
YY_BREAK
case 40:
YY_RULE_SETUP
-{return(END);}
+{return(SLOT_DESC);}
YY_BREAK
case 41:
YY_RULE_SETUP
-{return(SLOT_DESC);}
+{return(SMBIOS_DEV_INFO);}
YY_BREAK
case 42:
YY_RULE_SETUP
-{return(SMBIOS_DEV_INFO);}
+{return(EQUALS);}
YY_BREAK
case 43:
YY_RULE_SETUP
-{return(EQUALS);}
+{return(PIPE);}
YY_BREAK
case 44:
YY_RULE_SETUP
-{return(PIPE);}
+{yylval.string = malloc(yyleng+1); strncpy(yylval.string, yytext, yyleng); yylval.string[yyleng]='\0'; return(NUMBER);}
YY_BREAK
case 45:
YY_RULE_SETUP
@@ -1042,11 +1041,12 @@
YY_BREAK
case 47:
YY_RULE_SETUP
-{yylval.string = malloc(yyleng+1); strncpy(yylval.string, yytext, yyleng); yylval.string[yyleng]='\0'; return(NUMBER);}
+{yylval.string = malloc(yyleng+1); strncpy(yylval.string, yytext, yyleng); yylval.string[yyleng]='\0'; return(PCIINT);}
YY_BREAK
case 48:
+/* rule 48 can match eol */
YY_RULE_SETUP
-{yylval.string = malloc(yyleng+1); strncpy(yylval.string, yytext, yyleng); yylval.string[yyleng]='\0'; return(PCIINT);}
+{yylval.string = malloc(yyleng-1); strncpy(yylval.string, yytext+1, yyleng-2); yylval.string[yyleng-2]='\0'; return(STRING);}
YY_BREAK
case 49:
/* rule 49 can match eol */
@@ -1054,15 +1054,10 @@
{yylval.string = malloc(yyleng-1); strncpy(yylval.string, yytext+1, yyleng-2); yylval.string[yyleng-2]='\0'; return(STRING);}
YY_BREAK
case 50:
-/* rule 50 can match eol */
-YY_RULE_SETUP
-{yylval.string = malloc(yyleng-1); strncpy(yylval.string, yytext+1, yyleng-2); yylval.string[yyleng-2]='\0'; return(STRING);}
- YY_BREAK
-case 51:
YY_RULE_SETUP
{yylval.string = malloc(yyleng+1); strncpy(yylval.string, yytext, yyleng); yylval.string[yyleng]='\0'; return(STRING);}
YY_BREAK
-case 52:
+case 51:
YY_RULE_SETUP
ECHO;
YY_BREAK
@@ -1362,7 +1357,7 @@
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 >= 214 )
+ if ( yy_current_state >= 209 )
yy_c = yy_meta[yy_c];
}
yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
@@ -1390,11 +1385,11 @@
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 >= 214 )
+ if ( yy_current_state >= 209 )
yy_c = yy_meta[yy_c];
}
yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
- yy_is_jam = (yy_current_state == 213);
+ yy_is_jam = (yy_current_state == 208);
return yy_is_jam ? 0 : yy_current_state;
}
diff --git a/util/sconfig/main.c b/util/sconfig/main.c
index 5069dc1..a532dd4 100644
--- a/util/sconfig/main.c
+++ b/util/sconfig/main.c
@@ -869,10 +869,6 @@
new_d->path = ".type=DEVICE_PATH_I2C,{.i2c={ .device = 0x%x, .mode_10bit = %d }}";
break;
- case APIC:
- new_d->path = ".type=DEVICE_PATH_APIC,{.apic={ .apic_id = 0x%x }}";
- break;
-
case CPU_CLUSTER:
new_d->path = ".type=DEVICE_PATH_CPU_CLUSTER,{.cpu_cluster={ .cluster = 0x%x }}";
break;
diff --git a/util/sconfig/sconfig.l b/util/sconfig/sconfig.l
index 4b880cf7..f18fb0e 100644
--- a/util/sconfig/sconfig.l
+++ b/util/sconfig/sconfig.l
@@ -31,7 +31,6 @@
ioapic {yylval.number=IOAPIC; return(BUS);}
pnp {yylval.number=PNP; return(BUS);}
i2c {yylval.number=I2C; return(BUS);}
-lapic {yylval.number=APIC; return(BUS);}
cpu_cluster {yylval.number=CPU_CLUSTER; return(BUS);}
cpu {yylval.number=CPU; return(BUS);}
domain {yylval.number=DOMAIN; return(BUS);}
diff --git a/util/sconfig/sconfig.tab.c_shipped b/util/sconfig/sconfig.tab.c_shipped
index 6bc0e02..dc09332 100644
--- a/util/sconfig/sconfig.tab.c_shipped
+++ b/util/sconfig/sconfig.tab.c_shipped
@@ -131,66 +131,65 @@
YYSYMBOL_PCI = 18, /* PCI */
YYSYMBOL_PNP = 19, /* PNP */
YYSYMBOL_I2C = 20, /* I2C */
- YYSYMBOL_APIC = 21, /* APIC */
- YYSYMBOL_CPU_CLUSTER = 22, /* CPU_CLUSTER */
- YYSYMBOL_CPU = 23, /* CPU */
- YYSYMBOL_DOMAIN = 24, /* DOMAIN */
- YYSYMBOL_IRQ = 25, /* IRQ */
- YYSYMBOL_DRQ = 26, /* DRQ */
- YYSYMBOL_SLOT_DESC = 27, /* SLOT_DESC */
- YYSYMBOL_SMBIOS_DEV_INFO = 28, /* SMBIOS_DEV_INFO */
- YYSYMBOL_IO = 29, /* IO */
- YYSYMBOL_NUMBER = 30, /* NUMBER */
- YYSYMBOL_SUBSYSTEMID = 31, /* SUBSYSTEMID */
- YYSYMBOL_INHERIT = 32, /* INHERIT */
- YYSYMBOL_IOAPIC_IRQ = 33, /* IOAPIC_IRQ */
- YYSYMBOL_IOAPIC = 34, /* IOAPIC */
- YYSYMBOL_PCIINT = 35, /* PCIINT */
- YYSYMBOL_GENERIC = 36, /* GENERIC */
- YYSYMBOL_SPI = 37, /* SPI */
- YYSYMBOL_USB = 38, /* USB */
- YYSYMBOL_MMIO = 39, /* MMIO */
- YYSYMBOL_GPIO = 40, /* GPIO */
- YYSYMBOL_MDIO = 41, /* MDIO */
- YYSYMBOL_FW_CONFIG_TABLE = 42, /* FW_CONFIG_TABLE */
- YYSYMBOL_FW_CONFIG_FIELD = 43, /* FW_CONFIG_FIELD */
- YYSYMBOL_FW_CONFIG_OPTION = 44, /* FW_CONFIG_OPTION */
- YYSYMBOL_FW_CONFIG_PROBE = 45, /* FW_CONFIG_PROBE */
- YYSYMBOL_PIPE = 46, /* PIPE */
- YYSYMBOL_OPS = 47, /* OPS */
- YYSYMBOL_YYACCEPT = 48, /* $accept */
- YYSYMBOL_devtree = 49, /* devtree */
- YYSYMBOL_chipchild_nondev = 50, /* chipchild_nondev */
- YYSYMBOL_chipchild = 51, /* chipchild */
- YYSYMBOL_chipchildren = 52, /* chipchildren */
- YYSYMBOL_chipchildren_dev = 53, /* chipchildren_dev */
- YYSYMBOL_devicechildren = 54, /* devicechildren */
- YYSYMBOL_chip = 55, /* chip */
- YYSYMBOL_56_1 = 56, /* @1 */
- YYSYMBOL_device = 57, /* device */
- YYSYMBOL_58_2 = 58, /* @2 */
- YYSYMBOL_59_3 = 59, /* @3 */
- YYSYMBOL_alias = 60, /* alias */
- YYSYMBOL_status = 61, /* status */
- YYSYMBOL_resource = 62, /* resource */
- YYSYMBOL_reference = 63, /* reference */
- YYSYMBOL_registers = 64, /* registers */
- YYSYMBOL_subsystemid = 65, /* subsystemid */
- YYSYMBOL_ioapic_irq = 66, /* ioapic_irq */
- YYSYMBOL_smbios_slot_desc = 67, /* smbios_slot_desc */
- YYSYMBOL_smbios_dev_info = 68, /* smbios_dev_info */
- YYSYMBOL_fw_config_table = 69, /* fw_config_table */
- YYSYMBOL_fw_config_table_children = 70, /* fw_config_table_children */
- YYSYMBOL_fw_config_field_children = 71, /* fw_config_field_children */
- YYSYMBOL_fw_config_field_bits = 72, /* fw_config_field_bits */
- YYSYMBOL_fw_config_field_bits_repeating = 73, /* fw_config_field_bits_repeating */
- YYSYMBOL_fw_config_field = 74, /* fw_config_field */
- YYSYMBOL_75_4 = 75, /* $@4 */
- YYSYMBOL_76_5 = 76, /* $@5 */
- YYSYMBOL_77_6 = 77, /* $@6 */
- YYSYMBOL_fw_config_option = 78, /* fw_config_option */
- YYSYMBOL_fw_config_probe = 79, /* fw_config_probe */
- YYSYMBOL_ops = 80 /* ops */
+ YYSYMBOL_CPU_CLUSTER = 21, /* CPU_CLUSTER */
+ YYSYMBOL_CPU = 22, /* CPU */
+ YYSYMBOL_DOMAIN = 23, /* DOMAIN */
+ YYSYMBOL_IRQ = 24, /* IRQ */
+ YYSYMBOL_DRQ = 25, /* DRQ */
+ YYSYMBOL_SLOT_DESC = 26, /* SLOT_DESC */
+ YYSYMBOL_SMBIOS_DEV_INFO = 27, /* SMBIOS_DEV_INFO */
+ YYSYMBOL_IO = 28, /* IO */
+ YYSYMBOL_NUMBER = 29, /* NUMBER */
+ YYSYMBOL_SUBSYSTEMID = 30, /* SUBSYSTEMID */
+ YYSYMBOL_INHERIT = 31, /* INHERIT */
+ YYSYMBOL_IOAPIC_IRQ = 32, /* IOAPIC_IRQ */
+ YYSYMBOL_IOAPIC = 33, /* IOAPIC */
+ YYSYMBOL_PCIINT = 34, /* PCIINT */
+ YYSYMBOL_GENERIC = 35, /* GENERIC */
+ YYSYMBOL_SPI = 36, /* SPI */
+ YYSYMBOL_USB = 37, /* USB */
+ YYSYMBOL_MMIO = 38, /* MMIO */
+ YYSYMBOL_GPIO = 39, /* GPIO */
+ YYSYMBOL_MDIO = 40, /* MDIO */
+ YYSYMBOL_FW_CONFIG_TABLE = 41, /* FW_CONFIG_TABLE */
+ YYSYMBOL_FW_CONFIG_FIELD = 42, /* FW_CONFIG_FIELD */
+ YYSYMBOL_FW_CONFIG_OPTION = 43, /* FW_CONFIG_OPTION */
+ YYSYMBOL_FW_CONFIG_PROBE = 44, /* FW_CONFIG_PROBE */
+ YYSYMBOL_PIPE = 45, /* PIPE */
+ YYSYMBOL_OPS = 46, /* OPS */
+ YYSYMBOL_YYACCEPT = 47, /* $accept */
+ YYSYMBOL_devtree = 48, /* devtree */
+ YYSYMBOL_chipchild_nondev = 49, /* chipchild_nondev */
+ YYSYMBOL_chipchild = 50, /* chipchild */
+ YYSYMBOL_chipchildren = 51, /* chipchildren */
+ YYSYMBOL_chipchildren_dev = 52, /* chipchildren_dev */
+ YYSYMBOL_devicechildren = 53, /* devicechildren */
+ YYSYMBOL_chip = 54, /* chip */
+ YYSYMBOL_55_1 = 55, /* @1 */
+ YYSYMBOL_device = 56, /* device */
+ YYSYMBOL_57_2 = 57, /* @2 */
+ YYSYMBOL_58_3 = 58, /* @3 */
+ YYSYMBOL_alias = 59, /* alias */
+ YYSYMBOL_status = 60, /* status */
+ YYSYMBOL_resource = 61, /* resource */
+ YYSYMBOL_reference = 62, /* reference */
+ YYSYMBOL_registers = 63, /* registers */
+ YYSYMBOL_subsystemid = 64, /* subsystemid */
+ YYSYMBOL_ioapic_irq = 65, /* ioapic_irq */
+ YYSYMBOL_smbios_slot_desc = 66, /* smbios_slot_desc */
+ YYSYMBOL_smbios_dev_info = 67, /* smbios_dev_info */
+ YYSYMBOL_fw_config_table = 68, /* fw_config_table */
+ YYSYMBOL_fw_config_table_children = 69, /* fw_config_table_children */
+ YYSYMBOL_fw_config_field_children = 70, /* fw_config_field_children */
+ YYSYMBOL_fw_config_field_bits = 71, /* fw_config_field_bits */
+ YYSYMBOL_fw_config_field_bits_repeating = 72, /* fw_config_field_bits_repeating */
+ YYSYMBOL_fw_config_field = 73, /* fw_config_field */
+ YYSYMBOL_74_4 = 74, /* $@4 */
+ YYSYMBOL_75_5 = 75, /* $@5 */
+ YYSYMBOL_76_6 = 76, /* $@6 */
+ YYSYMBOL_fw_config_option = 77, /* fw_config_option */
+ YYSYMBOL_fw_config_probe = 78, /* fw_config_probe */
+ YYSYMBOL_ops = 79 /* ops */
};
typedef enum yysymbol_kind_t yysymbol_kind_t;
@@ -518,10 +517,10 @@
/* YYFINAL -- State number of the termination state. */
#define YYFINAL 2
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 109
+#define YYLAST 113
/* YYNTOKENS -- Number of terminals. */
-#define YYNTOKENS 48
+#define YYNTOKENS 47
/* YYNNTS -- Number of nonterminals. */
#define YYNNTS 33
/* YYNRULES -- Number of rules. */
@@ -530,7 +529,7 @@
#define YYNSTATES 108
/* YYMAXUTOK -- Last valid token kind. */
-#define YYMAXUTOK 302
+#define YYMAXUTOK 301
/* YYTRANSLATE(TOKEN-NUM) -- Symbol number corresponding to TOKEN-NUM
@@ -574,7 +573,7 @@
15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
- 45, 46, 47
+ 45, 46
};
#if YYDEBUG
@@ -606,8 +605,8 @@
"\"end of file\"", "error", "\"invalid token\"", "CHIP", "DEVICE",
"REGISTER", "ALIAS", "REFERENCE", "ASSOCIATION", "BOOL", "STATUS",
"MANDATORY", "BUS", "RESOURCE", "END", "EQUALS", "HEX", "STRING", "PCI",
- "PNP", "I2C", "APIC", "CPU_CLUSTER", "CPU", "DOMAIN", "IRQ", "DRQ",
- "SLOT_DESC", "SMBIOS_DEV_INFO", "IO", "NUMBER", "SUBSYSTEMID", "INHERIT",
+ "PNP", "I2C", "CPU_CLUSTER", "CPU", "DOMAIN", "IRQ", "DRQ", "SLOT_DESC",
+ "SMBIOS_DEV_INFO", "IO", "NUMBER", "SUBSYSTEMID", "INHERIT",
"IOAPIC_IRQ", "IOAPIC", "PCIINT", "GENERIC", "SPI", "USB", "MMIO",
"GPIO", "MDIO", "FW_CONFIG_TABLE", "FW_CONFIG_FIELD", "FW_CONFIG_OPTION",
"FW_CONFIG_PROBE", "PIPE", "OPS", "$accept", "devtree",
@@ -642,17 +641,17 @@
STATE-NUM. */
static const yytype_int8 yypact[] =
{
- -49, 8, -49, 2, -49, -49, -49, -49, -4, 39,
- -49, 3, -49, 5, 4, 12, 39, 16, -49, -49,
- -49, -49, 11, 34, 23, 7, 47, -49, -49, 39,
- 26, 13, -49, 6, 51, 41, 44, -49, -49, -49,
- -49, -49, 32, -49, -12, -49, -49, -49, 46, 6,
- -49, -49, -8, 26, 13, -49, -49, 50, -49, -49,
- -49, -49, -49, -49, -7, 40, 0, -49, -49, -49,
- 42, -49, 52, 43, 45, 48, 54, 57, -49, -49,
- -49, -49, -49, -49, -49, -49, -49, -49, 21, 49,
- 59, 60, 53, 55, 62, -49, -49, 56, 63, -49,
- 61, 58, -49, -49, 64, -49, -49, -49
+ -49, 6, -49, 8, -49, -49, -49, -49, 1, 45,
+ -49, 18, -49, 12, 24, 25, 45, 3, -49, -49,
+ -49, -49, -6, 37, 26, 41, 49, -49, -49, 45,
+ 29, 14, -49, 19, 55, 46, 47, -49, -49, -49,
+ -49, -49, 33, -49, -12, -49, -49, -49, 50, 19,
+ -49, -49, -7, 29, 14, -49, -49, 51, -49, -49,
+ -49, -49, -49, -49, 2, 40, 0, -49, -49, -49,
+ 42, -49, 53, 43, 44, 48, 57, 58, -49, -49,
+ -49, -49, -49, -49, -49, -49, -49, -49, 7, 61,
+ 62, 63, 52, 32, 65, -49, -49, 54, 67, -49,
+ 59, 56, -49, -49, 69, -49, -49, -49
};
/* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
@@ -676,9 +675,9 @@
/* YYPGOTO[NTERM-NUM]. */
static const yytype_int8 yypgoto[] =
{
- -49, -49, 65, -49, -49, 66, 17, -1, -49, -28,
- -49, -49, -49, 36, -49, -49, -48, -49, -49, -49,
- -49, -49, -49, -32, 67, 35, -49, -49, -49, -49,
+ -49, -49, 60, -49, -49, 72, 11, -1, -49, -28,
+ -49, -49, -49, 64, -49, -49, -48, -49, -49, -49,
+ -49, -49, -49, -33, 66, 38, -49, -49, -49, -49,
-49, -49, -49
};
@@ -696,61 +695,63 @@
number is the opposite. If YYTABLE_NINF, syntax error. */
static const yytype_int8 yytable[] =
{
- 5, 39, 56, 3, 13, 14, 62, 68, 2, 52,
- 10, 3, 23, 70, 71, 45, 46, 24, 81, 7,
- 22, 25, 35, 64, 3, 13, 14, 72, 73, 26,
- 28, 74, 57, 75, 70, 96, 57, 57, 79, 11,
- 81, 30, 3, 13, 14, 76, 15, 77, 72, 73,
- 4, 33, 74, 34, 75, 36, 40, 48, 50, 42,
- 79, 51, 53, 60, 97, 78, 76, 65, 77, 90,
- 69, 94, 89, 91, 95, 92, 98, 99, 93, 102,
- 104, 107, 27, 100, 88, 61, 103, 78, 106, 63,
- 101, 0, 0, 105, 37, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 54
+ 5, 39, 56, 3, 13, 14, 2, 62, 52, 3,
+ 3, 13, 14, 70, 71, 10, 68, 28, 81, 23,
+ 70, 96, 64, 30, 24, 7, 72, 73, 45, 46,
+ 74, 57, 75, 72, 73, 22, 57, 74, 79, 75,
+ 81, 25, 26, 11, 76, 57, 77, 4, 3, 13,
+ 14, 76, 15, 77, 33, 34, 35, 36, 40, 42,
+ 79, 48, 53, 50, 51, 78, 101, 60, 65, 69,
+ 90, 89, 91, 92, 94, 95, 97, 93, 88, 98,
+ 99, 100, 102, 103, 104, 106, 107, 78, 27, 37,
+ 105, 0, 63, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 54, 0,
+ 0, 0, 0, 61
};
static const yytype_int8 yycheck[] =
{
- 1, 29, 14, 3, 4, 5, 14, 14, 0, 41,
- 14, 3, 7, 13, 14, 9, 10, 12, 66, 17,
- 17, 17, 15, 55, 3, 4, 5, 27, 28, 17,
- 14, 31, 44, 33, 13, 14, 44, 44, 66, 43,
- 88, 30, 3, 4, 5, 45, 7, 47, 27, 28,
- 42, 17, 31, 30, 33, 8, 30, 6, 17, 46,
- 88, 17, 30, 17, 15, 66, 45, 17, 47, 17,
- 30, 17, 30, 30, 17, 30, 17, 17, 30, 17,
- 17, 17, 16, 30, 67, 49, 30, 88, 30, 54,
- 35, -1, -1, 32, 29, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 42
+ 1, 29, 14, 3, 4, 5, 0, 14, 41, 3,
+ 3, 4, 5, 13, 14, 14, 14, 14, 66, 7,
+ 13, 14, 55, 29, 12, 17, 26, 27, 9, 10,
+ 30, 43, 32, 26, 27, 17, 43, 30, 66, 32,
+ 88, 17, 17, 42, 44, 43, 46, 41, 3, 4,
+ 5, 44, 7, 46, 17, 29, 15, 8, 29, 45,
+ 88, 6, 29, 17, 17, 66, 34, 17, 17, 29,
+ 17, 29, 29, 29, 17, 17, 15, 29, 67, 17,
+ 17, 29, 17, 29, 17, 29, 17, 88, 16, 29,
+ 31, -1, 54, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 42, -1,
+ -1, -1, -1, 49
};
/* YYSTOS[STATE-NUM] -- The symbol kind of the accessing symbol of
state STATE-NUM. */
static const yytype_int8 yystos[] =
{
- 0, 49, 0, 3, 42, 55, 69, 17, 70, 56,
- 14, 43, 74, 4, 5, 7, 50, 53, 55, 57,
- 63, 64, 17, 7, 12, 17, 17, 53, 14, 52,
- 30, 72, 77, 17, 30, 15, 8, 50, 51, 57,
- 30, 76, 46, 73, 71, 9, 10, 61, 6, 60,
- 17, 17, 71, 30, 72, 75, 14, 44, 78, 59,
- 17, 61, 14, 73, 71, 17, 54, 58, 14, 30,
- 13, 14, 27, 28, 31, 33, 45, 47, 55, 57,
- 62, 64, 65, 66, 67, 68, 79, 80, 54, 30,
- 17, 30, 30, 30, 17, 17, 14, 15, 17, 17,
- 30, 35, 17, 30, 17, 32, 30, 17
+ 0, 48, 0, 3, 41, 54, 68, 17, 69, 55,
+ 14, 42, 73, 4, 5, 7, 49, 52, 54, 56,
+ 62, 63, 17, 7, 12, 17, 17, 52, 14, 51,
+ 29, 71, 76, 17, 29, 15, 8, 49, 50, 56,
+ 29, 75, 45, 72, 70, 9, 10, 60, 6, 59,
+ 17, 17, 70, 29, 71, 74, 14, 43, 77, 58,
+ 17, 60, 14, 72, 70, 17, 53, 57, 14, 29,
+ 13, 14, 26, 27, 30, 32, 44, 46, 54, 56,
+ 61, 63, 64, 65, 66, 67, 78, 79, 53, 29,
+ 17, 29, 29, 29, 17, 17, 14, 15, 17, 17,
+ 29, 34, 17, 29, 17, 31, 29, 17
};
/* YYR1[RULE-NUM] -- Symbol kind of the left-hand side of rule RULE-NUM. */
static const yytype_int8 yyr1[] =
{
- 0, 48, 49, 49, 49, 50, 50, 50, 51, 51,
- 52, 52, 53, 53, 54, 54, 54, 54, 54, 54,
- 54, 54, 54, 54, 54, 56, 55, 58, 57, 59,
- 57, 60, 60, 61, 61, 62, 63, 64, 65, 65,
- 66, 67, 67, 67, 68, 68, 69, 70, 70, 71,
- 71, 72, 73, 73, 75, 74, 76, 74, 77, 74,
- 78, 79, 80
+ 0, 47, 48, 48, 48, 49, 49, 49, 50, 50,
+ 51, 51, 52, 52, 53, 53, 53, 53, 53, 53,
+ 53, 53, 53, 53, 53, 55, 54, 57, 56, 58,
+ 56, 59, 59, 60, 60, 61, 62, 63, 64, 64,
+ 65, 66, 66, 66, 67, 67, 68, 69, 69, 70,
+ 70, 71, 72, 72, 74, 73, 75, 73, 76, 73,
+ 77, 78, 79
};
/* YYR2[RULE-NUM] -- Number of symbols on the right-hand side of rule RULE-NUM. */
diff --git a/util/sconfig/sconfig.tab.h_shipped b/util/sconfig/sconfig.tab.h_shipped
index 6996a237..2149db6 100644
--- a/util/sconfig/sconfig.tab.h_shipped
+++ b/util/sconfig/sconfig.tab.h_shipped
@@ -35,8 +35,8 @@
especially those whose name start with YY_ or yy_. They are
private implementation details that can be changed or removed. */
-#ifndef YY_YY_HOME_WERNER_COREBOOT_UTIL_SCONFIG_SCONFIG_TAB_H_SHIPPED_INCLUDED
-# define YY_YY_HOME_WERNER_COREBOOT_UTIL_SCONFIG_SCONFIG_TAB_H_SHIPPED_INCLUDED
+#ifndef YY_YY_HOME_ARTHUR_SRC_COREBOOT_UTIL_SCONFIG_SCONFIG_TAB_H_SHIPPED_INCLUDED
+# define YY_YY_HOME_ARTHUR_SRC_COREBOOT_UTIL_SCONFIG_SCONFIG_TAB_H_SHIPPED_INCLUDED
/* Debug traces. */
#ifndef YYDEBUG
# define YYDEBUG 0
@@ -72,33 +72,32 @@
PCI = 273, /* PCI */
PNP = 274, /* PNP */
I2C = 275, /* I2C */
- APIC = 276, /* APIC */
- CPU_CLUSTER = 277, /* CPU_CLUSTER */
- CPU = 278, /* CPU */
- DOMAIN = 279, /* DOMAIN */
- IRQ = 280, /* IRQ */
- DRQ = 281, /* DRQ */
- SLOT_DESC = 282, /* SLOT_DESC */
- SMBIOS_DEV_INFO = 283, /* SMBIOS_DEV_INFO */
- IO = 284, /* IO */
- NUMBER = 285, /* NUMBER */
- SUBSYSTEMID = 286, /* SUBSYSTEMID */
- INHERIT = 287, /* INHERIT */
- IOAPIC_IRQ = 288, /* IOAPIC_IRQ */
- IOAPIC = 289, /* IOAPIC */
- PCIINT = 290, /* PCIINT */
- GENERIC = 291, /* GENERIC */
- SPI = 292, /* SPI */
- USB = 293, /* USB */
- MMIO = 294, /* MMIO */
- GPIO = 295, /* GPIO */
- MDIO = 296, /* MDIO */
- FW_CONFIG_TABLE = 297, /* FW_CONFIG_TABLE */
- FW_CONFIG_FIELD = 298, /* FW_CONFIG_FIELD */
- FW_CONFIG_OPTION = 299, /* FW_CONFIG_OPTION */
- FW_CONFIG_PROBE = 300, /* FW_CONFIG_PROBE */
- PIPE = 301, /* PIPE */
- OPS = 302 /* OPS */
+ CPU_CLUSTER = 276, /* CPU_CLUSTER */
+ CPU = 277, /* CPU */
+ DOMAIN = 278, /* DOMAIN */
+ IRQ = 279, /* IRQ */
+ DRQ = 280, /* DRQ */
+ SLOT_DESC = 281, /* SLOT_DESC */
+ SMBIOS_DEV_INFO = 282, /* SMBIOS_DEV_INFO */
+ IO = 283, /* IO */
+ NUMBER = 284, /* NUMBER */
+ SUBSYSTEMID = 285, /* SUBSYSTEMID */
+ INHERIT = 286, /* INHERIT */
+ IOAPIC_IRQ = 287, /* IOAPIC_IRQ */
+ IOAPIC = 288, /* IOAPIC */
+ PCIINT = 289, /* PCIINT */
+ GENERIC = 290, /* GENERIC */
+ SPI = 291, /* SPI */
+ USB = 292, /* USB */
+ MMIO = 293, /* MMIO */
+ GPIO = 294, /* GPIO */
+ MDIO = 295, /* MDIO */
+ FW_CONFIG_TABLE = 296, /* FW_CONFIG_TABLE */
+ FW_CONFIG_FIELD = 297, /* FW_CONFIG_FIELD */
+ FW_CONFIG_OPTION = 298, /* FW_CONFIG_OPTION */
+ FW_CONFIG_PROBE = 299, /* FW_CONFIG_PROBE */
+ PIPE = 300, /* PIPE */
+ OPS = 301 /* OPS */
};
typedef enum yytokentype yytoken_kind_t;
#endif
@@ -127,4 +126,4 @@
int yyparse (void);
-#endif /* !YY_YY_HOME_WERNER_COREBOOT_UTIL_SCONFIG_SCONFIG_TAB_H_SHIPPED_INCLUDED */
+#endif /* !YY_YY_HOME_ARTHUR_SRC_COREBOOT_UTIL_SCONFIG_SCONFIG_TAB_H_SHIPPED_INCLUDED */
diff --git a/util/sconfig/sconfig.y b/util/sconfig/sconfig.y
index 35e1e5e..4f6ef87 100644
--- a/util/sconfig/sconfig.y
+++ b/util/sconfig/sconfig.y
@@ -21,7 +21,7 @@
uint64_t number;
}
-%token CHIP DEVICE REGISTER ALIAS REFERENCE ASSOCIATION BOOL STATUS MANDATORY BUS RESOURCE END EQUALS HEX STRING PCI PNP I2C APIC CPU_CLUSTER CPU DOMAIN IRQ DRQ SLOT_DESC SMBIOS_DEV_INFO IO NUMBER SUBSYSTEMID INHERIT IOAPIC_IRQ IOAPIC PCIINT GENERIC SPI USB MMIO GPIO MDIO FW_CONFIG_TABLE FW_CONFIG_FIELD FW_CONFIG_OPTION FW_CONFIG_PROBE PIPE OPS
+%token CHIP DEVICE REGISTER ALIAS REFERENCE ASSOCIATION BOOL STATUS MANDATORY BUS RESOURCE END EQUALS HEX STRING PCI PNP I2C CPU_CLUSTER CPU DOMAIN IRQ DRQ SLOT_DESC SMBIOS_DEV_INFO IO NUMBER SUBSYSTEMID INHERIT IOAPIC_IRQ IOAPIC PCIINT GENERIC SPI USB MMIO GPIO MDIO FW_CONFIG_TABLE FW_CONFIG_FIELD FW_CONFIG_OPTION FW_CONFIG_PROBE PIPE OPS
%%
devtree: { cur_parent = root_parent; } | devtree chip | devtree fw_config_table;