util/sconfig: Remove unused devicetree keywords ESPI & LPC
The ESPI & LPC keywords were added for the zork program, but it was
found that they weren't needed, so they were never used.
BUG=None
TEST=Build
Signed-off-by: Martin Roth <martin@coreboot.org>
Change-Id: I3a78afc55477d62eac8056e2ca4bcdd3ab12ea47
Reviewed-on: https://review.coreboot.org/c/coreboot/+/56197
Reviewed-by: Raul Rangel <rrangel@chromium.org>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
diff --git a/util/sconfig/sconfig.tab.c_shipped b/util/sconfig/sconfig.tab.c_shipped
index 68421a1..6155dc0 100644
--- a/util/sconfig/sconfig.tab.c_shipped
+++ b/util/sconfig/sconfig.tab.c_shipped
@@ -149,42 +149,40 @@
YYSYMBOL_SPI = 36, /* SPI */
YYSYMBOL_USB = 37, /* USB */
YYSYMBOL_MMIO = 38, /* MMIO */
- YYSYMBOL_LPC = 39, /* LPC */
- YYSYMBOL_ESPI = 40, /* ESPI */
- YYSYMBOL_GPIO = 41, /* GPIO */
- YYSYMBOL_FW_CONFIG_TABLE = 42, /* FW_CONFIG_TABLE */
- YYSYMBOL_FW_CONFIG_FIELD = 43, /* FW_CONFIG_FIELD */
- YYSYMBOL_FW_CONFIG_OPTION = 44, /* FW_CONFIG_OPTION */
- YYSYMBOL_FW_CONFIG_PROBE = 45, /* FW_CONFIG_PROBE */
- YYSYMBOL_PIPE = 46, /* PIPE */
- YYSYMBOL_YYACCEPT = 47, /* $accept */
- YYSYMBOL_devtree = 48, /* devtree */
- YYSYMBOL_chipchildren = 49, /* chipchildren */
- YYSYMBOL_devicechildren = 50, /* devicechildren */
- YYSYMBOL_chip = 51, /* chip */
- YYSYMBOL_52_1 = 52, /* @1 */
- YYSYMBOL_device = 53, /* device */
- YYSYMBOL_54_2 = 54, /* @2 */
- YYSYMBOL_55_3 = 55, /* @3 */
- YYSYMBOL_alias = 56, /* alias */
- YYSYMBOL_status = 57, /* status */
- YYSYMBOL_resource = 58, /* resource */
- YYSYMBOL_reference = 59, /* reference */
- YYSYMBOL_registers = 60, /* registers */
- YYSYMBOL_subsystemid = 61, /* subsystemid */
- YYSYMBOL_ioapic_irq = 62, /* ioapic_irq */
- YYSYMBOL_smbios_slot_desc = 63, /* smbios_slot_desc */
- YYSYMBOL_fw_config_table = 64, /* fw_config_table */
- YYSYMBOL_fw_config_table_children = 65, /* fw_config_table_children */
- YYSYMBOL_fw_config_field_children = 66, /* fw_config_field_children */
- YYSYMBOL_fw_config_field_bits = 67, /* fw_config_field_bits */
- YYSYMBOL_fw_config_field_bits_repeating = 68, /* fw_config_field_bits_repeating */
- YYSYMBOL_fw_config_field = 69, /* fw_config_field */
- YYSYMBOL_70_4 = 70, /* $@4 */
- YYSYMBOL_71_5 = 71, /* $@5 */
- YYSYMBOL_72_6 = 72, /* $@6 */
- YYSYMBOL_fw_config_option = 73, /* fw_config_option */
- YYSYMBOL_fw_config_probe = 74 /* fw_config_probe */
+ 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_YYACCEPT = 45, /* $accept */
+ YYSYMBOL_devtree = 46, /* devtree */
+ YYSYMBOL_chipchildren = 47, /* chipchildren */
+ YYSYMBOL_devicechildren = 48, /* devicechildren */
+ YYSYMBOL_chip = 49, /* chip */
+ YYSYMBOL_50_1 = 50, /* @1 */
+ YYSYMBOL_device = 51, /* device */
+ YYSYMBOL_52_2 = 52, /* @2 */
+ YYSYMBOL_53_3 = 53, /* @3 */
+ YYSYMBOL_alias = 54, /* alias */
+ YYSYMBOL_status = 55, /* status */
+ YYSYMBOL_resource = 56, /* resource */
+ YYSYMBOL_reference = 57, /* reference */
+ YYSYMBOL_registers = 58, /* registers */
+ YYSYMBOL_subsystemid = 59, /* subsystemid */
+ YYSYMBOL_ioapic_irq = 60, /* ioapic_irq */
+ YYSYMBOL_smbios_slot_desc = 61, /* smbios_slot_desc */
+ YYSYMBOL_fw_config_table = 62, /* fw_config_table */
+ YYSYMBOL_fw_config_table_children = 63, /* fw_config_table_children */
+ YYSYMBOL_fw_config_field_children = 64, /* fw_config_field_children */
+ YYSYMBOL_fw_config_field_bits = 65, /* fw_config_field_bits */
+ YYSYMBOL_fw_config_field_bits_repeating = 66, /* fw_config_field_bits_repeating */
+ YYSYMBOL_fw_config_field = 67, /* fw_config_field */
+ YYSYMBOL_68_4 = 68, /* $@4 */
+ YYSYMBOL_69_5 = 69, /* $@5 */
+ YYSYMBOL_70_6 = 70, /* $@6 */
+ YYSYMBOL_fw_config_option = 71, /* fw_config_option */
+ YYSYMBOL_fw_config_probe = 72 /* fw_config_probe */
};
typedef enum yysymbol_kind_t yysymbol_kind_t;
@@ -506,10 +504,10 @@
/* YYFINAL -- State number of the termination state. */
#define YYFINAL 2
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 83
+#define YYLAST 97
/* YYNTOKENS -- Number of terminals. */
-#define YYNTOKENS 47
+#define YYNTOKENS 45
/* YYNNTS -- Number of nonterminals. */
#define YYNNTS 28
/* YYNRULES -- Number of rules. */
@@ -518,7 +516,7 @@
#define YYNSTATES 95
/* YYMAXUTOK -- Last valid token kind. */
-#define YYMAXUTOK 301
+#define YYMAXUTOK 299
/* YYTRANSLATE(TOKEN-NUM) -- Symbol number corresponding to TOKEN-NUM
@@ -561,8 +559,7 @@
5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
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
+ 35, 36, 37, 38, 39, 40, 41, 42, 43, 44
};
#if YYDEBUG
@@ -595,8 +592,8 @@
"MANDATORY", "BUS", "RESOURCE", "END", "EQUALS", "HEX", "STRING", "PCI",
"PNP", "I2C", "APIC", "CPU_CLUSTER", "CPU", "DOMAIN", "IRQ", "DRQ",
"SLOT_DESC", "IO", "NUMBER", "SUBSYSTEMID", "INHERIT", "IOAPIC_IRQ",
- "IOAPIC", "PCIINT", "GENERIC", "SPI", "USB", "MMIO", "LPC", "ESPI",
- "GPIO", "FW_CONFIG_TABLE", "FW_CONFIG_FIELD", "FW_CONFIG_OPTION",
+ "IOAPIC", "PCIINT", "GENERIC", "SPI", "USB", "MMIO", "GPIO",
+ "FW_CONFIG_TABLE", "FW_CONFIG_FIELD", "FW_CONFIG_OPTION",
"FW_CONFIG_PROBE", "PIPE", "$accept", "devtree", "chipchildren",
"devicechildren", "chip", "@1", "device", "@2", "@3", "alias", "status",
"resource", "reference", "registers", "subsystemid", "ioapic_irq",
@@ -622,11 +619,11 @@
265, 266, 267, 268, 269, 270, 271, 272, 273, 274,
275, 276, 277, 278, 279, 280, 281, 282, 283, 284,
285, 286, 287, 288, 289, 290, 291, 292, 293, 294,
- 295, 296, 297, 298, 299, 300, 301
+ 295, 296, 297, 298, 299
};
#endif
-#define YYPACT_NINF (-21)
+#define YYPACT_NINF (-27)
#define yypact_value_is_default(Yyn) \
((Yyn) == YYPACT_NINF)
@@ -640,16 +637,16 @@
STATE-NUM. */
static const yytype_int8 yypact[] =
{
- -21, 9, -21, 2, -21, -21, -21, -21, -11, -21,
- -21, 8, -21, 45, -13, 10, 18, 19, -21, -21,
- -21, -21, -21, 12, -20, -21, 22, 15, 25, 37,
- -21, -21, 24, -21, -7, 11, 41, 38, 39, -6,
- 12, -20, -21, -21, 40, -21, -21, -21, -21, 43,
- 11, -21, -21, -21, -21, -1, 29, -21, -21, -21,
- -21, -21, -3, -21, 32, -21, 46, 33, 35, 48,
- -21, -21, -21, -21, -21, -21, -21, -21, 1, 51,
- 50, 42, 20, 52, -21, 44, 53, 47, 54, -21,
- -21, 55, -21, -21, -21
+ -27, 9, -27, 2, -27, -27, -27, -27, -11, -27,
+ -27, 4, -27, 43, -13, 10, 20, 21, -27, -27,
+ -27, -27, -27, 13, -26, -27, 22, 14, 30, 44,
+ -27, -27, 24, -27, -7, 16, 45, 37, 38, -6,
+ 13, -26, -27, -27, 39, -27, -27, -27, -27, 41,
+ 16, -27, -27, -27, -27, -1, 31, -27, -27, -27,
+ -27, -27, -3, -27, 32, -27, 42, 33, 34, 47,
+ -27, -27, -27, -27, -27, -27, -27, -27, 1, 50,
+ 49, 40, 36, 51, -27, 46, 54, 48, 52, -27,
+ -27, 55, -27, -27, -27
};
/* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
@@ -672,9 +669,9 @@
/* YYPGOTO[NTERM-NUM]. */
static const yytype_int8 yypgoto[] =
{
- -21, -21, -21, 5, 17, -21, 61, -21, -21, -21,
- 26, -21, -21, 62, -21, -21, -21, -21, -21, -8,
- 49, 36, -21, -21, -21, -21, -21, -21
+ -27, -27, -27, 11, 19, -27, 60, -27, -27, -27,
+ 17, -27, -27, 63, -27, -27, -27, -27, -27, -8,
+ 53, 56, -27, -27, -27, -27, -27, -27
};
/* YYDEFGOTO[NTERM-NUM]. */
@@ -691,41 +688,43 @@
static const yytype_int8 yytable[] =
{
3, 15, 16, 10, 3, 15, 16, 43, 53, 2,
- 64, 65, 3, 60, 64, 84, 23, 26, 5, 7,
- 46, 47, 27, 39, 66, 14, 32, 67, 66, 68,
- 19, 67, 11, 68, 55, 28, 29, 44, 44, 35,
- 37, 30, 69, 44, 36, 38, 69, 49, 3, 15,
- 16, 4, 17, 40, 88, 51, 52, 56, 61, 18,
- 58, 79, 81, 80, 82, 83, 85, 86, 78, 89,
- 91, 87, 94, 90, 20, 22, 59, 54, 92, 0,
- 0, 41, 0, 93
+ 64, 65, 3, 60, 64, 84, 23, 26, 32, 7,
+ 5, 14, 27, 39, 66, 46, 47, 67, 66, 68,
+ 11, 67, 19, 68, 55, 44, 44, 28, 29, 35,
+ 69, 44, 30, 36, 69, 37, 3, 15, 16, 4,
+ 17, 49, 38, 40, 51, 52, 56, 18, 58, 80,
+ 61, 79, 81, 82, 83, 85, 86, 59, 89, 87,
+ 88, 91, 94, 20, 78, 90, 22, 0, 0, 92,
+ 0, 93, 0, 0, 0, 41, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 54
};
static const yytype_int8 yycheck[] =
{
3, 4, 5, 14, 3, 4, 5, 14, 14, 0,
- 13, 14, 3, 14, 13, 14, 29, 7, 1, 17,
- 9, 10, 12, 31, 27, 17, 46, 30, 27, 32,
- 13, 30, 43, 32, 42, 17, 17, 44, 44, 17,
- 15, 29, 45, 44, 29, 8, 45, 6, 3, 4,
- 5, 42, 7, 29, 34, 17, 17, 17, 29, 14,
- 17, 29, 29, 17, 29, 17, 15, 17, 63, 17,
- 17, 29, 17, 29, 13, 13, 50, 41, 31, -1,
- -1, 32, -1, 29
+ 13, 14, 3, 14, 13, 14, 29, 7, 44, 17,
+ 1, 17, 12, 31, 27, 9, 10, 30, 27, 32,
+ 41, 30, 13, 32, 42, 42, 42, 17, 17, 17,
+ 43, 42, 29, 29, 43, 15, 3, 4, 5, 40,
+ 7, 6, 8, 29, 17, 17, 17, 14, 17, 17,
+ 29, 29, 29, 29, 17, 15, 17, 50, 17, 29,
+ 34, 17, 17, 13, 63, 29, 13, -1, -1, 31,
+ -1, 29, -1, -1, -1, 32, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 41
};
/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
symbol of state STATE-NUM. */
static const yytype_int8 yystos[] =
{
- 0, 48, 0, 3, 42, 51, 64, 17, 65, 52,
- 14, 43, 69, 49, 17, 4, 5, 7, 14, 51,
- 53, 59, 60, 29, 67, 72, 7, 12, 17, 17,
- 29, 71, 46, 68, 66, 17, 29, 15, 8, 66,
- 29, 67, 70, 14, 44, 73, 9, 10, 57, 6,
- 56, 17, 17, 14, 68, 66, 17, 55, 17, 57,
- 14, 29, 50, 54, 13, 14, 27, 30, 32, 45,
- 51, 53, 58, 60, 61, 62, 63, 74, 50, 29,
+ 0, 46, 0, 3, 40, 49, 62, 17, 63, 50,
+ 14, 41, 67, 47, 17, 4, 5, 7, 14, 49,
+ 51, 57, 58, 29, 65, 70, 7, 12, 17, 17,
+ 29, 69, 44, 66, 64, 17, 29, 15, 8, 64,
+ 29, 65, 68, 14, 42, 71, 9, 10, 55, 6,
+ 54, 17, 17, 14, 66, 64, 17, 53, 17, 55,
+ 14, 29, 48, 52, 13, 14, 27, 30, 32, 43,
+ 49, 51, 56, 58, 59, 60, 61, 72, 48, 29,
17, 29, 29, 17, 14, 15, 17, 29, 34, 17,
29, 17, 31, 29, 17
};
@@ -733,12 +732,12 @@
/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
static const yytype_int8 yyr1[] =
{
- 0, 47, 48, 48, 48, 49, 49, 49, 49, 49,
- 50, 50, 50, 50, 50, 50, 50, 50, 50, 52,
- 51, 54, 53, 55, 53, 56, 56, 57, 57, 58,
- 59, 60, 61, 61, 62, 63, 63, 63, 64, 65,
- 65, 66, 66, 67, 68, 68, 70, 69, 71, 69,
- 72, 69, 73, 74
+ 0, 45, 46, 46, 46, 47, 47, 47, 47, 47,
+ 48, 48, 48, 48, 48, 48, 48, 48, 48, 50,
+ 49, 52, 51, 53, 51, 54, 54, 55, 55, 56,
+ 57, 58, 59, 59, 60, 61, 61, 61, 62, 63,
+ 63, 64, 64, 65, 66, 66, 68, 67, 69, 67,
+ 70, 67, 71, 72
};
/* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */