diff --git a/src/mainboard/google/dragonegg/variants/baseboard/memory.c b/src/mainboard/google/dragonegg/variants/baseboard/memory.c
index c7d579b1a9..3c458e800e 100644
--- a/src/mainboard/google/dragonegg/variants/baseboard/memory.c
+++ b/src/mainboard/google/dragonegg/variants/baseboard/memory.c
@@ -36,19 +36,6 @@ static const u8 dqs_map[][8] = {
 /* Rcomp resistor */
 static const u16 rcomp_resistor[] = { 100, 100, 100 };
 
-/*
- * get processor id using cpuid eax=1
- * return value will be in EAX register
- */
-static uint32_t get_cpuid(void)
-{
-	struct cpuid_result cpuidr;
-
-	cpuidr = cpuid(1);
-
-	return cpuidr.eax;
-}
-
 void __weak variant_memory_params(struct lpddr4_config *mem_config)
 {
 	/* Rcomp target */
@@ -61,7 +48,7 @@ void __weak variant_memory_params(struct lpddr4_config *mem_config)
 	mem_config->dqs_map_size = sizeof(dqs_map);
 	mem_config->rcomp_resistor = rcomp_resistor;
 	mem_config->rcomp_resistor_size = sizeof(rcomp_resistor);
-	if (get_cpuid() == CPUID_ICELAKE_A0) {
+	if (cpu_get_cpuid() == CPUID_ICELAKE_A0) {
 		mem_config->rcomp_target = rcomp_target_es0;
 		mem_config->rcomp_target_size = sizeof(rcomp_target_es0);
 	} else {
diff --git a/src/mainboard/intel/icelake_rvp/spd/spd_util.c b/src/mainboard/intel/icelake_rvp/spd/spd_util.c
index 63b39fd3f4..6b733642cd 100644
--- a/src/mainboard/intel/icelake_rvp/spd/spd_util.c
+++ b/src/mainboard/intel/icelake_rvp/spd/spd_util.c
@@ -111,19 +111,6 @@ void mainboard_fill_rcomp_res_data(void *rcomp_ptr)
 	memcpy(rcomp_ptr, RcompResistor, sizeof(RcompResistor));
 }
 
-/*
- * get processor id using cpuid eax=1
- * return value will be in EAX register
- */
-static uint32_t get_cpuid(void)
-{
-	struct cpuid_result cpuidr;
-
-	cpuidr = cpuid(1);
-
-	return cpuidr.eax;
-}
-
 void mainboard_fill_rcomp_strength_data(void *rcomp_strength_ptr)
 {
 	/* Rcomp target */
@@ -142,7 +129,7 @@ void mainboard_fill_rcomp_strength_data(void *rcomp_strength_ptr)
 	case icl_y_lpddr4:
 	case icl_u_lpddr4:
 	case icl_u_lpddr4_type_3:
-		if (get_cpuid() == CPUID_ICELAKE_A0)
+		if (cpu_get_cpuid() == CPUID_ICELAKE_A0)
 			memcpy(rcomp_strength_ptr, RcompTarget_LPDDR4_Ax,
 				sizeof(RcompTarget_LPDDR4_Ax));
 		else