sconfig: Allow chipset to provide a base devicetree

This change extends the devicetree override one more layer and allows
the chipset to provide the base devicetree.  This allows the chipset to
assign alias names to devices as well as set default register values.
This works for both the baseboard devicetree.cb as well as variant
overridetree.cb.

chipset.cb:
device pci 15.0 alias i2c0 off end

devicetree.cb:
device ref i2c0 on end

BUG=b:156957424

Change-Id: Ia7500a62f6211243b519424ef3834b9e7615e2fd
Signed-off-by: Duncan Laurie <dlaurie@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/44037
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Reviewed-by: Furquan Shaikh <furquan@google.com>

1 files changed, 175 insertions, 171 deletions

diff --git a/util/sconfig/lex.yy.c_shipped b/util/sconfig/lex.yy.c_shipped
index fcf5c3ed4f..18b34b5e87 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 48
-#define YY_END_OF_BUFFER 49
+#define YY_NUM_RULES 49
+#define YY_END_OF_BUFFER 50
 /* This struct is not used in this scanner,
    but its presence is necessary. */
 struct yy_trans_info
@@ -358,31 +358,31 @@ struct yy_trans_info
 	flex_int32_t yy_verify;
 	flex_int32_t yy_nxt;
 	};
-static const flex_int16_t yy_accept[202] =
+static const flex_int16_t yy_accept[203] =
     {   0,
-        0,    0,   49,   47,    1,    3,   47,   47,   47,   42,
-       42,   40,   43,   47,   43,   43,   43,   43,   43,   47,
-       47,   47,   47,   47,   47,   47,   47,   47,   47,   47,
-        1,    3,   47,    0,   47,   47,    0,    2,   42,   43,
-       47,   47,   47,    8,   47,   47,   43,   47,   47,   47,
-       47,   47,   47,   47,   47,   47,   47,   34,   47,   47,
-       47,   47,   47,   47,   14,   47,   47,   47,   47,   47,
-       47,   47,   47,   47,   46,   46,   47,    0,   41,   47,
-       47,   47,   24,   47,   47,   33,   38,   47,   47,   47,
-       47,   47,   21,   47,   47,   32,   47,   30,   47,   47,
-
-       15,   47,   18,   20,   47,   47,   47,   28,   47,   29,
-        7,   47,    0,   44,   47,    4,   47,   47,   47,   31,
-       47,   47,   47,   47,   47,   47,   47,   47,   27,   47,
-       47,   47,   47,   47,   45,   45,    6,   47,   47,   47,
-       11,   47,   47,   47,   47,   47,   22,   47,   47,   13,
-       47,   47,   47,   47,    5,   25,   47,   47,   16,   47,
-       19,   47,   12,   47,   47,   47,   47,   47,   26,   36,
-       47,   47,   47,   47,   47,   47,   47,   47,   47,    9,
-       47,   47,   47,   10,   47,   17,   47,   47,   47,   35,
-       47,   47,   23,   47,   37,   47,   47,   47,   47,   39,
-
-        0
+        0,    0,   50,   48,    1,    3,   48,   48,   48,   43,
+       43,   41,   44,   48,   44,   44,   44,   44,   44,   48,
+       48,   48,   48,   48,   48,   48,   48,   48,   48,   48,
+        1,    3,   48,    0,   48,   48,    0,    2,   43,   44,
+       48,   48,   48,    9,   48,   48,   44,   48,   48,   48,
+       48,   48,   48,   48,   48,   48,   48,   35,   48,   48,
+       48,   48,   48,   48,   15,   48,   48,   48,   48,   48,
+       48,   48,   48,   48,   47,   47,   48,    0,   42,   48,
+       48,   48,   25,   48,   48,   34,   39,   48,   48,   48,
+       48,   48,   22,   48,   48,   33,   48,   31,   48,   48,
+
+       16,   48,   19,   21,   48,    8,   48,   48,   29,   48,
+       30,    7,   48,    0,   45,   48,    4,   48,   48,   48,
+       32,   48,   48,   48,   48,   48,   48,   48,   48,   28,
+       48,   48,   48,   48,   48,   46,   46,    6,   48,   48,
+       48,   12,   48,   48,   48,   48,   48,   23,   48,   48,
+       14,   48,   48,   48,   48,    5,   26,   48,   48,   17,
+       48,   20,   48,   13,   48,   48,   48,   48,   48,   27,
+       37,   48,   48,   48,   48,   48,   48,   48,   48,   48,
+       10,   48,   48,   48,   11,   48,   18,   48,   48,   48,
+       36,   48,   48,   24,   48,   38,   48,   48,   48,   48,
+
+       40,    0
     } ;
 
 static const YY_CHAR yy_ec[256] =
