- interim release w11a_V0.562 (untagged)

- C++ and Tcl based backend server: many support classes for interfacing to w11 system designs, and the associated Tcl bindings. - add 'asm-11', a simple, Macro-11 syntax subset combatible, assembler. - use now doxygen 1.8.3.1, generate c++,tcl, and vhdl source docs
2026-04-11 07:49:01 +00:00 · 2013-04-13 17:13:15 +00:00
parent 29d2dc5bef
commit 99de9893cb
439 changed files with 21913 additions and 1980 deletions
--- a/32
+++ b/32
@@ -1,4 +1,4 @@
-# $Id: Makefile 472 2013-01-06 14:39:10Z mueller $
+# $Id: Makefile 489 2013-02-17 10:58:02Z mueller $
 #
 # 'Meta Makefile' for whole retro project
 #   allows to make all synthesis targets
@@ -52,12 +52,18 @@ SIM_all += rtl/w11a/tb
 .PHONY : $(SYN_all) $(SIM_all)
 #
 all :
-	@echo "no default action defined, use"
-	@echo "  make -j 4 all_sim"
-	@echo "  make -j 4 all_syn"
-	@echo "  make clean"
-	@echo "  make clean_sim"
-	@echo "  make clean_syn"
+	@echo "no default action defined."
+	@echo "  for VHDL simulation/synthesis use:"
+	@echo "    make -j 4 all_sim"
+	@echo "    make -j 4 all_syn"
+	@echo "    make clean"
+	@echo "    make clean_sim"
+	@echo "    make clean_syn"
+	@echo "  for tool/documentation generation use:"
+	@echo "    make -j 4 all_lib"
+	@echo "    make clean_lib"
+	@echo "    make all_tcl"
+	@echo "    make all_dox"
 #
 #
 clean : clean_sim clean_syn
@@ -85,3 +91,15 @@ $(SIM_all):
 $(SYN_all):
 	$(MAKE) -j 1 -C $@
 #
+all_lib :
+	$(MAKE) -C tools/src
+clean_lib :
+	$(MAKE) -C tools/src distclean
+#
+all_tcl :
+	(cd tools/tcl; setup_packages)
+#
+all_dox :
+	(cd tools/dox; make_doxy)
+#
+all_all : all_sim all_syn all_lib all_tcl
--- a/doc/INSTALL.txt
+++ b/doc/INSTALL.txt
@@ -1,4 +1,4 @@
-# $Id: INSTALL.txt 467 2013-01-02 19:49:05Z mueller $
+# $Id: INSTALL.txt 504 2013-04-13 15:37:24Z mueller $

 Guide to install and build w11a systems, test benches and support software

@@ -22,6 +22,7 @@ Guide to install and build w11a systems, test benches and support software
       a. General instructions
       b. Configuring FPGAs
       c. Available systems
+  9.  Generate Doxygen based source code view

 1. Download ---------------------------------------------------------------

@@ -75,6 +76,9 @@ Guide to install and build w11a systems, test benches and support software
    - ghdl
      -> see INSTALL_ghdl.txt for the unfortunately gory details

+  - for doxygen documentation an up-to-date installation of doxygen is
+    required, version 1.8.3.1 or later
+
  - optional but very useful is:
    - gtkwave
      -> package: gtkwave
@@ -89,13 +93,15 @@ Guide to install and build w11a systems, test benches and support software

    - the definition of the environment variables:
      - RETROBASE: must refer to the installation root directory
-      - BOOSTINC:  pathname for includes of boost library
      - TCLINC:    pathname for includes of Tcl runtime library
      - RETRO_FX2_VID and RETRO_FX2_PID: default USB VID/PID, see below
    - that the tools binary directory is in the path
    - that the tools library directory is in the library path
+    - optional environment variables:
+      - BOOSTINC:  pathname for includes of boost library
+      - BOOSTLIB:  pathname for libraries of boost library
+        {Note: Either both must be undefined, or both must be defined}
    
-
  For bash and alike use

    export RETROBASE=<wdir>
@@ -105,9 +111,10 @@ Guide to install and build w11a systems, test benches and support software
  In most cases the boost library version coming with the distribution will
  work, similar for Tcl, in those cases simply use

-    export BOOSTINC=/usr/include
    export TCLINC=/usr/include/tcl8.5

+  and don't setup BOOSTINC and BOOSTLIB.
+
  After that building functional model based test benches will work. If you 
  want to also build post-xst or post-par test benches read next section.

@@ -378,3 +385,22 @@ Guide to install and build w11a systems, test benches and support software

        cd $RETROBASE/rtl/sys_gen/w11a/nexys3
        make sys_w11a_n3.bit
+
+9. Generate Doxygen based source code view --------------------------------
+
+   Currently there is not much real documentation included in the source
+   files. The doxygen generated html output is nevertheless very useful
+   to browse the code. C++, Tcl and Vhdl source are covered by setup files
+   contained in the project files.
+
+   To generate the html files
+
+     cd $RETROBASE/tools/dox
+     export RETRODOXY <desired root of html documentation>
+     ./make_doxy
+
+   If RETRODOXY is not defined '/tmp' is used. To view the docs use
+
+     firefox $RETRODOXY/w11/cpp/html/index.html &
+     firefox $RETRODOXY/w11/tcl/html/index.html &
+     firefox $RETRODOXY/w11/vhd/html/index.html &
--- a/doc/README.txt
+++ b/doc/README.txt
@@ -1,4 +1,4 @@
-# $Id: README.txt 472 2013-01-06 14:39:10Z mueller $
+# $Id: README.txt 504 2013-04-13 15:37:24Z mueller $

 Release notes for w11a

@@ -8,7 +8,6 @@ Release notes for w11a
  2. Files
  3. Change Log

-
 1. Documentation -------------------------------------------------------------

  More detailed information on installation, build and test can be found 
@@ -58,6 +57,9 @@ Release notes for w11a
   rtl/vlib/xlib                  - Xilinx specific components
   rtl/w11a                     - w11a core
   tools                        helper programs
+   tools/asm-11                 - pdp-11 assembler code
+   tools/asm-11/tests             - test bench for asm-11
+   tools/asm-11/tests-err         - test bench for asm-11 (error check part)
   tools/bin                    - scripts and binaries
   tools/dox                    - Doxygen documentation configuration
   tools/make                   - make includes
@@ -71,10 +73,51 @@ Release notes for w11a
   tools/src/librtcltools         - support classes to implement Tcl bindings
   tools/src/librtools            - general support classes and methods
   tools/src/librutiltpp          - Tcl support commands implemented in C++
+   tools/src/librw11              - w11 over rlink interface
+   tools/src/librwxxtpp           - C++ to tcl binding for w11 over rlink iface
+   tools/tbench                 - w11 CPU test bench
   tools/tcl                    - Tcl scripts

 3. Change Log ----------------------------------------------------------------

+- trunk (2013-06-13: svn rev 19(oc) 505(wfjm); untagged w11a_V0.562) +++++++++
+
+  - Summary
+    - V0.53 introduced a new C++ and Tcl based backend server, but only the
+      very basic rlink handling layer. This step release add now many support
+      classes for interfacing to w11 system designs, and the associated Tcl
+      bindings.
+    - add 'asm-11', a simple, Macro-11 syntax subset combatible, assembler. 
+      Can be used stand-alone to generate 'absolute loader' format files,
+      but also integrates tightly into the Tcl environment and is used as
+      building block in the creation of CPU test benches.
+    - use now doxygen 1.8.3.1, generate c++,tcl, and vhdl source docs
+      See section 9. in INSTALL.txt for details.
+
+  - New features
+    - new directory trees for
+      - tools/asm-11              - asm-11 code
+      - tools/asm-11/tests          - test bench for asm-11
+      - tools/asm-11/tests-err      - test bench for asm-11 (error check part)
+      - tools/src/librw11         - w11 over rlink interface
+      - tools/src/librwxxtpp      - C++ to tcl binding for w11 over rlink iface
+      - tools/tbench              - w11 CPU test bench
+    - new modules
+      - tools/bin
+        - asm-11         - simple, Macro-11 syntax subset compatible, assembler
+        - asm-11_expect  - expect checker for asm-11 test bench
+      - tools/dox
+        - *.Doxyfile     - new descriptors c++,tcl,vhdl docs
+        - make_dox       - driver script to generate c++,tcl,vhdl doxygen docs
+
+  - Changes
+    - vhdl module renames:
+        vlib/serport               -> vlib/serportlib
+    - vhdl module splits:
+        bplib/bpgen/bpgenlib       -> bpgenlib + bpgenrbuslib
+    - C++ class splits
+        librtcltools/RtclProxyBase -> RtclCmdBase + RtclProxyBase
+
 - trunk (2013-01-06: svn rev 18(oc) 472(wfjm); untagged w11a_V0.561) +++++++++

  - Summary
--- a/doc/w11a_tb_guide.txt
+++ b/doc/w11a_tb_guide.txt
@@ -1,4 +1,4 @@
-# $Id: w11a_tb_guide.txt 443 2011-12-23 11:21:03Z mueller $
+# $Id: w11a_tb_guide.txt 504 2013-04-13 15:37:24Z mueller $

 Guide to running w11a test benches

@@ -159,11 +159,6 @@ Guide to running w11a test benches
   simulation, or via a serial port to a FPGA board. This way the same tests 
   can be executed in simulation and on real hardware.

-   Currently two backend implementations are available:
-   - pi_rri: written in perl (old, slow, but full functionality)
-   - ti_tti: written in C++ and Tcl (new, fast, but as of V0.55 only with
-               limited functionality; will replace pi_rri).
-
 4. Available system tests benches -----------------------------------------

 4a. serport tester -- --------------------------------------------
@@ -217,8 +212,8 @@ Guide to running w11a test benches
     time ti_rri --run="tbw tb_tst_rlink_s3" --fifo --logl=3 -- \
       "package require tst_rlink" "tst_rlink::setup" "tst_rlink::test_all" |\
       tee tb_tst_rlink_s3_dsim.log | egrep "(-[EFW]:|FAIL|PEND|DONE)"
-     -> 1822195.0 ns  91100: DONE 
-     -> real 0m13.281s
+     -> 960540.0 ns  48017: DONE
+     -> real 0m4.470s

   - sys_tst_rlink_n2 test bench

@@ -227,8 +222,8 @@ Guide to running w11a test benches
     time ti_rri --run="tbw tb_tst_rlink_n2" --fifo --logl=3 -- \
       "package require tst_rlink" "tst_rlink::setup" "tst_rlink::test_all" |\
       tee tb_tst_rlink_n2_dsim.log | egrep "(-[EFW]:|FAIL|PEND|DONE)"
-     -> 1769140.0 ns  88446: DONE 
-     -> real 0m15.289s
+     -> 960560.0 ns  48017: DONE 
+     -> real 0m4.717s

   - sys_tst_rlink_n3 test bench

@@ -237,8 +232,8 @@ Guide to running w11a test benches
     time ti_rri --run="tbw tb_tst_rlink_n3" --fifo --logl=3 -- \
       "package require tst_rlink" "tst_rlink::setup" "tst_rlink::test_all" |\
       tee tb_tst_rlink_n3_dsim.log | egrep "(-[EFW]:|FAIL|PEND|DONE)"
-     -> 893590.0 ns  89338: DONE
-     -> real 0m9.510s
+     -> 480380.0 ns  48017: DONE
+     -> real 0m4.860s

 4c. w11a systems -----------------------------------------------------

@@ -253,32 +248,44 @@ Guide to running w11a test benches

     cd $RETROBASE/rtl/sys_gen/w11a/s3board/tb
     make tb_w11a_s3
-     time pi_rri --fifo --timeout=40. --cmax=3 \
-        --run="tbw tb_w11a_s3" -- \
-   	 @../../../../w11a/tb/tb_pdp11core_stim.dat |\
+     time ti_rri --pack=rw11a --run="tbw tb_w11a_s3" --fifo --logl=3 -- \
+         "rw11a::setup_cpu" \
+         "rw11a::run_pdpcp ../../../../w11a/tb/tb_pdp11core_stim.dat" |\
       tee tb_w11a_s3_stim2_dsim.log | egrep "(-[EFW]:|FAIL|PEND|DONE)"
-     -> 7852095.0 ns 392595: DONE 
-     -> real 0m49.835s   user 0m50.203s   sys 0m00.696s
+     -> 10225140.0 ns 511247: DONE 
+     -> real 0m52.105s  user 0m0.260s  sys 0m0.132s

   - sys_w11a_n2 test bench

     cd $RETROBASE/rtl/sys_gen/w11a/nexys2/tb
     make tb_w11a_n2
-     time pi_rri --fifo --timeout=40. --cmax=3 \
-        --run="tbw tb_w11a_n2" -- \
-   	 @../../../../w11a/tb/tb_pdp11core_stim.dat |\
+     time ti_rri --pack=rw11a --run="tbw tb_w11a_n2" --fifo --logl=3 -- \
+         "rw11a::setup_cpu" \
+         "rw11a::run_pdpcp ../../../../w11a/tb/tb_pdp11core_stim.dat" |\
       tee tb_w11a_n2_stim2_dsim.log | egrep "(-[EFW]:|FAIL|PEND|DONE)"
-     -> 7836580.0 ns 391818: DONE
-     -> real 1m0.854s   user 1m1.332s   sys 0m0.800s
+     -> 10278380.0 ns 513908: DONE 
+     -> real 1m26.388s  user 0m0.312s  sys 0m0.156s

   - sys_w11a_n3 test bench

     cd $RETROBASE/rtl/sys_gen/w11a/nexys3/tb
     make tb_w11a_n3
-     time pi_rri --fifo --timeout=40. --cmax=3 \
-        --run="tbw tb_w11a_n3" -- \
-   	 @../../../../w11a/tb/tb_pdp11core_stim.dat |\
+     time ti_rri --pack=rw11a --run="tbw tb_w11a_n3" --fifo --logl=3 -- \
+         "rw11a::setup_cpu" \
+         "rw11a::run_pdpcp ../../../../w11a/tb/tb_pdp11core_stim.dat" |\
       tee tb_w11a_n3_stim2_dsim.log | egrep "(-[EFW]:|FAIL|PEND|DONE)"
