diff options
| author | Mark Hatle <mark.hatle@amd.com> | 2022-09-20 14:57:40 -0700 |
|---|---|---|
| committer | Mark Hatle <mark.hatle@amd.com> | 2022-09-20 15:05:38 -0700 |
| commit | 144e1046c104d60a35c2e8d7e99f0c950962249c (patch) | |
| tree | 66278e6a5a5b999a4e88ac188e1fdc5265bafbfd /meta-xilinx-core/recipes-devtools | |
| parent | 9730a28b966f0b347b85c16e22d318794cbe64a1 (diff) | |
| parent | a19613e42c9194ab34c2c9938de62bc94392666e (diff) | |
| download | meta-xilinx-144e1046c104d60a35c2e8d7e99f0c950962249c.tar.gz | |
Merge remote-tracking branch 'origin/rel-v2022.2' into honister
Signed-off-by: Mark Hatle <mark.hatle@amd.com>
Diffstat (limited to 'meta-xilinx-core/recipes-devtools')
| -rw-r--r-- | meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2022.2.bb | 4 | ||||
| -rw-r--r-- | meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx.inc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2022.2.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2022.2.bb index c7719866..6675ba3e 100644 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2022.2.bb +++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2022.2.bb | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | 1 | ||
| 2 | require qemu-devicetrees.inc | 2 | require qemu-devicetrees.inc |
| 3 | 3 | ||
| 4 | BRANCH ?= "master" | 4 | BRANCH ?= "xlnx_rel_v2022.2" |
| 5 | SRCREV ?= "42d0b7e24fbd1adc72fb2d0e70e06ff332278468" | 5 | SRCREV ?= "cf5d357e16c13ac447861f908e83951ffb7b4301" |
| 6 | 6 | ||
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx.inc index a5557959..a656f749 100644 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx.inc +++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx.inc | |||
| @@ -11,8 +11,8 @@ LIC_FILES_CHKSUM = " \ | |||
| 11 | DEPENDS = "glib-2.0 zlib pixman bison-native ninja-native meson-native" | 11 | DEPENDS = "glib-2.0 zlib pixman bison-native ninja-native meson-native" |
| 12 | 12 | ||
| 13 | XILINX_QEMU_VERSION ?= "v6.1.0" | 13 | XILINX_QEMU_VERSION ?= "v6.1.0" |
| 14 | BRANCH ?= "master" | 14 | BRANCH ?= "xlnx_rel_v2022.2" |
| 15 | SRCREV = "fbcb55665e9f5f91110ba2a44f62be9bc72752ee" | 15 | SRCREV = "74d70f8008bfbd1566c2eed3496a077a974de0d0" |
| 16 | 16 | ||
| 17 | FILESEXTRAPATHS:prepend := "${THISDIR}/files:" | 17 | FILESEXTRAPATHS:prepend := "${THISDIR}/files:" |
| 18 | 18 | ||