@@ -425,61 +425,61 @@ static const YY_CHAR yy_meta[40] =
         1,    1,    1,    1,    1,    1,    1,    1,    1
     } ;
 
-static const flex_int16_t yy_base[209] =
+static const flex_int16_t yy_base[210] =
     {   0,
-        0,    0,  274,    0,  271,  275,  269,   38,   42,   39,
-      233,    0,   45,  256,   55,   59,   83,   65,   62,  248,
-      243,   68,   25,   48,   54,   75,  246,   75,  233,    0,
-      263,  275,  106,  259,  111,   76,  260,  275,    0,  110,
-      113,  247,  236,    0,  235,  224,  119,  231,  226,  236,
-      225,  233,  237,  224,  231,  231,  225,  231,  216,  216,
-      226,  216,  218,  220,    0,  207,  215,  209,  209,  214,
-      218,  210,  216,  118,    0,  275,  135,  228,    0,  221,
-      214,  200,  213,  203,  210,    0,    0,  201,  199,  205,
-      202,  202,    0,  200,  190,    0,  194,    0,  198,  188,
-
-        0,  191,    0,    0,  197,  189,  188,    0,  179,    0,
-        0,  206,  205,    0,  176,    0,  189,  188,  181,    0,
-      185,  175,  171,  181,  169,  175,  180,  181,    0,  168,
-      175,  162,  165,  154,    0,  275,    0,  166,  170,  162,
-        0,  161,  163,  159,  161,  166,    0,  150,  155,    0,
-      148,  148,  147,  144,    0,    0,  156,  158,    0,  142,
-      159,  145,    0,  152,  156,  137,  137,  144,    0,    0,
-      143,  122,  121,  119,  130,  116,  126,  116,  108,    0,
-      120,  118,  123,    0,  112,    0,  113,  116,   97,    0,
-       89,   86,    0,   85,    0,   75,   65,   52,   61,    0,
-
-      275,   48,  155,  157,  159,  161,  163,  165
+        0,    0,  275,    0,  272,  276,  270,   38,   42,   39,
+      234,    0,   45,  257,   55,   59,   83,   65,   62,  249,
+      244,   68,   25,   48,   54,   75,  247,   75,  234,    0,
+      264,  276,  106,  260,  111,   76,  261,  276,    0,  110,
+      113,  248,  237,    0,  236,  225,  119,  232,  227,  237,
+      226,  234,  238,  225,  232,  232,  226,  232,  217,  217,
+      227,  217,  219,  221,    0,  208,  216,  210,  210,   63,
+      220,  212,  218,  118,    0,  276,  135,  230,    0,  223,
+      216,  202,  215,  205,  212,    0,    0,  203,  201,  207,
+      204,  204,    0,  202,  192,    0,  196,    0,  200,  190,
+
+        0,  193,    0,    0,  199,    0,  191,  190,    0,  181,
+        0,    0,  208,  207,    0,  178,    0,  191,  190,  183,
+        0,  187,  177,  173,  183,  171,  177,  182,  183,    0,
+      170,  177,  164,  167,  156,    0,  276,    0,  168,  172,
+      164,    0,  163,  165,  161,  163,  168,    0,  152,  157,
+        0,  150,  150,  149,  146,    0,    0,  158,  160,    0,
+      144,  161,  147,    0,  154,  158,  139,  139,  146,    0,
+        0,  145,  137,  136,  121,  132,  118,  128,  118,  110,
+        0,  122,  120,  125,    0,  114,    0,  115,  118,  110,
+        0,  107,  109,    0,  107,    0,   86,   80,   62,   61,
+
+        0,  276,   48,  155,  157,  159,  161,  163,  165
     } ;
 
