colin
/
Hazard3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Small code cleanup

This commit is contained in:
Luke Wren 2021-07-24 10:08:27 +01:00
parent 2b1dee4bcc
commit 70a44d9681
3 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
example_soc/icebreaker-openocd.cfg
View File

@ -1,8 +1,8 @@
adapter driver ftdi
# 30 MHz -- a bit exciting but it seems reliable
adapter speed 3000
# ftdi_tdo_sample_edge falling
adapter speed 30000
ftdi_tdo_sample_edge falling
# JTAG is on FTDI B channel so it doesn't inadvertently assert flash CS pin
# (usually UART would be on the B channel).

2
example_soc/soc/example_soc.v
View File

@ -327,7 +327,7 @@ wire [W_DATA-1:0] bridge_hrdata;
ahbl_splitter #(
.N_PORTS (2),
.ADDR_MAP (64'h40000000_20000000),
.ADDR_MAP (64'h40000000_00000000),
.ADDR_MASK (64'he0000000_e0000000)
) splitter_u (
.clk (clk),

13
hdl/debug/dtm/hazard3_ecp5_jtag_dtm.v
View File

@ -115,23 +115,14 @@ always @ (posedge jtck or negedge jrst_n) begin
core_dr_ren <= 1'b0;
dr_shift_en <= 1'b0;
end else begin
core_dr_sel_dmi_ndtmcs <= jce1 ? 1'b0 : jce2 ? 1'b1 : dr_sel_prev;
if (jce1 || jce2)
core_dr_sel_dmi_ndtmcs <= jce2;
core_dr_ren <= (jce1 || jce2) && !jshift;
core_dr_wen <= jupdate;
dr_shift_en <= jshift;
end
end
reg dr_sel_prev;
always @ (posedge jtck or negedge jrst_n) begin
if (!jrst_n) begin
dr_sel_prev <= 1'b0;
end else begin
dr_sel_prev <= core_dr_sel_dmi_ndtmcs;
end
end
reg [W_DR_SHIFT-1:0] dr_shift;
assign core_dr_wdata = dr_shift;