Merge branch 'tmp2' into develop

.gitmodules

@@ -1,12 +1,12 @@
 [submodule "scc"]
 	path = scc
 	url = https://github.com/Minres/SystemC-Components.git
-[submodule "tgfs"]
-	path = dbt-rise-tgc
-	url = https://git.minres.com/DBT-RISE/DBT-RISE-TGFS.git
-[submodule "dbt-core"]
-	path = dbt-rise-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

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)
 

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)

dbt-rise-tgc

@@ -0,0 +1 @@
+Subproject commit 4c363f40736f286daef201407220763d962544ab

tgfs

@@ -1 +0,0 @@
-Subproject commit b8fa5fbbda1690ff37d0357b55440bc548d80dbe