Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
F
FMC DEL 1ns 4cha
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
2
Issues
2
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
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
FMC DEL 1ns 4cha
Commits
3df0b32d
Commit
3df0b32d
authored
Mar 17, 2021
by
Federico Vaga
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'release/v3.0.8' into master
parents
dc471ac5
a26f0d6f
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
15 additions
and
10 deletions
+15
-10
.gitmodules
.gitmodules
+0
-3
CHANGELOG.rst
CHANGELOG.rst
+8
-0
svec
hdl/ip_cores/svec
+1
-1
svec_fine_delay_top.vhd
hdl/top/svec/svec_fine_delay_top.vhd
+2
-2
fmc-fine-delay-svec-core.c
software/kernel/fmc-fine-delay-svec-core.c
+4
-4
No files found.
.gitmodules
View file @
3df0b32d
...
...
@@ -16,9 +16,6 @@
[submodule "hdl/ip_cores/ddr3-sp6-core"]
path = hdl/ip_cores/ddr3-sp6-core
url = https://ohwr.org/project/ddr3-sp6-core.git
[submodule "vme64x-core"]
path = hdl/ip_cores/vme64x-core
url = https://ohwr.org/project/vme64x-core.git
[submodule "hdl/ip_cores/svec"]
path = hdl/ip_cores/svec
url = https://ohwr.org/project/svec.git
...
...
CHANGELOG.rst
View file @
3df0b32d
...
...
@@ -6,6 +6,14 @@
Changelog
=========
3.0.8 - 2021-03-17
==================
Changed
-------
- hdl: svec-base updated to 2.0, for the FD there are no incompatible changes
- sw,hdl: compact memory map [we know, do not ask]
3.0.7 - 2021-02-24
==================
...
...
svec
@
577b31c8
Subproject commit
7afd1ca9d7413b360f96ebacf6d976f13cadebe
1
Subproject commit
577b31c8b1dc530aa145a8a49ab10dff7e9483b
1
hdl/top/svec/svec_fine_delay_top.vhd
View file @
3df0b32d
...
...
@@ -303,7 +303,7 @@ architecture arch of svec_top is
constant
c_WB_SLAVE_FD1
:
integer
:
=
2
;
-- Convention metadata base address
constant
c_METADATA_ADDR
:
t_wishbone_address
:
=
x"0000_
2
000"
;
constant
c_METADATA_ADDR
:
t_wishbone_address
:
=
x"0000_
4
000"
;
-- Primary wishbone crossbar layout
constant
c_WB_LAYOUT_ADDR
:
...
...
@@ -414,7 +414,7 @@ begin -- architecture arch
generic
map
(
g_VENDOR_ID
=>
x"0000_10DC"
,
g_DEVICE_ID
=>
x"574f_0002"
,
-- SVEC + 2xFineDelay
g_VERSION
=>
x"0300_000
4
"
,
g_VERSION
=>
x"0300_000
8
"
,
g_CAPABILITIES
=>
x"0000_0000"
,
g_COMMIT_ID
=>
sourceid_svec_fine_delay_top_pkg
.
sourceid
)
port
map
(
...
...
software/kernel/fmc-fine-delay-svec-core.c
View file @
3df0b32d
...
...
@@ -10,10 +10,10 @@
#include <linux/fmc.h>
enum
fd_svec_dev_offsets
{
FD_SVEC_FDT1_MEM_START
=
0x0000
E
000
,
FD_SVEC_FDT1_MEM_END
=
0x0000
E
1FF
,
FD_SVEC_FDT2_MEM_START
=
0x0001
E
000
,
FD_SVEC_FDT2_MEM_END
=
0x0001
E
1FF
,
FD_SVEC_FDT1_MEM_START
=
0x0000
C
000
,
FD_SVEC_FDT1_MEM_END
=
0x0000
C
1FF
,
FD_SVEC_FDT2_MEM_START
=
0x0001
C
000
,
FD_SVEC_FDT2_MEM_END
=
0x0001
C
1FF
,
};
/* MFD devices */
...
...
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