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 <[email protected]> --- recipes-kernel/linux/linux-intel-dev.bb | 4 +--- recipes-kernel/linux/linux-intel-rt_5.15.bb | 4 ---- recipes-kernel/linux/linux-intel.inc | 5 +---- .../linux/linux-intel/disable_skylake_sound.cfg | 7 ------- recipes-kernel/linux/linux-intel_5.15.bb | 8 -------- 5 files changed, 2 insertions(+), 26 deletions(-) delete mode 100644 recipes-kernel/linux/linux-intel/disable_skylake_sound.cfg diff --git a/recipes-kernel/linux/linux-intel-dev.bb b/recipes-kernel/linux/linux-intel-dev.bb index 41f327b8..b8256fcc 100644 --- a/recipes-kernel/linux/linux-intel-dev.bb +++ b/recipes-kernel/linux/linux-intel-dev.bb @@ -8,7 +8,6 @@ SRC_URI = " \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=${KMETA_BRANCH};destsuffix=${KMETA} \ file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch \ " -SRC_URI:append:core2-32-intel-common = " file://disable_skylake_sound.cfg" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" @@ -26,9 +25,8 @@ SRCREV_meta ?= "99570241ac88d6c7e32b6fccd83afce53816b275" LINUX_VERSION_EXTENSION ?= "-mainline-tracking-${LINUX_KERNEL_TYPE}" PV = "${LINUX_VERSION}+git${SRCPV}" -COMPATIBLE_MACHINE ?= "(intel-corei7-64|intel-core2-32)" +COMPATIBLE_MACHINE ?= "(intel-corei7-64)" # Functionality flags KERNEL_FEATURES:append = " ${KERNEL_EXTRA_FEATURES}" -KERNEL_FEATURES:append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}" KERNEL_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 2301510e..73903a5c 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" SRCREV_meta ?= "ea948a0983d7b7820814e5bce4eda3079201bd95" LINUX_KERNEL_TYPE = "preempt-rt" - -# 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.inc b/recipes-kernel/linux/linux-intel.inc index 8112dc62..97daba5e 100644 --- a/recipes-kernel/linux/linux-intel.inc +++ b/recipes-kernel/linux/linux-intel.inc @@ -10,8 +10,6 @@ SRC_URI = " \ ${KERNEL_CONFIG_URI} \ " -SRC_URI:append:core2-32-intel-common = " file://disable_skylake_sound.cfg" - LINUX_VERSION_EXTENSION ??= "-intel-pk-${LINUX_KERNEL_TYPE}" PV = "${LINUX_VERSION}+git${SRCPV}" @@ -19,7 +17,6 @@ PV = "${LINUX_VERSION}+git${SRCPV}" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -COMPATIBLE_MACHINE ?= "(intel-corei7-64|intel-core2-32)" +COMPATIBLE_MACHINE ?= "(intel-corei7-64)" KERNEL_FEATURES:append = " ${KERNEL_EXTRA_FEATURES}" -KERNEL_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 312bcb1a..00000000 --- a/recipes-kernel/linux/linux-intel/disable_skylake_sound.cfg +++ /dev/null @@ -1,7 +0,0 @@ -# CONFIG_SND_SOC_INTEL_SKYLAKE is not set -# CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH is not set -# CONFIG_SND_SOC_INTEL_BXT_RT298_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_SKL_NAU88L25_SSM4567_MACH is not set -# 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 6548055b..6a63e9f9 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" SRCREV_machine ?= "1ec5959a8f6dbfbb47057317bc935924cd8d6977" SRCREV_meta ?= "ea948a0983d7b7820814e5bce4eda3079201bd95" -# For Crystalforest and Romley -KERNEL_MODULE_AUTOLOAD:append:core2-32-intel-common = " uio" -KERNEL_MODULE_AUTOLOAD:append:corei7-64-intel-common = " uio" - # Functionality flags KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/security/security.scc" - -# 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" -- 2.35.3
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#7561): https://lists.yoctoproject.org/g/meta-intel/message/7561 Mute This Topic: https://lists.yoctoproject.org/mt/91816911/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-intel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
