autoport: Strip inc, co and corp suffixes from vendor name
Apple is named Apple Inc in DMI but is "apple" in coreboot naming. For other vendors we should follow similar pattern. Change-Id: I7975b19faaf942c5bd44a704bcee994815499ceb Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com> Reviewed-on: http://review.coreboot.org/10372 Tested-by: build bot (Jenkins) Reviewed-by: Edward O'Callaghan <edward.ocallaghan@koparo.com>
This commit is contained in:
@ -90,6 +90,7 @@ type Context struct {
|
||||
Model string
|
||||
BaseDirectory string
|
||||
InfoSource DevReader
|
||||
SaneVendor string
|
||||
}
|
||||
|
||||
type IOAPICIRQ struct {
|
||||
@ -622,7 +623,7 @@ const MoboDir = "/src/mainboard/"
|
||||
|
||||
func makeVendor(ctx Context) {
|
||||
vendor := ctx.Vendor
|
||||
vendorSane := sanitize(ctx.Vendor)
|
||||
vendorSane := ctx.SaneVendor
|
||||
vendorDir := *FlagOutDir + MoboDir + vendorSane
|
||||
vendorUpper := strings.ToUpper(vendorSane)
|
||||
kconfig := vendorDir + "/Kconfig"
|
||||
@ -702,8 +703,18 @@ func main() {
|
||||
if dmi.IsLaptop {
|
||||
KconfigBool["SYSTEM_TYPE_LAPTOP"] = true
|
||||
}
|
||||
ctx.MoboID = sanitize(ctx.Vendor) + "/" + sanitize(ctx.Model)
|
||||
ctx.KconfigName = "BOARD_" + strings.ToUpper(sanitize(ctx.Vendor)+"_"+sanitize(ctx.Model))
|
||||
ctx.SaneVendor = sanitize(ctx.Vendor)
|
||||
for {
|
||||
last := ctx.SaneVendor
|
||||
for _, suf := range []string{"_inc", "_co", "_corp"} {
|
||||
ctx.SaneVendor = strings.TrimSuffix(ctx.SaneVendor, suf)
|
||||
}
|
||||
if last == ctx.SaneVendor {
|
||||
break
|
||||
}
|
||||
}
|
||||
ctx.MoboID = ctx.SaneVendor + "/" + sanitize(ctx.Model)
|
||||
ctx.KconfigName = "BOARD_" + strings.ToUpper(ctx.SaneVendor+"_"+sanitize(ctx.Model))
|
||||
ctx.BaseDirectory = *FlagOutDir + MoboDir + ctx.MoboID
|
||||
KconfigStringUnquoted["MAINBOARD_DIR"] = ctx.MoboID
|
||||
KconfigString["MAINBOARD_PART_NUMBER"] = ctx.Model
|
||||
|
Reference in New Issue
Block a user