diff options
| author | Mark Hatle <mark.hatle@amd.com> | 2024-05-20 21:12:39 -0600 |
|---|---|---|
| committer | Mark Hatle <mark.hatle@amd.com> | 2024-05-21 07:56:41 -0600 |
| commit | c7a37a7210cac4e489aa5eddf436060e33745f89 (patch) | |
| tree | 90ca3625a4b6fe0a70c99075d5b679cc4bd89fd7 /meta-xilinx-bsp | |
| parent | e85496a095bd39e26c4302bd7982a46e5c052de0 (diff) | |
| parent | c87425ab6115af3eab18ac87669e76e09ad76b06 (diff) | |
| download | meta-xilinx-c7a37a7210cac4e489aa5eddf436060e33745f89.tar.gz | |
Merge remote-tracking branch 'xilinx/master' into master_2024.1
Signed-off-by: Mark Hatle <mark.hatle@amd.com>
Diffstat (limited to 'meta-xilinx-bsp')
| -rw-r--r-- | meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf | 2 | ||||
| -rw-r--r-- | meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf index b4c11f3a..bff853b8 100644 --- a/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf | |||
| @@ -50,7 +50,7 @@ HDF_MACHINE = "zcu104-zynqmp" | |||
| 50 | # KERNEL_DEVICETREE = "xilinx/zynqmp-zcu104-revC.dtb" | 50 | # KERNEL_DEVICETREE = "xilinx/zynqmp-zcu104-revC.dtb" |
| 51 | 51 | ||
| 52 | # Yocto IMAGE_FEATURES Variable | 52 | # Yocto IMAGE_FEATURES Variable |
| 53 | MACHINE_HWCODECS = "libomxil-xlnx" | 53 | MACHINE_HWCODECS = "libvcu-omxil" |
| 54 | IMAGE_FEATURES += "hwcodecs" | 54 | IMAGE_FEATURES += "hwcodecs" |
| 55 | 55 | ||
| 56 | #### No additional settings should be after the Postamble | 56 | #### No additional settings should be after the Postamble |
diff --git a/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf index ff273134..cc2c6083 100644 --- a/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf | |||
| @@ -50,7 +50,7 @@ HDF_MACHINE = "zcu106-zynqmp" | |||
| 50 | # KERNEL_DEVICETREE = "xilinx/zynqmp-zcu106-revA.dtb" | 50 | # KERNEL_DEVICETREE = "xilinx/zynqmp-zcu106-revA.dtb" |
| 51 | 51 | ||
| 52 | # Yocto IMAGE_FEATURES Variable | 52 | # Yocto IMAGE_FEATURES Variable |
| 53 | MACHINE_HWCODECS = "libomxil-xlnx" | 53 | MACHINE_HWCODECS = "libvcu-omxil" |
| 54 | IMAGE_FEATURES += "hwcodecs" | 54 | IMAGE_FEATURES += "hwcodecs" |
| 55 | 55 | ||
| 56 | #### No additional settings should be after the Postamble | 56 | #### No additional settings should be after the Postamble |