summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2021-03-19 14:58:30 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-03-20 18:54:57 +0000
commit6df0aad8463f546d16245fa51890b9c565989744 (patch)
tree2e943d46fddb92737e74e49cac4f2ef8cdac8484
parent922332f58de552d9f1c51648b4e09387ea739c74 (diff)
downloadpoky-contrib-6df0aad8463f546d16245fa51890b9c565989744.tar.gz
poky-contrib-6df0aad8463f546d16245fa51890b9c565989744.tar.bz2
poky-contrib-6df0aad8463f546d16245fa51890b9c565989744.zip
linux-yocto/5.10: fix SERIAL_OF_PLATFORM warning
Integrating the following commit(s) to linux-yocto.: a0249ac3bae cfg: classify CONFIG_SERIAL_OF_PLATFORM as non-hardware By declaring the option non-hardware, we make it optional and hence fix the warning on non OF platforms. (From OE-Core rev: c6f0962e5ea2403b95ecc2bc0bc3faa9d979ee57) Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_5.10.bb2
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb
index 4a4aa2b9d4..7375537654 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb
@@ -12,7 +12,7 @@ python () {
}
SRCREV_machine ?= "36889a571fe57fe3561cc23f842b92e4ea9ca264"
-SRCREV_meta ?= "8c8f6a791bed6e8f675236946e805a7fc489e382"
+SRCREV_meta ?= "7d652f104151052fe4c0cf48d7bc0d7e0c0a7dad"
SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb
index 8bb1037476..934c1c99b1 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb
@@ -17,7 +17,7 @@ KCONF_BSP_AUDIT_LEVEL = "2"
SRCREV_machine_qemuarm ?= "9d6d37cfe365ebd5b530f9c43c1ace924343bb15"
SRCREV_machine ?= "8c516ced69f41563404ada0bea315a55bcf1df6f"
-SRCREV_meta ?= "8c8f6a791bed6e8f675236946e805a7fc489e382"
+SRCREV_meta ?= "7d652f104151052fe4c0cf48d7bc0d7e0c0a7dad"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.10.bb b/meta/recipes-kernel/linux/linux-yocto_5.10.bb
index 03d7c6a3de..f867a125a4 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.10.bb
@@ -23,7 +23,7 @@ SRCREV_machine_qemux86 ?= "8c516ced69f41563404ada0bea315a55bcf1df6f"
SRCREV_machine_qemux86-64 ?= "8c516ced69f41563404ada0bea315a55bcf1df6f"
SRCREV_machine_qemumips64 ?= "f1c01716513524065f0f231c6e6502cd9a3ecb53"
SRCREV_machine ?= "8c516ced69f41563404ada0bea315a55bcf1df6f"
-SRCREV_meta ?= "8c8f6a791bed6e8f675236946e805a7fc489e382"
+SRCREV_meta ?= "7d652f104151052fe4c0cf48d7bc0d7e0c0a7dad"
# remap qemuarm to qemuarma15 for the 5.8 kernel
# KMACHINE_qemuarm ?= "qemuarma15"