10 files changed, 30 insertions, 24 deletions
diff --git a/util/intelp2m/platforms/adl/macro.go b/util/intelp2m/platforms/adl/macro.go
index 9ef4cd5200..d7b1f58f0b 100644
--- a/util/intelp2m/platforms/adl/macro.go
+++ b/util/intelp2m/platforms/adl/macro.go
@@ -3,11 +3,12 @@ package adl
 import (
 	"strings"
 	"fmt"
-	"../common"
-	"../../config"
-	"../../fields"
-	"../snr"
-	"../cnl"
+
+	"review.coreboot.org/coreboot.git/util/intelp2m/platforms/common"
+	"review.coreboot.org/coreboot.git/util/intelp2m/platforms/snr"
+	"review.coreboot.org/coreboot.git/util/intelp2m/platforms/cnl"
+	"review.coreboot.org/coreboot.git/util/intelp2m/config"
+	"review.coreboot.org/coreboot.git/util/intelp2m/fields"
 )
 
 const (
diff --git a/util/intelp2m/platforms/adl/template.go b/util/intelp2m/platforms/adl/template.go
index 491aa3c93a..672be84070 100644
--- a/util/intelp2m/platforms/adl/template.go
+++ b/util/intelp2m/platforms/adl/template.go
@@ -1,6 +1,6 @@
 package adl
 
-import "../common"
+import "review.coreboot.org/coreboot.git/util/intelp2m/platforms/common"
 
 // GroupNameExtract - This function extracts the group ID, if it exists in a row
 // line      : string from the configuration file
diff --git a/util/intelp2m/platforms/apl/macro.go b/util/intelp2m/platforms/apl/macro.go
index 5f27074570..2098c5788f 100644
--- a/util/intelp2m/platforms/apl/macro.go
+++ b/util/intelp2m/platforms/apl/macro.go
@@ -3,9 +3,10 @@ package apl
 import (
 	"fmt"
 	"strconv"
-	"../common"
-	"../../config"
-	"../../fields"
+
+	"review.coreboot.org/coreboot.git/util/intelp2m/platforms/common"
+	"review.coreboot.org/coreboot.git/util/intelp2m/config"
+	"review.coreboot.org/coreboot.git/util/intelp2m/fields"
 )
 
 const (
diff --git a/util/intelp2m/platforms/apl/template.go b/util/intelp2m/platforms/apl/template.go
index 823b321f3d..05d505f786 100644
--- a/util/intelp2m/platforms/apl/template.go
+++ b/util/intelp2m/platforms/apl/template.go
@@ -1,6 +1,6 @@
 package apl
 
-import "../common"
+import "review.coreboot.org/coreboot.git/util/intelp2m/platforms/common"
 
 // GroupNameExtract - This function extracts the group ID, if it exists in a row
 // line      : string from the configuration file
diff --git a/util/intelp2m/platforms/cnl/macro.go b/util/intelp2m/platforms/cnl/macro.go
index 714bfa1b66..5526b8f1f5 100644
--- a/util/intelp2m/platforms/cnl/macro.go
+++ b/util/intelp2m/platforms/cnl/macro.go
@@ -3,10 +3,11 @@ package cnl
 import (
 	"strings"
 	"fmt"
-	"../common"
-	"../../config"
-	"../../fields"
-	"../snr"
+
+	"review.coreboot.org/coreboot.git/util/intelp2m/platforms/common"
+	"review.coreboot.org/coreboot.git/util/intelp2m/config"
+	"review.coreboot.org/coreboot.git/util/intelp2m/fields"
+	"review.coreboot.org/coreboot.git/util/intelp2m/platforms/snr"
 )
 
 const (
diff --git a/util/intelp2m/platforms/cnl/template.go b/util/intelp2m/platforms/cnl/template.go
index 3b028e68ae..b38d9689f4 100644
--- a/util/intelp2m/platforms/cnl/template.go
+++ b/util/intelp2m/platforms/cnl/template.go
@@ -1,6 +1,6 @@
 package cnl
 
-import "../common"
+import "review.coreboot.org/coreboot.git/util/intelp2m/platforms/common"
 
 type InheritanceTemplate interface {
 	KeywordCheck(line string) bool
diff --git a/util/intelp2m/platforms/common/macro.go b/util/intelp2m/platforms/common/macro.go
index ed42729d96..ddb612a9a9 100644
--- a/util/intelp2m/platforms/common/macro.go
+++ b/util/intelp2m/platforms/common/macro.go
@@ -3,7 +3,8 @@ package common
 import (
 	"strconv"
 	"sync"
-	"../../config"
+
+	"review.coreboot.org/coreboot.git/util/intelp2m/config"
 )
 
 type Fields interface {
diff --git a/util/intelp2m/platforms/lbg/macro.go b/util/intelp2m/platforms/lbg/macro.go
index 003ea3f14b..db34f8e6cf 100644
--- a/util/intelp2m/platforms/lbg/macro.go
+++ b/util/intelp2m/platforms/lbg/macro.go
@@ -2,10 +2,11 @@ package lbg
 
 import (
 	"fmt"
-	"../../config"
-	"../../fields"
-	"../common"
-	"../snr"
+
+	"review.coreboot.org/coreboot.git/util/intelp2m/platforms/common"
+	"review.coreboot.org/coreboot.git/util/intelp2m/config"
+	"review.coreboot.org/coreboot.git/util/intelp2m/fields"
+	"review.coreboot.org/coreboot.git/util/intelp2m/platforms/snr"
 )
 
 const (
diff --git a/util/intelp2m/platforms/snr/macro.go b/util/intelp2m/platforms/snr/macro.go
index cebb0cd890..4e170103ba 100644
--- a/util/intelp2m/platforms/snr/macro.go
+++ b/util/intelp2m/platforms/snr/macro.go
@@ -3,9 +3,10 @@ package snr
 import (
 	"strings"
 	"fmt"
-	"../common"
-	"../../config"
-	"../../fields"
+
+	"review.coreboot.org/coreboot.git/util/intelp2m/platforms/common"
+	"review.coreboot.org/coreboot.git/util/intelp2m/config"
+	"review.coreboot.org/coreboot.git/util/intelp2m/fields"
 )
 
 const (
diff --git a/util/intelp2m/platforms/snr/template.go b/util/intelp2m/platforms/snr/template.go
index 9bcf9e1029..2a5dfc3643 100644
--- a/util/intelp2m/platforms/snr/template.go
+++ b/util/intelp2m/platforms/snr/template.go
@@ -1,6 +1,6 @@
 package snr
 
-import "../common"
+import "review.coreboot.org/coreboot.git/util/intelp2m/platforms/common"
 
 // GroupNameExtract - This function extracts the group ID, if it exists in a row
 // line      : string from the configuration file