From 38470145a0e53f0b13fdf8c94ed83eb31e309474 Mon Sep 17 00:00:00 2001 From: "Walter F.J. Mueller" Date: Sat, 14 Jan 2017 21:08:57 +0100 Subject: [PATCH] add sysmon_rbus to sys_tst_sram_n4 (xadc access) --- doc/CHANGELOG.md | 3 +- doc/README_known_issues.md | 6 +++- .../tst_sram/nexys4/sys_tst_sram_n4.vbom | 4 ++- .../tst_sram/nexys4/sys_tst_sram_n4.vhd | 34 +++++++++++++++---- tools/oskit/xxdp_rl/README.md | 2 +- .../{README_license.txt => README_license.md} | 0 6 files changed, 39 insertions(+), 10 deletions(-) rename tools/oskit/xxdp_rl/{README_license.txt => README_license.md} (100%) diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md index e0632d84..7752dad6 100644 --- a/doc/CHANGELOG.md +++ b/doc/CHANGELOG.md @@ -17,7 +17,8 @@ software or firmware builds or that the documentation is consistent. The full set of tests is only run for tagged releases._ ### Summary -- _nothing yet..._ +- add `sysmon_rbus` in `sys_tst_sram_n4` +- Auto-dection of Digilent boards with FT2232HQ interface --- diff --git a/doc/README_known_issues.md b/doc/README_known_issues.md index 0dba6c0d..6bf37014 100644 --- a/doc/README_known_issues.md +++ b/doc/README_known_issues.md @@ -11,9 +11,13 @@ The case id indicates the release when the issue was first recognized. The 'state number generator' code in `pdp11_sequencer` causes in vivado 2016.1 (and .2) that the main FSM isn't re-coded anymore, which has high impact on achievable clock rate. The two optional debug units depending on -the state number, dmscnt and dmcmon, are therefore currently deactivated in +the state number, `dmscnt` and `dmcmon`, are therefore currently deactivated in all Artix based systems (but are available on all Spartan based systems). +Issue is still in Vivado 2016.4. `dmcmon` can be enabled if wanted, this +might require a reduced clock rate. See procedure given in +[comment to issue #11](https://github.com/wfjm/w11/issues/11). + ### V0.73-2 {[issue #10](https://github.com/wfjm/w11/issues/10)} Many post-synthesis functional and especially post-routing timing simulations currently fail due to startup and initialization problems. diff --git a/rtl/sys_gen/tst_sram/nexys4/sys_tst_sram_n4.vbom b/rtl/sys_gen/tst_sram/nexys4/sys_tst_sram_n4.vbom index 349b2700..9cfbc065 100644 --- a/rtl/sys_gen/tst_sram/nexys4/sys_tst_sram_n4.vbom +++ b/rtl/sys_gen/tst_sram/nexys4/sys_tst_sram_n4.vbom @@ -7,6 +7,7 @@ ../../../vlib/rbus/rbdlib.vhd ../../../vlib/rlink/rlinklib.vbom ../../../bplib/bpgen/bpgenlib.vbom +../../../bplib/sysmon/sysmonrbuslib.vbom ../../../bplib/s3board/s3boardlib.vbom ../../../bplib/nxcramlib/nxcramlib.vhd ${sys_conf := sys_conf.vbom} @@ -19,8 +20,9 @@ ${sys_conf := sys_conf.vbom} ../../../vlib/rlink/rlink_sp2c.vbom ../tst_sram.vbom ../../../bplib/nxcramlib/nx_cram_memctl_as.vbom +../../../bplib/sysmon/sysmonx_rbus_base.vbom ../../../vlib/rbus/rbd_usracc.vbom -../../../vlib/rbus/rb_sres_or_4.vbom +../../../vlib/rbus/rb_sres_or_3.vbom # design sys_tst_sram_n4.vhd @ucf_cpp: sys_tst_sram_n4.ucf diff --git a/rtl/sys_gen/tst_sram/nexys4/sys_tst_sram_n4.vhd b/rtl/sys_gen/tst_sram/nexys4/sys_tst_sram_n4.vhd index 1e9f06cc..aed698fa 100644 --- a/rtl/sys_gen/tst_sram/nexys4/sys_tst_sram_n4.vhd +++ b/rtl/sys_gen/tst_sram/nexys4/sys_tst_sram_n4.vhd @@ -1,6 +1,6 @@ --- $Id: sys_tst_sram_n4.vhd 791 2016-07-21 22:01:10Z mueller $ +-- $Id: sys_tst_sram_n4.vhd 844 2017-01-14 20:01:52Z mueller $ -- --- Copyright 2013-2016 by Walter F.J. Mueller +-- Copyright 2013-2017 by Walter F.J. Mueller -- -- This program is free software; you may redistribute and/or modify it under -- the terms of the GNU General Public License as published by the Free @@ -22,20 +22,23 @@ -- vlib/rlink/rlink_sp2c -- tst_sram -- bplib/nxcramlib/nx_cram_memctl_as +-- bplib/sysmon/sysmonx_rbus_base -- vlib/rbus/rbd_usracc --- vlib/rbus/rb_sres_or_2 +-- vlib/rbus/rb_sres_or_3 -- -- Test bench: tb/tb_tst_sram_n4 -- -- Target Devices: generic --- Tool versions: ise 14.5-14.7; viv 2014.4-2016.2; ghdl 0.29-0.33 +-- Tool versions: ise 14.5-14.7; viv 2014.4-2016.4; ghdl 0.29-0.33 -- -- Synthesized: -- Date Rev viv Target flop lutl lutm bram slic +-- 2017-01-14 844 2016.4 xc7a100t-1 1042 1677 24 5 557 +sysmon -- 2016-03-29 756 2015.4 xc7a100t-1 918 1207 24 5 428 -- -- Revision History: -- Date Rev Version Comment +-- 2017-01-14 844 1.6 add sysmon_rbus -- 2016-07-10 785 1.5.1 SWI(1) now XON -- 2016-07-09 784 1.5 tst_sram with AWIDTH and 22bit support -- 2016-04-02 758 1.4.1 add rbd_usracc (bitfile+jtag timestamp access) @@ -62,6 +65,7 @@ use work.rblib.all; use work.rbdlib.all; use work.rlinklib.all; use work.bpgenlib.all; +use work.sysmonrbuslib.all; use work.s3boardlib.all; use work.nxcramlib.all; use work.sys_conf.all; @@ -128,6 +132,7 @@ architecture syn of sys_tst_sram_n4 is signal SER_MONI : serport_moni_type := serport_moni_init; signal RB_SRES_TST : rb_sres_type := rb_sres_init; + signal RB_SRES_SYSMON : rb_sres_type := rb_sres_init; signal RB_SRES_USRACC : rb_sres_type := rb_sres_init; signal RB_LAM_TST : slbit := '0'; @@ -145,6 +150,8 @@ architecture syn of sys_tst_sram_n4 is signal MEM_DI : slv32 := (others=>'0'); signal MEM_DO : slv32 := (others=>'0'); + constant rbaddr_sysmon: slv16 := x"fb00"; -- fb00/0080: 1111 1011 0xxx xxxx + constant sysid_proj : slv16 := x"0104"; -- tst_sram constant sysid_board : slv8 := x"05"; -- nexys4 constant sysid_vers : slv8 := x"00"; @@ -333,6 +340,20 @@ begin IO_MEM_DATA => IO_MEM_DATA ); + SMRB : sysmonx_rbus_base + generic map ( -- use default INIT_ (Vccint=1.00) + CLK_MHZ => sys_conf_clksys_mhz, + RB_ADDR => rbaddr_sysmon) + port map ( + CLK => CLK, + RESET => GBL_RESET, + RB_MREQ => RB_MREQ, + RB_SRES => RB_SRES_SYSMON, + ALM => open, + OT => open, + TEMP => open + ); + UARB : rbd_usracc port map ( CLK => CLK, @@ -340,10 +361,11 @@ begin RB_SRES => RB_SRES_USRACC ); - RB_SRES_OR : rb_sres_or_2 -- rbus or --------------------------- + RB_SRES_OR : rb_sres_or_3 -- rbus or --------------------------- port map ( RB_SRES_1 => RB_SRES_TST, - RB_SRES_2 => RB_SRES_USRACC, + RB_SRES_2 => RB_SRES_SYSMON, + RB_SRES_3 => RB_SRES_USRACC, RB_SRES_OR => RB_SRES ); diff --git a/tools/oskit/xxdp_rl/README.md b/tools/oskit/xxdp_rl/README.md index 65918244..225d839c 100644 --- a/tools/oskit/xxdp_rl/README.md +++ b/tools/oskit/xxdp_rl/README.md @@ -8,7 +8,7 @@ See notes in [w11a_os_guide.md](../../../doc/w11a_os_guide.md) on 3. Rlink and Backend Server setup 4. Legal terms -**Also read [README_license.txt](README_license.txt) !!** +**Also read [README_license.md](README_license.md) !!** ### Installation A disk images for XXDP V2.2 and V2.5 are available from bitsavers diff --git a/tools/oskit/xxdp_rl/README_license.txt b/tools/oskit/xxdp_rl/README_license.md similarity index 100% rename from tools/oskit/xxdp_rl/README_license.txt rename to tools/oskit/xxdp_rl/README_license.md