mirror of
git://git.yoctoproject.org/meta-intel.git
synced 2025-07-19 12:59:03 +02:00
linux-intel/5.10: remove recipes
5.15 is the only tested and default version now. Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
This commit is contained in:
Anuj Mittal
parent
5184e1d89f
commit
a499bad106
|
|
@ -9,8 +9,8 @@ PREFERRED_PROVIDER_virtual/kernel:poky-tiny ?= "linux-intel"
|
|||
|
||||
PREFERRED_VERSION_linux-intel ?= "5.15%"
|
||||
PREFERRED_VERSION_linux-intel-rt ?= "5.15%"
|
||||
PREFERRED_VERSION_linux-intel:poky-altcfg ?= "5.10%"
|
||||
PREFERRED_VERSION_linux-intel-rt:poky-altcfg ?= "5.10%"
|
||||
PREFERRED_VERSION_linux-intel:poky-altcfg ?= "5.15%"
|
||||
PREFERRED_VERSION_linux-intel-rt:poky-altcfg ?= "5.15%"
|
||||
|
||||
# Need to point to latest version of libva needed for media components
|
||||
PREFERRED_PROVIDER_libva = "libva-intel"
|
||||
|
|
|
|||
|
|
@ -1,36 +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=6bc538ed5bd9a7fc9398086aedcd7e46"
|
||||
SRC_URI:append = " file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch \
|
||||
file://0001-regulator-consumer-Add-missing-stubs-to-regulator-co.patch \
|
||||
"
|
||||
|
||||
KBRANCH = "5.10/preempt-rt"
|
||||
KMETA_BRANCH = "yocto-5.10"
|
||||
|
||||
DEPENDS += "elfutils-native openssl-native util-linux-native"
|
||||
|
||||
LINUX_VERSION ?= "5.10.115"
|
||||
SRCREV_machine ?= "5dd48c946c3d28aa2eeeb04de125bfca1c88527f"
|
||||
SRCREV_meta ?= "64fb693a6c11f21bab3ff9bb8dcb65a70abe05e3"
|
||||
|
||||
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"
|
||||
|
|
@ -1,94 +0,0 @@
|
|||
From cc3ff5fe73139251070775308dcaadf474566b4b Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Gleixner <tglx@linutronix.de>
|
||||
Date: Tue, 3 Nov 2020 10:27:32 +0100
|
||||
Subject: [PATCH] io-mapping: Cleanup atomic iomap
|
||||
|
||||
Switch the atomic iomap implementation over to kmap_local and stick the
|
||||
preempt/pagefault mechanics into the generic code similar to the
|
||||
kmap_atomic variants.
|
||||
|
||||
Rename the x86 map function in preparation for a non-atomic variant.
|
||||
|
||||
Upstream-Status: Backport [https://github.com/torvalds/linux/commit/351191ad55c8a1eccaf23e4187c62056229c0779]
|
||||
|
||||
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
||||
Cc: Linus Torvalds <torvalds@linuxfoundation.org>
|
||||
Cc: Christoph Hellwig <hch@lst.de>
|
||||
Cc: Andrew Morton <akpm@linux-foundation.org>
|
||||
Link: https://lore.kernel.org/r/20201103095858.625310005@linutronix.de
|
||||
---
|
||||
arch/x86/include/asm/iomap.h | 9 +--------
|
||||
arch/x86/mm/iomap_32.c | 6 ++----
|
||||
include/linux/io-mapping.h | 8 ++++++--
|
||||
3 files changed, 9 insertions(+), 14 deletions(-)
|
||||
|
||||
diff --git a/arch/x86/include/asm/iomap.h b/arch/x86/include/asm/iomap.h
|
||||
index 0be7a30fd6bc..e2de092fc38c 100644
|
||||
--- a/arch/x86/include/asm/iomap.h
|
||||
+++ b/arch/x86/include/asm/iomap.h
|
||||
@@ -13,14 +13,7 @@
|
||||
#include <asm/cacheflush.h>
|
||||
#include <asm/tlbflush.h>
|
||||
|
||||
-void __iomem *iomap_atomic_pfn_prot(unsigned long pfn, pgprot_t prot);
|
||||
-
|
||||
-static inline void iounmap_atomic(void __iomem *vaddr)
|
||||
-{
|
||||
- kunmap_local_indexed((void __force *)vaddr);
|
||||
- pagefault_enable();
|
||||
- preempt_enable();
|
||||
-}
|
||||
+void __iomem *__iomap_local_pfn_prot(unsigned long pfn, pgprot_t prot);
|
||||
|
||||
int iomap_create_wc(resource_size_t base, unsigned long size, pgprot_t *prot);
|
||||
|
||||
diff --git a/arch/x86/mm/iomap_32.c b/arch/x86/mm/iomap_32.c
|
||||
index e0a40d7cc66c..9aaa756ddf21 100644
|
||||
--- a/arch/x86/mm/iomap_32.c
|
||||
+++ b/arch/x86/mm/iomap_32.c
|
||||
@@ -44,7 +44,7 @@ void iomap_free(resource_size_t base, unsigned long size)
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(iomap_free);
|
||||
|
||||
-void __iomem *iomap_atomic_pfn_prot(unsigned long pfn, pgprot_t prot)
|
||||
+void __iomem *__iomap_local_pfn_prot(unsigned long pfn, pgprot_t prot)
|
||||
{
|
||||
/*
|
||||
* For non-PAT systems, translate non-WB request to UC- just in
|
||||
@@ -60,8 +60,6 @@ void __iomem *iomap_atomic_pfn_prot(unsigned long pfn, pgprot_t prot)
|
||||
/* Filter out unsupported __PAGE_KERNEL* bits: */
|
||||
pgprot_val(prot) &= __default_kernel_pte_mask;
|
||||
|
||||
- preempt_disable();
|
||||
- pagefault_disable();
|
||||
return (void __force __iomem *)__kmap_local_pfn_prot(pfn, prot);
|
||||
}
|
||||
-EXPORT_SYMBOL_GPL(iomap_atomic_pfn_prot);
|
||||
+EXPORT_SYMBOL_GPL(__iomap_local_pfn_prot);
|
||||
diff --git a/include/linux/io-mapping.h b/include/linux/io-mapping.h
|
||||
index 0a1a186a43c5..e9743cfd8585 100644
|
||||
--- a/include/linux/io-mapping.h
|
||||
+++ b/include/linux/io-mapping.h
|
||||
@@ -69,13 +69,17 @@ io_mapping_map_atomic_wc(struct io_mapping *mapping,
|
||||
|
||||
BUG_ON(offset >= mapping->size);
|
||||
phys_addr = mapping->base + offset;
|
||||
- return iomap_atomic_pfn_prot(PHYS_PFN(phys_addr), mapping->prot);
|
||||
+ preempt_disable();
|
||||
+ pagefault_disable();
|
||||
+ return __iomap_local_pfn_prot(PHYS_PFN(phys_addr), mapping->prot);
|
||||
}
|
||||
|
||||
static inline void
|
||||
io_mapping_unmap_atomic(void __iomem *vaddr)
|
||||
{
|
||||
- iounmap_atomic(vaddr);
|
||||
+ kunmap_local_indexed((void __force *)vaddr);
|
||||
+ pagefault_enable();
|
||||
+ preempt_enable();
|
||||
}
|
||||
|
||||
static inline void __iomem *
|
||||
--
|
||||
2.17.1
|
||||
|
||||
|
|
@ -1,89 +0,0 @@
|
|||
From 1c80d994d3dbdaefb429305461e95a86be5b3862 Mon Sep 17 00:00:00 2001
|
||||
From: Dmitry Osipenko <digetx@gmail.com>
|
||||
Date: Tue, 10 May 2022 16:53:06 +0800
|
||||
Subject: [PATCH] regulator: consumer: Add missing stubs to
|
||||
regulator/consumer.h
|
||||
|
||||
commit 51dfb6ca3728bd0a0a3c23776a12d2a15a1d2457 upstream
|
||||
|
||||
Add missing stubs to regulator/consumer.h in order to fix COMPILE_TEST
|
||||
of the kernel. In particular this should fix compile-testing of OPP core
|
||||
because of a missing stub for regulator_sync_voltage().
|
||||
|
||||
Reported-by: kernel test robot <lkp@intel.com>
|
||||
Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
|
||||
Link: https://lore.kernel.org/r/20210120205844.12658-1-digetx@gmail.com
|
||||
Signed-off-by: Mark Brown <broonie@kernel.org>
|
||||
|
||||
Backport from mainline to fix build failure when CONFIG_REGULATOR=n which
|
||||
is default in linux-yocto.
|
||||
5.10.114 in mainline stable tree does not handle this case.
|
||||
Link: https://lore.kernel.org/all/62796b82.1c69fb81.1bf47.0bcf@mx.google.com/
|
||||
|
||||
Upstream-Status: Backported [https://github.com/torvalds/linux/commit/51dfb6ca3728bd0a0a3c23776a12d2a15a1d2457]
|
||||
|
||||
Signed-off-by: He Zhe <zhe.he@windriver.com>
|
||||
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
|
||||
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
|
||||
---
|
||||
include/linux/regulator/consumer.h | 30 ++++++++++++++++++++++++++++++
|
||||
1 file changed, 30 insertions(+)
|
||||
|
||||
diff --git a/include/linux/regulator/consumer.h b/include/linux/regulator/consumer.h
|
||||
index 2024944fd2f7..20e84a84fb77 100644
|
||||
--- a/include/linux/regulator/consumer.h
|
||||
+++ b/include/linux/regulator/consumer.h
|
||||
@@ -331,6 +331,12 @@ regulator_get_exclusive(struct device *dev, const char *id)
|
||||
return ERR_PTR(-ENODEV);
|
||||
}
|
||||
|
||||
+static inline struct regulator *__must_check
|
||||
+devm_regulator_get_exclusive(struct device *dev, const char *id)
|
||||
+{
|
||||
+ return ERR_PTR(-ENODEV);
|
||||
+}
|
||||
+
|
||||
static inline struct regulator *__must_check
|
||||
regulator_get_optional(struct device *dev, const char *id)
|
||||
{
|
||||
@@ -486,6 +492,11 @@ static inline int regulator_get_voltage(struct regulator *regulator)
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
+static inline int regulator_sync_voltage(struct regulator *regulator)
|
||||
+{
|
||||
+ return -EINVAL;
|
||||
+}
|
||||
+
|
||||
static inline int regulator_is_supported_voltage(struct regulator *regulator,
|
||||
int min_uV, int max_uV)
|
||||
{
|
||||
@@ -578,6 +589,25 @@ static inline int devm_regulator_unregister_notifier(struct regulator *regulator
|
||||
return 0;
|
||||
}
|
||||
|
||||
+static inline int regulator_suspend_enable(struct regulator_dev *rdev,
|
||||
+ suspend_state_t state)
|
||||
+{
|
||||
+ return -EINVAL;
|
||||
+}
|
||||
+
|
||||
+static inline int regulator_suspend_disable(struct regulator_dev *rdev,
|
||||
+ suspend_state_t state)
|
||||
+{
|
||||
+ return -EINVAL;
|
||||
+}
|
||||
+
|
||||
+static inline int regulator_set_suspend_voltage(struct regulator *regulator,
|
||||
+ int min_uV, int max_uV,
|
||||
+ suspend_state_t state)
|
||||
+{
|
||||
+ return -EINVAL;
|
||||
+}
|
||||
+
|
||||
static inline void *regulator_get_drvdata(struct regulator *regulator)
|
||||
{
|
||||
return NULL;
|
||||
--
|
||||
2.25.1
|
||||
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
require linux-intel.inc
|
||||
|
||||
KBRANCH = "5.10/yocto"
|
||||
KMETA_BRANCH = "yocto-5.10"
|
||||
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
|
||||
|
||||
SRC_URI:append = " file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch \
|
||||
file://0001-io-mapping-Cleanup-atomic-iomap.patch \
|
||||
file://0001-regulator-consumer-Add-missing-stubs-to-regulator-co.patch \
|
||||
"
|
||||
|
||||
DEPENDS += "elfutils-native openssl-native util-linux-native"
|
||||
|
||||
LINUX_VERSION ?= "5.10.115"
|
||||
SRCREV_machine ?= "9d73f92a1109a0f9e916edb861214ce1cea6863a"
|
||||
SRCREV_meta ?= "64fb693a6c11f21bab3ff9bb8dcb65a70abe05e3"
|
||||
|
||||
# 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"
|
||||
|
||||
# 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"
|
||||
Loading…
Reference in New Issue
Block a user