Merge remote-tracking branch 'origin/scarthgap' into yocto-master

This moves the system to scarthgap.  It is known to NOT work with Styhead and master,

Signed-off-by: Mark Hatle <mark.hatle@amd.com>

1 files changed, 10 insertions, 3 deletions

diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-8.1.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-8.1.inc
index 53ad1145..da62c8b7 100644
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-8.1.inc
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-8.1.inc
@@ -8,8 +8,8 @@ COMPATIBLE_HOST:arm = "null"
 # x86_64 is needed to build nativesdks
 QEMU_TARGETS = "aarch64 arm microblaze microblazeel riscv32 x86_64"
 
-BRANCH = "xlnx_rel_v2024.1"
-SRCREV = "2319c870e754148ec3b9d40be0d3dbee959c3251"
+BRANCH = "xlnx_rel_v2024.2"
+SRCREV = "01482fa113dcbfa785feb7d513df50d15ec4c5df"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
                     file://COPYING.LIB;endline=24;md5=8c5efda6cf1e1b03dcfd0e6c0d271c7f"
@@ -72,7 +72,14 @@ SRC_URI += "\
 # Patch doesn't apply to 8.1.0
 #           file://fixmips.patch 
 
-S = "${UNPACKDIR}/git"
+# Additional patches to match Scarthgap, which requires a slightly newer qmp interface
+SRC_URI += "\
+           file://0001-python-rename-QEMUMonitorProtocol.cmd-to-cmd_raw.patch \
+           file://0002-python-qemu-rename-command-to-cmd.patch \
+           "
+
+
+S = "${WORKDIR}/git"
 
 # Based on qemu settings in poky/meta/conf/distro/include/no-static-libs.inc
 DISABLE_STATIC:pn-qemu-xilinx = ""