summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAngel Pons <th3fanbus@gmail.com>2021-01-31 13:09:01 +0100
committerPatrick Georgi <pgeorgi@google.com>2021-02-03 08:52:35 +0000
commit6d7a6d291d6dd04c2fc5ca0dba2b3ccb032c9ff4 (patch)
tree3495176830efa73aa078548e2099dcb0b61e1d06
parent4d4953b261e4becd9c01152bc58c2ad46f35f050 (diff)
mb/google/sarien: Turn `hda_verb.h` into `hda_verb.c`
Change-Id: I40c8145fdddf9605bc3cc66ae8075e52dca4e539 Signed-off-by: Angel Pons <th3fanbus@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/50175 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
-rw-r--r--src/mainboard/google/sarien/Makefile.inc2
-rw-r--r--src/mainboard/google/sarien/hda_verb.c3
-rw-r--r--src/mainboard/google/sarien/variants/arcada/hda_verb.c (renamed from src/mainboard/google/sarien/variants/arcada/include/variant/hda_verb.h)5
-rw-r--r--src/mainboard/google/sarien/variants/sarien/hda_verb.c (renamed from src/mainboard/google/sarien/variants/sarien/include/variant/hda_verb.h)5
4 files changed, 1 insertions, 14 deletions
diff --git a/src/mainboard/google/sarien/Makefile.inc b/src/mainboard/google/sarien/Makefile.inc
index 12e08be4c0..6bc69efbc9 100644
--- a/src/mainboard/google/sarien/Makefile.inc
+++ b/src/mainboard/google/sarien/Makefile.inc
@@ -12,7 +12,7 @@ ramstage-$(CONFIG_CHROMEOS) += chromeos.c
romstage-$(CONFIG_CHROMEOS) += chromeos.c
verstage-$(CONFIG_CHROMEOS) += chromeos.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
bootblock-$(CONFIG_EC_GOOGLE_WILCO) += ec.c
ramstage-$(CONFIG_EC_GOOGLE_WILCO) += ec.c
diff --git a/src/mainboard/google/sarien/hda_verb.c b/src/mainboard/google/sarien/hda_verb.c
deleted file mode 100644
index c26029774e..0000000000
--- a/src/mainboard/google/sarien/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/google/sarien/variants/arcada/include/variant/hda_verb.h b/src/mainboard/google/sarien/variants/arcada/hda_verb.c
index 83acbc2857..b447e9f25b 100644
--- a/src/mainboard/google/sarien/variants/arcada/include/variant/hda_verb.h
+++ b/src/mainboard/google/sarien/variants/arcada/hda_verb.c
@@ -1,8 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef MAINBOARD_HDA_VERB_H
-#define MAINBOARD_HDA_VERB_H
-
#include <device/azalia_device.h>
const u32 cim_verb_data[] = {
@@ -192,5 +189,3 @@ const u32 pc_beep_verbs[] = {
};
AZALIA_ARRAY_SIZES;
-
-#endif
diff --git a/src/mainboard/google/sarien/variants/sarien/include/variant/hda_verb.h b/src/mainboard/google/sarien/variants/sarien/hda_verb.c
index 5ec53ed112..316b110137 100644
--- a/src/mainboard/google/sarien/variants/sarien/include/variant/hda_verb.h
+++ b/src/mainboard/google/sarien/variants/sarien/hda_verb.c
@@ -1,8 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef MAINBOARD_HDA_VERB_H
-#define MAINBOARD_HDA_VERB_H
-
#include <device/azalia_device.h>
const u32 cim_verb_data[] = {
@@ -135,5 +132,3 @@ const u32 pc_beep_verbs[] = {
};
AZALIA_ARRAY_SIZES;
-
-#endif