From 23725958b49ac850e3d27ffa0a0db3961cce72ca Mon Sep 17 00:00:00 2001
From: Johnny Lin <johnny_lin@wiwynn.com>
Date: Fri, 24 Mar 2023 07:52:16 +0800
Subject: [PATCH] cpu/intel: Remove redefined SAPPHIRERAPIDS_SP CPUID to fix
 build error

This reverts pieces of commit 08135332dd "soc/intel/xeon_sp: Report platform cpu info"

Reason for revert: Due to duplicated definitions this breaks the tree.

Signed-off-by: Johnny Lin <johnny_lin@wiwynn.com>
Change-Id: I7bcffe99e4f049e38d9a13c82d38464c64250ee1
Reviewed-on: https://review.coreboot.org/c/coreboot/+/74002
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
Reviewed-by: Matt DeVillier <matt.devillier@amd.corp-partner.google.com>
Reviewed-by: Jonathon Hall <jonathon.hall@puri.sm>
Reviewed-by: Eric Lai <eric_lai@quanta.corp-partner.google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Martin Roth <martin.roth@amd.corp-partner.google.com>
---
 src/include/cpu/intel/cpu_ids.h | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/include/cpu/intel/cpu_ids.h b/src/include/cpu/intel/cpu_ids.h
index ff1525200b..7caafd5886 100644
--- a/src/include/cpu/intel/cpu_ids.h
+++ b/src/include/cpu/intel/cpu_ids.h
@@ -11,12 +11,6 @@
 #define CPUID_SKYLAKE_SP_A0_A1		0x506f0
 #define CPUID_SKYLAKE_SP_B0		0x506f1
 #define CPUID_SKYLAKE_SP_4		0x50654
-#define CPUID_SAPPHIRERAPIDS_SP_D	0x0806f3
-#define CPUID_SAPPHIRERAPIDS_SP_E0	0x0806f4
-#define CPUID_SAPPHIRERAPIDS_SP_E2	0x0806f5
-#define CPUID_SAPPHIRERAPIDS_SP_E3	0x0806f6
-#define CPUID_SAPPHIRERAPIDS_SP_E4	0x0806f7
-#define CPUID_SAPPHIRERAPIDS_SP_Ex	0x0806f8
 #define CPUID_SKYLAKE_C0		0x406e2
 #define CPUID_SKYLAKE_D0		0x406e3
 #define CPUID_SKYLAKE_HQ0		0x506e1