From 34e2652a1ae39dd4ad43b5f931664e74570e9303 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Mon, 24 Jan 2022 14:29:25 -0800 Subject: qemu: Move to latest in-progress development version Move from the initial qemu-xilinx 6.1.0 version to the current development version. Changelog qemu-devicetrees: versal-psm: Add psm err management module versal: Add vitis variant for xcvc2802 versal: Add xcvc2802 & xcve2802 devices versal: memmap: npi: Allow AIE2 NPI range to be overriden versal: Make generic npi default for all boards versal: remote-port: Add a PL to XRAM port versal: lpd: Move the XRAM into a separate memory region zynqmp: Fix DDR aliasing onto qemu_sysmem versal-pmc-sys: Connect efuse-cache to sysmon versal: smmu: Versal has 1 global + 32 context interrupts vpk180: Add new board dts xcvp1802: Add ssit property board-versal-ps-virt: Add include guards xcvp1802-virt: This virt board is for VPK180 emulation versal: Add pmc error management node vitis: versal: Prepare for NPI forwarding versal: remote-port: Allocate device for NPI forwarding versal: memmap: Add the AIE2 adress range versal-ps-iou: Configure the number of interrupts an slots on usb_dwc3 zynqmp-iou: Configure the number of interrupts an slots on usb_dwc3 versal-pmc-sec: Improve the error message board-versal-pmc-virt: Fix DDR size Changelog qemu-xilinx: versal-psm-error-mng: Fix the mask reg updates versal-psm-error-mng: Add PSM error management module versal-pmc-error-mng: Update MASK regs based on EN/DIS versal: puf: Fix puf-id generation versal: xram-slcr: Reflect XRAM power up/down status versal: sysmon: Model secure efuse transfer versal: pmc: efuse-cache: Implement sysmon data-source interface xlnx-efuse: Introduce sysmon data-source interface Signed-off-by: Mark Hatle --- .../qemu/files/0001-Add-enable-disable-udev.patch | 30 -------------------- .../qemu/qemu-devicetrees_2021.2.bb | 4 --- .../qemu/qemu-devicetrees_2022.1.bb | 5 ++++ .../qemu/qemu-xilinx-helper-native_1.0.bb | 32 ++++++++++++++-------- .../qemu/qemu-xilinx-native_2021.2.bb | 7 ----- .../qemu/qemu-xilinx-native_2022.1.bb | 7 +++++ .../qemu/qemu-xilinx-system-native_2021.2.bb | 18 ------------ .../qemu/qemu-xilinx-system-native_2022.1.bb | 18 ++++++++++++ .../recipes-devtools/qemu/qemu-xilinx.inc | 2 +- .../recipes-devtools/qemu/qemu-xilinx_2021.2.bb | 17 ------------ .../recipes-devtools/qemu/qemu-xilinx_2022.1.bb | 17 ++++++++++++ 11 files changed, 69 insertions(+), 88 deletions(-) delete mode 100644 meta-xilinx-core/recipes-devtools/qemu/files/0001-Add-enable-disable-udev.patch delete mode 100644 meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2021.2.bb create mode 100644 meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2022.1.bb delete mode 100644 meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2021.2.bb create mode 100644 meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2022.1.bb delete mode 100644 meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2021.2.bb create mode 100644 meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2022.1.bb delete mode 100644 meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2021.2.bb create mode 100644 meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2022.1.bb diff --git a/meta-xilinx-core/recipes-devtools/qemu/files/0001-Add-enable-disable-udev.patch b/meta-xilinx-core/recipes-devtools/qemu/files/0001-Add-enable-disable-udev.patch deleted file mode 100644 index 32c33385..00000000 --- a/meta-xilinx-core/recipes-devtools/qemu/files/0001-Add-enable-disable-udev.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 4ebe009d505bf10b0d90bad081d3fe5bd1cf7441 Mon Sep 17 00:00:00 2001 -From: Sai Hari Chandana Kalluri -Date: Thu, 6 May 2021 14:33:42 -0700 -Subject: [PATCH] Add enable/disable libudev - -Upstream-Status: Pending -Signed-off-by: Jeremy Puhlman -Signed-off-by: Sai Hari Chandana Kalluri ---- - configure | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/configure b/configure -index c2ef164..612f987 100755 ---- a/configure -+++ b/configure -@@ -1633,6 +1633,10 @@ for opt do - ;; - --gdb=*) gdb_bin="$optarg" - ;; -+ --enable-libudev) libudev="yes" -+ ;; -+ --disable-libudev) libudev="no" -+ ;; - --enable-rng-none) rng_none=yes - ;; - --disable-rng-none) rng_none=no --- -2.7.4 - diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2021.2.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2021.2.bb deleted file mode 100644 index 98785e7e..00000000 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2021.2.bb +++ /dev/null @@ -1,4 +0,0 @@ -require qemu-devicetrees.inc - -BRANCH ?= "xlnx_rel_v2021.2" -SRCREV ?= "0462d4d4866481c19102e05ebefe9f1691ed7ee8" diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2022.1.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2022.1.bb new file mode 100644 index 00000000..54164c56 --- /dev/null +++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2022.1.bb @@ -0,0 +1,5 @@ + +require qemu-devicetrees.inc + +BRANCH ?= "master" +SRCREV ?= "e151ddb709f351e51339d5a45f59203dc3908329" diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-helper-native_1.0.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-helper-native_1.0.bb index efd23d50..eb14c0c1 100644 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-helper-native_1.0.bb +++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-helper-native_1.0.bb @@ -1,18 +1,22 @@ - -python () { - if d.getVar("PREFERRED_PROVIDER_qemu-helper-native") != d.getVar("PN"): - raise bb.parse.SkipRecipe("Set qemu-helper-native provider to use this recipe") -} - -# TODO: improve this, since it is very hacky that this recipe need to build tunctl. -# include the existing qemu-helper-native -require recipes-devtools/qemu/qemu-helper-native_1.0.bb -# get the path to tunctl.c (from oe-core!) FILESEXTRAPATHS:prepend := "${COREBASE}/meta/recipes-devtools/qemu/qemu-helper:" # provide it, to replace the existing -PROVIDES += "qemu-helper-native" +PROVIDES = "qemu-helper-native" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://${WORKDIR}/tunctl.c;endline=4;md5=ff3a09996bc5fff6bc5d4e0b4c28f999" + +SRC_URI = "\ + file://tunctl.c \ + " + +S = "${WORKDIR}" +inherit native + +do_compile() { + ${CC} ${CFLAGS} ${LDFLAGS} -Wall tunctl.c -o tunctl +} # replace qemu with qemu-xilinx DEPENDS:remove = "qemu-system-native" DEPENDS:append = " \ @@ -22,3 +26,9 @@ DEPENDS:append = " \ RDEPENDS:${PN}:remove = "qemu-system-native" RDEPENDS:${PN}:append = " qemu-xilinx-system-native" + +do_install() { + install -d ${STAGING_BINDIR_NATIVE} + install tunctl ${STAGING_BINDIR_NATIVE} + +} diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2021.2.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2021.2.bb deleted file mode 100644 index 5e6c2d28..00000000 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2021.2.bb +++ /dev/null @@ -1,7 +0,0 @@ -require qemu-xilinx-native.inc -BPN = "qemu-xilinx" - -EXTRA_OECONF:append = " --target-list=${@get_qemu_usermode_target_list(d)} --disable-tools --disable-blobs --disable-guest-agent" - -PROVIDES = "qemu-native" -PACKAGECONFIG ??= "pie" diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2022.1.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2022.1.bb new file mode 100644 index 00000000..5e6c2d28 --- /dev/null +++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2022.1.bb @@ -0,0 +1,7 @@ +require qemu-xilinx-native.inc +BPN = "qemu-xilinx" + +EXTRA_OECONF:append = " --target-list=${@get_qemu_usermode_target_list(d)} --disable-tools --disable-blobs --disable-guest-agent" + +PROVIDES = "qemu-native" +PACKAGECONFIG ??= "pie" diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2021.2.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2021.2.bb deleted file mode 100644 index f5b89f05..00000000 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2021.2.bb +++ /dev/null @@ -1,18 +0,0 @@ -require qemu-xilinx-native.inc - -EXTRA_OECONF:append = " --target-list=${@get_qemu_system_target_list(d)}" - -PACKAGECONFIG ??= "fdt alsa kvm pie" - -PACKAGECONFIG:remove = "${@'kvm' if not os.path.exists('/usr/include/linux/kvm.h') else ''}" - -DEPENDS += "pixman-native qemu-xilinx-native bison-native ninja-native meson-native" - -do_install:append() { - # The following is also installed by qemu-native - rm -f ${D}${datadir}/qemu/trace-events-all - rm -rf ${D}${datadir}/qemu/keymaps - rm -rf ${D}${datadir}/icons - rm -rf ${D}${includedir}/qemu-plugin.h -} - diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2022.1.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2022.1.bb new file mode 100644 index 00000000..f5b89f05 --- /dev/null +++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2022.1.bb @@ -0,0 +1,18 @@ +require qemu-xilinx-native.inc + +EXTRA_OECONF:append = " --target-list=${@get_qemu_system_target_list(d)}" + +PACKAGECONFIG ??= "fdt alsa kvm pie" + +PACKAGECONFIG:remove = "${@'kvm' if not os.path.exists('/usr/include/linux/kvm.h') else ''}" + +DEPENDS += "pixman-native qemu-xilinx-native bison-native ninja-native meson-native" + +do_install:append() { + # The following is also installed by qemu-native + rm -f ${D}${datadir}/qemu/trace-events-all + rm -rf ${D}${datadir}/qemu/keymaps + rm -rf ${D}${datadir}/icons + rm -rf ${D}${includedir}/qemu-plugin.h +} + diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx.inc index d268f3e7..9f402a2b 100644 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx.inc +++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx.inc @@ -12,7 +12,7 @@ DEPENDS = "glib-2.0 zlib pixman bison-native ninja-native meson-native" XILINX_QEMU_VERSION ?= "v6.1.0" BRANCH ?= "master" -SRCREV = "8dd1b8cabff3e3e5b965d7a60472278ca4e27ceb" +SRCREV = "58e43069b15879cf8bc926ebae02a21909fb7df8" FILESEXTRAPATHS:prepend := "${THISDIR}/files:" diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2021.2.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2021.2.bb deleted file mode 100644 index 4983b4df..00000000 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2021.2.bb +++ /dev/null @@ -1,17 +0,0 @@ -require recipes-devtools/qemu/qemu.inc -require qemu-xilinx.inc - -BBCLASSEXTEND = "nativesdk" - -RDEPENDS:${PN}:class-target += "bash" - -PROVIDES:class-nativesdk = "nativesdk-qemu" -RPROVIDES:${PN}:class-nativesdk = "nativesdk-qemu" - -EXTRA_OECONF:append:class-target = " --target-list=${@get_qemu_target_list(d)}" -EXTRA_OECONF:append:class-nativesdk = " --target-list=${@get_qemu_target_list(d)}" -EXTRA_OECONF:append:class-target:mipsarcho32 = "${@bb.utils.contains('BBEXTENDCURR', 'multilib', ' --disable-capstone', '', d)}" - -do_install:append:class-nativesdk() { - ${@bb.utils.contains('PACKAGECONFIG', 'gtk+', 'make_qemu_wrapper', '', d)} -} diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2022.1.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2022.1.bb new file mode 100644 index 00000000..4983b4df --- /dev/null +++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2022.1.bb @@ -0,0 +1,17 @@ +require recipes-devtools/qemu/qemu.inc +require qemu-xilinx.inc + +BBCLASSEXTEND = "nativesdk" + +RDEPENDS:${PN}:class-target += "bash" + +PROVIDES:class-nativesdk = "nativesdk-qemu" +RPROVIDES:${PN}:class-nativesdk = "nativesdk-qemu" + +EXTRA_OECONF:append:class-target = " --target-list=${@get_qemu_target_list(d)}" +EXTRA_OECONF:append:class-nativesdk = " --target-list=${@get_qemu_target_list(d)}" +EXTRA_OECONF:append:class-target:mipsarcho32 = "${@bb.utils.contains('BBEXTENDCURR', 'multilib', ' --disable-capstone', '', d)}" + +do_install:append:class-nativesdk() { + ${@bb.utils.contains('PACKAGECONFIG', 'gtk+', 'make_qemu_wrapper', '', d)} +} -- cgit v1.2.3-54-g00ecf