summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2021-04-18 20:06:26 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-04-21 22:43:58 +0100
commit7f7281cb6d24e8c2e0f57df2dab63f0bb853f1f9 (patch)
tree0861361bd61feb9f7bf411da8017a94f89957ba6
parent0596dc8d5109ad9bb674e04eb4d3b7095dcbb369 (diff)
downloadpoky-7f7281cb6d24e8c2e0f57df2dab63f0bb853f1f9.tar.gz
linux-yocto/5.10: BSP configuration fixes
Integrating the following commit(s) to linux-yocto/5.10.: fa039db710c qemuppc64: Enable the RTC driver f6cfc23fbfc nxp-s32g2xx: add HSE UIO related configs to make hse demo work 2b445fb1e0b firmware: fix CONFIG_FW_LOADER option mismatch warning 60dde01d949 nxp-imx8: Correct DRM_TTM config and delete redundant config 07119316ee5 xlnx: bsp: drop obsolete kernel options for xilinx-zynqmp and xilinx-zynq 0cf78165f8e bcm-2xxx-rpi: update v5.10 kernel config for raspberrypi 4b platform 9b5a9e46778 marvell-cn96xx: Add the preempt-rt support (From OE-Core rev: 6186f21b29e7a152d34c620e81878bf6eff6519d) 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.bb4
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb6
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_5.10.bb22
3 files changed, 16 insertions, 16 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 3e08b5aec5..1896b2f295 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb
@@ -11,8 +11,8 @@ python () {
11 raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") 11 raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
12} 12}
13 13
14SRCREV_machine ?= "8262073e1b09920fb55a32d698c3a98c3af628eb" 14SRCREV_machine ?= "57f0dabaec5ad65d936350e9b1f69791c8ddf97e"
15SRCREV_meta ?= "bbff9c3b4b30e741730c2ceb2365ab18639c246a" 15SRCREV_meta ?= "fa039db710ceb054f8670e09e7e31142c1566253"
16 16
17SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ 17SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
18 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}" 18 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 92c15e9b5b..a7b93fce7a 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb
@@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native"
15KMETA = "kernel-meta" 15KMETA = "kernel-meta"
16KCONF_BSP_AUDIT_LEVEL = "2" 16KCONF_BSP_AUDIT_LEVEL = "2"
17 17
18SRCREV_machine_qemuarm ?= "2825075bb360f256c3a9dcdf3cf67b34423d657d" 18SRCREV_machine_qemuarm ?= "ae643fde3bb3d99f194ec0b6b9662bdd1d508c2f"
19SRCREV_machine ?= "ca8e7981378c7ab461ae9e2b9b96d702fbb0af2a" 19SRCREV_machine ?= "a60fe3fcf113a00eb3263294f192615da7c2af8c"
20SRCREV_meta ?= "bbff9c3b4b30e741730c2ceb2365ab18639c246a" 20SRCREV_meta ?= "fa039db710ceb054f8670e09e7e31142c1566253"
21 21
22PV = "${LINUX_VERSION}+git${SRCPV}" 22PV = "${LINUX_VERSION}+git${SRCPV}"
23 23
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.10.bb b/meta/recipes-kernel/linux/linux-yocto_5.10.bb
index f89f513878..d480fc27c7 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.10.bb
@@ -13,17 +13,17 @@ KBRANCH_qemux86 ?= "v5.10/standard/base"
13KBRANCH_qemux86-64 ?= "v5.10/standard/base" 13KBRANCH_qemux86-64 ?= "v5.10/standard/base"
14KBRANCH_qemumips64 ?= "v5.10/standard/mti-malta64" 14KBRANCH_qemumips64 ?= "v5.10/standard/mti-malta64"
15 15
16SRCREV_machine_qemuarm ?= "0441d737d347be0b8bcf9bef0b7707d5ba2741a0" 16SRCREV_machine_qemuarm ?= "036f0e96d68be58be2e97ea7cab11f9ca2fb8e1c"
17SRCREV_machine_qemuarm64 ?= "ca8e7981378c7ab461ae9e2b9b96d702fbb0af2a" 17SRCREV_machine_qemuarm64 ?= "a60fe3fcf113a00eb3263294f192615da7c2af8c"
18SRCREV_machine_qemumips ?= "5fbc41f5c569e11bf5e56beea77c432efa69b99e" 18SRCREV_machine_qemumips ?= "46964fe445c229120a9733ed98dcd5ab8454c999"
19SRCREV_machine_qemuppc ?= "ca8e7981378c7ab461ae9e2b9b96d702fbb0af2a" 19SRCREV_machine_qemuppc ?= "a60fe3fcf113a00eb3263294f192615da7c2af8c"
20SRCREV_machine_qemuriscv64 ?= "ca8e7981378c7ab461ae9e2b9b96d702fbb0af2a" 20SRCREV_machine_qemuriscv64 ?= "a60fe3fcf113a00eb3263294f192615da7c2af8c"
21SRCREV_machine_qemuriscv32 ?= "ca8e7981378c7ab461ae9e2b9b96d702fbb0af2a" 21SRCREV_machine_qemuriscv32 ?= "a60fe3fcf113a00eb3263294f192615da7c2af8c"
22SRCREV_machine_qemux86 ?= "ca8e7981378c7ab461ae9e2b9b96d702fbb0af2a" 22SRCREV_machine_qemux86 ?= "a60fe3fcf113a00eb3263294f192615da7c2af8c"
23SRCREV_machine_qemux86-64 ?= "ca8e7981378c7ab461ae9e2b9b96d702fbb0af2a" 23SRCREV_machine_qemux86-64 ?= "a60fe3fcf113a00eb3263294f192615da7c2af8c"
24SRCREV_machine_qemumips64 ?= "a60cf276769d28c6c495dbf2816a50871705d5eb" 24SRCREV_machine_qemumips64 ?= "efe9e0c23330929c92a364d2497b231d1325ef29"
25SRCREV_machine ?= "ca8e7981378c7ab461ae9e2b9b96d702fbb0af2a" 25SRCREV_machine ?= "a60fe3fcf113a00eb3263294f192615da7c2af8c"
26SRCREV_meta ?= "bbff9c3b4b30e741730c2ceb2365ab18639c246a" 26SRCREV_meta ?= "fa039db710ceb054f8670e09e7e31142c1566253"
27 27
28# remap qemuarm to qemuarma15 for the 5.8 kernel 28# remap qemuarm to qemuarma15 for the 5.8 kernel
29# KMACHINE_qemuarm ?= "qemuarma15" 29# KMACHINE_qemuarm ?= "qemuarma15"