Patch set updated for coreboot: soc/intel/apollolake: Use common NHLT

[Saurabh Satija]

Saurabh Satija ([e-mail]) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/15326

-gerrit

commit 942ce5118a739298fa23c4abc989d318256e321c
Author: Saurabh Satija 
Date:   Wed Jun 22 17:38:12 2016 -0700

soc/intel/apollolake: Use common NHLT

This makes use of common NHLT implmentation for audio on Intel's
    apollolake platform.

Change-Id: I3ff87efc83bc243d51a8ddea896ae60f7bb7aec9
    Signed-off-by: Saurabh Satija 
---
 src/soc/intel/apollolake/Kconfig      | 23 +++++++++++++++++++++++
 src/soc/intel/apollolake/Makefile.inc | 18 ++++++++++++++++++
 2 files changed, 41 insertions(+)

diff --git a/src/soc/intel/apollolake/Kconfig b/src/soc/intel/apollolake/Kconfig
index d830a9f..9bc199d 100644
--- a/src/soc/intel/apollolake/Kconfig
+++ b/src/soc/intel/apollolake/Kconfig
@@ -17,6 +17,8 @@ config CPU_SPECIFIC_OPTIONS
    select SMP
    select SSE2
    select SUPPORT_CPU_UCODE_IN_CBFS
+	# Audio options
+	select ACPI_NHLT
    # Misc options
    select C_ENVIRONMENT_BOOTBLOCK
    select COLLECT_TIMESTAMPS
@@ -184,4 +186,25 @@ config IFWI_FILE_NAME
    help
      Name of file to store in the IFWI region.

+config NHLT_DMIC_2CH_16B
+	bool
+	depends on ACPI_NHLT
+	default n
+	help
+	  Include DSP firmware settings for 2 channel 16B DMIC array.
+
+config NHLT_MAX98357
+	bool
+	depends on ACPI_NHLT
+	default n
+	help
+	  Include DSP firmware settings for headset codec.
+
+config NHLT_DA7219
+	bool
+	depends on ACPI_NHLT
+	default n
+	help
+	  Include DSP firmware settings for headset codec.
+
 endif
diff --git a/src/soc/intel/apollolake/Makefile.inc b/src/soc/intel/apollolake/Makefile.inc
index 38ed07d..a82dacd 100644
--- a/src/soc/intel/apollolake/Makefile.inc
+++ b/src/soc/intel/apollolake/Makefile.inc
@@ -56,6 +56,24 @@ ramstage-y += pmc.c
 ramstage-y += smi.c
 ramstage-y += reset.c

+# DSP firmware settings files.
+NHLT_BLOB_PATH = 3rdparty/blobs/soc/intel/apollolake/nhlt-blobs
+DMIC_2CH_48KHZ_16B = dmic-2ch-48khz-16b.bin
+MAX98357_RENDER = max98357-render-2ch-48khz-24b.bin
+DA7219_RENDER_CAPTURE = dialog-2ch-48khz-24b.bin
+
+cbfs-files-$(CONFIG_NHLT_DMIC_2CH) += $(DMIC_2CH_48KHZ_16B)
+$(DMIC_2CH_48KHZ_16B)-file := $(NHLT_BLOB_PATH)/$(DMIC_2CH_48KHZ_16B)
+$(DMIC_2CH_48KHZ_16B)-type := raw
+
+cbfs-files-$(CONFIG_NHLT_MAX98357) += $(MAX98357_RENDER)
+$(MAX98357_RENDER)-file := $(NHLT_BLOB_PATH)/$(MAX98357_RENDER)
+$(MAX98357_RENDER)-type := raw
+
+cbfs-files-$(CONFIG_NHLT_DA7219) += $(DA7219_RENDER_CAPTURE)
+$(DA7219_RENDER_CAPTURE)-file := $(NHLT_BLOB_PATH)/$(DA7219_RENDER_CAPTURE)
+$(DA7219_RENDER_CAPTURE)-type := raw
+
 postcar-y += exit_car.S
 postcar-y += memmap.c
 postcar-y += mmap_boot.c