summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--recipes-kernel/linux/linux-intel-rt_5.10.bb10
-rw-r--r--recipes-kernel/linux/linux-intel_5.10.bb10
2 files changed, 20 insertions, 0 deletions
diff --git a/recipes-kernel/linux/linux-intel-rt_5.10.bb b/recipes-kernel/linux/linux-intel-rt_5.10.bb
index 7d67fb0a..16e8149e 100644
--- a/recipes-kernel/linux/linux-intel-rt_5.10.bb
+++ b/recipes-kernel/linux/linux-intel-rt_5.10.bb
@@ -23,3 +23,13 @@ SRCREV_machine ?= "774cd893ee3f4044305e0a7bf5090e32b72578b3"
SRCREV_meta ?= "eb09284047fec2f09d62068c338ae320c6681bd1"
LINUX_KERNEL_TYPE = "preempt-rt"
+
+# Following commit is backported from mainline 5.12-rc to linux-intel 5.10 kernel
+# Commit: https://github.com/torvalds/linux/commit/26499e0518a77de29e7db2c53fb0d0e9e15be8fb
+# In which 'CONFIG_DRM_GMA3600' config option is dropped.
+# This causes warning during config audit. So suppress the harmless warning for now.
+KCONF_BSP_AUDIT_LEVEL = "0"
+
+# Disabling CONFIG_SND_SOC_INTEL_SKYLAKE for 32-bit, does not allow to set CONFIG_SND_SOC_INTEL_SST too, which
+# causes config warning too.
+KCONF_AUDIT_LEVEL_core2-32-intel-common = "0"
diff --git a/recipes-kernel/linux/linux-intel_5.10.bb b/recipes-kernel/linux/linux-intel_5.10.bb
index 399ab014..4e33b45e 100644
--- a/recipes-kernel/linux/linux-intel_5.10.bb
+++ b/recipes-kernel/linux/linux-intel_5.10.bb
@@ -20,3 +20,13 @@ KERNEL_MODULE_AUTOLOAD_append_corei7-64-intel-common = " uio"
# Functionality flags
KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/security/security.scc"
+
+# Following commit is backported from mainline 5.12-rc to linux-intel 5.10 kernel
+# Commit: https://github.com/torvalds/linux/commit/26499e0518a77de29e7db2c53fb0d0e9e15be8fb
+# In which 'CONFIG_DRM_GMA3600' config option is dropped.
+# This causes warning during config audit. So suppress the harmless warning for now.
+KCONF_BSP_AUDIT_LEVEL = "0"
+
+# Disabling CONFIG_SND_SOC_INTEL_SKYLAKE for 32-bit, does not allow to set CONFIG_SND_SOC_INTEL_SST too, which
+# causes config warning too.
+KCONF_AUDIT_LEVEL_core2-32-intel-common = "0"