-     -> 3956540.0 ns 395633: DONE 
-     -> real 1m13.811s   user 1m14.389s   sys 0m0.948s
+     -> 5167410.0 ns 516720: DONE 
+     -> real 1m26.611s   user 0m0.248s   sys 0m0.196s

+   A new, modular w11a test bench is under construction. So far it is very
+   incomplete. This very preliminary version can be executed with
+
+   - sys_w11a_n2 test bench
+
+     cd $RETROBASE/rtl/sys_gen/w11a/nexys2/tb
+     make tb_w11a_n2
+     time ti_rri --pack=rw11a --run="tbw tb_w11a_n2" --fifo --logl=3 -- \
+         "rw11a::setup_cpu" "rw11a::tbench @w11a_all.dat" | \
+       tee w11a_tbench_dsim.log | egrep "(-[EFW]:|FAIL|PASS|DONE)"
+     -> 904180.0 ns  45198: DONE 
+     -> real 0m5.739s   user 0m0.576s   sys 0m0.076s
--- a/rtl/bplib/bpgen/Makefile
+++ b/rtl/bplib/bpgen/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile 405 2011-08-14 08:16:28Z mueller $
+# $Id: Makefile 477 2013-01-27 14:07:10Z mueller $
 #
 #  Revision History: 
 # Date         Rev Version  Comment
@@ -9,7 +9,7 @@
 VBOM_all = $(wildcard *.vbom)
 NGC_all  = $(VBOM_all:.vbom=.ngc)
 #
-ISE_PATH = xc3s1000-ft256-4
+include $(RETROBASE)/rtl/make/xflow_default_s3board.mk
 #
 .PHONY : all clean
 #
@@ -21,5 +21,7 @@ clean : ise_clean
 #
 include $(RETROBASE)/rtl/make/generic_xflow.mk
 #
+ifndef DONTINCDEP
 include $(VBOM_all:.vbom=.dep_xst)
+endif
 #
--- a/rtl/bplib/bpgen/bpgenlib.vbom
+++ b/rtl/bplib/bpgen/bpgenlib.vbom
@@ -1,4 +1,3 @@
 # libs
 ../../vlib/slvtypes.vhd
-../../vlib/rbus/rblib.vhd
 bpgenlib.vhd
--- a/rtl/bplib/bpgen/bpgenlib.vhd
+++ b/rtl/bplib/bpgen/bpgenlib.vhd
@@ -1,4 +1,4 @@
-- $Id: bpgenlib.vhd 472 2013-01-06 14:39:10Z mueller $
+-- $Id: bpgenlib.vhd 476 2013-01-26 22:23:53Z mueller $
 --
 -- Copyright 2011-2013 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
 --
@@ -12,13 +12,14 @@
 -- for complete details.
 --
 ------------------------------------------------------------------------------
-- Package Name:   bpliblib
+-- Package Name:   bpgenlib
 -- Description:    Generic Board/Part components
 -- 
 -- Dependencies:   -
 -- Tool versions:  12.1, 13.3; ghdl 0.26-0.29
 -- Revision History: 
 -- Date         Rev Version  Comment
+-- 2013-01-26   476   1.1    moved rbus depended components to bpgenrbuslib
 -- 2013-01-06   472   1.0.7  add sn_humanio_demu_rbus
 -- 2011-11-16   426   1.0.6  now numeric_std clean
 -- 2011-10-10   413   1.0.5  add sn_humanio_demu
@@ -34,7 +35,6 @@ use ieee.std_logic_1164.all;
 use ieee.numeric_std.all;

 use work.slvtypes.all;
-use work.rblib.all;

 package bpgenlib is

@@ -101,28 +101,6 @@ component bp_swibtnled is               -- generic SWI, BTN and LED handling
  );
 end component;

