Merge pull request #138 from timvideos/submodule-script

Changes to submodule management script.
timvideos · Nov 15, 2015 · 3729fcf · 3729fcf
2 parents 403c33e + 1cced34
commit 3729fcf
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/third_party/liteeth b/third_party/liteeth
diff --git a/third_party/update.sh → third_party/merge-upstream.sh b/third_party/update.sh → third_party/merge-upstream.sh
@@ -32,12 +32,21 @@ fi
 
 for TARGET in $TARGETS; do
 	(
+		case $TARGET in
+		lite*|mi*)
+			BRANCH=legacy
+			;;
+		*)
+			BRANCH=master
+			;;
+		esac
+
 		cd $TARGET
 		echo
 		echo "$TARGET checking for updates.."
 		BEFORE_VER=$(git describe --always --dirty)
 		git fetch origin | sed -e's/^/    /'
-		git checkout origin/master | sed -e's/^/    /'
+		git checkout origin/$BRANCH | sed -e's/^/    /'
 		AFTER_VER=$(git describe --always --dirty)
 		if [ x"$BEFORE_VER" = x"$AFTER_VER" ]; then
 			echo "$TARGET is unchanged"

diff --git a/third_party/migen b/third_party/migen
diff --git a/third_party/misoc b/third_party/misoc