Refactor i.MX6 configurations

Change-Id: I6b86b5b6084377bcca4bbc7cd1e01e772683084e
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>

1 files changed, 1 insertions, 16 deletions

diff --git a/conf/distro/include/apalis-imx6.conf b/conf/distro/include/apalis-imx6.conf
index c5d2b3a..fdc211d 100644
--- a/conf/distro/include/apalis-imx6.conf
+++ b/conf/distro/include/apalis-imx6.conf
@@ -29,6 +29,7 @@
 
 include conf/distro/include/toradex.inc
 include conf/distro/include/imx6.inc
+include conf/distro/include/imx6-egl.inc
 
 DEPLOY_CONF_NAME = "Toradex Apalis iMX6"
 
@@ -51,21 +52,5 @@ BOOT_SCRIPTS += " \
     flash_blk-${MACHINE}.img:flash_blk.img \
     "
 
-MACHINE_EXTRA_INSTALL = "\
-        libgal-mx6 \
-        libegl-mx6 \
-        libgles2-mx6 \
-        ${@base_contains("DISTRO_FEATURES", "gstreamer010", "gst-fsl-plugin", "", d)} \
-        ${@base_contains("DISTRO_FEATURES", "gstreamer", "gstreamer1.0-plugins-imx-meta", "", d)} \
-        "
-
-MACHINE_EXTRA_INSTALL_SDK += " \
-        libgal-mx6 \
-        libegl-mx6 \
-        libegl-mx6-dev \
-        libgles2-mx6 \
-        libgles2-mx6-dev \
-        "
-
 SERIAL_CONSOLES = "115200;ttymxc0 \
                    115200;ttymxc1"