-static const flex_int16_t yy_def[209] =
+static const flex_int16_t yy_def[210] =
     {   0,
-      201,    1,  201,  202,  201,  201,  202,  203,  204,  202,
-       10,  202,   10,  202,   10,   10,   10,   10,   10,  202,
-      202,  202,  202,  202,  202,  202,  202,  202,  202,  202,
-      201,  201,  203,  205,  206,  204,  207,  201,   10,   10,
-       10,  202,  202,  202,  202,  202,   10,  202,  202,  202,
-      202,  202,  202,  202,  202,  202,  202,  202,  202,  202,
-      202,  202,  202,  202,  202,  202,  202,  202,  202,  202,
-      202,  202,  202,  202,  202,  201,  206,  208,   41,  202,
-      202,  202,  202,  202,  202,  202,  202,  202,  202,  202,
-      202,  202,  202,  202,  202,  202,  202,  202,  202,  202,
-
-      202,  202,  202,  202,  202,  202,  202,  202,  202,  202,
-      202,  202,  201,  202,  202,  202,  202,  202,  202,  202,
-      202,  202,  202,  202,  202,  202,  202,  202,  202,  202,
-      202,  202,  202,  202,  202,  201,  202,  202,  202,  202,
-      202,  202,  202,  202,  202,  202,  202,  202,  202,  202,
-      202,  202,  202,  202,  202,  202,  202,  202,  202,  202,
-      202,  202,  202,  202,  202,  202,  202,  202,  202,  202,
-      202,  202,  202,  202,  202,  202,  202,  202,  202,  202,
-      202,  202,  202,  202,  202,  202,  202,  202,  202,  202,
-      202,  202,  202,  202,  202,  202,  202,  202,  202,  202,
-
-        0,  201,  201,  201,  201,  201,  201,  201
+      202,    1,  202,  203,  202,  202,  203,  204,  205,  203,
+       10,  203,   10,  203,   10,   10,   10,   10,   10,  203,
+      203,  203,  203,  203,  203,  203,  203,  203,  203,  203,
+      202,  202,  204,  206,  207,  205,  208,  202,   10,   10,
+       10,  203,  203,  203,  203,  203,   10,  203,  203,  203,
+      203,  203,  203,  203,  203,  203,  203,  203,  203,  203,
+      203,  203,  203,  203,  203,  203,  203,  203,  203,  203,
+      203,  203,  203,  203,  203,  202,  207,  209,   41,  203,
+      203,  203,  203,  203,  203,  203,  203,  203,  203,  203,
+      203,  203,  203,  203,  203,  203,  203,  203,  203,  203,
+
+      203,  203,  203,  203,  203,  203,  203,  203,  203,  203,
+      203,  203,  203,  202,  203,  203,  203,  203,  203,  203,
+      203,  203,  203,  203,  203,  203,  203,  203,  203,  203,
+      203,  203,  203,  203,  203,  203,  202,  203,  203,  203,
+      203,  203,  203,  203,  203,  203,  203,  203,  203,  203,
+      203,  203,  203,  203,  203,  203,  203,  203,  203,  203,
+      203,  203,  203,  203,  203,  203,  203,  203,  203,  203,
+      203,  203,  203,  203,  203,  203,  203,  203,  203,  203,
+      203,  203,  203,  203,  203,  203,  203,  203,  203,  203,
+      203,  203,  203,  203,  203,  203,  203,  203,  203,  203,
+
+      203,    0,  202,  202,  202,  202,  202,  202,  202
     } ;
 
