From 75c83870e51e6bc48a83114c64177432d3204b1f Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Fri, 5 Sep 2014 01:01:31 +0200 Subject: azalia: Shrink boilerplate Change-Id: Ib3e09644c0ee71aacb067adaa85653d151b52078 Signed-off-by: Vladimir Serbinenko Reviewed-on: http://review.coreboot.org/6840 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer Reviewed-by: Edward O'Callaghan --- src/southbridge/intel/bd82x6x/Makefile.inc | 2 ++ src/southbridge/intel/bd82x6x/azalia.c | 6 +----- src/southbridge/intel/i82801gx/Makefile.inc | 2 ++ src/southbridge/intel/i82801gx/azalia.c | 4 +--- src/southbridge/intel/i82801ix/Makefile.inc | 2 ++ src/southbridge/intel/i82801ix/hdaudio.c | 6 +----- src/southbridge/intel/ibexpeak/Makefile.inc | 2 ++ src/southbridge/intel/ibexpeak/azalia.c | 6 +----- src/southbridge/intel/lynxpoint/Makefile.inc | 2 ++ src/southbridge/intel/lynxpoint/azalia.c | 8 ++------ 10 files changed, 16 insertions(+), 24 deletions(-) (limited to 'src/southbridge/intel') diff --git a/src/southbridge/intel/bd82x6x/Makefile.inc b/src/southbridge/intel/bd82x6x/Makefile.inc index def9cd2aa2..b79b85a0a9 100644 --- a/src/southbridge/intel/bd82x6x/Makefile.inc +++ b/src/southbridge/intel/bd82x6x/Makefile.inc @@ -34,6 +34,8 @@ ramstage-y += me.c ramstage-y += me_8.x.c ramstage-y += smbus.c +ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/hda_verb.c + ramstage-y += me_status.c ramstage-y += reset.c ramstage-y += watchdog.c diff --git a/src/southbridge/intel/bd82x6x/azalia.c b/src/southbridge/intel/bd82x6x/azalia.c index fed6f745be..bef88abea4 100644 --- a/src/southbridge/intel/bd82x6x/azalia.c +++ b/src/southbridge/intel/bd82x6x/azalia.c @@ -26,6 +26,7 @@ #include #include #include +#include #include "pch.h" #define HDA_ICII_REG 0x68 @@ -90,11 +91,6 @@ no_codec: return 0; } -const u32 * cim_verb_data = NULL; -u32 cim_verb_data_size = 0; -const u32 * pc_beep_verbs = NULL; -u32 pc_beep_verbs_size = 0; - static u32 find_verb(struct device *dev, u32 viddid, const u32 ** verb) { int idx=0; diff --git a/src/southbridge/intel/i82801gx/Makefile.inc b/src/southbridge/intel/i82801gx/Makefile.inc index 94c84ed23e..6e4d42e519 100644 --- a/src/southbridge/intel/i82801gx/Makefile.inc +++ b/src/southbridge/intel/i82801gx/Makefile.inc @@ -30,6 +30,8 @@ ramstage-y += smbus.c ramstage-y += usb.c ramstage-y += usb_ehci.c +ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/hda_verb.c + ramstage-y += reset.c ramstage-y += watchdog.c diff --git a/src/southbridge/intel/i82801gx/azalia.c b/src/southbridge/intel/i82801gx/azalia.c index 59d812327c..f6628e7c95 100644 --- a/src/southbridge/intel/i82801gx/azalia.c +++ b/src/southbridge/intel/i82801gx/azalia.c @@ -25,6 +25,7 @@ #include #include #include +#include #include "i82801gx.h" #define HDA_ICII_REG 0x68 @@ -90,9 +91,6 @@ no_codec: return 0; } -const u32 * cim_verb_data = NULL; -u32 cim_verb_data_size = 0; - static u32 find_verb(struct device *dev, u32 viddid, const u32 ** verb) { int idx=0; diff --git a/src/southbridge/intel/i82801ix/Makefile.inc b/src/southbridge/intel/i82801ix/Makefile.inc index 096533c992..4117263ee7 100644 --- a/src/southbridge/intel/i82801ix/Makefile.inc +++ b/src/southbridge/intel/i82801ix/Makefile.inc @@ -28,6 +28,8 @@ ramstage-y += hdaudio.c ramstage-y += thermal.c ramstage-y += smbus.c +ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/hda_verb.c + ramstage-y += ../i82801gx/reset.c ramstage-y += ../i82801gx/watchdog.c diff --git a/src/southbridge/intel/i82801ix/hdaudio.c b/src/southbridge/intel/i82801ix/hdaudio.c index 407c0a795f..dd817b9b08 100644 --- a/src/southbridge/intel/i82801ix/hdaudio.c +++ b/src/southbridge/intel/i82801ix/hdaudio.c @@ -26,6 +26,7 @@ #include #include #include +#include #include "i82801ix.h" #define HDA_ICII_REG 0x68 @@ -91,11 +92,6 @@ no_codec: return 0; } -const u32 * cim_verb_data = NULL; -u32 cim_verb_data_size = 0; -const u32 * pc_beep_verbs = NULL; -u32 pc_beep_verbs_size = 0; - static u32 find_verb(struct device *dev, u32 viddid, const u32 ** verb) { int idx=0; diff --git a/src/southbridge/intel/ibexpeak/Makefile.inc b/src/southbridge/intel/ibexpeak/Makefile.inc index da9f34a8c8..24cbe454a1 100644 --- a/src/southbridge/intel/ibexpeak/Makefile.inc +++ b/src/southbridge/intel/ibexpeak/Makefile.inc @@ -34,6 +34,8 @@ ramstage-y += ../bd82x6x/me_8.x.c ramstage-y += smbus.c ramstage-y += thermal.c +ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/hda_verb.c + ramstage-y += ../bd82x6x/me_status.c ramstage-y += ../bd82x6x/reset.c ramstage-y += ../bd82x6x/watchdog.c diff --git a/src/southbridge/intel/ibexpeak/azalia.c b/src/southbridge/intel/ibexpeak/azalia.c index 046d2b68e8..314a1b1d19 100644 --- a/src/southbridge/intel/ibexpeak/azalia.c +++ b/src/southbridge/intel/ibexpeak/azalia.c @@ -26,6 +26,7 @@ #include #include #include +#include #include "pch.h" #define HDA_ICII_REG 0x68 @@ -88,11 +89,6 @@ no_codec: return 0; } -const u32 * cim_verb_data = NULL; -u32 cim_verb_data_size = 0; -const u32 * pc_beep_verbs = NULL; -u32 pc_beep_verbs_size = 0; - static u32 find_verb(struct device *dev, u32 viddid, const u32 ** verb) { int idx=0; diff --git a/src/southbridge/intel/lynxpoint/Makefile.inc b/src/southbridge/intel/lynxpoint/Makefile.inc index e504db09b7..3b7663ea04 100644 --- a/src/southbridge/intel/lynxpoint/Makefile.inc +++ b/src/southbridge/intel/lynxpoint/Makefile.inc @@ -35,6 +35,8 @@ ramstage-y += smbus.c ramstage-y += hda_verb.c ramstage-$(CONFIG_INTEL_LYNXPOINT_LP) += serialio.c +ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/hda_verb.c + ramstage-y += rcba.c ramstage-y += me_status.c ramstage-y += reset.c diff --git a/src/southbridge/intel/lynxpoint/azalia.c b/src/southbridge/intel/lynxpoint/azalia.c index 24c6702c3b..be056be493 100644 --- a/src/southbridge/intel/lynxpoint/azalia.c +++ b/src/southbridge/intel/lynxpoint/azalia.c @@ -26,14 +26,10 @@ #include #include #include +#include #include "pch.h" #include "hda_verb.h" -const u32 * cim_verb_data = NULL; -u32 cim_verb_data_size = 0; -const u32 * pc_beep_verbs = NULL; -u32 pc_beep_verbs_size = 0; - static void codecs_init(u32 base, u32 codec_mask) { int i; @@ -46,7 +42,7 @@ static void codecs_init(u32 base, u32 codec_mask) cim_verb_data); } - if (pc_beep_verbs_size && pc_beep_verbs) + if (pc_beep_verbs_size) hda_codec_write(base, pc_beep_verbs_size, pc_beep_verbs); } -- cgit v1.2.3