Skip to content

Commit

Permalink
⚠️ [top] remove fence signals
Browse files Browse the repository at this point in the history
  • Loading branch information
@stnolting
stnolting committed Feb 9, 2024
1 parent 48566cd commit 7e7e360
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 36 deletions.
23 changes: 4 additions & 19 deletions rtl/core/neorv32_top.vhd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,11 +186,7 @@ entity neorv32_top is
slink_rx_rdy_o : out std_ulogic; -- RX ready to receive
slink_tx_dat_o : out std_ulogic_vector(31 downto 0); -- TX output data
slink_tx_val_o : out std_ulogic; -- TX valid output
slink_tx_rdy_i : in std_ulogic := 'L'; -- TX ready to send

-- Advanced memory control signals --
fence_o : out std_ulogic; -- indicates an executed FENCE operation
fencei_o : out std_ulogic; -- indicates an executed FENCEI operation
slink_tx_rdy_i : in std_ulogic := 'L'; -- TX ready to send

-- XIP (execute in place via SPI) signals (available if XIP_EN = true) --
xip_csn_o : out std_ulogic; -- chip-select, low-active
Expand Down Expand Up @@ -298,10 +294,7 @@ architecture neorv32_top_rtl of neorv32_top is
signal cg_en : cg_en_t;

-- CPU status --
signal cpu_debug : std_ulogic; -- cpu is in debug mode
signal cpu_sleep : std_ulogic; -- cpu is in sleep mode
signal i_fence : std_ulogic; -- instruction fence
signal d_fence : std_ulogic; -- data fence
signal cpu_debug, cpu_sleep : std_ulogic; -- cpu is in debug/sleep mode

-- debug module interface (DMI) --
signal dmi_req : dmi_req_t;
Expand Down Expand Up @@ -358,8 +351,8 @@ begin

-- say hello --
assert false report
"The NEORV32 RISC-V Processor, " &
"version 0x" & to_hstring32_f(hw_version_c) & ", " &
"[NEORV32] The NEORV32 RISC-V Processor " &
"(version 0x" & to_hstring32_f(hw_version_c) & "), " &
"github.com/stnolting/neorv32" severity note;

-- show main SoC configuration --
Expand Down Expand Up @@ -556,8 +549,6 @@ begin
rstn_i => rstn_sys,
sleep_o => cpu_sleep,
debug_o => cpu_debug,
ifence_o => i_fence,
dfence_o => d_fence,
-- interrupts --
msi_i => msw_irq_i,
mei_i => mext_irq_i,
Expand All @@ -572,10 +563,6 @@ begin
dbus_rsp_i => cpu_d_rsp
);

-- advanced memory control --
fence_o <= d_fence;
fencei_o <= i_fence;

-- fast interrupt requests (FIRQs) --
cpu_firq(00) <= firq.wdt; -- highest priority
cpu_firq(01) <= firq.cfs;
Expand Down Expand Up @@ -609,7 +596,6 @@ begin
port map (
clk_i => clk_cpu,
rstn_i => rstn_sys,
clear_i => i_fence,
cpu_req_i => cpu_i_req,
cpu_rsp_o => cpu_i_rsp,
bus_req_o => icache_req,
Expand Down Expand Up @@ -637,7 +623,6 @@ begin
port map (
clk_i => clk_cpu,
rstn_i => rstn_sys,
clear_i => d_fence,
cpu_req_i => cpu_d_req,
cpu_rsp_o => cpu_d_rsp,
bus_req_o => dcache_req,
Expand Down
8 changes: 0 additions & 8 deletions rtl/system_integration/neorv32_SystemTop_AvalonMM.vhd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,10 +151,6 @@ entity neorv32_top_avalonmm is
writedata_o : out std_logic_vector(31 downto 0);
readdata_i : in std_logic_vector(31 downto 0) := (others => '0');

-- Advanced memory control signals (available if MEM_EXT_EN = true) --
fence_o : out std_ulogic; -- indicates an executed FENCE operation
fencei_o : out std_ulogic; -- indicates an executed FENCEI operation

-- XIP (execute in place via SPI) signals (available if IO_XIP_EN = true) --
xip_csn_o : out std_ulogic; -- chip-select, low-active
xip_clk_o : out std_ulogic; -- serial clock
Expand Down Expand Up @@ -350,10 +346,6 @@ begin
wb_ack_i => wb_ack_i,
wb_err_i => wb_err_i,

-- Advanced memory control signals (available if MEM_EXT_EN = true) --
fence_o => fence_o,
fencei_o => fencei_o,

-- XIP (execute in place via SPI) signals (available if IO_XIP_EN = true) --
xip_csn_o => xip_csn_o,
xip_clk_o => xip_clk_o,
Expand Down
3 changes: 0 additions & 3 deletions rtl/system_integration/neorv32_SystemTop_axi4lite.vhd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -458,9 +458,6 @@ begin
slink_tx_dat_o => s0_axis_tdata_int, -- TX output data
slink_tx_val_o => s0_axis_tvalid_int, -- TX valid output
slink_tx_rdy_i => s0_axis_tready_int, -- TX ready to send
-- Advanced memory control signals (available if MEM_EXT_EN = true) --
fence_o => open, -- indicates an executed FENCE operation
fencei_o => open, -- indicates an executed FENCEI operation
-- XIP (execute in place via SPI) signals (available if IO_XIP_EN = true) --
xip_csn_o => xip_csn_o_int, -- chip-select, low-active
xip_clk_o => xip_clk_o_int, -- serial clock
Expand Down
3 changes: 0 additions & 3 deletions sim/neorv32_tb.vhd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -336,9 +336,6 @@ begin
slink_tx_dat_o => slink_dat, -- TX output data
slink_tx_val_o => slink_val, -- TX valid output
slink_tx_rdy_i => slink_rdy, -- TX ready to send
-- Advanced memory control signals (available if MEM_EXT_EN = true) --
fence_o => open, -- indicates an executed FENCE operation
fencei_o => open, -- indicates an executed FENCEI operation
-- XIP (execute in place via SPI) signals (available if XIP_EN = true) --
xip_csn_o => open, -- chip-select, low-active
xip_clk_o => open, -- serial clock
Expand Down
3 changes: 0 additions & 3 deletions sim/simple/neorv32_tb.simple.vhd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -284,9 +284,6 @@ begin
slink_tx_dat_o => slink_dat, -- TX output data
slink_tx_val_o => slink_val, -- TX valid output
slink_tx_rdy_i => slink_rdy, -- TX ready to send
-- Advanced memory control signals (available if MEM_EXT_EN = true) --
fence_o => open, -- indicates an executed FENCE operation
fencei_o => open, -- indicates an executed FENCEI operation
-- XIP (execute in place via SPI) signals (available if XIP_EN = true) --
xip_csn_o => open, -- chip-select, low-active
xip_clk_o => open, -- serial clock
Expand Down

0 comments on commit 7e7e360

Please sign in to comment.