migrate all submodules to 'dependencies' folder at the root of the project

fc84eda0 · Dimitris Lampridis · 3b46c921 · fc84eda0 · f19220ff · 309cd51f
Commit fc84eda0 authored Jul 27, 2018 by Dimitris Lampridis
12 changed files
--- a/.gitmodules
+++ b/.gitmodules
-[submodule "hdl/ip_cores/mock-turtle"]
+[submodule "dependencies/mock-turtle"]
-	path = hdl/ip_cores/mock-turtle
+	path = dependencies/mock-turtle
 	url = git://ohwr.org/hdl-core-lib/mock-turtle.git
-[submodule "hdl/ip_cores/fine-delay"]
+[submodule "dependencies/fine-delay"]
-	path = hdl/ip_cores/fine-delay
+	path = dependencies/fine-delay
 	url = git://ohwr.org/fmc-projects/fmc-delay-1ns-8cha.git
-[submodule "hdl/ip_cores/fmc-tdc"]
+[submodule "dependencies/fmc-tdc"]
-	path = hdl/ip_cores/fmc-tdc
+	path = dependencies/fmc-tdc
 	url = git://ohwr.org/fmc-projects/fmc-tdc/fmc-tdc-1ns-5cha-gw.git
-[submodule "hdl/ip_cores/vme64x-core"]
+[submodule "dependencies/vme64x-core"]
-	path = hdl/ip_cores/vme64x-core
+	path = dependencies/vme64x-core
 	url = git://ohwr.org/hdl-core-lib/vme64x-core.git
-[submodule "hdl/ip_cores/general-cores"]
+[submodule "dependencies/general-cores"]
-	path = hdl/ip_cores/general-cores
+	path = dependencies/general-cores
 	url = git://ohwr.org/hdl-core-lib/general-cores.git
-[submodule "hdl/ip_cores/wr-cores"]
+[submodule "dependencies/wr-cores"]
-	path = hdl/ip_cores/wr-cores
+	path = dependencies/wr-cores
 	url = git://ohwr.org/hdl-core-lib/wr-cores.git
-[submodule "hdl/ip_cores/urv-core"]
+[submodule "dependencies/urv-core"]
-	path = hdl/ip_cores/urv-core
+	path = dependencies/urv-core
 	url = git://ohwr.org/hdl-core-lib/urv-core.git
-[submodule "hdl/ip_cores/etherbone-core"]
+[submodule "dependencies/etherbone-core"]
-	path = hdl/ip_cores/etherbone-core
+	path = dependencies/etherbone-core
 	url = git://ohwr.org/hdl-core-lib/etherbone-core.git
--- a/etherbone-core @ f19220ff
+++ b/etherbone-core @ f19220ff
--- a/fine-delay @ 309cd51f
+++ b/fine-delay @ 309cd51f
--- a/fmc-tdc @ 8a82e727
+++ b/fmc-tdc @ 8a82e727
--- a/general-cores @ 01731cd1
+++ b/general-cores @ 01731cd1
--- a/mock-turtle @ 5ce1aa6d
+++ b/mock-turtle @ 5ce1aa6d
--- a/urv-core @ 70e9e78f
+++ b/urv-core @ 70e9e78f
--- a/vme64x-core @ 633d3174
+++ b/vme64x-core @ 633d3174
--- a/wr-cores @ 2573b6cd
+++ b/wr-cores @ 2573b6cd
--- a/hdl/syn/svec/list_tdc_fd/Manifest.py
+++ b/hdl/syn/svec/list_tdc_fd/Manifest.py
+# HDLMake 'develop' branch required.
+#
+# Due to bugs in release v3.0 of hdlmake it is necessary to use the "develop"
+# branch of hdlmake, commit db4e1ab.
 target = "xilinx"
 action = "synthesis"
@@ -8,7 +13,7 @@ syn_top     = "svec_list_top"
 syn_project = "svec_list_tdc_fd.xise"
 syn_tool    ="ise"
-fetchto = "../../../ip_cores"
+fetchto = "../../../../dependencies"
 syn_post_project_cmd = "$(TCL_INTERPRETER) " + \
                       fetchto + "/general-cores/tools/sdb_desc_gen.tcl " + \

--- a/hdl/testbench/wrtd-system/Manifest.py
+++ b/hdl/testbench/wrtd-system/Manifest.py
@@ -10,6 +10,8 @@ target     = "xilinx"
 syn_device = "xc6slx150t"
 vcom_opt   = "-93 -mixedsvvh"
+fetchto = "../../../dependencies"
 include_dirs = [
    "../../ip_cores/mock-turtle/hdl/testbench/include/",
    "../../ip_cores/mock-turtle/hdl/testbench/include/regs/",

--- a/hdl/top/svec/list_tdc_fd/Manifest.py
+++ b/hdl/top/svec/list_tdc_fd/Manifest.py
@@ -2,13 +2,11 @@ files = [
    "svec_list_top.vhd",
 ]
-fetchto = "../../../ip_cores"
 modules = {
-    "local" : [	"../../../ip_cores/mock-turtle/hdl/rtl",
+    "local" : [	
-                "../../../ip_cores/wr-cores/board/svec",
+        "../../../ip_cores/wr-cores/board/svec",
-                "../../../ip_cores/fine-delay/hdl",
+        "../../../ip_cores/fine-delay/hdl",
-                "../../../ip_cores/fmc-tdc/hdl/rtl",
+        "../../../ip_cores/fmc-tdc/hdl/rtl",
    ],
    "git" : [
        "git://ohwr.org/hdl-core-lib/general-cores.git",
@@ -16,5 +14,6 @@ modules = {
        "git://ohwr.org/hdl-core-lib/vme64x-core.git",
        "git://ohwr.org/hdl-core-lib/urv-core.git",
        "git://ohwr.org/hdl-core-lib/etherbone-core.git",
+        "git://ohwr.org/hdl-core-lib/mock-turtle.git",
    ],
 }