adds some minor (mostly cosmetic) fixes
This commit is contained in:
parent
8abf623c63
commit
722b015f82
|
@ -18,7 +18,7 @@
|
||||||
<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_START_MODE" value="run"/>
|
<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_START_MODE" value="run"/>
|
||||||
<booleanAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN" value="false"/>
|
<booleanAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN" value="false"/>
|
||||||
<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN_SYMBOL" value="sc_main"/>
|
<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN_SYMBOL" value="sc_main"/>
|
||||||
<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_ARGUMENTS" value="-f fw/hello-world/hello -p ${workspace_loc:TGC-VP}/build/${config_name:TGC-VP}/tgc-iss/dbt-rise-plugins/pctrace/pctrace.so=tgc-iss/dbt-rise-tgc/contrib/instr/TGC5C_instr.yaml --backend=asmjit"/>
|
<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_ARGUMENTS" value="-f fw/hello-world/prebuilt/hello.elf -p ${workspace_loc:TGC-VP}/build/${config_name:TGC-VP}/tgc-iss/dbt-rise-plugins/pctrace/pctrace.so=tgc-iss/dbt-rise-tgc/contrib/instr/TGC5C_instr.yaml --backend=asmjit"/>
|
||||||
<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="build/${config_name:TGC-VP}/src/tgc-vp"/>
|
<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="build/${config_name:TGC-VP}/src/tgc-vp"/>
|
||||||
<stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="TGC-VP"/>
|
<stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="TGC-VP"/>
|
||||||
<booleanAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_AUTO_ATTR" value="true"/>
|
<booleanAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_AUTO_ATTR" value="true"/>
|
||||||
|
|
|
@ -18,11 +18,11 @@
|
||||||
<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_START_MODE" value="run"/>
|
<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_START_MODE" value="run"/>
|
||||||
<booleanAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN" value="false"/>
|
<booleanAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN" value="false"/>
|
||||||
<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN_SYMBOL" value="sc_main"/>
|
<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN_SYMBOL" value="sc_main"/>
|
||||||
<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_ARGUMENTS" value="-f fw/hello-world/hello --dump-structure=tgc_vp.json --config cfg.yaml -t 3"/>
|
<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_ARGUMENTS" value="-f fw/hello-world/prebuilt/hello.elf --dump-structure=tgc_vp.json --config cfg.yaml -t 3"/>
|
||||||
<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="build/${config_name:TGC-VP}/src/tgc-vp"/>
|
<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="build/${config_name:TGC-VP}/src/tgc-vp"/>
|
||||||
<stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="TGC-VP"/>
|
<stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="TGC-VP"/>
|
||||||
<booleanAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_AUTO_ATTR" value="true"/>
|
<booleanAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_AUTO_ATTR" value="true"/>
|
||||||
<stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value="cdt.managedbuild.toolchain.gnu.base.1730410661.719145049"/>
|
<stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value=""/>
|
||||||
<booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
|
<booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
|
||||||
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
|
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
|
||||||
<listEntry value="/TGC-VP"/>
|
<listEntry value="/TGC-VP"/>
|
||||||
|
|
2
scc
2
scc
|
@ -1 +1 @@
|
||||||
Subproject commit 59d07fbc6678f5676dc508925ed1982007e350f1
|
Subproject commit ebfa47becc44bd462e422943a667edf6979d5be3
|
|
@ -10,12 +10,12 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
// need double braces, see https://stackoverflow.com/questions/6893700/how-to-construct-stdarray-object-with-initializer-list#6894191
|
// need double braces, see https://stackoverflow.com/questions/6893700/how-to-construct-stdarray-object-with-initializer-list#6894191
|
||||||
const std::array<scc::target_memory_map_entry<scc::LT>, 6> PipelinedMemoryBusToApbBridge_map = {{
|
const std::array<scc::target_memory_map_entry<scc::LT>, 7> PipelinedMemoryBusToApbBridge_map = {{
|
||||||
{ gpio0.socket, 0x0, 0xc },
|
{ gpio0.socket, 0x0, 0xc },
|
||||||
{ uart0.socket, 0x1000, 0x14 },
|
{ uart0.socket, 0x1000, 0x14 },
|
||||||
{ timer0.socket, 0x20000, 0x1c },
|
{ timer0.socket, 0x20000, 0x1c },
|
||||||
{ aclint.socket, 0x30000, 0xc000 },
|
{ aclint.socket, 0x30000, 0xc000 },
|
||||||
{ irq_ctrl.socket, 0x40000, 0x8 },
|
{ irq_ctrl.socket, 0x40000, 0x8 },
|
||||||
{ qspi.socket, 0x50000, 0x5c },
|
{ qspi.socket, 0x50000, 0x5c },
|
||||||
//{ bootloader.socket, 0x80000, 0x400 },
|
{ boot_rom.target, 0x80000, 0x5c }
|
||||||
}} ;
|
}} ;
|
|
@ -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<scc::target_memory_map_entry<scc::LT>, 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_ */
|
|
|
@ -23,7 +23,7 @@ system::system(sc_core::sc_module_name nm)
|
||||||
|
|
||||||
ahb_router.initiator.at(0)(qspi.xip_sck);
|
ahb_router.initiator.at(0)(qspi.xip_sck);
|
||||||
ahb_router.set_target_range(0, 0xE0000000, 16_MB);
|
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.set_target_range(1, 0x80000000, 32_kB);
|
||||||
ahb_router.initiator.at(2)(apbBridge.target[0]);
|
ahb_router.initiator.at(2)(apbBridge.target[0]);
|
||||||
ahb_router.set_target_range(2, 0xF0000000, 256_MB);
|
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);
|
aclint.clk_i(clk_i);
|
||||||
irq_ctrl.clk_i(clk_i);
|
irq_ctrl.clk_i(clk_i);
|
||||||
qspi.clk_i(clk_i);
|
qspi.clk_i(clk_i);
|
||||||
|
boot_rom.clk_i(clk_i);
|
||||||
core_complex.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);
|
gpio0.rst_i(rst_s);
|
||||||
uart0.rst_i(rst_s);
|
uart0.rst_i(rst_s);
|
||||||
|
@ -86,9 +87,7 @@ system::system(sc_core::sc_module_name nm)
|
||||||
sensitive << erst_n;
|
sensitive << erst_n;
|
||||||
}
|
}
|
||||||
void system::gen_reset(){
|
void system::gen_reset(){
|
||||||
if(erst_n.read())
|
rst_s = !erst_n.read();
|
||||||
rst_s = 0;
|
|
||||||
else rst_s = 1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -61,8 +61,8 @@ private:
|
||||||
vpvper::minres::irq_tl irq_ctrl{"irq_ctrl"};
|
vpvper::minres::irq_tl irq_ctrl{"irq_ctrl"};
|
||||||
vpvper::minres::qspi_tl qspi{"qspi"};
|
vpvper::minres::qspi_tl qspi{"qspi"};
|
||||||
|
|
||||||
//scc::memory<1_kB, scc::LT> bootloader{"bootloader"};
|
scc::memory<1_kB, scc::LT> boot_rom{"boot_rom"};
|
||||||
scc::memory<32_kB, scc::LT> mem_ram {"mem_ram"};
|
scc::memory<32_kB, scc::LT> main_ram {"main_ram"};
|
||||||
|
|
||||||
sc_core::sc_signal<bool, sc_core::SC_MANY_WRITERS> rst_s{"rst_s"}, mtime_int_s{"mtime_int_s"}, msip_int_s{"msip_int_s"};
|
sc_core::sc_signal<bool, sc_core::SC_MANY_WRITERS> rst_s{"rst_s"}, mtime_int_s{"mtime_int_s"}, msip_int_s{"msip_int_s"};
|
||||||
|
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit fd303c83436fabe397af73686abd0d1158de27a3
|
Subproject commit 24449f1c0f113e3692f9845e80dedaaf95e43161
|
2
vpvper
2
vpvper
|
@ -1 +1 @@
|
||||||
Subproject commit c7453a4fc3e7eb1e9c52a168f847e36c625fe7cc
|
Subproject commit 021f845cfe32fdd0cbb44d9d2c68d2bb334cccf9
|
Loading…
Reference in New Issue