X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?p=AGL%2Fmeta-agl.git;a=blobdiff_plain;f=scripts%2Fenvsetup.sh;h=85069543a12c0ac34bd844494404b06893a4ca20;hp=6ca10de4d98dc78d800a639184379354cdce34ab;hb=f431a64246282e068570519b137cc8670521addd;hpb=7e1ebd1b2588503d8e2216cee5e7db7d0c70df83

diff --git a/scripts/envsetup.sh b/scripts/envsetup.sh
index 6ca10de4d..85069543a 100644
--- a/scripts/envsetup.sh
+++ b/scripts/envsetup.sh
@@ -6,7 +6,7 @@ if [ -z $1 ]; then
 fi
 
 MACHINE="$1"
-
+echo "MACHINE=$MACHINE"
 
 case "$MACHINE" in
         "porter")
@@ -43,6 +43,12 @@ case "$MACHINE" in
                 ;;
         "qemux86-64")
                 ;;
+        "dra7xx-evm")
+                ;;
+        "vayu")
+                # nickname for dra7xx-evm
+                MACHINE="dra7xx-evm"
+                ;;
         "wandboard")
                 ;;
         *)
@@ -51,14 +57,20 @@ case "$MACHINE" in
                 ;;
 esac
 
+echo "TEMPALTECONF=$TEMPLATECONF"
 # set template conf for each <board/device>
 if [ -z "$TEMPLATECONF" ]; then
+    # lookup meta-agl-demo first
     if [ -d "$PWD/meta-agl-demo/templates/$MACHINE/conf" ]; then
         TEMPLATECONF="$PWD/meta-agl-demo/templates/$MACHINE/conf"
+    # lookup meta-agl 2nd
+    elif [ -d "$PWD/meta-agl/templates/$MACHINE/conf" ]; then
+        TEMPLATECONF="$PWD/meta-agl/templates/$MACHINE/conf"
     fi
 fi
+echo "TEMPLATECONF=$TEMPLATECONF"
 
-echo "envsetup: Set '$1 as MACHINE."
+echo "envsetup: Set '$1' as MACHINE."
 export MACHINE
 
 # fallback