From b2afa77d746f68addda1c8b8aa4331413544bd59 Mon Sep 17 00:00:00 2001
From: Eric Kooistra <kooistra@astron.nl>
Date: Wed, 4 May 2022 13:49:52 +0200
Subject: [PATCH] Renamed c_tech_arria10 into c_tech_arria10_proto to more
easily find it with e.g. grep.
---
.../technology/ip_arria10/eth_10g/ip_arria10_eth_10g.vhd | 8 ++++----
.../ip_arria10_e1sg/eth_10g/ip_arria10_e1sg_eth_10g.vhd | 2 +-
.../ip_arria10_e2sg/eth_10g/ip_arria10_e2sg_eth_10g.vhd | 2 +-
.../eth_10g/ip_arria10_e3sge3_eth_10g.vhd | 2 +-
libraries/technology/mac_10g/tech_mac_10g_arria10.vhd | 2 +-
.../technology/mac_10g/tech_mac_10g_arria10_e1sg.vhd | 2 +-
.../technology/mac_10g/tech_mac_10g_arria10_e2sg.vhd | 2 +-
.../technology/mac_10g/tech_mac_10g_arria10_e3sge3.vhd | 2 +-
libraries/technology/technology_select_pkg.vhd | 3 ---
libraries/technology/technology_select_pkg_unb1.vhd | 5 +----
libraries/technology/technology_select_pkg_unb2b.vhd | 5 +----
libraries/technology/technology_select_pkg_unb2c.vhd | 5 +----
12 files changed, 14 insertions(+), 26 deletions(-)
diff --git a/libraries/technology/ip_arria10/eth_10g/ip_arria10_eth_10g.vhd b/libraries/technology/ip_arria10/eth_10g/ip_arria10_eth_10g.vhd
index 9c2474c773..2b52096438 100644
--- a/libraries/technology/ip_arria10/eth_10g/ip_arria10_eth_10g.vhd
+++ b/libraries/technology/ip_arria10/eth_10g/ip_arria10_eth_10g.vhd
@@ -21,7 +21,7 @@
--------------------------------------------------------------------------------
--- Purpose: Combine mac_10g and 10gbase_r for c_tech_arria10
+-- Purpose: Combine mac_10g and 10gbase_r for c_tech_arria10_proto
-- Description
--
-- The clocks come from an external central fPLL:
@@ -193,7 +193,7 @@ BEGIN
u_tech_mac_10g : ENTITY tech_mac_10g_lib.tech_mac_10g
GENERIC MAP (
- g_technology => c_tech_arria10,
+ g_technology => c_tech_arria10_proto,
g_pre_header_padding => g_pre_header_padding
)
PORT MAP (
@@ -227,7 +227,7 @@ BEGIN
u_tech_10gbase_r: ENTITY tech_10gbase_r_lib.tech_10gbase_r
GENERIC MAP (
- g_technology => c_tech_arria10,
+ g_technology => c_tech_arria10_proto,
g_sim => g_sim,
g_sim_level => g_sim_level,
g_nof_channels => g_nof_channels
@@ -290,7 +290,7 @@ BEGIN
u_common_mem_mux_mac : ENTITY common_lib.common_mem_mux
GENERIC MAP (
g_nof_mosi => g_nof_channels,
- g_mult_addr_w => func_tech_mac_10g_csr_addr_w(c_tech_arria10)
+ g_mult_addr_w => func_tech_mac_10g_csr_addr_w(c_tech_arria10_proto)
)
PORT MAP (
mosi => mac_mosi,
diff --git a/libraries/technology/ip_arria10_e1sg/eth_10g/ip_arria10_e1sg_eth_10g.vhd b/libraries/technology/ip_arria10_e1sg/eth_10g/ip_arria10_e1sg_eth_10g.vhd
index c840de488e..a3af9d8892 100644
--- a/libraries/technology/ip_arria10_e1sg/eth_10g/ip_arria10_e1sg_eth_10g.vhd
+++ b/libraries/technology/ip_arria10_e1sg/eth_10g/ip_arria10_e1sg_eth_10g.vhd
@@ -310,7 +310,7 @@ BEGIN
u_common_mem_mux_mac : ENTITY common_lib.common_mem_mux
GENERIC MAP (
g_nof_mosi => g_nof_channels,
- g_mult_addr_w => func_tech_mac_10g_csr_addr_w(c_tech_arria10)
+ g_mult_addr_w => func_tech_mac_10g_csr_addr_w(c_tech_arria10_e1sg)
)
PORT MAP (
mosi => mac_mosi,
diff --git a/libraries/technology/ip_arria10_e2sg/eth_10g/ip_arria10_e2sg_eth_10g.vhd b/libraries/technology/ip_arria10_e2sg/eth_10g/ip_arria10_e2sg_eth_10g.vhd
index 85914052e6..cdb3620492 100644
--- a/libraries/technology/ip_arria10_e2sg/eth_10g/ip_arria10_e2sg_eth_10g.vhd
+++ b/libraries/technology/ip_arria10_e2sg/eth_10g/ip_arria10_e2sg_eth_10g.vhd
@@ -310,7 +310,7 @@ BEGIN
u_common_mem_mux_mac : ENTITY common_lib.common_mem_mux
GENERIC MAP (
g_nof_mosi => g_nof_channels,
- g_mult_addr_w => func_tech_mac_10g_csr_addr_w(c_tech_arria10)
+ g_mult_addr_w => func_tech_mac_10g_csr_addr_w(c_tech_arria10_e2sg)
)
PORT MAP (
mosi => mac_mosi,
diff --git a/libraries/technology/ip_arria10_e3sge3/eth_10g/ip_arria10_e3sge3_eth_10g.vhd b/libraries/technology/ip_arria10_e3sge3/eth_10g/ip_arria10_e3sge3_eth_10g.vhd
index c1e19809c2..0ea7f65859 100644
--- a/libraries/technology/ip_arria10_e3sge3/eth_10g/ip_arria10_e3sge3_eth_10g.vhd
+++ b/libraries/technology/ip_arria10_e3sge3/eth_10g/ip_arria10_e3sge3_eth_10g.vhd
@@ -300,7 +300,7 @@ BEGIN
u_common_mem_mux_mac : ENTITY common_lib.common_mem_mux
GENERIC MAP (
g_nof_mosi => g_nof_channels,
- g_mult_addr_w => func_tech_mac_10g_csr_addr_w(c_tech_arria10)
+ g_mult_addr_w => func_tech_mac_10g_csr_addr_w(c_tech_arria10_e3sge3)
)
PORT MAP (
mosi => mac_mosi,
diff --git a/libraries/technology/mac_10g/tech_mac_10g_arria10.vhd b/libraries/technology/mac_10g/tech_mac_10g_arria10.vhd
index b91cbb6a47..66d4f1f7fd 100644
--- a/libraries/technology/mac_10g/tech_mac_10g_arria10.vhd
+++ b/libraries/technology/mac_10g/tech_mac_10g_arria10.vhd
@@ -63,7 +63,7 @@ END tech_mac_10g_arria10;
ARCHITECTURE str OF tech_mac_10g_arria10 IS
- CONSTANT c_mac_10g_csr_addr_w : NATURAL := func_tech_mac_10g_csr_addr_w(c_tech_arria10); -- = 13
+ CONSTANT c_mac_10g_csr_addr_w : NATURAL := func_tech_mac_10g_csr_addr_w(c_tech_arria10_proto); -- = 13
SIGNAL mm_rst_n : STD_LOGIC;
SIGNAL tx_rst_n : STD_LOGIC;
diff --git a/libraries/technology/mac_10g/tech_mac_10g_arria10_e1sg.vhd b/libraries/technology/mac_10g/tech_mac_10g_arria10_e1sg.vhd
index 2acea7c3c2..9583c3522c 100644
--- a/libraries/technology/mac_10g/tech_mac_10g_arria10_e1sg.vhd
+++ b/libraries/technology/mac_10g/tech_mac_10g_arria10_e1sg.vhd
@@ -63,7 +63,7 @@ END tech_mac_10g_arria10_e1sg;
ARCHITECTURE str OF tech_mac_10g_arria10_e1sg IS
- CONSTANT c_mac_10g_csr_addr_w : NATURAL := func_tech_mac_10g_csr_addr_w(c_tech_arria10); -- = 13
+ CONSTANT c_mac_10g_csr_addr_w : NATURAL := func_tech_mac_10g_csr_addr_w(c_tech_arria10_e1sg); -- = 13
SIGNAL mm_rst_n : STD_LOGIC;
SIGNAL tx_rst_n : STD_LOGIC;
diff --git a/libraries/technology/mac_10g/tech_mac_10g_arria10_e2sg.vhd b/libraries/technology/mac_10g/tech_mac_10g_arria10_e2sg.vhd
index f7a598b09f..aa139fa18a 100644
--- a/libraries/technology/mac_10g/tech_mac_10g_arria10_e2sg.vhd
+++ b/libraries/technology/mac_10g/tech_mac_10g_arria10_e2sg.vhd
@@ -63,7 +63,7 @@ END tech_mac_10g_arria10_e2sg;
ARCHITECTURE str OF tech_mac_10g_arria10_e2sg IS
- CONSTANT c_mac_10g_csr_addr_w : NATURAL := func_tech_mac_10g_csr_addr_w(c_tech_arria10); -- = 13
+ CONSTANT c_mac_10g_csr_addr_w : NATURAL := func_tech_mac_10g_csr_addr_w(c_tech_arria10_e2sg); -- = 13
SIGNAL mm_rst_n : STD_LOGIC;
SIGNAL tx_rst_n : STD_LOGIC;
diff --git a/libraries/technology/mac_10g/tech_mac_10g_arria10_e3sge3.vhd b/libraries/technology/mac_10g/tech_mac_10g_arria10_e3sge3.vhd
index ae3eb9657a..6327dad72c 100644
--- a/libraries/technology/mac_10g/tech_mac_10g_arria10_e3sge3.vhd
+++ b/libraries/technology/mac_10g/tech_mac_10g_arria10_e3sge3.vhd
@@ -63,7 +63,7 @@ END tech_mac_10g_arria10_e3sge3;
ARCHITECTURE str OF tech_mac_10g_arria10_e3sge3 IS
- CONSTANT c_mac_10g_csr_addr_w : NATURAL := func_tech_mac_10g_csr_addr_w(c_tech_arria10); -- = 13
+ CONSTANT c_mac_10g_csr_addr_w : NATURAL := func_tech_mac_10g_csr_addr_w(c_tech_arria10_e3sge3); -- = 13
SIGNAL mm_rst_n : STD_LOGIC;
SIGNAL tx_rst_n : STD_LOGIC;
diff --git a/libraries/technology/technology_select_pkg.vhd b/libraries/technology/technology_select_pkg.vhd
index a0f1f68ebf..2771342260 100644
--- a/libraries/technology/technology_select_pkg.vhd
+++ b/libraries/technology/technology_select_pkg.vhd
@@ -31,8 +31,5 @@ USE work.technology_pkg.ALL;
PACKAGE technology_select_pkg IS
CONSTANT c_tech_select_default : INTEGER := c_tech_stratixiv;
- --CONSTANT c_tech_select_default : INTEGER := c_tech_arria10;
- --CONSTANT c_tech_select_default : INTEGER := c_tech_arria10_e3sge3;
- --CONSTANT c_tech_select_default : INTEGER := c_tech_arria10_e1sg;
END technology_select_pkg;
diff --git a/libraries/technology/technology_select_pkg_unb1.vhd b/libraries/technology/technology_select_pkg_unb1.vhd
index 430ecaccbc..2771342260 100644
--- a/libraries/technology/technology_select_pkg_unb1.vhd
+++ b/libraries/technology/technology_select_pkg_unb1.vhd
@@ -30,9 +30,6 @@ USE work.technology_pkg.ALL;
PACKAGE technology_select_pkg IS
- CONSTANT c_tech_select_default : INTEGER := c_tech_stratixiv;
- --CONSTANT c_tech_select_default : INTEGER := c_tech_arria10;
- --CONSTANT c_tech_select_default : INTEGER := c_tech_arria10_e3sge3;
- --CONSTANT c_tech_select_default : INTEGER := c_tech_arria10_e1sg;
+ CONSTANT c_tech_select_default : INTEGER := c_tech_stratixiv;
END technology_select_pkg;
diff --git a/libraries/technology/technology_select_pkg_unb2b.vhd b/libraries/technology/technology_select_pkg_unb2b.vhd
index c917c75add..ea1dbe6775 100644
--- a/libraries/technology/technology_select_pkg_unb2b.vhd
+++ b/libraries/technology/technology_select_pkg_unb2b.vhd
@@ -30,9 +30,6 @@ USE work.technology_pkg.ALL;
PACKAGE technology_select_pkg IS
- --CONSTANT c_tech_select_default : INTEGER := c_tech_stratixiv;
- --CONSTANT c_tech_select_default : INTEGER := c_tech_arria10;
- --CONSTANT c_tech_select_default : INTEGER := c_tech_arria10_e3sge3;
- CONSTANT c_tech_select_default : INTEGER := c_tech_arria10_e1sg;
+ CONSTANT c_tech_select_default : INTEGER := c_tech_arria10_e1sg;
END technology_select_pkg;
diff --git a/libraries/technology/technology_select_pkg_unb2c.vhd b/libraries/technology/technology_select_pkg_unb2c.vhd
index 90c39c8ce2..97a93feecc 100644
--- a/libraries/technology/technology_select_pkg_unb2c.vhd
+++ b/libraries/technology/technology_select_pkg_unb2c.vhd
@@ -30,9 +30,6 @@ USE work.technology_pkg.ALL;
PACKAGE technology_select_pkg IS
- --CONSTANT c_tech_select_default : INTEGER := c_tech_stratixiv;
- --CONSTANT c_tech_select_default : INTEGER := c_tech_arria10;
- --CONSTANT c_tech_select_default : INTEGER := c_tech_arria10_e3sge3;
- CONSTANT c_tech_select_default : INTEGER := c_tech_arria10_e2sg;
+ CONSTANT c_tech_select_default : INTEGER := c_tech_arria10_e2sg;
END technology_select_pkg;
--
GitLab