GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Duncan Laurie 2020-07-29 16:28:43 -07:00 committed by Furquan Shaikh
parent b9a7d779b3
commit e335c2e02f
9 changed files with 677 additions and 722 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.inc
View File

@ -13,6 +13,7 @@ CONFIG_CBFS_PREFIX:=$(call strip_quotes,$(CONFIG_CBFS_PREFIX))
CONFIG_FMDFILE:=$(call strip_quotes,$(CONFIG_FMDFILE)) CONFIG_FMDFILE:=$(call strip_quotes,$(CONFIG_FMDFILE))
CONFIG_DEVICETREE:=$(call strip_quotes, $(CONFIG_DEVICETREE)) CONFIG_DEVICETREE:=$(call strip_quotes, $(CONFIG_DEVICETREE))
CONFIG_OVERRIDE_DEVICETREE:=$(call strip_quotes, $(CONFIG_OVERRIDE_DEVICETREE)) CONFIG_OVERRIDE_DEVICETREE:=$(call strip_quotes, $(CONFIG_OVERRIDE_DEVICETREE))
CONFIG_CHIPSET_DEVICETREE:=$(call strip_quotes, $(CONFIG_CHIPSET_DEVICETREE))
CONFIG_MEMLAYOUT_LD_FILE:=$(call strip_quotes, $(CONFIG_MEMLAYOUT_LD_FILE)) CONFIG_MEMLAYOUT_LD_FILE:=$(call strip_quotes, $(CONFIG_MEMLAYOUT_LD_FILE))
####################################################################### #######################################################################
@ -599,13 +600,18 @@ OVERRIDE_DEVICETREE_FILE := $(src)/mainboard/$(MAINBOARDDIR)/$(CONFIG_OVERRIDE_D
SCONFIG_OPTIONS += --override_devtree=$(OVERRIDE_DEVICETREE_FILE) SCONFIG_OPTIONS += --override_devtree=$(OVERRIDE_DEVICETREE_FILE)
endif endif
ifneq ($(CONFIG_CHIPSET_DEVICETREE),)
CHIPSET_DEVICETREE_FILE := $(src)/$(CONFIG_CHIPSET_DEVICETREE)
SCONFIG_OPTIONS += --chipset_devtree=$(CHIPSET_DEVICETREE_FILE)
endif
DEVICETREE_STATIC_C := $(obj)/mainboard/$(MAINBOARDDIR)/static.c DEVICETREE_STATIC_C := $(obj)/mainboard/$(MAINBOARDDIR)/static.c
SCONFIG_OPTIONS += --output_c=$(DEVICETREE_STATIC_C) SCONFIG_OPTIONS += --output_c=$(DEVICETREE_STATIC_C)
DEVICETREE_STATIC_H := $(obj)/static.h DEVICETREE_STATIC_H := $(obj)/static.h
SCONFIG_OPTIONS += --output_h=$(DEVICETREE_STATIC_H) SCONFIG_OPTIONS += --output_h=$(DEVICETREE_STATIC_H)
$(DEVICETREE_STATIC_C): $(DEVICETREE_FILE) $(OVERRIDE_DEVICETREE_FILE) $(objutil)/sconfig/sconfig $(DEVICETREE_STATIC_C): $(DEVICETREE_FILE) $(OVERRIDE_DEVICETREE_FILE) $(CHIPSET_DEVICETREE_FILE) $(objutil)/sconfig/sconfig
@printf " SCONFIG $(subst $(src)/,,$(<))\n" @printf " SCONFIG $(subst $(src)/,,$(<))\n"
mkdir -p $(dir $(DEVICETREE_STATIC_C)) mkdir -p $(dir $(DEVICETREE_STATIC_C))
$(objutil)/sconfig/sconfig $(SCONFIG_OPTIONS) $(objutil)/sconfig/sconfig $(SCONFIG_OPTIONS)

11
src/Kconfig
View File

@ -536,6 +536,17 @@ source "src/vendorcode/*/Kconfig"
source "src/arch/*/Kconfig" source "src/arch/*/Kconfig"
config CHIPSET_DEVICETREE
string
default ""
help
This symbol allows a chipset to provide a set of default settings in
a devicetree which are common to all mainboards. This may include
devices (including alias names), chip drivers, register settings,
and others. This path is relative to the src/ directory.
Example: "chipset.cb"
endmenu endmenu
source "src/device/Kconfig" source "src/device/Kconfig"

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

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

97
util/sconfig/main.c
View File

@ -69,6 +69,9 @@ typedef enum {
/* Root device of primary tree. */ /* Root device of primary tree. */
static struct device base_root_dev; static struct device base_root_dev;
/* Root device of chipset tree. */
static struct device chipset_root_dev;
/* Root device of override tree (if applicable). */ /* Root device of override tree (if applicable). */
static struct device override_root_dev; static struct device override_root_dev;
@ -88,6 +91,20 @@ static struct device base_root_dev = {
.bus = &base_root_bus, .bus = &base_root_bus,
}; };
static struct bus chipset_root_bus = {
.id = 0,
.dev = &chipset_root_dev,
};
static struct device chipset_root_dev = {
.name = "chipset_root",
.chip_instance = &mainboard_instance,
.path = " .type = DEVICE_PATH_ROOT ",
.parent = &chipset_root_bus,
.enabled = 1,
.bus = &chipset_root_bus,
};
static struct bus override_root_bus = { static struct bus override_root_bus = {
.id = 0, .id = 0,
.dev = &override_root_dev, .dev = &override_root_dev,
@ -689,28 +706,13 @@ static const struct device *find_alias(const struct device *const parent,
return NULL; return NULL;
} }
struct device *new_device(struct bus *parent, static struct device *new_device_with_path(struct bus *parent,
struct chip_instance *chip_instance, struct chip_instance *chip_instance,
const int bustype, const char *devnum, const int bustype, int path_a, int path_b,
char *alias, int status) char *alias, int status)
{ {
char *tmp;
int path_a;
int path_b = 0;
struct device *new_d; struct device *new_d;
/* Check for alias name conflicts. */
if (alias && find_alias(&base_root_dev, alias)) {
printf("ERROR: Alias already exists: %s\n", alias);
exit(1);
}
path_a = strtol(devnum, &tmp, 16);
if (*tmp == '.') {
tmp++;
path_b = strtol(tmp, NULL, 16);
}
/* If device is found under parent, no need to allocate new device. */ /* If device is found under parent, no need to allocate new device. */
new_d = get_dev(parent, path_a, path_b, bustype, chip_instance); new_d = get_dev(parent, path_a, path_b, bustype, chip_instance);
if (new_d) { if (new_d) {
@ -794,6 +796,46 @@ struct device *new_device(struct bus *parent,
return new_d; return new_d;
} }
struct device *new_device_reference(struct bus *parent,
struct chip_instance *chip_instance,
const char *reference, int status)
{
const struct device *dev = find_alias(&base_root_dev, reference);
if (!dev) {
printf("ERROR: Unable to find device reference %s\n", reference);
exit(1);
}
return new_device_with_path(parent, chip_instance, dev->bustype, dev->path_a,
dev->path_b, NULL, status);
}
struct device *new_device_raw(struct bus *parent,
struct chip_instance *chip_instance,
const int bustype, const char *devnum,
char *alias, int status)
{
char *tmp;
int path_a;
int path_b = 0;
/* Check for alias name conflicts. */
if (alias && find_alias(root_parent->dev, alias)) {
printf("ERROR: Alias already exists: %s\n", alias);
exit(1);
}
path_a = strtol(devnum, &tmp, 16);
if (*tmp == '.') {
tmp++;
path_b = strtol(tmp, NULL, 16);
}
return new_device_with_path(parent, chip_instance, bustype, path_a, path_b, alias,
status);
}
static void new_resource(struct device *dev, int type, int index, int base) static void new_resource(struct device *dev, int type, int index, int base)
{ {
struct resource *r = S_ALLOC(sizeof(struct resource)); struct resource *r = S_ALLOC(sizeof(struct resource));
@ -1315,6 +1357,7 @@ static void usage(void)
printf(" -r | --output_h : Path to header static.h file (required)\n"); printf(" -r | --output_h : Path to header static.h file (required)\n");
printf(" -m | --mainboard_devtree : Path to mainboard devicetree file (required)\n"); printf(" -m | --mainboard_devtree : Path to mainboard devicetree file (required)\n");
printf(" -o | --override_devtree : Path to override devicetree file (optional)\n"); printf(" -o | --override_devtree : Path to override devicetree file (optional)\n");
printf(" -p | --chipset_devtree : Path to chipset/SOC devicetree file (optional)\n");
exit(1); exit(1);
} }
@ -1683,6 +1726,7 @@ int main(int argc, char **argv)
static const struct option long_options[] = { static const struct option long_options[] = {
{ "mainboard_devtree", 1, NULL, 'm' }, { "mainboard_devtree", 1, NULL, 'm' },
{ "override_devtree", 1, NULL, 'o' }, { "override_devtree", 1, NULL, 'o' },
{ "chipset_devtree", 1, NULL, 'p' },
{ "output_c", 1, NULL, 'c' }, { "output_c", 1, NULL, 'c' },
{ "output_h", 1, NULL, 'r' }, { "output_h", 1, NULL, 'r' },
{ "help", 1, NULL, 'h' }, { "help", 1, NULL, 'h' },
@ -1690,11 +1734,12 @@ int main(int argc, char **argv)
}; };
const char *override_devtree = NULL; const char *override_devtree = NULL;
const char *base_devtree = NULL; const char *base_devtree = NULL;
const char *chipset_devtree = NULL;
const char *outputc = NULL; const char *outputc = NULL;
const char *outputh = NULL; const char *outputh = NULL;
int opt, option_index; int opt, option_index;
while ((opt = getopt_long(argc, argv, "m:o:c:r:h", long_options, while ((opt = getopt_long(argc, argv, "m:o:p:c:r:h", long_options,
&option_index)) != EOF) { &option_index)) != EOF) {
switch (opt) { switch (opt) {
case 'm': case 'm':
@ -1703,6 +1748,9 @@ int main(int argc, char **argv)
case 'o': case 'o':
override_devtree = strdup(optarg); override_devtree = strdup(optarg);
break; break;
case 'p':
chipset_devtree = strdup(optarg);
break;
case 'c': case 'c':
outputc = strdup(optarg); outputc = strdup(optarg);
break; break;
@ -1718,7 +1766,14 @@ int main(int argc, char **argv)
if (!base_devtree || !outputc || !outputh) if (!base_devtree || !outputc || !outputh)
usage(); usage();
parse_devicetree(base_devtree, &base_root_bus); if (chipset_devtree) {
/* Use the chipset devicetree as the base, then override
with the mainboard "base" devicetree. */
parse_devicetree(chipset_devtree, &base_root_bus);
parse_override_devicetree(base_devtree, &chipset_root_dev);
} else {
parse_devicetree(base_devtree, &base_root_bus);
}
if (override_devtree) if (override_devtree)
parse_override_devicetree(override_devtree, &override_root_dev); parse_override_devicetree(override_devtree, &override_root_dev);

12
util/sconfig/sconfig.h
View File

@ -175,10 +175,14 @@ struct device {
extern struct bus *root_parent; extern struct bus *root_parent;
struct device *new_device(struct bus *parent, struct device *new_device_raw(struct bus *parent,
struct chip_instance *chip_instance, struct chip_instance *chip_instance,
const int bustype, const char *devnum, const int bustype, const char *devnum,
char *alias, int status); char *alias, int status);
struct device *new_device_reference(struct bus *parent,
struct chip_instance *chip_instance,
const char *reference, int status);
void add_resource(struct bus *bus, int type, int index, int base); void add_resource(struct bus *bus, int type, int index, int base);

1
util/sconfig/sconfig.l
View File

@ -15,6 +15,7 @@ chip {return(CHIP);}
device {return(DEVICE);} device {return(DEVICE);}
alias {return(ALIAS);} alias {return(ALIAS);}
use {return(REFERENCE);} use {return(REFERENCE);}
ref {return(REFERENCE);}
as {return(ASSOCIATION);} as {return(ASSOCIATION);}
register {return(REGISTER);} register {return(REGISTER);}
fw_config {return(FW_CONFIG_TABLE);} fw_config {return(FW_CONFIG_TABLE);}

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

File diff suppressed because it is too large Load Diff

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

@ -1,4 +1,4 @@
/* A Bison parser, made by GNU Bison 3.5.3. */ /* A Bison parser, made by GNU Bison 3.6.3. */
/* Bison interface for Yacc-like parsers in C /* Bison interface for Yacc-like parsers in C
@ -31,8 +31,9 @@
This special exception was added by the Free Software Foundation in This special exception was added by the Free Software Foundation in
version 2.2 of Bison. */ version 2.2 of Bison. */
/* Undocumented macros, especially those whose name start with YY_, /* DO NOT RELY ON FEATURES THAT ARE NOT DOCUMENTED in the manual,
are private implementation details. Do not rely on them. */ especially those whose name start with YY_ or yy_. They are
private implementation details that can be changed or removed. */
#ifndef YY_YY_SRC_COREBOOT_UTIL_SCONFIG_SCONFIG_TAB_H_SHIPPED_INCLUDED #ifndef YY_YY_SRC_COREBOOT_UTIL_SCONFIG_SCONFIG_TAB_H_SHIPPED_INCLUDED
# define YY_YY_SRC_COREBOOT_UTIL_SCONFIG_SCONFIG_TAB_H_SHIPPED_INCLUDED # define YY_YY_SRC_COREBOOT_UTIL_SCONFIG_SCONFIG_TAB_H_SHIPPED_INCLUDED
@ -44,54 +45,59 @@
extern int yydebug; extern int yydebug;
#endif #endif
/* Token type. */ /* Token kinds. */
#ifndef YYTOKENTYPE #ifndef YYTOKENTYPE
# define YYTOKENTYPE # define YYTOKENTYPE
enum yytokentype enum yytokentype
{ {
CHIP = 258, YYEMPTY = -2,
DEVICE = 259, YYEOF = 0, /* "end of file" */
REGISTER = 260, YYerror = 256, /* error */
ALIAS = 261, YYUNDEF = 257, /* "invalid token" */
REFERENCE = 262, CHIP = 258, /* CHIP */
ASSOCIATION = 263, DEVICE = 259, /* DEVICE */
BOOL = 264, REGISTER = 260, /* REGISTER */
STATUS = 265, ALIAS = 261, /* ALIAS */
MANDATORY = 266, REFERENCE = 262, /* REFERENCE */
BUS = 267, ASSOCIATION = 263, /* ASSOCIATION */
RESOURCE = 268, BOOL = 264, /* BOOL */
END = 269, STATUS = 265, /* STATUS */
EQUALS = 270, MANDATORY = 266, /* MANDATORY */
HEX = 271, BUS = 267, /* BUS */
STRING = 272, RESOURCE = 268, /* RESOURCE */
PCI = 273, END = 269, /* END */
PNP = 274, EQUALS = 270, /* EQUALS */
I2C = 275, HEX = 271, /* HEX */
APIC = 276, STRING = 272, /* STRING */
CPU_CLUSTER = 277, PCI = 273, /* PCI */
CPU = 278, PNP = 274, /* PNP */
DOMAIN = 279, I2C = 275, /* I2C */
IRQ = 280, APIC = 276, /* APIC */
DRQ = 281, CPU_CLUSTER = 277, /* CPU_CLUSTER */
SLOT_DESC = 282, CPU = 278, /* CPU */
IO = 283, DOMAIN = 279, /* DOMAIN */
NUMBER = 284, IRQ = 280, /* IRQ */
SUBSYSTEMID = 285, DRQ = 281, /* DRQ */
INHERIT = 286, SLOT_DESC = 282, /* SLOT_DESC */
IOAPIC_IRQ = 287, IO = 283, /* IO */
IOAPIC = 288, NUMBER = 284, /* NUMBER */
PCIINT = 289, SUBSYSTEMID = 285, /* SUBSYSTEMID */
GENERIC = 290, INHERIT = 286, /* INHERIT */
SPI = 291, IOAPIC_IRQ = 287, /* IOAPIC_IRQ */
USB = 292, IOAPIC = 288, /* IOAPIC */
MMIO = 293, PCIINT = 289, /* PCIINT */
LPC = 294, GENERIC = 290, /* GENERIC */
ESPI = 295, SPI = 291, /* SPI */
FW_CONFIG_TABLE = 296, USB = 292, /* USB */
FW_CONFIG_FIELD = 297, MMIO = 293, /* MMIO */
FW_CONFIG_OPTION = 298, LPC = 294, /* LPC */
FW_CONFIG_PROBE = 299 ESPI = 295, /* ESPI */
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 */
}; };
typedef enum yytokentype yytoken_kind_t;
#endif #endif
/* Value type. */ /* Value type. */

10
util/sconfig/sconfig.y
View File

@ -37,13 +37,21 @@ chip: CHIP STRING /* == path */ {
}; };
device: DEVICE BUS NUMBER /* == devnum */ alias status { device: DEVICE BUS NUMBER /* == devnum */ alias status {
$<dev>$ = new_device(cur_parent, cur_chip_instance, $<number>2, $<string>3, $<string>4, $<number>5); $<dev>$ = new_device_raw(cur_parent, cur_chip_instance, $<number>2, $<string>3, $<string>4, $<number>5);
cur_parent = $<dev>$->last_bus; cur_parent = $<dev>$->last_bus;
} }
devicechildren END { devicechildren END {
cur_parent = $<dev>6->parent; cur_parent = $<dev>6->parent;
}; };
device: DEVICE REFERENCE STRING status {
$<dev>$ = new_device_reference(cur_parent, cur_chip_instance, $<string>3, $<number>4);
cur_parent = $<dev>$->last_bus;
}
devicechildren END {
cur_parent = $<dev>5->parent;
};
alias: /* empty */ { alias: /* empty */ {
$<string>$ = NULL; $<string>$ = NULL;
} | ALIAS STRING { } | ALIAS STRING {