From 2d615e58dad5436db929f36a051e106a2ea87cea Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Fri, 29 May 2015 21:43:51 +0200 Subject: 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 Reviewed-on: http://review.coreboot.org/10372 Tested-by: build bot (Jenkins) Reviewed-by: Edward O'Callaghan --- util/autoport/main.go | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'util') diff --git a/util/autoport/main.go b/util/autoport/main.go index e9d847d9a0..add58a11a4 100644 --- a/util/autoport/main.go +++ b/util/autoport/main.go @@ -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 -- cgit v1.2.3