summaryrefslogtreecommitdiffstats
path: root/recipes-kernel
diff options
context:
space:
mode:
authorAnuj Mittal <anuj.mittal@intel.com>2022-06-14 08:42:34 (GMT)
committerAnuj Mittal <anuj.mittal@intel.com>2022-06-20 01:50:59 (GMT)
commitbdcf0ec068f1c2146c5e7464eb8fceccdb688377 (patch)
tree416c9e04a52dbc9aa330865d98b2a26fbac61320 /recipes-kernel
parent5ffac669962e858b528068ae9f5396ac7d7f5a53 (diff)
downloadmeta-intel-bdcf0ec068f1c2146c5e7464eb8fceccdb688377.tar.gz
linux-intel: remove 32 bit specific tweaks
We test this kernel only with 64 bit machine types. Make changes to reflect that. intel-core2-32 should be built with linux-yocto kernel. Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Diffstat (limited to 'recipes-kernel')
-rw-r--r--recipes-kernel/linux/linux-intel-dev.bb4
-rw-r--r--recipes-kernel/linux/linux-intel-rt_5.15.bb4
-rw-r--r--recipes-kernel/linux/linux-intel.inc5
-rw-r--r--recipes-kernel/linux/linux-intel/disable_skylake_sound.cfg7
-rw-r--r--recipes-kernel/linux/linux-intel_5.15.bb8
5 files changed, 2 insertions, 26 deletions
diff --git a/recipes-kernel/linux/linux-intel-dev.bb b/recipes-kernel/linux/linux-intel-dev.bb
index 41f327b..b8256fc 100644
--- a/recipes-kernel/linux/linux-intel-dev.bb
+++ b/recipes-kernel/linux/linux-intel-dev.bb
@@ -8,7 +8,6 @@ SRC_URI = " \
8 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=${KMETA_BRANCH};destsuffix=${KMETA} \ 8 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=${KMETA_BRANCH};destsuffix=${KMETA} \
9 file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch \ 9 file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch \
10 " 10 "
11SRC_URI:append:core2-32-intel-common = " file://disable_skylake_sound.cfg"
12 11
13KMETA = "kernel-meta" 12KMETA = "kernel-meta"
14KCONF_BSP_AUDIT_LEVEL = "2" 13KCONF_BSP_AUDIT_LEVEL = "2"
@@ -26,9 +25,8 @@ SRCREV_meta ?= "99570241ac88d6c7e32b6fccd83afce53816b275"
26LINUX_VERSION_EXTENSION ?= "-mainline-tracking-${LINUX_KERNEL_TYPE}" 25LINUX_VERSION_EXTENSION ?= "-mainline-tracking-${LINUX_KERNEL_TYPE}"
27PV = "${LINUX_VERSION}+git${SRCPV}" 26PV = "${LINUX_VERSION}+git${SRCPV}"
28 27
29COMPATIBLE_MACHINE ?= "(intel-corei7-64|intel-core2-32)" 28COMPATIBLE_MACHINE ?= "(intel-corei7-64)"
30 29
31# Functionality flags 30# Functionality flags
32KERNEL_FEATURES:append = " ${KERNEL_EXTRA_FEATURES}" 31KERNEL_FEATURES:append = " ${KERNEL_EXTRA_FEATURES}"
33KERNEL_FEATURES:append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}"
34KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/security/security.scc" 32KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/security/security.scc"
diff --git a/recipes-kernel/linux/linux-intel-rt_5.15.bb b/recipes-kernel/linux/linux-intel-rt_5.15.bb
index 2301510..73903a5 100644
--- a/recipes-kernel/linux/linux-intel-rt_5.15.bb
+++ b/recipes-kernel/linux/linux-intel-rt_5.15.bb
@@ -23,7 +23,3 @@ SRCREV_machine ?= "9800b6da3fbf306dd172f2848423e5cc4060b604"
23SRCREV_meta ?= "ea948a0983d7b7820814e5bce4eda3079201bd95" 23SRCREV_meta ?= "ea948a0983d7b7820814e5bce4eda3079201bd95"
24 24
25LINUX_KERNEL_TYPE = "preempt-rt" 25LINUX_KERNEL_TYPE = "preempt-rt"
26
27# Disabling CONFIG_SND_SOC_INTEL_SKYLAKE for 32-bit, does not allow to set CONFIG_SND_SOC_INTEL_SST too, which
28# causes config warning too.
29KCONF_AUDIT_LEVEL:core2-32-intel-common = "0"
diff --git a/recipes-kernel/linux/linux-intel.inc b/recipes-kernel/linux/linux-intel.inc
index 8112dc6..97daba5 100644
--- a/recipes-kernel/linux/linux-intel.inc
+++ b/recipes-kernel/linux/linux-intel.inc
@@ -10,8 +10,6 @@ SRC_URI = " \
10 ${KERNEL_CONFIG_URI} \ 10 ${KERNEL_CONFIG_URI} \
11 " 11 "
12 12
13SRC_URI:append:core2-32-intel-common = " file://disable_skylake_sound.cfg"
14
15LINUX_VERSION_EXTENSION ??= "-intel-pk-${LINUX_KERNEL_TYPE}" 13LINUX_VERSION_EXTENSION ??= "-intel-pk-${LINUX_KERNEL_TYPE}"
16 14
17PV = "${LINUX_VERSION}+git${SRCPV}" 15PV = "${LINUX_VERSION}+git${SRCPV}"
@@ -19,7 +17,6 @@ PV = "${LINUX_VERSION}+git${SRCPV}"
19KMETA = "kernel-meta" 17KMETA = "kernel-meta"
20KCONF_BSP_AUDIT_LEVEL = "2" 18KCONF_BSP_AUDIT_LEVEL = "2"
21 19
22COMPATIBLE_MACHINE ?= "(intel-corei7-64|intel-core2-32)" 20COMPATIBLE_MACHINE ?= "(intel-corei7-64)"
23 21
24KERNEL_FEATURES:append = " ${KERNEL_EXTRA_FEATURES}" 22KERNEL_FEATURES:append = " ${KERNEL_EXTRA_FEATURES}"
25KERNEL_FEATURES:append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}"
diff --git a/recipes-kernel/linux/linux-intel/disable_skylake_sound.cfg b/recipes-kernel/linux/linux-intel/disable_skylake_sound.cfg
deleted file mode 100644
index 312bcb1..0000000
--- a/recipes-kernel/linux/linux-intel/disable_skylake_sound.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
1# CONFIG_SND_SOC_INTEL_SKYLAKE is not set
2# CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH is not set
3# CONFIG_SND_SOC_INTEL_BXT_RT298_MACH is not set
4# CONFIG_SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH is not set
5# CONFIG_SND_SOC_INTEL_SKL_RT286_MACH is not set
6# CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH is not set
7# CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH is not set
diff --git a/recipes-kernel/linux/linux-intel_5.15.bb b/recipes-kernel/linux/linux-intel_5.15.bb
index 6548055..6a63e9f 100644
--- a/recipes-kernel/linux/linux-intel_5.15.bb
+++ b/recipes-kernel/linux/linux-intel_5.15.bb
@@ -14,13 +14,5 @@ LINUX_VERSION ?= "5.15.43"
14SRCREV_machine ?= "1ec5959a8f6dbfbb47057317bc935924cd8d6977" 14SRCREV_machine ?= "1ec5959a8f6dbfbb47057317bc935924cd8d6977"
15SRCREV_meta ?= "ea948a0983d7b7820814e5bce4eda3079201bd95" 15SRCREV_meta ?= "ea948a0983d7b7820814e5bce4eda3079201bd95"
16 16
17# For Crystalforest and Romley
18KERNEL_MODULE_AUTOLOAD:append:core2-32-intel-common = " uio"
19KERNEL_MODULE_AUTOLOAD:append:corei7-64-intel-common = " uio"
20
21# Functionality flags 17# Functionality flags
22KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/security/security.scc" 18KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/security/security.scc"
23
24# Disabling CONFIG_SND_SOC_INTEL_SKYLAKE for 32-bit, does not allow to set CONFIG_SND_SOC_INTEL_SST too, which
25# causes config warning too.
26KCONF_AUDIT_LEVEL:core2-32-intel-common = "0"