diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2019-01-21 12:26:52 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-01-21 23:44:23 +0000 |
commit | 1873c9605dcfb0af6eb57936c8adf3a9e23dcfb0 (patch) | |
tree | 3eda1416e93624b81d6537dac2ae01a9ed5f83fb | |
parent | 406f6addb407a051c1a570bc9bfc89a6fdac5898 (diff) | |
download | poky-1873c9605dcfb0af6eb57936c8adf3a9e23dcfb0.tar.gz |
linux-yocto/4.19: integrate qemuarm refresh changes
Integrating the following two commits that prepare for an update of
'qemuarm' to an a15 based emulation.
[
Author: Jon Mason <jdmason@kudzu.us>
Date: Fri Jan 18 16:45:28 2019 -0500
qemuarma15: Add Real-Time and Tiny configs
Add tiny and Real-Time configs. Also, add kmachine name to standard
config to allow for BSP renaming.
Signed-off-by: Jon Mason <jdmason@kudzu.us>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Author: Jon Mason <jdmason@kudzu.us>
Date: Fri Jan 18 16:45:27 2019 -0500
qemuarm: Add qemuarmv5 kmachine name
Add alternative kmachine name to allow for the configs to be used by
soon-to-be-renamed BSPs.
Signed-off-by: Jon Mason <jdmason@kudzu.us>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
]
(From OE-Core rev: 10aae50df0febb83fe1570405ac2b8b265365052)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_4.19.bb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb index 4a987d52c0..cb0283d49f 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb | |||
@@ -12,7 +12,7 @@ python () { | |||
12 | } | 12 | } |
13 | 13 | ||
14 | SRCREV_machine ?= "7a0b04e5a8d036cd9dcc6ee64a838e8d8d5cdd56" | 14 | SRCREV_machine ?= "7a0b04e5a8d036cd9dcc6ee64a838e8d8d5cdd56" |
15 | SRCREV_meta ?= "d9a3d567a7b5617f757d132090ca1646e139301f" | 15 | SRCREV_meta ?= "0b9ea5596fd88277a4ecca1a8b8a1aca06a1ae37" |
16 | 16 | ||
17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ | 17 | SRC_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-4.19;destsuffix=${KMETA}" | 18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.19;destsuffix=${KMETA}" |
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb index d3c6f12352..4e13bf125e 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb | |||
@@ -17,7 +17,7 @@ KCONF_BSP_AUDIT_LEVEL = "2" | |||
17 | 17 | ||
18 | SRCREV_machine_qemuarm ?= "d11db6c6617f689e6b9e2afaa3d3b2036c6d3d30" | 18 | SRCREV_machine_qemuarm ?= "d11db6c6617f689e6b9e2afaa3d3b2036c6d3d30" |
19 | SRCREV_machine ?= "eebb51300a07804a020ec468b5f8c5bf720198d9" | 19 | SRCREV_machine ?= "eebb51300a07804a020ec468b5f8c5bf720198d9" |
20 | SRCREV_meta ?= "d9a3d567a7b5617f757d132090ca1646e139301f" | 20 | SRCREV_meta ?= "0b9ea5596fd88277a4ecca1a8b8a1aca06a1ae37" |
21 | 21 | ||
22 | PV = "${LINUX_VERSION}+git${SRCPV}" | 22 | PV = "${LINUX_VERSION}+git${SRCPV}" |
23 | 23 | ||
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.19.bb b/meta/recipes-kernel/linux/linux-yocto_4.19.bb index bd9b6a3543..599418d9cb 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.19.bb | |||
@@ -19,7 +19,7 @@ SRCREV_machine_qemux86 ?= "eebb51300a07804a020ec468b5f8c5bf720198d9" | |||
19 | SRCREV_machine_qemux86-64 ?= "eebb51300a07804a020ec468b5f8c5bf720198d9" | 19 | SRCREV_machine_qemux86-64 ?= "eebb51300a07804a020ec468b5f8c5bf720198d9" |
20 | SRCREV_machine_qemumips64 ?= "dff23f01307cbab688d9677ecd4b5f350ec435d9" | 20 | SRCREV_machine_qemumips64 ?= "dff23f01307cbab688d9677ecd4b5f350ec435d9" |
21 | SRCREV_machine ?= "eebb51300a07804a020ec468b5f8c5bf720198d9" | 21 | SRCREV_machine ?= "eebb51300a07804a020ec468b5f8c5bf720198d9" |
22 | SRCREV_meta ?= "d9a3d567a7b5617f757d132090ca1646e139301f" | 22 | SRCREV_meta ?= "0b9ea5596fd88277a4ecca1a8b8a1aca06a1ae37" |
23 | 23 | ||
24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ | 24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ |
25 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.19;destsuffix=${KMETA}" | 25 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.19;destsuffix=${KMETA}" |