summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2022-01-14 13:23:35 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-01-15 16:23:24 +0000
commit044d0d44922c477db2c0443c1b12f52a71f20451 (patch)
tree1fcfc9a58a12c54a5cc79efb983dcfb350f1175f /meta
parentaf01b73f3cad4c43ab2a37965ef0fd8cde6c3aed (diff)
downloadpoky-044d0d44922c477db2c0443c1b12f52a71f20451.tar.gz
linux-yocto/5.15: fix arm defconfig warnings
Integrating the following commit(s) to linux-yocto/5.15: 02bf23d26bc4 arm64: defconfig: cleanup config options 05914e2c87e5 arm: defconfig: drop unused POWER_AVS option (From OE-Core rev: 40e680de829cf0d394f0c10bb7363604b18a489b) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb4
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_5.15.bb20
3 files changed, 13 insertions, 13 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb
index f114e0ad4e..0a905d0bff 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb
@@ -11,7 +11,7 @@ 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 ?= "4cf3777087098d1900d7b10f9fa902374e147243" 14SRCREV_machine ?= "04a95b0307715d513560636c2bef4238dde56c86"
15SRCREV_meta ?= "9855687d0262b744ef201fc6e019c659033b83b2" 15SRCREV_meta ?= "9855687d0262b744ef201fc6e019c659033b83b2"
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 \
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb
index 1c41406f52..bee98d87cf 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb
@@ -15,8 +15,8 @@ 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 ?= "d6eeaf39f3beb483733ff2970c901a94093d0b7d" 18SRCREV_machine:qemuarm ?= "149aa4e4f2f3c704e11fd379be32746ab2d3433f"
19SRCREV_machine ?= "b5879e67153e83a5884bbfa32346dc33d96921e7" 19SRCREV_machine ?= "02bf23d26bc4c2e6859aa3810df8d6b955488a06"
20SRCREV_meta ?= "9855687d0262b744ef201fc6e019c659033b83b2" 20SRCREV_meta ?= "9855687d0262b744ef201fc6e019c659033b83b2"
21 21
22PV = "${LINUX_VERSION}+git${SRCPV}" 22PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.15.bb b/meta/recipes-kernel/linux/linux-yocto_5.15.bb
index b6f2fc3b4f..2e093357cb 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.15.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.15.bb
@@ -13,16 +13,16 @@ KBRANCH:qemux86 ?= "v5.15/standard/base"
13KBRANCH:qemux86-64 ?= "v5.15/standard/base" 13KBRANCH:qemux86-64 ?= "v5.15/standard/base"
14KBRANCH:qemumips64 ?= "v5.15/standard/mti-malta64" 14KBRANCH:qemumips64 ?= "v5.15/standard/mti-malta64"
15 15
16SRCREV_machine:qemuarm ?= "aa48e73490dacca52a99928456050476765b56a7" 16SRCREV_machine:qemuarm ?= "49cda4a3872929491dbcc3793afbd01709555315"
17SRCREV_machine:qemuarm64 ?= "b5879e67153e83a5884bbfa32346dc33d96921e7" 17SRCREV_machine:qemuarm64 ?= "02bf23d26bc4c2e6859aa3810df8d6b955488a06"
18SRCREV_machine:qemumips ?= "b15f476dfd5edc44300279429b7de25ec899c2a6" 18SRCREV_machine:qemumips ?= "049f989b96848df48c445c2b83c634cc5d692032"
19SRCREV_machine:qemuppc ?= "b5879e67153e83a5884bbfa32346dc33d96921e7" 19SRCREV_machine:qemuppc ?= "02bf23d26bc4c2e6859aa3810df8d6b955488a06"
20SRCREV_machine:qemuriscv64 ?= "b5879e67153e83a5884bbfa32346dc33d96921e7" 20SRCREV_machine:qemuriscv64 ?= "02bf23d26bc4c2e6859aa3810df8d6b955488a06"
21SRCREV_machine:qemuriscv32 ?= "b5879e67153e83a5884bbfa32346dc33d96921e7" 21SRCREV_machine:qemuriscv32 ?= "02bf23d26bc4c2e6859aa3810df8d6b955488a06"
22SRCREV_machine:qemux86 ?= "b5879e67153e83a5884bbfa32346dc33d96921e7" 22SRCREV_machine:qemux86 ?= "02bf23d26bc4c2e6859aa3810df8d6b955488a06"
23SRCREV_machine:qemux86-64 ?= "b5879e67153e83a5884bbfa32346dc33d96921e7" 23SRCREV_machine:qemux86-64 ?= "02bf23d26bc4c2e6859aa3810df8d6b955488a06"
24SRCREV_machine:qemumips64 ?= "e146f932b0ae0c3f764745df1c80aafa0136f276" 24SRCREV_machine:qemumips64 ?= "27a47d7d5d6e7bbe8267f32f8089e395e0eaa863"
25SRCREV_machine ?= "b5879e67153e83a5884bbfa32346dc33d96921e7" 25SRCREV_machine ?= "02bf23d26bc4c2e6859aa3810df8d6b955488a06"
26SRCREV_meta ?= "9855687d0262b744ef201fc6e019c659033b83b2" 26SRCREV_meta ?= "9855687d0262b744ef201fc6e019c659033b83b2"
27 27
28# set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll 28# set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll