6 files changed, 1 insertions, 20 deletions
diff --git a/src/mainboard/intel/coffeelake_rvp/Makefile.inc b/src/mainboard/intel/coffeelake_rvp/Makefile.inc
index a3061e3db5..77f06913fa 100644
--- a/src/mainboard/intel/coffeelake_rvp/Makefile.inc
+++ b/src/mainboard/intel/coffeelake_rvp/Makefile.inc
@@ -10,7 +10,7 @@ romstage-y += memory.c
 
 ramstage-$(CONFIG_CHROMEOS) += chromeos.c
 ramstage-y += mainboard.c
-ramstage-$(CONFIG_SOC_INTEL_COMMON_BLOCK_HDA_VERB) += hda_verb.c
+ramstage-$(CONFIG_SOC_INTEL_COMMON_BLOCK_HDA_VERB) += variants/$(VARIANT_DIR)/hda_verb.c
 
 subdirs-y += variants/baseboard
 CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/baseboard/include
diff --git a/src/mainboard/intel/coffeelake_rvp/hda_verb.c b/src/mainboard/intel/coffeelake_rvp/hda_verb.c
deleted file mode 100644
index c26029774e..0000000000
--- a/src/mainboard/intel/coffeelake_rvp/hda_verb.c
+++ /dev/null
@@ -1,3 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include "variant/hda_verb.h"
diff --git a/src/mainboard/intel/coffeelake_rvp/variants/cfl_h/include/variant/hda_verb.h b/src/mainboard/intel/coffeelake_rvp/variants/cfl_h/hda_verb.c
index e276cf7f6e..cbe8f0be21 100644
--- a/src/mainboard/intel/coffeelake_rvp/variants/cfl_h/include/variant/hda_verb.h
+++ b/src/mainboard/intel/coffeelake_rvp/variants/cfl_h/hda_verb.c
@@ -1,8 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#ifndef HDA_VERB_H
-#define HDA_VERB_H
-
 #include <device/azalia_device.h>
 
 const u32 cim_verb_data[] = {
@@ -183,4 +180,3 @@ const u32 pc_beep_verbs[] = {
 };
 
 AZALIA_ARRAY_SIZES;
-#endif
diff --git a/src/mainboard/intel/coffeelake_rvp/variants/cfl_s/include/variant/hda_verb.h b/src/mainboard/intel/coffeelake_rvp/variants/cfl_s/hda_verb.c
index e276cf7f6e..cbe8f0be21 100644
--- a/src/mainboard/intel/coffeelake_rvp/variants/cfl_s/include/variant/hda_verb.h
+++ b/src/mainboard/intel/coffeelake_rvp/variants/cfl_s/hda_verb.c
@@ -1,8 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#ifndef HDA_VERB_H
-#define HDA_VERB_H
-
 #include <device/azalia_device.h>
 
 const u32 cim_verb_data[] = {
@@ -183,4 +180,3 @@ const u32 pc_beep_verbs[] = {
 };
 
 AZALIA_ARRAY_SIZES;
-#endif
diff --git a/src/mainboard/intel/coffeelake_rvp/variants/whl_u/include/variant/hda_verb.h b/src/mainboard/intel/coffeelake_rvp/variants/cml_u/hda_verb.c
index 7233250105..01012dde1b 100644
--- a/src/mainboard/intel/coffeelake_rvp/variants/whl_u/include/variant/hda_verb.h
+++ b/src/mainboard/intel/coffeelake_rvp/variants/cml_u/hda_verb.c
@@ -1,8 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#ifndef HDA_VERB_H
-#define HDA_VERB_H
-
 #include <device/azalia_device.h>
 
 const u32 cim_verb_data[] = {
@@ -684,4 +681,3 @@ const u32 cim_verb_data[] = {
 const u32 pc_beep_verbs[] = {
 };
 AZALIA_ARRAY_SIZES;
-#endif
diff --git a/src/mainboard/intel/coffeelake_rvp/variants/cml_u/include/variant/hda_verb.h b/src/mainboard/intel/coffeelake_rvp/variants/whl_u/hda_verb.c
index 7233250105..01012dde1b 100644
--- a/src/mainboard/intel/coffeelake_rvp/variants/cml_u/include/variant/hda_verb.h
+++ b/src/mainboard/intel/coffeelake_rvp/variants/whl_u/hda_verb.c
@@ -1,8 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#ifndef HDA_VERB_H
-#define HDA_VERB_H
-
 #include <device/azalia_device.h>
 
 const u32 cim_verb_data[] = {
@@ -684,4 +681,3 @@ const u32 cim_verb_data[] = {
 const u32 pc_beep_verbs[] = {
 };
 AZALIA_ARRAY_SIZES;
-#endif