util/sconfig: Remove unused ioapic and irq keywords

Ioapic information in the devicetree was only used to set up mptables
but this generic driver was removed (ca5a793 drivers/generic/ioapic:
Drop poor implementation).

This removes the unused remainders from mainboard devicetrees.
Remove ioapic setup from sconfig.

Change-Id: Ib3fef0bf923ab3f02f3aeed2e55cf662a3dc3a1b
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/71789
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Lean Sheng Tan <sheng.tan@9elements.com>

1 files changed, 182 insertions, 201 deletions

diff --git a/util/sconfig/lex.yy.c_shipped b/util/sconfig/lex.yy.c_shipped
index 8d26db5cda..3fc7ddcc4c 100644
--- a/util/sconfig/lex.yy.c_shipped
+++ b/util/sconfig/lex.yy.c_shipped
@@ -349,8 +349,8 @@ static void yynoreturn yy_fatal_error ( const char* msg  );
 	(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 48
+#define YY_END_OF_BUFFER 49
 /* This struct is not used in this scanner,
    but its presence is necessary. */
 struct yy_trans_info
@@ -358,31 +358,30 @@ struct yy_trans_info
 	flex_int32_t yy_verify;
 	flex_int32_t yy_nxt;
 	};
-static const flex_int16_t yy_accept[209] =
+static const flex_int16_t yy_accept[197] =
     {   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,   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,
-
-       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,
-
-       50,   50,   50,   50,   41,   50,   40,    0
+        0,    0,   49,   47,    1,    3,   47,   47,   47,   43,
+       43,   40,   44,   44,   44,   44,   44,   44,   47,   47,
+       47,   47,   47,   47,   47,   47,   47,   41,   47,    1,
+        3,   47,    0,   47,   47,    0,    2,   43,   44,   47,
+       47,   10,   47,   47,   44,   47,   47,   47,   47,   47,
+       47,   47,   47,   47,   47,   34,   47,   47,   47,   47,
+       47,   16,   47,   47,   47,   47,   47,   47,   47,   47,
+       47,   46,   46,   47,    0,   42,   47,   47,   24,   47,
+       47,   33,   37,   47,   47,   47,   47,   47,   22,   47,
+       32,   47,   47,   47,   17,    7,   47,   20,   21,   47,
+
+        9,   47,   47,   28,   47,   29,    8,   47,    0,   47,
+        4,   47,   47,   47,   47,   47,   47,   30,   47,   47,
+       47,   31,   27,   47,   47,   47,   47,   47,   45,   45,
+        6,   47,   47,   47,   13,   47,   47,   47,   47,   47,
+       47,   15,   47,   47,   47,   47,    5,   25,   47,   47,
+       18,   47,   47,   14,   47,   47,   47,   47,   47,   26,
+       35,   47,   47,   47,   47,   47,   47,   47,   11,   47,
+       47,   47,   47,   12,   19,   47,   47,   47,   47,   47,
+       47,   47,   23,   47,   47,   36,   47,   47,   47,   47,
+       47,   47,   39,   47,   38,    0
+
     } ;
 
 static const YY_CHAR yy_ec[256] =
@@ -393,14 +392,14 @@ static const YY_CHAR yy_ec[256] =
         1,    2,    1,    5,    6,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    7,    1,    8,    7,    9,
         7,    7,    7,    7,    7,    7,    7,    1,    1,    1,
-       10,    1,    1,    1,   11,   11,   11,   11,   12,   12,
-        1,    1,   13,    1,    1,    1,    1,   14,    1,    1,
-        1,    1,    1,   15,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,   16,    1,   17,   18,   19,   20,
-
-       21,   22,   23,   24,   25,    1,    1,   26,   27,   28,
-       29,   30,   31,   32,   33,   34,   35,   36,   37,   38,
-       39,    1,    1,   40,    1,    1,    1,    1,    1,    1,
+       10,    1,    1,    1,   11,   11,   11,   11,   11,   11,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,   12,    1,   13,   14,   15,   16,
+
+       17,   18,   19,   20,   21,    1,    1,   22,   23,   24,
+       25,   26,   27,   28,   29,   30,   31,   32,   33,   34,
+       35,    1,    1,   36,    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,
@@ -417,148 +416,142 @@ static const YY_CHAR yy_ec[256] =
         1,    1,    1,    1,    1
     } ;
 
