From f9154e30c19c0a598b09100ff07ac74ba0888856 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Fri, 9 Dec 2022 13:25:42 -0800 Subject: vcu: Move vcu recipes to trigger off MACHINE_FEATURES vcu Side effect of this change, all vcu recipes are now package arch of machine. Signed-off-by: Mark Hatle --- .../recipes-multimedia/vcu/kernel-module-vcu_2023.1.bb | 4 +++- meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx_2023.1.bb | 7 ++++--- meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2023.1.bb | 7 ++++--- meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_2023.1.bb | 7 ++++--- 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2023.1.bb b/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2023.1.bb index a78d0642..c9469974 100644 --- a/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2023.1.bb +++ b/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2023.1.bb @@ -21,7 +21,9 @@ SRC_URI = " \ file://99-vcu-enc-dec.rules \ " -inherit module +inherit module features_check + +REQUIRED_MACHINE_FEATURES = "vcu" EXTRA_OEMAKE += "O=${STAGING_KERNEL_BUILDDIR}" diff --git a/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx_2023.1.bb b/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx_2023.1.bb index 2166a6aa..944b8c23 100644 --- a/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx_2023.1.bb +++ b/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx_2023.1.bb @@ -15,10 +15,11 @@ SRC_URI = "${REPO};${BRANCHARG}" S = "${WORKDIR}/git" -COMPATIBLE_MACHINE = "^$" -COMPATIBLE_MACHINE:zynqmp = "zynqmp" +inherit features_check -PACKAGE_ARCH = "${SOC_FAMILY_ARCH}" +REQUIRED_MACHINE_FEATURES = "vcu" + +PACKAGE_ARCH = "${MACHINE_ARCH}" DEPENDS = "libvcu-xlnx" RDEPENDS:${PN} = "libvcu-xlnx" diff --git a/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2023.1.bb b/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2023.1.bb index e69077e8..6c58c8a8 100644 --- a/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2023.1.bb +++ b/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2023.1.bb @@ -15,10 +15,11 @@ SRC_URI = "${REPO};${BRANCHARG}" S = "${WORKDIR}/git" -COMPATIBLE_MACHINE = "^$" -COMPATIBLE_MACHINE:zynqmp = "zynqmp" +inherit features_check -PACKAGE_ARCH = "${SOC_FAMILY_ARCH}" +REQUIRED_MACHINE_FEATURES = "vcu" + +PACKAGE_ARCH = "${MACHINE_ARCH}" #RDEPENDS:${PN} = "kernel-module-vcu" diff --git a/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_2023.1.bb b/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_2023.1.bb index 4d058162..1c76291f 100644 --- a/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_2023.1.bb +++ b/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_2023.1.bb @@ -15,10 +15,11 @@ SRCREV = "d59b5f22ea9b6eac7b402c1381b8e49702837064" BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" SRC_URI = "${REPO};${BRANCHARG}" -COMPATIBLE_MACHINE = "^$" -COMPATIBLE_MACHINE:zynqmp = "zynqmp" +inherit features_check -PACKAGE_ARCH = "${SOC_FAMILY_ARCH}" +REQUIRED_MACHINE_FEATURES = "vcu" + +PACKAGE_ARCH = "${MACHINE_ARCH}" do_install() { install -Dm 0644 ${S}/${XILINX_VCU_VERSION}/lib/firmware/al5d_b.fw ${D}/lib/firmware/al5d_b.fw -- cgit v1.2.3-54-g00ecf