Moving migen and misoc to submodules.

timvideos · Aug 19, 2015 · 62f8b93 · 62f8b93
1 parent 36acfc1
commit 62f8b93
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,9 +7,6 @@ firmware/lm32/firmware.elf
 firmware/lm32/version.h
 test/dump.png
 build
-misoc
 makestuff
-migen
-misoc
 *.pyc
 *.pnm
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,9 @@
 [submodule "firmware/fx2/fx2lib"]
 	path = firmware/fx2/fx2lib
 	url = https://github.com/timvideos/fx2lib
+[submodule "build/misoc"]
+	path = build/misoc
+	url = https://github.com/m-labs/misoc.git
+[submodule "build/migen"]
+	path = build/migen
+	url = https://github.com/m-labs/migen.git
diff --git a/Makefile b/Makefile
@@ -15,6 +15,14 @@ else
 	FLTERM = $(MSCDIR)/tools/flterm
 endif
 
+build/misoc:
+	git submodule init build/misoc
+	git submodule update build/misoc
+
+build/migen:
+	git submodule init build/migen
+	git submodule update build/misoc
+
 help:
 	@echo "Targets avaliable:"
 	@echo " make gateware"

diff --git a/build/migen b/build/migen
diff --git a/build/misoc b/build/misoc
diff --git a/scripts/update-submodules.sh b/scripts/update-submodules.sh
@@ -0,0 +1,27 @@
+
+
+(
+	cd build/migen
+	git fetch origin
+	git checkout origin/master
+)
+MIGEN_VERSION=$(cd build/migen; git describe --always --dirty)
+git add build/migen
+
+(
+	cd build/misoc
+	git fetch origin
+	git checkout origin/master
+)
+MISOC_VERSION=$(cd build/misoc; git describe --always --dirty)
+git add build/misoc
+
+echo "migen now $MIGEN_VERSION"
+echo "misoc now $MISOC_VERSION"
+
+cat << EOF
+git commit -F- <<EOF
+Updating migen+misoc submodules
+ * migen to $MIGEN_VERSION
+ * misoc to $MISOC_VERSION
+EOF