Re-add dra7-evm-lcd-lg.dtb as it the screen of the board in CI

[AGL/meta-agl.git] / meta-agl-bsp / conf / include / agl_dra7xx-evm.inc

diff --git a/meta-agl-bsp/conf/include/agl_dra7xx-evm.inc b/meta-agl-bsp/conf/include/agl_dra7xx-evm.inc
index bbb7d95..2161c7d 100644 (file)
--- a/meta-agl-bsp/conf/include/agl_dra7xx-evm.inc
+++ b/meta-agl-bsp/conf/include/agl_dra7xx-evm.inc
@@ -24,13 +24,13 @@ PREFERRED_VERSION_libgbm            = "10.0.0"
 ## Multimedia section ##
 #-------------------------------------------------
 
-GSTREAMER_PLUGINS = " \
-                    "
-# Disable due to broken build in morty
-#     gstreamer1.0-plugins-bad-meta \
-#     gstreamer1.0-plugins-ducati \
-#     gstreamer1.0-plugins-vpe \
-#"
+# FIXME
+GSTREAMER_PLUGINS = ""
+DISABLED_ROCKO_GSTREAMER_PLUGINS = " \
+     gstreamer1.0-plugins-bad-meta \
+     gstreamer1.0-plugins-ducati \
+     gstreamer1.0-plugins-vpe \
+"
 
 PACKAGES_MULTIMEDIA   = " \
     ipumm-fw \
@@ -41,7 +41,7 @@ PACKAGES_MULTIMEDIA   = " \
 PREFERRED_VERSION_ipumm-fw          = "3.00.13.00"
 
 PREFERRED_PROVIDER_virtual/kernel  = "linux-ti-staging"
-PREFERRED_VERSION_virtual/kernel  = "4.4"
+PREFERRED_VERSION_virtual/kernel  = "4.9"
 
 # Distribution-specific runtime components
 IMAGE_INSTALL_append = " \
@@ -50,11 +50,12 @@ IMAGE_INSTALL_append = " \
      cmem \
 "
 
-## ATTENTION, this is needed right now to build meta-ti with AGL: ##
-## due to meta-ti being based on YP 1.8 instead of YP 2.0
-BBMASK  = "meta-ti/.*eudev"
-
+# Include WIC support based on beaglebone
+do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"
+WKS_FILE = "sdimage-bootpart-uuid.wks"
+IMAGE_BOOT_FILES = "MLO u-boot.img uEnv.txt"
 
+AGL_EXTRA_IMAGE_FSTYPES = "wic.xz wic.bmap wic.xz.sha256sum"
 
-IMAGE_CLASSES_append_sota = " image_types_uboot sdcard_image-dra7xx-evm-ota"
-IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'agl-ota', 'dra7xx-evm-sdimg-ota  ', '', d)}"
+# re-add LG touchscreen
+KERNEL_DEVICETREE += "dra7-evm-lcd-lg.dtb"