Change in coreboot[master]: soc/intel/xeon_sp/cpx: Remove duplicate macros

[Marc Jones (Code Review)]

Marc Jones has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/46809 )

Change subject: soc/intel/xeon_sp/cpx: Remove duplicate macros
......................................................................

soc/intel/xeon_sp/cpx: Remove duplicate macros

Use the xeon_sp common version of the macros in xeon_sp/include/soc/util.h.

Change-Id: I3ede3c8a4b51b8c9fc1c392e65e670d4abd0f3d7
Signed-off-by: Marc Jones 
---
M src/soc/intel/xeon_sp/cpx/chip.c
M src/soc/intel/xeon_sp/cpx/cpu.c
M src/soc/intel/xeon_sp/cpx/include/soc/soc_util.h
3 files changed, 2 insertions(+), 14 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/09/46809/1

diff --git a/src/soc/intel/xeon_sp/cpx/chip.c b/src/soc/intel/xeon_sp/cpx/chip.c
index c5a8c1c..425421a 100644
--- a/src/soc/intel/xeon_sp/cpx/chip.c
+++ b/src/soc/intel/xeon_sp/cpx/chip.c
@@ -14,6 +14,7 @@
 #include <soc/ramstage.h>
 #include <soc/pm.h>
 #include <soc/soc_util.h>
+#include <soc/util.h>
 #include <stdlib.h>

/* C620 IOAPIC has 120 redirection entries */
diff --git a/src/soc/intel/xeon_sp/cpx/cpu.c b/src/soc/intel/xeon_sp/cpx/cpu.c
index 0999f6d..d8a5e45 100644
--- a/src/soc/intel/xeon_sp/cpx/cpu.c
+++ b/src/soc/intel/xeon_sp/cpx/cpu.c
@@ -15,6 +15,7 @@
 #include <soc/cpu.h>
 #include <soc/msr.h>
 #include <soc/soc_util.h>
+#include <soc/util.h>
 #include "chip.h"
 #include <cpu/intel/common/common.h>

diff --git a/src/soc/intel/xeon_sp/cpx/include/soc/soc_util.h b/src/soc/intel/xeon_sp/cpx/include/soc/soc_util.h
index 412730b..097c16e 100644
--- a/src/soc/intel/xeon_sp/cpx/include/soc/soc_util.h
+++ b/src/soc/intel/xeon_sp/cpx/include/soc/soc_util.h
@@ -8,20 +8,6 @@
 #include <hob_memmap.h>
 #include <stdint.h>

-#define DEV_FUNC_ENTER(dev) \
-	printk(BIOS_SPEW, "%s:%s:%d: ENTER (dev: %s)\n", \
-		__FILE__, __func__, __LINE__, dev_path(dev))
-
-#define DEV_FUNC_EXIT(dev) \
-	printk(BIOS_SPEW, "%s:%s:%d: EXIT (dev: %s)\n", __FILE__, \
-		__func__, __LINE__, dev_path(dev))
-
-#define FUNC_ENTER() \
-	printk(BIOS_SPEW, "%s:%s:%d: ENTER\n", __FILE__, __func__, __LINE__)
-
-#define FUNC_EXIT() \
-	printk(BIOS_SPEW, "%s:%s:%d: EXIT\n", __FILE__, __func__, __LINE__)
-
 struct iiostack_resource {
    uint8_t     no_of_stacks;
    STACK_RES   res[MAX_SOCKET * MAX_LOGIC_IIO_STACK];

[Jay Talbott (Code Review)]

Jay Talbott has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46809 )

Change subject: soc/intel/xeon_sp/cpx: Remove duplicate macros
......................................................................

Patch Set 1: Code-Review+1

[Stefan Reinauer (Code Review)]

Stefan Reinauer has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46809 )

Change subject: soc/intel/xeon_sp/cpx: Remove duplicate macros
......................................................................

Patch Set 1: Code-Review+2

Why is there soc/soc_util.h and soc/util.h?

[Marc Jones (Code Review)]

Marc Jones has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46809 )

Change subject: soc/intel/xeon_sp/cpx: Remove duplicate macros
......................................................................

Patch Set 1:
> Patch Set 1: Code-Review+2
>
> Why is there soc/soc_util.h and soc/util.h?

It is the non-intuitive directory names. xeon_sp/*x/include/soc/soc_util.h and xeon_sp/include/soc/util.h

[Marc Jones (Code Review)]

Marc Jones has abandoned this change. ( https://review.coreboot.org/c/coreboot/+/46809 )

Change subject: soc/intel/xeon_sp/cpx: Remove duplicate macros
......................................................................

Abandoned

fixed by cb:46093