Merge remote-tracking branch 'origin/dev' into toolchains2

2019-07-19 01:10:50 +00:00
parent 121c572d72 de51c91881
commit a759d64926
23 changed files with 284 additions and 107 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -40,3 +40,9 @@
 [submodule "toolchains/esp-tools"]
 	path = toolchains/esp-tools
 	url = https://github.com/ucb-bar/esp-tools.git
+[submodule "vlsi/hammer"]
+	path = vlsi/hammer
+	url = git@github.com:ucb-bar/hammer.git
+[submodule "vlsi/hammer-cad-plugins"]
+	path = vlsi/hammer-cad-plugins
+	url = git@github.com:ucb-bar/hammer-cad-plugins