1 files changed, 10 insertions, 8 deletions

diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh
index fbe8672..3045e3c 100755
--- a/scripts/setup-environment.sh
+++ b/scripts/setup-environment.sh
@@ -56,10 +56,16 @@ BUILDDIRECTORY=${BUILDDIRECTORY:-build-${MACHINE}}
 
 if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then
   case ${MACHINE} in
+    apalis-imx8|imx8qmlpddr4arm2)
+      LAYERSCONF="bblayers.conf.fsl-imx8.sample"
+    ;;
     apalis-imx6|colibri-imx6|colibri-vf|colibri-imx7)
       LAYERSCONF="bblayers.conf.toradex.sample"
     ;;
-    imx6qsabresd|imx6dlsabresd|nitrogen6x|imx7dsabresd|imx7s-warp)
+    nitrogen6x|nitrogen7)
+      LAYERSCONF="bblayers.conf.boundary.sample"
+    ;;
+    imx6qsabresd|imx6dlsabresd|imx7dsabresd|imx7s-warp)
       LAYERSCONF="bblayers.conf.fsl.sample"
     ;;
     smarc-samx6i)
@@ -83,7 +89,7 @@ if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then
     emulator)
       LAYERSCONF="bblayers.conf.emulator.sample"
     ;;
-    jetson-tx1|jetson-tk1)
+    jetson-tx1|jetson-tx2|jetson-tk1)
       LAYERSCONF="bblayers.conf.jetson.sample"
     ;;
     *)
@@ -93,18 +99,14 @@ if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then
   esac
 
   mkdir -p ${PWD}/${BUILDDIRECTORY}/conf
-  cp ${PWD}/sources/meta-boot2qt/conf/${LAYERSCONF} ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf
-
-  if [ ! -d ${PWD}/sources/meta-qt5 ]; then
-    sed -i -e '/meta-qt5/d' ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf
-  fi
+  cp ${PWD}/sources/meta-boot2qt/meta-boot2qt-distro/conf/${LAYERSCONF} ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf
 
   if [ ! -d ${PWD}/sources/meta-boot2qt/.git ]; then
     QT_SDK_PATH=$(readlink -f ${PWD}/sources/meta-boot2qt/../../../../)
   fi
 fi
 
-export TEMPLATECONF="${PWD}/sources/meta-boot2qt/conf"
+export TEMPLATECONF="${PWD}/sources/meta-boot2qt/meta-boot2qt-distro/conf"
 . sources/poky/oe-init-build-env ${BUILDDIRECTORY}
 
 # use sources from Qt SDK if that is available