From 73b3dc81bdfe8c541f9091c6515fe36e432f2128 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Tue, 24 Jan 2017 10:39:27 -0200 Subject: imx-base.inc: Convert to use i.MX MACHINEOVERRIDES_EXTENDER There were some core BSP variables which were still using SoC family names instead of feature overrides (XSERVER_DRIVER, MACHINE_SOCARCH_FILTER) and those needed to be reworked so other SoC families could be dealt in the generic way (e.g: mx6ul). Signed-off-by: Otavio Salvador --- conf/machine/include/imx-base.inc | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 6e6233d2..30e71be0 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc @@ -28,7 +28,7 @@ UBOOT_ENTRYPOINT_vf = "0x80008000" PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" XSERVER_DRIVER = "xf86-video-fbdev" -XSERVER_DRIVER_mx6 = "xf86-video-imxfb-vivante" +XSERVER_DRIVER_imxgpu2d = "xf86-video-imxfb-vivante" XSERVER_DRIVER_vf = "xf86-video-modesetting" XSERVER = "xserver-xorg \ xf86-input-evdev \ @@ -73,12 +73,9 @@ MACHINE_SOCARCH_SUFFIX_mx6ul = "-mx6ul" MACHINE_SOCARCH_SUFFIX_mx6ull = "-mx6ul" MACHINE_ARCH_FILTER = "virtual/kernel" -MACHINE_SOCARCH_FILTER_append_mx6 = " imx-vpu libimxvpuapi imx-codec imx-vpuwrap imx-parser" -MACHINE_SOCARCH_FILTER_append_mx6 = " virtual/libopenvg virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa virtual/libgl virtual/libg2d" -MACHINE_SOCARCH_FILTER_append_mx6 = " cairo pango" -MACHINE_SOCARCH_FILTER_append_mx6ul = " imx-codec imx-parser" -MACHINE_SOCARCH_FILTER_append_mx6ull = " imx-codec imx-parser" -MACHINE_SOCARCH_FILTER_append_mx7 = " imx-codec imx-parser" +MACHINE_SOCARCH_FILTER_append_imxvpu = " imx-vpu libimxvpuapi imx-codec imx-vpuwrap imx-parser" +MACHINE_SOCARCH_FILTER_append_imxgpu2d = " virtual/libopenvg virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa virtual/libgl virtual/libg2d cairo pango" +MACHINE_SOCARCH_FILTER_append_imxpxp = " imx-codec imx-parser" INHERIT += "fsl-dynamic-packagearch" -- cgit v1.2.3-54-g00ecf