-static const flex_int16_t yy_nxt[315] =
+static const flex_int16_t yy_nxt[316] =
     {   0,
         4,    5,    6,    7,    8,    9,   10,   11,   10,   12,
        13,   13,   14,    4,    4,    4,   15,   13,   16,   17,
@@ -488,73 +488,73 @@ static const flex_int16_t yy_nxt[315] =
        34,   60,   35,   37,   38,   39,   39,   39,   30,   40,
        40,   40,   40,   40,   61,   40,   40,   40,   40,   40,
        40,   40,   40,   40,   62,   40,   40,   40,   40,   40,
-       40,   40,   40,   40,   63,   64,   56,   37,   38,  200,
-       43,   65,   45,   66,  199,  198,   52,   44,   46,   40,
-       40,   40,   50,   67,  197,   57,   58,   51,   53,   59,
+       40,   40,   40,   40,   63,   64,   56,   37,   38,  201,
+       43,   65,   45,   66,  106,  107,   52,   44,   46,   40,
+       40,   40,   50,   67,  200,   57,   58,   51,   53,   59,
 
-      196,   71,   68,   47,   72,  195,   69,   34,   34,   73,
+      199,   71,   68,   47,   72,  198,   69,   34,   34,   73,
        75,   48,   78,   78,   49,   30,   40,   40,   40,   79,
-       79,   79,  194,   79,   79,   40,   40,   40,  193,   79,
-       79,   79,   79,   79,   79,  110,   78,   78,  111,  112,
-      192,  191,  190,  189,  188,  187,  186,  185,  184,  183,
-      182,  181,  180,  179,   84,   33,   33,   36,   36,   34,
-       34,   77,   77,   37,   37,   78,   78,  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,  106,  105,  104,  103,
-      102,  101,  100,   99,   98,   97,   96,   95,   94,   93,
-       92,   91,   90,   89,   88,   87,   86,   85,   83,   82,
-       81,   80,   38,   76,   31,   74,   70,   55,   54,   42,
-       41,   32,   31,  201,    3,  201,  201,  201,  201,  201,
-      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
-      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
-
-      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
-      201,  201,  201,  201
+       79,   79,  197,   79,   79,   40,   40,   40,  196,   79,
+       79,   79,   79,   79,   79,  111,   78,   78,  112,  113,
+      195,  194,  193,  192,  191,  190,  189,  188,  187,  186,
+      185,  184,  183,  182,   84,   33,   33,   36,   36,   34,
+       34,   77,   77,   37,   37,   78,   78,  181,  180,  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,  110,  109,  108,  105,  104,
+      103,  102,  101,  100,   99,   98,   97,   96,   95,   94,
+       93,   92,   91,   90,   89,   88,   87,   86,   85,   83,
+       82,   81,   80,   38,   76,   31,   74,   70,   55,   54,
+       42,   41,   32,   31,  202,    3,  202,  202,  202,  202,
+      202,  202,  202,  202,  202,  202,  202,  202,  202,  202,
+      202,  202,  202,  202,  202,  202,  202,  202,  202,  202,
+
+      202,  202,  202,  202,  202,  202,  202,  202,  202,  202,
+      202,  202,  202,  202,  202
     } ;
 
