Merge branch 'develop'

# Conflicts:
#	.cproject
#	.gitmodules
#	.settings/language.settings.xml
#	conanfile.txt
#	examples/simple_system/CMakeLists.txt
#	examples/simple_system/gen/e300_plat_t.h
#	examples/simple_system/gpio.cpp
#	examples/simple_system/plic.cpp
#	examples/simple_system/sc_main.cpp
#	examples/simple_system/simple_system.cpp
#	examples/transaction_recording/CMakeLists.txt
#	examples/transaction_recording/scv_tr_recording_example.cpp
This commit is contained in:
2020-04-23 16:39:32 +02:00
28 changed files with 810 additions and 438 deletions

1
.gitmodules vendored
View File

@ -2,3 +2,4 @@
path = sc-components
url = https://git.minres.com/SystemC/SystemC-Components.git
branch = master