1 files changed, 7 insertions, 12 deletions

diff --git a/conf/distro/include/tegra-t18x.conf b/conf/distro/include/tegra-t18x.conf
index a1fad00..349488b 100644
--- a/conf/distro/include/tegra-t18x.conf
+++ b/conf/distro/include/tegra-t18x.conf
@@ -20,15 +20,14 @@
 ##
 #############################################################################
 
-include conf/distro/include/tegra.inc
-
 OLDEST_KERNEL_aarch64 = "3.18"
 
 TARGET_CFLAGS += " -DWIN_INTERFACE_CUSTOM"
 DISTRO_FEATURES_DEFAULT += "wayland"
+IMAGE_FSTYPES += "tar.gz"
 
 KERN_DIR ?= '${@os.path.normpath("${TOPDIR}/../sources/vibrante-t186/kernel")}'
-PLATFORM_TOPDIR ?= '${@os.path.normpath("${TOPDIR}/../sources/vibrante-t186/vibrante-t186ref-linux")}'
+PLATFORM_TOPDIR ?= '${@os.path.normpath("${TOPDIR}/../sources/vibrante-t186")}'
 NVLAYER_DIR ?= "${TOPDIR}/../sources/nvidia-layer"
 
 MACHINE_EXTRA_INSTALL += "\
@@ -48,7 +47,6 @@ MACHINE_EXTRA_INSTALL += "\
     virtual/libegl \
     virtual/libgles2 \
     libdrm-nv \
-    asound-conf \
     "
 
 PREFERRED_PROVIDER_virtual/libgles2 ?= "tegra-drivers"
@@ -60,21 +58,18 @@ PREFERRED_PROVIDER_virtual/libgl ?= "tegra-drivers"
 PREFERRED_PROVIDER_virtual/libgles1 ?= "tegra-drivers"
 PREFERRED_PROVIDER_virtual/mesa ?= "tegra-drivers"
 
-PREFERRED_PROVIDER_wayland ?= "wayland-nv"
-PREFERRED_PROVIDER_wayland-native ?= "wayland-nv"
-PREFERRED_PROVIDER_nativesdk-wayland ?= "wayland-nv"
-
 BBMASK += "\
     meta-vib4/recipes-connectivity/connman \
-    meta-vib4/recipes-core/busybox \
+    meta-vib4/recipes-core/toybox \
     meta-vib4/recipes-core/images \
-    meta-vib4/recipes-core/meta \
     meta-vib4/recipes-core/packagegroups \
-    meta-vib4/recipes-core/systemd/systemd \
-    meta-vib4/recipes-devtools \
     meta-vib4/recipes-extended \
     meta-vib4/recipes-multimedia/audiomanager \
     meta-vib4/recipes-core/glibc \
     meta-vib4/recipes-support/lvm2 \
     meta-vib4/recipes-kernel/linux-libc-headers \
+    meta-vib4/recipes-devtools/binutils \
+    meta-vib4/recipes-yocto-ivi/packagegroups \
+    meta-vib4/recipes-graphics/wayland/wayland-ivi-extension_%.bbappend \
+    meta-vib4/recipes-graphics/wayland/libinput_%.bbappend \
     "