-static const flex_int16_t yy_chk[315] =
+static const flex_int16_t yy_chk[316] =
     {   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,    8,
-        8,   23,    8,    9,    9,   10,   10,   10,  202,   10,
+        8,   23,    8,    9,    9,   10,   10,   10,  203,   10,
        10,   13,   13,   13,   23,   10,   10,   10,   10,   10,
        10,   15,   15,   15,   24,   16,   16,   16,   19,   19,
-       19,   18,   18,   18,   24,   25,   22,   36,   36,  199,
-       15,   25,   16,   25,  198,  197,   19,   15,   16,   17,
-       17,   17,   18,   26,  196,   22,   22,   18,   19,   22,
+       19,   18,   18,   18,   24,   25,   22,   36,   36,  200,
+       15,   25,   16,   25,   70,   70,   19,   15,   16,   17,
+       17,   17,   18,   26,  199,   22,   22,   18,   19,   22,
 
-      194,   28,   26,   17,   28,  192,   26,   33,   33,   28,
+      198,   28,   26,   17,   28,  197,   26,   33,   33,   28,
        33,   17,   35,   35,   17,   35,   40,   40,   40,   41,
-       41,   41,  191,   41,   41,   47,   47,   47,  189,   41,
+       41,   41,  195,   41,   41,   47,   47,   47,  193,   41,
        41,   41,   41,   41,   41,   74,   77,   77,   74,   77,
-      188,  187,  185,  183,  182,  181,  179,  178,  177,  176,
-      175,  174,  173,  172,   47,  203,  203,  204,  204,  205,
-      205,  206,  206,  207,  207,  208,  208,  171,  168,  167,
-      166,  165,  164,  162,  161,  160,  158,  157,  154,  153,
-      152,  151,  149,  148,  146,  145,  144,  143,  142,  140,
-      139,  138,  134,  133,  132,  131,  130,  128,  127,  126,
-
-      125,  124,  123,  122,  121,  119,  118,  117,  115,  113,
-      112,  109,  107,  106,  105,  102,  100,   99,   97,   95,
-       94,   92,   91,   90,   89,   88,   85,   84,   83,   82,
-       81,   80,   78,   73,   72,   71,   70,   69,   68,   67,
-       66,   64,   63,   62,   61,   60,   59,   58,   57,   56,
-       55,   54,   53,   52,   51,   50,   49,   48,   46,   45,
-       43,   42,   37,   34,   31,   29,   27,   21,   20,   14,
-       11,    7,    5,    3,  201,  201,  201,  201,  201,  201,
-      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
-      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
-
-      201,  201,  201,  201,  201,  201,  201,  201,  201,  201,
-      201,  201,  201,  201
+      192,  190,  189,  188,  186,  184,  183,  182,  180,  179,
+      178,  177,  176,  175,   47,  204,  204,  205,  205,  206,
+      206,  207,  207,  208,  208,  209,  209,  174,  173,  172,
+      169,  168,  167,  166,  165,  163,  162,  161,  159,  158,
+      155,  154,  153,  152,  150,  149,  147,  146,  145,  144,
+      143,  141,  140,  139,  135,  134,  133,  132,  131,  129,
+
+      128,  127,  126,  125,  124,  123,  122,  120,  119,  118,
+      116,  114,  113,  110,  108,  107,  105,  102,  100,   99,
+       97,   95,   94,   92,   91,   90,   89,   88,   85,   84,
+       83,   82,   81,   80,   78,   73,   72,   71,   69,   68,
+       67,   66,   64,   63,   62,   61,   60,   59,   58,   57,
+       56,   55,   54,   53,   52,   51,   50,   49,   48,   46,
+       45,   43,   42,   37,   34,   31,   29,   27,   21,   20,
+       14,   11,    7,    5,    3,  202,  202,  202,  202,  202,
+      202,  202,  202,  202,  202,  202,  202,  202,  202,  202,
+      202,  202,  202,  202,  202,  202,  202,  202,  202,  202,
+
+      202,  202,  202,  202,  202,  202,  202,  202,  202,  202,
+      202,  202,  202,  202,  202
     } ;
 
 static yy_state_type yy_last_accepting_state;
@@ -819,13 +819,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 >= 202 )
+				if ( yy_current_state >= 203 )
 					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] != 275 );
+		while ( yy_base[yy_current_state] != 276 );
 
 yy_find_action:
 		yy_act = yy_accept[yy_current_state];
@@ -881,139 +881,139 @@ YY_RULE_SETUP
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-{return(ASSOCIATION);}
+{return(REFERENCE);}
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-{return(REGISTER);}
+{return(ASSOCIATION);}
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-{return(FW_CONFIG_TABLE);}
+{return(REGISTER);}
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-{return(FW_CONFIG_FIELD);}
+{return(FW_CONFIG_TABLE);}
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-{return(FW_CONFIG_OPTION);}
+{return(FW_CONFIG_FIELD);}
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-{return(FW_CONFIG_PROBE);}
+{return(FW_CONFIG_OPTION);}
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-{yylval.number=1; return(BOOL);}
+{return(FW_CONFIG_PROBE);}
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-{yylval.number=0; return(BOOL);}
+{yylval.number=1; return(BOOL);}
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
-{yylval.number=3; return(STATUS);}
+{yylval.number=0; return(BOOL);}
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
-{yylval.number=5; return(STATUS);}
+{yylval.number=3; return(STATUS);}
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
-{yylval.number=PCI; return(BUS);}
+{yylval.number=5; return(STATUS);}
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
-{yylval.number=IOAPIC; return(BUS);}
+{yylval.number=PCI; return(BUS);}
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
-{yylval.number=PNP; return(BUS);}
+{yylval.number=IOAPIC; return(BUS);}
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
-{yylval.number=I2C; return(BUS);}
+{yylval.number=PNP; return(BUS);}
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
-{yylval.number=APIC; return(BUS);}
+{yylval.number=I2C; return(BUS);}
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
-{yylval.number=CPU_CLUSTER; return(BUS);}
+{yylval.number=APIC; return(BUS);}
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
-{yylval.number=CPU; return(BUS);}
+{yylval.number=CPU_CLUSTER; return(BUS);}
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
-{yylval.number=DOMAIN; return(BUS);}
+{yylval.number=CPU; return(BUS);}
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
-{yylval.number=GENERIC; return(BUS);}
+{yylval.number=DOMAIN; return(BUS);}
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
-{yylval.number=MMIO; return(BUS);}
+{yylval.number=GENERIC; return(BUS);}
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
-{yylval.number=SPI; return(BUS);}
+{yylval.number=MMIO; return(BUS);}
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
-{yylval.number=USB; return(BUS);}
+{yylval.number=SPI; return(BUS);}
 	YY_BREAK
 case 30:
 YY_RULE_SETUP
