Merge branch 'main' of git.soton.ac.uk:soclabs/nanosoc into main

set_env.sh

@@ -10,23 +10,28 @@
 #-----------------------------------------------------------------------------
 #!/bin/bash
 
-# Get Root Location of Repository
+# Get Root Location of Design Structure
 if [ -z $DESIGN_ROOT ]; then
     # If $DESIGN_ROOT hasn't been set yet
     DESIGN_ROOT=`git rev-parse --show-superproject-working-tree`
+
     if [ -z $DESIGN_ROOT ]; then
-        # If not in a submodule
+        # If not in a submodule - at root
         DESIGN_ROOT=`git rev-parse --show-toplevel`
     fi
-fi
 
+    # Source Top-Level Sourceme
+    source $DESIGN_ROOT/set_env.sh
+else
     # Set Environment Variable for this Repository
     export NANOSOC_DIR="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
 
     # If this Repo is root of workspace
     if [ $NANOSOC_DIR = $DESIGN_ROOT ]; then
-    echo "Design Workspace: $NANOSOC_DIR" 
+        echo "Design Workspace: $DESIGN_ROOT" 
         export DESIGN_ROOT
+        # Set Default Simulator
+        export SIMULATOR="ivlog"
     fi
 
     # Source environment variables for all submodules
@@ -39,5 +44,6 @@ for d in $NANOSOC_DIR/* ; do
         fi
     done
 
-# Add Flow directory to Path
+    # Add Scripts to Path
     export PATH="$PATH:/$NANOSOC_DIR/flow"
+fi
\ No newline at end of file