From e7cd73db41ba056ed4b27731c21a3b2aa53eaa51 Mon Sep 17 00:00:00 2001
From: Dimitris Lampridis <Dimitris.Lampridis@cern.ch>
Date: Mon, 19 Mar 2018 14:55:29 +0100
Subject: [PATCH] hdl: Eradicate INT from wishbone records and peripheral
ports.
---
hdl/gn4124core/rtl/spartan6/gn4124_core.vhd | 4 +---
hdl/gn4124core/rtl/spartan6/gn4124_core_pkg.vhd | 4 +---
hdl/gn4124core/rtl/wbmaster32.vhd | 3 +--
hdl/spec/ip_cores/general-cores | 2 +-
4 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/hdl/gn4124core/rtl/spartan6/gn4124_core.vhd b/hdl/gn4124core/rtl/spartan6/gn4124_core.vhd
index e0cc8ca..e4154a1 100644
--- a/hdl/gn4124core/rtl/spartan6/gn4124_core.vhd
+++ b/hdl/gn4124core/rtl/spartan6/gn4124_core.vhd
@@ -126,7 +126,6 @@ entity gn4124_core is
csr_stall_i : in std_logic;
csr_err_i : in std_logic := '0';
csr_rty_i : in std_logic := '0'; -- not used internally
- csr_int_i : in std_logic := '0'; -- not used internally
---------------------------------------------------------
-- DMA wishbone interface (master pipelined)
@@ -563,8 +562,7 @@ begin
wb_ack_i => csr_ack_i,
wb_stall_i => csr_stall_i,
wb_err_i => csr_err_i,
- wb_rty_i => csr_rty_i,
- wb_int_i => csr_int_i
+ wb_rty_i => csr_rty_i
);
-- Adapt address bus width for top level
diff --git a/hdl/gn4124core/rtl/spartan6/gn4124_core_pkg.vhd b/hdl/gn4124core/rtl/spartan6/gn4124_core_pkg.vhd
index 90d9445..37411e9 100644
--- a/hdl/gn4124core/rtl/spartan6/gn4124_core_pkg.vhd
+++ b/hdl/gn4124core/rtl/spartan6/gn4124_core_pkg.vhd
@@ -143,7 +143,6 @@ package gn4124_core_pkg is
csr_stall_i : in std_logic;
csr_err_i : in std_logic := '0';
csr_rty_i : in std_logic := '0';
- csr_int_i : in std_logic := '0';
---------------------------------------------------------
-- DMA wishbone interface (master pipelined)
@@ -317,8 +316,7 @@ package gn4124_core_pkg is
wb_ack_i : in std_logic; -- Acknowledge
wb_stall_i : in std_logic; -- Stall
wb_err_i : in std_logic; -- Error
- wb_rty_i : in std_logic; -- Retry
- wb_int_i : in std_logic -- Interrupt
+ wb_rty_i : in std_logic -- Retry
);
end component; -- wbmaster32
diff --git a/hdl/gn4124core/rtl/wbmaster32.vhd b/hdl/gn4124core/rtl/wbmaster32.vhd
index f07e3ca..c4dd751 100644
--- a/hdl/gn4124core/rtl/wbmaster32.vhd
+++ b/hdl/gn4124core/rtl/wbmaster32.vhd
@@ -106,8 +106,7 @@ entity wbmaster32 is
wb_ack_i : in std_logic; -- Acknowledge
wb_stall_i : in std_logic; -- Stall
wb_err_i : in std_logic; -- Error
- wb_rty_i : in std_logic; -- Retry
- wb_int_i : in std_logic -- Interrupt
+ wb_rty_i : in std_logic -- Retry
);
end wbmaster32;
diff --git a/hdl/spec/ip_cores/general-cores b/hdl/spec/ip_cores/general-cores
index bd7bca1..61ca3f4 160000
--- a/hdl/spec/ip_cores/general-cores
+++ b/hdl/spec/ip_cores/general-cores
@@ -1 +1 @@
-Subproject commit bd7bca1cfb18346c2f4d42f7b5d94a79d7657117
+Subproject commit 61ca3f49b61233e922f4c2c034e1b62728c124bf
--
GitLab