From aed51b65a7764d845ec164e1b803812361543ebf Mon Sep 17 00:00:00 2001 From: Eyck Jentzsch Date: Tue, 28 Feb 2023 14:56:36 +0100 Subject: [PATCH] updates build system --- .cproject | 2 +- CMakeLists.txt | 11 ++++++++++- scc | 2 +- src/tgc_vp/system.cpp | 2 +- tgc-iss/dbt-rise-core | 2 +- tgc-iss/dbt-rise-tgc | 2 +- vpvper | 2 +- 7 files changed, 16 insertions(+), 7 deletions(-) diff --git a/.cproject b/.cproject index ac5af9a..81be607 100644 --- a/.cproject +++ b/.cproject @@ -12,7 +12,7 @@ - + diff --git a/CMakeLists.txt b/CMakeLists.txt index e8db919..bbac218 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -57,7 +57,15 @@ if (UNIX) list(APPEND CONAN_BOOST_OPTIONS boost:fPIC=True boost:shared=True) endif (UNIX) -set(CONAN_PACKAGE_LIST fmt/8.0.1 zlib/1.2.11 boost/1.75.0 gsl-lite/0.37.0 elfio/3.8) +set(CONAN_PACKAGE_LIST + fmt/8.0.1 + spdlog/1.9.2 + boost/1.75.0 + gsl-lite/0.37.0 + elfio/3.8 + yaml-cpp/0.7.0 + jsoncpp/1.9.5 +) if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") list(APPEND CONAN_BOOST_OPTIONS boost:fPIC=True lua:compile_as_cpp=False) @@ -82,6 +90,7 @@ conan_install() find_package(tcc QUIET) find_package(elfio) find_package(fmt) +find_package(spdlog) find_package(gsl-lite) set(Boost_NO_BOOST_CMAKE ON) # Don't do a find_package in config mode before searching for a regular boost install. diff --git a/scc b/scc index bee44d8..e0c3b9a 160000 --- a/scc +++ b/scc @@ -1 +1 @@ -Subproject commit bee44d83d0b86d71e4e191c7150332e34cc2dd56 +Subproject commit e0c3b9ab6a4e2fe1a3a3c87d84a617a9d674941d diff --git a/src/tgc_vp/system.cpp b/src/tgc_vp/system.cpp index 4525174..900e90d 100644 --- a/src/tgc_vp/system.cpp +++ b/src/tgc_vp/system.cpp @@ -77,7 +77,7 @@ system::system(sc_core::sc_module_name nm) core_complex.sw_irq_i(msie_int_s); core_complex.timer_irq_i(mtime_int_s); - core_complex.global_irq_i(core_int_s); + core_complex.ext_irq_i(core_int_s); core_complex.local_irq_i(local_int_s); pins_i(gpio0.pins_i); diff --git a/tgc-iss/dbt-rise-core b/tgc-iss/dbt-rise-core index d40069a..8a2fe18 160000 --- a/tgc-iss/dbt-rise-core +++ b/tgc-iss/dbt-rise-core @@ -1 +1 @@ -Subproject commit d40069a26170c3026c74f83cdf7ece2177afa914 +Subproject commit 8a2fe18cba1e799aebd018d0d5434fb00d94b29f diff --git a/tgc-iss/dbt-rise-tgc b/tgc-iss/dbt-rise-tgc index 1ad66a7..ec55efd 160000 --- a/tgc-iss/dbt-rise-tgc +++ b/tgc-iss/dbt-rise-tgc @@ -1 +1 @@ -Subproject commit 1ad66a71d8e706b37b4d3b2868ac9917c712b00a +Subproject commit ec55efd3229b201dde1778d5b7f6e68876d2c99f diff --git a/vpvper b/vpvper index 9982e81..55f81f2 160000 --- a/vpvper +++ b/vpvper @@ -1 +1 @@ -Subproject commit 9982e812f3b590b27baa33c37087fb825055a75a +Subproject commit 55f81f21494eba59e30925527d3d2cf4cde7b884