VP
/
TGC-VP
6
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

updates submodules and adapts design to changes

This commit is contained in:
Eyck Jentzsch 2023-06-28 09:03:30 +02:00
parent 2d220181e8
commit 5c09ed24fb
10 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.cproject
View File

@ -12,11 +12,11 @@
</extensions> </extensions>
</storageModule> </storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0"> <storageModule moduleId="cdtBuildSystem" version="4.0.0">
<configuration artifactName="${ProjName}" buildProperties="" description="" id="cdt.managedbuild.toolchain.gnu.base.1730410661" name="Debug" optionalBuildProperties="org.eclipse.cdt.docker.launcher.containerbuild.property.volumes=,org.eclipse.cdt.docker.launcher.containerbuild.property.selectedvolumes=" parent="org.eclipse.cdt.build.core.emptycfg"> <configuration artifactName="${ProjName}" buildProperties="" description="" id="cdt.managedbuild.toolchain.gnu.base.1730410661" name="Debug" optionalBuildProperties="org.eclipse.cdt.docker.launcher.containerbuild.property.selectedvolumes=,org.eclipse.cdt.docker.launcher.containerbuild.property.volumes=" parent="org.eclipse.cdt.build.core.emptycfg">
<folderInfo id="cdt.managedbuild.toolchain.gnu.base.1730410661.218663890" name="/" resourcePath=""> <folderInfo id="cdt.managedbuild.toolchain.gnu.base.1730410661.218663890" name="/" resourcePath="">
<toolChain id="cdt.managedbuild.toolchain.gnu.base.953157788" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.base"> <toolChain id="cdt.managedbuild.toolchain.gnu.base.953157788" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.base">
<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.GNU_ELF" id="cdt.managedbuild.target.gnu.platform.base.1034252621" name="Debug Platform" osList="linux,hpux,aix,qnx" superClass="cdt.managedbuild.target.gnu.platform.base"/> <targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.GNU_ELF" id="cdt.managedbuild.target.gnu.platform.base.1034252621" name="Debug Platform" osList="linux,hpux,aix,qnx" superClass="cdt.managedbuild.target.gnu.platform.base"/>
<builder buildPath="/TGC-VP/build/Debug" id="cmake4eclipse.mbs.builder.1810203992" parallelBuildOn="true" parallelizationNumber="optimal" superClass="cmake4eclipse.mbs.builder"/> <builder buildPath="/TGC-VP/build/Debug" id="cmake4eclipse.mbs.builder.1810203992" keepEnvironmentInBuildfile="false" name="CMake Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="cmake4eclipse.mbs.builder"/>
<tool id="cdt.managedbuild.tool.gnu.archiver.base.519757762" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/> <tool id="cdt.managedbuild.tool.gnu.archiver.base.519757762" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.base.1878089590" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base"> <tool id="cdt.managedbuild.tool.gnu.cpp.compiler.base.1878089590" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base">
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.705150349" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/> <inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.705150349" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
@ -46,10 +46,11 @@
<def name="BUILD_SHARED_LIBS" type="STRING" val="ON"/> <def name="BUILD_SHARED_LIBS" type="STRING" val="ON"/>
</defs> </defs>
</storageModule> </storageModule>
<storageModule buildDir="build/${ConfigName}" dirtyTs="1659771636546" moduleId="de.marw.cmake4eclipse.mbs.settings"> <storageModule buildDir="build/${ConfigName}" dirtyTs="1687934527300" moduleId="de.marw.cmake4eclipse.mbs.settings">
<options/> <options/>
<defs> <defs>
<def name="CMAKE_BUILD_TYPE" type="STRING" val="Debug"/> <def name="CMAKE_BUILD_TYPE" type="STRING" val="Debug"/>
<def name="ENABLE_TCC" type="STRING" val="OFF"/>
</defs> </defs>
</storageModule> </storageModule>
</cconfiguration> </cconfiguration>

8
CMakeLists.txt
View File

@ -12,6 +12,7 @@ option(EN_EXT_DEBUG "Enable extended debug output at runtime" OFF)
option(ENABLE_COVERAGE "Enable code coverage" OFF) option(ENABLE_COVERAGE "Enable code coverage" OFF)
option(ENABLE_SANITIZER "Enable address sanitizer" OFF) option(ENABLE_SANITIZER "Enable address sanitizer" OFF)
option(ENABLE_CLANGTIDY "Enable static analysis with clang-tidy." OFF) option(ENABLE_CLANGTIDY "Enable static analysis with clang-tidy." OFF)
option(ENABLE_TCC "Enable the use of TCC" ON)
set(SCC_LIB_ONLY ON) set(SCC_LIB_ONLY ON)
set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD 14)
@ -67,9 +68,12 @@ set(CONAN_PACKAGE_LIST
jsoncpp/1.9.5 jsoncpp/1.9.5
) )
if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux" AND ENABLE_TCC)
list(APPEND CONAN_BOOST_OPTIONS boost:fPIC=True lua:compile_as_cpp=False) list(APPEND CONAN_BOOST_OPTIONS boost:fPIC=True lua:compile_as_cpp=False)
list(APPEND CONAN_PACKAGE_LIST tcc/0.9.27 seasocks/1.4.4 lua/5.4.3) if(ENABLE_TCC)
list(APPEND CONAN_PACKAGE_LIST tcc/0.9.27)
endif()
list(APPEND CONAN_PACKAGE_LIST seasocks/1.4.4 lua/5.4.3)
endif() endif()
set(CONAN_PACKAGE_OPTIONS fmt:header_only=True ${CONAN_BOOST_OPTIONS}) set(CONAN_PACKAGE_OPTIONS fmt:header_only=True ${CONAN_BOOST_OPTIONS})
if(NOT USE_CWR_SYSTEMC AND NOT USE_NCSC_SYSTEMC AND NOT DEFINED ENV{SYSTEMC_HOME}) if(NOT USE_CWR_SYSTEMC AND NOT USE_NCSC_SYSTEMC AND NOT DEFINED ENV{SYSTEMC_HOME})

