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/cnl/template.go | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'util/intelp2m/platforms/cnl') diff --git a/util/intelp2m/platforms/cnl/template.go b/util/intelp2m/platforms/cnl/template.go index f1a17413bc..3b028e68ae 100644 --- a/util/intelp2m/platforms/cnl/template.go +++ b/util/intelp2m/platforms/cnl/template.go @@ -1,9 +1,8 @@ package cnl -import "strings" +import "../common" type InheritanceTemplate interface { - KeywordCheck(line string) bool } @@ -13,16 +12,8 @@ type InheritanceTemplate interface { // bool : true if the string contains a group identifier // string : group identifier func (PlatformSpecific) GroupNameExtract(line string) (bool, string) { - for _, groupKeyword := range []string{ - "GPP_A", "GPP_B", "GPP_G", - "GPP_D", "GPP_F", "GPP_H", - "GPD", "GPP_C", "GPP_E", - } { - if strings.Contains(line, groupKeyword) { - return true, groupKeyword - } - } - return false, "" + return common.KeywordsCheck(line, + "GPP_A", "GPP_B", "GPP_G", "GPP_D", "GPP_F", "GPP_H", "GPD", "GPP_C", "GPP_E") } // KeywordCheck - This function is used to filter parsed lines of the configuration file and -- cgit v1.2.3