From 06feba8f6348727ff0c97b3445df13f23806b586 Mon Sep 17 00:00:00 2001 From: Jens Ahrensfeld Date: Sun, 28 Mar 2021 10:27:33 +0000 Subject: [PATCH] - refactored git-svn-id: http://moon:8086/svn/vhdl/trunk@1541 cc03376c-175c-47c8-b038-4cd826a8556b --- lib/CPUs/JCpu/ghdl/cpu_embedded.make | 5 +- lib/CPUs/JCpu/ghdl/cpu_itest.make | 9 ++-- lib/CPUs/JCpu/ghdl/jcpu_core.inc | 34 ++++++-------- lib/CPUs/JCpu/ghdl/mul8x8.make | 5 +- lib/CPUs/JCpu/ghdl/reti_issue.make | 9 ++-- lib/CPUs/MIPS/ghdl/mips_core.inc | 46 ++++++++----------- lib/CPUs/MIPS/ghdl/tb_mips_top.make | 24 ++++++---- lib/FIFO/ghdl/fifo_async.inc | 21 +++------ lib/FIFO/ghdl/fifo_sync.inc | 19 +++----- lib/FIFO/ghdl/tb_fifo_async.make | 3 +- lib/FIFO/ghdl/tb_fifo_sync.make | 3 +- lib/FIFO/ghdl/tb_gray_counter.make | 5 +- .../busmaster/ghdl/tb_busmaster_async.make | 7 ++- .../busmaster/ghdl/tb_busmaster_sync.make | 7 ++- lib/JBUS/dmac/ghdl/tb_dmac_sync.make | 7 ++- lib/JBUS/memory/ghdl/tb_ram_wb.make | 8 ++-- lib/JBUS/memory/ghdl/tb_rom_wb.make | 7 ++- .../ddr_sdr_v1_5/ghdl/tb_ctrl_ddr_wb32.make | 12 +++-- .../ddr_sdr_v1_5/ghdl/tb_ctrl_ddr_wb64.make | 13 +++--- lib/emac/ghdl/emac_jbus.inc | 21 +++------ lib/emac/ghdl/emac_rx.inc | 28 +++++------ lib/emac/ghdl/emac_tx.inc | 32 ++++++------- lib/emac/ghdl/tb_emac_top_jb.make | 8 ++-- lib/filter/ghdl/fir_iterative.inc | 25 ++++------ lib/filter/ghdl/fir_parallel.inc | 23 ++++------ lib/filter/ghdl/fir_semi_parallel.inc | 27 ++++------- lib/filter/ghdl/tb_fir_iterative.make | 3 +- lib/filter/ghdl/tb_fir_parallel.make | 3 +- lib/filter/ghdl/tb_fir_semi_parallel.make | 3 +- lib/filter/ghdl/tb_fir_stage.make | 5 +- lib/filter/ghdl/tb_fir_stage_sys.make | 5 +- lib/ps2_port/ghdl/tb_ps2_core.make | 6 +-- lib/radio/cordic/ghdl/cordic_iterative.inc | 25 ++++------ lib/radio/cordic/ghdl/cordic_pipe.inc | 23 ++++------ .../cordic/ghdl/tb_cordic_iterative_top.make | 5 +- lib/radio/cordic/ghdl/tb_cordic_pipe_top.make | 6 +-- lib/radio/ddc/ghdl/tb_ddc.make | 13 +++--- lib/radio/ddc/ghdl/tb_syn_ddc.make | 15 +++--- .../decimator/CIC/ghdl/cic_decim_pipe.inc | 21 +++------ .../decimator/CIC/ghdl/tb_cic_decim_pipe.make | 6 +-- lib/radio/nco/ghdl/mix_cordic_pipe.inc | 16 ++----- lib/radio/nco/ghdl/nco_lut.inc | 21 +++------ lib/radio/nco/ghdl/tb_mix_cordic.make | 9 ++-- lib/radio/nco/ghdl/tb_nco_cordic.make | 9 ++-- lib/radio/nco/ghdl/tb_nco_lut.make | 7 ++- make/defs.mk | 3 ++ {Common/make => make}/ghdl.mk | 0 47 files changed, 255 insertions(+), 357 deletions(-) create mode 100644 make/defs.mk rename {Common/make => make}/ghdl.mk (100%) diff --git a/lib/CPUs/JCpu/ghdl/cpu_embedded.make b/lib/CPUs/JCpu/ghdl/cpu_embedded.make index 2cc5e05..42660ca 100644 --- a/lib/CPUs/JCpu/ghdl/cpu_embedded.make +++ b/lib/CPUs/JCpu/ghdl/cpu_embedded.make @@ -1,3 +1,6 @@ +# ----------------------------------------------------------- +include $(VHDL_HOME)/make/defs.mk +# ----------------------------------------------------------- include jcpu_core.inc SRCS += $(JCPU_CORE_SRCS) @@ -10,5 +13,5 @@ TARGET := cpu_embedded ENTITY := tb_cpu_embedded WITH_GHW := y -include ../../../../Common/make/ghdl.mk +include $(VHDL_HOME)/make/ghdl.mk diff --git a/lib/CPUs/JCpu/ghdl/cpu_itest.make b/lib/CPUs/JCpu/ghdl/cpu_itest.make index 6a66b98..156aff6 100644 --- a/lib/CPUs/JCpu/ghdl/cpu_itest.make +++ b/lib/CPUs/JCpu/ghdl/cpu_itest.make @@ -1,8 +1,11 @@ +# ----------------------------------------------------------- +include $(VHDL_HOME)/make/defs.mk +# ----------------------------------------------------------- include jcpu_core.inc SRCS += $(JCPU_CORE_SRCS) -SRCS += ../../../PCK_FIO-2002.7/PCK_FIO_1993.vhd -SRCS += ../../../PCK_FIO-2002.7/PCK_FIO_1993_BODY.vhd +SRCS += $(LIB_PATH)/PCK_FIO-2002.7/PCK_FIO_1993.vhd +SRCS += $(LIB_PATH)/PCK_FIO-2002.7/PCK_FIO_1993_BODY.vhd SRCS += ../src/itest_irom.vhdl SRCS += ../src/tb_cpu_itest.vhd @@ -11,5 +14,5 @@ TARGET := cpu_itest ENTITY := tb_cpu WITH_GHW := y -include ../../../../Common/make/ghdl.mk +include $(VHDL_HOME)/make/ghdl.mk diff --git a/lib/CPUs/JCpu/ghdl/jcpu_core.inc b/lib/CPUs/JCpu/ghdl/jcpu_core.inc index 960db0d..d532cd2 100644 --- a/lib/CPUs/JCpu/ghdl/jcpu_core.inc +++ b/lib/CPUs/JCpu/ghdl/jcpu_core.inc @@ -1,28 +1,20 @@ # ----------------------------------------------------------- +include $(VHDL_HOME)/make/defs.mk +# ----------------------------------------------------------- PKG_NAME := JCPU_CORE -ROOT_PATH := ../../../.. -LIB_PATH := $(ROOT_PATH)/lib -CUR_PATH := $(shell dirname $(lastword $(MAKEFILE_LIST))) -SRC_PATH := $(LIB_PATH)/CPUs/JCpu/src/core # ----------------------------------------------------------- -SRCS := $(SRC_PATH)/cpu_pkg.vhd -SRCS += $(SRC_PATH)/cpu.vhd -SRCS += $(SRC_PATH)/alu.vhd -SRCS += $(SRC_PATH)/chipram.vhd -SRCS += $(SRC_PATH)/chipreg.vhd -SRCS += $(SRC_PATH)/dpath_ctrl.vhd -SRCS += $(SRC_PATH)/int_ctrl.vhd -SRCS += $(SRC_PATH)/pc.vhd -SRCS += $(SRC_PATH)/reg_dual.vhd -SRCS += $(SRC_PATH)/stack_ctrl.vhd +MOD_PATH := $(LIB_PATH)/CPUs/JCpu/src/core +$(PKG_NAME)_SRCS += $(MOD_PATH)/cpu_pkg.vhd +$(PKG_NAME)_SRCS += $(MOD_PATH)/cpu.vhd +$(PKG_NAME)_SRCS += $(MOD_PATH)/alu.vhd +$(PKG_NAME)_SRCS += $(MOD_PATH)/chipram.vhd +$(PKG_NAME)_SRCS += $(MOD_PATH)/chipreg.vhd +$(PKG_NAME)_SRCS += $(MOD_PATH)/dpath_ctrl.vhd +$(PKG_NAME)_SRCS += $(MOD_PATH)/int_ctrl.vhd +$(PKG_NAME)_SRCS += $(MOD_PATH)/pc.vhd +$(PKG_NAME)_SRCS += $(MOD_PATH)/reg_dual.vhd +$(PKG_NAME)_SRCS += $(MOD_PATH)/stack_ctrl.vhd # ----------------------------------------------------------- -$(PKG_NAME)_SRCS := $(addprefix $(CUR_PATH)/,$(SRCS)) - -SRCS := -CUR_PATH := -SRC_PATH := -ROOT_PATH := -LIB_PATH := diff --git a/lib/CPUs/JCpu/ghdl/mul8x8.make b/lib/CPUs/JCpu/ghdl/mul8x8.make index 28d6434..4c3949c 100644 --- a/lib/CPUs/JCpu/ghdl/mul8x8.make +++ b/lib/CPUs/JCpu/ghdl/mul8x8.make @@ -1,3 +1,6 @@ +# ----------------------------------------------------------- +include $(VHDL_HOME)/make/defs.mk +# ----------------------------------------------------------- include jcpu_core.inc SRCS += $(JCPU_CORE_SRCS) @@ -10,5 +13,5 @@ TARGET := mul8x8 ENTITY := tb_cpu_embedded WITH_GHW := y -include ../../../../Common/make/ghdl.mk +include $(VHDL_HOME)/make/ghdl.mk diff --git a/lib/CPUs/JCpu/ghdl/reti_issue.make b/lib/CPUs/JCpu/ghdl/reti_issue.make index bbbaee2..1625e5a 100644 --- a/lib/CPUs/JCpu/ghdl/reti_issue.make +++ b/lib/CPUs/JCpu/ghdl/reti_issue.make @@ -1,8 +1,11 @@ +# ----------------------------------------------------------- +include $(VHDL_HOME)/make/defs.mk +# ----------------------------------------------------------- include jcpu_core.inc SRCS += $(JCPU_CORE_SRCS) -SRCS += ../../../PCK_FIO-2002.7/PCK_FIO_1993.vhd -SRCS += ../../../PCK_FIO-2002.7/PCK_FIO_1993_BODY.vhd +SRCS += $(LIB_PATH)/PCK_FIO-2002.7/PCK_FIO_1993.vhd +SRCS += $(LIB_PATH)/PCK_FIO-2002.7/PCK_FIO_1993_BODY.vhd SRCS += ../src/reti_issue_irom.vhdl SRCS += ../src/tb_cpu_itest.vhd @@ -11,5 +14,5 @@ TARGET := reti_issue ENTITY := tb_cpu WITH_GHW := y -include ../../../../Common/make/ghdl.mk +include $(VHDL_HOME)/make/ghdl.mk diff --git a/lib/CPUs/MIPS/ghdl/mips_core.inc b/lib/CPUs/MIPS/ghdl/mips_core.inc index 742824d..1245027 100644 --- a/lib/CPUs/MIPS/ghdl/mips_core.inc +++ b/lib/CPUs/MIPS/ghdl/mips_core.inc @@ -1,33 +1,25 @@ # ----------------------------------------------------------- +include $(VHDL_HOME)/make/defs.mk +# ----------------------------------------------------------- PKG_NAME := MIPS_CORE -ROOT_PATH := ../../../.. -LIB_PATH := $(ROOT_PATH)/lib -CUR_PATH := $(shell dirname $(lastword $(MAKEFILE_LIST))) + +# ----------------------------------------------------------- MOD_PATH := $(LIB_PATH)/CPUs/MIPS/src/core +$(PKG_NAME)_SRCS += $(LIB_PATH)/rams/sim/src/dpram_2w2r2c_ra.vhd +$(PKG_NAME)_SRCS += $(LIB_PATH)/rams/sim/src/dpram_1w1r2c_ra.vhd +$(PKG_NAME)_SRCS += $(MOD_PATH)/mips_types.vhd +$(PKG_NAME)_SRCS += $(MOD_PATH)/mips_instr.vhd +$(PKG_NAME)_SRCS += $(MOD_PATH)/mips_alu.vhd +$(PKG_NAME)_SRCS += $(MOD_PATH)/mips_bcu.vhd +$(PKG_NAME)_SRCS += $(MOD_PATH)/mips_biu.vhd +$(PKG_NAME)_SRCS += $(MOD_PATH)/mips_cop.vhd +$(PKG_NAME)_SRCS += $(MOD_PATH)/mips_dcache.vhd +$(PKG_NAME)_SRCS += $(MOD_PATH)/mips_icache.vhd +$(PKG_NAME)_SRCS += $(MOD_PATH)/mips_muldiv.vhd +$(PKG_NAME)_SRCS += $(MOD_PATH)/mips_pipeline.vhd +$(PKG_NAME)_SRCS += $(MOD_PATH)/mips_reg.vhd +$(PKG_NAME)_SRCS += $(MOD_PATH)/mips_shifter.vhd +$(PKG_NAME)_SRCS += $(MOD_PATH)/mips_top.vhd # ----------------------------------------------------------- -SRCS += $(LIB_PATH)/rams/sim/src/dpram_2w2r2c_ra.vhd -SRCS += $(LIB_PATH)/rams/sim/src/dpram_1w1r2c_ra.vhd -SRCS += $(MOD_PATH)/mips_types.vhd -SRCS += $(MOD_PATH)/mips_instr.vhd -SRCS += $(MOD_PATH)/mips_alu.vhd -SRCS += $(MOD_PATH)/mips_bcu.vhd -SRCS += $(MOD_PATH)/mips_biu.vhd -SRCS += $(MOD_PATH)/mips_cop.vhd -SRCS += $(MOD_PATH)/mips_dcache.vhd -SRCS += $(MOD_PATH)/mips_icache.vhd -SRCS += $(MOD_PATH)/mips_muldiv.vhd -SRCS += $(MOD_PATH)/mips_pipeline.vhd -SRCS += $(MOD_PATH)/mips_reg.vhd -SRCS += $(MOD_PATH)/mips_shifter.vhd -SRCS += $(MOD_PATH)/mips_top.vhd - -# ----------------------------------------------------------- -$(PKG_NAME)_SRCS := $(addprefix $(CUR_PATH)/,$(SRCS)) - -SRCS := -CUR_PATH := -MOD_PATH := -ROOT_PATH := -LIB_PATH := diff --git a/lib/CPUs/MIPS/ghdl/tb_mips_top.make b/lib/CPUs/MIPS/ghdl/tb_mips_top.make index 7b71441..6bc33a3 100644 --- a/lib/CPUs/MIPS/ghdl/tb_mips_top.make +++ b/lib/CPUs/MIPS/ghdl/tb_mips_top.make @@ -1,29 +1,33 @@ +# ----------------------------------------------------------- +include $(VHDL_HOME)/make/defs.mk +# ----------------------------------------------------------- include mips_core.inc -include ../../../../lib/FIFO/ghdl/fifo_sync.inc -include ../../../../lib/FIFO/ghdl/fifo_async.inc +include $(LIB_PATH)/FIFO/ghdl/fifo_sync.inc +include $(LIB_PATH)/FIFO/ghdl/fifo_async.inc +# ----------------------------------------------------------- # FIFOS SRCS += $(FIFO_SYNC_SRCS) SRCS += $(FIFO_ASYNC_SRCS) # UART -SRCS += ../../../uart/src/uart_types.vhd -SRCS += ../../../uart/src/sim/uart.vhd -SRCS += ../../../uart/src/uart_wb.vhd +SRCS += $(LIB_PATH)/uart/src/uart_types.vhd +SRCS += $(LIB_PATH)/uart/src/sim/uart.vhd +SRCS += $(LIB_PATH)/uart/src/uart_wb.vhd # GPIO -SRCS += ../../../JBUS/gpio/src/gpio_wb.vhd +SRCS += $(LIB_PATH)/JBUS/gpio/src/gpio_wb.vhd # Async port -SRCS += ../../../JBUS/async_port/src/async_types.vhd -SRCS += ../../../JBUS/async_port/src/async_port_wb.vhd +SRCS += $(LIB_PATH)/JBUS/async_port/src/async_types.vhd +SRCS += $(LIB_PATH)/JBUS/async_port/src/async_port_wb.vhd SRCS += ../src/async_defs.vhd # ROM #SRCS += Z:/work/repos/mips/src/bootloader/build/ml402/eb/bootloader.elf.ROM.vhd #SRCS += Z:/work/repos/mips/src/bootloader/build/denano/eb/bootloader.elf.ROM.vhd SRCS += ../src/bootloader_flash.ROM.vhd -SRCS += ../../../JBUS/memory/src/rom_wb.vhd +SRCS += $(LIB_PATH)/JBUS/memory/src/rom_wb.vhd # MIPS SRCS += $(MIPS_CORE_SRCS) @@ -37,5 +41,5 @@ ENTITY = tb_mips_top RUN_TIME := 1500us WITH_VCD := y -include ../../../../Common/make/ghdl.mk +include $(VHDL_HOME)/make/ghdl.mk diff --git a/lib/FIFO/ghdl/fifo_async.inc b/lib/FIFO/ghdl/fifo_async.inc index d5640fb..7dcfdc7 100644 --- a/lib/FIFO/ghdl/fifo_async.inc +++ b/lib/FIFO/ghdl/fifo_async.inc @@ -1,21 +1,14 @@ # ----------------------------------------------------------- +include $(VHDL_HOME)/make/defs.mk +# ----------------------------------------------------------- PKG_NAME := FIFO_ASYNC -ROOT_PATH := ../../.. -LIB_PATH := $(ROOT_PATH)/lib -CUR_PATH := $(shell dirname $(lastword $(MAKEFILE_LIST))) # ----------------------------------------------------------- -SRCS := $(LIB_PATH)/rams/sim/src/dpram_1w1r2c_ra.vhd -SRCS += $(LIB_PATH)/FIFO/src/fifo_ctrl_pkg.vhd -SRCS += $(LIB_PATH)/FIFO/src/gray_counter.vhd -SRCS += $(LIB_PATH)/FIFO/src/fifo_async_ctrl.vhd -SRCS += $(LIB_PATH)/FIFO/src/fifo_async.vhd +$(PKG_NAME)_SRCS := $(LIB_PATH)/rams/sim/src/dpram_1w1r2c_ra.vhd +$(PKG_NAME)_SRCS += $(LIB_PATH)/FIFO/src/fifo_ctrl_pkg.vhd +$(PKG_NAME)_SRCS += $(LIB_PATH)/FIFO/src/gray_counter.vhd +$(PKG_NAME)_SRCS += $(LIB_PATH)/FIFO/src/fifo_async_ctrl.vhd +$(PKG_NAME)_SRCS += $(LIB_PATH)/FIFO/src/fifo_async.vhd # ----------------------------------------------------------- -$(PKG_NAME)_SRCS := $(addprefix $(CUR_PATH)/,$(SRCS)) - -SRCS := -CUR_PATH := -ROOT_PATH := -LIB_PATH := diff --git a/lib/FIFO/ghdl/fifo_sync.inc b/lib/FIFO/ghdl/fifo_sync.inc index 37ca883..2bdb239 100644 --- a/lib/FIFO/ghdl/fifo_sync.inc +++ b/lib/FIFO/ghdl/fifo_sync.inc @@ -1,20 +1,13 @@ # ----------------------------------------------------------- +include $(VHDL_HOME)/make/defs.mk +# ----------------------------------------------------------- PKG_NAME := FIFO_SYNC -ROOT_PATH := ../../.. -LIB_PATH := $(ROOT_PATH)/lib -CUR_PATH := $(shell dirname $(lastword $(MAKEFILE_LIST))) # ----------------------------------------------------------- -SRCS := $(LIB_PATH)/rams/sim/src/dpram_1w1r2c_ra.vhd -SRCS += $(LIB_PATH)/FIFO/src/fifo_ctrl_pkg.vhd -SRCS += $(LIB_PATH)/FIFO/src/fifo_sync_ctrl.vhd -SRCS += $(LIB_PATH)/FIFO/src/fifo_sync.vhd +$(PKG_NAME)_SRCS := $(LIB_PATH)/rams/sim/src/dpram_1w1r2c_ra.vhd +$(PKG_NAME)_SRCS += $(LIB_PATH)/FIFO/src/fifo_ctrl_pkg.vhd +$(PKG_NAME)_SRCS += $(LIB_PATH)/FIFO/src/fifo_sync_ctrl.vhd +$(PKG_NAME)_SRCS += $(LIB_PATH)/FIFO/src/fifo_sync.vhd # ----------------------------------------------------------- -$(PKG_NAME)_SRCS := $(addprefix $(CUR_PATH)/,$(SRCS)) - -SRCS := -CUR_PATH := -ROOT_PATH := -LIB_PATH := diff --git a/lib/FIFO/ghdl/tb_fifo_async.make b/lib/FIFO/ghdl/tb_fifo_async.make index 98c7da6..74d9b86 100644 --- a/lib/FIFO/ghdl/tb_fifo_async.make +++ b/lib/FIFO/ghdl/tb_fifo_async.make @@ -1,3 +1,4 @@ +include $(VHDL_HOME)/make/defs.mk include fifo_async.inc ROOT_PATH := ../../.. @@ -12,5 +13,5 @@ ENTITY := tb_fifo_async WITH_VCD := y RUN_TIME := 5us -include $(ROOT_PATH)/Common/make/ghdl.mk +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 62f1e00..fb32c19 100644 --- a/lib/FIFO/ghdl/tb_fifo_sync.make +++ b/lib/FIFO/ghdl/tb_fifo_sync.make @@ -1,3 +1,4 @@ +include $(VHDL_HOME)/make/defs.mk include fifo_sync.inc ROOT_PATH := ../../.. @@ -12,5 +13,5 @@ ENTITY := tb_fifo_sync WITH_VCD := y RUN_TIME := 5us -include $(ROOT_PATH)/Common/make/ghdl.mk +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 e4fface..b863d03 100644 --- a/lib/FIFO/ghdl/tb_gray_counter.make +++ b/lib/FIFO/ghdl/tb_gray_counter.make @@ -1,5 +1,4 @@ -ROOT_PATH := ../../.. -LIB_PATH := $(ROOT_PATH)/lib +include $(VHDL_HOME)/make/defs.mk SRCS += $(LIB_PATH)/FIFO/src/fifo_ctrl_pkg.vhd SRCS += $(LIB_PATH)/FIFO/src/gray_counter.vhd @@ -11,5 +10,5 @@ ENTITY := tb_gray_counter WITH_VCD := y RUN_TIME := 1us -include $(ROOT_PATH)/Common/make/ghdl.mk +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 93cba06..eaf4b46 100644 --- a/lib/JBUS/busmaster/ghdl/tb_busmaster_async.make +++ b/lib/JBUS/busmaster/ghdl/tb_busmaster_async.make @@ -1,7 +1,6 @@ -include ../../../../lib/FIFO/ghdl/fifo_async.inc +include $(VHDL_HOME)/make/defs.mk +include $(LIB_PATH)/FIFO/ghdl/fifo_async.inc -ROOT_PATH := ../../../.. -LIB_PATH := $(ROOT_PATH)/lib MOD_PATH := $(LIB_PATH)/JBUS/busmaster SRCS += $(LIB_PATH)/misc/utils_pkg.vhd @@ -16,5 +15,5 @@ ENTITY := tb_busmaster_async WITH_VCD := y RUN_TIME := 80us -include $(ROOT_PATH)/Common/make/ghdl.mk +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 1695d29..1d04754 100644 --- a/lib/JBUS/busmaster/ghdl/tb_busmaster_sync.make +++ b/lib/JBUS/busmaster/ghdl/tb_busmaster_sync.make @@ -1,7 +1,6 @@ -include ../../../../lib/FIFO/ghdl/fifo_sync.inc +include $(VHDL_HOME)/make/defs.mk +include $(LIB_PATH)/FIFO/ghdl/fifo_sync.inc -ROOT_PATH := ../../../.. -LIB_PATH := $(ROOT_PATH)/lib MOD_PATH := $(LIB_PATH)/JBUS/busmaster SRCS += $(LIB_PATH)/misc/utils_pkg.vhd @@ -16,5 +15,5 @@ ENTITY := tb_busmaster_sync WITH_VCD := y RUN_TIME := 40us -include $(ROOT_PATH)/Common/make/ghdl.mk +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 b274130..40415fb 100644 --- a/lib/JBUS/dmac/ghdl/tb_dmac_sync.make +++ b/lib/JBUS/dmac/ghdl/tb_dmac_sync.make @@ -1,7 +1,6 @@ -include ../../../../lib/FIFO/ghdl/fifo_sync.inc +include $(VHDL_HOME)/make/defs.mk +include $(LIB_PATH)/FIFO/ghdl/fifo_sync.inc -ROOT_PATH := ../../../.. -LIB_PATH := $(ROOT_PATH)/lib MOD_PATH := $(LIB_PATH)/JBUS SRCS += $(LIB_PATH)/misc/utils_pkg.vhd @@ -17,5 +16,5 @@ ENTITY := tb_dmac WITH_VCD := y RUN_TIME := 6us -include $(ROOT_PATH)/Common/make/ghdl.mk +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 74d5f82..8feeaf1 100644 --- a/lib/JBUS/memory/ghdl/tb_ram_wb.make +++ b/lib/JBUS/memory/ghdl/tb_ram_wb.make @@ -1,5 +1,5 @@ -ROOT_PATH := ../../../.. -LIB_PATH := $(ROOT_PATH)/lib +include $(VHDL_HOME)/make/defs.mk + MOD_PATH := $(LIB_PATH)/JBUS/memory SRCS += $(LIB_PATH)/misc/utils_pkg.vhd @@ -13,6 +13,4 @@ ENTITY := tb_ram_wb WITH_VCD := y RUN_TIME := 1500ns -include $(ROOT_PATH)/Common/make/ghdl.mk - - +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 c4e0c6f..45764e0 100644 --- a/lib/JBUS/memory/ghdl/tb_rom_wb.make +++ b/lib/JBUS/memory/ghdl/tb_rom_wb.make @@ -1,5 +1,5 @@ -ROOT_PATH := ../../../.. -LIB_PATH := $(ROOT_PATH)/lib +include $(VHDL_HOME)/make/defs.mk + MOD_PATH := $(LIB_PATH)/JBUS/memory SRCS += $(MOD_PATH)/src/rom_sim.vhd @@ -12,6 +12,5 @@ ENTITY := tb_rom_wb WITH_VCD := y RUN_TIME := 1500ns -include $(ROOT_PATH)/Common/make/ghdl.mk - +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 4fd0b84..b292ef1 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 @@ -1,8 +1,10 @@ -include ../../../../lib/FIFO/ghdl/fifo_sync.inc -include ../../../../lib/FIFO/ghdl/fifo_async.inc +# ----------------------------------------------------------- +include $(VHDL_HOME)/make/defs.mk +# ----------------------------------------------------------- +include $(LIB_PATH)/FIFO/ghdl/fifo_sync.inc +include $(LIB_PATH)/FIFO/ghdl/fifo_async.inc -ROOT_PATH := ../../../.. -LIB_PATH := $(ROOT_PATH)/lib +# ----------------------------------------------------------- MOD_PATH := $(LIB_PATH)/SDRAM/ddr_sdr_v1_5 SRCS += $(LIB_PATH)/misc/utils_pkg.vhd @@ -29,5 +31,5 @@ RUN_TIME := 200us GHDL_OPTS := -P$(ROOT_PATH)/Common/sim/build/unisim/unisim -fsynopsys -fexplicit -include $(ROOT_PATH)/Common/make/ghdl.mk +include $(VHDL_HOME)/make/ghdl.mk 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 db1b87f..105f5b8 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 @@ -1,10 +1,11 @@ -include ../../../../lib/FIFO/ghdl/fifo_sync.inc -include ../../../../lib/FIFO/ghdl/fifo_async.inc +# ----------------------------------------------------------- +include $(VHDL_HOME)/make/defs.mk +# ----------------------------------------------------------- +include $(LIB_PATH)/FIFO/ghdl/fifo_sync.inc +include $(LIB_PATH)/FIFO/ghdl/fifo_async.inc -ROOT_PATH := ../../../.. -LIB_PATH := $(ROOT_PATH)/lib +# ----------------------------------------------------------- MOD_PATH := $(LIB_PATH)/SDRAM/ddr_sdr_v1_5 - SRCS += $(LIB_PATH)/misc/utils_pkg.vhd SRCS += $(LIB_PATH)/models/memory/sdram/mt46v16m16/mt46v16m16.vhd SRCS += $(FIFO_SYNC_SRCS) @@ -29,5 +30,5 @@ RUN_TIME := 200us GHDL_OPTS := -P$(ROOT_PATH)/Common/sim/build/unisim/unisim -fsynopsys -fexplicit -include $(ROOT_PATH)/Common/make/ghdl.mk +include $(VHDL_HOME)/make/ghdl.mk diff --git a/lib/emac/ghdl/emac_jbus.inc b/lib/emac/ghdl/emac_jbus.inc index 6321a00..2dc5c6d 100644 --- a/lib/emac/ghdl/emac_jbus.inc +++ b/lib/emac/ghdl/emac_jbus.inc @@ -1,23 +1,16 @@ # ----------------------------------------------------------- -include emac_tx.inc -include emac_rx.inc +include $(VHDL_HOME)/make/defs.mk +# ----------------------------------------------------------- +include $(LIB_PATH)/emac/ghdl/emac_tx.inc +include $(LIB_PATH)/emac/ghdl/emac_rx.inc # ----------------------------------------------------------- PKG_NAME := EMAC_JBUS -ROOT_PATH := ../../.. -LIB_PATH := $(ROOT_PATH)/lib -CUR_PATH := $(shell dirname $(lastword $(MAKEFILE_LIST))) # ----------------------------------------------------------- -SRCS += $(EMAC_RX_SRCS) -SRCS += $(EMAC_TX_SRCS) -SRCS += $(LIB_PATH)/emac/src/emac_top_jb.vhd +$(PKG_NAME)_SRCS += $(EMAC_RX_SRCS) +$(PKG_NAME)_SRCS += $(EMAC_TX_SRCS) +$(PKG_NAME)_SRCS += $(LIB_PATH)/emac/src/emac_top_jb.vhd # ----------------------------------------------------------- -$(PKG_NAME)_SRCS := $(addprefix $(CUR_PATH)/,$(SRCS)) - -SRCS := -CUR_PATH := -ROOT_PATH := -LIB_PATH := diff --git a/lib/emac/ghdl/emac_rx.inc b/lib/emac/ghdl/emac_rx.inc index a639674..79fc2cf 100644 --- a/lib/emac/ghdl/emac_rx.inc +++ b/lib/emac/ghdl/emac_rx.inc @@ -1,25 +1,19 @@ # ----------------------------------------------------------- -include ../../../lib/FIFO/ghdl/fifo_async.inc +include $(VHDL_HOME)/make/defs.mk +# ----------------------------------------------------------- +include $(LIB_PATH)/FIFO/ghdl/fifo_async.inc + # ----------------------------------------------------------- PKG_NAME := EMAC_RX -ROOT_PATH := ../../.. -LIB_PATH := $(ROOT_PATH)/lib -CUR_PATH := $(shell dirname $(lastword $(MAKEFILE_LIST))) # ----------------------------------------------------------- -SRCS += $(LIB_PATH)/misc/utils_pkg.vhd -SRCS += $(LIB_PATH)/rams/sim/src/dpram_1w1r2c_ro.vhd -SRCS += $(FIFO_ASYNC_SRCS) -SRCS += $(LIB_PATH)/emac/src/sipo.vhd -SRCS += $(LIB_PATH)/emac/src/crc32.vhd -SRCS += $(LIB_PATH)/emac/src/emac_types.vhd -SRCS += $(LIB_PATH)/emac/src/emac_rx.vhd +$(PKG_NAME)_SRCS += $(LIB_PATH)/misc/utils_pkg.vhd +$(PKG_NAME)_SRCS += $(LIB_PATH)/rams/sim/src/dpram_1w1r2c_ro.vhd +$(PKG_NAME)_SRCS += $(FIFO_ASYNC_SRCS) +$(PKG_NAME)_SRCS += $(LIB_PATH)/emac/src/sipo.vhd +$(PKG_NAME)_SRCS += $(LIB_PATH)/emac/src/crc32.vhd +$(PKG_NAME)_SRCS += $(LIB_PATH)/emac/src/emac_types.vhd +$(PKG_NAME)_SRCS += $(LIB_PATH)/emac/src/emac_rx.vhd # ----------------------------------------------------------- -$(PKG_NAME)_SRCS := $(addprefix $(CUR_PATH)/,$(SRCS)) - -SRCS := -CUR_PATH := -ROOT_PATH := -LIB_PATH := diff --git a/lib/emac/ghdl/emac_tx.inc b/lib/emac/ghdl/emac_tx.inc index 2c99879..9c5de4f 100644 --- a/lib/emac/ghdl/emac_tx.inc +++ b/lib/emac/ghdl/emac_tx.inc @@ -1,27 +1,21 @@ # ----------------------------------------------------------- -include ../../../lib/FIFO/ghdl/fifo_sync.inc -include ../../../lib/FIFO/ghdl/fifo_async.inc +include $(VHDL_HOME)/make/defs.mk +# ----------------------------------------------------------- +include $(LIB_PATH)/FIFO/ghdl/fifo_sync.inc +include $(LIB_PATH)/FIFO/ghdl/fifo_async.inc # ----------------------------------------------------------- PKG_NAME := EMAC_TX -ROOT_PATH := ../../.. -LIB_PATH := $(ROOT_PATH)/lib -CUR_PATH := $(shell dirname $(lastword $(MAKEFILE_LIST))) +SRCS := $(PKG_NAME)_SRCS # ----------------------------------------------------------- -SRCS += $(LIB_PATH)/misc/utils_pkg.vhd -SRCS += $(LIB_PATH)/rams/sim/src/dpram_1w1r2c_ro.vhd -SRCS += $(FIFO_SYNC_SRCS) -SRCS += $(FIFO_ASYNC_SRCS) -SRCS += $(LIB_PATH)/emac/src/piso.vhd -SRCS += $(LIB_PATH)/emac/src/crc32.vhd -SRCS += $(LIB_PATH)/emac/src/emac_types.vhd -SRCS += $(LIB_PATH)/emac/src/emac_tx.vhd +$(PKG_NAME)_SRCS += $(LIB_PATH)/misc/utils_pkg.vhd +$(PKG_NAME)_SRCS += $(LIB_PATH)/rams/sim/src/dpram_1w1r2c_ro.vhd +$(PKG_NAME)_SRCS += $(FIFO_SYNC_SRCS) +$(PKG_NAME)_SRCS += $(FIFO_ASYNC_SRCS) +$(PKG_NAME)_SRCS += $(LIB_PATH)/emac/src/piso.vhd +$(PKG_NAME)_SRCS += $(LIB_PATH)/emac/src/crc32.vhd +$(PKG_NAME)_SRCS += $(LIB_PATH)/emac/src/emac_types.vhd +$(PKG_NAME)_SRCS += $(LIB_PATH)/emac/src/emac_tx.vhd # ----------------------------------------------------------- -$(PKG_NAME)_SRCS := $(addprefix $(CUR_PATH)/,$(SRCS)) - -SRCS := -CUR_PATH := -ROOT_PATH := -LIB_PATH := diff --git a/lib/emac/ghdl/tb_emac_top_jb.make b/lib/emac/ghdl/tb_emac_top_jb.make index ce82e27..178e7d3 100644 --- a/lib/emac/ghdl/tb_emac_top_jb.make +++ b/lib/emac/ghdl/tb_emac_top_jb.make @@ -1,9 +1,7 @@ +include $(VHDL_HOME)/make/defs.mk include emac_jbus.inc -ROOT_PATH := ../../.. -LIB_PATH := $(ROOT_PATH)/lib - -SRCS += $(EMAC_JBUS_SRCS) +SRCS := $(EMAC_JBUS_SRCS) SRCS += $(LIB_PATH)/emac/src/pkt_gen.vhd SRCS += $(LIB_PATH)/emac/src/tb_emac_top_jb.vhd @@ -13,5 +11,5 @@ ENTITY := tb_emac_top_jb WITH_VCD := y RUN_TIME := 2000us -include $(ROOT_PATH)/Common/make/ghdl.mk +include $(VHDL_HOME)/make/ghdl.mk diff --git a/lib/filter/ghdl/fir_iterative.inc b/lib/filter/ghdl/fir_iterative.inc index 59e62bd..b437885 100644 --- a/lib/filter/ghdl/fir_iterative.inc +++ b/lib/filter/ghdl/fir_iterative.inc @@ -1,23 +1,16 @@ # ----------------------------------------------------------- +include $(VHDL_HOME)/make/defs.mk +# ----------------------------------------------------------- PKG_NAME := FIR_ITERATIVE -ROOT_PATH := ../../.. -LIB_PATH := $(ROOT_PATH)/lib -CUR_PATH := $(shell dirname $(lastword $(MAKEFILE_LIST))) # ----------------------------------------------------------- -SRCS := $(LIB_PATH)/misc/utils_pkg.vhd -SRCS += $(LIB_PATH)/fixed/ieee_proposed/fixed_util_pkg.vhd -SRCS += $(LIB_PATH)/filter/src/filter_pkg.vhd -SRCS += $(LIB_PATH)/filter/src/fir_pkg.vhd -SRCS += $(LIB_PATH)/filter/src/fir_stage_sys.vhd -SRCS += $(LIB_PATH)/filter/src/fir_stage.vhd -SRCS += $(LIB_PATH)/filter/src/fir_iterative.vhd +$(PKG_NAME)_SRCS := $(LIB_PATH)/misc/utils_pkg.vhd +$(PKG_NAME)_SRCS += $(LIB_PATH)/fixed/ieee_proposed/fixed_util_pkg.vhd +$(PKG_NAME)_SRCS += $(LIB_PATH)/filter/src/filter_pkg.vhd +$(PKG_NAME)_SRCS += $(LIB_PATH)/filter/src/fir_pkg.vhd +$(PKG_NAME)_SRCS += $(LIB_PATH)/filter/src/fir_stage_sys.vhd +$(PKG_NAME)_SRCS += $(LIB_PATH)/filter/src/fir_stage.vhd +$(PKG_NAME)_SRCS += $(LIB_PATH)/filter/src/fir_iterative.vhd # ----------------------------------------------------------- -$(PKG_NAME)_SRCS := $(addprefix $(CUR_PATH)/,$(SRCS)) - -SRCS := -CUR_PATH := -ROOT_PATH := -LIB_PATH := diff --git a/lib/filter/ghdl/fir_parallel.inc b/lib/filter/ghdl/fir_parallel.inc index 5a99092..95e914b 100644 --- a/lib/filter/ghdl/fir_parallel.inc +++ b/lib/filter/ghdl/fir_parallel.inc @@ -1,22 +1,15 @@ # ----------------------------------------------------------- +include $(VHDL_HOME)/make/defs.mk +# ----------------------------------------------------------- PKG_NAME := FIR_PARALLEL -ROOT_PATH := ../../.. -LIB_PATH := $(ROOT_PATH)/lib -CUR_PATH := $(shell dirname $(lastword $(MAKEFILE_LIST))) # ----------------------------------------------------------- -SRCS := $(LIB_PATH)/misc/utils_pkg.vhd -SRCS += $(LIB_PATH)/fixed/ieee_proposed/fixed_util_pkg.vhd -SRCS += $(LIB_PATH)/filter/src/filter_pkg.vhd -SRCS += $(LIB_PATH)/filter/src/fir_pkg.vhd -SRCS += $(LIB_PATH)/filter/src/fir_stage.vhd -SRCS += $(LIB_PATH)/filter/src/fir_parallel.vhd +$(PKG_NAME)_SRCS := $(LIB_PATH)/misc/utils_pkg.vhd +$(PKG_NAME)_SRCS += $(LIB_PATH)/fixed/ieee_proposed/fixed_util_pkg.vhd +$(PKG_NAME)_SRCS += $(LIB_PATH)/filter/src/filter_pkg.vhd +$(PKG_NAME)_SRCS += $(LIB_PATH)/filter/src/fir_pkg.vhd +$(PKG_NAME)_SRCS += $(LIB_PATH)/filter/src/fir_stage.vhd +$(PKG_NAME)_SRCS += $(LIB_PATH)/filter/src/fir_parallel.vhd # ----------------------------------------------------------- -$(PKG_NAME)_SRCS := $(addprefix $(CUR_PATH)/,$(SRCS)) - -SRCS := -CUR_PATH := -ROOT_PATH := -LIB_PATH := diff --git a/lib/filter/ghdl/fir_semi_parallel.inc b/lib/filter/ghdl/fir_semi_parallel.inc index 160ec88..ae56b3e 100644 --- a/lib/filter/ghdl/fir_semi_parallel.inc +++ b/lib/filter/ghdl/fir_semi_parallel.inc @@ -1,24 +1,17 @@ # ----------------------------------------------------------- +include $(VHDL_HOME)/make/defs.mk +# ----------------------------------------------------------- PKG_NAME := FIR_SEMI_PARALLEL -ROOT_PATH := ../../.. -LIB_PATH := $(ROOT_PATH)/lib -CUR_PATH := $(shell dirname $(lastword $(MAKEFILE_LIST))) # ----------------------------------------------------------- -SRCS := $(LIB_PATH)/misc/utils_pkg.vhd -SRCS += $(LIB_PATH)/rams/sim/src/dpram_1w1r2c_ro.vhd -SRCS += $(LIB_PATH)/fixed/ieee_proposed/fixed_util_pkg.vhd -SRCS += $(LIB_PATH)/filter/src/filter_pkg.vhd -SRCS += $(LIB_PATH)/filter/src/fir_pkg.vhd -SRCS += $(LIB_PATH)/filter/src/fir_stage_sys.vhd -SRCS += $(LIB_PATH)/filter/src/delay_line.vhd -SRCS += $(LIB_PATH)/filter/src/fir_semi_parallel.vhd +$(PKG_NAME)_SRCS := $(LIB_PATH)/misc/utils_pkg.vhd +$(PKG_NAME)_SRCS += $(LIB_PATH)/rams/sim/src/dpram_1w1r2c_ro.vhd +$(PKG_NAME)_SRCS += $(LIB_PATH)/fixed/ieee_proposed/fixed_util_pkg.vhd +$(PKG_NAME)_SRCS += $(LIB_PATH)/filter/src/filter_pkg.vhd +$(PKG_NAME)_SRCS += $(LIB_PATH)/filter/src/fir_pkg.vhd +$(PKG_NAME)_SRCS += $(LIB_PATH)/filter/src/fir_stage_sys.vhd +$(PKG_NAME)_SRCS += $(LIB_PATH)/filter/src/delay_line.vhd +$(PKG_NAME)_SRCS += $(LIB_PATH)/filter/src/fir_semi_parallel.vhd # ----------------------------------------------------------- -$(PKG_NAME)_SRCS := $(addprefix $(CUR_PATH)/,$(SRCS)) - -SRCS := -CUR_PATH := -ROOT_PATH := -LIB_PATH := diff --git a/lib/filter/ghdl/tb_fir_iterative.make b/lib/filter/ghdl/tb_fir_iterative.make index dacc905..bf7947a 100644 --- a/lib/filter/ghdl/tb_fir_iterative.make +++ b/lib/filter/ghdl/tb_fir_iterative.make @@ -1,3 +1,4 @@ +include $(VHDL_HOME)/make/defs.mk include fir_iterative.inc ROOT_PATH := ../../.. @@ -15,5 +16,5 @@ WITH_VCD := y GHDL_OPTS := -P$(LIB_PATH)/fixed/ieee_proposed/build/fixed_pkg/ieee_proposed RUN_TIME := 6us -include $(ROOT_PATH)/Common/make/ghdl.mk +include $(VHDL_HOME)/make/ghdl.mk diff --git a/lib/filter/ghdl/tb_fir_parallel.make b/lib/filter/ghdl/tb_fir_parallel.make index 6767bdc..a16c33a 100644 --- a/lib/filter/ghdl/tb_fir_parallel.make +++ b/lib/filter/ghdl/tb_fir_parallel.make @@ -1,3 +1,4 @@ +include $(VHDL_HOME)/make/defs.mk include fir_parallel.inc ROOT_PATH := ../../.. @@ -15,5 +16,5 @@ WITH_VCD := y GHDL_OPTS := -P$(LIB_PATH)/fixed/ieee_proposed/build/fixed_pkg/ieee_proposed RUN_TIME := 200us -include $(ROOT_PATH)/Common/make/ghdl.mk +include $(VHDL_HOME)/make/ghdl.mk diff --git a/lib/filter/ghdl/tb_fir_semi_parallel.make b/lib/filter/ghdl/tb_fir_semi_parallel.make index 992d629..e715cef 100644 --- a/lib/filter/ghdl/tb_fir_semi_parallel.make +++ b/lib/filter/ghdl/tb_fir_semi_parallel.make @@ -1,3 +1,4 @@ +include $(VHDL_HOME)/make/defs.mk include fir_semi_parallel.inc ROOT_PATH := ../../.. @@ -15,5 +16,5 @@ WITH_VCD := y GHDL_OPTS := -P$(LIB_PATH)/fixed/ieee_proposed/build/fixed_pkg/ieee_proposed RUN_TIME := 50us -include $(ROOT_PATH)/Common/make/ghdl.mk +include $(VHDL_HOME)/make/ghdl.mk diff --git a/lib/filter/ghdl/tb_fir_stage.make b/lib/filter/ghdl/tb_fir_stage.make index ee96698..616683c 100644 --- a/lib/filter/ghdl/tb_fir_stage.make +++ b/lib/filter/ghdl/tb_fir_stage.make @@ -1,5 +1,4 @@ -ROOT_PATH := ../../.. -LIB_PATH := $(ROOT_PATH)/lib +include $(VHDL_HOME)/make/defs.mk SRCS += $(LIB_PATH)/PCK_FIO-2002.7/PCK_FIO_1993.vhd SRCS += $(LIB_PATH)/PCK_FIO-2002.7/PCK_FIO_1993_BODY.vhd @@ -17,5 +16,5 @@ WITH_VCD := y GHDL_OPTS := -P$(LIB_PATH)/fixed/ieee_proposed/build/fixed_pkg/ieee_proposed RUN_TIME := 2us -include $(ROOT_PATH)/Common/make/ghdl.mk +include $(VHDL_HOME)/make/ghdl.mk diff --git a/lib/filter/ghdl/tb_fir_stage_sys.make b/lib/filter/ghdl/tb_fir_stage_sys.make index 63e2652..af84172 100644 --- a/lib/filter/ghdl/tb_fir_stage_sys.make +++ b/lib/filter/ghdl/tb_fir_stage_sys.make @@ -1,5 +1,4 @@ -ROOT_PATH := ../../.. -LIB_PATH := $(ROOT_PATH)/lib +include $(VHDL_HOME)/make/defs.mk SRCS += $(LIB_PATH)/PCK_FIO-2002.7/PCK_FIO_1993.vhd SRCS += $(LIB_PATH)/PCK_FIO-2002.7/PCK_FIO_1993_BODY.vhd @@ -17,5 +16,5 @@ WITH_VCD := y GHDL_OPTS := -P$(LIB_PATH)/fixed/ieee_proposed/build/fixed_pkg/ieee_proposed RUN_TIME := 2us -include $(ROOT_PATH)/Common/make/ghdl.mk +include $(VHDL_HOME)/make/ghdl.mk diff --git a/lib/ps2_port/ghdl/tb_ps2_core.make b/lib/ps2_port/ghdl/tb_ps2_core.make index a6473be..ad68336 100644 --- a/lib/ps2_port/ghdl/tb_ps2_core.make +++ b/lib/ps2_port/ghdl/tb_ps2_core.make @@ -1,5 +1,5 @@ -ROOT_PATH := ../../.. -LIB_PATH := $(ROOT_PATH)/lib +include $(VHDL_HOME)/make/defs.mk + MOD_PATH := $(ROOT_PATH)/lib/ps2_port SRCS += $(MOD_PATH)/src/ps2_core.vhd @@ -11,5 +11,5 @@ ENTITY := tb_ps2_core WITH_VCD := y RUN_TIME := 10ms -include $(ROOT_PATH)/Common/make/ghdl.mk +include $(VHDL_HOME)/make/ghdl.mk diff --git a/lib/radio/cordic/ghdl/cordic_iterative.inc b/lib/radio/cordic/ghdl/cordic_iterative.inc index 9931000..9090a0c 100644 --- a/lib/radio/cordic/ghdl/cordic_iterative.inc +++ b/lib/radio/cordic/ghdl/cordic_iterative.inc @@ -1,23 +1,16 @@ # ----------------------------------------------------------- +include $(VHDL_HOME)/make/defs.mk +# ----------------------------------------------------------- PKG_NAME := CORDIC_ITERATIVE -ROOT_PATH := ../../../.. -LIB_PATH := $(ROOT_PATH)/lib -CUR_PATH := $(shell dirname $(lastword $(MAKEFILE_LIST))) # ----------------------------------------------------------- -SRCS := $(LIB_PATH)/fixed/ieee_proposed/fixed_util_pkg.vhd -SRCS += $(LIB_PATH)/radio/cordic/src/cordic_pkg.vhd -SRCS += $(LIB_PATH)/radio/cordic/src/cordic_rom.vhd -SRCS += $(LIB_PATH)/radio/cordic/src/cordic_stage.vhd -SRCS += $(LIB_PATH)/radio/cordic/src/cordic_stage_pre.vhd -SRCS += $(LIB_PATH)/radio/cordic/src/cordic_stage_post.vhd -SRCS += $(LIB_PATH)/radio/cordic/src/cordic_top.vhd +$(PKG_NAME)_SRCS := $(LIB_PATH)/fixed/ieee_proposed/fixed_util_pkg.vhd +$(PKG_NAME)_SRCS += $(LIB_PATH)/radio/cordic/src/cordic_pkg.vhd +$(PKG_NAME)_SRCS += $(LIB_PATH)/radio/cordic/src/cordic_rom.vhd +$(PKG_NAME)_SRCS += $(LIB_PATH)/radio/cordic/src/cordic_stage.vhd +$(PKG_NAME)_SRCS += $(LIB_PATH)/radio/cordic/src/cordic_stage_pre.vhd +$(PKG_NAME)_SRCS += $(LIB_PATH)/radio/cordic/src/cordic_stage_post.vhd +$(PKG_NAME)_SRCS += $(LIB_PATH)/radio/cordic/src/cordic_top.vhd # ----------------------------------------------------------- -$(PKG_NAME)_SRCS := $(addprefix $(CUR_PATH)/,$(SRCS)) - -SRCS := -CUR_PATH := -ROOT_PATH := -LIB_PATH := diff --git a/lib/radio/cordic/ghdl/cordic_pipe.inc b/lib/radio/cordic/ghdl/cordic_pipe.inc index da2dfb0..59883b7 100644 --- a/lib/radio/cordic/ghdl/cordic_pipe.inc +++ b/lib/radio/cordic/ghdl/cordic_pipe.inc @@ -1,22 +1,15 @@ # ----------------------------------------------------------- +include $(VHDL_HOME)/make/defs.mk +# ----------------------------------------------------------- PKG_NAME := CORDIC_PIPE -ROOT_PATH := ../../../.. -LIB_PATH := $(ROOT_PATH)/lib -CUR_PATH := $(shell dirname $(lastword $(MAKEFILE_LIST))) # ----------------------------------------------------------- -SRCS := $(LIB_PATH)/fixed/ieee_proposed/fixed_util_pkg.vhd -SRCS += $(LIB_PATH)/radio/cordic/src/cordic_pkg.vhd -SRCS += $(LIB_PATH)/radio/cordic/src/cordic_pipe_stage.vhd -SRCS += $(LIB_PATH)/radio/cordic/src/cordic_pipe_pre.vhd -SRCS += $(LIB_PATH)/radio/cordic/src/cordic_pipe_post.vhd -SRCS += $(LIB_PATH)/radio/cordic/src/cordic_pipe_top.vhd +$(PKG_NAME)_SRCS := $(LIB_PATH)/fixed/ieee_proposed/fixed_util_pkg.vhd +$(PKG_NAME)_SRCS += $(LIB_PATH)/radio/cordic/src/cordic_pkg.vhd +$(PKG_NAME)_SRCS += $(LIB_PATH)/radio/cordic/src/cordic_pipe_stage.vhd +$(PKG_NAME)_SRCS += $(LIB_PATH)/radio/cordic/src/cordic_pipe_pre.vhd +$(PKG_NAME)_SRCS += $(LIB_PATH)/radio/cordic/src/cordic_pipe_post.vhd +$(PKG_NAME)_SRCS += $(LIB_PATH)/radio/cordic/src/cordic_pipe_top.vhd # ----------------------------------------------------------- -$(PKG_NAME)_SRCS := $(addprefix $(CUR_PATH)/,$(SRCS)) - -SRCS := -CUR_PATH := -ROOT_PATH := -LIB_PATH := diff --git a/lib/radio/cordic/ghdl/tb_cordic_iterative_top.make b/lib/radio/cordic/ghdl/tb_cordic_iterative_top.make index 7a1ddd7..378f024 100644 --- a/lib/radio/cordic/ghdl/tb_cordic_iterative_top.make +++ b/lib/radio/cordic/ghdl/tb_cordic_iterative_top.make @@ -1,4 +1,5 @@ # ------------------------------------------------- +include $(VHDL_HOME)/make/defs.mk include cordic_iterative.inc # ------------------------------------------------- @@ -11,8 +12,6 @@ WORK_LIB := work # ------------------------------------------------- # Target options # ------------------------------------------------- -LIB_PATH := ../../../../lib - SRCS += $(LIB_PATH)/PCK_FIO-2002.7/PCK_FIO_1993.vhd SRCS += $(LIB_PATH)/PCK_FIO-2002.7/PCK_FIO_1993_BODY.vhd SRCS += $(CORDIC_ITERATIVE_SRCS) @@ -27,5 +26,5 @@ RUN_TIME := 300us GHDL_OPTS := -P$(LIB_PATH)/fixed/ieee_proposed/build/fixed_pkg/ieee_proposed -include ../../../../Common/make/ghdl.mk +include $(VHDL_HOME)/make/ghdl.mk # ------------------------------------------------- diff --git a/lib/radio/cordic/ghdl/tb_cordic_pipe_top.make b/lib/radio/cordic/ghdl/tb_cordic_pipe_top.make index 9053aed..1a5c27a 100644 --- a/lib/radio/cordic/ghdl/tb_cordic_pipe_top.make +++ b/lib/radio/cordic/ghdl/tb_cordic_pipe_top.make @@ -1,4 +1,5 @@ # ------------------------------------------------- +include $(VHDL_HOME)/make/defs.mk include cordic_pipe.inc # ------------------------------------------------- @@ -11,8 +12,6 @@ WORK_LIB := work # ------------------------------------------------- # Target options # ------------------------------------------------- -LIB_PATH := ../../../../lib - SRCS += $(LIB_PATH)/PCK_FIO-2002.7/PCK_FIO_1993.vhd SRCS += $(LIB_PATH)/PCK_FIO-2002.7/PCK_FIO_1993_BODY.vhd SRCS += $(CORDIC_PIPE_SRCS) @@ -27,5 +26,6 @@ RUN_TIME := 150us GHDL_OPTS := -P$(LIB_PATH)/fixed/ieee_proposed/build/fixed_pkg/ieee_proposed -include ../../../../Common/make/ghdl.mk +include $(VHDL_HOME)/make/ghdl.mk # ------------------------------------------------- + diff --git a/lib/radio/ddc/ghdl/tb_ddc.make b/lib/radio/ddc/ghdl/tb_ddc.make index 77663a4..451e33b 100644 --- a/lib/radio/ddc/ghdl/tb_ddc.make +++ b/lib/radio/ddc/ghdl/tb_ddc.make @@ -1,10 +1,9 @@ -include ../../../../lib/FIFO/ghdl/fifo_sync.inc -include ../../../../lib/filter/ghdl/fir_semi_parallel.inc -include ../../../../lib/radio/nco/ghdl/mix_cordic_pipe.inc -include ../../../../lib/radio/decimator/CIC/ghdl/cic_decim_pipe.inc +include $(VHDL_HOME)/make/defs.mk -ROOT_PATH := ../../../.. -LIB_PATH := $(ROOT_PATH)/lib +include $(LIB_PATH)/FIFO/ghdl/fifo_sync.inc +include $(LIB_PATH)/filter/ghdl/fir_semi_parallel.inc +include $(LIB_PATH)/radio/nco/ghdl/mix_cordic_pipe.inc +include $(LIB_PATH)/radio/decimator/CIC/ghdl/cic_decim_pipe.inc SRCS += $(FIFO_SYNC_SRCS) SRCS += $(FIR_SEMI_PARALLEL_SRCS) @@ -23,5 +22,5 @@ RUN_TIME := 100us GHDL_OPTS := -P$(LIB_PATH)/fixed/ieee_proposed/build/fixed_pkg/ieee_proposed -include $(ROOT_PATH)/Common/make/ghdl.mk +include $(VHDL_HOME)/make/ghdl.mk diff --git a/lib/radio/ddc/ghdl/tb_syn_ddc.make b/lib/radio/ddc/ghdl/tb_syn_ddc.make index 9b9f74b..e91767e 100644 --- a/lib/radio/ddc/ghdl/tb_syn_ddc.make +++ b/lib/radio/ddc/ghdl/tb_syn_ddc.make @@ -1,11 +1,10 @@ -include ../../../../lib/FIFO/ghdl/fifo_sync.inc -include ../../../../lib/FIFO/ghdl/fifo_async.inc -include ../../../../lib/filter/ghdl/fir_semi_parallel.inc -include ../../../../lib/radio/nco/ghdl/mix_cordic_pipe.inc -include ../../../../lib/radio/decimator/CIC/ghdl/cic_decim_pipe.inc +include $(VHDL_HOME)/make/defs.mk -ROOT_PATH := ../../../.. -LIB_PATH := $(ROOT_PATH)/lib +include $(LIB_PATH)/FIFO/ghdl/fifo_sync.inc +include $(LIB_PATH)/FIFO/ghdl/fifo_async.inc +include $(LIB_PATH)/filter/ghdl/fir_semi_parallel.inc +include $(LIB_PATH)/radio/nco/ghdl/mix_cordic_pipe.inc +include $(LIB_PATH)/radio/decimator/CIC/ghdl/cic_decim_pipe.inc SRCS += $(LIB_PATH)/misc/utils_pkg.vhd SRCS += $(FIFO_SYNC_SRCS) @@ -27,5 +26,5 @@ RUN_TIME := 100us GHDL_OPTS := -P$(LIB_PATH)/fixed/ieee_proposed/build/fixed_pkg/ieee_proposed -include $(ROOT_PATH)/Common/make/ghdl.mk +include $(VHDL_HOME)/make/ghdl.mk diff --git a/lib/radio/decimator/CIC/ghdl/cic_decim_pipe.inc b/lib/radio/decimator/CIC/ghdl/cic_decim_pipe.inc index 695c931..e9262eb 100644 --- a/lib/radio/decimator/CIC/ghdl/cic_decim_pipe.inc +++ b/lib/radio/decimator/CIC/ghdl/cic_decim_pipe.inc @@ -1,21 +1,14 @@ # ----------------------------------------------------------- +include $(VHDL_HOME)/make/defs.mk +# ----------------------------------------------------------- PKG_NAME := CIC_DECIM_PIPE -ROOT_PATH := ../../../../.. -LIB_PATH := $(ROOT_PATH)/lib -CUR_PATH := $(shell dirname $(lastword $(MAKEFILE_LIST))) # ----------------------------------------------------------- -SRCS := $(LIB_PATH)/misc/utils_pkg.vhd -SRCS += $(LIB_PATH)/fixed/ieee_proposed/fixed_util_pkg.vhd -SRCS += $(LIB_PATH)/radio/decimator/CIC/src/cic_i_pipe.vhd -SRCS += $(LIB_PATH)/radio/decimator/CIC/src/cic_c_pipe.vhd -SRCS += $(LIB_PATH)/radio/decimator/CIC/src/cic_decim_pipe.vhd +$(PKG_NAME)_SRCS := $(LIB_PATH)/misc/utils_pkg.vhd +$(PKG_NAME)_SRCS += $(LIB_PATH)/fixed/ieee_proposed/fixed_util_pkg.vhd +$(PKG_NAME)_SRCS += $(LIB_PATH)/radio/decimator/CIC/src/cic_i_pipe.vhd +$(PKG_NAME)_SRCS += $(LIB_PATH)/radio/decimator/CIC/src/cic_c_pipe.vhd +$(PKG_NAME)_SRCS += $(LIB_PATH)/radio/decimator/CIC/src/cic_decim_pipe.vhd # ----------------------------------------------------------- -$(PKG_NAME)_SRCS := $(addprefix $(CUR_PATH)/,$(SRCS)) - -SRCS := -CUR_PATH := -ROOT_PATH := -LIB_PATH := 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 acf584f..2b2be61 100644 --- a/lib/radio/decimator/CIC/ghdl/tb_cic_decim_pipe.make +++ b/lib/radio/decimator/CIC/ghdl/tb_cic_decim_pipe.make @@ -1,8 +1,6 @@ +include $(VHDL_HOME)/make/defs.mk include cic_decim_pipe.inc -ROOT_PATH := ../../../../.. -LIB_PATH := $(ROOT_PATH)/lib - SRCS += $(CIC_DECIM_PIPE_SRCS) SRCS += $(LIB_PATH)/PCK_FIO-2002.7/PCK_FIO_1993.vhd SRCS += $(LIB_PATH)/PCK_FIO-2002.7/PCK_FIO_1993_BODY.vhd @@ -16,5 +14,5 @@ RUN_TIME := 75us GHDL_OPTS := -P$(LIB_PATH)/fixed/ieee_proposed/build/fixed_pkg/ieee_proposed -include $(ROOT_PATH)/Common/make/ghdl.mk +include $(VHDL_HOME)/make/ghdl.mk diff --git a/lib/radio/nco/ghdl/mix_cordic_pipe.inc b/lib/radio/nco/ghdl/mix_cordic_pipe.inc index abca1f5..b2647e7 100644 --- a/lib/radio/nco/ghdl/mix_cordic_pipe.inc +++ b/lib/radio/nco/ghdl/mix_cordic_pipe.inc @@ -1,20 +1,12 @@ # ----------------------------------------------------------- -include ../../../../lib/radio/cordic/ghdl/cordic_pipe.inc +include $(VHDL_HOME)/make/defs.mk +include $(LIB_PATH)/radio/cordic/ghdl/cordic_pipe.inc # ----------------------------------------------------------- PKG_NAME := MIX_CORDIC_PIPE -ROOT_PATH := ../../../.. -LIB_PATH := $(ROOT_PATH)/lib -CUR_PATH := $(shell dirname $(lastword $(MAKEFILE_LIST))) # ----------------------------------------------------------- -SRCS := $(CORDIC_PIPE_SRCS) -SRCS += $(LIB_PATH)/radio/nco/src/mix_cordic_pipe.vhd +$(PKG_NAME)_SRCS := $(CORDIC_PIPE_SRCS) +$(PKG_NAME)_SRCS += $(LIB_PATH)/radio/nco/src/mix_cordic_pipe.vhd # ----------------------------------------------------------- -$(PKG_NAME)_SRCS := $(addprefix $(CUR_PATH)/,$(SRCS)) - -SRCS := -CUR_PATH := -ROOT_PATH := -LIB_PATH := diff --git a/lib/radio/nco/ghdl/nco_lut.inc b/lib/radio/nco/ghdl/nco_lut.inc index f3faec2..f99f5d2 100644 --- a/lib/radio/nco/ghdl/nco_lut.inc +++ b/lib/radio/nco/ghdl/nco_lut.inc @@ -1,21 +1,14 @@ # ----------------------------------------------------------- +include $(VHDL_HOME)/make/defs.mk +# ----------------------------------------------------------- PKG_NAME := NCO_LUT -ROOT_PATH := ../../../.. -LIB_PATH := $(ROOT_PATH)/lib -CUR_PATH := $(shell dirname $(lastword $(MAKEFILE_LIST))) # ----------------------------------------------------------- -SRCS := $(LIB_PATH)/fixed/ieee_proposed/fixed_util_pkg.vhd -SRCS += $(LIB_PATH)/radio/nco/src/nco_pkg.vhd -SRCS += $(LIB_PATH)/radio/nco/src/waverom_dual.vhd -SRCS += $(LIB_PATH)/radio/nco/src/wavelut.vhd -SRCS += $(LIB_PATH)/radio/nco/src/nco_lut_dbg.vhd +$(PKG_NAME)_SRCS := $(LIB_PATH)/fixed/ieee_proposed/fixed_util_pkg.vhd +$(PKG_NAME)_SRCS += $(LIB_PATH)/radio/nco/src/nco_pkg.vhd +$(PKG_NAME)_SRCS += $(LIB_PATH)/radio/nco/src/waverom_dual.vhd +$(PKG_NAME)_SRCS += $(LIB_PATH)/radio/nco/src/wavelut.vhd +$(PKG_NAME)_SRCS += $(LIB_PATH)/radio/nco/src/nco_lut_dbg.vhd # ----------------------------------------------------------- -$(PKG_NAME)_SRCS := $(addprefix $(CUR_PATH)/,$(SRCS)) - -SRCS := -CUR_PATH := -ROOT_PATH := -LIB_PATH := diff --git a/lib/radio/nco/ghdl/tb_mix_cordic.make b/lib/radio/nco/ghdl/tb_mix_cordic.make index 9ecf10e..9cdff9b 100644 --- a/lib/radio/nco/ghdl/tb_mix_cordic.make +++ b/lib/radio/nco/ghdl/tb_mix_cordic.make @@ -1,7 +1,6 @@ # ------------------------------------------------- -# Includes -# ------------------------------------------------- -include mix_cordic_pipe.inc +include $(VHDL_HOME)/make/defs.mk +include $(LIB_PATH)/radio/nco/ghdl/mix_cordic_pipe.inc # ------------------------------------------------- # Global options @@ -13,8 +12,6 @@ WORK_LIB := work # ------------------------------------------------- # Target options # ------------------------------------------------- -LIB_PATH := ../../../../lib - SRCS += $(LIB_PATH)/PCK_FIO-2002.7/PCK_FIO_1993.vhd SRCS += $(LIB_PATH)/PCK_FIO-2002.7/PCK_FIO_1993_BODY.vhd SRCS += $(MIX_CORDIC_PIPE_SRCS) @@ -29,7 +26,7 @@ RUN_TIME := 200us GHDL_OPTS := -P$(LIB_PATH)/fixed/ieee_proposed/build/fixed_pkg/ieee_proposed -include ../../../../Common/make/ghdl.mk +include $(VHDL_HOME)/make/ghdl.mk # ------------------------------------------------- diff --git a/lib/radio/nco/ghdl/tb_nco_cordic.make b/lib/radio/nco/ghdl/tb_nco_cordic.make index 5bb2aeb..0234dac 100644 --- a/lib/radio/nco/ghdl/tb_nco_cordic.make +++ b/lib/radio/nco/ghdl/tb_nco_cordic.make @@ -1,7 +1,6 @@ # ------------------------------------------------- -# Includes -# ------------------------------------------------- -include mix_cordic_pipe.inc +include $(VHDL_HOME)/make/defs.mk +include $(LIB_PATH)/radio/nco/ghdl/mix_cordic_pipe.inc # ------------------------------------------------- # Global options @@ -13,8 +12,6 @@ WORK_LIB := work # ------------------------------------------------- # Target options # ------------------------------------------------- -LIB_PATH := ../../../../lib - SRCS += $(LIB_PATH)/PCK_FIO-2002.7/PCK_FIO_1993.vhd SRCS += $(LIB_PATH)/PCK_FIO-2002.7/PCK_FIO_1993_BODY.vhd SRCS += $(MIX_CORDIC_PIPE_SRCS) @@ -29,7 +26,7 @@ RUN_TIME := 250us GHDL_OPTS := -P$(LIB_PATH)/fixed/ieee_proposed/build/fixed_pkg/ieee_proposed -include ../../../../Common/make/ghdl.mk +include $(VHDL_HOME)/make/ghdl.mk # ------------------------------------------------- diff --git a/lib/radio/nco/ghdl/tb_nco_lut.make b/lib/radio/nco/ghdl/tb_nco_lut.make index 4b0cabc..a52438f 100644 --- a/lib/radio/nco/ghdl/tb_nco_lut.make +++ b/lib/radio/nco/ghdl/tb_nco_lut.make @@ -1,5 +1,6 @@ # ------------------------------------------------- -include nco_lut.inc +include $(VHDL_HOME)/make/defs.mk +include $(LIB_PATH)/radio/nco/ghdl/nco_lut.inc # ------------------------------------------------- # Global options @@ -11,8 +12,6 @@ WORK_LIB := work # ------------------------------------------------- # Target options # ------------------------------------------------- -LIB_PATH := ../../../../lib - SRCS += $(LIB_PATH)/PCK_FIO-2002.7/PCK_FIO_1993.vhd SRCS += $(LIB_PATH)/PCK_FIO-2002.7/PCK_FIO_1993_BODY.vhd SRCS += $(NCO_LUT_SRCS) @@ -27,6 +26,6 @@ RUN_TIME := 250us GHDL_OPTS := -P$(LIB_PATH)/fixed/ieee_proposed/build/fixed_pkg/ieee_proposed -include ../../../../Common/make/ghdl.mk +include $(VHDL_HOME)/make/ghdl.mk # ------------------------------------------------- diff --git a/make/defs.mk b/make/defs.mk new file mode 100644 index 0000000..f12edfb --- /dev/null +++ b/make/defs.mk @@ -0,0 +1,3 @@ +ROOT_PATH := $(VHDL_HOME) +LIB_PATH := $(ROOT_PATH)/lib + diff --git a/Common/make/ghdl.mk b/make/ghdl.mk similarity index 100% rename from Common/make/ghdl.mk rename to make/ghdl.mk