diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2019-10-28 20:16:02 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2019-10-28 20:16:02 +0300 |
commit | da710c8bb0dea17982efc20ab4ee226a86992e6f (patch) | |
tree | 06c83c9e85c881f40532972aaa1453298236e029 /poky/meta/recipes-kernel | |
parent | 6656af78e6c7b48a1252459a61b3b72dce77ab44 (diff) | |
parent | 2795589128d1f7509ac0ab9eba940d868413ac7d (diff) | |
download | openbmc-da710c8bb0dea17982efc20ab4ee226a86992e6f.tar.xz |
Merge branch 'master' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'poky/meta/recipes-kernel')
-rw-r--r-- | poky/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb | 4 | ||||
-rw-r--r-- | poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb | 6 | ||||
-rw-r--r-- | poky/meta/recipes-kernel/linux/linux-yocto_5.2.bb | 20 |
3 files changed, 15 insertions, 15 deletions
diff --git a/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb b/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb index 6ab1f8d3e..e3fe54441 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb @@ -11,8 +11,8 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "04d5cfbbd09ba202134f97f8818372c7c9c81fe7" -SRCREV_meta ?= "56f5bc749e5a8e40b55a3819288ac277813ec5ef" +SRCREV_machine ?= "0a9f6ee2443b54c614107728ca76485916010023" +SRCREV_meta ?= "b867b78b5019ae455af97dec7794cff7527d7624" 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.2;destsuffix=${KMETA}" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb b/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb index e6eb78198..f3f546866 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb @@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "e31887832108a1dfac19601459a84a2fa38207f7" -SRCREV_machine ?= "25b14cdf9659c68ab32d66616dfdbbe2ece3fd94" -SRCREV_meta ?= "56f5bc749e5a8e40b55a3819288ac277813ec5ef" +SRCREV_machine_qemuarm ?= "aaa66d462ec17345dadd69b1ec0f3fcc83e82536" +SRCREV_machine ?= "255a750d28cd45df8923c3aba1e82c322757a50d" +SRCREV_meta ?= "b867b78b5019ae455af97dec7794cff7527d7624" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto_5.2.bb b/poky/meta/recipes-kernel/linux/linux-yocto_5.2.bb index 49b14b618..1a2c3ffcd 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto_5.2.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto_5.2.bb @@ -12,16 +12,16 @@ KBRANCH_qemux86 ?= "v5.2/standard/base" KBRANCH_qemux86-64 ?= "v5.2/standard/base" KBRANCH_qemumips64 ?= "v5.2/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "d956bb318771761069228fc70fea722ceabecb75" -SRCREV_machine_qemuarm64 ?= "25b14cdf9659c68ab32d66616dfdbbe2ece3fd94" -SRCREV_machine_qemumips ?= "9e95334637a4a85b19bea120f9027ff0028d7069" -SRCREV_machine_qemuppc ?= "25b14cdf9659c68ab32d66616dfdbbe2ece3fd94" -SRCREV_machine_qemuriscv64 ?= "25b14cdf9659c68ab32d66616dfdbbe2ece3fd94" -SRCREV_machine_qemux86 ?= "25b14cdf9659c68ab32d66616dfdbbe2ece3fd94" -SRCREV_machine_qemux86-64 ?= "25b14cdf9659c68ab32d66616dfdbbe2ece3fd94" -SRCREV_machine_qemumips64 ?= "29a8d126f60d1b9e9cf0985b38da2033ebde25db" -SRCREV_machine ?= "25b14cdf9659c68ab32d66616dfdbbe2ece3fd94" -SRCREV_meta ?= "56f5bc749e5a8e40b55a3819288ac277813ec5ef" +SRCREV_machine_qemuarm ?= "47b80ef7bd932830f299ed76e2302df631ae4fbe" +SRCREV_machine_qemuarm64 ?= "255a750d28cd45df8923c3aba1e82c322757a50d" +SRCREV_machine_qemumips ?= "45ff64cb3f87c38db6f46353ea93005d049b0cf6" +SRCREV_machine_qemuppc ?= "255a750d28cd45df8923c3aba1e82c322757a50d" +SRCREV_machine_qemuriscv64 ?= "255a750d28cd45df8923c3aba1e82c322757a50d" +SRCREV_machine_qemux86 ?= "255a750d28cd45df8923c3aba1e82c322757a50d" +SRCREV_machine_qemux86-64 ?= "255a750d28cd45df8923c3aba1e82c322757a50d" +SRCREV_machine_qemumips64 ?= "ea0fd387a459803ac60e9b8a1729f2fc7d3215f1" +SRCREV_machine ?= "255a750d28cd45df8923c3aba1e82c322757a50d" +SRCREV_meta ?= "b867b78b5019ae455af97dec7794cff7527d7624" # remap qemuarm to qemuarma15 for the 5.2 kernel # KMACHINE_qemuarm ?= "qemuarma15" |