summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2017-03-23 11:57:59 -0300
committerOtavio Salvador <otavio@ossystems.com.br>2017-03-27 11:52:56 -0300
commit34002dbb315467e8eb022c61e4cdfd9c7f7819b4 (patch)
tree78318dd950a930bb79b99be0972ba4c7f1dbc800
parent7dc760ad8b3b8d0f8562d60b9a60114f332abbea (diff)
downloadmeta-freescale-34002dbb315467e8eb022c61e4cdfd9c7f7819b4.tar.gz
imx-base.inc: Add 'use-mainline-bsp' override support
The 'use-mainline-bsp' makes use of MAACHINEOVERRIDES_EXTENDER_FILTER_OUT variable and currently filters out the i.MX 6 and i.MX 7 overrides, ensuring we use the pristine support for all metadata. This commit does most changes related to initial mainline support for Etnaviv and Video4Linux VPU support using CODA. Change-Id: Idcb3e4f9c3bc46d4c066dea3c0388f821ab2d3ec Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-rw-r--r--conf/machine/include/imx-base.inc20
1 files changed, 20 insertions, 0 deletions
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 06b81253..6e25c52b 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -60,6 +60,19 @@ MACHINEOVERRIDES_EXTENDER_mx6ul = "imxpxp"
60MACHINEOVERRIDES_EXTENDER_mx6ull = "imxpxp:imxepdc" 60MACHINEOVERRIDES_EXTENDER_mx6ull = "imxpxp:imxepdc"
61MACHINEOVERRIDES_EXTENDER_mx7d = "imxpxp:imxepdc" 61MACHINEOVERRIDES_EXTENDER_mx7d = "imxpxp:imxepdc"
62 62
63MACHINEOVERRIDES_EXTENDER_FILTER_OUT_use-mainline-bsp = " \
64 mx6 \
65 mx6q \
66 mx6dl \
67 mx6sx \
68 mx6sl \
69 mx6ul \
70 mx6ull \
71 \
72 mx7 \
73 mx7d \
74"
75
63# Sub-architecture support 76# Sub-architecture support
64MACHINE_SOCARCH_SUFFIX ?= "" 77MACHINE_SOCARCH_SUFFIX ?= ""
65MACHINE_SOCARCH_SUFFIX_mx6q = "-mx6qdl" 78MACHINE_SOCARCH_SUFFIX_mx6q = "-mx6qdl"
@@ -71,11 +84,16 @@ MACHINE_SOCARCH_SUFFIX_vf60 = "-vf60"
71MACHINE_SOCARCH_SUFFIX_vf50 = "-vf50" 84MACHINE_SOCARCH_SUFFIX_vf50 = "-vf50"
72MACHINE_SOCARCH_SUFFIX_mx6ul = "-mx6ul" 85MACHINE_SOCARCH_SUFFIX_mx6ul = "-mx6ul"
73MACHINE_SOCARCH_SUFFIX_mx6ull = "-mx6ul" 86MACHINE_SOCARCH_SUFFIX_mx6ull = "-mx6ul"
87MACHINE_SOCARCH_SUFFIX_use-mainline-bsp = "-imx"
74 88
75MACHINE_ARCH_FILTER = "virtual/kernel" 89MACHINE_ARCH_FILTER = "virtual/kernel"
76MACHINE_SOCARCH_FILTER_append_imxvpu = " imx-vpu libimxvpuapi imx-codec imx-vpuwrap imx-parser" 90MACHINE_SOCARCH_FILTER_append_imxvpu = " imx-vpu libimxvpuapi imx-codec imx-vpuwrap imx-parser"
77MACHINE_SOCARCH_FILTER_append_imxgpu2d = " virtual/libopenvg virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa virtual/libgl virtual/libg2d cairo pango" 91MACHINE_SOCARCH_FILTER_append_imxgpu2d = " virtual/libopenvg virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa virtual/libgl virtual/libg2d cairo pango"
78MACHINE_SOCARCH_FILTER_append_imxpxp = " imx-codec imx-parser" 92MACHINE_SOCARCH_FILTER_append_imxpxp = " imx-codec imx-parser"
93MACHINE_SOCARCH_FILTER_append_use-mainline-bsp = " \
94 qtbase \
95 virtual/libopenvg virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa virtual/libgl virtual/libg2d cairo pango \
96"
79 97
80INHERIT += "fsl-dynamic-packagearch" 98INHERIT += "fsl-dynamic-packagearch"
81 99
@@ -96,6 +114,7 @@ MACHINE_FIRMWARE_append_mx6sl = " firmware-imx-epdc"
96MACHINE_FIRMWARE_append_mx6ull = " firmware-imx-epdc" 114MACHINE_FIRMWARE_append_mx6ull = " firmware-imx-epdc"
97MACHINE_FIRMWARE_append_mx53 = " firmware-imx-vpu-imx53 firmware-imx-sdma-imx53" 115MACHINE_FIRMWARE_append_mx53 = " firmware-imx-vpu-imx53 firmware-imx-sdma-imx53"
98MACHINE_FIRMWARE_append_mx51 = " firmware-imx-vpu-imx51 firmware-imx-sdma-imx51" 116MACHINE_FIRMWARE_append_mx51 = " firmware-imx-vpu-imx51 firmware-imx-sdma-imx51"
117MACHINE_FIRMWARE_append_use-mainline-bsp = " firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d"
99 118
100# FIXME: Needs addition of firmware-imx of official BSPs 119# FIXME: Needs addition of firmware-imx of official BSPs
101#MACHINE_FIRMWARE_append_mx27 = " firmware-imx-vpu-imx27" 120#MACHINE_FIRMWARE_append_mx27 = " firmware-imx-vpu-imx27"
@@ -179,6 +198,7 @@ IMX_DEFAULT_KERNEL_mx6 = "linux-fslc-imx"
179IMX_DEFAULT_KERNEL_mx7 = "linux-fslc-imx" 198IMX_DEFAULT_KERNEL_mx7 = "linux-fslc-imx"
180IMX_DEFAULT_KERNEL_mx6ul = "linux-fslc-imx" 199IMX_DEFAULT_KERNEL_mx6ul = "linux-fslc-imx"
181IMX_DEFAULT_KERNEL_mx6ull = "linux-fslc-imx" 200IMX_DEFAULT_KERNEL_mx6ull = "linux-fslc-imx"
201IMX_DEFAULT_KERNEL_use-mainline-bsp = "linux-fslc"
182 202
183PREFERRED_PROVIDER_virtual/kernel ??= "${IMX_DEFAULT_KERNEL}" 203PREFERRED_PROVIDER_virtual/kernel ??= "${IMX_DEFAULT_KERNEL}"
184 204