Vladimir Serbinenko (phcoder@gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6695
-gerrit
commit b1f43a74559cf2632e6362ce56127b328104487c Author: Vladimir Serbinenko phcoder@gmail.com Date: Sun Aug 17 23:48:42 2014 +0200
azalia: Move shared variable to separate file
Change-Id: Icf46ad1397c67478887c80a627b8f4eb0a67e542 Signed-off-by: Vladimir Serbinenko phcoder@gmail.com --- src/include/device/azalia_device.h | 5 +++++ src/mainboard/apple/macbook21/mainboard.c | 4 +--- src/mainboard/asus/m2n-e/hda_verb.h | 2 -- src/mainboard/asus/m2n-e/mainboard.c | 1 + src/mainboard/dmp/vortex86ex/hda_verb.h | 3 --- src/mainboard/dmp/vortex86ex/mainboard.c | 1 + src/mainboard/getac/p470/hda_verb.h | 3 --- src/mainboard/getac/p470/mainboard.c | 2 ++ src/mainboard/google/bolt/mainboard.c | 4 +--- src/mainboard/google/butterfly/mainboard.c | 6 +----- src/mainboard/google/falco/mainboard.c | 6 +----- src/mainboard/google/link/mainboard.c | 6 +----- src/mainboard/google/panther/mainboard.c | 6 +----- src/mainboard/google/parrot/mainboard.c | 6 +----- src/mainboard/google/peppy/mainboard.c | 6 +----- src/mainboard/google/slippy/mainboard.c | 6 +----- src/mainboard/google/stout/mainboard.c | 6 +----- src/mainboard/ibase/mb899/mainboard.c | 5 +---- src/mainboard/intel/baskingridge/mainboard.c | 4 +--- src/mainboard/intel/cougar_canyon2/mainboard.c | 4 +--- src/mainboard/intel/emeraldlake2/mainboard.c | 4 +--- src/mainboard/intel/wtm2/mainboard.c | 4 +--- src/mainboard/iwave/iWRainbowG6/hda_verb.h | 3 --- src/mainboard/iwave/iWRainbowG6/mainboard.c | 1 + src/mainboard/kontron/986lcd-m/mainboard.c | 4 +--- src/mainboard/kontron/ktqm77/mainboard.c | 4 +--- src/mainboard/lenovo/t520/mainboard.c | 6 +----- src/mainboard/lenovo/t530/mainboard.c | 6 +----- src/mainboard/lenovo/x200/hda_verb.h | 4 ---- src/mainboard/lenovo/x200/mainboard.c | 1 + src/mainboard/lenovo/x201/mainboard.c | 4 +--- src/mainboard/lenovo/x230/mainboard.c | 6 +----- src/mainboard/msi/ms7260/mainboard.c | 1 + src/mainboard/msi/ms9652_fam10/mainboard.c | 1 + src/mainboard/nvidia/l1_2pvv/hda_verb.h | 3 --- src/mainboard/nvidia/l1_2pvv/mainboard.c | 1 + src/mainboard/packardbell/ms2290/mainboard.c | 4 +--- src/mainboard/roda/rk9/hda_verb.h | 4 ---- src/mainboard/roda/rk9/mainboard.c | 1 + src/mainboard/samsung/lumpy/mainboard.c | 6 +----- src/mainboard/samsung/stumpy/mainboard.c | 6 +----- 41 files changed, 39 insertions(+), 121 deletions(-)
diff --git a/src/include/device/azalia_device.h b/src/include/device/azalia_device.h index 10bc77d..2276047 100644 --- a/src/include/device/azalia_device.h +++ b/src/include/device/azalia_device.h @@ -25,4 +25,9 @@ void azalia_audio_init(struct device *dev); extern struct device_operations default_azalia_audio_ops;
+extern const u32 *cim_verb_data; +extern u32 cim_verb_data_size; +extern const u32 *pc_beep_verbs; +extern u32 pc_beep_verbs_size; + #endif /* DEVICE_AZALIA_H */ diff --git a/src/mainboard/apple/macbook21/mainboard.c b/src/mainboard/apple/macbook21/mainboard.c index 9a025dd..b537f78 100644 --- a/src/mainboard/apple/macbook21/mainboard.c +++ b/src/mainboard/apple/macbook21/mainboard.c @@ -34,12 +34,10 @@ #include <arch/x86/include/arch/acpigen.h> #include <smbios.h> #include <x86emu/x86emu.h> +#include <device/azalia_device.h> #include "hda_verb.h" #define PANEL INT15_5F35_CL_DISPLAY_DEFAULT
-extern const u32 *cim_verb_data; -extern u32 cim_verb_data_size; - #if CONFIG_PCI_OPTION_ROM_RUN_YABEL || CONFIG_PCI_OPTION_ROM_RUN_REALMODE static int int15_handler(void) { diff --git a/src/mainboard/asus/m2n-e/hda_verb.h b/src/mainboard/asus/m2n-e/hda_verb.h index ec288ba..3adbd38 100644 --- a/src/mainboard/asus/m2n-e/hda_verb.h +++ b/src/mainboard/asus/m2n-e/hda_verb.h @@ -118,5 +118,3 @@ static const u32 mainboard_cim_verb_data[] = { 0x02571f01, };
-extern const u32 *cim_verb_data; -extern u32 cim_verb_data_size; diff --git a/src/mainboard/asus/m2n-e/mainboard.c b/src/mainboard/asus/m2n-e/mainboard.c index b48d23e..51a4419 100644 --- a/src/mainboard/asus/m2n-e/mainboard.c +++ b/src/mainboard/asus/m2n-e/mainboard.c @@ -19,6 +19,7 @@ */
#include <device/device.h> +#include <device/azalia_device.h> #include "hda_verb.h"
static void verb_setup(void) diff --git a/src/mainboard/dmp/vortex86ex/hda_verb.h b/src/mainboard/dmp/vortex86ex/hda_verb.h index 0556315..6b1620b 100644 --- a/src/mainboard/dmp/vortex86ex/hda_verb.h +++ b/src/mainboard/dmp/vortex86ex/hda_verb.h @@ -102,6 +102,3 @@ static const u32 mainboard_cim_verb_data[] = { 0x01f71e11, 0x01f71f41, }; - -extern const u32 *cim_verb_data; -extern u32 cim_verb_data_size; diff --git a/src/mainboard/dmp/vortex86ex/mainboard.c b/src/mainboard/dmp/vortex86ex/mainboard.c index c824963..edf18c2 100644 --- a/src/mainboard/dmp/vortex86ex/mainboard.c +++ b/src/mainboard/dmp/vortex86ex/mainboard.c @@ -23,6 +23,7 @@ #include <arch/io.h> #include <boot/tables.h> #include <device/pci_def.h> +#include <device/azalia_device.h> #include "hda_verb.h"
static void verb_setup(void) diff --git a/src/mainboard/getac/p470/hda_verb.h b/src/mainboard/getac/p470/hda_verb.h index b7578cc..dfc4d79 100644 --- a/src/mainboard/getac/p470/hda_verb.h +++ b/src/mainboard/getac/p470/hda_verb.h @@ -103,6 +103,3 @@ static const u32 mainboard_cim_verb_data[] = { 0x01F71E11, 0x01F71F41, }; - -extern const u32 *cim_verb_data; -extern u32 cim_verb_data_size; diff --git a/src/mainboard/getac/p470/mainboard.c b/src/mainboard/getac/p470/mainboard.c index ead665e..ac235d3 100644 --- a/src/mainboard/getac/p470/mainboard.c +++ b/src/mainboard/getac/p470/mainboard.c @@ -24,6 +24,8 @@ #include <device/pci_def.h> #include <arch/io.h> #include <delay.h> +#include <device/azalia_device.h> + #include "hda_verb.h"
#include "ec_oem.c" diff --git a/src/mainboard/google/bolt/mainboard.c b/src/mainboard/google/bolt/mainboard.c index 39a85ff..dd5dc03 100644 --- a/src/mainboard/google/bolt/mainboard.c +++ b/src/mainboard/google/bolt/mainboard.c @@ -34,6 +34,7 @@ #include <arch/io.h> #include <arch/interrupt.h> #include <boot/coreboot_tables.h> +#include <device/azalia_device.h> #include "hda_verb.h" #include <southbridge/intel/lynxpoint/pch.h> #include "ec.h" @@ -133,9 +134,6 @@ static int int15_handler(void)
/* Audio Setup */
-extern const u32 * cim_verb_data; -extern u32 cim_verb_data_size; - static void verb_setup(void) { cim_verb_data = mainboard_cim_verb_data; diff --git a/src/mainboard/google/butterfly/mainboard.c b/src/mainboard/google/butterfly/mainboard.c index f714ca9..85b86cb 100644 --- a/src/mainboard/google/butterfly/mainboard.c +++ b/src/mainboard/google/butterfly/mainboard.c @@ -39,6 +39,7 @@ #include <smbios.h> #include <device/pci.h> #include <ec/quanta/ene_kb3940q/ec.h> +#include <device/azalia_device.h> #if CONFIG_CHROMEOS #include <vendorcode/google/chromeos/fmap.h> #else @@ -282,11 +283,6 @@ static int int15_handler(void)
/* Audio Setup */
-extern const u32 *cim_verb_data; -extern u32 cim_verb_data_size; -extern const u32 *pc_beep_verbs; -extern u32 pc_beep_verbs_size; - static void verb_setup(void) { cim_verb_data = mainboard_cim_verb_data; diff --git a/src/mainboard/google/falco/mainboard.c b/src/mainboard/google/falco/mainboard.c index 26fd6ab..38edb5c 100644 --- a/src/mainboard/google/falco/mainboard.c +++ b/src/mainboard/google/falco/mainboard.c @@ -36,6 +36,7 @@ #include <boot/coreboot_tables.h> #include "hda_verb.h" #include <southbridge/intel/lynxpoint/pch.h> +#include <device/azalia_device.h> #include "ec.h" #include "onboard.h"
@@ -133,11 +134,6 @@ static int int15_handler(void)
/* Audio Setup */
-extern const u32 * cim_verb_data; -extern u32 cim_verb_data_size; -extern const u32 * pc_beep_verbs; -extern u32 pc_beep_verbs_size; - static void verb_setup(void) { cim_verb_data = mainboard_cim_verb_data; diff --git a/src/mainboard/google/link/mainboard.c b/src/mainboard/google/link/mainboard.c index 9c63acd..ee83089 100644 --- a/src/mainboard/google/link/mainboard.c +++ b/src/mainboard/google/link/mainboard.c @@ -40,6 +40,7 @@ #include <smbios.h> #include <device/pci.h> #include <ec/google/chromeec/ec.h> +#include <device/azalia_device.h>
/* placeholder for evenual link post. Not sure what we'll * do but it will look nice @@ -150,11 +151,6 @@ static int int15_handler(void)
/* Audio Setup */
-extern const u32 * cim_verb_data; -extern u32 cim_verb_data_size; -extern const u32 * pc_beep_verbs; -extern u32 pc_beep_verbs_size; - static void verb_setup(void) { cim_verb_data = mainboard_cim_verb_data; diff --git a/src/mainboard/google/panther/mainboard.c b/src/mainboard/google/panther/mainboard.c index 0c59ded..e4fd95b 100644 --- a/src/mainboard/google/panther/mainboard.c +++ b/src/mainboard/google/panther/mainboard.c @@ -33,6 +33,7 @@ #include <pc80/mc146818rtc.h> #include <southbridge/intel/lynxpoint/pch.h> #include <x86emu/x86emu.h> +#include <device/azalia_device.h> #include "hda_verb.h" #include "onboard.h"
@@ -131,11 +132,6 @@ static int int15_handler(void)
/* Audio Setup */
-extern const u32 * cim_verb_data; -extern u32 cim_verb_data_size; -extern const u32 * pc_beep_verbs; -extern u32 pc_beep_verbs_size; - static void verb_setup(void) { cim_verb_data = mainboard_cim_verb_data; diff --git a/src/mainboard/google/parrot/mainboard.c b/src/mainboard/google/parrot/mainboard.c index 56a1b47..6aa3fca 100644 --- a/src/mainboard/google/parrot/mainboard.c +++ b/src/mainboard/google/parrot/mainboard.c @@ -39,6 +39,7 @@ #include <smbios.h> #include <device/pci.h> #include <ec/compal/ene932/ec.h> +#include <device/azalia_device.h>
void mainboard_suspend_resume(void) { @@ -136,11 +137,6 @@ static int int15_handler(void)
/* Audio Setup */
-extern const u32 * cim_verb_data; -extern u32 cim_verb_data_size; -extern const u32 * pc_beep_verbs; -extern u32 pc_beep_verbs_size; - static void verb_setup(void) { cim_verb_data = mainboard_cim_verb_data; diff --git a/src/mainboard/google/peppy/mainboard.c b/src/mainboard/google/peppy/mainboard.c index 26fd6ab..38edb5c 100644 --- a/src/mainboard/google/peppy/mainboard.c +++ b/src/mainboard/google/peppy/mainboard.c @@ -36,6 +36,7 @@ #include <boot/coreboot_tables.h> #include "hda_verb.h" #include <southbridge/intel/lynxpoint/pch.h> +#include <device/azalia_device.h> #include "ec.h" #include "onboard.h"
@@ -133,11 +134,6 @@ static int int15_handler(void)
/* Audio Setup */
-extern const u32 * cim_verb_data; -extern u32 cim_verb_data_size; -extern const u32 * pc_beep_verbs; -extern u32 pc_beep_verbs_size; - static void verb_setup(void) { cim_verb_data = mainboard_cim_verb_data; diff --git a/src/mainboard/google/slippy/mainboard.c b/src/mainboard/google/slippy/mainboard.c index 26fd6ab..022c1e8 100644 --- a/src/mainboard/google/slippy/mainboard.c +++ b/src/mainboard/google/slippy/mainboard.c @@ -38,6 +38,7 @@ #include <southbridge/intel/lynxpoint/pch.h> #include "ec.h" #include "onboard.h" +#include <device/azalia_device.h>
void mainboard_suspend_resume(void) { @@ -133,11 +134,6 @@ static int int15_handler(void)
/* Audio Setup */
-extern const u32 * cim_verb_data; -extern u32 cim_verb_data_size; -extern const u32 * pc_beep_verbs; -extern u32 pc_beep_verbs_size; - static void verb_setup(void) { cim_verb_data = mainboard_cim_verb_data; diff --git a/src/mainboard/google/stout/mainboard.c b/src/mainboard/google/stout/mainboard.c index 8cd2fbd..b0ed3c1 100644 --- a/src/mainboard/google/stout/mainboard.c +++ b/src/mainboard/google/stout/mainboard.c @@ -39,6 +39,7 @@ #include <smbios.h> #include <device/pci.h> #include <ec/quanta/it8518/ec.h> +#include <device/azalia_device.h>
void mainboard_suspend_resume(void) { @@ -136,11 +137,6 @@ static int int15_handler(void)
/* Audio Setup */
-extern const u32 * cim_verb_data; -extern u32 cim_verb_data_size; -extern const u32 * pc_beep_verbs; -extern u32 pc_beep_verbs_size; - static void verb_setup(void) { cim_verb_data = mainboard_cim_verb_data; diff --git a/src/mainboard/ibase/mb899/mainboard.c b/src/mainboard/ibase/mb899/mainboard.c index 3730984..f78a118 100644 --- a/src/mainboard/ibase/mb899/mainboard.c +++ b/src/mainboard/ibase/mb899/mainboard.c @@ -26,7 +26,7 @@ #include <pc80/mc146818rtc.h> #include <arch/io.h> #include <arch/interrupt.h> - +#include <device/azalia_device.h> #include "superio_hwm.h"
#if CONFIG_VGA_ROM_RUN @@ -67,9 +67,6 @@ static int int15_handler(void)
/* Audio Setup */
-extern u32 * cim_verb_data; -extern u32 cim_verb_data_size; - static void verb_setup(void) { // Default VERB is fine on this mainboard. diff --git a/src/mainboard/intel/baskingridge/mainboard.c b/src/mainboard/intel/baskingridge/mainboard.c index 9d08099..61ba4af 100644 --- a/src/mainboard/intel/baskingridge/mainboard.c +++ b/src/mainboard/intel/baskingridge/mainboard.c @@ -35,6 +35,7 @@ #include <boot/coreboot_tables.h> #include "hda_verb.h" #include <southbridge/intel/lynxpoint/pch.h> +#include <device/azalia_device.h>
void mainboard_suspend_resume(void) { @@ -130,9 +131,6 @@ static int int15_handler(void)
/* Audio Setup */
-extern const u32 * cim_verb_data; -extern u32 cim_verb_data_size; - static void verb_setup(void) { cim_verb_data = mainboard_cim_verb_data; diff --git a/src/mainboard/intel/cougar_canyon2/mainboard.c b/src/mainboard/intel/cougar_canyon2/mainboard.c index f633279..1a29992 100644 --- a/src/mainboard/intel/cougar_canyon2/mainboard.c +++ b/src/mainboard/intel/cougar_canyon2/mainboard.c @@ -33,6 +33,7 @@ #include <boot/coreboot_tables.h> #include "hda_verb.h" #include <southbridge/intel/fsp_bd82x6x/pch.h> +#include <device/azalia_device.h>
#if IS_ENABLED(CONFIG_HAVE_ACPI_RESUME) void mainboard_suspend_resume(void) @@ -142,9 +143,6 @@ static int int15_handler(void)
/* Audio Setup */
-extern const u32 * cim_verb_data; -extern u32 cim_verb_data_size; - static void verb_setup(void) { cim_verb_data = mainboard_cim_verb_data; diff --git a/src/mainboard/intel/emeraldlake2/mainboard.c b/src/mainboard/intel/emeraldlake2/mainboard.c index cd8fc80..3c93e05 100644 --- a/src/mainboard/intel/emeraldlake2/mainboard.c +++ b/src/mainboard/intel/emeraldlake2/mainboard.c @@ -35,6 +35,7 @@ #include <boot/coreboot_tables.h> #include "hda_verb.h" #include <southbridge/intel/bd82x6x/pch.h> +#include <device/azalia_device.h>
void mainboard_suspend_resume(void) { @@ -142,9 +143,6 @@ static int int15_handler(void)
/* Audio Setup */
-extern const u32 * cim_verb_data; -extern u32 cim_verb_data_size; - static void verb_setup(void) { cim_verb_data = mainboard_cim_verb_data; diff --git a/src/mainboard/intel/wtm2/mainboard.c b/src/mainboard/intel/wtm2/mainboard.c index 68b8c7d..6f6e464 100644 --- a/src/mainboard/intel/wtm2/mainboard.c +++ b/src/mainboard/intel/wtm2/mainboard.c @@ -35,6 +35,7 @@ #include <boot/coreboot_tables.h> #include "hda_verb.h" #include <southbridge/intel/lynxpoint/pch.h> +#include <device/azalia_device.h>
void mainboard_suspend_resume(void) { @@ -130,9 +131,6 @@ static int int15_handler(void)
/* Audio Setup */
-extern const u32 * cim_verb_data; -extern u32 cim_verb_data_size; - static void verb_setup(void) { cim_verb_data = mainboard_cim_verb_data; diff --git a/src/mainboard/iwave/iWRainbowG6/hda_verb.h b/src/mainboard/iwave/iWRainbowG6/hda_verb.h index 80ed21d..6799c12 100644 --- a/src/mainboard/iwave/iWRainbowG6/hda_verb.h +++ b/src/mainboard/iwave/iWRainbowG6/hda_verb.h @@ -89,6 +89,3 @@ static u32 mainboard_cim_verb_data[] = { /* BTL Gain */ 0x017F417, /* Gain = 16.79dB */ }; - -extern const u32 *cim_verb_data; -extern u32 cim_verb_data_size; diff --git a/src/mainboard/iwave/iWRainbowG6/mainboard.c b/src/mainboard/iwave/iWRainbowG6/mainboard.c index 7c4064c..0b84f68 100644 --- a/src/mainboard/iwave/iWRainbowG6/mainboard.c +++ b/src/mainboard/iwave/iWRainbowG6/mainboard.c @@ -20,6 +20,7 @@
#include <device/device.h> #include <console/console.h> +#include <device/azalia_device.h> #include "hda_verb.h"
static void verb_setup(void) diff --git a/src/mainboard/kontron/986lcd-m/mainboard.c b/src/mainboard/kontron/986lcd-m/mainboard.c index 4f0dcdd..346546a 100644 --- a/src/mainboard/kontron/986lcd-m/mainboard.c +++ b/src/mainboard/kontron/986lcd-m/mainboard.c @@ -26,6 +26,7 @@ #include <pc80/mc146818rtc.h> #include <arch/io.h> #include <arch/interrupt.h> +#include <device/azalia_device.h>
#define BOOT_DISPLAY_DEFAULT 0 #define BOOT_DISPLAY_CRT (1 << 0) @@ -206,9 +207,6 @@ static void hwm_setup(void)
/* Audio Setup */
-extern u32 * cim_verb_data; -extern u32 cim_verb_data_size; - static void verb_setup(void) { // Default VERB is fine on this mainboard. diff --git a/src/mainboard/kontron/ktqm77/mainboard.c b/src/mainboard/kontron/ktqm77/mainboard.c index fd9cbf1..4804a7e 100644 --- a/src/mainboard/kontron/ktqm77/mainboard.c +++ b/src/mainboard/kontron/ktqm77/mainboard.c @@ -35,6 +35,7 @@ #include <boot/coreboot_tables.h> #include "hda_verb.h" #include <southbridge/intel/bd82x6x/pch.h> +#include <device/azalia_device.h>
void mainboard_suspend_resume(void) { @@ -170,9 +171,6 @@ static int int15_handler(void)
/* Audio Setup */
-extern const u32 *cim_verb_data; -extern u32 cim_verb_data_size; - static void verb_setup(void) { cim_verb_data = mainboard_cim_verb_data; diff --git a/src/mainboard/lenovo/t520/mainboard.c b/src/mainboard/lenovo/t520/mainboard.c index d374e7e..c37e6b9 100644 --- a/src/mainboard/lenovo/t520/mainboard.c +++ b/src/mainboard/lenovo/t520/mainboard.c @@ -40,6 +40,7 @@ #include <cbfs.h> #include <pc80/keyboard.h> #include <ec/lenovo/h8/h8.h> +#include <device/azalia_device.h>
void mainboard_suspend_resume(void) { @@ -139,11 +140,6 @@ const char *smbios_mainboard_version(void)
/* Audio Setup */
-extern const u32 *cim_verb_data; -extern u32 cim_verb_data_size; -extern const u32 *pc_beep_verbs; -extern u32 pc_beep_verbs_size; - static void verb_setup(void) { cim_verb_data = mainboard_cim_verb_data; diff --git a/src/mainboard/lenovo/t530/mainboard.c b/src/mainboard/lenovo/t530/mainboard.c index 325f90f..b82ba7c 100644 --- a/src/mainboard/lenovo/t530/mainboard.c +++ b/src/mainboard/lenovo/t530/mainboard.c @@ -40,6 +40,7 @@ #include <cbfs.h> #include <pc80/keyboard.h> #include <ec/lenovo/h8/h8.h> +#include <device/azalia_device.h>
void mainboard_suspend_resume(void) { @@ -139,11 +140,6 @@ const char *smbios_mainboard_version(void)
/* Audio Setup */
-extern const u32 *cim_verb_data; -extern u32 cim_verb_data_size; -extern const u32 *pc_beep_verbs; -extern u32 pc_beep_verbs_size; - static void verb_setup(void) { cim_verb_data = mainboard_cim_verb_data; diff --git a/src/mainboard/lenovo/x200/hda_verb.h b/src/mainboard/lenovo/x200/hda_verb.h index 6c9f60b..6be7518 100644 --- a/src/mainboard/lenovo/x200/hda_verb.h +++ b/src/mainboard/lenovo/x200/hda_verb.h @@ -41,8 +41,6 @@ static const u32 mainboard_cim_verb_data[] = { PIN_CFG(0x1c, 0x40f001f0), PIN_CFG(0x1d, 0x90a601f0) }; -extern const u32 *cim_verb_data; -extern u32 cim_verb_data_size;
static const u32 mainboard_pc_beep_verbs[] = { 0x00170500, /* power up codec */ @@ -54,5 +52,3 @@ static const u32 mainboard_pc_beep_verbs[] = { 0x00c3b015, /* set lout1 output volume -15dB */ 0x0143b000, /* unmute speakers */ }; -extern const u32 * pc_beep_verbs; -extern u32 pc_beep_verbs_size; diff --git a/src/mainboard/lenovo/x200/mainboard.c b/src/mainboard/lenovo/x200/mainboard.c index ab0bc45..a00f185 100644 --- a/src/mainboard/lenovo/x200/mainboard.c +++ b/src/mainboard/lenovo/x200/mainboard.c @@ -35,6 +35,7 @@ #include <ec/lenovo/pmh7/pmh7.h> #include <ec/acpi/ec.h> #include <ec/lenovo/h8/h8.h> +#include <device/azalia_device.h>
#include "hda_verb.h"
diff --git a/src/mainboard/lenovo/x201/mainboard.c b/src/mainboard/lenovo/x201/mainboard.c index 0c3c49a..b57d790 100644 --- a/src/mainboard/lenovo/x201/mainboard.c +++ b/src/mainboard/lenovo/x201/mainboard.c @@ -35,6 +35,7 @@ #include <ec/lenovo/h8/h8.h> #include <northbridge/intel/nehalem/nehalem.h> #include <southbridge/intel/bd82x6x/pch.h> +#include <device/azalia_device.h>
#include <pc80/mc146818rtc.h> #include "dock.h" @@ -104,9 +105,6 @@ const char *smbios_mainboard_version(void)
/* Audio Setup */
-extern const u32 *cim_verb_data; -extern u32 cim_verb_data_size; - static void verb_setup(void) { cim_verb_data = mainboard_cim_verb_data; diff --git a/src/mainboard/lenovo/x230/mainboard.c b/src/mainboard/lenovo/x230/mainboard.c index 8c977ad..4e3151f 100644 --- a/src/mainboard/lenovo/x230/mainboard.c +++ b/src/mainboard/lenovo/x230/mainboard.c @@ -41,6 +41,7 @@ #include <pc80/keyboard.h> #include <ec/lenovo/h8/h8.h> #include <build.h> +#include <device/azalia_device.h>
void mainboard_suspend_resume(void) { @@ -149,11 +150,6 @@ const char *smbios_mainboard_version(void)
/* Audio Setup */
-extern const u32 *cim_verb_data; -extern u32 cim_verb_data_size; -extern const u32 *pc_beep_verbs; -extern u32 pc_beep_verbs_size; - static void verb_setup(void) { cim_verb_data = mainboard_cim_verb_data; diff --git a/src/mainboard/msi/ms7260/mainboard.c b/src/mainboard/msi/ms7260/mainboard.c index bbd1e9d..226925f 100644 --- a/src/mainboard/msi/ms7260/mainboard.c +++ b/src/mainboard/msi/ms7260/mainboard.c @@ -19,6 +19,7 @@ */
#include <device/device.h> +#include <device/azalia_device.h>
#if 0 #include "hda_verb.h" diff --git a/src/mainboard/msi/ms9652_fam10/mainboard.c b/src/mainboard/msi/ms9652_fam10/mainboard.c index c1f1069..316a962 100644 --- a/src/mainboard/msi/ms9652_fam10/mainboard.c +++ b/src/mainboard/msi/ms9652_fam10/mainboard.c @@ -24,6 +24,7 @@ #include <device/pci.h> #include <device/pci_ids.h> #include <device/pci_ops.h> +#include <device/azalia_device.h> // #include "hda_verb.h"
static void verb_setup(void) diff --git a/src/mainboard/nvidia/l1_2pvv/hda_verb.h b/src/mainboard/nvidia/l1_2pvv/hda_verb.h index 763840b..98e2a92 100644 --- a/src/mainboard/nvidia/l1_2pvv/hda_verb.h +++ b/src/mainboard/nvidia/l1_2pvv/hda_verb.h @@ -103,6 +103,3 @@ static u32 mainboard_cim_verb_data[] = { 0x01f71ec5, 0x01f71f01, }; - -extern u32 *cim_verb_data; -extern u32 cim_verb_data_size; diff --git a/src/mainboard/nvidia/l1_2pvv/mainboard.c b/src/mainboard/nvidia/l1_2pvv/mainboard.c index 6a30018..fb7317b 100644 --- a/src/mainboard/nvidia/l1_2pvv/mainboard.c +++ b/src/mainboard/nvidia/l1_2pvv/mainboard.c @@ -24,6 +24,7 @@ #include <device/pci.h> #include <device/pci_ids.h> #include <device/pci_ops.h> +#include <device/azalia_device.h> #include "hda_verb.h"
static void verb_setup(void) diff --git a/src/mainboard/packardbell/ms2290/mainboard.c b/src/mainboard/packardbell/ms2290/mainboard.c index d7f45c0..aca221a 100644 --- a/src/mainboard/packardbell/ms2290/mainboard.c +++ b/src/mainboard/packardbell/ms2290/mainboard.c @@ -44,6 +44,7 @@ #include <cpu/x86/lapic.h> #include <device/pci.h> #include <smbios.h> +#include <device/azalia_device.h>
static acpi_cstate_t cst_entries[] = { {1, 1, 1000, {0x7f, 1, 2, {0}, 1, 0}}, @@ -87,9 +88,6 @@ static int int15_handler(void)
/* Audio Setup */
-extern const u32 *cim_verb_data; -extern u32 cim_verb_data_size; - static void verb_setup(void) { cim_verb_data = mainboard_cim_verb_data; diff --git a/src/mainboard/roda/rk9/hda_verb.h b/src/mainboard/roda/rk9/hda_verb.h index f99d097..db9e0e3 100644 --- a/src/mainboard/roda/rk9/hda_verb.h +++ b/src/mainboard/roda/rk9/hda_verb.h @@ -57,8 +57,6 @@ static const u32 mainboard_cim_verb_data[] = { /* Pin Complex (NID 0x1f), S/PDIF-IN: not connected */ PIN_CFG(0x1f, 0x411111f0) }; -extern const u32 *cim_verb_data; -extern u32 cim_verb_data_size;
static const u32 mainboard_pc_beep_verbs[] = { 0x00170500, /* power up codec */ @@ -70,5 +68,3 @@ static const u32 mainboard_pc_beep_verbs[] = { 0x00c3b015, /* set lout1 output volume -15dB */ 0x0143b000, /* unmute speakers */ }; -extern const u32 * pc_beep_verbs; -extern u32 pc_beep_verbs_size; diff --git a/src/mainboard/roda/rk9/mainboard.c b/src/mainboard/roda/rk9/mainboard.c index 2bdec28..4744415 100644 --- a/src/mainboard/roda/rk9/mainboard.c +++ b/src/mainboard/roda/rk9/mainboard.c @@ -29,6 +29,7 @@ #endif #include <pc80/keyboard.h> #include <ec/acpi/ec.h> +#include <device/azalia_device.h> #include "hda_verb.h"
#if CONFIG_GENERATE_ACPI_TABLES diff --git a/src/mainboard/samsung/lumpy/mainboard.c b/src/mainboard/samsung/lumpy/mainboard.c index 1c7be3b..ee6728f 100644 --- a/src/mainboard/samsung/lumpy/mainboard.c +++ b/src/mainboard/samsung/lumpy/mainboard.c @@ -38,6 +38,7 @@ #include "onboard.h" #include <southbridge/intel/bd82x6x/pch.h> #include <smbios.h> +#include <device/azalia_device.h>
void mainboard_suspend_resume(void) { @@ -136,11 +137,6 @@ static int int15_handler(void)
/* Audio Setup */
-extern const u32 * cim_verb_data; -extern u32 cim_verb_data_size; -extern const u32 * pc_beep_verbs; -extern u32 pc_beep_verbs_size; - static void verb_setup(void) { cim_verb_data = mainboard_cim_verb_data; diff --git a/src/mainboard/samsung/stumpy/mainboard.c b/src/mainboard/samsung/stumpy/mainboard.c index 3afb2d4..99fe725 100644 --- a/src/mainboard/samsung/stumpy/mainboard.c +++ b/src/mainboard/samsung/stumpy/mainboard.c @@ -35,6 +35,7 @@ #include <boot/coreboot_tables.h> #include "hda_verb.h" #include <southbridge/intel/bd82x6x/pch.h> +#include <device/azalia_device.h>
void mainboard_suspend_resume(void) { @@ -129,11 +130,6 @@ static int int15_handler(void)
/* Audio Setup */
-extern const u32 * cim_verb_data; -extern u32 cim_verb_data_size; -extern const u32 * pc_beep_verbs; -extern u32 pc_beep_verbs_size; - static void verb_setup(void) { cim_verb_data = mainboard_cim_verb_data;