This is needed because the current kernel has a missing kernel
config check for 32bit skylake sound

Commit 0d590c4be300365a2d1787fcea767ac41c741875 upstream.

Signed-off-by: Saul Wold <[email protected]>
[reworked for pyro]
Signed-off-by: California Sullivan <[email protected]>
---
 common/recipes-kernel/linux/linux-intel-rt_4.9.bb          |  2 ++
 .../linux/linux-intel/disable_skylake_sound.cfg            | 14 ++++++++++++++
 common/recipes-kernel/linux/linux-intel_4.9.bb             |  2 ++
 3 files changed, 18 insertions(+)
 create mode 100644 
common/recipes-kernel/linux/linux-intel/disable_skylake_sound.cfg

diff --git a/common/recipes-kernel/linux/linux-intel-rt_4.9.bb 
b/common/recipes-kernel/linux/linux-intel-rt_4.9.bb
index 71de386..c3738f3 100644
--- a/common/recipes-kernel/linux/linux-intel-rt_4.9.bb
+++ b/common/recipes-kernel/linux/linux-intel-rt_4.9.bb
@@ -17,6 +17,8 @@ SRCREV_meta ?= "6acae6f7200af17b3c2be5ecab2cffdc59a02b35"
 SRC_URI = 
"git://github.com/01org/linux-intel-4.9.git;protocol=https;name=machine;branch=${KBRANCH};
 \
            
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.9;destsuffix=${KMETA}"
 
+SRC_URI_append_core2-32-intel-common = " file://disable_skylake_sound.cfg"
+
 LINUX_VERSION ?= "4.9.47"
 LINUX_VERSION_EXTENSION ?= "-intel-pk-${LINUX_KERNEL_TYPE}"
 
diff --git a/common/recipes-kernel/linux/linux-intel/disable_skylake_sound.cfg 
b/common/recipes-kernel/linux/linux-intel/disable_skylake_sound.cfg
new file mode 100644
index 0000000..f7d7322
--- /dev/null
+++ b/common/recipes-kernel/linux/linux-intel/disable_skylake_sound.cfg
@@ -0,0 +1,14 @@
+# CONFIG_SND_SOC_INTEL_SKYLAKE is not set
+# CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH is not set
+# CONFIG_SND_SOC_INTEL_BXT_FLORIDA_MACH is not set
+# CONFIG_SND_SOC_INTEL_BXT_RT298_MACH is not set
+# CONFIG_SND_SOC_INTEL_BXT_TDF8532_MACH is not set
+# CONFIG_SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH is not set
+# CONFIG_SND_SOC_INTEL_SKL_RT286_MACH is not set
+# CONFIG_SND_SOC_INTEL_CNL_WM8281_MACH is not set
+# CONFIG_SND_SOC_INTEL_CNL_RT274_MACH is not set
+# CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH is not set
+# CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH is not set
+# CONFIG_SND_SOC_INTEL_CNL_CS42L42_MACH is not set
+# CONFIG_SND_SOC_INTEL_CNL_RT700_MACH is not set
+# CONFIG_SND_SOC_INTEL_CNL_SVFPGA_MACH is not set
diff --git a/common/recipes-kernel/linux/linux-intel_4.9.bb 
b/common/recipes-kernel/linux/linux-intel_4.9.bb
index eca7dd7..b11519d 100644
--- a/common/recipes-kernel/linux/linux-intel_4.9.bb
+++ b/common/recipes-kernel/linux/linux-intel_4.9.bb
@@ -8,6 +8,8 @@ SRCREV_meta ?= "6acae6f7200af17b3c2be5ecab2cffdc59a02b35"
 SRC_URI = 
"git://github.com/01org/linux-intel-4.9.git;protocol=https;name=machine;branch=${KBRANCH};
 \
            
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.9;destsuffix=${KMETA}"
 
+SRC_URI_append_core2-32-intel-common = " file://disable_skylake_sound.cfg"
+
 LINUX_VERSION ?= "4.9.47"
 LINUX_VERSION_EXTENSION = "-intel-pk-${LINUX_KERNEL_TYPE}"
 
-- 
2.9.5

-- 
_______________________________________________
meta-intel mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/meta-intel

Reply via email to