diff options
author | Mark Hatle <mark.hatle@amd.com> | 2022-12-09 13:25:42 -0800 |
---|---|---|
committer | Mark Hatle <mark.hatle@amd.com> | 2022-12-16 10:18:32 -0800 |
commit | f9154e30c19c0a598b09100ff07ac74ba0888856 (patch) | |
tree | ec22ef090bce7b189f995d306467723bdd7a05c8 | |
parent | 2dccf9c8a88c21e404d2b3eb4438e1489b0bdd3d (diff) | |
download | meta-xilinx-f9154e30c19c0a598b09100ff07ac74ba0888856.tar.gz |
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 <mark.hatle@amd.com>
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 = " \ | |||
21 | file://99-vcu-enc-dec.rules \ | 21 | file://99-vcu-enc-dec.rules \ |
22 | " | 22 | " |
23 | 23 | ||
24 | inherit module | 24 | inherit module features_check |
25 | |||
26 | REQUIRED_MACHINE_FEATURES = "vcu" | ||
25 | 27 | ||
26 | EXTRA_OEMAKE += "O=${STAGING_KERNEL_BUILDDIR}" | 28 | EXTRA_OEMAKE += "O=${STAGING_KERNEL_BUILDDIR}" |
27 | 29 | ||
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}" | |||
15 | 15 | ||
16 | S = "${WORKDIR}/git" | 16 | S = "${WORKDIR}/git" |
17 | 17 | ||
18 | COMPATIBLE_MACHINE = "^$" | 18 | inherit features_check |
19 | COMPATIBLE_MACHINE:zynqmp = "zynqmp" | ||
20 | 19 | ||
21 | PACKAGE_ARCH = "${SOC_FAMILY_ARCH}" | 20 | REQUIRED_MACHINE_FEATURES = "vcu" |
21 | |||
22 | PACKAGE_ARCH = "${MACHINE_ARCH}" | ||
22 | 23 | ||
23 | DEPENDS = "libvcu-xlnx" | 24 | DEPENDS = "libvcu-xlnx" |
24 | RDEPENDS:${PN} = "libvcu-xlnx" | 25 | 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}" | |||
15 | 15 | ||
16 | S = "${WORKDIR}/git" | 16 | S = "${WORKDIR}/git" |
17 | 17 | ||
18 | COMPATIBLE_MACHINE = "^$" | 18 | inherit features_check |
19 | COMPATIBLE_MACHINE:zynqmp = "zynqmp" | ||
20 | 19 | ||
21 | PACKAGE_ARCH = "${SOC_FAMILY_ARCH}" | 20 | REQUIRED_MACHINE_FEATURES = "vcu" |
21 | |||
22 | PACKAGE_ARCH = "${MACHINE_ARCH}" | ||
22 | 23 | ||
23 | #RDEPENDS:${PN} = "kernel-module-vcu" | 24 | #RDEPENDS:${PN} = "kernel-module-vcu" |
24 | 25 | ||
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" | |||
15 | BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" | 15 | BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" |
16 | SRC_URI = "${REPO};${BRANCHARG}" | 16 | SRC_URI = "${REPO};${BRANCHARG}" |
17 | 17 | ||
18 | COMPATIBLE_MACHINE = "^$" | 18 | inherit features_check |
19 | COMPATIBLE_MACHINE:zynqmp = "zynqmp" | ||
20 | 19 | ||
21 | PACKAGE_ARCH = "${SOC_FAMILY_ARCH}" | 20 | REQUIRED_MACHINE_FEATURES = "vcu" |
21 | |||
22 | PACKAGE_ARCH = "${MACHINE_ARCH}" | ||
22 | 23 | ||
23 | do_install() { | 24 | do_install() { |
24 | install -Dm 0644 ${S}/${XILINX_VCU_VERSION}/lib/firmware/al5d_b.fw ${D}/lib/firmware/al5d_b.fw | 25 | install -Dm 0644 ${S}/${XILINX_VCU_VERSION}/lib/firmware/al5d_b.fw ${D}/lib/firmware/al5d_b.fw |