New LTS 5.15 is already added, so time to drop 5.4 support Drop linux-intel-rt/5.4 too.
Drop cfg which is not required for LTS 5.10 & 5.15. Ref: https://github.com/torvalds/linux/commit/eb83479e18999e34b3b800f54aa31137f7f41c33 Signed-off-by: Naveen Saini <[email protected]> --- recipes-kernel/linux/linux-intel-rt_5.4.bb | 30 ------------------- recipes-kernel/linux/linux-intel.inc | 1 - .../linux-intel/enable_lynxpoint_gpio.cfg | 1 - recipes-kernel/linux/linux-intel_5.4.bb | 26 ---------------- 4 files changed, 58 deletions(-) delete mode 100644 recipes-kernel/linux/linux-intel-rt_5.4.bb delete mode 100644 recipes-kernel/linux/linux-intel/enable_lynxpoint_gpio.cfg delete mode 100644 recipes-kernel/linux/linux-intel_5.4.bb diff --git a/recipes-kernel/linux/linux-intel-rt_5.4.bb b/recipes-kernel/linux/linux-intel-rt_5.4.bb deleted file mode 100644 index adc01e6b..00000000 --- a/recipes-kernel/linux/linux-intel-rt_5.4.bb +++ /dev/null @@ -1,30 +0,0 @@ -require linux-intel.inc - -# Skip processing of this recipe if it is not explicitly specified as the -# PREFERRED_PROVIDER for virtual/kernel. This avoids errors when trying -# to build multiple virtual/kernel providers, e.g. as dependency of -# core-image-rt-sdk, core-image-rt. -python () { - if d.getVar("KERNEL_PACKAGE_NAME", True) == "kernel" and d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-intel-rt": - raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-intel-rt to enable it") -} - -LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -SRC_URI:append = " file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch \ -" - -KBRANCH = "5.4/preempt-rt" -KMETA_BRANCH = "yocto-5.4" - -DEPENDS += "elfutils-native openssl-native util-linux-native" - -LINUX_VERSION ?= "5.4.143" -SRCREV_machine ?= "2dc0f2c1ee89b9ce92944e397f2619062ebb77f8" -SRCREV_meta ?= "e14d587eec888fba8693da2a072f729219acfb41" - -LINUX_KERNEL_TYPE = "preempt-rt" - -# Kernel config 'CONFIG_GPIO_LYNXPOINT' goes by a different name 'CONFIG_PINCTRL_LYNXPOINT' in -# linux-intel 5.4 specifically. This cause annoying warning during kernel config audit. So suppress the -# harmless warning for now. -KCONF_BSP_AUDIT_LEVEL = "0" diff --git a/recipes-kernel/linux/linux-intel.inc b/recipes-kernel/linux/linux-intel.inc index 70a7e7dc..8112dc62 100644 --- a/recipes-kernel/linux/linux-intel.inc +++ b/recipes-kernel/linux/linux-intel.inc @@ -10,7 +10,6 @@ SRC_URI = " \ ${KERNEL_CONFIG_URI} \ " -SRC_URI:append = " file://enable_lynxpoint_gpio.cfg" SRC_URI:append:core2-32-intel-common = " file://disable_skylake_sound.cfg" LINUX_VERSION_EXTENSION ??= "-intel-pk-${LINUX_KERNEL_TYPE}" diff --git a/recipes-kernel/linux/linux-intel/enable_lynxpoint_gpio.cfg b/recipes-kernel/linux/linux-intel/enable_lynxpoint_gpio.cfg deleted file mode 100644 index 49e70e67..00000000 --- a/recipes-kernel/linux/linux-intel/enable_lynxpoint_gpio.cfg +++ /dev/null @@ -1 +0,0 @@ -CONFIG_PINCTRL_LYNXPOINT=m diff --git a/recipes-kernel/linux/linux-intel_5.4.bb b/recipes-kernel/linux/linux-intel_5.4.bb deleted file mode 100644 index 570f692b..00000000 --- a/recipes-kernel/linux/linux-intel_5.4.bb +++ /dev/null @@ -1,26 +0,0 @@ -require linux-intel.inc - -KBRANCH = "5.4/yocto" -KMETA_BRANCH = "yocto-5.4" - -LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" - -SRC_URI:append = " file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch" - -DEPENDS += "elfutils-native openssl-native util-linux-native" - -LINUX_VERSION ?= "5.4.143" -SRCREV_machine ?= "8246417e2e14117a0a9f3625c2122fc26c92c6bd" -SRCREV_meta ?= "e14d587eec888fba8693da2a072f729219acfb41" - -# 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" - -# Kernel config 'CONFIG_GPIO_LYNXPOINT' goes by a different name 'CONFIG_PINCTRL_LYNXPOINT' in -# linux-intel 5.4 specifically. This cause warning during kernel config audit. So suppress the -# harmless warning for now. -KCONF_BSP_AUDIT_LEVEL = "0" -- 2.17.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#7354): https://lists.yoctoproject.org/g/meta-intel/message/7354 Mute This Topic: https://lists.yoctoproject.org/mt/87230439/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-intel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
