Attention is currently required from: Martin L Roth.
Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/69378 )
Change subject: util/sconfig: Remove lapic devices from devicetree parsers ......................................................................
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 --- M util/sconfig/lex.yy.c_shipped M util/sconfig/main.c M util/sconfig/sconfig.l M util/sconfig/sconfig.tab.c_shipped M util/sconfig/sconfig.tab.h_shipped M util/sconfig/sconfig.y 6 files changed, 321 insertions(+), 319 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/78/69378/1
diff --git a/util/sconfig/lex.yy.c_shipped b/util/sconfig/lex.yy.c_shipped index 3e2bb15..a6c5afa 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 51 -#define YY_END_OF_BUFFER 52 +#define YY_NUM_RULES 50 +#define YY_END_OF_BUFFER 51 /* This struct is not used in this scanner, but its presence is necessary. */ struct yy_trans_info @@ -358,31 +358,31 @@ flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static const flex_int16_t yy_accept[211] = +static const flex_int16_t yy_accept[206] = { 0, - 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, 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, 26, 50, 50, 34, 39, 50, 50, 50, - 50, 50, 23, 50, 50, 33, 50, 50, 50, 17, + 0, 0, 51, 49, 1, 3, 49, 49, 49, 44, + 44, 41, 45, 49, 45, 45, 45, 45, 45, 49, + 49, 49, 49, 49, 49, 49, 49, 49, 42, 49, + 1, 3, 49, 0, 49, 49, 0, 2, 44, 45, + 49, 49, 49, 10, 49, 49, 45, 49, 49, 49, + 49, 49, 49, 49, 49, 49, 49, 34, 49, 49, + 49, 49, 16, 49, 49, 49, 49, 49, 49, 49, + 49, 49, 48, 48, 49, 0, 43, 49, 49, 49, + 25, 49, 49, 33, 38, 49, 49, 49, 49, 49, + 23, 49, 49, 32, 49, 49, 17, 7, 49, 20,
- 7, 50, 20, 22, 50, 9, 50, 50, 30, 50, - 31, 8, 50, 0, 47, 50, 4, 50, 50, 50, - 50, 50, 50, 32, 50, 50, 50, 50, 50, 29, - 50, 50, 50, 50, 50, 48, 48, 6, 50, 50, - 50, 13, 50, 50, 50, 50, 50, 24, 50, 50, - 15, 50, 50, 50, 50, 5, 27, 50, 50, 18, - 50, 21, 50, 14, 50, 50, 50, 50, 50, 28, - 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, 25, 50, 50, 38, + 22, 49, 9, 49, 49, 29, 49, 30, 8, 49, + 0, 46, 49, 4, 49, 49, 49, 49, 49, 49, + 31, 49, 49, 49, 49, 28, 49, 49, 49, 49, + 49, 47, 47, 6, 49, 49, 49, 13, 49, 49, + 49, 49, 49, 49, 49, 15, 49, 49, 49, 49, + 5, 26, 49, 49, 18, 49, 21, 49, 14, 49, + 49, 49, 49, 49, 27, 36, 49, 49, 49, 49, + 49, 49, 49, 49, 49, 11, 49, 49, 49, 49, + 12, 49, 19, 49, 49, 49, 49, 35, 49, 49, + 49, 24, 49, 49, 37, 49, 49, 49, 49, 49,
- 50, 50, 50, 50, 50, 50, 41, 50, 40, 0 + 49, 40, 49, 39, 0 } ;
static const YY_CHAR yy_ec[256] = @@ -425,140 +425,138 @@ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 } ;
-static const flex_int16_t yy_base[218] = +static const flex_int16_t yy_base[213] = { 0, - 0, 0, 283, 0, 280, 284, 278, 39, 43, 40, - 242, 0, 46, 265, 56, 60, 64, 67, 72, 56, - 253, 74, 260, 39, 70, 59, 255, 77, 242, 0, - 0, 272, 284, 108, 268, 112, 116, 269, 284, 0, - 113, 116, 256, 245, 0, 244, 233, 122, 240, 235, - 245, 243, 247, 234, 236, 240, 240, 234, 240, 225, - 225, 226, 228, 230, 0, 106, 226, 220, 220, 119, - 230, 222, 228, 87, 0, 284, 141, 240, 0, 233, - 226, 212, 225, 215, 222, 0, 0, 212, 218, 215, - 206, 214, 0, 212, 202, 0, 206, 210, 200, 0, + 0, 0, 279, 0, 276, 280, 274, 39, 43, 40, + 238, 0, 46, 261, 56, 60, 64, 67, 72, 56, + 249, 74, 39, 70, 59, 252, 77, 239, 0, 0, + 269, 280, 108, 265, 112, 116, 266, 280, 0, 113, + 116, 253, 242, 0, 241, 230, 122, 237, 232, 242, + 240, 244, 231, 233, 237, 237, 231, 237, 222, 224, + 226, 228, 0, 106, 224, 218, 218, 119, 228, 220, + 226, 87, 0, 280, 141, 238, 0, 231, 224, 210, + 223, 213, 220, 0, 0, 210, 216, 213, 204, 212, + 0, 210, 200, 0, 209, 199, 0, 0, 202, 0,
- 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, 192, 193, 0, - 180, 187, 174, 177, 166, 0, 284, 0, 178, 182, - 174, 0, 173, 175, 171, 173, 178, 0, 162, 167, - 0, 160, 160, 159, 156, 0, 0, 168, 170, 0, - 154, 171, 157, 0, 164, 168, 149, 149, 156, 0, - 0, 155, 147, 146, 68, 156, 142, 152, 142, 134, - 0, 151, 145, 130, 135, 0, 124, 0, 118, 124, - 127, 119, 0, 134, 115, 128, 0, 122, 129, 0, + 0, 208, 0, 200, 199, 0, 190, 0, 0, 217, + 216, 0, 187, 0, 200, 199, 192, 196, 186, 182, + 0, 192, 180, 186, 193, 0, 180, 187, 174, 177, + 166, 0, 280, 0, 178, 182, 174, 0, 173, 175, + 171, 173, 178, 162, 167, 0, 160, 160, 159, 156, + 0, 0, 168, 170, 0, 154, 171, 157, 0, 164, + 168, 149, 149, 156, 0, 0, 155, 147, 146, 68, + 156, 142, 152, 142, 134, 0, 151, 145, 130, 135, + 0, 124, 0, 118, 124, 127, 119, 0, 134, 115, + 128, 0, 122, 129, 0, 104, 106, 94, 78, 65,
- 104, 106, 94, 78, 65, 37, 0, 31, 0, 284, - 42, 158, 160, 162, 164, 166, 168 + 37, 0, 31, 0, 280, 42, 158, 160, 162, 164, + 166, 168 } ;
-static const flex_int16_t yy_def[218] = +static const flex_int16_t yy_def[213] = { 0, - 210, 1, 210, 211, 210, 210, 211, 212, 213, 211, - 10, 211, 10, 211, 10, 10, 10, 10, 10, 211, - 211, 211, 211, 211, 211, 211, 211, 211, 211, 211, - 211, 210, 210, 212, 214, 215, 213, 216, 210, 10, - 10, 10, 211, 211, 211, 211, 211, 10, 211, 211, - 211, 211, 211, 211, 211, 211, 211, 211, 211, 211, - 211, 211, 211, 211, 211, 211, 211, 211, 211, 211, - 211, 211, 211, 211, 211, 210, 215, 217, 42, 211, - 211, 211, 211, 211, 211, 211, 211, 211, 211, 211, - 211, 211, 211, 211, 211, 211, 211, 211, 211, 211, + 205, 1, 205, 206, 205, 205, 206, 207, 208, 206, + 10, 206, 10, 206, 10, 10, 10, 10, 10, 206, + 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, + 205, 205, 207, 209, 210, 208, 211, 205, 10, 10, + 10, 206, 206, 206, 206, 206, 10, 206, 206, 206, + 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, + 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, + 206, 206, 206, 205, 210, 212, 41, 206, 206, 206, + 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, + 206, 206, 206, 206, 206, 206, 206, 206, 206, 206,
- 211, 211, 211, 211, 211, 211, 211, 211, 211, 211, - 211, 211, 211, 210, 211, 211, 211, 211, 211, 211, - 211, 211, 211, 211, 211, 211, 211, 211, 211, 211, - 211, 211, 211, 211, 211, 211, 210, 211, 211, 211, - 211, 211, 211, 211, 211, 211, 211, 211, 211, 211, - 211, 211, 211, 211, 211, 211, 211, 211, 211, 211, - 211, 211, 211, 211, 211, 211, 211, 211, 211, 211, - 211, 211, 211, 211, 211, 211, 211, 211, 211, 211, - 211, 211, 211, 211, 211, 211, 211, 211, 211, 211, - 211, 211, 211, 211, 211, 211, 211, 211, 211, 211, + 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, + 205, 206, 206, 206, 206, 206, 206, 206, 206, 206, + 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, + 206, 206, 205, 206, 206, 206, 206, 206, 206, 206, + 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, + 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, + 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, + 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, + 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, + 206, 206, 206, 206, 206, 206, 206, 206, 206, 206,
- 211, 211, 211, 211, 211, 211, 211, 211, 211, 0, - 210, 210, 210, 210, 210, 210, 210 + 206, 206, 206, 206, 0, 205, 205, 205, 205, 205, + 205, 205 } ;
-static const flex_int16_t yy_nxt[325] = +static const flex_int16_t yy_nxt[321] = { 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, 31, 36, 38, 39, 40, 40, 40, 209, - 41, 41, 41, 41, 41, 62, 41, 41, 41, 41, - 41, 41, 41, 41, 41, 63, 41, 41, 41, 208, - 41, 41, 41, 41, 41, 41, 54, 67, 41, 41, - 41, 44, 57, 46, 48, 55, 68, 182, 45, 47, - 69, 64, 49, 207, 51, 50, 52, 65, 206, 66, + 18, 19, 20, 21, 22, 4, 23, 4, 24, 25, + 4, 26, 27, 4, 28, 4, 4, 4, 4, 29, + 34, 34, 30, 35, 37, 38, 39, 39, 39, 204, + 40, 40, 40, 40, 40, 60, 40, 40, 40, 40, + 40, 40, 40, 40, 40, 61, 40, 40, 40, 203, + 40, 40, 40, 40, 40, 40, 53, 65, 40, 40, + 40, 43, 56, 45, 47, 54, 66, 177, 44, 46, + 67, 62, 48, 202, 50, 49, 51, 63, 201, 64,
- 183, 58, 59, 71, 111, 60, 72, 112, 53, 35, - 35, 73, 75, 78, 78, 205, 31, 38, 39, 41, - 41, 41, 79, 79, 79, 204, 79, 79, 41, 41, - 41, 203, 79, 79, 79, 79, 79, 79, 101, 102, - 106, 107, 78, 78, 202, 113, 201, 200, 199, 198, - 197, 196, 195, 194, 193, 192, 191, 84, 34, 34, - 37, 37, 35, 35, 77, 77, 38, 38, 78, 78, - 190, 189, 188, 187, 186, 185, 184, 181, 180, 179, - 178, 177, 176, 175, 174, 173, 172, 171, 170, 169, - 168, 167, 166, 165, 164, 163, 162, 161, 160, 159, + 178, 57, 58, 69, 108, 59, 70, 109, 52, 34, + 34, 71, 73, 76, 76, 200, 30, 37, 38, 40, + 40, 40, 77, 77, 77, 199, 77, 77, 40, 40, + 40, 198, 77, 77, 77, 77, 77, 77, 98, 99, + 103, 104, 76, 76, 197, 110, 196, 195, 194, 193, + 192, 191, 190, 189, 188, 187, 186, 82, 33, 33, + 36, 36, 34, 34, 75, 75, 37, 37, 76, 76, + 185, 184, 183, 182, 181, 180, 179, 176, 175, 174, + 173, 172, 171, 170, 169, 168, 167, 166, 165, 164, + 163, 162, 161, 160, 159, 158, 157, 156, 155, 154,
- 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, 115, 114, 110, 109, 108, 105, 104, - 103, 100, 99, 98, 97, 96, 95, 94, 93, 92, - 91, 90, 89, 88, 87, 86, 85, 83, 82, 81, - 80, 39, 76, 32, 74, 70, 61, 56, 43, 42, - 33, 32, 210, 3, 210, 210, 210, 210, 210, 210, - 210, 210, 210, 210, 210, 210, 210, 210, 210, 210, + 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, 112, 111, 107, 106, 105, 102, 101, 100, 97, + 96, 95, 94, 93, 92, 91, 90, 89, 88, 87, + 86, 85, 84, 83, 81, 80, 79, 78, 38, 74, + 31, 72, 68, 55, 42, 41, 32, 31, 205, 3, + 205, 205, 205, 205, 205, 205, 205, 205, 205, 205, + 205, 205, 205, 205, 205, 205, 205, 205, 205, 205,
- 210, 210, 210, 210, 210, 210, 210, 210, 210, 210, - 210, 210, 210, 210, 210, 210, 210, 210, 210, 210, - 210, 210, 210, 210 + 205, 205, 205, 205, 205, 205, 205, 205, 205, 205, + 205, 205, 205, 205, 205, 205, 205, 205, 205, 205 } ;
-static const flex_int16_t yy_chk[325] = +static const flex_int16_t yy_chk[321] = { 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, 211, 8, 9, 9, 10, 10, 10, 208, - 10, 10, 13, 13, 13, 24, 10, 10, 10, 10, - 10, 10, 15, 15, 15, 24, 16, 16, 16, 206, - 17, 17, 17, 18, 18, 18, 20, 26, 19, 19, - 19, 15, 22, 16, 17, 20, 26, 175, 15, 16, - 26, 25, 17, 205, 18, 17, 19, 25, 204, 25, + 8, 8, 206, 8, 9, 9, 10, 10, 10, 203, + 10, 10, 13, 13, 13, 23, 10, 10, 10, 10, + 10, 10, 15, 15, 15, 23, 16, 16, 16, 201, + 17, 17, 17, 18, 18, 18, 20, 25, 19, 19, + 19, 15, 22, 16, 17, 20, 25, 170, 15, 16, + 25, 24, 17, 200, 18, 17, 19, 24, 199, 24,
- 175, 22, 22, 28, 74, 22, 28, 74, 19, 34, - 34, 28, 34, 36, 36, 203, 36, 37, 37, 41, - 41, 41, 42, 42, 42, 202, 42, 42, 48, 48, - 48, 201, 42, 42, 42, 42, 42, 42, 66, 66, - 70, 70, 77, 77, 199, 77, 198, 196, 195, 194, - 192, 191, 190, 189, 187, 185, 184, 48, 212, 212, - 213, 213, 214, 214, 215, 215, 216, 216, 217, 217, - 183, 182, 180, 179, 178, 177, 176, 174, 173, 172, - 169, 168, 167, 166, 165, 163, 162, 161, 159, 158, - 155, 154, 153, 152, 150, 149, 147, 146, 145, 144, + 170, 22, 22, 27, 72, 22, 27, 72, 19, 33, + 33, 27, 33, 35, 35, 198, 35, 36, 36, 40, + 40, 40, 41, 41, 41, 197, 41, 41, 47, 47, + 47, 196, 41, 41, 41, 41, 41, 41, 64, 64, + 68, 68, 75, 75, 194, 75, 193, 191, 190, 189, + 187, 186, 185, 184, 182, 180, 179, 47, 207, 207, + 208, 208, 209, 209, 210, 210, 211, 211, 212, 212, + 178, 177, 175, 174, 173, 172, 171, 169, 168, 167, + 164, 163, 162, 161, 160, 158, 157, 156, 154, 153, + 150, 149, 148, 147, 145, 144, 143, 142, 141, 140,
- 143, 141, 140, 139, 135, 134, 133, 132, 131, 129, - 128, 127, 126, 125, 123, 122, 121, 120, 119, 118, - 116, 114, 113, 110, 108, 107, 105, 102, 99, 98, - 97, 95, 94, 92, 91, 90, 89, 88, 85, 84, - 83, 82, 81, 80, 78, 73, 72, 71, 69, 68, - 67, 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, 210, 210, 210, 210, 210, 210, 210, - 210, 210, 210, 210, 210, 210, 210, 210, 210, 210, + 139, 137, 136, 135, 131, 130, 129, 128, 127, 125, + 124, 123, 122, 120, 119, 118, 117, 116, 115, 113, + 111, 110, 107, 105, 104, 102, 99, 96, 95, 93, + 92, 90, 89, 88, 87, 86, 83, 82, 81, 80, + 79, 78, 76, 71, 70, 69, 67, 66, 65, 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, 205, + 205, 205, 205, 205, 205, 205, 205, 205, 205, 205, + 205, 205, 205, 205, 205, 205, 205, 205, 205, 205,
- 210, 210, 210, 210, 210, 210, 210, 210, 210, 210, - 210, 210, 210, 210, 210, 210, 210, 210, 210, 210, - 210, 210, 210, 210 + 205, 205, 205, 205, 205, 205, 205, 205, 205, 205, + 205, 205, 205, 205, 205, 205, 205, 205, 205, 205 } ;
static yy_state_type yy_last_accepting_state; @@ -823,13 +821,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 >= 211 ) + if ( yy_current_state >= 206 ) 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] != 284 ); + while ( yy_base[yy_current_state] != 280 );
yy_find_action: yy_act = yy_accept[yy_current_state]; @@ -949,83 +947,83 @@ 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=IRQ; return(RESOURCE);} YY_BREAK case 33: YY_RULE_SETUP -{yylval.number=IRQ; return(RESOURCE);} +{yylval.number=DRQ; return(RESOURCE);} YY_BREAK case 34: YY_RULE_SETUP -{yylval.number=DRQ; return(RESOURCE);} +{yylval.number=IO; return(RESOURCE);} YY_BREAK case 35: YY_RULE_SETUP -{yylval.number=IO; return(RESOURCE);} +{return(IOAPIC_IRQ);} YY_BREAK case 36: YY_RULE_SETUP -{return(IOAPIC_IRQ);} +{return(INHERIT);} YY_BREAK case 37: YY_RULE_SETUP -{return(INHERIT);} +{return(SUBSYSTEMID);} YY_BREAK case 38: YY_RULE_SETUP -{return(SUBSYSTEMID);} +{return(END);} YY_BREAK case 39: YY_RULE_SETUP -{return(END);} +{return(SLOT_DESC);} YY_BREAK case 40: YY_RULE_SETUP -{return(SLOT_DESC);} +{return(SMBIOS_DEV_INFO);} YY_BREAK case 41: YY_RULE_SETUP -{return(SMBIOS_DEV_INFO);} +{return(EQUALS);} YY_BREAK case 42: YY_RULE_SETUP -{return(EQUALS);} +{return(PIPE);} YY_BREAK case 43: YY_RULE_SETUP -{return(PIPE);} +{yylval.string = malloc(yyleng+1); strncpy(yylval.string, yytext, yyleng); yylval.string[yyleng]='\0'; return(NUMBER);} YY_BREAK case 44: YY_RULE_SETUP @@ -1037,11 +1035,12 @@ YY_BREAK case 46: 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 47: +/* rule 47 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 48: /* rule 48 can match eol */ @@ -1049,15 +1048,10 @@ {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 */ -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 50: YY_RULE_SETUP {yylval.string = malloc(yyleng+1); strncpy(yylval.string, yytext, yyleng); yylval.string[yyleng]='\0'; return(STRING);} YY_BREAK -case 51: +case 50: YY_RULE_SETUP ECHO; YY_BREAK @@ -1357,7 +1351,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 >= 211 ) + if ( yy_current_state >= 206 ) yy_c = yy_meta[yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; @@ -1385,11 +1379,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 >= 211 ) + if ( yy_current_state >= 206 ) yy_c = yy_meta[yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; - yy_is_jam = (yy_current_state == 210); + yy_is_jam = (yy_current_state == 205);
return yy_is_jam ? 0 : yy_current_state; } diff --git a/util/sconfig/main.c b/util/sconfig/main.c index 0833d38..7ab098b 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 5ff144b..846d226 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 3df31a7..70925f4 100644 --- a/util/sconfig/sconfig.tab.c_shipped +++ b/util/sconfig/sconfig.tab.c_shipped @@ -131,65 +131,64 @@ 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_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 */ + 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_FW_CONFIG_TABLE = 40, /* FW_CONFIG_TABLE */ + YYSYMBOL_FW_CONFIG_FIELD = 41, /* FW_CONFIG_FIELD */ + YYSYMBOL_FW_CONFIG_OPTION = 42, /* FW_CONFIG_OPTION */ + YYSYMBOL_FW_CONFIG_PROBE = 43, /* FW_CONFIG_PROBE */ + YYSYMBOL_PIPE = 44, /* PIPE */ + YYSYMBOL_OPS = 45, /* OPS */ + YYSYMBOL_YYACCEPT = 46, /* $accept */ + YYSYMBOL_devtree = 47, /* devtree */ + YYSYMBOL_chipchild_nondev = 48, /* chipchild_nondev */ + YYSYMBOL_chipchild = 49, /* chipchild */ + YYSYMBOL_chipchildren = 50, /* chipchildren */ + YYSYMBOL_chipchildren_dev = 51, /* chipchildren_dev */ + YYSYMBOL_devicechildren = 52, /* devicechildren */ + YYSYMBOL_chip = 53, /* chip */ + YYSYMBOL_54_1 = 54, /* @1 */ + YYSYMBOL_device = 55, /* device */ + YYSYMBOL_56_2 = 56, /* @2 */ + YYSYMBOL_57_3 = 57, /* @3 */ + YYSYMBOL_alias = 58, /* alias */ + YYSYMBOL_status = 59, /* status */ + YYSYMBOL_resource = 60, /* resource */ + YYSYMBOL_reference = 61, /* reference */ + YYSYMBOL_registers = 62, /* registers */ + YYSYMBOL_subsystemid = 63, /* subsystemid */ + YYSYMBOL_ioapic_irq = 64, /* ioapic_irq */ + YYSYMBOL_smbios_slot_desc = 65, /* smbios_slot_desc */ + YYSYMBOL_smbios_dev_info = 66, /* smbios_dev_info */ + YYSYMBOL_fw_config_table = 67, /* fw_config_table */ + YYSYMBOL_fw_config_table_children = 68, /* fw_config_table_children */ + YYSYMBOL_fw_config_field_children = 69, /* fw_config_field_children */ + YYSYMBOL_fw_config_field_bits = 70, /* fw_config_field_bits */ + YYSYMBOL_fw_config_field_bits_repeating = 71, /* fw_config_field_bits_repeating */ + YYSYMBOL_fw_config_field = 72, /* fw_config_field */ + YYSYMBOL_73_4 = 73, /* $@4 */ + YYSYMBOL_74_5 = 74, /* $@5 */ + YYSYMBOL_75_6 = 75, /* $@6 */ + YYSYMBOL_fw_config_option = 76, /* fw_config_option */ + YYSYMBOL_fw_config_probe = 77, /* fw_config_probe */ + YYSYMBOL_ops = 78 /* ops */ }; typedef enum yysymbol_kind_t yysymbol_kind_t;
@@ -517,10 +516,10 @@ /* YYFINAL -- State number of the termination state. */ #define YYFINAL 2 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 101 +#define YYLAST 116
/* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 47 +#define YYNTOKENS 46 /* YYNNTS -- Number of nonterminals. */ #define YYNNTS 33 /* YYNRULES -- Number of rules. */ @@ -529,7 +528,7 @@ #define YYNSTATES 108
/* YYMAXUTOK -- Last valid token kind. */ -#define YYMAXUTOK 301 +#define YYMAXUTOK 300
/* YYTRANSLATE(TOKEN-NUM) -- Symbol number corresponding to TOKEN-NUM @@ -573,7 +572,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 + 45 };
#if YYDEBUG @@ -605,8 +604,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", "FW_CONFIG_TABLE", "FW_CONFIG_FIELD", "FW_CONFIG_OPTION", "FW_CONFIG_PROBE", "PIPE", "OPS", "$accept", "devtree", @@ -627,7 +626,7 @@ } #endif
-#define YYPACT_NINF (-57) +#define YYPACT_NINF (-49)
#define yypact_value_is_default(Yyn) \ ((Yyn) == YYPACT_NINF) @@ -641,17 +640,17 @@ STATE-NUM. */ static const yytype_int8 yypact[] = { - -57, 6, -57, 2, -57, -57, -57, -57, -12, 45, - -57, 4, -57, 11, 5, 7, 45, -3, -57, -57, - -57, -57, 21, 18, 25, 14, 34, -57, -57, 45, - 27, 16, -57, 44, 53, 46, 47, -57, -57, -57, - -57, -57, 32, -57, -7, -57, -57, -57, 49, 44, - -57, -57, -6, 27, 16, -57, -57, 50, -57, -57, - -57, -57, -57, -57, -2, 38, 0, -57, -57, -57, - 39, -57, 54, 40, 42, 43, 57, 58, -57, -57, - -57, -57, -57, -57, -57, -57, -57, -57, 12, 61, - 60, 62, 48, 51, 63, -57, -57, 52, 64, -57, - 56, 55, -57, -57, 66, -57, -57, -57 + -49, 6, -49, -2, -49, -49, -49, -49, -12, 44, + -49, 8, -49, 12, 11, 24, 44, 28, -49, -49, + -49, -49, 25, 36, 26, 41, 49, -49, -49, 44, + 29, 15, -49, 13, 55, 45, 46, -49, -49, -49, + -49, -49, 35, -49, -7, -49, -49, -49, 50, 13, + -49, -49, -6, 29, 15, -49, -49, 51, -49, -49, + -49, -49, -49, -49, 2, 37, 0, -49, -49, -49, + 40, -49, 53, 42, 43, 47, 56, 57, -49, -49, + -49, -49, -49, -49, -49, -49, -49, -49, 7, 60, + 61, 62, 48, 52, 63, -49, -49, 54, 64, -49, + 58, 59, -49, -49, 65, -49, -49, -49 };
/* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. @@ -675,10 +674,10 @@ /* YYPGOTO[NTERM-NUM]. */ static const yytype_int8 yypgoto[] = { - -57, -57, 65, -57, -57, 68, 22, -1, -57, -28, - -57, -57, -57, 41, -57, -57, -56, -57, -57, -57, - -57, -57, -57, -21, 59, 37, -57, -57, -57, -57, - -57, -57, -57 + -49, -49, 66, -49, -49, 68, 18, -1, -49, -28, + -49, -49, -49, 67, -49, -49, -48, -49, -49, -49, + -49, -49, -49, -24, 69, 38, -49, -49, -49, -49, + -49, -49, -49 };
/* YYDEFGOTO[NTERM-NUM]. */ @@ -696,60 +695,62 @@ static const yytype_int8 yytable[] = { 5, 39, 10, 3, 13, 14, 2, 56, 62, 3, - 81, 28, 68, 70, 71, 3, 13, 14, 23, 7, - 52, 22, 25, 24, 26, 70, 96, 72, 73, 35, - 11, 74, 81, 75, 64, 33, 57, 57, 79, 72, - 73, 57, 36, 74, 76, 75, 77, 4, 3, 13, - 14, 30, 15, 45, 46, 34, 76, 40, 77, 48, - 79, 42, 53, 50, 51, 78, 60, 65, 69, 89, - 91, 90, 92, 93, 94, 95, 97, 98, 100, 99, - 102, 104, 103, 107, 27, 106, 101, 78, 105, 88, - 61, 63, 0, 0, 37, 0, 0, 0, 0, 0, - 0, 54 + 3, 13, 14, 70, 71, 7, 68, 52, 81, 23, + 70, 96, 45, 46, 24, 22, 72, 73, 25, 11, + 74, 64, 75, 72, 73, 57, 57, 74, 79, 75, + 81, 26, 28, 76, 57, 77, 4, 3, 13, 14, + 76, 15, 77, 33, 30, 34, 35, 36, 40, 42, + 79, 48, 50, 51, 53, 78, 69, 60, 65, 89, + 90, 91, 92, 94, 95, 97, 93, 100, 98, 99, + 102, 104, 107, 103, 27, 88, 101, 78, 106, 105, + 0, 0, 63, 0, 0, 37, 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, 0, 14, 14, 3, - 66, 14, 14, 13, 14, 3, 4, 5, 7, 17, - 41, 17, 17, 12, 17, 13, 14, 27, 28, 15, - 42, 31, 88, 33, 55, 17, 43, 43, 66, 27, - 28, 43, 8, 31, 44, 33, 46, 41, 3, 4, - 5, 30, 7, 9, 10, 30, 44, 30, 46, 6, - 88, 45, 30, 17, 17, 66, 17, 17, 30, 30, - 30, 17, 30, 30, 17, 17, 15, 17, 30, 17, - 17, 17, 30, 17, 16, 30, 35, 88, 32, 67, - 49, 54, -1, -1, 29, -1, -1, -1, -1, -1, - -1, 42 + 3, 4, 5, 13, 14, 17, 14, 41, 66, 7, + 13, 14, 9, 10, 12, 17, 26, 27, 17, 41, + 30, 55, 32, 26, 27, 42, 42, 30, 66, 32, + 88, 17, 14, 43, 42, 45, 40, 3, 4, 5, + 43, 7, 45, 17, 29, 29, 15, 8, 29, 44, + 88, 6, 17, 17, 29, 66, 29, 17, 17, 29, + 17, 29, 29, 17, 17, 15, 29, 29, 17, 17, + 17, 17, 17, 29, 16, 67, 34, 88, 29, 31, + -1, -1, 54, -1, -1, 29, -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, 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, - 30, 71, 76, 17, 30, 15, 8, 49, 50, 56, - 30, 75, 45, 72, 70, 9, 10, 60, 6, 59, - 17, 17, 70, 30, 71, 74, 14, 43, 77, 58, - 17, 60, 14, 72, 70, 17, 53, 57, 14, 30, - 13, 14, 27, 28, 31, 33, 44, 46, 54, 56, - 61, 63, 64, 65, 66, 67, 78, 79, 53, 30, - 17, 30, 30, 30, 17, 17, 14, 15, 17, 17, - 30, 35, 17, 30, 17, 32, 30, 17 + 0, 47, 0, 3, 40, 53, 67, 17, 68, 54, + 14, 41, 72, 4, 5, 7, 48, 51, 53, 55, + 61, 62, 17, 7, 12, 17, 17, 51, 14, 50, + 29, 70, 75, 17, 29, 15, 8, 48, 49, 55, + 29, 74, 44, 71, 69, 9, 10, 59, 6, 58, + 17, 17, 69, 29, 70, 73, 14, 42, 76, 57, + 17, 59, 14, 71, 69, 17, 52, 56, 14, 29, + 13, 14, 26, 27, 30, 32, 43, 45, 53, 55, + 60, 62, 63, 64, 65, 66, 77, 78, 52, 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, 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 + 0, 46, 47, 47, 47, 48, 48, 48, 49, 49, + 50, 50, 51, 51, 52, 52, 52, 52, 52, 52, + 52, 52, 52, 52, 52, 54, 53, 56, 55, 57, + 55, 58, 58, 59, 59, 60, 61, 62, 63, 63, + 64, 65, 65, 65, 66, 66, 67, 68, 68, 69, + 69, 70, 71, 71, 73, 72, 74, 72, 75, 72, + 76, 77, 78 };
/* 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 a35b64b..cb06e65 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_ICON_COREBOOT_UTIL_SCONFIG_SCONFIG_TAB_H_SHIPPED_INCLUDED -# define YY_YY_HOME_ICON_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,32 +72,31 @@ 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 */ - 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 */ + 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 */ + FW_CONFIG_TABLE = 295, /* FW_CONFIG_TABLE */ + FW_CONFIG_FIELD = 296, /* FW_CONFIG_FIELD */ + FW_CONFIG_OPTION = 297, /* FW_CONFIG_OPTION */ + FW_CONFIG_PROBE = 298, /* FW_CONFIG_PROBE */ + PIPE = 299, /* PIPE */ + OPS = 300 /* OPS */ }; typedef enum yytokentype yytoken_kind_t; #endif @@ -126,4 +125,4 @@ int yyparse (void);
-#endif /* !YY_YY_HOME_ICON_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 fb5409f..a92ecb3 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 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 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;