imx-digi-base: sync with meta-imx branch zeus-5.4.70-2.3.0

Update the MACHINE values with the ones in meta-freescale and meta-imx layer.

https://jira.digi.com/browse/DEL-7397

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
This commit is contained in:
Arturo Buzarra 2021-02-01 12:41:19 +01:00
parent 702382c7e4
commit 52db82f2c7
1 changed files with 16 additions and 17 deletions

View File

@ -24,8 +24,8 @@ DEFAULTTUNE_mx8 ?= "aarch64"
INHERIT += "machine-overrides-extender" INHERIT += "machine-overrides-extender"
MACHINEOVERRIDES_EXTENDER_mx6q = "imxfbdev:imxipu:imxvpu:imxvpucnm:imxgpu:imxgpu2d:imxdpublit:imxgpu3d" MACHINEOVERRIDES_EXTENDER_mx6q = "imxfbdev:imxipu:imxvpu:imxgpu:imxgpu2d:imxgpu3d"
MACHINEOVERRIDES_EXTENDER_mx6dl = "imxfbdev:imxipu:imxpxp:imxvpu:imxvpucnm:imxgpu:imxgpu2d:imxdpublit:imxgpu3d:imxepdc" MACHINEOVERRIDES_EXTENDER_mx6dl = "imxfbdev:imxpxp:imxipu:imxvpu:imxgpu:imxgpu2d:imxgpu3d:imxepdc"
MACHINEOVERRIDES_EXTENDER_mx6ul = "imxfbdev:imxpxp" MACHINEOVERRIDES_EXTENDER_mx6ul = "imxfbdev:imxpxp"
MACHINEOVERRIDES_EXTENDER_mx8qxp = "imxdrm:imxdpu:imxgpu:imxgpu2d:imxgpu3d" MACHINEOVERRIDES_EXTENDER_mx8qxp = "imxdrm:imxdpu:imxgpu:imxgpu2d:imxgpu3d"
MACHINEOVERRIDES_EXTENDER_mx8mn = "imxdrm:imxgpu:imxgpu3d" MACHINEOVERRIDES_EXTENDER_mx8mn = "imxdrm:imxgpu:imxgpu3d"
@ -45,21 +45,23 @@ MACHINE_SOCARCH_SUFFIX_mx8mm = "-mx8mm"
MACHINE_ARCH_FILTER = "virtual/kernel" MACHINE_ARCH_FILTER = "virtual/kernel"
MACHINE_SOCARCH_FILTER_append_imxvpu = " \ MACHINE_SOCARCH_FILTER_append_imxvpu = " \
imx-codec \ imx-codec \
imx-vpu \
imx-vpuwrap \ imx-vpuwrap \
libimxvpuapi \ libimxvpuapi \
virtual/imxvpu \
" "
MACHINE_SOCARCH_FILTER_append_imxgpu = " \ MACHINE_SOCARCH_FILTER_append_imxgpu = " \
virtual/egl \ virtual/egl \
virtual/mesa \ virtual/mesa \
virtual/libg2d \
libgal-imx \
virtual/libopenvg \ virtual/libopenvg \
libdrm \
cairo \ cairo \
opencv \ opencv \
libgal-imx \
pango \ pango \
" "
MACHINE_SOCARCH_FILTER_append_imxgpu2d = " \
virtual/libg2d \
"
MACHINE_SOCARCH_FILTER_append_imxgpu3d = " \ MACHINE_SOCARCH_FILTER_append_imxgpu3d = " \
virtual/libgl \ virtual/libgl \
virtual/libgles1 \ virtual/libgles1 \
@ -70,21 +72,20 @@ MACHINE_SOCARCH_FILTER_append_mx6q = " \
opencl-headers \ opencl-headers \
" "
MACHINE_SOCARCH_FILTER_append_mx8 = " \ MACHINE_SOCARCH_FILTER_append_mx8 = " \
virtual/libopenvx \
virtual/opencl-icd \ virtual/opencl-icd \
opencl-headers \ opencl-headers \
" "
MACHINE_SOCARCH_FILTER_append_imxpxp = " \ MACHINE_SOCARCH_FILTER_append_mx8qm = " \
imx-codec \ virtual/libopenvx \
" "
INHERIT += "fsl-dynamic-packagearch" INHERIT += "fsl-dynamic-packagearch"
SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS_append = " \ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS_append = " \
libimxvpuapi->imx-vpu \ libimxvpuapi->virtual/imxvpu \
imx-vpuwrap->imx-vpu \ imx-vpuwrap->virtual/imxvpu \
imx-codec->imx-vpu \ imx-codec->virtual/imxvpu \
imx-test->imx-vpu \ imx-test->virtual/imxvpu \
" "
# Extra udev rules # Extra udev rules
@ -100,9 +101,7 @@ MACHINE_GSTREAMER_1_0_PLUGIN_mx8 ?= "imx-gst1.0-plugin imx-gst1.0-plugin-gplay i
# Determines if the SoC has support for Vivante kernel driver # Determines if the SoC has support for Vivante kernel driver
SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT = "0" SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT = "0"
SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT_mx6q = "1" SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT_imxgpu = "1"
SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT_mx6dl = "1"
SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT_mx8 = "1"
# Handle Vivante kernel driver setting: # Handle Vivante kernel driver setting:
# 0 - machine does not have Vivante GPU driver support # 0 - machine does not have Vivante GPU driver support