From 1ecd3328b6f87b832f59970bf99a7760bbcc6731 Mon Sep 17 00:00:00 2001 From: Rohit Visavalia Date: Mon, 9 Jan 2023 03:25:01 -0800 Subject: Revert "vcu: Move vcu recipes to trigger off MACHINE_FEATURES vcu" This reverts commit f9154e30c19c0a598b09100ff07ac74ba0888856. 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, 10 insertions(+), 15 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 c9469974..a78d0642 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,9 +21,7 @@ SRC_URI = " \ file://99-vcu-enc-dec.rules \ " -inherit module features_check - -REQUIRED_MACHINE_FEATURES = "vcu" +inherit module 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 944b8c23..2166a6aa 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,11 +15,10 @@ SRC_URI = "${REPO};${BRANCHARG}" S = "${WORKDIR}/git" -inherit features_check +COMPATIBLE_MACHINE = "^$" +COMPATIBLE_MACHINE:zynqmp = "zynqmp" -REQUIRED_MACHINE_FEATURES = "vcu" - -PACKAGE_ARCH = "${MACHINE_ARCH}" +PACKAGE_ARCH = "${SOC_FAMILY_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 6c58c8a8..e69077e8 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,11 +15,10 @@ SRC_URI = "${REPO};${BRANCHARG}" S = "${WORKDIR}/git" -inherit features_check +COMPATIBLE_MACHINE = "^$" +COMPATIBLE_MACHINE:zynqmp = "zynqmp" -REQUIRED_MACHINE_FEATURES = "vcu" - -PACKAGE_ARCH = "${MACHINE_ARCH}" +PACKAGE_ARCH = "${SOC_FAMILY_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 1c76291f..4d058162 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,11 +15,10 @@ SRCREV = "d59b5f22ea9b6eac7b402c1381b8e49702837064" BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" SRC_URI = "${REPO};${BRANCHARG}" -inherit features_check +COMPATIBLE_MACHINE = "^$" +COMPATIBLE_MACHINE:zynqmp = "zynqmp" -REQUIRED_MACHINE_FEATURES = "vcu" - -PACKAGE_ARCH = "${MACHINE_ARCH}" +PACKAGE_ARCH = "${SOC_FAMILY_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