1 files changed, 5 insertions, 2 deletions

diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh
index fbe8672..c0d952f 100755
--- a/scripts/setup-environment.sh
+++ b/scripts/setup-environment.sh
@@ -59,7 +59,10 @@ if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then
     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 +86,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"
     ;;
     *)