summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDuncan Laurie <dlaurie@chromium.org>2014-04-22 10:48:29 -0700
committerMarc Jones <marc.jones@se-eng.com>2014-10-22 03:35:13 +0200
commitf0aaa29989f4de7258430715d64c6d465fb0c457 (patch)
treeb6726bf7769b3d8384a4070de4c853f0cd19fa7b
parentd8c4f2b72462f60ae92a59a976437c2407ec6654 (diff)
downloadcoreboot-f0aaa29989f4de7258430715d64c6d465fb0c457.tar.xz
baytrail: Move HDA verb table to Intel SOC common directory
This is common code for Intel SOC that can be shared. Change-Id: Ic703f36f56a8238d5cc1248b353d8c3a49827a9a Signed-off-by: Duncan Laurie <dlaurie@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/196264 Reviewed-by: Aaron Durbin <adurbin@chromium.org> (cherry picked from commit 3a9057b9616c54a8404eee55511743d2492dbc28) Signed-off-by: Isaac Christensen <isaac.christensen@se-eng.com> Reviewed-on: http://review.coreboot.org/6968 Tested-by: build bot (Jenkins) Reviewed-by: Marc Jones <marc.jones@se-eng.com>
-rw-r--r--src/soc/intel/baytrail/Makefile.inc1
-rw-r--r--src/soc/intel/baytrail/hda.c2
-rw-r--r--src/soc/intel/common/Makefile.inc1
-rw-r--r--src/soc/intel/common/hda_verb.c (renamed from src/soc/intel/baytrail/hda_verb.c)2
-rw-r--r--src/soc/intel/common/hda_verb.h (renamed from src/soc/intel/baytrail/baytrail/hda_verb.h)8
5 files changed, 7 insertions, 7 deletions
diff --git a/src/soc/intel/baytrail/Makefile.inc b/src/soc/intel/baytrail/Makefile.inc
index f5c4c9f6e7..94f3241dfb 100644
--- a/src/soc/intel/baytrail/Makefile.inc
+++ b/src/soc/intel/baytrail/Makefile.inc
@@ -48,7 +48,6 @@ ramstage-y += stage_cache.c
romstage-y += stage_cache.c
ramstage-$(CONFIG_ELOG) += elog.c
ramstage-y += hda.c
-ramstage-y += hda_verb.c
# Remove as ramstage gets fleshed out
ramstage-y += placeholders.c
diff --git a/src/soc/intel/baytrail/hda.c b/src/soc/intel/baytrail/hda.c
index a99e743a60..c5de654921 100644
--- a/src/soc/intel/baytrail/hda.c
+++ b/src/soc/intel/baytrail/hda.c
@@ -24,7 +24,7 @@
#include <device/pci_ids.h>
#include <reg_script.h>
-#include <baytrail/hda_verb.h>
+#include <soc/intel/common/hda_verb.h>
#include <baytrail/iomap.h>
#include <baytrail/iosf.h>
#include <baytrail/pci_devs.h>
diff --git a/src/soc/intel/common/Makefile.inc b/src/soc/intel/common/Makefile.inc
index b32255ae42..0c39d80340 100644
--- a/src/soc/intel/common/Makefile.inc
+++ b/src/soc/intel/common/Makefile.inc
@@ -1,3 +1,4 @@
+ramstage-y += hda_verb.c
ramstage-$(CONFIG_CACHE_MRC_SETTINGS) += nvm.c
ramstage-$(CONFIG_CACHE_MRC_SETTINGS) += mrc_cache.c
romstage-$(CONFIG_CACHE_MRC_SETTINGS) += mrc_cache.c
diff --git a/src/soc/intel/baytrail/hda_verb.c b/src/soc/intel/common/hda_verb.c
index ae71b89770..6404ee281f 100644
--- a/src/soc/intel/baytrail/hda_verb.c
+++ b/src/soc/intel/common/hda_verb.c
@@ -22,7 +22,7 @@
#include <console/console.h>
#include <arch/io.h>
#include <delay.h>
-#include <baytrail/hda_verb.h>
+#include "hda_verb.h"
/**
* Set bits in a register and wait for status
diff --git a/src/soc/intel/baytrail/baytrail/hda_verb.h b/src/soc/intel/common/hda_verb.h
index 9c505d6c0e..a9c93c6e4f 100644
--- a/src/soc/intel/baytrail/baytrail/hda_verb.h
+++ b/src/soc/intel/common/hda_verb.h
@@ -1,7 +1,7 @@
/*
* This file is part of the coreboot project.
*
- * Copyright (C) 2013 Google Inc.
+ * Copyright (C) 2014 Google Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -17,8 +17,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef BAYTRAIL_HDA_VERB_H
-#define BAYTRAIL_HDA_VERB_H
+#ifndef _COMMON_HDA_VERB_H_
+#define _COMMON_HDA_VERB_H_
#include <stdint.h>
@@ -36,4 +36,4 @@ int hda_codec_detect(u32 base);
int hda_codec_write(u32 base, u32 size, const u32 *data);
int hda_codec_init(u32 base, int addr, int verb_size, const u32 *verb_data);
-#endif
+#endif /* _COMMON_HDA_VERB_H_ */