-static const YY_CHAR yy_meta[41] =
+static const YY_CHAR yy_meta[37] =
     {   0,
         1,    2,    2,    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,    1,    1,    1
     } ;
 
-static const flex_int16_t yy_base[216] =
+static const flex_int16_t yy_base[204] =
     {   0,
-        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,
-
-      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,
-
-       70,   66,   49,   37,    0,   47,    0,  283,   49,  161,
-      163,  165,  167,  169,  171
+        0,    0,  265,    0,  262,  266,  260,   35,   39,   36,
+      228,    0,   48,   51,   55,   75,   61,   58,   22,  240,
+       62,   81,   75,   74,  243,   82,  230,    0,    0,  256,
+      266,  104,  252,  109,   74,  253,  266,    0,  108,  111,
+      234,    0,  233,  222,  123,  229,  224,  234,  232,  236,
+      223,  225,  229,  229,  223,    0,  215,  217,  219,  218,
+      220,    0,   66,  216,  210,  210,  115,  220,  212,  218,
+      121,    0,  266,  134,  226,    0,  217,  203,  216,  206,
+      213,    0,    0,  203,  209,  206,  197,  205,    0,  203,
+        0,  203,  193,  192,    0,    0,  195,    0,    0,  201,
+
+        0,  193,  192,    0,  183,    0,    0,  206,  205,  180,
+        0,  193,  192,  185,  189,  179,  175,    0,  185,  173,
+      187,    0,    0,  174,  181,  168,  171,  160,    0,  266,
+        0,  172,  176,  168,    0,  167,  169,  165,  167,  157,
+      162,    0,  155,  155,  154,  151,    0,    0,  163,  165,
+        0,  149,  153,    0,  160,  164,  145,  145,  152,    0,
+        0,  144,  143,   45,  153,  139,  149,  119,    0,  136,
+      130,  128,  133,    0,    0,  117,  123,  126,  118,  133,
+      114,  127,    0,  121,  129,    0,  116,  107,  103,   93,
+       63,   49,    0,   57,    0,  266,   45,  155,  157,  159,
+
+      161,  163,  165
     } ;
 
-static const flex_int16_t yy_def[216] =
+static const flex_int16_t yy_def[204] =
     {   0,
-      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,
-
-      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,
-
-      209,  209,  209,  209,  209,  209,  209,    0,  208,  208,
-      208,  208,  208,  208,  208
+      196,    1,  196,  197,  196,  196,  197,  198,  199,  197,
+       10,  197,   10,   10,   10,   10,   10,   10,  197,  197,
+      197,  197,  197,  197,  197,  197,  197,  197,  197,  196,
+      196,  198,  200,  201,  199,  202,  196,   10,   10,   10,
+      197,  197,  197,  197,   10,  197,  197,  197,  197,  197,
+      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
+      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
+      197,  197,  196,  201,  203,   40,  197,  197,  197,  197,
+      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
+      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
+
+      197,  197,  197,  197,  197,  197,  197,  197,  196,  197,
+      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
+      197,  197,  197,  197,  197,  197,  197,  197,  197,  196,
+      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
+      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
+      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
+      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
+      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
+      197,  197,  197,  197,  197,  197,  197,  197,  197,  197,
+      197,  197,  197,  197,  197,    0,  196,  196,  196,  196,
+
+      196,  196,  196
     } ;
 
