5 files changed, 34 insertions, 33 deletions
diff --git a/util/intelp2m/platforms/apl/macro.go b/util/intelp2m/platforms/apl/macro.go
index 0364067f11..5f27074570 100644
--- a/util/intelp2m/platforms/apl/macro.go
+++ b/util/intelp2m/platforms/apl/macro.go
@@ -1,12 +1,12 @@
 package apl
 
-import "fmt"
-import "strconv"
-
-// Local packages
-import "../common"
-import "../../config"
-import "../../fields"
+import (
+	"fmt"
+	"strconv"
+	"../common"
+	"../../config"
+	"../../fields"
+)
 
 const (
 	PAD_CFG_DW0_RO_FIELDS = (0x1 << 27) | (0x1 << 24) | (0x3 << 21) | (0xf << 16) | 0xfc
diff --git a/util/intelp2m/platforms/cnl/macro.go b/util/intelp2m/platforms/cnl/macro.go
index c3bdfc88b1..714bfa1b66 100644
--- a/util/intelp2m/platforms/cnl/macro.go
+++ b/util/intelp2m/platforms/cnl/macro.go
@@ -1,13 +1,13 @@
 package cnl
 
-import "strings"
-import "fmt"
-
-// Local packages
-import "../common"
-import "../../config"
-import "../../fields"
-import "../snr"
+import (
+	"strings"
+	"fmt"
+	"../common"
+	"../../config"
+	"../../fields"
+	"../snr"
+)
 
 const (
 	PAD_CFG_DW0_RO_FIELDS = (0x1 << 27) | (0x1 << 24) | (0x3 << 21) | (0xf << 16) | 0xfc
diff --git a/util/intelp2m/platforms/common/macro.go b/util/intelp2m/platforms/common/macro.go
index 38937f66b9..ed42729d96 100644
--- a/util/intelp2m/platforms/common/macro.go
+++ b/util/intelp2m/platforms/common/macro.go
@@ -1,9 +1,10 @@
 package common
 
-import "strconv"
-import "sync"
-
-import "../../config"
+import (
+	"strconv"
+	"sync"
+	"../../config"
+)
 
 type Fields interface {
 	DecodeDW0()
diff --git a/util/intelp2m/platforms/lbg/macro.go b/util/intelp2m/platforms/lbg/macro.go
index 6b44a25885..003ea3f14b 100644
--- a/util/intelp2m/platforms/lbg/macro.go
+++ b/util/intelp2m/platforms/lbg/macro.go
@@ -1,12 +1,12 @@
 package lbg
 
-import "fmt"
-
-// Local packages
-import "../../config"
-import "../../fields"
-import "../common"
-import "../snr"
+import (
+	"fmt"
+	"../../config"
+	"../../fields"
+	"../common"
+	"../snr"
+)
 
 const (
 	PAD_CFG_DW0_RO_FIELDS = (0x1 << 27) | (0x1 << 24) | (0x3 << 21) | (0xf << 16) | 0xfc
diff --git a/util/intelp2m/platforms/snr/macro.go b/util/intelp2m/platforms/snr/macro.go
index fb530c54c1..cebb0cd890 100644
--- a/util/intelp2m/platforms/snr/macro.go
+++ b/util/intelp2m/platforms/snr/macro.go
@@ -1,12 +1,12 @@
 package snr
 
-import "strings"
-import "fmt"
-
-// Local packages
-import "../common"
-import "../../config"
-import "../../fields"
+import (
+	"strings"
+	"fmt"
+	"../common"
+	"../../config"
+	"../../fields"
+)
 
 const (
 	PAD_CFG_DW0_RO_FIELDS = (0x1 << 27) | (0x1 << 24) | (0x3 << 21) | (0xf << 16) | 0xfc