-component bp_swibtnled_rbus is          -- swi,btn,led handling /w rbus icept
-  generic (
-    SWIDTH : positive := 4;             -- SWI port width
-    BWIDTH : positive := 4;             -- BTN port width
-    LWIDTH : positive := 4;             -- LED port width
-    DEBOUNCE : boolean := true;         -- instantiate debouncer for SWI,BTN
-    RB_ADDR : slv8 := slv(to_unsigned(2#10000000#,8)));
-  port (
-    CLK : in slbit;                     -- clock
-    RESET : in slbit := '0';            -- reset
-    CE_MSEC : in slbit;                 -- 1 ms clock enable
-    RB_MREQ : in rb_mreq_type;          -- rbus: request
-    RB_SRES : out rb_sres_type;         -- rbus: response
-    SWI : out slv(SWIDTH-1 downto 0);   -- switch settings, debounced
-    BTN : out slv(BWIDTH-1 downto 0);   -- button settings, debounced
-    LED : in slv(LWIDTH-1 downto 0);    -- led data
-    I_SWI : in slv(SWIDTH-1 downto 0);  -- pad-i: switches
-    I_BTN : in slv(BWIDTH-1 downto 0);  -- pad-i: buttons
-    O_LED : out slv(LWIDTH-1 downto 0)  -- pad-o: leds
-  );
-end component;
-
 component sn_4x7segctl is               -- Quad 7 segment display controller
  generic (
    CDWIDTH : positive := 6);           -- clk divider width (must be >= 5)
@@ -174,49 +152,4 @@ component sn_humanio_demu is            -- human i/o handling: swi,btn,led only
  );
 end component;

-component sn_humanio_rbus is            -- human i/o handling /w rbus intercept
-  generic (
-    BWIDTH : positive := 4;             -- BTN port width
-    DEBOUNCE : boolean := true;         -- instantiate debouncer for SWI,BTN
-    RB_ADDR : slv8 := slv(to_unsigned(2#10000000#,8)));
-  port (
-    CLK : in slbit;                     -- clock
-    RESET : in slbit := '0';            -- reset
-    CE_MSEC : in slbit;                 -- 1 ms clock enable
-    RB_MREQ : in rb_mreq_type;          -- rbus: request
-    RB_SRES : out rb_sres_type;         -- rbus: response
-    SWI : out slv8;                     -- switch settings, debounced
-    BTN : out slv(BWIDTH-1 downto 0);   -- button settings, debounced
-    LED : in slv8;                      -- led data
-    DSP_DAT : in slv16;                 -- display data
-    DSP_DP : in slv4;                   -- display decimal points
-    I_SWI : in slv8;                    -- pad-i: switches
-    I_BTN : in slv(BWIDTH-1 downto 0);  -- pad-i: buttons
-    O_LED : out slv8;                   -- pad-o: leds
-    O_ANO_N : out slv4;                 -- pad-o: 7 seg disp: anodes   (act.low)
-    O_SEG_N : out slv8                  -- pad-o: 7 seg disp: segments (act.low)
-  );
-end component;
-
-component sn_humanio_demu_rbus is       -- human i/o swi,btn,led only /w rbus
-  generic (
-    DEBOUNCE : boolean := true;         -- instantiate debouncer for SWI,BTN
-    RB_ADDR : slv8 := slv(to_unsigned(2#10000000#,8)));
-  port (
-    CLK : in slbit;                     -- clock
-    RESET : in slbit := '0';            -- reset
-    CE_MSEC : in slbit;                 -- 1 ms clock enable
-    RB_MREQ : in rb_mreq_type;          -- rbus: request
-    RB_SRES : out rb_sres_type;         -- rbus: response
-    SWI : out slv8;                     -- switch settings, debounced
-    BTN : out slv4;                     -- button settings, debounced
-    LED : in slv8;                      -- led data
-    DSP_DAT : in slv16;                 -- display data
-    DSP_DP : in slv4;                   -- display decimal points
-    I_SWI : in slv8;                    -- pad-i: switches
-    I_BTN : in slv6;                    -- pad-i: buttons
-    O_LED : out slv8                    -- pad-o: leds
-  );
-end component;
-
 end package bpgenlib;
--- a/rtl/bplib/bpgen/bpgenrbuslib.vbom
+++ b/rtl/bplib/bpgen/bpgenrbuslib.vbom
@@ -0,0 +1,4 @@
+# libs
+../../vlib/slvtypes.vhd
+../../vlib/rbus/rblib.vhd
+bpgenrbuslib.vhd
--- a/rtl/bplib/bpgen/bpgenrbuslib.vhd
+++ b/rtl/bplib/bpgen/bpgenrbuslib.vhd
@@ -0,0 +1,101 @@
+-- $Id: bpgenrbuslib.vhd 476 2013-01-26 22:23:53Z mueller $
+--
+-- Copyright 2013- by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
+--
+-- 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
+-- Software Foundation, either version 2, or at your option any later version.
+--
+-- This program is distributed in the hope that it will be useful, but
+-- WITHOUT ANY WARRANTY, without even the implied warranty of MERCHANTABILITY
+-- or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+-- for complete details.
+--
+------------------------------------------------------------------------------
+-- Package Name:   bpgenrbuslib
+-- Description:    Generic Board/Part components using rbus
+-- 
+-- Dependencies:   -
+-- Tool versions:  12.1, 13.3; ghdl 0.26-0.29
+-- Revision History: 
+-- Date         Rev Version  Comment
+-- 2013-01-26   476   1.0    Initial version (extracted from bpgenlib)
+------------------------------------------------------------------------------
+
+library ieee;
+use ieee.std_logic_1164.all;
+use ieee.numeric_std.all;
+
+use work.slvtypes.all;
+use work.rblib.all;
+
+package bpgenrbuslib is
+
+component bp_swibtnled_rbus is          -- swi,btn,led handling /w rbus icept
+  generic (
+    SWIDTH : positive := 4;             -- SWI port width
+    BWIDTH : positive := 4;             -- BTN port width
+    LWIDTH : positive := 4;             -- LED port width
+    DEBOUNCE : boolean := true;         -- instantiate debouncer for SWI,BTN
+    RB_ADDR : slv8 := slv(to_unsigned(2#10000000#,8)));
+  port (
+    CLK : in slbit;                     -- clock
+    RESET : in slbit := '0';            -- reset
+    CE_MSEC : in slbit;                 -- 1 ms clock enable
+    RB_MREQ : in rb_mreq_type;          -- rbus: request
+    RB_SRES : out rb_sres_type;         -- rbus: response
+    SWI : out slv(SWIDTH-1 downto 0);   -- switch settings, debounced
+    BTN : out slv(BWIDTH-1 downto 0);   -- button settings, debounced
+    LED : in slv(LWIDTH-1 downto 0);    -- led data
+    I_SWI : in slv(SWIDTH-1 downto 0);  -- pad-i: switches
+    I_BTN : in slv(BWIDTH-1 downto 0);  -- pad-i: buttons
+    O_LED : out slv(LWIDTH-1 downto 0)  -- pad-o: leds
+  );
+end component;
+
+component sn_humanio_rbus is            -- human i/o handling /w rbus intercept
+  generic (
+    BWIDTH : positive := 4;             -- BTN port width
+    DEBOUNCE : boolean := true;         -- instantiate debouncer for SWI,BTN
+    RB_ADDR : slv8 := slv(to_unsigned(2#10000000#,8)));
+  port (
+    CLK : in slbit;                     -- clock
+    RESET : in slbit := '0';            -- reset
+    CE_MSEC : in slbit;                 -- 1 ms clock enable
+    RB_MREQ : in rb_mreq_type;          -- rbus: request
+    RB_SRES : out rb_sres_type;         -- rbus: response
+    SWI : out slv8;                     -- switch settings, debounced
+    BTN : out slv(BWIDTH-1 downto 0);   -- button settings, debounced
+    LED : in slv8;                      -- led data
+    DSP_DAT : in slv16;                 -- display data
+    DSP_DP : in slv4;                   -- display decimal points
+    I_SWI : in slv8;                    -- pad-i: switches
+    I_BTN : in slv(BWIDTH-1 downto 0);  -- pad-i: buttons
+    O_LED : out slv8;                   -- pad-o: leds
+    O_ANO_N : out slv4;                 -- pad-o: 7 seg disp: anodes   (act.low)
+    O_SEG_N : out slv8                  -- pad-o: 7 seg disp: segments (act.low)
+  );
+end component;
+
+component sn_humanio_demu_rbus is       -- human i/o swi,btn,led only /w rbus
+  generic (
+    DEBOUNCE : boolean := true;         -- instantiate debouncer for SWI,BTN
+    RB_ADDR : slv8 := slv(to_unsigned(2#10000000#,8)));
+  port (
+    CLK : in slbit;                     -- clock
+    RESET : in slbit := '0';            -- reset
+    CE_MSEC : in slbit;                 -- 1 ms clock enable
+    RB_MREQ : in rb_mreq_type;          -- rbus: request
+    RB_SRES : out rb_sres_type;         -- rbus: response
+    SWI : out slv8;                     -- switch settings, debounced
+    BTN : out slv4;                     -- button settings, debounced
+    LED : in slv8;                      -- led data
+    DSP_DAT : in slv16;                 -- display data
+    DSP_DP : in slv4;                   -- display decimal points
+    I_SWI : in slv8;                    -- pad-i: switches
+    I_BTN : in slv6;                    -- pad-i: buttons
+    O_LED : out slv8                    -- pad-o: leds
+  );
+end component;
+
+end package bpgenrbuslib;
--- a/rtl/bplib/fx2lib/Makefile
+++ b/rtl/bplib/fx2lib/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile 405 2011-08-14 08:16:28Z mueller $
+# $Id: Makefile 477 2013-01-27 14:07:10Z mueller $
 #
 #  Revision History: 
 # Date         Rev Version  Comment
@@ -8,7 +8,7 @@
 VBOM_all = $(wildcard *.vbom)
 NGC_all  = $(VBOM_all:.vbom=.ngc)
 #
-ISE_PATH = xc3s1200e-fg320-4
+include $(RETROBASE)/rtl/make/xflow_default_nexys2.mk
 #
 .PHONY : all clean
 #
@@ -20,5 +20,7 @@ clean : ise_clean
 #
 include $(RETROBASE)/rtl/make/generic_xflow.mk
 #
+ifndef DONTINCDEP
 include $(VBOM_all:.vbom=.dep_xst)
+endif
 #
--- a/rtl/bplib/issi/Makefile
+++ b/rtl/bplib/issi/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile 405 2011-08-14 08:16:28Z mueller $
+# $Id: Makefile 477 2013-01-27 14:07:10Z mueller $
 #
 #  Revision History: 
 # Date         Rev Version  Comment
@@ -16,5 +16,7 @@ include $(RETROBASE)/rtl/make/generic_ghdl.mk
 #
 VBOM_all = $(wildcard *.vbom)
 #
+ifndef DONTINCDEP
 include $(VBOM_all:.vbom=.dep_ghdl)
+endif
 #
--- a/rtl/bplib/nexys2/Makefile
+++ b/rtl/bplib/nexys2/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile 405 2011-08-14 08:16:28Z mueller $
+# $Id: Makefile 477 2013-01-27 14:07:10Z mueller $
 #
 #  Revision History: 
 # Date         Rev Version  Comment
@@ -8,7 +8,7 @@
 VBOM_all = $(wildcard *.vbom)
 NGC_all  = $(VBOM_all:.vbom=.ngc)
 #
-ISE_PATH = xc3s1200e-fg320-4
+include $(RETROBASE)/rtl/make/xflow_default_nexys2.mk
 #
 .PHONY : all clean
 #
@@ -20,5 +20,7 @@ clean : ise_clean
 #
 include $(RETROBASE)/rtl/make/generic_xflow.mk
 #
+ifndef DONTINCDEP
 include $(VBOM_all:.vbom=.dep_xst)
+endif
 #
--- a/rtl/bplib/nexys2/tb/Makefile
+++ b/rtl/bplib/nexys2/tb/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile 467 2013-01-02 19:49:05Z mueller $
+# $Id: Makefile 477 2013-01-27 14:07:10Z mueller $
 #
 #  Revision History: 
 # Date         Rev Version  Comment
@@ -13,7 +13,7 @@ EXE_all  = tb_nexys2_dummy
 EXE_all += tb_nexys2_fusp_dummy
 EXE_all += tb_nexys2_fusp_cuff_dummy
 #
-ISE_PATH = xc3s1200e-fg320-4
+include $(RETROBASE)/rtl/make/xflow_default_nexys2.mk
 #
 .PHONY : all all_ssim all_tsim clean
 #
@@ -31,8 +31,10 @@ include $(RETROBASE)/rtl/make/generic_xflow.mk
 #
 VBOM_all = $(wildcard *.vbom)
 #
+ifndef DONTINCDEP
 include $(VBOM_all:.vbom=.dep_xst)
 include $(VBOM_all:.vbom=.dep_ghdl)
 include $(VBOM_all:.vbom=.dep_isim)
 include $(wildcard *.o.dep_ghdl)
+endif
 #
--- a/rtl/bplib/nexys2/tb/tb_nexys2_core.vbom
+++ b/rtl/bplib/nexys2/tb/tb_nexys2_core.vbom
@@ -1,6 +1,6 @@
 # libs
 ../../../vlib/slvtypes.vhd
-../../../vlib/serport/serport.vhd
+../../../vlib/serport/serportlib.vbom
 ../../../vlib/simlib/simbus.vhd
 # components
 ../../../vlib/serport/serport_uart_rx.vbom
--- a/rtl/bplib/nexys2/tb/tb_nexys2_core.vhd
+++ b/rtl/bplib/nexys2/tb/tb_nexys2_core.vhd
@@ -1,4 +1,4 @@
-- $Id: tb_nexys2_core.vhd 433 2011-11-27 22:04:39Z mueller $
+-- $Id: tb_nexys2_core.vhd 476 2013-01-26 22:23:53Z mueller $
 --
 -- Copyright 2010-2011 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
 --
@@ -36,7 +36,7 @@ use ieee.std_logic_textio.all;
 use std.textio.all;

 use work.slvtypes.all;
-use work.serport.all;
+use work.serportlib.all;
 use work.simbus.all;

 entity tb_nexys2_core is
--- a/rtl/bplib/nexys2/tb/tb_nexys2_fusp.vbom
+++ b/rtl/bplib/nexys2/tb/tb_nexys2_fusp.vbom
@@ -6,7 +6,7 @@
 ../../../vlib/slvtypes.vhd
 ../../../vlib/rlink/rlinklib.vbom
 ../../../vlib/rlink/tb/rlinktblib.vhd
-../../../vlib/serport/serport.vhd
+../../../vlib/serport/serportlib.vbom
 ../../../vlib/xlib/xlib.vhd
 ../nexys2lib.vhd
 ../../../vlib/simlib/simlib.vhd
--- a/rtl/bplib/nexys2/tb/tb_nexys2_fusp.vhd
+++ b/rtl/bplib/nexys2/tb/tb_nexys2_fusp.vhd
@@ -1,4 +1,4 @@
-- $Id: tb_nexys2_fusp.vhd 467 2013-01-02 19:49:05Z mueller $
+-- $Id: tb_nexys2_fusp.vhd 476 2013-01-26 22:23:53Z mueller $
 --
 -- Copyright 2010-2011 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
 --
@@ -49,7 +49,7 @@ use std.textio.all;
 use work.slvtypes.all;
 use work.rlinklib.all;
 use work.rlinktblib.all;
-use work.serport.all;
+use work.serportlib.all;
 use work.xlib.all;
 use work.nexys2lib.all;
 use work.simlib.all;
--- a/rtl/bplib/nexys2/tb/tb_nexys2_fusp_cuff.vbom
+++ b/rtl/bplib/nexys2/tb/tb_nexys2_fusp_cuff.vbom
@@ -6,7 +6,7 @@
 ../../../vlib/slvtypes.vhd
 ../../../vlib/rlink/rlinklib.vbom
 ../../../vlib/rlink/tb/rlinktblib.vhd
-../../../vlib/serport/serport.vhd
+../../../vlib/serport/serportlib.vbom
 ../../../vlib/xlib/xlib.vhd
 ../nexys2lib.vhd
 ../../../vlib/simlib/simlib.vhd
--- a/rtl/bplib/nexys2/tb/tb_nexys2_fusp_cuff.vhd
+++ b/rtl/bplib/nexys2/tb/tb_nexys2_fusp_cuff.vhd
@@ -1,4 +1,4 @@
-- $Id: tb_nexys2_fusp_cuff.vhd 469 2013-01-05 12:29:44Z mueller $
+-- $Id: tb_nexys2_fusp_cuff.vhd 476 2013-01-26 22:23:53Z mueller $
 --
 -- Copyright 2013- by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
 --
@@ -44,7 +44,7 @@ use std.textio.all;
 use work.slvtypes.all;
 use work.rlinklib.all;
 use work.rlinktblib.all;
-use work.serport.all;
+use work.serportlib.all;
 use work.xlib.all;
 use work.nexys2lib.all;
 use work.simlib.all;
--- a/rtl/bplib/nexys3/tb/Makefile
+++ b/rtl/bplib/nexys3/tb/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile 433 2011-11-27 22:04:39Z mueller $
+# $Id: Makefile 477 2013-01-27 14:07:10Z mueller $
 #
 #  Revision History: 
 # Date         Rev Version  Comment
@@ -6,10 +6,7 @@
 #
 EXE_all = tb_nexys3_fusp_dummy 
 #
-ISE_PATH  = xc6slx16-csg324-2
-#
-XFLOWOPT_SYN = syn_s6_speed.opt
-XFLOWOPT_IMP = imp_s6_speed.opt
+include $(RETROBASE)/rtl/make/xflow_default_nexys3.mk
 #
 .PHONY : all all_ssim all_tsim clean
 #
@@ -27,8 +24,10 @@ include $(RETROBASE)/rtl/make/generic_xflow.mk
 #
 VBOM_all = $(wildcard *.vbom)
 #
+ifndef DONTINCDEP
 include $(VBOM_all:.vbom=.dep_xst)
 include $(VBOM_all:.vbom=.dep_ghdl)
 include $(VBOM_all:.vbom=.dep_isim)
 include $(wildcard *.o.dep_ghdl)
+endif
 #
--- a/rtl/bplib/nexys3/tb/tb_nexys3_core.vbom
+++ b/rtl/bplib/nexys3/tb/tb_nexys3_core.vbom
@@ -1,6 +1,6 @@
 # libs
 ../../../vlib/slvtypes.vhd
-../../../vlib/serport/serport.vhd
+../../../vlib/serport/serportlib.vbom
 ../../../vlib/simlib/simbus.vhd
 # components
 ../../../vlib/serport/serport_uart_rx.vbom
--- a/rtl/bplib/nexys3/tb/tb_nexys3_core.vhd
+++ b/rtl/bplib/nexys3/tb/tb_nexys3_core.vhd
@@ -1,4 +1,4 @@
-- $Id: tb_nexys3_core.vhd 432 2011-11-25 20:16:28Z mueller $
+-- $Id: tb_nexys3_core.vhd 476 2013-01-26 22:23:53Z mueller $
 --
 -- Copyright 2011- by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
 --
@@ -33,7 +33,7 @@ use ieee.std_logic_textio.all;
 use std.textio.all;

 use work.slvtypes.all;
-use work.serport.all;
+use work.serportlib.all;
 use work.simbus.all;

 entity tb_nexys3_core is
--- a/rtl/bplib/nexys3/tb/tb_nexys3_fusp.vbom
+++ b/rtl/bplib/nexys3/tb/tb_nexys3_fusp.vbom
@@ -6,7 +6,7 @@
 ../../../vlib/slvtypes.vhd
 ../../../vlib/rlink/rlinklib.vbom
 ../../../vlib/rlink/tb/rlinktblib.vhd
-../../../vlib/serport/serport.vhd
+../../../vlib/serport/serportlib.vbom
 ../../../vlib/xlib/xlib.vhd
 ../nexys3lib.vhd
 ../../../vlib/simlib/simlib.vhd
--- a/rtl/bplib/nexys3/tb/tb_nexys3_fusp.vhd
+++ b/rtl/bplib/nexys3/tb/tb_nexys3_fusp.vhd
@@ -1,4 +1,4 @@
-- $Id: tb_nexys3_fusp.vhd 444 2011-12-25 10:04:58Z mueller $
+-- $Id: tb_nexys3_fusp.vhd 476 2013-01-26 22:23:53Z mueller $
 --
 -- Copyright 2011- by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
 --
@@ -43,7 +43,7 @@ use std.textio.all;
 use work.slvtypes.all;
 use work.rlinklib.all;
 use work.rlinktblib.all;
-use work.serport.all;
+use work.serportlib.all;
 use work.xlib.all;
 use work.nexys3lib.all;
 use work.simlib.all;
--- a/rtl/bplib/nxcramlib/Makefile
+++ b/rtl/bplib/nxcramlib/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile 433 2011-11-27 22:04:39Z mueller $
+# $Id: Makefile 477 2013-01-27 14:07:10Z mueller $
 #
 #  Revision History: 
 # Date         Rev Version  Comment
@@ -7,7 +7,7 @@
 VBOM_all = $(wildcard *.vbom)
 NGC_all  = $(VBOM_all:.vbom=.ngc)
 #
-ISE_PATH = xc3s1200e-fg320-4
+include $(RETROBASE)/rtl/make/xflow_default_nexys2.mk
 #
 .PHONY : all clean
 #
@@ -19,5 +19,7 @@ clean : ise_clean
 #
 include $(RETROBASE)/rtl/make/generic_xflow.mk
 #
+ifndef DONTINCDEP
 include $(VBOM_all:.vbom=.dep_xst)
+endif
 #
--- a/rtl/bplib/nxcramlib/tb/Makefile
+++ b/rtl/bplib/nxcramlib/tb/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile 433 2011-11-27 22:04:39Z mueller $
+# $Id: Makefile 477 2013-01-27 14:07:10Z mueller $
 #
 #  Revision History: 
 # Date         Rev Version  Comment
@@ -6,7 +6,7 @@
 #
 EXE_all = tb_nx_cram_memctl_as
 #
-ISE_PATH = xc3s1200e-fg320-4
+include $(RETROBASE)/rtl/make/xflow_default_nexys2.mk
 #
 .PHONY : all all_ssim all_tsim clean
 #
@@ -24,8 +24,10 @@ include $(RETROBASE)/rtl/make/generic_xflow.mk
 #
 VBOM_all = $(wildcard *.vbom)
 #
+ifndef DONTINCDEP
 include $(VBOM_all:.vbom=.dep_xst)
 include $(VBOM_all:.vbom=.dep_ghdl)
 include $(VBOM_all:.vbom=.dep_isim)
 include $(wildcard *.o.dep_ghdl)
+endif
 #
--- a/rtl/bplib/s3board/Makefile
+++ b/rtl/bplib/s3board/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile 405 2011-08-14 08:16:28Z mueller $
+# $Id: Makefile 477 2013-01-27 14:07:10Z mueller $
 #
 #  Revision History: 
 # Date         Rev Version  Comment
@@ -9,7 +9,7 @@
 VBOM_all = $(wildcard *.vbom)
 NGC_all  = $(VBOM_all:.vbom=.ngc)
 #
-ISE_PATH = xc3s1000-ft256-4
+include $(RETROBASE)/rtl/make/xflow_default_s3board.mk
 #
 .PHONY : all clean
 #
@@ -21,5 +21,7 @@ clean : ise_clean
 #
 include $(RETROBASE)/rtl/make/generic_xflow.mk
 #
+ifndef DONTINCDEP
 include $(VBOM_all:.vbom=.dep_xst)
+endif
 #
--- a/rtl/bplib/s3board/tb/Makefile
+++ b/rtl/bplib/s3board/tb/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile 444 2011-12-25 10:04:58Z mueller $
+# $Id: Makefile 477 2013-01-27 14:07:10Z mueller $
 #
 #  Revision History: 
 # Date         Rev Version  Comment
@@ -13,7 +13,7 @@ EXE_all  = tb_s3board_dummy
 EXE_all += tb_s3board_fusp_dummy 
 EXE_all += tb_s3_sram_memctl
 #
-ISE_PATH = xc3s1000-ft256-4
+include $(RETROBASE)/rtl/make/xflow_default_s3board.mk
 #
 .PHONY : all all_ssim all_tsim clean
 #
@@ -31,8 +31,10 @@ include $(RETROBASE)/rtl/make/generic_xflow.mk
 #
 VBOM_all = $(wildcard *.vbom)
 #
+ifndef DONTINCDEP
 include $(VBOM_all:.vbom=.dep_xst)
 include $(VBOM_all:.vbom=.dep_ghdl)
 include $(VBOM_all:.vbom=.dep_isim)
 include $(wildcard *.o.dep_ghdl)
+endif
 #
--- a/rtl/bplib/s3board/tb/tb_s3board_core.vbom
+++ b/rtl/bplib/s3board/tb/tb_s3board_core.vbom
@@ -1,6 +1,6 @@
 # libs
 ../../../vlib/slvtypes.vhd
-../../../vlib/serport/serport.vhd
+../../../vlib/serport/serportlib.vbom
 ../../../vlib/simlib/simbus.vhd
 # components
 ../../../vlib/serport/serport_uart_rx.vbom
--- a/rtl/bplib/s3board/tb/tb_s3board_core.vhd
+++ b/rtl/bplib/s3board/tb/tb_s3board_core.vhd
@@ -1,4 +1,4 @@
-- $Id: tb_s3board_core.vhd 427 2011-11-19 21:04:11Z mueller $
+-- $Id: tb_s3board_core.vhd 476 2013-01-26 22:23:53Z mueller $
 --
 -- Copyright 2010-2011 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
 --
@@ -35,7 +35,7 @@ use ieee.std_logic_textio.all;
 use std.textio.all;

 use work.slvtypes.all;
-use work.serport.all;
+use work.serportlib.all;
 use work.simbus.all;

 entity tb_s3board_core is
--- a/rtl/bplib/s3board/tb/tb_s3board_fusp.vbom
+++ b/rtl/bplib/s3board/tb/tb_s3board_fusp.vbom
@@ -6,7 +6,7 @@
 ../../../vlib/slvtypes.vhd
 ../../../vlib/rlink/rlinklib.vbom
 ../../../vlib/rlink/tb/rlinktblib.vhd
-../../../vlib/serport/serport.vhd
+../../../vlib/serport/serportlib.vbom
 ../s3boardlib.vbom
 ../../../vlib/simlib/simlib.vhd
 ../../../vlib/simlib/simbus.vhd
--- a/rtl/bplib/s3board/tb/tb_s3board_fusp.vhd
+++ b/rtl/bplib/s3board/tb/tb_s3board_fusp.vhd
@@ -1,4 +1,4 @@
-- $Id: tb_s3board_fusp.vhd 444 2011-12-25 10:04:58Z mueller $
+-- $Id: tb_s3board_fusp.vhd 476 2013-01-26 22:23:53Z mueller $
 --
 -- Copyright 2010-2011 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
 --
@@ -47,7 +47,7 @@ use std.textio.all;
 use work.slvtypes.all;
 use work.rlinklib.all;
 use work.rlinktblib.all;
-use work.serport.all;
+use work.serportlib.all;
 use work.s3boardlib.all;
 use work.simlib.all;
 use work.simbus.all;
--- a/rtl/ibus/Makefile
+++ b/rtl/ibus/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile 405 2011-08-14 08:16:28Z mueller $
+# $Id: Makefile 477 2013-01-27 14:07:10Z mueller $
 #
 #  Revision History: 
 # Date         Rev Version  Comment
@@ -8,6 +8,9 @@
 VBOM_all = $(wildcard *.vbom)
 NGC_all  = $(VBOM_all:.vbom=.ngc)
 #
+# reference board for test synthesis is Spartan-6 based Nexys3
+include $(RETROBASE)/rtl/make/xflow_default_nexys3.mk
+#
 .PHONY : all clean
 #
 all : $(NGC_all)
@@ -18,5 +21,7 @@ clean : ise_clean
 #
 include $(RETROBASE)/rtl/make/generic_xflow.mk
 #
+ifndef DONTINCDEP
 include $(VBOM_all:.vbom=.dep_xst)
+endif
 #
--- a/rtl/make/dontincdep.mk
+++ b/rtl/make/dontincdep.mk
@@ -0,0 +1,21 @@
+# $Id: dontincdep.mk 477 2013-01-27 14:07:10Z mueller $
+#
+#  Revision History: 
+# Date         Rev Version  Comment
+# 2013-01-27   477   1.0    Initial version
+#
+# DONTINCDEP controls whether dependency files are included. Set it if
+# any of the 'clean' type targets is involved
+#
+ifneq  ($(findstring clean, $(MAKECMDGOALS)),)
+DONTINCDEP = 1
+endif
+ifneq  ($(findstring realclean, $(MAKECMDGOALS)),)
+DONTINCDEP = 1
+endif
+ifneq  ($(findstring distclean, $(MAKECMDGOALS)),)
+DONTINCDEP = 1
+endif
+ifdef DONTINCDEP
+$(info DONTINCDEP set, *.dep files not included)
+endif
--- a/rtl/make/generic_ghdl.mk
+++ b/rtl/make/generic_ghdl.mk
@@ -1,7 +1,8 @@
-# $Id: generic_ghdl.mk 405 2011-08-14 08:16:28Z mueller $
+# $Id: generic_ghdl.mk 477 2013-01-27 14:07:10Z mueller $
 #
 #  Revision History: 
-# Date         Rev Version Comment
+# Date         Rev Version  Comment
+# 2013-01-27   477   1.3.1  use dontincdep.mk to suppress .dep include on clean
 # 2011-08-13   405   1.3    renamed, moved to rtl/make;
 # 2007-11-04    95   1.2.2  fix find statement in ghdl_tmp_clean
 # 2007-11-02    94   1.2.1  don't delete cext_*.o in ghdl_tmp_clean
@@ -33,6 +34,8 @@ LINK.vhd = $(GHDL) -e $(GHDLIEEE)
 %.dep_ghdl: %.vbom
 	vbomconv --dep_ghdl $< > $@
 #
+include $(RETROBASE)/rtl/make/dontincdep.mk
+#
 .PHONY: ghdl_clean ghdl_tmp_clean
 #
 ghdl_clean: ghdl_tmp_clean
--- a/rtl/make/generic_isim.mk
+++ b/rtl/make/generic_isim.mk
@@ -1,7 +1,8 @@
-# $Id: generic_isim.mk 405 2011-08-14 08:16:28Z mueller $
+# $Id: generic_isim.mk 477 2013-01-27 14:07:10Z mueller $
 #
 #  Revision History: 
-# Date         Rev Version Comment
+# Date         Rev Version  Comment
+# 2013-01-27   477   1.2.1  use dontincdep.mk to suppress .dep include on clean
 # 2011-08-13   405   1.2    renamed, moved to rtl/make;
 # 2010-04-26   284   1.1    add _[sft]sim support
 # 2009-11-22   252   1.0    Initial version
@@ -35,6 +36,8 @@ FUSE = fuse
 %.dep_isim: %.vbom
 	vbomconv --dep_isim $< > $@
 #
+include $(RETROBASE)/rtl/make/dontincdep.mk
+#
 .PHONY: isim_clean isim_tmp_clean
 #
 isim_clean: isim_tmp_clean
--- a/rtl/make/generic_xflow.mk
+++ b/rtl/make/generic_xflow.mk
@@ -1,7 +1,9 @@
-# $Id: generic_xflow.mk 470 2013-01-05 17:28:46Z mueller $
+# $Id: generic_xflow.mk 477 2013-01-27 14:07:10Z mueller $
 #
 #  Revision History: 
 # Date         Rev Version  Comment
+# 2013-01-27   477   1.8    remove defaults for ISE_(BOARD|PATH) and XFLOWOPT_*
+#                           use dontincdep.mk to suppress .dep include on clean
 # 2013-01-05   470   1.7.6  remove '-r' from all non-dir clean rm's
 # 2012-02-05   456   1.7.5  use vbomvonv --get_top for xflow calls
 # 2012-01-08   451   1.7.4  use xilinx_ghdl_sdf_filter
@@ -40,11 +42,11 @@
 # setup default board (for impact), device and userid (for bitgen)
 #
 ifndef ISE_BOARD
-ISE_BOARD = s3board
+$(error ISE_BOARD is not defined)
 endif
 #
 ifndef ISE_PATH
-ISE_PATH  = xc3s1000-ft256-4
+$(error ISE_PATH is not defined)
 endif
 #
 ifndef ISE_USERID
@@ -54,11 +56,11 @@ endif
 # setup defaults for xflow option files for synthesis and implementation
 #
 ifndef XFLOWOPT_SYN
-XFLOWOPT_SYN = syn_s3_speed.opt
+$(error XFLOWOPT_SYN is not defined)
 endif
 #
 ifndef XFLOWOPT_IMP
-XFLOWOPT_IMP = imp_s3_speed.opt
+$(error XFLOWOPT_IMP is not defined)
 endif
 #
 XFLOW    = xflow -p ${ISE_PATH} 
@@ -298,6 +300,8 @@ endif
 	cpp -I${RETROBASE}/rtl -MM $*.ucf_cpp |\
            sed 's/\.o:/\.ucf:/' > $*.dep_ucf_cpp
 #
+include $(RETROBASE)/rtl/make/dontincdep.mk
+#
 .PHONY : ise_clean ise_tmp_clean
 #
 ise_clean: ise_tmp_clean
--- a/rtl/make/xflow_default_atlys.mk
+++ b/rtl/make/xflow_default_atlys.mk
@@ -0,0 +1,24 @@
+# $Id: xflow_default_atlys.mk 477 2013-01-27 14:07:10Z mueller $
+#
+#  Revision History: 
+# Date         Rev Version  Comment
+# 2013-01-27   477   1.0    Initial version
+#---
+#
+# Setup for Digilent Atlys
+#
+# setup default board (for impact), device and userid (for bitgen)
+#
+ISE_BOARD = atlys
+ISE_PATH  = xc6slx45-csg324-2
+#
+# setup defaults for xflow option files for synthesis and implementation
+#
+ifndef XFLOWOPT_SYN
+XFLOWOPT_SYN = syn_s6_speed.opt
+endif
+#
+ifndef XFLOWOPT_IMP
+XFLOWOPT_IMP = imp_s6_speed.opt
+endif
+#
--- a/rtl/make/xflow_default_nexys2.mk
+++ b/rtl/make/xflow_default_nexys2.mk
@@ -0,0 +1,24 @@
+# $Id: xflow_default_nexys2.mk 477 2013-01-27 14:07:10Z mueller $
+#
+#  Revision History: 
+# Date         Rev Version  Comment
+# 2013-01-27   477   1.0    Initial version
+#---
+#
+# Setup for Digilent Nexys2
+#
+# setup default board (for impact), device and userid (for bitgen)
+#
+ISE_BOARD = nexys2
+ISE_PATH  = xc3s1200e-fg320-4
+#
+# setup defaults for xflow option files for synthesis and implementation
+#
+ifndef XFLOWOPT_SYN
+XFLOWOPT_SYN = syn_s3_speed.opt
+endif
+#
+ifndef XFLOWOPT_IMP
+XFLOWOPT_IMP = imp_s3_speed.opt
+endif
+#
--- a/rtl/make/xflow_default_nexys3.mk
+++ b/rtl/make/xflow_default_nexys3.mk
@@ -0,0 +1,24 @@
+# $Id: xflow_default_nexys3.mk 477 2013-01-27 14:07:10Z mueller $
+#
+#  Revision History: 
+# Date         Rev Version  Comment
+# 2013-01-27   477   1.0    Initial version
+#---
+#
+# Setup for Digilent Nexys3
+#
+# setup default board (for impact), device and userid (for bitgen)
+#
+ISE_BOARD = nexys3
+ISE_PATH  = xc6slx16-csg324-2
+#
+# setup defaults for xflow option files for synthesis and implementation
+#
+ifndef XFLOWOPT_SYN
+XFLOWOPT_SYN = syn_s6_speed.opt
+endif
+#
+ifndef XFLOWOPT_IMP
+XFLOWOPT_IMP = imp_s6_speed.opt
+endif
+#
--- a/rtl/make/xflow_default_s3board.mk
+++ b/rtl/make/xflow_default_s3board.mk
@@ -0,0 +1,24 @@
+# $Id: xflow_default_s3board.mk 477 2013-01-27 14:07:10Z mueller $
+#
+#  Revision History: 
+# Date         Rev Version  Comment
+# 2013-01-27   477   1.0    Initial version
+#---
+#
+# Setup for Digilent S3BOARD (with 1000 die size)
+#
+# setup default board (for impact), device and userid (for bitgen)
+#
+ISE_BOARD = s3board
+ISE_PATH  = xc3s1000-ft256-4
+#
+# setup defaults for xflow option files for synthesis and implementation
+#
+ifndef XFLOWOPT_SYN
+XFLOWOPT_SYN = syn_s3_speed.opt
+endif
+#
+ifndef XFLOWOPT_IMP
+XFLOWOPT_IMP = imp_s3_speed.opt
+endif
+#
--- a/rtl/make/xflow_default_s3board_200.mk
+++ b/rtl/make/xflow_default_s3board_200.mk
@@ -0,0 +1,24 @@
+# $Id: xflow_default_s3board_200.mk 477 2013-01-27 14:07:10Z mueller $
+#
+#  Revision History: 
+# Date         Rev Version  Comment
+# 2013-01-27   477   1.0    Initial version
+#---
+#
+# Setup for Digilent S3BOARD (with 200 die size)
+#
+# setup default board (for impact), device and userid (for bitgen)
+#
+ISE_BOARD = s3board
+ISE_PATH  = xc3s200-ft256-4
+#
+# setup defaults for xflow option files for synthesis and implementation
+#
+ifndef XFLOWOPT_SYN
+XFLOWOPT_SYN = syn_s3_speed.opt
+endif
+#
+ifndef XFLOWOPT_IMP
+XFLOWOPT_IMP = imp_s3_speed.opt
+endif
+#
--- a/rtl/sys_gen/tst_fx2loop/Makefile
+++ b/rtl/sys_gen/tst_fx2loop/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile 470 2013-01-05 17:28:46Z mueller $
+# $Id: Makefile 477 2013-01-27 14:07:10Z mueller $
 #
 #  Revision History: 
 # Date         Rev Version  Comment
@@ -9,7 +9,7 @@
 VBOM_all = $(wildcard *.vbom)
 NGC_all  = $(VBOM_all:.vbom=.ngc)
 #
-ISE_PATH = xc3s1200e-fg320-4
+include $(RETROBASE)/rtl/make/xflow_default_nexys2.mk
 #
 .PHONY : all clean realclean
 #
@@ -34,5 +34,7 @@ tst_fx2loop_si : tst_fx2loop_si.c
 #
 include $(RETROBASE)/rtl/make/generic_xflow.mk
 #
+ifndef DONTINCDEP
 include $(VBOM_all:.vbom=.dep_xst)
+endif
 #
--- a/rtl/sys_gen/tst_fx2loop/nexys2/ic/Makefile
+++ b/rtl/sys_gen/tst_fx2loop/nexys2/ic/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile 453 2012-01-15 17:51:18Z mueller $
+# $Id: Makefile 477 2013-01-27 14:07:10Z mueller $
 #
 #  Revision History: 
 # Date         Rev Version  Comment
@@ -8,8 +8,7 @@
 VBOM_all  = $(wildcard *.vbom)
 BIT_all   = $(VBOM_all:.vbom=.bit)
 #
-ISE_BOARD = nexys2
-ISE_PATH  = xc3s1200e-fg320-4
+include $(RETROBASE)/rtl/make/xflow_default_nexys2.mk
 FX2_FILE  = nexys2_jtag_2fifo_ic.ihx
 #
 .PHONY : all clean
@@ -24,6 +23,8 @@ clean : ise_clean
 include $(RETROBASE)/rtl/make/generic_xflow.mk
 include $(RETROBASE)/rtl/make/generic_ghdl.mk
 #
+ifndef DONTINCDEP
 include $(VBOM_all:.vbom=.dep_xst)
 include $(VBOM_all:.vbom=.dep_ghdl)
+endif
 #
--- a/rtl/sys_gen/tst_fx2loop/nexys2/ic3/Makefile
+++ b/rtl/sys_gen/tst_fx2loop/nexys2/ic3/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile 453 2012-01-15 17:51:18Z mueller $
+# $Id: Makefile 477 2013-01-27 14:07:10Z mueller $
 #
 #  Revision History: 
 # Date         Rev Version  Comment
@@ -8,8 +8,7 @@
 VBOM_all  = $(wildcard *.vbom)
 BIT_all   = $(VBOM_all:.vbom=.bit)
 #
-ISE_BOARD = nexys2
-ISE_PATH  = xc3s1200e-fg320-4
+include $(RETROBASE)/rtl/make/xflow_default_nexys2.mk
 FX2_FILE  = nexys2_jtag_3fifo_ic.ihx
 #
 .PHONY : all clean
@@ -24,6 +23,8 @@ clean : ise_clean
 include $(RETROBASE)/rtl/make/generic_xflow.mk
 include $(RETROBASE)/rtl/make/generic_ghdl.mk
 #
+ifndef DONTINCDEP
 include $(VBOM_all:.vbom=.dep_xst)
 include $(VBOM_all:.vbom=.dep_ghdl)
+endif
 #
--- a/rtl/sys_gen/tst_rlink/Makefile
+++ b/rtl/sys_gen/tst_rlink/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile 438 2011-12-11 23:40:52Z mueller $
+# $Id: Makefile 477 2013-01-27 14:07:10Z mueller $
 #
 #  Revision History: 
 # Date         Rev Version  Comment
@@ -7,7 +7,7 @@
 VBOM_all = $(wildcard *.vbom)
 NGC_all  = $(VBOM_all:.vbom=.ngc)
 #
-ISE_PATH = xc3s1000-ft256-4
+include $(RETROBASE)/rtl/make/xflow_default_s3board.mk
 #
 .PHONY : all clean realclean
 #
@@ -20,5 +20,7 @@ clean : ise_clean
 #
 include $(RETROBASE)/rtl/make/generic_xflow.mk
 #
+ifndef DONTINCDEP
 include $(VBOM_all:.vbom=.dep_xst)
+endif
 #
--- a/rtl/sys_gen/tst_rlink/nexys2/Makefile
+++ b/rtl/sys_gen/tst_rlink/nexys2/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile 448 2012-01-02 21:55:11Z mueller $
+# $Id: Makefile 477 2013-01-27 14:07:10Z mueller $
 #
 #  Revision History: 
 # Date         Rev Version  Comment
@@ -8,8 +8,7 @@
 VBOM_all  = $(wildcard *.vbom)
 BIT_all   = $(VBOM_all:.vbom=.bit)
 #
-ISE_BOARD = nexys2
-ISE_PATH  = xc3s1200e-fg320-4
+include $(RETROBASE)/rtl/make/xflow_default_nexys2.mk
 #
 .PHONY : all clean
 #
@@ -23,6 +22,8 @@ clean : ise_clean
 include $(RETROBASE)/rtl/make/generic_xflow.mk
 include $(RETROBASE)/rtl/make/generic_ghdl.mk
 #
+ifndef DONTINCDEP
 include $(VBOM_all:.vbom=.dep_xst)
 include $(VBOM_all:.vbom=.dep_ghdl)
+endif
 #
--- a/rtl/sys_gen/tst_rlink/nexys2/sys_tst_rlink_n2.vbom
+++ b/rtl/sys_gen/tst_rlink/nexys2/sys_tst_rlink_n2.vbom
@@ -2,10 +2,11 @@
 ../../../vlib/slvtypes.vhd
 ../../../vlib/xlib/xlib.vhd
 ../../../vlib/genlib/genlib.vhd
-../../../vlib/serport/serport.vhd
+../../../vlib/serport/serportlib.vbom
 ../../../vlib/rbus/rblib.vhd
 ../../../vlib/rlink/rlinklib.vbom
 ../../../bplib/bpgen/bpgenlib.vbom
+../../../bplib/bpgen/bpgenrbuslib.vbom
 ../../../bplib/nxcramlib/nxcramlib.vhd
 ${sys_conf := sys_conf.vhd}
 # components
--- a/rtl/sys_gen/tst_rlink/nexys2/sys_tst_rlink_n2.vhd
+++ b/rtl/sys_gen/tst_rlink/nexys2/sys_tst_rlink_n2.vhd
@@ -1,4 +1,4 @@
-- $Id: sys_tst_rlink_n2.vhd 465 2012-12-27 21:29:38Z mueller $
+-- $Id: sys_tst_rlink_n2.vhd 476 2013-01-26 22:23:53Z mueller $
 --
 -- Copyright 2010-2011 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
 --
@@ -74,10 +74,11 @@ use ieee.std_logic_1164.all;
 use work.slvtypes.all;
 use work.xlib.all;
 use work.genlib.all;
-use work.serport.all;
+use work.serportlib.all;
 use work.rblib.all;
 use work.rlinklib.all;
 use work.bpgenlib.all;
+use work.bpgenrbuslib.all;
 use work.nxcramlib.all;
 use work.sys_conf.all;

--- a/rtl/sys_gen/tst_rlink/nexys2/tb/Makefile
+++ b/rtl/sys_gen/tst_rlink/nexys2/tb/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile 405 2011-08-14 08:16:28Z mueller $
+# $Id: Makefile 477 2013-01-27 14:07:10Z mueller $
 #
 #  Revision History: 
 # Date         Rev Version  Comment
@@ -7,7 +7,7 @@
 #
 EXE_all = tb_tst_rlink_n2
 #
-ISE_PATH = xc3s1200e-fg320-4
+include $(RETROBASE)/rtl/make/xflow_default_nexys2.mk
 #
 .PHONY : all all_ssim all_tsim clean
 #
@@ -25,7 +25,9 @@ include $(RETROBASE)/rtl/make/generic_xflow.mk
 #
 VBOM_all = $(wildcard *.vbom)
 #
+ifndef DONTINCDEP
 include $(VBOM_all:.vbom=.dep_xst)
 include $(VBOM_all:.vbom=.dep_ghdl)
 include $(wildcard *.o.dep_ghdl)
+endif
 #
--- a/rtl/sys_gen/tst_rlink/nexys3/Makefile
+++ b/rtl/sys_gen/tst_rlink/nexys3/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile 448 2012-01-02 21:55:11Z mueller $
+# $Id: Makefile 477 2013-01-27 14:07:10Z mueller $
 #
 #  Revision History: 
 # Date         Rev Version  Comment
@@ -7,11 +7,7 @@
 VBOM_all  = $(wildcard *.vbom)
 BIT_all   = $(VBOM_all:.vbom=.bit)
 #
-ISE_BOARD = nexys3
-ISE_PATH  = xc6slx16-csg324-2
-#
-XFLOWOPT_SYN = syn_s6_speed.opt
-XFLOWOPT_IMP = imp_s6_speed.opt
+include $(RETROBASE)/rtl/make/xflow_default_nexys3.mk
 #
 .PHONY : all clean
 #
@@ -25,6 +21,8 @@ clean : ise_clean
 include $(RETROBASE)/rtl/make/generic_xflow.mk
 include $(RETROBASE)/rtl/make/generic_ghdl.mk
 #
+ifndef DONTINCDEP
 include $(VBOM_all:.vbom=.dep_xst)
 include $(VBOM_all:.vbom=.dep_ghdl)
+endif
 #
--- a/rtl/sys_gen/tst_rlink/nexys3/sys_tst_rlink_n3.vbom
+++ b/rtl/sys_gen/tst_rlink/nexys3/sys_tst_rlink_n3.vbom
@@ -2,10 +2,11 @@
 ../../../vlib/slvtypes.vhd
 ../../../vlib/xlib/xlib.vhd
 ../../../vlib/genlib/genlib.vhd
-../../../vlib/serport/serport.vhd
+../../../vlib/serport/serportlib.vbom
 ../../../vlib/rbus/rblib.vhd
 ../../../vlib/rlink/rlinklib.vbom
 ../../../bplib/bpgen/bpgenlib.vbom
+../../../bplib/bpgen/bpgenrbuslib.vbom
 ../../../bplib/nxcramlib/nxcramlib.vhd
 ${sys_conf := sys_conf.vhd}
 # components
--- a/rtl/sys_gen/tst_rlink/nexys3/sys_tst_rlink_n3.vhd
+++ b/rtl/sys_gen/tst_rlink/nexys3/sys_tst_rlink_n3.vhd
@@ -1,4 +1,4 @@
-- $Id: sys_tst_rlink_n3.vhd 442 2011-12-23 10:03:28Z mueller $
+-- $Id: sys_tst_rlink_n3.vhd 476 2013-01-26 22:23:53Z mueller $
 --
 -- Copyright 2011- by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
 --
@@ -65,10 +65,11 @@ use ieee.std_logic_1164.all;
 use work.slvtypes.all;
 use work.xlib.all;
 use work.genlib.all;
-use work.serport.all;
+use work.serportlib.all;
 use work.rblib.all;
 use work.rlinklib.all;
 use work.bpgenlib.all;
+use work.bpgenrbuslib.all;
 use work.nxcramlib.all;
 use work.sys_conf.all;

--- a/rtl/sys_gen/tst_rlink/nexys3/tb/Makefile
+++ b/rtl/sys_gen/tst_rlink/nexys3/tb/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile 433 2011-11-27 22:04:39Z mueller $
+# $Id: Makefile 477 2013-01-27 14:07:10Z mueller $
 #
 #  Revision History: 
 # Date         Rev Version  Comment
@@ -6,11 +6,7 @@
 #
 EXE_all = tb_tst_rlink_n3
 #
-ISE_BOARD = nexys3
-ISE_PATH  = xc6slx16-csg324-2
-#
-XFLOWOPT_SYN = syn_s6_speed.opt
-XFLOWOPT_IMP = imp_s6_speed.opt
+include $(RETROBASE)/rtl/make/xflow_default_nexys3.mk
 #
 .PHONY : all all_ssim all_tsim clean
 #
@@ -28,7 +24,9 @@ include $(RETROBASE)/rtl/make/generic_xflow.mk
 #
 VBOM_all = $(wildcard *.vbom)
 #
+ifndef DONTINCDEP
 include $(VBOM_all:.vbom=.dep_xst)
 include $(VBOM_all:.vbom=.dep_ghdl)
 include $(wildcard *.o.dep_ghdl)
+endif
 #
--- a/rtl/sys_gen/tst_rlink/s3board/Makefile
+++ b/rtl/sys_gen/tst_rlink/s3board/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile 448 2012-01-02 21:55:11Z mueller $
+# $Id: Makefile 477 2013-01-27 14:07:10Z mueller $
 #
 #  Revision History: 
 # Date         Rev Version  Comment
@@ -7,8 +7,7 @@
 VBOM_all  = $(wildcard *.vbom)
 BIT_all   = $(VBOM_all:.vbom=.bit)
 #
-ISE_BOARD = s3board
-ISE_PATH  = xc3s1000-ft256-4
+include $(RETROBASE)/rtl/make/xflow_default_s3board.mk
 #
 .PHONY : all clean
 #
@@ -22,6 +21,8 @@ clean : ise_clean
 include $(RETROBASE)/rtl/make/generic_xflow.mk
 include $(RETROBASE)/rtl/make/generic_ghdl.mk
 #
+ifndef DONTINCDEP
 include $(VBOM_all:.vbom=.dep_xst)
 include $(VBOM_all:.vbom=.dep_ghdl)
+endif
 #
--- a/rtl/sys_gen/tst_rlink/s3board/sys_tst_rlink_s3.vbom
+++ b/rtl/sys_gen/tst_rlink/s3board/sys_tst_rlink_s3.vbom
@@ -1,10 +1,11 @@
 # libs
 ../../../vlib/slvtypes.vhd
 ../../../vlib/genlib/genlib.vhd
-../../../vlib/serport/serport.vhd
+../../../vlib/serport/serportlib.vbom
 ../../../vlib/rbus/rblib.vhd
 ../../../vlib/rlink/rlinklib.vbom
 ../../../bplib/bpgen/bpgenlib.vbom
+../../../bplib/bpgen/bpgenrbuslib.vbom
 ../../../bplib/s3board/s3boardlib.vbom
 ${sys_conf := sys_conf.vhd}
 # components
--- a/rtl/sys_gen/tst_rlink/s3board/sys_tst_rlink_s3.vhd
+++ b/rtl/sys_gen/tst_rlink/s3board/sys_tst_rlink_s3.vhd
@@ -1,4 +1,4 @@
-- $Id: sys_tst_rlink_s3.vhd 442 2011-12-23 10:03:28Z mueller $
+-- $Id: sys_tst_rlink_s3.vhd 476 2013-01-26 22:23:53Z mueller $
 --
 -- Copyright 2011- by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
 --
@@ -60,10 +60,11 @@ use ieee.std_logic_1164.all;

 use work.slvtypes.all;
 use work.genlib.all;
-use work.serport.all;
+use work.serportlib.all;
 use work.rblib.all;
 use work.rlinklib.all;
 use work.bpgenlib.all;
+use work.bpgenrbuslib.all;
 use work.s3boardlib.all;
 use work.sys_conf.all;

--- a/rtl/sys_gen/tst_rlink/s3board/tb/Makefile
+++ b/rtl/sys_gen/tst_rlink/s3board/tb/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile 442 2011-12-23 10:03:28Z mueller $
+# $Id: Makefile 477 2013-01-27 14:07:10Z mueller $
 #
 #  Revision History: 
 # Date         Rev Version  Comment
@@ -6,7 +6,7 @@
 #
 EXE_all = tb_tst_rlink_s3
 #
-ISE_PATH = xc3s1000-ft256-4
+include $(RETROBASE)/rtl/make/xflow_default_s3board.mk
 #
 .PHONY : all all_ssim all_tsim clean
 #
@@ -24,7 +24,9 @@ include $(RETROBASE)/rtl/make/generic_xflow.mk
 #
 VBOM_all = $(wildcard *.vbom)
 #
+ifndef DONTINCDEP
 include $(VBOM_all:.vbom=.dep_xst)
 include $(VBOM_all:.vbom=.dep_ghdl)
 include $(wildcard *.o.dep_ghdl)
+endif
 #
--- a/rtl/sys_gen/tst_rlink_cuff/Makefile
+++ b/rtl/sys_gen/tst_rlink_cuff/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile 466 2012-12-30 13:26:55Z mueller $
+# $Id: Makefile 477 2013-01-27 14:07:10Z mueller $
 #
 #  Revision History: 
 # Date         Rev Version  Comment
@@ -7,7 +7,7 @@
 VBOM_all = $(wildcard *.vbom)
 NGC_all  = $(VBOM_all:.vbom=.ngc)
 #
-ISE_PATH = xc3s1200e-fg320-4
+include $(RETROBASE)/rtl/make/xflow_default_nexys2.mk
 #
 .PHONY : all clean realclean
 #
@@ -20,5 +20,7 @@ clean : ise_clean
 #
 include $(RETROBASE)/rtl/make/generic_xflow.mk
 #
+ifndef DONTINCDEP
 include $(VBOM_all:.vbom=.dep_xst)
+endif
 #
--- a/rtl/sys_gen/tst_rlink_cuff/atlys/ic/Makefile
+++ b/rtl/sys_gen/tst_rlink_cuff/atlys/ic/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile 472 2013-01-06 14:39:10Z mueller $
+# $Id: Makefile 477 2013-01-27 14:07:10Z mueller $
 #
 #  Revision History: 
 # Date         Rev Version  Comment
@@ -8,13 +8,9 @@
 VBOM_all  = $(wildcard *.vbom)
 BIT_all   = $(VBOM_all:.vbom=.bit)
 #
-ISE_BOARD = atlys
-ISE_PATH  = xc6slx45-csg324-2
+include $(RETROBASE)/rtl/make/xflow_default_atlys.mk
 FX2_FILE  = nexys3_jtag_2fifo_ic.ihx
 #
-XFLOWOPT_SYN = syn_s6_speed.opt
-XFLOWOPT_IMP = imp_s6_speed.opt
-#
 .PHONY : all clean
 #
 all : $(BIT_all)
@@ -27,6 +23,8 @@ clean : ise_clean
 include $(RETROBASE)/rtl/make/generic_xflow.mk
 include $(RETROBASE)/rtl/make/generic_ghdl.mk
 #
+ifndef DONTINCDEP
 include $(VBOM_all:.vbom=.dep_xst)
 include $(VBOM_all:.vbom=.dep_ghdl)
+endif
 #
--- a/rtl/sys_gen/tst_rlink_cuff/atlys/sys_tst_rlink_cuff_atlys.vbom
+++ b/rtl/sys_gen/tst_rlink_cuff/atlys/sys_tst_rlink_cuff_atlys.vbom
@@ -9,6 +9,7 @@
 ../../../vlib/xlib/xlib.vhd
 ../../../vlib/genlib/genlib.vhd
 ../../../bplib/bpgen/bpgenlib.vbom
+../../../bplib/bpgen/bpgenrbuslib.vbom
 ../../../vlib/rbus/rblib.vhd
 ../../../bplib/fx2lib/fx2lib.vhd
 ${sys_conf}
--- a/rtl/sys_gen/tst_rlink_cuff/atlys/sys_tst_rlink_cuff_atlys.vhd
+++ b/rtl/sys_gen/tst_rlink_cuff/atlys/sys_tst_rlink_cuff_atlys.vhd
@@ -1,4 +1,4 @@
-- $Id: sys_tst_rlink_cuff_atlys.vhd 472 2013-01-06 14:39:10Z mueller $
+-- $Id: sys_tst_rlink_cuff_atlys.vhd 476 2013-01-26 22:23:53Z mueller $
 --
 -- Copyright 2013- by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
 --
@@ -18,7 +18,7 @@
 -- Dependencies:   vlib/xlib/dcm_sfs
 --                 vlib/genlib/clkdivce
 --                 bplib/bpgen/bp_rs232_2l4l_iob
--                 bplib/bpgen/sn_humanio_rbus
+--                 bplib/bpgen/sn_humanio_demu_rbus
 --                 bplib/fx2lib/fx2_2fifoctl_as   [sys_conf_fx2_type="as2"]
 --                 bplib/fx2lib/fx2_2fifoctl_ic   [sys_conf_fx2_type="ic2"]
 --                 bplib/fx2lib/fx2_3fifoctl_ic   [sys_conf_fx2_type="ic3"]
@@ -40,7 +40,7 @@
 ------------------------------------------------------------------------------
 -- Usage of Atlys Switches, Buttons, LEDs:
 --
--    SWI(7:3)  no function (only connected to sn_humanio_rbus)
+--    SWI(7:3)  no function (only connected to sn_humanio_demu_rbus)
 --       (2)    0 -> int/ext RS242 port for rlink
 --              1 -> use USB interface for rlink
 --       (1)    1 enable XON
@@ -48,7 +48,7 @@
 --              1 -> Pmod B/top RS232 port  /
 --
 --    LED(7)    SER_MONI.abact
--       (6:2)  no function (only connected to sn_humanio_rbus)
+--       (6:2)  no function (only connected to sn_humanio_demu_rbus)
 --       (0)    timer 0 busy 
 --       (1)    timer 1 busy 
 --
@@ -73,6 +73,7 @@ use work.slvtypes.all;
 use work.xlib.all;
 use work.genlib.all;
 use work.bpgenlib.all;
+use work.bpgenrbuslib.all;
 use work.rblib.all;
 use work.fx2lib.all;
 use work.sys_conf.all;
--- a/rtl/sys_gen/tst_rlink_cuff/nexys2/ic/Makefile
+++ b/rtl/sys_gen/tst_rlink_cuff/nexys2/ic/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile 466 2012-12-30 13:26:55Z mueller $
+# $Id: Makefile 477 2013-01-27 14:07:10Z mueller $
 #
 #  Revision History: 
 # Date         Rev Version  Comment
@@ -8,8 +8,7 @@
 VBOM_all  = $(wildcard *.vbom)
 BIT_all   = $(VBOM_all:.vbom=.bit)
 #
-ISE_BOARD = nexys2
-ISE_PATH  = xc3s1200e-fg320-4
+include $(RETROBASE)/rtl/make/xflow_default_nexys2.mk
 FX2_FILE  = nexys2_jtag_2fifo_ic.ihx
 #
 .PHONY : all clean
@@ -24,6 +23,8 @@ clean : ise_clean
 include $(RETROBASE)/rtl/make/generic_xflow.mk
 include $(RETROBASE)/rtl/make/generic_ghdl.mk
 #
+ifndef DONTINCDEP
 include $(VBOM_all:.vbom=.dep_xst)
 include $(VBOM_all:.vbom=.dep_ghdl)
+endif
 #
--- a/rtl/sys_gen/tst_rlink_cuff/nexys2/ic/tb/Makefile
+++ b/rtl/sys_gen/tst_rlink_cuff/nexys2/ic/tb/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile 467 2013-01-02 19:49:05Z mueller $
+# $Id: Makefile 477 2013-01-27 14:07:10Z mueller $
 #
 #  Revision History: 
 # Date         Rev Version  Comment
@@ -6,7 +6,7 @@
 #
 EXE_all = tb_tst_rlink_cuff_ic_n2
 #
-ISE_PATH = xc3s1200e-fg320-4
+include $(RETROBASE)/rtl/make/xflow_default_nexys2.mk
 #
 .PHONY : all all_ssim all_tsim clean
 #
@@ -24,7 +24,9 @@ include $(RETROBASE)/rtl/make/generic_xflow.mk
 #
 VBOM_all = $(wildcard *.vbom)
 #
+ifndef DONTINCDEP
 include $(VBOM_all:.vbom=.dep_xst)
 include $(VBOM_all:.vbom=.dep_ghdl)
 include $(wildcard *.o.dep_ghdl)
+endif
 #
--- a/rtl/sys_gen/tst_rlink_cuff/nexys2/ic3/Makefile
+++ b/rtl/sys_gen/tst_rlink_cuff/nexys2/ic3/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile 466 2012-12-30 13:26:55Z mueller $
+# $Id: Makefile 477 2013-01-27 14:07:10Z mueller $
 #
 #  Revision History: 
 # Date         Rev Version  Comment
@@ -8,8 +8,7 @@
 VBOM_all  = $(wildcard *.vbom)
 BIT_all   = $(VBOM_all:.vbom=.bit)
 #
-ISE_BOARD = nexys2
-ISE_PATH  = xc3s1200e-fg320-4
+include $(RETROBASE)/rtl/make/xflow_default_nexys2.mk
 FX2_FILE  = nexys2_jtag_3fifo_ic.ihx
 #
 .PHONY : all clean
@@ -24,6 +23,8 @@ clean : ise_clean
 include $(RETROBASE)/rtl/make/generic_xflow.mk
 include $(RETROBASE)/rtl/make/generic_ghdl.mk
 #
+ifndef DONTINCDEP
 include $(VBOM_all:.vbom=.dep_xst)
 include $(VBOM_all:.vbom=.dep_ghdl)
+endif
 #
--- a/rtl/sys_gen/tst_rlink_cuff/nexys2/sys_tst_rlink_cuff_n2.vbom
+++ b/rtl/sys_gen/tst_rlink_cuff/nexys2/sys_tst_rlink_cuff_n2.vbom
@@ -9,6 +9,7 @@
 ../../../vlib/xlib/xlib.vhd
 ../../../vlib/genlib/genlib.vhd
 ../../../bplib/bpgen/bpgenlib.vbom
+../../../bplib/bpgen/bpgenrbuslib.vbom
 ../../../vlib/rbus/rblib.vhd
 ../../../bplib/fx2lib/fx2lib.vhd
 ../../../bplib/nxcramlib/nxcramlib.vhd
--- a/rtl/sys_gen/tst_rlink_cuff/nexys2/sys_tst_rlink_cuff_n2.vhd
+++ b/rtl/sys_gen/tst_rlink_cuff/nexys2/sys_tst_rlink_cuff_n2.vhd
@@ -1,4 +1,4 @@
-- $Id: sys_tst_rlink_cuff_n2.vhd 469 2013-01-05 12:29:44Z mueller $
+-- $Id: sys_tst_rlink_cuff_n2.vhd 476 2013-01-26 22:23:53Z mueller $
 --
 -- Copyright 2012-2013 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
 --
@@ -77,6 +77,7 @@ use work.slvtypes.all;
 use work.xlib.all;
 use work.genlib.all;
 use work.bpgenlib.all;
+use work.bpgenrbuslib.all;
 use work.rblib.all;
 use work.fx2lib.all;
 use work.nxcramlib.all;
--- a/rtl/sys_gen/tst_rlink_cuff/nexys3/ic/Makefile
+++ b/rtl/sys_gen/tst_rlink_cuff/nexys3/ic/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile 469 2013-01-05 12:29:44Z mueller $
+# $Id: Makefile 477 2013-01-27 14:07:10Z mueller $
 #
 #  Revision History: 
 # Date         Rev Version  Comment
@@ -8,13 +8,9 @@
 VBOM_all  = $(wildcard *.vbom)
 BIT_all   = $(VBOM_all:.vbom=.bit)
 #
-ISE_BOARD = nexys3
-ISE_PATH  = xc6slx16-csg324-2
+include $(RETROBASE)/rtl/make/xflow_default_nexys3.mk
 FX2_FILE  = nexys3_jtag_2fifo_ic.ihx
 #
-XFLOWOPT_SYN = syn_s6_speed.opt
-XFLOWOPT_IMP = imp_s6_speed.opt
-#
 .PHONY : all clean
 #
 all : $(BIT_all)
@@ -27,6 +23,8 @@ clean : ise_clean
 include $(RETROBASE)/rtl/make/generic_xflow.mk
 include $(RETROBASE)/rtl/make/generic_ghdl.mk
 #
+ifndef DONTINCDEP
 include $(VBOM_all:.vbom=.dep_xst)
 include $(VBOM_all:.vbom=.dep_ghdl)
+endif
 #
--- a/rtl/sys_gen/tst_rlink_cuff/nexys3/sys_tst_rlink_cuff_n3.vbom
+++ b/rtl/sys_gen/tst_rlink_cuff/nexys3/sys_tst_rlink_cuff_n3.vbom
@@ -9,6 +9,7 @@
 ../../../vlib/xlib/xlib.vhd
 ../../../vlib/genlib/genlib.vhd
 ../../../bplib/bpgen/bpgenlib.vbom
+../../../bplib/bpgen/bpgenrbuslib.vbom
 ../../../vlib/rbus/rblib.vhd
 ../../../bplib/fx2lib/fx2lib.vhd
 ../../../bplib/nxcramlib/nxcramlib.vhd
--- a/rtl/sys_gen/tst_rlink_cuff/nexys3/sys_tst_rlink_cuff_n3.vhd
+++ b/rtl/sys_gen/tst_rlink_cuff/nexys3/sys_tst_rlink_cuff_n3.vhd
@@ -1,4 +1,4 @@
-- $Id: sys_tst_rlink_cuff_n3.vhd 469 2013-01-05 12:29:44Z mueller $
+-- $Id: sys_tst_rlink_cuff_n3.vhd 476 2013-01-26 22:23:53Z mueller $
 --
 -- Copyright 2013- by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
 --
@@ -74,6 +74,7 @@ use work.slvtypes.all;
 use work.xlib.all;
 use work.genlib.all;
 use work.bpgenlib.all;
+use work.bpgenrbuslib.all;
 use work.rblib.all;
 use work.fx2lib.all;
 use work.nxcramlib.all;
--- a/rtl/sys_gen/tst_rlink_cuff/tst_rlink_cuff.vbom
+++ b/rtl/sys_gen/tst_rlink_cuff/tst_rlink_cuff.vbom
@@ -3,7 +3,7 @@
 ../../vlib/genlib/genlib.vhd
 ../../vlib/rbus/rblib.vhd
 ../../vlib/rlink/rlinklib.vbom
-../../vlib/serport/serport.vhd
+../../vlib/serport/serportlib.vbom
 ../../bplib/fx2lib/fx2lib.vhd
 ${sys_conf := nexys2/as/sys_conf.vhd}
 # components
--- a/rtl/sys_gen/tst_rlink_cuff/tst_rlink_cuff.vhd
+++ b/rtl/sys_gen/tst_rlink_cuff/tst_rlink_cuff.vhd
@@ -1,4 +1,4 @@
-- $Id: tst_rlink_cuff.vhd 467 2013-01-02 19:49:05Z mueller $
+-- $Id: tst_rlink_cuff.vhd 476 2013-01-26 22:23:53Z mueller $
 --
 -- Copyright 2012-2013 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
 --
@@ -41,7 +41,7 @@ use work.slvtypes.all;
 use work.genlib.all;
 use work.rblib.all;
 use work.rlinklib.all;
-use work.serport.all;
+use work.serportlib.all;
 use work.fx2lib.all;
 use work.sys_conf.all;

--- a/rtl/sys_gen/tst_serloop/Makefile
+++ b/rtl/sys_gen/tst_serloop/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile 441 2011-12-20 17:01:16Z mueller $
+# $Id: Makefile 477 2013-01-27 14:07:10Z mueller $
 #
 #  Revision History: 
 # Date         Rev Version  Comment
@@ -7,7 +7,7 @@
 VBOM_all = $(wildcard *.vbom)
 NGC_all  = $(VBOM_all:.vbom=.ngc)
 #
-ISE_PATH = xc3s1000-ft256-4
+include $(RETROBASE)/rtl/make/xflow_default_s3board.mk
 #
 .PHONY : all clean realclean
 #
@@ -22,5 +22,7 @@ realclean :
 #
 include $(RETROBASE)/rtl/make/generic_xflow.mk
 #
+ifndef DONTINCDEP
 include $(VBOM_all:.vbom=.dep_xst)
+endif
 #
--- a/rtl/sys_gen/tst_serloop/nexys2/Makefile
+++ b/rtl/sys_gen/tst_serloop/nexys2/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile 448 2012-01-02 21:55:11Z mueller $
+# $Id: Makefile 477 2013-01-27 14:07:10Z mueller $
 #
 #  Revision History: 
 # Date         Rev Version  Comment
@@ -7,8 +7,7 @@
 VBOM_all  = $(wildcard *.vbom)
 BIT_all   = $(VBOM_all:.vbom=.bit)
 #
-ISE_BOARD = nexys2
-ISE_PATH  = xc3s1200e-fg320-4
+include $(RETROBASE)/rtl/make/xflow_default_nexys2.mk
 #
 .PHONY : all clean
 #
@@ -22,6 +21,8 @@ clean : ise_clean
 include $(RETROBASE)/rtl/make/generic_xflow.mk
 include $(RETROBASE)/rtl/make/generic_ghdl.mk
 #
+ifndef DONTINCDEP
 include $(VBOM_all:.vbom=.dep_xst)
 include $(VBOM_all:.vbom=.dep_ghdl)
+endif
 #
--- a/rtl/sys_gen/tst_serloop/nexys2/sys_tst_serloop1_n2.vbom
+++ b/rtl/sys_gen/tst_serloop/nexys2/sys_tst_serloop1_n2.vbom
@@ -3,7 +3,7 @@
 ../../../vlib/genlib/genlib.vhd
 ../../../bplib/bpgen/bpgenlib.vbom
 ../tst_serlooplib.vbom
-../../../vlib/serport/serport.vhd
+../../../vlib/serport/serportlib.vbom
 ../../../bplib/nxcramlib/nxcramlib.vhd
 ${sys_conf := sys_conf1.vhd}
 # components
--- a/rtl/sys_gen/tst_serloop/nexys2/sys_tst_serloop1_n2.vhd
+++ b/rtl/sys_gen/tst_serloop/nexys2/sys_tst_serloop1_n2.vhd
@@ -1,4 +1,4 @@
-- $Id: sys_tst_serloop1_n2.vhd 444 2011-12-25 10:04:58Z mueller $
+-- $Id: sys_tst_serloop1_n2.vhd 476 2013-01-26 22:23:53Z mueller $
 --
 -- Copyright 2011- by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
 --
@@ -48,7 +48,7 @@ use work.xlib.all;
 use work.genlib.all;
 use work.bpgenlib.all;
 use work.tst_serlooplib.all;
-use work.serport.all;
+use work.serportlib.all;
 use work.nxcramlib.all;
 use work.sys_conf.all;

--- a/rtl/sys_gen/tst_serloop/nexys2/sys_tst_serloop2_n2.vbom
+++ b/rtl/sys_gen/tst_serloop/nexys2/sys_tst_serloop2_n2.vbom
@@ -4,7 +4,7 @@
 ../../../vlib/genlib/genlib.vhd
 ../../../bplib/bpgen/bpgenlib.vbom
 ../tst_serlooplib.vbom
-../../../vlib/serport/serport.vhd
+../../../vlib/serport/serportlib.vbom
 ../../../bplib/nxcramlib/nxcramlib.vhd
 ${sys_conf := sys_conf2.vhd}
 # components
--- a/rtl/sys_gen/tst_serloop/nexys2/sys_tst_serloop2_n2.vhd
+++ b/rtl/sys_gen/tst_serloop/nexys2/sys_tst_serloop2_n2.vhd
@@ -1,4 +1,4 @@
-- $Id: sys_tst_serloop2_n2.vhd 444 2011-12-25 10:04:58Z mueller $
+-- $Id: sys_tst_serloop2_n2.vhd 476 2013-01-26 22:23:53Z mueller $
 --
 -- Copyright 2011- by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
 --
@@ -56,7 +56,7 @@ use work.xlib.all;
 use work.genlib.all;
 use work.bpgenlib.all;
 use work.tst_serlooplib.all;
-use work.serport.all;
+use work.serportlib.all;
 use work.nxcramlib.all;
 use work.sys_conf.all;

--- a/rtl/sys_gen/tst_serloop/nexys2/tb/Makefile
+++ b/rtl/sys_gen/tst_serloop/nexys2/tb/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile 448 2012-01-02 21:55:11Z mueller $
+# $Id: Makefile 477 2013-01-27 14:07:10Z mueller $
 #
 #  Revision History: 
 # Date         Rev Version  Comment
@@ -7,8 +7,7 @@
 EXE_all  = tb_tst_serloop1_n2
 EXE_all += tb_tst_serloop2_n2
 #
-ISE_BOARD = nexys2
-ISE_PATH  = xc3s1200e-fg320-4
+include $(RETROBASE)/rtl/make/xflow_default_nexys2.mk
 #
 .PHONY : all all_ssim all_tsim clean
 #
@@ -26,8 +25,10 @@ include $(RETROBASE)/rtl/make/generic_xflow.mk
 #
 VBOM_all = $(wildcard *.vbom)
 #
+ifndef DONTINCDEP
 include $(VBOM_all:.vbom=.dep_xst)
 include $(VBOM_all:.vbom=.dep_ghdl)
 include $(VBOM_all:.vbom=.dep_isim)
 include $(wildcard *.o.dep_ghdl)
+endif
 #
--- a/rtl/sys_gen/tst_serloop/nexys3/Makefile
+++ b/rtl/sys_gen/tst_serloop/nexys3/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile 448 2012-01-02 21:55:11Z mueller $
+# $Id: Makefile 477 2013-01-27 14:07:10Z mueller $
 #
 #  Revision History: 
 # Date         Rev Version  Comment
@@ -7,11 +7,7 @@
 VBOM_all  = $(wildcard *.vbom)
 BIT_all   = $(VBOM_all:.vbom=.bit)
 #
-ISE_BOARD = nexys3
-ISE_PATH  = xc6slx16-csg324-2
-#
-XFLOWOPT_SYN = syn_s6_speed.opt
-XFLOWOPT_IMP = imp_s6_speed.opt
+include $(RETROBASE)/rtl/make/xflow_default_nexys3.mk
 #
 .PHONY : all clean
 #
@@ -25,6 +21,8 @@ clean : ise_clean
 include $(RETROBASE)/rtl/make/generic_xflow.mk
 include $(RETROBASE)/rtl/make/generic_ghdl.mk
 #
+ifndef DONTINCDEP
 include $(VBOM_all:.vbom=.dep_xst)
 include $(VBOM_all:.vbom=.dep_ghdl)
+endif
 #
--- a/rtl/sys_gen/tst_serloop/nexys3/sys_tst_serloop1_n3.vbom
+++ b/rtl/sys_gen/tst_serloop/nexys3/sys_tst_serloop1_n3.vbom
@@ -4,7 +4,7 @@
 ../../../vlib/genlib/genlib.vhd
 ../../../bplib/bpgen/bpgenlib.vbom
 ../tst_serlooplib.vbom
-../../../vlib/serport/serport.vhd
+../../../vlib/serport/serportlib.vbom
 ../../../bplib/nxcramlib/nxcramlib.vhd
 ${sys_conf := sys_conf1.vhd}
 # components
--- a/rtl/sys_gen/tst_serloop/nexys3/sys_tst_serloop1_n3.vhd
+++ b/rtl/sys_gen/tst_serloop/nexys3/sys_tst_serloop1_n3.vhd
@@ -1,4 +1,4 @@
-- $Id: sys_tst_serloop1_n3.vhd 441 2011-12-20 17:01:16Z mueller $
+-- $Id: sys_tst_serloop1_n3.vhd 476 2013-01-26 22:23:53Z mueller $
 --
 -- Copyright 2011- by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
 --
@@ -47,7 +47,7 @@ use work.xlib.all;
 use work.genlib.all;
 use work.bpgenlib.all;
 use work.tst_serlooplib.all;
-use work.serport.all;
+use work.serportlib.all;
 use work.nxcramlib.all;
 use work.sys_conf.all;

--- a/rtl/sys_gen/tst_serloop/nexys3/tb/Makefile
+++ b/rtl/sys_gen/tst_serloop/nexys3/tb/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile 448 2012-01-02 21:55:11Z mueller $
+# $Id: Makefile 477 2013-01-27 14:07:10Z mueller $
 #
 #  Revision History: 
 # Date         Rev Version  Comment
@@ -7,11 +7,7 @@
 #
 EXE_all  = tb_tst_serloop1_n3 
 #
-ISE_BOARD = nexys3
-ISE_PATH  = xc6slx16-csg324-2
-#
-XFLOWOPT_SYN = syn_s6_speed.opt
-XFLOWOPT_IMP = imp_s6_speed.opt
+include $(RETROBASE)/rtl/make/xflow_default_nexys3.mk
 #
 .PHONY : all all_ssim all_tsim clean
 #
@@ -29,8 +25,10 @@ include $(RETROBASE)/rtl/make/generic_xflow.mk
 #
 VBOM_all = $(wildcard *.vbom)
 #
+ifndef DONTINCDEP
 include $(VBOM_all:.vbom=.dep_xst)
 include $(VBOM_all:.vbom=.dep_ghdl)
 include $(VBOM_all:.vbom=.dep_isim)
 include $(wildcard *.o.dep_ghdl)
+endif
 #
--- a/rtl/sys_gen/tst_serloop/s3board/Makefile
+++ b/rtl/sys_gen/tst_serloop/s3board/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile 448 2012-01-02 21:55:11Z mueller $
+# $Id: Makefile 477 2013-01-27 14:07:10Z mueller $
 #
 #  Revision History: 
 # Date         Rev Version  Comment
@@ -7,8 +7,7 @@
 VBOM_all  = $(wildcard *.vbom)
 BIT_all   = $(VBOM_all:.vbom=.bit)
 #
-ISE_BOARD = s3board
-ISE_PATH  = xc3s1000-ft256-4
+include $(RETROBASE)/rtl/make/xflow_default_s3board.mk
 #
 .PHONY : all clean
 #
@@ -22,6 +21,8 @@ clean : ise_clean
 include $(RETROBASE)/rtl/make/generic_xflow.mk
 include $(RETROBASE)/rtl/make/generic_ghdl.mk
 #
+ifndef DONTINCDEP
 include $(VBOM_all:.vbom=.dep_xst)
 include $(VBOM_all:.vbom=.dep_ghdl)
+endif
 #
--- a/rtl/sys_gen/tst_serloop/s3board/sys_tst_serloop_s3.vbom
+++ b/rtl/sys_gen/tst_serloop/s3board/sys_tst_serloop_s3.vbom
@@ -4,7 +4,7 @@
 ../../../vlib/genlib/genlib.vhd
 ../../../bplib/bpgen/bpgenlib.vbom
 ../tst_serlooplib.vbom
-../../../vlib/serport/serport.vhd
+../../../vlib/serport/serportlib.vbom
 ../../../bplib/s3board/s3boardlib.vbom
 ${sys_conf := sys_conf.vhd}
 # components
--- a/rtl/sys_gen/tst_serloop/s3board/sys_tst_serloop_s3.vhd
+++ b/rtl/sys_gen/tst_serloop/s3board/sys_tst_serloop_s3.vhd
@@ -1,4 +1,4 @@
-- $Id: sys_tst_serloop_s3.vhd 441 2011-12-20 17:01:16Z mueller $
+-- $Id: sys_tst_serloop_s3.vhd 476 2013-01-26 22:23:53Z mueller $
 --
 -- Copyright 2011- by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
 --
@@ -52,7 +52,7 @@ use work.xlib.all;
 use work.genlib.all;
 use work.bpgenlib.all;
 use work.tst_serlooplib.all;
-use work.serport.all;
+use work.serportlib.all;
 use work.s3boardlib.all;
 use work.sys_conf.all;

--- a/rtl/sys_gen/tst_serloop/s3board/tb/Makefile
+++ b/rtl/sys_gen/tst_serloop/s3board/tb/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile 441 2011-12-20 17:01:16Z mueller $
+# $Id: Makefile 477 2013-01-27 14:07:10Z mueller $
 #
 #  Revision History: 
 # Date         Rev Version  Comment
@@ -6,6 +6,8 @@
 #
 EXE_all = tb_tst_serloop_s3
 #
+include $(RETROBASE)/rtl/make/xflow_default_s3board.mk
+#
 .PHONY : all all_ssim all_tsim clean
 #
 all      : $(EXE_all)
@@ -22,8 +24,10 @@ include $(RETROBASE)/rtl/make/generic_xflow.mk
 #
 VBOM_all = $(wildcard *.vbom)
 #
+ifndef DONTINCDEP
 include $(VBOM_all:.vbom=.dep_xst)
 include $(VBOM_all:.vbom=.dep_ghdl)
 include $(VBOM_all:.vbom=.dep_isim)
 include $(wildcard *.o.dep_ghdl)
+endif
 #
--- a/rtl/sys_gen/tst_serloop/tb/tb_tst_serloop.vbom
+++ b/rtl/sys_gen/tst_serloop/tb/tb_tst_serloop.vbom
@@ -1,7 +1,7 @@
 # libs
 ../../../vlib/slvtypes.vhd
 ../../../vlib/simlib/simlib.vhd
-../../../vlib/serport/serport.vhd
+../../../vlib/serport/serportlib.vbom
 # components
 ../../../vlib/simlib/simclkcnt.vbom
 ../../../vlib/serport/serport_uart_rxtx.vbom
--- a/rtl/sys_gen/tst_serloop/tb/tb_tst_serloop.vhd
+++ b/rtl/sys_gen/tst_serloop/tb/tb_tst_serloop.vhd
@@ -1,4 +1,4 @@
-- $Id: tb_tst_serloop.vhd 444 2011-12-25 10:04:58Z mueller $
+-- $Id: tb_tst_serloop.vhd 476 2013-01-26 22:23:53Z mueller $
 --
 -- Copyright 2011- by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
 --
@@ -38,7 +38,7 @@ use std.textio.all;

 use work.slvtypes.all;
 use work.simlib.all;
-use work.serport.all;
+use work.serportlib.all;

 entity tb_tst_serloop is
  port (
--- a/rtl/sys_gen/tst_serloop/tst_serloop.vbom
+++ b/rtl/sys_gen/tst_serloop/tst_serloop.vbom
@@ -1,6 +1,6 @@
 # libs
 ../../vlib/slvtypes.vhd
-../../vlib/serport/serport.vhd
+../../vlib/serport/serportlib.vbom
 tst_serlooplib.vhd
 # components
 # design
--- a/rtl/sys_gen/tst_serloop/tst_serloop.vhd
+++ b/rtl/sys_gen/tst_serloop/tst_serloop.vhd
@@ -1,4 +1,4 @@
-- $Id: tst_serloop.vhd 441 2011-12-20 17:01:16Z mueller $
+-- $Id: tst_serloop.vhd 476 2013-01-26 22:23:53Z mueller $
 --
 -- Copyright 2011- by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
 --
@@ -34,7 +34,7 @@ use ieee.std_logic_1164.all;
 use ieee.numeric_std.all;

 use work.slvtypes.all;
-use work.serport.all;
+use work.serportlib.all;
 use work.tst_serlooplib.all;

 -- ----------------------------------------------------------------------------
--- a/rtl/sys_gen/tst_serloop/tst_serloop_hiomap.vbom
+++ b/rtl/sys_gen/tst_serloop/tst_serloop_hiomap.vbom
@@ -1,6 +1,6 @@
 # libs
 ../../vlib/slvtypes.vhd
-../../vlib/serport/serport.vhd
+../../vlib/serport/serportlib.vbom
 tst_serlooplib.vbom
 # components
 # design
--- a/rtl/sys_gen/tst_serloop/tst_serloop_hiomap.vhd
+++ b/rtl/sys_gen/tst_serloop/tst_serloop_hiomap.vhd
@@ -1,4 +1,4 @@
-- $Id: tst_serloop_hiomap.vhd 441 2011-12-20 17:01:16Z mueller $
+-- $Id: tst_serloop_hiomap.vhd 476 2013-01-26 22:23:53Z mueller $
 --
 -- Copyright 2011- by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
 --
@@ -81,7 +81,7 @@ use ieee.std_logic_1164.all;
 use ieee.numeric_std.all;

 use work.slvtypes.all;
-use work.serport.all;
+use work.serportlib.all;
 use work.tst_serlooplib.all;

 -- ----------------------------------------------------------------------------
--- a/rtl/sys_gen/tst_serloop/tst_serlooplib.vbom
+++ b/rtl/sys_gen/tst_serloop/tst_serlooplib.vbom
@@ -1,3 +1,3 @@
 # libs
 ../../vlib/slvtypes.vhd
-../../vlib/serport/serport.vhd
+../../vlib/serport/serportlib.vbom
--- a/rtl/sys_gen/tst_serloop/tst_serlooplib.vhd
+++ b/rtl/sys_gen/tst_serloop/tst_serlooplib.vhd
@@ -1,4 +1,4 @@
-- $Id: tst_serlooplib.vhd 441 2011-12-20 17:01:16Z mueller $
+-- $Id: tst_serlooplib.vhd 476 2013-01-26 22:23:53Z mueller $
 --
 -- Copyright 2011- by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
 --
@@ -28,7 +28,7 @@ library ieee;
 use ieee.std_logic_1164.all;

 use work.slvtypes.all;
-use work.serport.all;
+use work.serportlib.all;

 package tst_serlooplib is

--- a/rtl/sys_gen/tst_snhumanio/Makefile
+++ b/rtl/sys_gen/tst_snhumanio/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile 410 2011-09-18 11:23:09Z mueller $
+# $Id: Makefile 477 2013-01-27 14:07:10Z mueller $
 #
 #  Revision History: 
 # Date         Rev Version  Comment
@@ -7,7 +7,7 @@
 VBOM_all = $(wildcard *.vbom)
 NGC_all  = $(VBOM_all:.vbom=.ngc)
 #
-ISE_PATH = xc3s1000-ft256-4
+include $(RETROBASE)/rtl/make/xflow_default_s3board.mk
 #
 .PHONY : all clean
 #
@@ -19,5 +19,7 @@ clean : ise_clean
 #
 include $(RETROBASE)/rtl/make/generic_xflow.mk
 #
+ifndef DONTINCDEP
 include $(VBOM_all:.vbom=.dep_xst)
+endif
 #
--- a/rtl/sys_gen/tst_snhumanio/atlys/Makefile
+++ b/rtl/sys_gen/tst_snhumanio/atlys/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile 448 2012-01-02 21:55:11Z mueller $
+# $Id: Makefile 477 2013-01-27 14:07:10Z mueller $
 #
 #  Revision History: 
 # Date         Rev Version  Comment
@@ -7,11 +7,7 @@
 VBOM_all  = $(wildcard *.vbom)
 BIT_all   = $(VBOM_all:.vbom=.bit)
 #
-ISE_BOARD = atlys
-ISE_PATH  = xc6slx45-csg324-2
-#
-XFLOWOPT_SYN = syn_s6_speed.opt
-XFLOWOPT_IMP = imp_s6_speed.opt
+include $(RETROBASE)/rtl/make/xflow_default_atlys.mk
 #
 .PHONY : all clean
 #
@@ -25,6 +21,8 @@ clean : ise_clean
 include $(RETROBASE)/rtl/make/generic_xflow.mk
 include $(RETROBASE)/rtl/make/generic_ghdl.mk
 #
+ifndef DONTINCDEP
 include $(VBOM_all:.vbom=.dep_xst)
 include $(VBOM_all:.vbom=.dep_ghdl)
+endif
 #
--- a/rtl/sys_gen/tst_snhumanio/nexys2/Makefile
+++ b/rtl/sys_gen/tst_snhumanio/nexys2/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile 448 2012-01-02 21:55:11Z mueller $
+# $Id: Makefile 477 2013-01-27 14:07:10Z mueller $
 #
 #  Revision History: 
 # Date         Rev Version  Comment
@@ -7,8 +7,7 @@
 VBOM_all  = $(wildcard *.vbom)
 BIT_all   = $(VBOM_all:.vbom=.bit)
 #
-ISE_BOARD = nexys2
-ISE_PATH  = xc3s1200e-fg320-4
+include $(RETROBASE)/rtl/make/xflow_default_nexys2.mk
 #
 .PHONY : all clean
 #
@@ -22,6 +21,8 @@ clean : ise_clean
 include $(RETROBASE)/rtl/make/generic_xflow.mk
 include $(RETROBASE)/rtl/make/generic_ghdl.mk
 #
+ifndef DONTINCDEP
 include $(VBOM_all:.vbom=.dep_xst)
 include $(VBOM_all:.vbom=.dep_ghdl)
+endif
 #
--- a/rtl/sys_gen/tst_snhumanio/nexys3/Makefile
+++ b/rtl/sys_gen/tst_snhumanio/nexys3/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile 448 2012-01-02 21:55:11Z mueller $
+# $Id: Makefile 477 2013-01-27 14:07:10Z mueller $
 #
 #  Revision History: 
 # Date         Rev Version  Comment
@@ -7,11 +7,7 @@
 VBOM_all  = $(wildcard *.vbom)
 BIT_all   = $(VBOM_all:.vbom=.bit)
 #
-ISE_BOARD = nexys3
-ISE_PATH  = xc6slx16-csg324-2
-#
-XFLOWOPT_SYN = syn_s6_speed.opt
-XFLOWOPT_IMP = imp_s6_speed.opt
+include $(RETROBASE)/rtl/make/xflow_default_nexys3.mk
 #
 .PHONY : all clean
 #
@@ -25,6 +21,8 @@ clean : ise_clean
 include $(RETROBASE)/rtl/make/generic_xflow.mk
 include $(RETROBASE)/rtl/make/generic_ghdl.mk
 #
+ifndef DONTINCDEP
 include $(VBOM_all:.vbom=.dep_xst)
 include $(VBOM_all:.vbom=.dep_ghdl)
+endif
 #
--- a/rtl/sys_gen/tst_snhumanio/s3board/Makefile
+++ b/rtl/sys_gen/tst_snhumanio/s3board/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile 448 2012-01-02 21:55:11Z mueller $
+# $Id: Makefile 477 2013-01-27 14:07:10Z mueller $
 #
 #  Revision History: 
 # Date         Rev Version  Comment
@@ -7,8 +7,7 @@
 VBOM_all  = $(wildcard *.vbom)
 BIT_all   = $(VBOM_all:.vbom=.bit)
 #
-ISE_BOARD = s3board
-ISE_PATH  = xc3s1000-ft256-4
+include $(RETROBASE)/rtl/make/xflow_default_s3board.mk
 #
 .PHONY : all clean
 #
@@ -22,6 +21,8 @@ clean : ise_clean
 include $(RETROBASE)/rtl/make/generic_xflow.mk
 include $(RETROBASE)/rtl/make/generic_ghdl.mk
 #
+ifndef DONTINCDEP
 include $(VBOM_all:.vbom=.dep_xst)
 include $(VBOM_all:.vbom=.dep_ghdl)
+endif
 #
--- a/Show More
+++ b/Show More