1 files changed, 3 insertions, 9 deletions

diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh
index 5ee1ad0..1a72d28 100755
--- a/scripts/setup-environment.sh
+++ b/scripts/setup-environment.sh
@@ -57,7 +57,7 @@ BUILDDIRECTORY=${BUILDDIRECTORY:-build-${MACHINE}}
 if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then
   case ${MACHINE} in
     apalis-imx6|colibri-imx6|colibri-vf|colibri-imx7)
-      LAYERSCONF="bblayers.conf.toradex.sample"
+      LAYERSCONF="bblayers.conf.fsl.sample"
     ;;
     imx6qsabresd|imx6dlsabresd|nitrogen6x|imx7dsabresd)
       LAYERSCONF="bblayers.conf.fsl.sample"
@@ -68,21 +68,15 @@ if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then
     tibidabo)
       LAYERSCONF="bblayers.conf.tibidabo.sample"
     ;;
-    beagleboard|am335x-evm)
+    beagleboard|beaglebone|am335x-evm)
       LAYERSCONF="bblayers.conf.ti.sample"
     ;;
-    beaglebone)
-      LAYERSCONF="bblayers.conf.bbb.sample"
-    ;;
-    raspberrypi|raspberrypi2|raspberrypi3)
+    raspberrypi0|raspberrypi|raspberrypi2|raspberrypi3)
       LAYERSCONF="bblayers.conf.rpi.sample"
     ;;
     intel-corei7-64)
       LAYERSCONF="bblayers.conf.intel.sample"
     ;;
-    nvidia-logan)
-      LAYERSCONF="bblayers.conf.nvidia-logan.sample"
-    ;;
     tegra-x1|tegra-t18x)
       LAYERSCONF="bblayers.conf.nvidia-tegra.sample"
     ;;