From 6c7fa2fd115cc554d6d988b5d1e9aa1b42467309 Mon Sep 17 00:00:00 2001 From: wfjm Date: Sat, 4 May 2019 12:15:23 +0200 Subject: [PATCH] sys_conf: prepare for m9312 --- rtl/ibus/sys_conf.vhd | 6 ++++-- rtl/sys_gen/w11a/arty/sys_conf.vhd | 4 +++- rtl/sys_gen/w11a/arty/tb/sys_conf_sim.vhd | 4 +++- rtl/sys_gen/w11a/arty_bram/sys_conf.vhd | 4 +++- rtl/sys_gen/w11a/arty_bram/tb/sys_conf_sim.vhd | 4 +++- rtl/sys_gen/w11a/artys7/sys_conf.vhd | 4 +++- rtl/sys_gen/w11a/artys7/tb/sys_conf_sim.vhd | 4 +++- rtl/sys_gen/w11a/artys7_bram/sys_conf.vhd | 4 +++- rtl/sys_gen/w11a/artys7_bram/tb/sys_conf_sim.vhd | 4 +++- rtl/sys_gen/w11a/basys3/sys_conf.vhd | 4 +++- rtl/sys_gen/w11a/basys3/tb/sys_conf_sim.vhd | 4 +++- rtl/sys_gen/w11a/cmoda7/sys_conf.vhd | 4 +++- rtl/sys_gen/w11a/cmoda7/tb/sys_conf_sim.vhd | 4 +++- rtl/sys_gen/w11a/nexys2/sys_conf.vhd | 6 ++++-- rtl/sys_gen/w11a/nexys2/tb/sys_conf_sim.vhd | 6 ++++-- rtl/sys_gen/w11a/nexys3/sys_conf.vhd | 6 ++++-- rtl/sys_gen/w11a/nexys3/sys_w11a_n3.vhd | 3 ++- rtl/sys_gen/w11a/nexys3/tb/sys_conf_sim.vhd | 6 ++++-- rtl/sys_gen/w11a/nexys4/sys_conf.vhd | 4 +++- rtl/sys_gen/w11a/nexys4/sys_w11a_n4.vhd | 3 ++- rtl/sys_gen/w11a/nexys4/tb/sys_conf_sim.vhd | 4 +++- rtl/sys_gen/w11a/nexys4d/sys_conf.vhd | 4 +++- rtl/sys_gen/w11a/nexys4d/tb/sys_conf_sim.vhd | 4 +++- rtl/sys_gen/w11a/nexys4d_bram/sys_conf.vhd | 4 +++- rtl/sys_gen/w11a/nexys4d_bram/tb/sys_conf_sim.vhd | 4 +++- rtl/sys_gen/w11a/s3board/sys_conf.vhd | 6 ++++-- rtl/sys_gen/w11a/s3board/tb/sys_conf_sim.vhd | 6 ++++-- 27 files changed, 86 insertions(+), 34 deletions(-) diff --git a/rtl/ibus/sys_conf.vhd b/rtl/ibus/sys_conf.vhd index d8818a92..82a9960e 100644 --- a/rtl/ibus/sys_conf.vhd +++ b/rtl/ibus/sys_conf.vhd @@ -1,4 +1,4 @@ --- $Id: sys_conf.vhd 1111 2019-02-10 16:13:55Z mueller $ +-- $Id: sys_conf.vhd 1146 2019-05-05 06:25:13Z mueller $ -- -- Copyright 2015-2019 by Walter F.J. Mueller -- @@ -19,6 +19,7 @@ -- Tool versions: xst 14.7; viv 2014.4-2018.3; ghdl 0.18-0.35 -- Revision History: -- Date Rev Version Comment +-- 2019-05-04 1146 1.1.1 add sys_conf_ibd_m9312 -- 2019-02-09 1110 1.1 use typ for DL,PC,LP; add dz11 -- 2018-09-08 1043 1.0.2 add sys_conf_ibd_kw11p -- 2017-01-29 847 1.0.1 add sys_conf_ibd_deuna @@ -36,7 +37,7 @@ package sys_conf is -- typ for DL,DZ,PC,LP: -1->none; 0->unbuffered; 4-7 buffered (typ=AWIDTH) constant sys_conf_ibd_dl11_0 : integer := 4; -- 1st DL11 constant sys_conf_ibd_dl11_1 : integer := 4; -- 2nd DL11 - constant sys_conf_ibd_dz11 : integer := 4; -- DZ11 + constant sys_conf_ibd_dz11 : integer := 5; -- DZ11 constant sys_conf_ibd_pc11 : integer := 4; -- PC11 constant sys_conf_ibd_lp11 : integer := 5; -- LP11 constant sys_conf_ibd_deuna : boolean := true; -- DEUNA @@ -50,6 +51,7 @@ package sys_conf is -- configure other devices constant sys_conf_ibd_iist : boolean := true; -- IIST constant sys_conf_ibd_kw11p : boolean := true; -- KW11P + constant sys_conf_ibd_m9312 : boolean := true; -- M9312 end package sys_conf; diff --git a/rtl/sys_gen/w11a/arty/sys_conf.vhd b/rtl/sys_gen/w11a/arty/sys_conf.vhd index 78b1e0c9..165670de 100644 --- a/rtl/sys_gen/w11a/arty/sys_conf.vhd +++ b/rtl/sys_gen/w11a/arty/sys_conf.vhd @@ -1,4 +1,4 @@ --- $Id: sys_conf.vhd 1111 2019-02-10 16:13:55Z mueller $ +-- $Id: sys_conf.vhd 1142 2019-04-28 19:27:57Z mueller $ -- -- Copyright 2018-2019 by Walter F.J. Mueller -- @@ -19,6 +19,7 @@ -- Tool versions: viv 2017.2-2018.3; ghdl 0.34-0.35 -- Revision History: -- Date Rev Version Comment +-- 2019-04-28 1142 1.1.1 add sys_conf_ibd_m9312 -- 2019-02-09 1110 1.1 use typ for DL,PC,LP; add dz11,ibtst -- 2019-01-27 1108 1.0.1 down-rate to 75 MHz, viv 2018.3 fails with 80 MHz -- 2018-11-17 1071 1.0 Initial version (derived from _br_arty version) @@ -81,6 +82,7 @@ package sys_conf is -- configure other devices constant sys_conf_ibd_iist : boolean := true; -- IIST constant sys_conf_ibd_kw11p : boolean := true; -- KW11P + constant sys_conf_ibd_m9312 : boolean := true; -- M9312 -- derived constants ======================================================= constant sys_conf_clksys : integer := diff --git a/rtl/sys_gen/w11a/arty/tb/sys_conf_sim.vhd b/rtl/sys_gen/w11a/arty/tb/sys_conf_sim.vhd index e3702e33..ef329fe0 100644 --- a/rtl/sys_gen/w11a/arty/tb/sys_conf_sim.vhd +++ b/rtl/sys_gen/w11a/arty/tb/sys_conf_sim.vhd @@ -1,4 +1,4 @@ --- $Id: sys_conf_sim.vhd 1111 2019-02-10 16:13:55Z mueller $ +-- $Id: sys_conf_sim.vhd 1142 2019-04-28 19:27:57Z mueller $ -- -- Copyright 2018-2019 by Walter F.J. Mueller -- @@ -19,6 +19,7 @@ -- Tool versions: viv 2017.2-2018.3; ghdl 0.34-0.35 -- Revision History: -- Date Rev Version Comment +-- 2019-04-28 1142 1.1.1 add sys_conf_ibd_m9312 -- 2019-02-09 1110 1.1 use typ for DL,PC,LP; add dz11,ibtst -- 2019-01-27 1108 1.0.1 down-rate to 75 MHz, viv 2018.3 fails with 80 MHz -- 2018-11-17 1071 1.0 Initial version (derived from _br_arty version) @@ -81,6 +82,7 @@ package sys_conf is -- configure other devices constant sys_conf_ibd_iist : boolean := true; -- IIST constant sys_conf_ibd_kw11p : boolean := true; -- KW11P + constant sys_conf_ibd_m9312 : boolean := true; -- M9312 -- derived constants ======================================================= constant sys_conf_clksys : integer := diff --git a/rtl/sys_gen/w11a/arty_bram/sys_conf.vhd b/rtl/sys_gen/w11a/arty_bram/sys_conf.vhd index 7b9f0431..d43ce456 100644 --- a/rtl/sys_gen/w11a/arty_bram/sys_conf.vhd +++ b/rtl/sys_gen/w11a/arty_bram/sys_conf.vhd @@ -1,4 +1,4 @@ --- $Id: sys_conf.vhd 1111 2019-02-10 16:13:55Z mueller $ +-- $Id: sys_conf.vhd 1142 2019-04-28 19:27:57Z mueller $ -- -- Copyright 2016-2019 by Walter F.J. Mueller -- @@ -19,6 +19,7 @@ -- Tool versions: viv 2015.4-2018.3; ghdl 0.33-0.35 -- Revision History: -- Date Rev Version Comment +-- 2019-04-28 1142 1.4.1 add sys_conf_ibd_m9312 -- 2019-02-09 1110 1.4 use typ for DL,PC,LP; add dz11,ibtst -- 2018-09-22 1050 1.3.7 add sys_conf_dmpcnt -- 2018-09-08 1043 1.3.6 add sys_conf_ibd_kw11p @@ -96,6 +97,7 @@ package sys_conf is -- configure other devices constant sys_conf_ibd_iist : boolean := true; -- IIST constant sys_conf_ibd_kw11p : boolean := true; -- KW11P + constant sys_conf_ibd_m9312 : boolean := true; -- M9312 -- derived constants ======================================================= constant sys_conf_clksys : integer := diff --git a/rtl/sys_gen/w11a/arty_bram/tb/sys_conf_sim.vhd b/rtl/sys_gen/w11a/arty_bram/tb/sys_conf_sim.vhd index 54ed8a31..381106e0 100644 --- a/rtl/sys_gen/w11a/arty_bram/tb/sys_conf_sim.vhd +++ b/rtl/sys_gen/w11a/arty_bram/tb/sys_conf_sim.vhd @@ -1,4 +1,4 @@ --- $Id: sys_conf_sim.vhd 1111 2019-02-10 16:13:55Z mueller $ +-- $Id: sys_conf_sim.vhd 1142 2019-04-28 19:27:57Z mueller $ -- -- Copyright 2016-2019 by Walter F.J. Mueller -- @@ -19,6 +19,7 @@ -- Tool versions: viv 2015.4-2018.3; ghdl 0.33-0.35 -- Revision History: -- Date Rev Version Comment +-- 2019-04-28 1142 1.4.1 add sys_conf_ibd_m9312 -- 2019-02-09 1110 1.4 use typ for DL,PC,LP; add dz11,ibtst -- 2018-09-22 1050 1.3.6 add sys_conf_dmpcnt -- 2018-09-08 1043 1.3.5 add sys_conf_ibd_kw11p @@ -95,6 +96,7 @@ package sys_conf is -- configure other devices constant sys_conf_ibd_iist : boolean := true; -- IIST constant sys_conf_ibd_kw11p : boolean := true; -- KW11P + constant sys_conf_ibd_m9312 : boolean := true; -- M9312 -- derived constants ======================================================= constant sys_conf_clksys : integer := diff --git a/rtl/sys_gen/w11a/artys7/sys_conf.vhd b/rtl/sys_gen/w11a/artys7/sys_conf.vhd index aa8072e6..2b596ba6 100644 --- a/rtl/sys_gen/w11a/artys7/sys_conf.vhd +++ b/rtl/sys_gen/w11a/artys7/sys_conf.vhd @@ -1,4 +1,4 @@ --- $Id: sys_conf.vhd 1111 2019-02-10 16:13:55Z mueller $ +-- $Id: sys_conf.vhd 1142 2019-04-28 19:27:57Z mueller $ -- -- Copyright 2019- by Walter F.J. Mueller -- @@ -19,6 +19,7 @@ -- Tool versions: viv 2018.3; ghdl 0.35 -- Revision History: -- Date Rev Version Comment +-- 2019-04-28 1142 1.1.1 add sys_conf_ibd_m9312 -- 2019-02-09 1110 1.1 use typ for DL,PC,LP; add dz11,ibtst -- 2019-01-12 1105 1.0 Initial version (derived from _arty) ------------------------------------------------------------------------------ @@ -80,6 +81,7 @@ package sys_conf is -- configure other devices constant sys_conf_ibd_iist : boolean := true; -- IIST constant sys_conf_ibd_kw11p : boolean := true; -- KW11P + constant sys_conf_ibd_m9312 : boolean := true; -- M9312 -- derived constants ======================================================= constant sys_conf_clksys : integer := diff --git a/rtl/sys_gen/w11a/artys7/tb/sys_conf_sim.vhd b/rtl/sys_gen/w11a/artys7/tb/sys_conf_sim.vhd index 69618abe..7d718758 100644 --- a/rtl/sys_gen/w11a/artys7/tb/sys_conf_sim.vhd +++ b/rtl/sys_gen/w11a/artys7/tb/sys_conf_sim.vhd @@ -1,4 +1,4 @@ --- $Id: sys_conf_sim.vhd 1111 2019-02-10 16:13:55Z mueller $ +-- $Id: sys_conf_sim.vhd 1142 2019-04-28 19:27:57Z mueller $ -- -- Copyright 2019- by Walter F.J. Mueller -- @@ -19,6 +19,7 @@ -- Tool versions: viv 2018.3; ghdl 0.35 -- Revision History: -- Date Rev Version Comment +-- 2019-04-28 1142 1.1.1 add sys_conf_ibd_m9312 -- 2019-02-09 1110 1.1 use typ for DL,PC,LP; add dz11,ibtst -- 2019-01-12 1105 1.0 Initial version ------------------------------------------------------------------------------ @@ -80,6 +81,7 @@ package sys_conf is -- configure other devices constant sys_conf_ibd_iist : boolean := true; -- IIST constant sys_conf_ibd_kw11p : boolean := true; -- KW11P + constant sys_conf_ibd_m9312 : boolean := true; -- M9312 -- derived constants ======================================================= constant sys_conf_clksys : integer := diff --git a/rtl/sys_gen/w11a/artys7_bram/sys_conf.vhd b/rtl/sys_gen/w11a/artys7_bram/sys_conf.vhd index 4b3c29d4..86ccb5c0 100644 --- a/rtl/sys_gen/w11a/artys7_bram/sys_conf.vhd +++ b/rtl/sys_gen/w11a/artys7_bram/sys_conf.vhd @@ -1,4 +1,4 @@ --- $Id: sys_conf.vhd 1111 2019-02-10 16:13:55Z mueller $ +-- $Id: sys_conf.vhd 1142 2019-04-28 19:27:57Z mueller $ -- -- Copyright 2018-2019 by Walter F.J. Mueller -- @@ -19,6 +19,7 @@ -- Tool versions: viv 2017.2-2018.3; ghdl 0.34-0.35 -- Revision History: -- Date Rev Version Comment +-- 2019-04-28 1142 1.1.1 add sys_conf_ibd_m9312 -- 2019-02-09 1110 1.1 use typ for DL,PC,LP; add dz11,ibtst -- 2018-09-22 1050 1.0.2 add sys_conf_dmpcnt -- 2018-09-08 1043 1.0.1 add sys_conf_ibd_kw11p @@ -88,6 +89,7 @@ package sys_conf is -- configure other devices constant sys_conf_ibd_iist : boolean := true; -- IIST constant sys_conf_ibd_kw11p : boolean := true; -- KW11P + constant sys_conf_ibd_m9312 : boolean := true; -- M9312 -- derived constants ======================================================= constant sys_conf_clksys : integer := diff --git a/rtl/sys_gen/w11a/artys7_bram/tb/sys_conf_sim.vhd b/rtl/sys_gen/w11a/artys7_bram/tb/sys_conf_sim.vhd index 577b1e84..ac7f377f 100644 --- a/rtl/sys_gen/w11a/artys7_bram/tb/sys_conf_sim.vhd +++ b/rtl/sys_gen/w11a/artys7_bram/tb/sys_conf_sim.vhd @@ -1,4 +1,4 @@ --- $Id: sys_conf_sim.vhd 1111 2019-02-10 16:13:55Z mueller $ +-- $Id: sys_conf_sim.vhd 1142 2019-04-28 19:27:57Z mueller $ -- -- Copyright 2018-2019 by Walter F.J. Mueller -- @@ -19,6 +19,7 @@ -- Tool versions: viv 2017.2-2018.3; ghdl 0.34-0.35 -- Revision History: -- Date Rev Version Comment +-- 2019-04-28 1142 1.1.1 add sys_conf_ibd_m9312 -- 2019-02-09 1110 1.1 use typ for DL,PC,LP; add dz11,ibtst -- 2018-09-22 1050 1.0.2 add sys_conf_dmpcnt -- 2018-09-08 1043 1.0.1 add sys_conf_ibd_kw11p @@ -88,6 +89,7 @@ package sys_conf is -- configure other devices constant sys_conf_ibd_iist : boolean := true; -- IIST constant sys_conf_ibd_kw11p : boolean := true; -- KW11P + constant sys_conf_ibd_m9312 : boolean := true; -- M9312 -- derived constants ======================================================= constant sys_conf_clksys : integer := diff --git a/rtl/sys_gen/w11a/basys3/sys_conf.vhd b/rtl/sys_gen/w11a/basys3/sys_conf.vhd index ba00782d..4fcfa844 100644 --- a/rtl/sys_gen/w11a/basys3/sys_conf.vhd +++ b/rtl/sys_gen/w11a/basys3/sys_conf.vhd @@ -1,4 +1,4 @@ --- $Id: sys_conf.vhd 1111 2019-02-10 16:13:55Z mueller $ +-- $Id: sys_conf.vhd 1142 2019-04-28 19:27:57Z mueller $ -- -- Copyright 2015-2019 by Walter F.J. Mueller -- @@ -19,6 +19,7 @@ -- Tool versions: viv 2014.4-2018.3; ghdl 0.31-0.35 -- Revision History: -- Date Rev Version Comment +-- 2019-04-28 1142 1.4.1 add sys_conf_ibd_m9312 -- 2019-02-09 1110 1.4 use typ for DL,PC,LP; add dz11,ibtst -- 2018-09-22 1050 1.3.7 add sys_conf_dmpcnt -- 2018-09-08 1043 1.3.6 add sys_conf_ibd_kw11p @@ -98,6 +99,7 @@ package sys_conf is -- configure other devices constant sys_conf_ibd_iist : boolean := true; -- IIST constant sys_conf_ibd_kw11p : boolean := true; -- KW11P + constant sys_conf_ibd_m9312 : boolean := true; -- M9312 -- derived constants ======================================================= constant sys_conf_clksys : integer := diff --git a/rtl/sys_gen/w11a/basys3/tb/sys_conf_sim.vhd b/rtl/sys_gen/w11a/basys3/tb/sys_conf_sim.vhd index 95b5e89c..fc9e5ab4 100644 --- a/rtl/sys_gen/w11a/basys3/tb/sys_conf_sim.vhd +++ b/rtl/sys_gen/w11a/basys3/tb/sys_conf_sim.vhd @@ -1,4 +1,4 @@ --- $Id: sys_conf_sim.vhd 1111 2019-02-10 16:13:55Z mueller $ +-- $Id: sys_conf_sim.vhd 1142 2019-04-28 19:27:57Z mueller $ -- -- Copyright 2015-2019 by Walter F.J. Mueller -- @@ -19,6 +19,7 @@ -- Tool versions: viv 2014.4-2018.3; ghdl 0.31-0.35 -- Revision History: -- Date Rev Version Comment +-- 2019-04-28 1142 1.4.1 add sys_conf_ibd_m9312 -- 2019-02-09 1110 1.4 use typ for DL,PC,LP; add dz11,ibtst -- 2018-09-22 1050 1.3.6 add sys_conf_dmpcnt -- 2018-09-08 1043 1.3.5 add sys_conf_ibd_kw11p @@ -97,6 +98,7 @@ package sys_conf is -- configure other devices constant sys_conf_ibd_iist : boolean := true; -- IIST constant sys_conf_ibd_kw11p : boolean := true; -- KW11P + constant sys_conf_ibd_m9312 : boolean := true; -- M9312 -- derived constants ======================================================= constant sys_conf_clksys : integer := diff --git a/rtl/sys_gen/w11a/cmoda7/sys_conf.vhd b/rtl/sys_gen/w11a/cmoda7/sys_conf.vhd index 812d0706..d2c1d09d 100644 --- a/rtl/sys_gen/w11a/cmoda7/sys_conf.vhd +++ b/rtl/sys_gen/w11a/cmoda7/sys_conf.vhd @@ -1,4 +1,4 @@ --- $Id: sys_conf.vhd 1111 2019-02-10 16:13:55Z mueller $ +-- $Id: sys_conf.vhd 1142 2019-04-28 19:27:57Z mueller $ -- -- Copyright 2017-2019 by Walter F.J. Mueller -- @@ -19,6 +19,7 @@ -- Tool versions: viv 2017.1-2018.3; ghdl 0.34-0.35 -- Revision History: -- Date Rev Version Comment +-- 2019-04-28 1142 1.1.1 add sys_conf_ibd_m9312 -- 2019-02-09 1110 1.1 use typ for DL,PC,LP; add dz11,ibtst -- 2018-09-22 1050 1.0.2 add sys_conf_dmpcnt -- 2018-09-08 1043 1.0.1 add sys_conf_ibd_kw11p @@ -90,6 +91,7 @@ package sys_conf is -- configure other devices constant sys_conf_ibd_iist : boolean := true; -- IIST constant sys_conf_ibd_kw11p : boolean := true; -- KW11P + constant sys_conf_ibd_m9312 : boolean := false; -- M9312 -- derived constants ======================================================= constant sys_conf_clksys : integer := diff --git a/rtl/sys_gen/w11a/cmoda7/tb/sys_conf_sim.vhd b/rtl/sys_gen/w11a/cmoda7/tb/sys_conf_sim.vhd index 0bbb6f1a..20a9df0c 100644 --- a/rtl/sys_gen/w11a/cmoda7/tb/sys_conf_sim.vhd +++ b/rtl/sys_gen/w11a/cmoda7/tb/sys_conf_sim.vhd @@ -1,4 +1,4 @@ --- $Id: sys_conf_sim.vhd 1111 2019-02-10 16:13:55Z mueller $ +-- $Id: sys_conf_sim.vhd 1142 2019-04-28 19:27:57Z mueller $ -- -- Copyright 2017-2019 by Walter F.J. Mueller -- @@ -19,6 +19,7 @@ -- Tool versions: viv 2017.1-2018.3; ghdl 0.35 -- Revision History: -- Date Rev Version Comment +-- 2019-04-28 1142 1.1.1 add sys_conf_ibd_m9312 -- 2019-02-09 1110 1.1 use typ for DL,PC,LP; add dz11,ibtst -- 2018-09-22 1050 1.0.2 add sys_conf_dmpcnt -- 2018-09-08 1043 1.0.1 add sys_conf_ibd_kw11p @@ -90,6 +91,7 @@ package sys_conf is -- configure other devices constant sys_conf_ibd_iist : boolean := true; -- IIST constant sys_conf_ibd_kw11p : boolean := true; -- KW11P + constant sys_conf_ibd_m9312 : boolean := false; -- M9312 -- derived constants ======================================================= constant sys_conf_clksys : integer := diff --git a/rtl/sys_gen/w11a/nexys2/sys_conf.vhd b/rtl/sys_gen/w11a/nexys2/sys_conf.vhd index 344ea7de..fba5c13b 100644 --- a/rtl/sys_gen/w11a/nexys2/sys_conf.vhd +++ b/rtl/sys_gen/w11a/nexys2/sys_conf.vhd @@ -1,4 +1,4 @@ --- $Id: sys_conf.vhd 1111 2019-02-10 16:13:55Z mueller $ +-- $Id: sys_conf.vhd 1145 2019-05-04 10:07:32Z mueller $ -- -- Copyright 2010-2019 by Walter F.J. Mueller -- @@ -19,6 +19,7 @@ -- Tool versions: xst 11.4-14.7; ghdl 0.26-0.35 -- Revision History: -- Date Rev Version Comment +-- 2019-04-28 1142 1.7.1 add sys_conf_ibd_m9312 -- 2019-02-09 1110 1.7 use typ for DL,PC,LP; add dz11,ibtst -- 2019-01-27 1108 1.6.6 drop iist -- 2018-09-22 1050 1.6.5 add sys_conf_dmpcnt @@ -84,7 +85,7 @@ package sys_conf is -- typ for DL,DZ,PC,LP: -1->none; 0->unbuffered; 4-7 buffered (typ=AWIDTH) constant sys_conf_ibd_dl11_0 : integer := 4; -- 1st DL11 constant sys_conf_ibd_dl11_1 : integer := 4; -- 2nd DL11 - constant sys_conf_ibd_dz11 : integer := 4; -- DZ11 + constant sys_conf_ibd_dz11 : integer := 5; -- DZ11 constant sys_conf_ibd_pc11 : integer := 4; -- PC11 constant sys_conf_ibd_lp11 : integer := 5; -- LP11 constant sys_conf_ibd_deuna : boolean := true; -- DEUNA @@ -98,6 +99,7 @@ package sys_conf is -- configure other devices constant sys_conf_ibd_iist : boolean := false; -- IIST constant sys_conf_ibd_kw11p : boolean := true; -- KW11P + constant sys_conf_ibd_m9312 : boolean := true; -- M9312 -- derived constants ======================================================= constant sys_conf_clksys : integer := diff --git a/rtl/sys_gen/w11a/nexys2/tb/sys_conf_sim.vhd b/rtl/sys_gen/w11a/nexys2/tb/sys_conf_sim.vhd index c21d3d8d..87dc5446 100644 --- a/rtl/sys_gen/w11a/nexys2/tb/sys_conf_sim.vhd +++ b/rtl/sys_gen/w11a/nexys2/tb/sys_conf_sim.vhd @@ -1,4 +1,4 @@ --- $Id: sys_conf_sim.vhd 1111 2019-02-10 16:13:55Z mueller $ +-- $Id: sys_conf_sim.vhd 1145 2019-05-04 10:07:32Z mueller $ -- -- Copyright 2010-2019 by Walter F.J. Mueller -- @@ -19,6 +19,7 @@ -- Tool versions: xst 11.4-14.7; ghdl 0.26-0.35 -- Revision History: -- Date Rev Version Comment +-- 2019-04-28 1142 1.7.1 add sys_conf_ibd_m9312 -- 2019-02-09 1110 1.7 use typ for DL,PC,LP; add dz11,ibtst -- 2019-01-27 1108 1.6.5 drop iist -- 2018-09-22 1050 1.6.4 add sys_conf_dmpcnt @@ -83,7 +84,7 @@ package sys_conf is -- typ for DL,DZ,PC,LP: -1->none; 0->unbuffered; 4-7 buffered (typ=AWIDTH) constant sys_conf_ibd_dl11_0 : integer := 4; -- 1st DL11 constant sys_conf_ibd_dl11_1 : integer := 4; -- 2nd DL11 - constant sys_conf_ibd_dz11 : integer := 4; -- DZ11 + constant sys_conf_ibd_dz11 : integer := 5; -- DZ11 constant sys_conf_ibd_pc11 : integer := 4; -- PC11 constant sys_conf_ibd_lp11 : integer := 5; -- LP11 constant sys_conf_ibd_deuna : boolean := true; -- DEUNA @@ -97,6 +98,7 @@ package sys_conf is -- configure other devices constant sys_conf_ibd_iist : boolean := false; -- IIST constant sys_conf_ibd_kw11p : boolean := true; -- KW11P + constant sys_conf_ibd_m9312 : boolean := true; -- M9312 -- derived constants ======================================================= constant sys_conf_clksys : integer := diff --git a/rtl/sys_gen/w11a/nexys3/sys_conf.vhd b/rtl/sys_gen/w11a/nexys3/sys_conf.vhd index 1be89607..98a513d0 100644 --- a/rtl/sys_gen/w11a/nexys3/sys_conf.vhd +++ b/rtl/sys_gen/w11a/nexys3/sys_conf.vhd @@ -1,4 +1,4 @@ --- $Id: sys_conf.vhd 1111 2019-02-10 16:13:55Z mueller $ +-- $Id: sys_conf.vhd 1145 2019-05-04 10:07:32Z mueller $ -- -- Copyright 2011-2019 by Walter F.J. Mueller -- @@ -19,6 +19,7 @@ -- Tool versions: xst 13.1-14.7; ghdl 0.29-0.35 -- Revision History: -- Date Rev Version Comment +-- 2019-04-28 1142 1.8.1 add sys_conf_ibd_m9312 -- 2019-02-09 1110 1.8 use typ for DL,PC,LP; add dz11,ibtst -- 2019-01-27 1108 1.7.6 drop iist -- 2018-09-22 1050 1.7.5 add sys_conf_dmpcnt @@ -88,7 +89,7 @@ package sys_conf is -- typ for DL,DZ,PC,LP: -1->none; 0->unbuffered; 4-7 buffered (typ=AWIDTH) constant sys_conf_ibd_dl11_0 : integer := 4; -- 1st DL11 constant sys_conf_ibd_dl11_1 : integer := 4; -- 2nd DL11 - constant sys_conf_ibd_dz11 : integer := 4; -- DZ11 + constant sys_conf_ibd_dz11 : integer := 5; -- DZ11 constant sys_conf_ibd_pc11 : integer := 4; -- PC11 constant sys_conf_ibd_lp11 : integer := 5; -- LP11 constant sys_conf_ibd_deuna : boolean := true; -- DEUNA @@ -102,6 +103,7 @@ package sys_conf is -- configure other devices constant sys_conf_ibd_iist : boolean := false; -- IIST constant sys_conf_ibd_kw11p : boolean := true; -- KW11P + constant sys_conf_ibd_m9312 : boolean := true; -- M9312 -- derived constants ======================================================= constant sys_conf_clksys : integer := diff --git a/rtl/sys_gen/w11a/nexys3/sys_w11a_n3.vhd b/rtl/sys_gen/w11a/nexys3/sys_w11a_n3.vhd index 92081746..67dd8f37 100644 --- a/rtl/sys_gen/w11a/nexys3/sys_w11a_n3.vhd +++ b/rtl/sys_gen/w11a/nexys3/sys_w11a_n3.vhd @@ -1,4 +1,4 @@ --- $Id: sys_w11a_n3.vhd 1140 2019-04-28 10:21:21Z mueller $ +-- $Id: sys_w11a_n3.vhd 1143 2019-05-01 13:25:51Z mueller $ -- -- Copyright 2011-2019 by Walter F.J. Mueller -- @@ -34,6 +34,7 @@ -- -- Synthesized (xst): -- Date Rev ise Target flop lutl lutm slic t peri +-- 2019-05-01 1143 14.7 131013 xc6slx16-2 3062 5761 232 2057 ok: +m9312 90% -- 2019-04-27 1140 14.7 131013 xc6slx16-2 3053 5742 232 2050 ok: +dlbuf 89% -- 2019-04-24 1137 14.7 131013 xc6slx16-2 3049 5727 223 2045 ok: +pcbuf 89% -- 2019-03-17 1123 14.7 131013 xc6slx16-2 3059 5722 212 2041 ok: +lpbuf 89% diff --git a/rtl/sys_gen/w11a/nexys3/tb/sys_conf_sim.vhd b/rtl/sys_gen/w11a/nexys3/tb/sys_conf_sim.vhd index 9c286196..a972a55a 100644 --- a/rtl/sys_gen/w11a/nexys3/tb/sys_conf_sim.vhd +++ b/rtl/sys_gen/w11a/nexys3/tb/sys_conf_sim.vhd @@ -1,4 +1,4 @@ --- $Id: sys_conf_sim.vhd 1111 2019-02-10 16:13:55Z mueller $ +-- $Id: sys_conf_sim.vhd 1145 2019-05-04 10:07:32Z mueller $ -- -- Copyright 2011-2019 by Walter F.J. Mueller -- @@ -19,6 +19,7 @@ -- Tool versions: xst 13.1-14.7; ghdl 0.29-0.35 -- Revision History: -- Date Rev Version Comment +-- 2019-04-28 1142 1.8.1 add sys_conf_ibd_m9312 -- 2019-02-09 1110 1.8 use typ for DL,PC,LP; add dz11,ibtst -- 2019-01-27 1108 1.7.5 drop iist -- 2018-09-22 1050 1.7.4 add sys_conf_dmpcnt @@ -83,7 +84,7 @@ package sys_conf is -- typ for DL,DZ,PC,LP: -1->none; 0->unbuffered; 4-7 buffered (typ=AWIDTH) constant sys_conf_ibd_dl11_0 : integer := 4; -- 1st DL11 constant sys_conf_ibd_dl11_1 : integer := 4; -- 2nd DL11 - constant sys_conf_ibd_dz11 : integer := 4; -- DZ11 + constant sys_conf_ibd_dz11 : integer := 5; -- DZ11 constant sys_conf_ibd_pc11 : integer := 4; -- PC11 constant sys_conf_ibd_lp11 : integer := 5; -- LP11 constant sys_conf_ibd_deuna : boolean := true; -- DEUNA @@ -97,6 +98,7 @@ package sys_conf is -- configure other devices constant sys_conf_ibd_iist : boolean := false; -- IIST constant sys_conf_ibd_kw11p : boolean := true; -- KW11P + constant sys_conf_ibd_m9312 : boolean := true; -- M9312 -- derived constants ======================================================= diff --git a/rtl/sys_gen/w11a/nexys4/sys_conf.vhd b/rtl/sys_gen/w11a/nexys4/sys_conf.vhd index 328c2957..1e7697e6 100644 --- a/rtl/sys_gen/w11a/nexys4/sys_conf.vhd +++ b/rtl/sys_gen/w11a/nexys4/sys_conf.vhd @@ -1,4 +1,4 @@ --- $Id: sys_conf.vhd 1111 2019-02-10 16:13:55Z mueller $ +-- $Id: sys_conf.vhd 1142 2019-04-28 19:27:57Z mueller $ -- -- Copyright 2013-2019 by Walter F.J. Mueller -- @@ -19,6 +19,7 @@ -- Tool versions: ise 14.5-14.7; viv 2014.4-2018.3; ghdl 0.29-0.35 -- Revision History: -- Date Rev Version Comment +-- 2019-04-28 1142 1.6.1 add sys_conf_ibd_m9312 -- 2019-02-09 1110 1.6 use typ for DL,PC,LP; add dz11,ibtst -- 2018-09-22 1050 1.5.6 add sys_conf_dmpcnt -- 2018-09-09 1044 1.5.5 use _cache_twidth TW=7 (32 kByte), timing issues @@ -102,6 +103,7 @@ package sys_conf is -- configure other devices constant sys_conf_ibd_iist : boolean := true; -- IIST constant sys_conf_ibd_kw11p : boolean := true; -- KW11P + constant sys_conf_ibd_m9312 : boolean := true; -- M9312 -- derived constants ======================================================= constant sys_conf_clksys : integer := diff --git a/rtl/sys_gen/w11a/nexys4/sys_w11a_n4.vhd b/rtl/sys_gen/w11a/nexys4/sys_w11a_n4.vhd index 0305f694..d7ef5edc 100644 --- a/rtl/sys_gen/w11a/nexys4/sys_w11a_n4.vhd +++ b/rtl/sys_gen/w11a/nexys4/sys_w11a_n4.vhd @@ -1,4 +1,4 @@ --- $Id: sys_w11a_n4.vhd 1140 2019-04-28 10:21:21Z mueller $ +-- $Id: sys_w11a_n4.vhd 1143 2019-05-01 13:25:51Z mueller $ -- -- Copyright 2013-2019 by Walter F.J. Mueller -- @@ -35,6 +35,7 @@ -- -- Synthesized: -- Date Rev viv Target flop lutl lutm bram slic MHz +-- 2019-05-01 1143 2017.2 xc7a100t-1 3295 6597 260 17.5 2107 80 +m9312 -- 2019-04-27 1140 2017.2 xc7a100t-1 3288 6574 260 17.0 2132 80 +dlbuf -- 2019-04-24 1137 2017.2 xc7a100t-1 3251 6465 228 17.0 2043 80 +pcbuf -- 2019-03-17 1123 2017.2 xc7a100t-1 3231 6403 212 17.0 2053 80 +lpbuf diff --git a/rtl/sys_gen/w11a/nexys4/tb/sys_conf_sim.vhd b/rtl/sys_gen/w11a/nexys4/tb/sys_conf_sim.vhd index e99a8e52..7706aba5 100644 --- a/rtl/sys_gen/w11a/nexys4/tb/sys_conf_sim.vhd +++ b/rtl/sys_gen/w11a/nexys4/tb/sys_conf_sim.vhd @@ -1,4 +1,4 @@ --- $Id: sys_conf_sim.vhd 1111 2019-02-10 16:13:55Z mueller $ +-- $Id: sys_conf_sim.vhd 1142 2019-04-28 19:27:57Z mueller $ -- -- Copyright 2013-2019 by Walter F.J. Mueller -- @@ -19,6 +19,7 @@ -- Tool versions: xst 14.5-14.7; viv 2016.1-2018.3; ghdl 0.29-0.35 -- Revision History: -- Date Rev Version Comment +-- 2019-04-28 1142 1.6.1 add sys_conf_ibd_m9312 -- 2019-02-09 1110 1.6 use typ for DL,PC,LP; add dz11,ibtst -- 2018-09-22 1050 1.5.6 add sys_conf_dmpcnt -- 2018-09-09 1044 1.5.5 use _cache_twidth TW=7 (32 kByte), timing issues @@ -101,6 +102,7 @@ package sys_conf is -- configure other devices constant sys_conf_ibd_iist : boolean := true; -- IIST constant sys_conf_ibd_kw11p : boolean := true; -- KW11P + constant sys_conf_ibd_m9312 : boolean := true; -- M9312 -- derived constants ======================================================= constant sys_conf_clksys : integer := diff --git a/rtl/sys_gen/w11a/nexys4d/sys_conf.vhd b/rtl/sys_gen/w11a/nexys4d/sys_conf.vhd index cd5cd056..921d1cbc 100644 --- a/rtl/sys_gen/w11a/nexys4d/sys_conf.vhd +++ b/rtl/sys_gen/w11a/nexys4d/sys_conf.vhd @@ -1,4 +1,4 @@ --- $Id: sys_conf.vhd 1111 2019-02-10 16:13:55Z mueller $ +-- $Id: sys_conf.vhd 1142 2019-04-28 19:27:57Z mueller $ -- -- Copyright 2019- by Walter F.J. Mueller -- @@ -19,6 +19,7 @@ -- Tool versions: viv 2017.2; ghdl 0.34-0.35 -- Revision History: -- Date Rev Version Comment +-- 2019-04-28 1142 1.1.1 add sys_conf_ibd_m9312 -- 2019-02-09 1110 1.1 use typ for DL,PC,LP; add dz11,ibtst -- 2019-01-02 1101 1.0 Initial version ------------------------------------------------------------------------------ @@ -80,6 +81,7 @@ package sys_conf is -- configure other devices constant sys_conf_ibd_iist : boolean := true; -- IIST constant sys_conf_ibd_kw11p : boolean := true; -- KW11P + constant sys_conf_ibd_m9312 : boolean := true; -- M9312 -- derived constants ======================================================= constant sys_conf_clksys : integer := diff --git a/rtl/sys_gen/w11a/nexys4d/tb/sys_conf_sim.vhd b/rtl/sys_gen/w11a/nexys4d/tb/sys_conf_sim.vhd index f7bac8ae..328d6e5e 100644 --- a/rtl/sys_gen/w11a/nexys4d/tb/sys_conf_sim.vhd +++ b/rtl/sys_gen/w11a/nexys4d/tb/sys_conf_sim.vhd @@ -1,4 +1,4 @@ --- $Id: sys_conf_sim.vhd 1111 2019-02-10 16:13:55Z mueller $ +-- $Id: sys_conf_sim.vhd 1142 2019-04-28 19:27:57Z mueller $ -- -- Copyright 2019- by Walter F.J. Mueller -- @@ -19,6 +19,7 @@ -- Tool versions: viv 2017.2-2018.3; ghdl 0.34-0.35 -- Revision History: -- Date Rev Version Comment +-- 2019-04-28 1142 1.1.1 add sys_conf_ibd_m9312 -- 2019-02-09 1110 1.1 use typ for DL,PC,LP; add dz11,ibtst -- 2019-01-02 1101 1.0 Initial version (cloned from _n4) ------------------------------------------------------------------------------ @@ -80,6 +81,7 @@ package sys_conf is -- configure other devices constant sys_conf_ibd_iist : boolean := true; -- IIST constant sys_conf_ibd_kw11p : boolean := true; -- KW11P + constant sys_conf_ibd_m9312 : boolean := true; -- M9312 -- derived constants ======================================================= constant sys_conf_clksys : integer := diff --git a/rtl/sys_gen/w11a/nexys4d_bram/sys_conf.vhd b/rtl/sys_gen/w11a/nexys4d_bram/sys_conf.vhd index f5c30e35..becb2e4e 100644 --- a/rtl/sys_gen/w11a/nexys4d_bram/sys_conf.vhd +++ b/rtl/sys_gen/w11a/nexys4d_bram/sys_conf.vhd @@ -1,4 +1,4 @@ --- $Id: sys_conf.vhd 1111 2019-02-10 16:13:55Z mueller $ +-- $Id: sys_conf.vhd 1142 2019-04-28 19:27:57Z mueller $ -- -- Copyright 2017-2019 by Walter F.J. Mueller -- @@ -19,6 +19,7 @@ -- Tool versions: viv 2016.2-2018.3; ghdl 0.33-0.35 -- Revision History: -- Date Rev Version Comment +-- 2019-04-28 1142 1.1.1 add sys_conf_ibd_m9312 -- 2019-02-09 1110 1.1 use typ for DL,PC,LP; add dz11,ibtst -- 2018-09-22 1050 1.0.4 add sys_conf_dmpcnt -- 2018-09-08 1043 1.0.3 add sys_conf_ibd_kw11p @@ -92,6 +93,7 @@ package sys_conf is -- configure other devices constant sys_conf_ibd_iist : boolean := true; -- IIST constant sys_conf_ibd_kw11p : boolean := true; -- KW11P + constant sys_conf_ibd_m9312 : boolean := true; -- M9312 -- derived constants ======================================================= constant sys_conf_clksys : integer := diff --git a/rtl/sys_gen/w11a/nexys4d_bram/tb/sys_conf_sim.vhd b/rtl/sys_gen/w11a/nexys4d_bram/tb/sys_conf_sim.vhd index e7a716ab..828d38e5 100644 --- a/rtl/sys_gen/w11a/nexys4d_bram/tb/sys_conf_sim.vhd +++ b/rtl/sys_gen/w11a/nexys4d_bram/tb/sys_conf_sim.vhd @@ -1,4 +1,4 @@ --- $Id: sys_conf_sim.vhd 1111 2019-02-10 16:13:55Z mueller $ +-- $Id: sys_conf_sim.vhd 1142 2019-04-28 19:27:57Z mueller $ -- -- Copyright 2017-2019 by Walter F.J. Mueller -- @@ -19,6 +19,7 @@ -- Tool versions: viv 2016.2-2018.3; ghdl 0.33-0.35 -- Revision History: -- Date Rev Version Comment +-- 2019-04-28 1142 1.1.1 add sys_conf_ibd_m9312 -- 2019-02-09 1110 1.1 use typ for DL,PC,LP; add dz11,ibtst -- 2018-09-22 1050 1.0.3 add sys_conf_dmpcnt -- 2018-09-08 1043 1.0.2 add sys_conf_ibd_kw11p @@ -89,6 +90,7 @@ package sys_conf is -- configure other devices constant sys_conf_ibd_iist : boolean := true; -- IIST constant sys_conf_ibd_kw11p : boolean := true; -- KW11P + constant sys_conf_ibd_m9312 : boolean := true; -- M9312 -- derived constants ======================================================= diff --git a/rtl/sys_gen/w11a/s3board/sys_conf.vhd b/rtl/sys_gen/w11a/s3board/sys_conf.vhd index 3902d2af..5531189d 100644 --- a/rtl/sys_gen/w11a/s3board/sys_conf.vhd +++ b/rtl/sys_gen/w11a/s3board/sys_conf.vhd @@ -1,4 +1,4 @@ --- $Id: sys_conf.vhd 1111 2019-02-10 16:13:55Z mueller $ +-- $Id: sys_conf.vhd 1145 2019-05-04 10:07:32Z mueller $ -- -- Copyright 2007-2019 by Walter F.J. Mueller -- @@ -19,6 +19,7 @@ -- Tool versions: xst 8.1-14.7; ghdl 0.18-0.35 -- Revision History: -- Date Rev Version Comment +-- 2019-04-28 1142 1.4.1 add sys_conf_ibd_m9312 -- 2019-02-09 1110 1.4 use typ for DL,PC,LP; add dz11,ibtst -- 2019-01-27 1108 1.3.7 drop iist -- 2018-09-22 1050 1.3.6 add sys_conf_dmpcnt @@ -67,7 +68,7 @@ package sys_conf is -- typ for DL,DZ,PC,LP: -1->none; 0->unbuffered; 4-7 buffered (typ=AWIDTH) constant sys_conf_ibd_dl11_0 : integer := 4; -- 1st DL11 constant sys_conf_ibd_dl11_1 : integer := 4; -- 2nd DL11 - constant sys_conf_ibd_dz11 : integer := 4; -- DZ11 + constant sys_conf_ibd_dz11 : integer := 5; -- DZ11 constant sys_conf_ibd_pc11 : integer := 4; -- PC11 constant sys_conf_ibd_lp11 : integer := 5; -- LP11 constant sys_conf_ibd_deuna : boolean := true; -- DEUNA @@ -81,5 +82,6 @@ package sys_conf is -- configure other devices constant sys_conf_ibd_iist : boolean := false; -- IIST constant sys_conf_ibd_kw11p : boolean := true; -- KW11P + constant sys_conf_ibd_m9312 : boolean := true; -- M9312 end package sys_conf; diff --git a/rtl/sys_gen/w11a/s3board/tb/sys_conf_sim.vhd b/rtl/sys_gen/w11a/s3board/tb/sys_conf_sim.vhd index b9668ad9..8a9b4790 100644 --- a/rtl/sys_gen/w11a/s3board/tb/sys_conf_sim.vhd +++ b/rtl/sys_gen/w11a/s3board/tb/sys_conf_sim.vhd @@ -1,4 +1,4 @@ --- $Id: sys_conf_sim.vhd 1111 2019-02-10 16:13:55Z mueller $ +-- $Id: sys_conf_sim.vhd 1145 2019-05-04 10:07:32Z mueller $ -- -- Copyright 2007-2019 by Walter F.J. Mueller -- @@ -19,6 +19,7 @@ -- Tool versions: xst 8.1-14.7; ghdl 0.18-0.35 -- Revision History: -- Date Rev Version Comment +-- 2019-04-28 1142 1.4.1 add sys_conf_ibd_m9312 -- 2019-02-09 1110 1.4 use typ for DL,PC,LP; add dz11,ibtst -- 2019-01-27 1108 1.3.6 drop iist -- 2018-09-22 1050 1.3.5 add sys_conf_dmpcnt @@ -73,7 +74,7 @@ package sys_conf is -- typ for DL,DZ,PC,LP: -1->none; 0->unbuffered; 4-7 buffered (typ=AWIDTH) constant sys_conf_ibd_dl11_0 : integer := 4; -- 1st DL11 constant sys_conf_ibd_dl11_1 : integer := 4; -- 2nd DL11 - constant sys_conf_ibd_dz11 : integer := 4; -- DZ11 + constant sys_conf_ibd_dz11 : integer := 5; -- DZ11 constant sys_conf_ibd_pc11 : integer := 4; -- PC11 constant sys_conf_ibd_lp11 : integer := 5; -- LP11 constant sys_conf_ibd_deuna : boolean := true; -- DEUNA @@ -87,6 +88,7 @@ package sys_conf is -- configure other devices constant sys_conf_ibd_iist : boolean := false; -- IIST constant sys_conf_ibd_kw11p : boolean := true; -- KW11P + constant sys_conf_ibd_m9312 : boolean := true; -- M9312 end package sys_conf;