Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
X
x393
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
Elphel
x393
Commits
bb5dabda
Commit
bb5dabda
authored
Aug 01, 2016
by
Andrey Filippov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Changed interrupt lines
parent
a7abc965
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
14 additions
and
11 deletions
+14
-11
com.elphel.vdt.VivadoBitstream.prefs
.settings/com.elphel.vdt.VivadoBitstream.prefs
+1
-1
VERSION
VERSION
+1
-1
fpga_version.vh
fpga_version.vh
+3
-1
system_defines.vh
system_defines.vh
+1
-1
x393.v
x393.v
+8
-7
x393_hispi.bit
x393_hispi.bit
+0
-0
x393_parallel.bit
x393_parallel.bit
+0
-0
No files found.
.settings/com.elphel.vdt.VivadoBitstream.prefs
View file @
bb5dabda
VivadoBitstream_@_PreBitstreamTCL=set_property BITSTREAM.STARTUP.MATCH_CYCLE NoWait [current_design]<-@\#\#@->
VivadoBitstream_@_force=true
VivadoBitstream_@_rawfile=x393_
parallel
VivadoBitstream_@_rawfile=x393_
hispi
com.elphel.store.context.VivadoBitstream=VivadoBitstream_@_rawfile<-@\#\#@->VivadoBitstream_@_force<-@\#\#@->VivadoBitstream_@_PreBitstreamTCL<-@\#\#@->
eclipse.preferences.version=1
VERSION
View file @
bb5dabda
...
...
@@ -4,4 +4,4 @@
# a. 3
# b. 3.2 (preferred)
# c. 3.2.4
1.16
0
1.16
1
fpga_version.vh
View file @
bb5dabda
...
...
@@ -35,7 +35,9 @@
* contains all the components and scripts required to completely simulate it
* with at least one of the Free Software programs.
*/
parameter FPGA_VERSION = 32'h039300a0; // parallel, else same as 9f 78.91%, not met by -0.032
parameter FPGA_VERSION = 32'h039300a1; // hispi 81.19%, not met by -0.07
// parameter FPGA_VERSION = 32'h039300a0; // parallel, re-ran after bug fix, %79.38%, not met -0.072
// parameter FPGA_VERSION = 32'h039300a0; // parallel, else same as 9f 78.91%, not met by -0.032
// parameter FPGA_VERSION = 32'h0393009f; // hispi, adding IRQ status register (placemnt "explore") 81.36%, all met
// parameter FPGA_VERSION = 32'h0393009e; // hispi, adding IRQ status register 80.90%, timing failed by -0.218
// parameter FPGA_VERSION = 32'h0393009d; // hispi, adding IRQ from multi_saxi 80.95%, timing not met (-0.034 )
...
...
system_defines.vh
View file @
bb5dabda
...
...
@@ -63,7 +63,7 @@
`define PRELOAD_BRAMS
`define DISPLAY_COMPRESSED_DATA
// if HISPI is not defined, parallel sensor interface is used for all channels
//
`define HISPI /*************** CHANGE here and x393_hispi/x393_parallel in bitstream tool settings ****************/
`define HISPI /*************** CHANGE here and x393_hispi/x393_parallel in bitstream tool settings ****************/
// `define USE_OLD_XDCT393
// `define USE_PCLK2X
// `define USE_XCLK2X
...
...
x393.v
View file @
bb5dabda
...
...
@@ -2951,13 +2951,14 @@ sata_ahci_top sata_top(
.
DMA3DATYPE
()
,
// DMAC 3 DMA Ackbowledge TYpe (completed single AXI, completed burst AXI, flush request), output
.
DMA3RSTN
()
,
// DMAC 3 RESET output (reserved, do not use), output
// Interrupt signals
.
IRQF2P
(
{
mult_saxi_irq
[
3
:
0
]
,
// [19:16] interrupts from mult_saxi channels
cmprs_irq
[
3
:
0
]
,
// [15:12] Compressor done interrupts
frseq_irq
[
3
:
0
]
,
// [11: 8] Frame sync interrupts
7'b0
,
sata_irq
// Put AHCI (SATA ) interrupt
}
)
,
// Interrupts, OL to PS [19:0], input
.
IRQP2F
()
,
// Interrupts, OL to PS [28:0], output
.
IRQF2P
(
{
4'b0
,
// [19:16] Reserved PPI: nFIQ, nIRQ (both CPUs)
cmprs_irq
[
3
:
0
]
,
// [15:12] Compressor done interrupts SPI: Numbers [91:88]
frseq_irq
[
3
:
0
]
,
// [11: 8] Frame sync interrupts SPI: Numbers [87:84]
mult_saxi_irq
[
3
:
0
]
,
// [ 7: 4] interrupts from mult_saxi channels SPI: Numbers [68:65]
3'b0
,
// [ 3: 1] Reserved SPI: Numbers [65:63]
sata_irq
// [ 0] AHCI (SATA ) interrupt SPI: Number [62]
}
)
,
// Interrupts, PL to PS [19:0], input
.
IRQP2F
()
,
// Interrupts, PL to PS [28:0], output
// Event Signals
.
EVENTEVENTI
()
,
// EVENT Wake up one or both CPU from WFE state, input
.
EVENTEVENTO
()
,
// EVENT Asserted when one of the COUs executed SEV instruction, output
...
...
x393_hispi.bit
View file @
bb5dabda
No preview for this file type
x393_parallel.bit
View file @
bb5dabda
No preview for this file type
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