1 files changed, 3 insertions, 18 deletions

diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf
index bfe29bf..a8db798 100644
--- a/conf/distro/include/nitrogen6x.conf
+++ b/conf/distro/include/nitrogen6x.conf
@@ -27,24 +27,11 @@
 ##
 ############################################################################
 
-include conf/distro/include/imx6.inc
-include conf/distro/include/imx6-egl.inc
-include conf/distro/include/imx6-opencv.inc
+include conf/distro/include/fsl.inc
+include conf/distro/include/opencv.inc
 
 DEPLOY_CONF_NAME = "Boundary Devices i.MX6"
 
-BOOTFS_CONTENT = "\
-    ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \
-    ${KERNEL_IMAGETYPE}-imx6q-${MACHINE}.dtb:imx6q-${MACHINE}.dtb \
-    ${KERNEL_IMAGETYPE}-imx6dl-${MACHINE}.dtb:imx6dl-${MACHINE}.dtb \
-    ${KERNEL_IMAGETYPE}-imx6q-sabrelite.dtb:imx6q-sabrelite.dtb \
-    ${KERNEL_IMAGETYPE}-imx6dl-nit6xlite.dtb:imx6dl-nit6xlite.dtb \
-    ${KERNEL_IMAGETYPE}-imx6q-nitrogen6_max.dtb:imx6q-nitrogen6_max.dtb \
-    6x_bootscript-${MACHINE}:6x_bootscript \
-    6x_upgrade-${MACHINE}:6x_upgrade \
-    u-boot-${MACHINE}.imx:u-boot.imx \
-    "
-BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy u-boot-script-boundary:do_deploy"
 BOOT_SPACE = "16384"
 BOOT_SCRIPTS += "6x_upgrade-${MACHINE}:6x_upgrade \
                  u-boot-nit6xlite-*.imx:u-boot.nit6xlite \
@@ -89,12 +76,10 @@ UBOOT_CONFIG[nitrogen6_max] = "nitrogen6_max_config"
 UBOOT_CONFIG[nitrogen6_vm1g] = "nitrogen6_vm1g_config"
 UBOOT_CONFIG[nitrogen6_vm] = "nitrogen6_vm_config"
 
-EXTRA_IMAGEDEPENDS += "u-boot-script-boundary"
+EXTRA_IMAGEDEPENDS += "u-boot u-boot-script-boundary"
 
 KERNEL_DEVICETREE += "\
     imx6dl-nit6xlite.dtb \
-    imx6qp-nitrogen6_max.dtb \
-    imx6q-nitrogen6_som2.dtb \
     "
 
 DISTRO_FEATURES_DEFAULT += "wayland"