GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mb/intel/coffeelake_rvp: Stop using headers for HDA verbs 

One of the variants lacks an hda_verb.h, and hda_verb.c can't be built.
Follow-up changes will make mainboard hda_verb.c files always get built
through AZALIA_PLUGIN_SUPPORT, and breaks building this contraption.

Turn the headers into standalone compilation units to prevent this
issue. Since they contain definitions, including them from multiple
compilation units wasn't a good idea anyway.

Change-Id: I00d968563539a4e1b8d1e12145293439d8358555
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/48360
Reviewed-by: Patrick Rudolph <siro@das-labor.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Angel Pons 2020-12-05 19:11:25 +01:00 committed by Hung-Te Lin
parent b8602aa184
commit c8be0947f1
6 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mainboard/intel/coffeelake_rvp/Makefile.inc
View File

@ -10,7 +10,7 @@ romstage-y += memory.c
ramstage-$(CONFIG_CHROMEOS) += chromeos.c ramstage-$(CONFIG_CHROMEOS) += chromeos.c
ramstage-y += mainboard.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 subdirs-y += variants/baseboard
CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/baseboard/include CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/baseboard/include

3
src/mainboard/intel/coffeelake_rvp/hda_verb.c
View File

@ -1,3 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#include "variant/hda_verb.h"

4
src/mainboard/intel/coffeelake_rvp/variants/cfl_h/include/variant/hda_verb.h → src/mainboard/intel/coffeelake_rvp/variants/cfl_h/hda_verb.c
View File

@ -1,8 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0-only */ /* SPDX-License-Identifier: GPL-2.0-only */
#ifndef HDA_VERB_H
#define HDA_VERB_H
#include <device/azalia_device.h> #include <device/azalia_device.h>
const u32 cim_verb_data[] = { const u32 cim_verb_data[] = {
@ -183,4 +180,3 @@ const u32 pc_beep_verbs[] = {
}; };
AZALIA_ARRAY_SIZES; AZALIA_ARRAY_SIZES;
#endif

4
src/mainboard/intel/coffeelake_rvp/variants/cfl_s/include/variant/hda_verb.h → src/mainboard/intel/coffeelake_rvp/variants/cfl_s/hda_verb.c
View File

@ -1,8 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0-only */ /* SPDX-License-Identifier: GPL-2.0-only */
#ifndef HDA_VERB_H
#define HDA_VERB_H
#include <device/azalia_device.h> #include <device/azalia_device.h>
const u32 cim_verb_data[] = { const u32 cim_verb_data[] = {
@ -183,4 +180,3 @@ const u32 pc_beep_verbs[] = {
}; };
AZALIA_ARRAY_SIZES; AZALIA_ARRAY_SIZES;
#endif

4
src/mainboard/intel/coffeelake_rvp/variants/whl_u/include/variant/hda_verb.h → src/mainboard/intel/coffeelake_rvp/variants/cml_u/hda_verb.c
View File

@ -1,8 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0-only */ /* SPDX-License-Identifier: GPL-2.0-only */
#ifndef HDA_VERB_H
#define HDA_VERB_H
#include <device/azalia_device.h> #include <device/azalia_device.h>
const u32 cim_verb_data[] = { const u32 cim_verb_data[] = {
@ -684,4 +681,3 @@ const u32 cim_verb_data[] = {
const u32 pc_beep_verbs[] = { const u32 pc_beep_verbs[] = {
}; };
AZALIA_ARRAY_SIZES; AZALIA_ARRAY_SIZES;
#endif

4
src/mainboard/intel/coffeelake_rvp/variants/cml_u/include/variant/hda_verb.h → src/mainboard/intel/coffeelake_rvp/variants/whl_u/hda_verb.c
View File

@ -1,8 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0-only */ /* SPDX-License-Identifier: GPL-2.0-only */
#ifndef HDA_VERB_H
#define HDA_VERB_H
#include <device/azalia_device.h> #include <device/azalia_device.h>
const u32 cim_verb_data[] = { const u32 cim_verb_data[] = {
@ -684,4 +681,3 @@ const u32 cim_verb_data[] = {
const u32 pc_beep_verbs[] = { const u32 pc_beep_verbs[] = {
}; };
AZALIA_ARRAY_SIZES; AZALIA_ARRAY_SIZES;
#endif