diff --git a/Common/sim/ieee_proposed.make b/Common/sim/ieee_proposed.make index 1e5a658..78f901c 100644 --- a/Common/sim/ieee_proposed.make +++ b/Common/sim/ieee_proposed.make @@ -1,6 +1,7 @@ # ------------------------------------------------- # Compile script for GHDL # ------------------------------------------------- +include ../make/defs.mk # ------------------------------------------------- # Global options @@ -8,15 +9,11 @@ LANG_STD := 93c IEEE_STD := standard WORK_LIB := ieee_proposed - +TARGET := ieee_proposed # ------------------------------------------------- # Target options # ------------------------------------------------- -TARGET := ieee_proposed - -LIB_PATH := ieee_proposed/modelsim - SRCS := $(LIB_PATH)/standard_additions_c.vhdl SRCS += $(LIB_PATH)/standard_textio_additions_c.vhdl SRCS += $(LIB_PATH)/env_c.vhdl diff --git a/Common/sim/unisim.make b/Common/sim/unisim.make index 339f380..5c98ff6 100644 --- a/Common/sim/unisim.make +++ b/Common/sim/unisim.make @@ -1,6 +1,7 @@ # ------------------------------------------------- # Compile script for GHDL # ------------------------------------------------- +include ../make/defs.mk # ------------------------------------------------- # Global options @@ -8,14 +9,11 @@ LANG_STD := 93c IEEE_STD := standard WORK_LIB := unisim - +TARGET := unisim # ------------------------------------------------- # Target options # ------------------------------------------------- -TARGET := unisim -LIB_PATH := xilinx/libsrc - SRCS := $(LIB_PATH)/unisims/unisim_VPKG.vhd SRCS += $(LIB_PATH)/unisims/unisim_VCOMP.vhd SRCS += $(LIB_PATH)/unisims/unisim_SMODEL.vhd diff --git a/lib/CPUs/MIPS/ghdl/tb_mips_top.make b/lib/CPUs/MIPS/ghdl/tb_mips_top.make index 57908e0..bbfa40e 100644 --- a/lib/CPUs/MIPS/ghdl/tb_mips_top.make +++ b/lib/CPUs/MIPS/ghdl/tb_mips_top.make @@ -33,7 +33,6 @@ SRCS += ../src/tb_mips_top.vhd TARGET := tb_mips_top ENTITY = tb_mips_top RUN_TIME := 1500us -WITH_VCD := y include $(VHDL_HOME)/make/ghdl.mk diff --git a/lib/FIFO/ghdl/tb_fifo_async.make b/lib/FIFO/ghdl/tb_fifo_async.make index 74d9b86..98a882b 100644 --- a/lib/FIFO/ghdl/tb_fifo_async.make +++ b/lib/FIFO/ghdl/tb_fifo_async.make @@ -10,7 +10,6 @@ SRCS += $(LIB_PATH)/FIFO/src/tb_fifo_async.vhd # Compile TARGET := tb_fifo_async ENTITY := tb_fifo_async -WITH_VCD := y RUN_TIME := 5us include $(VHDL_HOME)/make/ghdl.mk diff --git a/lib/FIFO/ghdl/tb_fifo_sync.make b/lib/FIFO/ghdl/tb_fifo_sync.make index fb32c19..d2525e8 100644 --- a/lib/FIFO/ghdl/tb_fifo_sync.make +++ b/lib/FIFO/ghdl/tb_fifo_sync.make @@ -10,7 +10,6 @@ SRCS += $(LIB_PATH)/FIFO/src/tb_fifo_sync.vhd # Compile TARGET := tb_fifo_sync ENTITY := tb_fifo_sync -WITH_VCD := y RUN_TIME := 5us include $(VHDL_HOME)/make/ghdl.mk diff --git a/lib/FIFO/ghdl/tb_gray_counter.make b/lib/FIFO/ghdl/tb_gray_counter.make index b863d03..869b0a5 100644 --- a/lib/FIFO/ghdl/tb_gray_counter.make +++ b/lib/FIFO/ghdl/tb_gray_counter.make @@ -7,7 +7,6 @@ SRCS += $(LIB_PATH)/FIFO/src/tb_gray_counter.vhd # Compile TARGET := tb_gray_counter ENTITY := tb_gray_counter -WITH_VCD := y RUN_TIME := 1us include $(VHDL_HOME)/make/ghdl.mk diff --git a/lib/JBUS/busmaster/ghdl/tb_busmaster_async.make b/lib/JBUS/busmaster/ghdl/tb_busmaster_async.make index eaf4b46..5882051 100644 --- a/lib/JBUS/busmaster/ghdl/tb_busmaster_async.make +++ b/lib/JBUS/busmaster/ghdl/tb_busmaster_async.make @@ -12,7 +12,6 @@ SRCS += $(MOD_PATH)/src/tb_busmaster_async.vhd # Compile TARGET := tb_busmaster_async ENTITY := tb_busmaster_async -WITH_VCD := y RUN_TIME := 80us include $(VHDL_HOME)/make/ghdl.mk diff --git a/lib/JBUS/busmaster/ghdl/tb_busmaster_sync.make b/lib/JBUS/busmaster/ghdl/tb_busmaster_sync.make index 1d04754..53873fb 100644 --- a/lib/JBUS/busmaster/ghdl/tb_busmaster_sync.make +++ b/lib/JBUS/busmaster/ghdl/tb_busmaster_sync.make @@ -12,7 +12,6 @@ SRCS += $(MOD_PATH)/src/tb_busmaster_sync.vhd # Compile TARGET := tb_busmaster_sync ENTITY := tb_busmaster_sync -WITH_VCD := y RUN_TIME := 40us include $(VHDL_HOME)/make/ghdl.mk diff --git a/lib/JBUS/dmac/ghdl/tb_dmac_sync.make b/lib/JBUS/dmac/ghdl/tb_dmac_sync.make index 40415fb..f643b54 100644 --- a/lib/JBUS/dmac/ghdl/tb_dmac_sync.make +++ b/lib/JBUS/dmac/ghdl/tb_dmac_sync.make @@ -13,7 +13,6 @@ SRCS += $(MOD_PATH)/dmac/src/tb_dmac.vhd # Compile TARGET := tb_dmac_sync ENTITY := tb_dmac -WITH_VCD := y RUN_TIME := 6us include $(VHDL_HOME)/make/ghdl.mk diff --git a/lib/JBUS/memory/ghdl/tb_ram_wb.make b/lib/JBUS/memory/ghdl/tb_ram_wb.make index 8feeaf1..6f33895 100644 --- a/lib/JBUS/memory/ghdl/tb_ram_wb.make +++ b/lib/JBUS/memory/ghdl/tb_ram_wb.make @@ -10,7 +10,6 @@ SRCS += $(MOD_PATH)/src/tb_ram_wb.vhd # Compile TARGET := tb_ram_wb ENTITY := tb_ram_wb -WITH_VCD := y RUN_TIME := 1500ns include $(VHDL_HOME)/make/ghdl.mk diff --git a/lib/JBUS/memory/ghdl/tb_rom_wb.make b/lib/JBUS/memory/ghdl/tb_rom_wb.make index 45764e0..1a2d61f 100644 --- a/lib/JBUS/memory/ghdl/tb_rom_wb.make +++ b/lib/JBUS/memory/ghdl/tb_rom_wb.make @@ -9,7 +9,6 @@ SRCS += $(MOD_PATH)/src/tb_rom_wb.vhd # Compile TARGET := tb_rom_wb ENTITY := tb_rom_wb -WITH_VCD := y RUN_TIME := 1500ns include $(VHDL_HOME)/make/ghdl.mk diff --git a/lib/SDRAM/ddr_sdr_v1_5/ghdl/tb_ctrl_ddr_wb32.make b/lib/SDRAM/ddr_sdr_v1_5/ghdl/tb_ctrl_ddr_wb32.make index e864e1c..cf8398c 100644 --- a/lib/SDRAM/ddr_sdr_v1_5/ghdl/tb_ctrl_ddr_wb32.make +++ b/lib/SDRAM/ddr_sdr_v1_5/ghdl/tb_ctrl_ddr_wb32.make @@ -26,7 +26,6 @@ SRCS += $(MOD_PATH)/src/tb_ctrl_ddr_wb32.vhd # Compile TARGET := tb_ctrl_ddr_wb32 ENTITY := tb_ctrl_ddr_wb32 -WITH_VCD := y RUN_TIME := 200us GHDL_OPTS := -P$(VHDL_HOME)/Common/sim/build/unisim/unisim -fsynopsys -fexplicit diff --git a/lib/SDRAM/ddr_sdr_v1_5/ghdl/tb_ctrl_ddr_wb64.make b/lib/SDRAM/ddr_sdr_v1_5/ghdl/tb_ctrl_ddr_wb64.make index aa90301..f38de1d 100644 --- a/lib/SDRAM/ddr_sdr_v1_5/ghdl/tb_ctrl_ddr_wb64.make +++ b/lib/SDRAM/ddr_sdr_v1_5/ghdl/tb_ctrl_ddr_wb64.make @@ -25,7 +25,6 @@ SRCS += $(MOD_PATH)/src/tb_ctrl_ddr_wb64.vhd # Compile TARGET := tb_ctrl_ddr_wb64 ENTITY := tb_ctrl_ddr_wb64 -WITH_VCD := y RUN_TIME := 200us GHDL_OPTS := -P$(VHDL_HOME)/Common/sim/build/unisim/unisim -fsynopsys -fexplicit diff --git a/lib/VGA_ctrl/ghdl/tb_vga_frontend_jb32.make b/lib/VGA_ctrl/ghdl/tb_vga_frontend_jb32.make index 7a8ddc5..9900c34 100644 --- a/lib/VGA_ctrl/ghdl/tb_vga_frontend_jb32.make +++ b/lib/VGA_ctrl/ghdl/tb_vga_frontend_jb32.make @@ -11,7 +11,6 @@ SRCS += ../src/tb_vga_frontend_jb32.vhd # Compile TARGET := tb_vga_frontend_jb32 ENTITY := tb_vga_frontend_jb32 -WITH_FST := y RUN_TIME := 20ms include $(VHDL_HOME)/make/ghdl.mk diff --git a/lib/VGA_ctrl/ghdl/tb_vga_frontend_jb64.make b/lib/VGA_ctrl/ghdl/tb_vga_frontend_jb64.make index afc7ab6..5d6fa88 100644 --- a/lib/VGA_ctrl/ghdl/tb_vga_frontend_jb64.make +++ b/lib/VGA_ctrl/ghdl/tb_vga_frontend_jb64.make @@ -11,7 +11,6 @@ SRCS += ../src/tb_vga_frontend_jb64.vhd # Compile TARGET := tb_vga_frontend_jb64 ENTITY := tb_vga_frontend_jb64 -WITH_FST := y RUN_TIME := 2ms include $(VHDL_HOME)/make/ghdl.mk diff --git a/lib/emac/ghdl/tb_emac_top_jb.make b/lib/emac/ghdl/tb_emac_top_jb.make index 178e7d3..cb50eda 100644 --- a/lib/emac/ghdl/tb_emac_top_jb.make +++ b/lib/emac/ghdl/tb_emac_top_jb.make @@ -8,7 +8,6 @@ SRCS += $(LIB_PATH)/emac/src/tb_emac_top_jb.vhd # Compile TARGET := tb_emac_top_jb ENTITY := tb_emac_top_jb -WITH_VCD := y RUN_TIME := 2000us include $(VHDL_HOME)/make/ghdl.mk diff --git a/lib/filter/ghdl/tb_fir_iterative.make b/lib/filter/ghdl/tb_fir_iterative.make index bf7947a..fb0a705 100644 --- a/lib/filter/ghdl/tb_fir_iterative.make +++ b/lib/filter/ghdl/tb_fir_iterative.make @@ -12,7 +12,6 @@ SRCS += $(LIB_PATH)/filter/src/tb_fir_iterative.vhd # Compile TARGET := tb_fir_iterative ENTITY := tb_fir_iterative -WITH_VCD := y GHDL_OPTS := -P$(LIB_PATH)/fixed/ieee_proposed/build/fixed_pkg/ieee_proposed RUN_TIME := 6us diff --git a/lib/filter/ghdl/tb_fir_parallel.make b/lib/filter/ghdl/tb_fir_parallel.make index a16c33a..e7eb356 100644 --- a/lib/filter/ghdl/tb_fir_parallel.make +++ b/lib/filter/ghdl/tb_fir_parallel.make @@ -12,7 +12,6 @@ SRCS += $(LIB_PATH)/filter/src/tb_fir_parallel.vhd # Compile TARGET := tb_fir_parallel ENTITY := tb_fir_parallel -WITH_VCD := y GHDL_OPTS := -P$(LIB_PATH)/fixed/ieee_proposed/build/fixed_pkg/ieee_proposed RUN_TIME := 200us diff --git a/lib/filter/ghdl/tb_fir_semi_parallel.make b/lib/filter/ghdl/tb_fir_semi_parallel.make index e715cef..ffaa233 100644 --- a/lib/filter/ghdl/tb_fir_semi_parallel.make +++ b/lib/filter/ghdl/tb_fir_semi_parallel.make @@ -12,7 +12,6 @@ SRCS += $(LIB_PATH)/filter/src/tb_fir_semi_parallel.vhd # Compile TARGET := tb_fir_semi_parallel ENTITY := tb_fir_semi_parallel -WITH_VCD := y GHDL_OPTS := -P$(LIB_PATH)/fixed/ieee_proposed/build/fixed_pkg/ieee_proposed RUN_TIME := 50us diff --git a/lib/filter/ghdl/tb_fir_stage.make b/lib/filter/ghdl/tb_fir_stage.make index 616683c..c66b87a 100644 --- a/lib/filter/ghdl/tb_fir_stage.make +++ b/lib/filter/ghdl/tb_fir_stage.make @@ -12,7 +12,6 @@ SRCS += $(LIB_PATH)/filter/src/tb_fir_stage.vhd # Compile TARGET := tb_fir_stage ENTITY := tb_fir_stage -WITH_VCD := y GHDL_OPTS := -P$(LIB_PATH)/fixed/ieee_proposed/build/fixed_pkg/ieee_proposed RUN_TIME := 2us diff --git a/lib/filter/ghdl/tb_fir_stage_sys.make b/lib/filter/ghdl/tb_fir_stage_sys.make index af84172..5255fc1 100644 --- a/lib/filter/ghdl/tb_fir_stage_sys.make +++ b/lib/filter/ghdl/tb_fir_stage_sys.make @@ -12,7 +12,6 @@ SRCS += $(LIB_PATH)/filter/src/tb_fir_stage_sys.vhd # Compile TARGET := tb_fir_stage_sys ENTITY := tb_fir_stage_sys -WITH_VCD := y GHDL_OPTS := -P$(LIB_PATH)/fixed/ieee_proposed/build/fixed_pkg/ieee_proposed RUN_TIME := 2us diff --git a/lib/ps2_port/ghdl/tb_ps2_core.make b/lib/ps2_port/ghdl/tb_ps2_core.make index 969d76f..6a986e6 100644 --- a/lib/ps2_port/ghdl/tb_ps2_core.make +++ b/lib/ps2_port/ghdl/tb_ps2_core.make @@ -8,7 +8,6 @@ SRCS += $(MOD_PATH)/src/tb_ps2_core.vhd # Compile TARGET := tb_ps2_core ENTITY := tb_ps2_core -WITH_VCD := y RUN_TIME := 10ms include $(VHDL_HOME)/make/ghdl.mk diff --git a/lib/radio/cordic/ghdl/tb_cordic_iterative_top.make b/lib/radio/cordic/ghdl/tb_cordic_iterative_top.make index 378f024..6a51c30 100644 --- a/lib/radio/cordic/ghdl/tb_cordic_iterative_top.make +++ b/lib/radio/cordic/ghdl/tb_cordic_iterative_top.make @@ -21,7 +21,6 @@ SRCS += $(LIB_PATH)/radio/cordic/src/tb_cordic_top.vhd # Compile TARGET := tb_cordic_iterative_top ENTITY := tb_cordic_top -WITH_VCD := y RUN_TIME := 300us GHDL_OPTS := -P$(LIB_PATH)/fixed/ieee_proposed/build/fixed_pkg/ieee_proposed diff --git a/lib/radio/cordic/ghdl/tb_cordic_pipe_top.make b/lib/radio/cordic/ghdl/tb_cordic_pipe_top.make index 1a5c27a..f62b4bb 100644 --- a/lib/radio/cordic/ghdl/tb_cordic_pipe_top.make +++ b/lib/radio/cordic/ghdl/tb_cordic_pipe_top.make @@ -21,7 +21,6 @@ SRCS += $(LIB_PATH)/radio/cordic/src/tb_cordic_pipe_top.vhd # Compile TARGET := tb_cordic_pipe_top ENTITY := tb_cordic_pipe_top -WITH_VCD := y RUN_TIME := 150us GHDL_OPTS := -P$(LIB_PATH)/fixed/ieee_proposed/build/fixed_pkg/ieee_proposed diff --git a/lib/radio/ddc/ghdl/tb_ddc.make b/lib/radio/ddc/ghdl/tb_ddc.make index 451e33b..8f8cb2a 100644 --- a/lib/radio/ddc/ghdl/tb_ddc.make +++ b/lib/radio/ddc/ghdl/tb_ddc.make @@ -17,7 +17,6 @@ SRCS += $(LIB_PATH)/radio/ddc/src/tb_ddc.vhd # Compile TARGET := tb_ddc ENTITY := tb_ddc -WITH_VCD := y RUN_TIME := 100us GHDL_OPTS := -P$(LIB_PATH)/fixed/ieee_proposed/build/fixed_pkg/ieee_proposed diff --git a/lib/radio/ddc/ghdl/tb_syn_ddc.make b/lib/radio/ddc/ghdl/tb_syn_ddc.make index e91767e..b14691f 100644 --- a/lib/radio/ddc/ghdl/tb_syn_ddc.make +++ b/lib/radio/ddc/ghdl/tb_syn_ddc.make @@ -21,7 +21,6 @@ SRCS += $(LIB_PATH)/radio/ddc/src/tb_syn_ddc.vhd # Compile TARGET := tb_syn_ddc ENTITY := tb_syn_ddc -WITH_VCD := y RUN_TIME := 100us GHDL_OPTS := -P$(LIB_PATH)/fixed/ieee_proposed/build/fixed_pkg/ieee_proposed diff --git a/lib/radio/decimator/CIC/ghdl/tb_cic_decim_pipe.make b/lib/radio/decimator/CIC/ghdl/tb_cic_decim_pipe.make index 2b2be61..0d0f5a8 100644 --- a/lib/radio/decimator/CIC/ghdl/tb_cic_decim_pipe.make +++ b/lib/radio/decimator/CIC/ghdl/tb_cic_decim_pipe.make @@ -9,7 +9,6 @@ SRCS += $(LIB_PATH)/radio/decimator/CIC/src/tb_cic_decim_pipe.vhd # Compile TARGET := tb_cic_decim_pipe ENTITY := tb_cic_decim_pipe -WITH_VCD := y RUN_TIME := 75us GHDL_OPTS := -P$(LIB_PATH)/fixed/ieee_proposed/build/fixed_pkg/ieee_proposed diff --git a/lib/radio/nco/ghdl/tb_mix_cordic.make b/lib/radio/nco/ghdl/tb_mix_cordic.make index 9cdff9b..22605b0 100644 --- a/lib/radio/nco/ghdl/tb_mix_cordic.make +++ b/lib/radio/nco/ghdl/tb_mix_cordic.make @@ -21,7 +21,6 @@ SRCS += $(LIB_PATH)/radio/nco/src/tb_mix_cordic.vhd # Compile TARGET := tb_mix_cordic ENTITY := tb_mix -WITH_VCD := y RUN_TIME := 200us GHDL_OPTS := -P$(LIB_PATH)/fixed/ieee_proposed/build/fixed_pkg/ieee_proposed diff --git a/lib/radio/nco/ghdl/tb_nco_cordic.make b/lib/radio/nco/ghdl/tb_nco_cordic.make index 0234dac..4327194 100644 --- a/lib/radio/nco/ghdl/tb_nco_cordic.make +++ b/lib/radio/nco/ghdl/tb_nco_cordic.make @@ -21,7 +21,6 @@ SRCS += $(LIB_PATH)/radio/nco/src/tb_nco_cordic.vhd # Compile TARGET := tb_nco_cordic ENTITY := tb_nco -WITH_VCD := y RUN_TIME := 250us GHDL_OPTS := -P$(LIB_PATH)/fixed/ieee_proposed/build/fixed_pkg/ieee_proposed diff --git a/lib/radio/nco/ghdl/tb_nco_lut.make b/lib/radio/nco/ghdl/tb_nco_lut.make index a52438f..6baaf53 100644 --- a/lib/radio/nco/ghdl/tb_nco_lut.make +++ b/lib/radio/nco/ghdl/tb_nco_lut.make @@ -21,7 +21,6 @@ SRCS += $(LIB_PATH)/radio/nco/src/tb_nco_lut.vhd # Compile TARGET := tb_nco_lut ENTITY := tb_nco -WITH_VCD := y RUN_TIME := 250us GHDL_OPTS := -P$(LIB_PATH)/fixed/ieee_proposed/build/fixed_pkg/ieee_proposed diff --git a/projects/mips_sys/ghdl/tb_mips_sys.make b/projects/mips_sys/ghdl/tb_mips_sys.make index 0005dc5..324cb51 100644 --- a/projects/mips_sys/ghdl/tb_mips_sys.make +++ b/projects/mips_sys/ghdl/tb_mips_sys.make @@ -98,7 +98,6 @@ SRCS += ../src/tb_mips_sys.vhd TARGET := tb_mips_sys ENTITY = tb_mips_sys RUN_TIME := 10ms -WITH_FST := y GHDL_OPTS := -P$(ROOT_PATH)/Common/sim/build/unisim/unisim -fsynopsys -fexplicit diff --git a/projects/vga_ctrl/ghdl/tb_vga_ctrl.make b/projects/vga_ctrl/ghdl/tb_vga_ctrl.make index d7d734e..b244799 100644 --- a/projects/vga_ctrl/ghdl/tb_vga_ctrl.make +++ b/projects/vga_ctrl/ghdl/tb_vga_ctrl.make @@ -19,7 +19,6 @@ SRCS += ../src/tb_vga_ctrl.vhd # Compile TARGET := tb_vga_ctrl ENTITY := tb_vga_ctrl -WITH_VCD := y RUN_TIME := 1us include $(VHDL_HOME)/make/ghdl.mk