--- fsl-setup-env.orig	2017-06-16 11:36:16.714142160 +0200
+++ fsl-setup-env	2017-06-16 11:36:02.248286004 +0200
@@ -105,10 +105,15 @@
     echo "Usage: . $PROGNAME -m <machine>"
 
     echo -e "\n    Supported machines:
+NXP Machines:    
     `find ${ROOTDIR}/sources/meta-{fsl,freescale,nxp}*/conf/machine \
         -name *.conf 2>/dev/null \
         |egrep "/(mpc|b4|bsc|c29|p1|p2|p3|p4|p5|t1|t2|t4|ls).*conf$" |sort \
         |xargs echo |sed -e 's,[^ ]*/,,g;s,.conf,,g'`
+
+Scalys Machines:
+    `ls sources/meta-scalys-ppc/conf/machine | grep "\.conf" \
+           | egrep -v "^imx|^twr" | sed s/\.conf//g | xargs echo`
 "
 
     echo "    Optional parameters:
@@ -171,11 +176,11 @@
 # Check the machine type specified
 valid_machine=false
 if [ -n "${MACHINE}" ];then
-    valid_num=`find ${ROOTDIR}/sources/meta-{fsl,freescale,nxp}*/conf/machine \
+    valid_num=`find ${ROOTDIR}/sources/meta-{fsl,freescale,nxp,scalys-ppc}*/conf/machine \
         -name ${MACHINE}.conf 2>/dev/null |wc -l`
     if [ "1" -lt "$valid_num" ];then
         echo "ERROR: possible error may occur due to duplicate ${MACHINE}.conf exist:"
-        find ${ROOTDIR}/sources/meta-{fsl,freescale,nxp}*/conf/machine \
+        find ${ROOTDIR}/sources/meta-{fsl,freescale,nxp,scalys-ppc}*/conf/machine \
             -name ${MACHINE}.conf 2>/dev/null
         echo "Please remove the useless layer under ${ROOTDIR}/sources"
         clean_up && return
@@ -223,6 +228,7 @@
     meta-fsl-local-build \
     meta-fsl-testing \
     meta-fsl-dataplane \
+    meta-scalys-ppc \
 "
 if [ "$setup_g" == "true" ]; then
 LAYER_LIST="$LAYER_LIST \