--- fsl-setup-env.org	2016-04-28 08:51:45.358230853 +0200
+++ fsl-setup-env	2016-04-28 09:51:47.386287880 +0200
@@ -101,9 +101,14 @@
 
     if [ $? -eq 0 ]; then
         echo -e "\n    Supported machines:
+NXP Machines:
     `ls $FSLROOTDIR/conf/machine | grep "\.conf" \
            | egrep -v "^imx|^twr" | sed s/\.conf//g | xargs echo`
-"
+
+Scalys Machines:
+   `ls sources/meta-scalys-ppc/conf/machine | grep "\.conf" \
+	              | egrep -v "^imx|^twr" | sed s/\.conf//g | xargs echo`
+   "
     else
         echo "    ERROR: no available machine conf file is found. "
     fi
@@ -166,6 +171,9 @@
 if [ -n "${MACHINE}" ] && \
     [ -e "$FSLROOTDIR/conf/machine/${MACHINE}.conf" ]; then
     echo "Configuring for ${MACHINE} ..."
+elif [ -n "${MACHINE}" ] && \
+    [ -e "sources/meta-scalys-ppc/conf/machine/${MACHINE}.conf" ]; then
+    echo "Configuring for ${MACHINE} ..."
 else
     echo -e "\nThe \$MACHINE you have specified ($MACHINE) is not supported by this build setup."
     usage && clean_up && return
@@ -216,6 +224,9 @@
 elif [ "`ls $FSLROOTDIR/conf/machine $EXTRAROOTDIR/conf/machine \
        | grep "\.conf" | egrep -v "^imx|^twr" | grep ${MACHINE} | wc -l`" != "0" ]; then
     DISTRO="fsl-qoriq"
+elif [ "`ls sources/meta-scalys-ppc/conf/machine $EXTRAROOTDIR/conf/machine \
+	       | grep "\.conf" | egrep -v "^imx|^twr" | grep ${MACHINE} | wc -l`" != "0" ]; then
+    DISTRO="fsl-qoriq"
 fi
 
 if [ -z "$DISTRO" ]; then