From 6c4797903977b072be397efc8e1e2113b0653dbd Mon Sep 17 00:00:00 2001 From: Eyck Jentzsch Date: Wed, 9 Feb 2022 21:03:13 +0100 Subject: [PATCH] update submodules and paths --- .gitmodules | 12 ++++++------ CMakeLists.txt | 4 ++-- cmake/CodeGen.cmake | 2 +- dbt-core | 1 - dbt-rise-core | 1 + dbt-rise-tgc | 1 + tgfs | 1 - 7 files changed, 11 insertions(+), 11 deletions(-) delete mode 160000 dbt-core create mode 160000 dbt-rise-core create mode 160000 dbt-rise-tgc delete mode 160000 tgfs diff --git a/.gitmodules b/.gitmodules index f533ef3..a1a4698 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,12 +1,12 @@ [submodule "scc"] path = scc url = https://github.com/Minres/SystemC-Components.git -[submodule "tgfs"] - path = tgfs - url = https://git.minres.com/DBT-RISE/DBT-RISE-TGFS.git -[submodule "dbt-core"] - path = dbt-core - url = https://git.minres.com/DBT-RISE/DBT-RISE-Core.git [submodule "coredsl"] path = coredsl url = https://git.minres.com/DBT-RISE/CoreDSL.git +[submodule "dbt-rise-core"] + path = dbt-rise-core + url = https://git.minres.com/DBT-RISE/DBT-RISE-Core.git +[submodule "dbt-rise-tgc"] + path = dbt-rise-tgc + url = https://git.minres.com/DBT-RISE/DBT-RISE-TGFS.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 9762d91..c5322f1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -111,7 +111,7 @@ endif() gen_coredsl(${CORE_NAME} ${CORE_DSL_INPUT_DIR}/${CORE_NAME}.core_desc interp) -add_subdirectory(dbt-core) +add_subdirectory(dbt-rise-core) add_subdirectory(scc) -add_subdirectory(tgfs) +add_subdirectory(dbt-rise-tgc) diff --git a/cmake/CodeGen.cmake b/cmake/CodeGen.cmake index fa2dee1..eddd921 100644 --- a/cmake/CodeGen.cmake +++ b/cmake/CodeGen.cmake @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.16) option(ENABLE_CODEGEN "Enable code generation for supported cores" ON) set(ROOT_DIR ${CMAKE_CURRENT_LIST_DIR}/..) -set(DBT_CORE_TGC_DIR ${ROOT_DIR}/tgfs) +set(DBT_CORE_TGC_DIR ${ROOT_DIR}/dbt-rise-tgc) #helper to setup code generation and generate outputs set(GENERATOR_JAR ${ROOT_DIR}/coredsl/com.minres.coredsl.generator.repository/target/com.minres.coredsl.generator-2.0.0-SNAPSHOT.jar) diff --git a/dbt-core b/dbt-core deleted file mode 160000 index bd7124e..0000000 --- a/dbt-core +++ /dev/null @@ -1 +0,0 @@ -Subproject commit bd7124e8a23ff94b948369ee5f2d920c541eb4ad diff --git a/dbt-rise-core b/dbt-rise-core new file mode 160000 index 0000000..66f4c6b --- /dev/null +++ b/dbt-rise-core @@ -0,0 +1 @@ +Subproject commit 66f4c6b12b51a28a7d96a13088e860e3edd1ac87 diff --git a/dbt-rise-tgc b/dbt-rise-tgc new file mode 160000 index 0000000..4c363f4 --- /dev/null +++ b/dbt-rise-tgc @@ -0,0 +1 @@ +Subproject commit 4c363f40736f286daef201407220763d962544ab diff --git a/tgfs b/tgfs deleted file mode 160000 index ac86f14..0000000 --- a/tgfs +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ac86f14a54699647590b57455b437c337995f1d1