soc/intel/xeon_sp/gnr: Move CPU ID definition to common header

Change-Id: I816c6f68840c122fbc37085e31a1b0368a819f4a
Signed-off-by: Jincheng Li <jincheng.li@intel.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/84313
Reviewed-by: Lean Sheng Tan <sheng.tan@9elements.com>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

src/include/cpu/intel/cpu_ids.h

@@ -57,6 +57,8 @@
 #define CPUID_SAPPHIRERAPIDS_SP_E3	0x806f6
 #define CPUID_SAPPHIRERAPIDS_SP_E4	0x806f7
 #define CPUID_SAPPHIRERAPIDS_SP_Ex	0x806f8
+#define CPUID_GRANITERAPIDS		0xA06D0
+#define CPUID_SIERRAFOREST		0xA06F0
 #define CPUID_ELKHARTLAKE_A0		0x90660
 #define CPUID_ELKHARTLAKE_B0		0x90661
 #define CPUID_ALDERLAKE_A0		0x90670

src/soc/intel/xeon_sp/gnr/cpu.c

@@ -6,7 +6,6 @@
 #include <cpu/x86/mtrr.h>
 #include <intelblocks/cpulib.h>
 #include <intelblocks/mp_init.h>
-#include <soc/cpu.h>
 #include <soc/soc_util.h>
 #include <soc/util.h>
 

src/soc/intel/xeon_sp/gnr/include/soc/cpu.h

@@ -1,9 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#ifndef _SOC_CPU_H
-#define _SOC_CPU_H
-
-#define CPUID_GRANITERAPIDS	0xA06D0
-#define CPUID_SIERRAFOREST	0xA06F0
-
-#endif

src/soc/intel/xeon_sp/gnr/soc_util.c

@@ -1,13 +1,13 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <assert.h>
+#include <cpu/intel/cpu_ids.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <fsp/util.h>
 #include <soc/util.h>
 #include <soc/acpi.h>
 #include <soc/chip_common.h>
-#include <soc/cpu.h>
 #include <soc/pci_devs.h>
 #include <soc/soc_util.h>
 #include <stdlib.h>