1
fw/hello-world/Makefile
View File

@ -13,6 +13,5 @@ LDFLAGS := -march=$(RISCV_ARCH) -mabi=$(RISCV_ABI)
compiler := $(shell which riscv32-unknown-elf-gcc) compiler := $(shell which riscv32-unknown-elf-gcc)
TOOL_DIR=$(dir $(compiler)) TOOL_DIR=$(dir $(compiler))
TRIPLET=riscv32-unknown-elf
BSP_BASE = ../bsp BSP_BASE = ../bsp
include $(BSP_BASE)/env/common-gcc.mk include $(BSP_BASE)/env/common-gcc.mk

2
scc

@ -1 +1 @@
Subproject commit e0c3b9ab6a4e2fe1a3a3c87d84a617a9d674941d Subproject commit fbc21a0509e01f3697a16dc407eaa40b9d6a5cbb

2
src/tgc_vp/gen/platform_mmap.h
View File

@ -7,7 +7,7 @@
#define _PLATFORM_MMAP_H_ #define _PLATFORM_MMAP_H_
// need double braces, see // need double braces, see
// https://stackoverflow.com/questions/6893700/how-to-construct-stdarray-object-with-initializer-list#6894191 // https://stackoverflow.com/questions/6893700/how-to-construct-stdarray-object-with-initializer-list#6894191
const std::array<scc::target_memory_map_entry<32>, 13> platfrom_mmap = {{ const std::array<scc::target_memory_map_entry<>, 13> platfrom_mmap = {{
{clint.socket, 0x2000000, 0xc000}, {clint.socket, 0x2000000, 0xc000},
{plic.socket, 0xc000000, 0x200008}, {plic.socket, 0xc000000, 0x200008},
{aon.socket, 0x10000000, 0x150}, {aon.socket, 0x10000000, 0x150},

5
src/tgc_vp/system.cpp
View File

@ -13,7 +13,7 @@ using namespace sysc::tgfs;
system::system(sc_core::sc_module_name nm) system::system(sc_core::sc_module_name nm)
: sc_core::sc_module(nm) : sc_core::sc_module(nm)
, NAMED(router, platfrom_mmap.size() + 2, 1) , NAMED(router, platfrom_mmap.size() + 2, 2)
, NAMEDC(qspi0_ptr, spi, spi_impl::beh) , NAMEDC(qspi0_ptr, spi, spi_impl::beh)
, NAMEDC(qspi1_ptr, spi, spi_impl::beh) , NAMEDC(qspi1_ptr, spi, spi_impl::beh)
, NAMEDC(qspi2_ptr, spi, spi_impl::beh) , NAMEDC(qspi2_ptr, spi, spi_impl::beh)
@ -24,7 +24,8 @@ system::system(sc_core::sc_module_name nm)
auto& qspi0 = *qspi0_ptr; auto& qspi0 = *qspi0_ptr;
auto& qspi1 = *qspi1_ptr; auto& qspi1 = *qspi1_ptr;
auto& qspi2 = *qspi2_ptr; auto& qspi2 = *qspi2_ptr;
core_complex.initiator(router.target[0]); core_complex.ibus(router.target[0]);
core_complex.dbus(router.target[1]);
size_t i = 0; size_t i = 0;
for (const auto &e : platfrom_mmap) { for (const auto &e : platfrom_mmap) {
router.initiator.at(i)(e.target); router.initiator.at(i)(e.target);

4
src/tgc_vp/system.h
View File

@ -52,9 +52,9 @@ private:
vpvper::sifive::prci prci{"prci"}; vpvper::sifive::prci prci{"prci"};
vpvper::sifive::clint clint{"clint"}; vpvper::sifive::clint clint{"clint"};
using mem_qspi_t = scc::memory<512_MB, 32>; using mem_qspi_t = scc::memory<512_MB, scc::LT>;
mem_qspi_t mem_qspi{"mem_qspi"}; mem_qspi_t mem_qspi{"mem_qspi"};
using mem_ram_t = scc::memory<128_kB, 32>; using mem_ram_t = scc::memory<128_kB, scc::LT>;
mem_ram_t mem_ram{"mem_ram"}; mem_ram_t mem_ram{"mem_ram"};
sc_core::sc_signal<sc_core::sc_time, sc_core::SC_MANY_WRITERS> tlclk_s{"tlclk_s"}; sc_core::sc_signal<sc_core::sc_time, sc_core::SC_MANY_WRITERS> tlclk_s{"tlclk_s"};

2
tgc-iss/dbt-rise-core

@ -1 +1 @@
Subproject commit 8a2fe18cba1e799aebd018d0d5434fb00d94b29f Subproject commit c669f78a90084d55b6a04d41cf7f92558d73e75a

2
tgc-iss/dbt-rise-tgc

@ -1 +1 @@
Subproject commit ec55efd3229b201dde1778d5b7f6e68876d2c99f Subproject commit 4dbc7433a5ce58e367d2e740e191929df50e39ef

2
vpvper

@ -1 +1 @@
Subproject commit 55f81f21494eba59e30925527d3d2cf4cde7b884 Subproject commit 755a9a3f19cd6c3364a17ac15c521c09de71341d