diff --git a/.launch/TGC-VP asmjit hello.launch b/.launch/TGC-VP asmjit hello.launch
index 36b6a1e..f36745f 100644
--- a/.launch/TGC-VP asmjit hello.launch
+++ b/.launch/TGC-VP asmjit hello.launch
@@ -18,7 +18,7 @@
-
+
diff --git a/.launch/TGC-VP interp hello.launch b/.launch/TGC-VP interp hello.launch
index 7f8cfbe..0aaee3e 100644
--- a/.launch/TGC-VP interp hello.launch
+++ b/.launch/TGC-VP interp hello.launch
@@ -18,11 +18,11 @@
-
+
-
+
diff --git a/scc b/scc
index 59d07fb..ebfa47b 160000
--- a/scc
+++ b/scc
@@ -1 +1 @@
-Subproject commit 59d07fbc6678f5676dc508925ed1982007e350f1
+Subproject commit ebfa47becc44bd462e422943a667edf6979d5be3
diff --git a/src/tgc_vp/gen/PipelinedMemoryBusToApbBridge.h b/src/tgc_vp/gen/PipelinedMemoryBusToApbBridge.h
index df1acc7..b0765a5 100644
--- a/src/tgc_vp/gen/PipelinedMemoryBusToApbBridge.h
+++ b/src/tgc_vp/gen/PipelinedMemoryBusToApbBridge.h
@@ -10,12 +10,12 @@
#pragma once
// need double braces, see https://stackoverflow.com/questions/6893700/how-to-construct-stdarray-object-with-initializer-list#6894191
-const std::array, 6> PipelinedMemoryBusToApbBridge_map = {{
+const std::array, 7> PipelinedMemoryBusToApbBridge_map = {{
{ gpio0.socket, 0x0, 0xc },
{ uart0.socket, 0x1000, 0x14 },
{ timer0.socket, 0x20000, 0x1c },
{ aclint.socket, 0x30000, 0xc000 },
{ irq_ctrl.socket, 0x40000, 0x8 },
{ qspi.socket, 0x50000, 0x5c },
- //{ bootloader.socket, 0x80000, 0x400 },
- }} ;
\ No newline at end of file
+ { boot_rom.target, 0x80000, 0x5c }
+ }} ;
diff --git a/src/tgc_vp/gen/platform_mmap.h b/src/tgc_vp/gen/platform_mmap.h
deleted file mode 100644
index 9f8b352..0000000
--- a/src/tgc_vp/gen/platform_mmap.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2019 -2021 MINRES Technolgies GmbH
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-#ifndef _PLATFORM_MMAP_H_
-#define _PLATFORM_MMAP_H_
-// need double braces, see
-// https://stackoverflow.com/questions/6893700/how-to-construct-stdarray-object-with-initializer-list#6894191
-const std::array, 13> platfrom_mmap = {{
- {clint.socket, 0x2000000, 0xc000},
- {plic.socket, 0xc000000, 0x200008},
- {aon.socket, 0x10000000, 0x150},
- {prci.socket, 0x10008000, 0x14},
- {gpio0.socket, 0x10012000, 0x44},
- {uart0.socket, 0x10013000, 0x1c},
- {qspi0.socket, 0x10014000, 0x78},
- {pwm0.socket, 0x10015000, 0x30},
- {uart1.socket, 0x10023000, 0x1c},
- {qspi1.socket, 0x10024000, 0x78},
- {pwm1.socket, 0x10025000, 0x30},
- {qspi2.socket, 0x10034000, 0x78},
- {pwm2.socket, 0x10035000, 0x30},
-}};
-
-#endif /* _PLATFORM_MMAP_H_ */
diff --git a/src/tgc_vp/system.cpp b/src/tgc_vp/system.cpp
index 5d48fc6..280362d 100644
--- a/src/tgc_vp/system.cpp
+++ b/src/tgc_vp/system.cpp
@@ -23,7 +23,7 @@ system::system(sc_core::sc_module_name nm)
ahb_router.initiator.at(0)(qspi.xip_sck);
ahb_router.set_target_range(0, 0xE0000000, 16_MB);
- ahb_router.initiator.at(1)(mem_ram.target);
+ ahb_router.initiator.at(1)(main_ram.target);
ahb_router.set_target_range(1, 0x80000000, 32_kB);
ahb_router.initiator.at(2)(apbBridge.target[0]);
ahb_router.set_target_range(2, 0xF0000000, 256_MB);
@@ -41,8 +41,9 @@ system::system(sc_core::sc_module_name nm)
aclint.clk_i(clk_i);
irq_ctrl.clk_i(clk_i);
qspi.clk_i(clk_i);
+ boot_rom.clk_i(clk_i);
core_complex.clk_i(clk_i);
- //mem_ram.clk_i(clk_i);
+ main_ram.clk_i(clk_i);
gpio0.rst_i(rst_s);
uart0.rst_i(rst_s);
@@ -86,9 +87,7 @@ system::system(sc_core::sc_module_name nm)
sensitive << erst_n;
}
void system::gen_reset(){
- if(erst_n.read())
- rst_s = 0;
- else rst_s = 1;
+ rst_s = !erst_n.read();
}
diff --git a/src/tgc_vp/system.h b/src/tgc_vp/system.h
index 014fa1a..e8530df 100644
--- a/src/tgc_vp/system.h
+++ b/src/tgc_vp/system.h
@@ -61,8 +61,8 @@ private:
vpvper::minres::irq_tl irq_ctrl{"irq_ctrl"};
vpvper::minres::qspi_tl qspi{"qspi"};
- //scc::memory<1_kB, scc::LT> bootloader{"bootloader"};
- scc::memory<32_kB, scc::LT> mem_ram {"mem_ram"};
+ scc::memory<1_kB, scc::LT> boot_rom{"boot_rom"};
+ scc::memory<32_kB, scc::LT> main_ram {"main_ram"};
sc_core::sc_signal rst_s{"rst_s"}, mtime_int_s{"mtime_int_s"}, msip_int_s{"msip_int_s"};
diff --git a/tgc-iss/dbt-rise-tgc b/tgc-iss/dbt-rise-tgc
index fd303c8..24449f1 160000
--- a/tgc-iss/dbt-rise-tgc
+++ b/tgc-iss/dbt-rise-tgc
@@ -1 +1 @@
-Subproject commit fd303c83436fabe397af73686abd0d1158de27a3
+Subproject commit 24449f1c0f113e3692f9845e80dedaaf95e43161
diff --git a/vpvper b/vpvper
index c7453a4..021f845 160000
--- a/vpvper
+++ b/vpvper
@@ -1 +1 @@
-Subproject commit c7453a4fc3e7eb1e9c52a168f847e36c625fe7cc
+Subproject commit 021f845cfe32fdd0cbb44d9d2c68d2bb334cccf9