-static const flex_int16_t yy_nxt[324] =
+static const flex_int16_t yy_nxt[303] =
     {   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,    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,
-
-       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,
-
-      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,
-
-      208,  208,  208,  208,  208,  208,  208,  208,  208,  208,
-      208,  208,  208,  208,  208,  208,  208,  208,  208,  208,
-      208,  208,  208
+       13,    4,   14,   13,   15,   16,   17,   18,   19,   20,
+       21,    4,   22,    4,   23,   24,    4,   25,   26,    4,
+       27,    4,    4,    4,    4,   28,   33,   33,   51,   34,
+       36,   37,   38,   38,   38,   29,   39,   52,   39,   39,
+       39,   39,   39,   39,   39,   39,   39,   39,   39,   39,
+      170,   39,   39,   39,   39,   39,   39,   39,   39,   39,
+       54,  195,   41,  171,   43,   36,   37,  194,   49,   42,
+       44,   39,   39,   39,   48,   55,   56,  193,   64,   57,
+       50,   45,   61,   58,   96,   97,   59,   65,   62,   46,
+
+       63,   66,   47,   60,   68,   33,   33,   69,   72,  192,
+       75,   75,   70,   29,   39,   39,   39,   76,   76,   76,
+      191,   76,  190,   76,   76,   76,   76,   76,   76,   39,
+       39,   39,  101,  102,  106,   75,   75,  107,  108,  189,
+      188,  187,  186,  185,  184,  183,  182,  181,  180,  179,
+      178,  177,  176,  175,   80,   32,   32,   35,   35,   33,
+       33,   74,   74,   36,   36,   75,   75,  174,  173,  172,
+      169,  168,  167,  166,  165,  164,  163,  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,  115,  114,  113,  112,  111,  110,
+      109,  105,  104,  103,  100,   99,   98,   95,   94,   93,
+       92,   91,   90,   89,   88,   87,   86,   85,   84,   83,
+       82,   81,   79,   78,   77,   37,   73,   30,   71,   67,
+       53,   40,   31,   30,  196,    3,  196,  196,  196,  196,
+      196,  196,  196,  196,  196,  196,  196,  196,  196,  196,
+      196,  196,  196,  196,  196,  196,  196,  196,  196,  196,
+      196,  196,  196,  196,  196,  196,  196,  196,  196,  196,
+
+      196,  196
     } ;
 
-static const flex_int16_t yy_chk[324] =
+static const flex_int16_t yy_chk[303] =
     {   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,  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,
-
-       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,
-
-      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,
-
-      208,  208,  208,  208,  208,  208,  208,  208,  208,  208,
-      208,  208,  208,  208,  208,  208,  208,  208,  208,  208,
-      208,  208,  208
+        1,    1,    1,    1,    1,    1,    8,    8,   19,    8,
+        9,    9,   10,   10,   10,  197,   10,   19,   10,   10,
+       10,   10,   10,   10,   13,   13,   13,   14,   14,   14,
+      164,   15,   15,   15,   18,   18,   18,   17,   17,   17,
+       21,  194,   14,  164,   15,   35,   35,  192,   18,   14,
+       15,   16,   16,   16,   17,   21,   21,  191,   24,   21,
+       18,   16,   23,   22,   63,   63,   22,   24,   23,   16,
+
+       23,   24,   16,   22,   26,   32,   32,   26,   32,  190,
+       34,   34,   26,   34,   39,   39,   39,   40,   40,   40,
+      189,   40,  188,   40,   40,   40,   40,   40,   40,   45,
+       45,   45,   67,   67,   71,   74,   74,   71,   74,  187,
+      185,  184,  182,  181,  180,  179,  178,  177,  176,  173,
+      172,  171,  170,  168,   45,  198,  198,  199,  199,  200,
+      200,  201,  201,  202,  202,  203,  203,  167,  166,  165,
+      163,  162,  159,  158,  157,  156,  155,  153,  152,  150,
+      149,  146,  145,  144,  143,  141,  140,  139,  138,  137,
+      136,  134,  133,  132,  128,  127,  126,  125,  124,  121,
+
+      120,  119,  117,  116,  115,  114,  113,  112,  110,  109,
+      108,  105,  103,  102,  100,   97,   94,   93,   92,   90,
+       88,   87,   86,   85,   84,   81,   80,   79,   78,   77,
+       75,   70,   69,   68,   66,   65,   64,   61,   60,   59,
+       58,   57,   55,   54,   53,   52,   51,   50,   49,   48,
+       47,   46,   44,   43,   41,   36,   33,   30,   27,   25,
+       20,   11,    7,    5,    3,  196,  196,  196,  196,  196,
+      196,  196,  196,  196,  196,  196,  196,  196,  196,  196,
+      196,  196,  196,  196,  196,  196,  196,  196,  196,  196,
+      196,  196,  196,  196,  196,  196,  196,  196,  196,  196,
+
+      196,  196
     } ;
 
 static yy_state_type yy_last_accepting_state;
@@ -823,13 +816,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 >= 209 )
+				if ( yy_current_state >= 197 )
 					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] != 283 );
