Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
W
White Rabbit core collection
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
30
Issues
30
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Schedules
Wiki
Wiki
image/svg+xml
Discourse
Discourse
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Projects
White Rabbit core collection
Commits
c96b4047
Commit
c96b4047
authored
Sep 16, 2020
by
Grzegorz Daniluk
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wrc_core: swap aux WB and diags in secondary crossbar
parent
d1d1cc49
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
34 deletions
+17
-34
wr_core.vhd
modules/wrc_core/wr_core.vhd
+17
-34
No files found.
modules/wrc_core/wr_core.vhd
View file @
c96b4047
...
...
@@ -440,8 +440,8 @@ architecture struct of wr_core is
4
=>
f_sdb_embed_device
(
c_wrc_periph0_sdb
,
x"00000400"
),
-- Syscon
5
=>
f_sdb_embed_device
(
c_wrc_periph1_sdb
,
x"00000500"
),
-- UART
6
=>
f_sdb_embed_device
(
c_wrc_periph2_sdb
,
x"00000600"
),
-- 1-Wire
7
=>
f_sdb_embed_device
(
g_aux_sdb
,
x"00008000"
),
-- aux WB bu
s
8
=>
f_sdb_embed_device
(
c_wrc_periph4_sdb
,
x"00000800"
)
-- WRPC diag register
s
7
=>
f_sdb_embed_device
(
c_wrc_periph4_sdb
,
x"00000800"
),
-- WRPC diag register
s
8
=>
f_sdb_embed_device
(
g_aux_sdb
,
x"00008000"
)
-- aux WB bu
s
);
constant
c_secbar_sdb_address
:
t_wishbone_address
:
=
x"00000C00"
;
...
...
@@ -1091,43 +1091,26 @@ begin
secbar_master_i
(
4
)
<=
periph_slave_o
(
0
);
secbar_master_i
(
5
)
<=
periph_slave_o
(
1
);
secbar_master_i
(
6
)
<=
periph_slave_o
(
2
);
secbar_master_i
(
8
)
<=
periph_slave_o
(
3
);
secbar_master_i
(
7
)
<=
periph_slave_o
(
3
);
periph_slave_i
(
0
)
<=
secbar_master_o
(
4
);
periph_slave_i
(
1
)
<=
secbar_master_o
(
5
);
periph_slave_i
(
2
)
<=
secbar_master_o
(
6
);
periph_slave_i
(
3
)
<=
secbar_master_o
(
8
);
aux_adr_o
<=
secbar_master_o
(
7
)
.
adr
;
aux_dat_o
<=
secbar_master_o
(
7
)
.
dat
;
aux_sel_o
<=
secbar_master_o
(
7
)
.
sel
;
aux_cyc_o
<=
secbar_master_o
(
7
)
.
cyc
;
aux_stb_o
<=
secbar_master_o
(
7
)
.
stb
;
aux_we_o
<=
secbar_master_o
(
7
)
.
we
;
secbar_master_i
(
7
)
.
dat
<=
aux_dat_i
;
secbar_master_i
(
7
)
.
ack
<=
aux_ack_i
;
secbar_master_i
(
7
)
.
stall
<=
aux_stall_i
;
secbar_master_i
(
7
)
.
err
<=
'0'
;
secbar_master_i
(
7
)
.
rty
<=
'0'
;
--secbar_master_i(6).err <= '0';
--secbar_master_i(5).err <= '0';
--secbar_master_i(4).err <= '0';
--secbar_master_i(3).err <= '0';
--secbar_master_i(2).err <= '0';
--secbar_master_i(1).err <= '0';
--secbar_master_i(0).err <= '0';
--secbar_master_i(6).rty <= '0';
--secbar_master_i(5).rty <= '0';
--secbar_master_i(4).rty <= '0';
--secbar_master_i(3).rty <= '0';
--secbar_master_i(2).rty <= '0';
--secbar_master_i(1).rty <= '0';
--secbar_master_i(0).rty <= '0';
periph_slave_i
(
3
)
<=
secbar_master_o
(
7
);
aux_adr_o
<=
secbar_master_o
(
8
)
.
adr
;
aux_dat_o
<=
secbar_master_o
(
8
)
.
dat
;
aux_sel_o
<=
secbar_master_o
(
8
)
.
sel
;
aux_cyc_o
<=
secbar_master_o
(
8
)
.
cyc
;
aux_stb_o
<=
secbar_master_o
(
8
)
.
stb
;
aux_we_o
<=
secbar_master_o
(
8
)
.
we
;
secbar_master_i
(
8
)
.
dat
<=
aux_dat_i
;
secbar_master_i
(
8
)
.
ack
<=
aux_ack_i
;
secbar_master_i
(
8
)
.
stall
<=
aux_stall_i
;
secbar_master_i
(
8
)
.
err
<=
'0'
;
secbar_master_i
(
8
)
.
rty
<=
'0'
;
-----------------------------------------------------------------------------
-- WBP MUX
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment