From 6d7a6d291d6dd04c2fc5ca0dba2b3ccb032c9ff4 Mon Sep 17 00:00:00 2001 From: Angel Pons Date: Sun, 31 Jan 2021 13:09:01 +0100 Subject: [PATCH] mb/google/sarien: Turn `hda_verb.h` into `hda_verb.c` Change-Id: I40c8145fdddf9605bc3cc66ae8075e52dca4e539 Signed-off-by: Angel Pons Reviewed-on: https://review.coreboot.org/c/coreboot/+/50175 Tested-by: build bot (Jenkins) Reviewed-by: Tim Wawrzynczak --- src/mainboard/google/sarien/Makefile.inc | 2 +- src/mainboard/google/sarien/hda_verb.c | 3 --- .../arcada/{include/variant/hda_verb.h => hda_verb.c} | 5 ----- .../sarien/{include/variant/hda_verb.h => hda_verb.c} | 5 ----- 4 files changed, 1 insertion(+), 14 deletions(-) delete mode 100644 src/mainboard/google/sarien/hda_verb.c rename src/mainboard/google/sarien/variants/arcada/{include/variant/hda_verb.h => hda_verb.c} (98%) rename src/mainboard/google/sarien/variants/sarien/{include/variant/hda_verb.h => hda_verb.c} (97%) 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 similarity index 98% rename from src/mainboard/google/sarien/variants/arcada/include/variant/hda_verb.h rename to 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 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 similarity index 97% rename from src/mainboard/google/sarien/variants/sarien/include/variant/hda_verb.h rename to 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 const u32 cim_verb_data[] = { @@ -135,5 +132,3 @@ const u32 pc_beep_verbs[] = { }; AZALIA_ARRAY_SIZES; - -#endif