+		while ( yy_base[yy_current_state] != 266 );
 
 yy_find_action:
 		yy_act = yy_accept[yy_current_state];
@@ -937,127 +930,115 @@ YY_RULE_SETUP
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
-{yylval.number=IOAPIC; return(BUS);}
+{yylval.number=PNP; return(BUS);}
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
-{yylval.number=PNP; return(BUS);}
+{yylval.number=I2C; return(BUS);}
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
-{yylval.number=I2C; return(BUS);}
+{yylval.number=CPU_CLUSTER; return(BUS);}
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
-{yylval.number=CPU_CLUSTER; return(BUS);}
+{yylval.number=CPU; return(BUS);}
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
-{yylval.number=CPU; return(BUS);}
+{yylval.number=DOMAIN; return(BUS);}
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
-{yylval.number=DOMAIN; return(BUS);}
+{yylval.number=GENERIC; return(BUS);}
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
-{yylval.number=GENERIC; return(BUS);}
+{yylval.number=MMIO; return(BUS);}
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
-{yylval.number=MMIO; return(BUS);}
+{yylval.number=SPI; return(BUS);}
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
-{yylval.number=SPI; return(BUS);}
+{yylval.number=USB; return(BUS);}
 	YY_BREAK
 case 30:
 YY_RULE_SETUP
-{yylval.number=USB; return(BUS);}
+{yylval.number=GPIO; return(BUS);}
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
-{yylval.number=GPIO; return(BUS);}
+{yylval.number=MDIO; return(BUS);}
 	YY_BREAK
 case 32:
 YY_RULE_SETUP
-{yylval.number=MDIO; 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(INHERIT);}
 	YY_BREAK
 case 36:
 YY_RULE_SETUP
-{return(IOAPIC_IRQ);}
+{return(SUBSYSTEMID);}
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
-{return(INHERIT);}
+{return(END);}
 	YY_BREAK
 case 38:
 YY_RULE_SETUP
-{return(SUBSYSTEMID);}
+{return(SLOT_DESC);}
 	YY_BREAK
 case 39:
 YY_RULE_SETUP
-{return(END);}
+{return(SMBIOS_DEV_INFO);}
 	YY_BREAK
 case 40:
 YY_RULE_SETUP
-{return(SLOT_DESC);}
+{return(EQUALS);}
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
-{return(SMBIOS_DEV_INFO);}
+{return(PIPE);}
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
-{return(EQUALS);}
+{yylval.string = malloc(yyleng+1); strncpy(yylval.string, yytext, yyleng); yylval.string[yyleng]='\0'; return(NUMBER);}
 	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
 {yylval.string = malloc(yyleng+1); strncpy(yylval.string, yytext, yyleng); yylval.string[yyleng]='\0'; return(NUMBER);}
 	YY_BREAK
 case 45:
-YY_RULE_SETUP
-{yylval.string = malloc(yyleng+1); strncpy(yylval.string, yytext, yyleng); yylval.string[yyleng]='\0'; return(NUMBER);}
-	YY_BREAK
-case 46:
-YY_RULE_SETUP
-{yylval.string = malloc(yyleng+1); strncpy(yylval.string, yytext, yyleng); yylval.string[yyleng]='\0'; return(NUMBER);}
-	YY_BREAK
-case 47:
-YY_RULE_SETUP
-{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 */
+/* rule 45 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 49:
-/* rule 49 can match eol */
+case 46:
+/* rule 46 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:
+case 47:
 YY_RULE_SETUP
 {yylval.string = malloc(yyleng+1); strncpy(yylval.string, yytext, yyleng); yylval.string[yyleng]='\0'; return(STRING);}
 	YY_BREAK
-case 51:
+case 48:
 YY_RULE_SETUP
 ECHO;
 	YY_BREAK
@@ -1357,7 +1338,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 >= 209 )
+			if ( yy_current_state >= 197 )
 				yy_c = yy_meta[yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
@@ -1385,11 +1366,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 >= 209 )
+		if ( yy_current_state >= 197 )
 			yy_c = yy_meta[yy_c];
 		}
 	yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
-	yy_is_jam = (yy_current_state == 208);
+	yy_is_jam = (yy_current_state == 196);
 
 		return yy_is_jam ? 0 : yy_current_state;
 }