util/intelp2m: Check keywords in common code
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 <max.senia.poliak@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/45167 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Matt DeVillier <matt.devillier@gmail.com> Reviewed-by: Michael Niewöhner <foss@mniewoehner.de>
This commit is contained in:
committed by
Patrick Georgi
parent
85e4c43b02
commit
0a6f82835e
@@ -1,6 +1,6 @@
|
||||
package snr
|
||||
|
||||
import "strings"
|
||||
import "../common"
|
||||
|
||||
// GroupNameExtract - This function extracts the group ID, if it exists in a row
|
||||
// line : string from the configuration file
|
||||
@@ -8,30 +8,16 @@ import "strings"
|
||||
// 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_F",
|
||||
"GPP_C", "GPP_D", "GPP_E",
|
||||
"GPD", "GPP_I",
|
||||
"GPP_J", "GPP_K",
|
||||
"GPP_G", "GPP_H", "GPP_L",
|
||||
} {
|
||||
if strings.Contains(line, groupKeyword) {
|
||||
return true, groupKeyword
|
||||
}
|
||||
}
|
||||
return false, ""
|
||||
return common.KeywordsCheck(line,
|
||||
"GPP_A", "GPP_B", "GPP_F", "GPP_C", "GPP_D", "GPP_E", "GPD", "GPP_I", "GPP_J",
|
||||
"GPP_K", "GPP_G", "GPP_H", "GPP_L")
|
||||
}
|
||||
|
||||
// KeywordCheck - This function is used to filter parsed lines of the configuration file and
|
||||
// returns true if the keyword is contained in the line.
|
||||
// line : string from the configuration file
|
||||
// line : string from the configuration file
|
||||
// Returns false if no word was found, or true otherwise
|
||||
func (PlatformSpecific) KeywordCheck(line string) bool {
|
||||
for _, keyword := range []string{
|
||||
"GPP_", "GPD",
|
||||
} {
|
||||
if strings.Contains(line, keyword) {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
isIncluded, _ := common.KeywordsCheck(line, "GPP_", "GPD")
|
||||
return isIncluded
|
||||
}
|
||||
|
Reference in New Issue
Block a user