From 0a6f82835ecbc43b43ff8645f049eee2844a4d85 Mon Sep 17 00:00:00 2001 From: Maxim Polyakov Date: Tue, 8 Sep 2020 10:12:02 +0300 Subject: util/intelp2m: Check keywords in common code MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit TEST = ./intelp2m -n -file inteltool.log; ./intelp2m -fld cb -file inteltool.log; ./intelp2m -fld fsp -file inteltool.log; ./intelp2m -fld raw -file inteltool.log. Before and after the patch, gpio.h is no different. Change-Id: I8af28960e41fcb97f03fe97c42cdddde07b3615a Signed-off-by: Maxim Polyakov Reviewed-on: https://review.coreboot.org/c/coreboot/+/45167 Tested-by: build bot (Jenkins) Reviewed-by: Matt DeVillier Reviewed-by: Michael Niewöhner --- util/intelp2m/platforms/apl/template.go | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'util/intelp2m/platforms/apl') diff --git a/util/intelp2m/platforms/apl/template.go b/util/intelp2m/platforms/apl/template.go index 5944727cd6..823b321f3d 100644 --- a/util/intelp2m/platforms/apl/template.go +++ b/util/intelp2m/platforms/apl/template.go @@ -1,6 +1,6 @@ package apl -import "strings" +import "../common" // GroupNameExtract - This function extracts the group ID, if it exists in a row // line : string from the configuration file @@ -16,7 +16,7 @@ func (PlatformSpecific) GroupNameExtract(line string) (bool, string) { // returns true if the keyword is contained in the line. // line : string from the configuration file func (PlatformSpecific) KeywordCheck(line string) bool { - for _, keyword := range []string{ + isIncluded, _ := common.KeywordsCheck(line, "GPIO_", "TCK", "TRST_B", "TMS", "TDI", "CX_PMODE", "CX_PREQ_B", "JTAGX", "CX_PRDY_B", "TDO", "CNV_BRI_DT", "CNV_BRI_RSP", "CNV_RGI_DT", "CNV_RGI_RSP", "SVID0_ALERT_B", "SVID0_DATA", "SVID0_CLK", "PMC_SPI_FS", "PMC_SPI_RXD", "PMC_SPI_TXD", "PMC_SPI_CLK", @@ -25,11 +25,6 @@ func (PlatformSpecific) KeywordCheck(line string) bool { "PMU_BATLOW_B", "PMU_PLTRST_B", "PMU_PWRBTN_B", "PMU_RESETBUTTON_B", "PMU_SLP_S0_B", "PMU_SLP_S3_B", "PMU_SLP_S4_B", "PMU_SUSCLK", "PMU_WAKE_B", "SUS_STAT_B", "SUSPWRDNACK", "SMB_ALERTB", "SMB_CLK", "SMB_DATA", "LPC_ILB_SERIRQ", "LPC_CLKOUT", "LPC_AD", "LPC_CLKRUNB", - "LPC_FRAMEB", - } { - if strings.Contains(line, keyword) { - return true - } - } - return false + "LPC_FRAMEB") + return isIncluded } -- cgit v1.2.3