-{yylval.number=LPC; return(BUS);}
+{yylval.number=USB; return(BUS);}
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
-{yylval.number=ESPI; return(BUS);}
+{yylval.number=LPC; return(BUS);}
 	YY_BREAK
 case 32:
 YY_RULE_SETUP
-{yylval.number=IRQ; return(RESOURCE);}
+{yylval.number=ESPI; return(BUS);}
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
-{yylval.number=DRQ; return(RESOURCE);}
+{yylval.number=IRQ; return(RESOURCE);}
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
-{yylval.number=IO; return(RESOURCE);}
+{yylval.number=DRQ; return(RESOURCE);}
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
-{return(IOAPIC_IRQ);}
+{yylval.number=IO; return(RESOURCE);}
 	YY_BREAK
 case 36:
 YY_RULE_SETUP
-{return(INHERIT);}
+{return(IOAPIC_IRQ);}
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
-{return(SUBSYSTEMID);}
+{return(INHERIT);}
 	YY_BREAK
 case 38:
 YY_RULE_SETUP
-{return(END);}
+{return(SUBSYSTEMID);}
 	YY_BREAK
 case 39:
 YY_RULE_SETUP
-{return(SLOT_DESC);}
+{return(END);}
 	YY_BREAK
 case 40:
 YY_RULE_SETUP
-{return(EQUALS);}
+{return(SLOT_DESC);}
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
-{yylval.string = malloc(yyleng+1); strncpy(yylval.string, yytext, yyleng); yylval.string[yyleng]='\0'; return(NUMBER);}
+{return(EQUALS);}
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
@@ -1025,12 +1025,11 @@ YY_RULE_SETUP
 	YY_BREAK
 case 44:
 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, yyleng); yylval.string[yyleng]='\0'; return(NUMBER);}
 	YY_BREAK
 case 45:
-/* 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);}
+{yylval.string = malloc(yyleng+1); strncpy(yylval.string, yytext, yyleng); yylval.string[yyleng]='\0'; return(PCIINT);}
 	YY_BREAK
 case 46:
 /* rule 46 can match eol */
@@ -1038,11 +1037,16 @@ 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 47:
+/* rule 47 can match eol */
 YY_RULE_SETUP
-{yylval.string = malloc(yyleng+1); strncpy(yylval.string, yytext, yyleng); yylval.string[yyleng]='\0'; return(STRING);}
+{yylval.string = malloc(yyleng-1); strncpy(yylval.string, yytext+1, yyleng-2); yylval.string[yyleng-2]='\0'; return(STRING);}
 	YY_BREAK
 case 48:
 YY_RULE_SETUP
+{yylval.string = malloc(yyleng+1); strncpy(yylval.string, yytext, yyleng); yylval.string[yyleng]='\0'; return(STRING);}
+	YY_BREAK
+case 49:
+YY_RULE_SETUP
 ECHO;
 	YY_BREAK
 case YY_STATE_EOF(INITIAL):
@@ -1341,7 +1345,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 >= 202 )
+			if ( yy_current_state >= 203 )
 				yy_c = yy_meta[yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
@@ -1369,11 +1373,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 >= 202 )
+		if ( yy_current_state >= 203 )
 			yy_c = yy_meta[yy_c];
 		}
 	yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
-	yy_is_jam = (yy_current_state == 201);
+	yy_is_jam = (yy_current_state == 202);
 
 		return yy_is_jam ? 0 : yy_current_state;
 }