From 96280bb78a2334fb43b7ac412b8725ac16254c86 Mon Sep 17 00:00:00 2001 From: jens Date: Thu, 8 Sep 2022 09:10:32 +0200 Subject: [PATCH] Reafctored defs.mk --- Common/make/defs.mk | 2 -- defs.mk | 2 ++ lib/CPUs/JCpu/Makefile | 2 +- lib/CPUs/JCpu/ghdl/cpu_itest.make | 2 +- lib/CPUs/JCpu/ghdl/jcpu_core.inc | 2 +- lib/CPUs/JCpu/ghdl/mul8x8.make | 2 +- lib/CPUs/JCpu/ghdl/reti_issue.make | 2 +- lib/CPUs/JCpu/ghdl/tb_cpu_embedded.make | 2 +- lib/CPUs/JCpu/ghdl/tb_cpu_embedded_with_uart.make | 2 +- lib/CPUs/MIPS/ghdl/mips_core.inc | 2 +- lib/CPUs/MIPS/ghdl/tb_mips_top.make | 2 +- lib/FIFO/ghdl/fifo_async.inc | 2 +- lib/FIFO/ghdl/fifo_sync.inc | 2 +- lib/FIFO/ghdl/tb_fifo_async.make | 2 +- lib/FIFO/ghdl/tb_fifo_sync.make | 2 +- lib/FIFO/ghdl/tb_gray_counter.make | 2 +- lib/FIFO/ghdl/tb_reg_stage.make | 2 +- lib/JBUS/busmaster/ghdl/busmaster_async.inc | 2 +- lib/JBUS/busmaster/ghdl/busmaster_sync.inc | 2 +- lib/JBUS/busmaster/ghdl/tb_busmaster_async.make | 2 +- lib/JBUS/busmaster/ghdl/tb_busmaster_sync.make | 2 +- lib/JBUS/dmac/ghdl/tb_dmac_sync.make | 2 +- lib/JBUS/memory/ghdl/tb_ram_wb.make | 2 +- lib/JBUS/memory/ghdl/tb_rom_wb.make | 2 +- lib/SDRAM/ddr_sdr_v1_5/ghdl/tb_ctrl_ddr_wb32.make | 2 +- lib/SDRAM/ddr_sdr_v1_5/ghdl/tb_ctrl_ddr_wb64.make | 2 +- lib/VGA_ctrl/ghdl/tb_vga_frontend_jb32.make | 2 +- lib/VGA_ctrl/ghdl/tb_vga_frontend_jb64.make | 2 +- lib/VGA_ctrl/ghdl/vga_backend.inc | 2 +- lib/VGA_ctrl/ghdl/vga_frontend_jb32.inc | 2 +- lib/VGA_ctrl/ghdl/vga_frontend_jb64.inc | 2 +- lib/emac/ghdl/emac_jbus.inc | 2 +- lib/emac/ghdl/emac_rx.inc | 2 +- lib/emac/ghdl/emac_tx.inc | 2 +- lib/emac/ghdl/tb_emac_top_jb.make | 2 +- lib/filter/ghdl/fir_iterative.inc | 2 +- lib/filter/ghdl/fir_parallel.inc | 2 +- lib/filter/ghdl/fir_semi_parallel.inc | 2 +- lib/filter/ghdl/tb_fir_iterative.make | 2 +- lib/filter/ghdl/tb_fir_parallel.make | 2 +- lib/filter/ghdl/tb_fir_semi_parallel.make | 2 +- lib/filter/ghdl/tb_fir_stage.make | 2 +- lib/filter/ghdl/tb_fir_stage_sys.make | 2 +- lib/ps2_port/ghdl/tb_ps2_core.make | 2 +- lib/radio/cordic/ghdl/cordic_iterative.inc | 2 +- lib/radio/cordic/ghdl/cordic_pipe.inc | 2 +- lib/radio/cordic/ghdl/tb_cordic_iterative_top.make | 2 +- lib/radio/cordic/ghdl/tb_cordic_pipe_top.make | 2 +- lib/radio/ddc/ghdl/tb_ddc.make | 2 +- lib/radio/ddc/ghdl/tb_syn_ddc.make | 2 +- lib/radio/decimator/CIC/ghdl/cic_decim_pipe.inc | 2 +- lib/radio/decimator/CIC/ghdl/tb_cic_decim_pipe.make | 2 +- lib/radio/nco/ghdl/mix_cordic_pipe.inc | 2 +- lib/radio/nco/ghdl/nco_lut.inc | 2 +- lib/radio/nco/ghdl/tb_mix_cordic.make | 2 +- lib/radio/nco/ghdl/tb_nco_cordic.make | 2 +- lib/radio/nco/ghdl/tb_nco_lut.make | 2 +- lib/uart/ghdl/tb_uart_generic.make | 2 +- lib/uart/ghdl/tb_uart_sim.make | 2 +- lib/uart/ghdl/uart_generic.inc | 2 +- lib/uart/ghdl/uart_sim.inc | 2 +- 61 files changed, 61 insertions(+), 61 deletions(-) delete mode 100644 Common/make/defs.mk create mode 100644 defs.mk diff --git a/Common/make/defs.mk b/Common/make/defs.mk deleted file mode 100644 index c4016bd..0000000 --- a/Common/make/defs.mk +++ /dev/null @@ -1,2 +0,0 @@ -LIB_PATH := $(VHDL_HOME)/lib - diff --git a/defs.mk b/defs.mk new file mode 100644 index 0000000..649047d --- /dev/null +++ b/defs.mk @@ -0,0 +1,2 @@ +LIB_PATH := $(VHDL_HOME)/lib +VHDL_MAKE_HOME := $(VHDL_HOME)/Common/make diff --git a/lib/CPUs/JCpu/Makefile b/lib/CPUs/JCpu/Makefile index b826375..102c91f 100644 --- a/lib/CPUs/JCpu/Makefile +++ b/lib/CPUs/JCpu/Makefile @@ -1,4 +1,4 @@ -include $(VHDL_MAKE_HOME)/defs.mk +include $(VHDL_HOME)/defs.mk TOOL_PATH := $(VHDL_HOME)/tools/jcpu .PHONY: install uninstall diff --git a/lib/CPUs/JCpu/ghdl/cpu_itest.make b/lib/CPUs/JCpu/ghdl/cpu_itest.make index a908544..ede3871 100644 --- a/lib/CPUs/JCpu/ghdl/cpu_itest.make +++ b/lib/CPUs/JCpu/ghdl/cpu_itest.make @@ -1,5 +1,5 @@ # ----------------------------------------------------------- -include $(VHDL_MAKE_HOME)/defs.mk +include $(VHDL_HOME)/defs.mk # ----------------------------------------------------------- include jcpu_core.inc diff --git a/lib/CPUs/JCpu/ghdl/jcpu_core.inc b/lib/CPUs/JCpu/ghdl/jcpu_core.inc index c6e8c15..f70995a 100644 --- a/lib/CPUs/JCpu/ghdl/jcpu_core.inc +++ b/lib/CPUs/JCpu/ghdl/jcpu_core.inc @@ -1,5 +1,5 @@ # ----------------------------------------------------------- -include $(VHDL_MAKE_HOME)/defs.mk +include $(VHDL_HOME)/defs.mk # ----------------------------------------------------------- PKG_NAME := JCPU_CORE diff --git a/lib/CPUs/JCpu/ghdl/mul8x8.make b/lib/CPUs/JCpu/ghdl/mul8x8.make index 440f47a..6cb87df 100644 --- a/lib/CPUs/JCpu/ghdl/mul8x8.make +++ b/lib/CPUs/JCpu/ghdl/mul8x8.make @@ -1,5 +1,5 @@ # ----------------------------------------------------------- -include $(VHDL_MAKE_HOME)/defs.mk +include $(VHDL_HOME)/defs.mk # ----------------------------------------------------------- include jcpu_core.inc diff --git a/lib/CPUs/JCpu/ghdl/reti_issue.make b/lib/CPUs/JCpu/ghdl/reti_issue.make index 618759f..ddeedf7 100644 --- a/lib/CPUs/JCpu/ghdl/reti_issue.make +++ b/lib/CPUs/JCpu/ghdl/reti_issue.make @@ -1,5 +1,5 @@ # ----------------------------------------------------------- -include $(VHDL_MAKE_HOME)/defs.mk +include $(VHDL_HOME)/defs.mk # ----------------------------------------------------------- include jcpu_core.inc diff --git a/lib/CPUs/JCpu/ghdl/tb_cpu_embedded.make b/lib/CPUs/JCpu/ghdl/tb_cpu_embedded.make index 42b6aa3..ee12fa5 100644 --- a/lib/CPUs/JCpu/ghdl/tb_cpu_embedded.make +++ b/lib/CPUs/JCpu/ghdl/tb_cpu_embedded.make @@ -1,5 +1,5 @@ # ----------------------------------------------------------- -include $(VHDL_MAKE_HOME)/defs.mk +include $(VHDL_HOME)/defs.mk # ----------------------------------------------------------- include jcpu_core.inc diff --git a/lib/CPUs/JCpu/ghdl/tb_cpu_embedded_with_uart.make b/lib/CPUs/JCpu/ghdl/tb_cpu_embedded_with_uart.make index edcf153..caad462 100644 --- a/lib/CPUs/JCpu/ghdl/tb_cpu_embedded_with_uart.make +++ b/lib/CPUs/JCpu/ghdl/tb_cpu_embedded_with_uart.make @@ -1,5 +1,5 @@ # ----------------------------------------------------------- -include $(VHDL_MAKE_HOME)/defs.mk +include $(VHDL_HOME)/defs.mk # ----------------------------------------------------------- include $(VHDL_HOME)/lib/uart/ghdl/uart_sim.inc include jcpu_core.inc diff --git a/lib/CPUs/MIPS/ghdl/mips_core.inc b/lib/CPUs/MIPS/ghdl/mips_core.inc index 9e05ce2..f6a6e74 100644 --- a/lib/CPUs/MIPS/ghdl/mips_core.inc +++ b/lib/CPUs/MIPS/ghdl/mips_core.inc @@ -1,5 +1,5 @@ # ----------------------------------------------------------- -include $(VHDL_MAKE_HOME)/defs.mk +include $(VHDL_HOME)/defs.mk include $(LIB_PATH)/FIFO/ghdl/fifo_sync.inc include $(LIB_PATH)/FIFO/ghdl/fifo_async.inc diff --git a/lib/CPUs/MIPS/ghdl/tb_mips_top.make b/lib/CPUs/MIPS/ghdl/tb_mips_top.make index d567289..077ae0e 100644 --- a/lib/CPUs/MIPS/ghdl/tb_mips_top.make +++ b/lib/CPUs/MIPS/ghdl/tb_mips_top.make @@ -1,5 +1,5 @@ # ----------------------------------------------------------- -include $(VHDL_MAKE_HOME)/defs.mk +include $(VHDL_HOME)/defs.mk # ----------------------------------------------------------- include mips_core.inc diff --git a/lib/FIFO/ghdl/fifo_async.inc b/lib/FIFO/ghdl/fifo_async.inc index 80185a4..1c674a0 100644 --- a/lib/FIFO/ghdl/fifo_async.inc +++ b/lib/FIFO/ghdl/fifo_async.inc @@ -1,5 +1,5 @@ # ----------------------------------------------------------- -include $(VHDL_MAKE_HOME)/defs.mk +include $(VHDL_HOME)/defs.mk # ----------------------------------------------------------- PKG_NAME := FIFO_ASYNC diff --git a/lib/FIFO/ghdl/fifo_sync.inc b/lib/FIFO/ghdl/fifo_sync.inc index 5531d26..8f6098d 100644 --- a/lib/FIFO/ghdl/fifo_sync.inc +++ b/lib/FIFO/ghdl/fifo_sync.inc @@ -1,5 +1,5 @@ # ----------------------------------------------------------- -include $(VHDL_MAKE_HOME)/defs.mk +include $(VHDL_HOME)/defs.mk # ----------------------------------------------------------- PKG_NAME := FIFO_SYNC diff --git a/lib/FIFO/ghdl/tb_fifo_async.make b/lib/FIFO/ghdl/tb_fifo_async.make index ad6fbdd..e18fd86 100644 --- a/lib/FIFO/ghdl/tb_fifo_async.make +++ b/lib/FIFO/ghdl/tb_fifo_async.make @@ -1,4 +1,4 @@ -include $(VHDL_MAKE_HOME)/defs.mk +include $(VHDL_HOME)/defs.mk include fifo_async.inc ROOT_PATH := ../../.. diff --git a/lib/FIFO/ghdl/tb_fifo_sync.make b/lib/FIFO/ghdl/tb_fifo_sync.make index 79139f3..0b58a7f 100644 --- a/lib/FIFO/ghdl/tb_fifo_sync.make +++ b/lib/FIFO/ghdl/tb_fifo_sync.make @@ -1,4 +1,4 @@ -include $(VHDL_MAKE_HOME)/defs.mk +include $(VHDL_HOME)/defs.mk include fifo_sync.inc ROOT_PATH := ../../.. diff --git a/lib/FIFO/ghdl/tb_gray_counter.make b/lib/FIFO/ghdl/tb_gray_counter.make index 3e92afd..28851ae 100644 --- a/lib/FIFO/ghdl/tb_gray_counter.make +++ b/lib/FIFO/ghdl/tb_gray_counter.make @@ -1,4 +1,4 @@ -include $(VHDL_MAKE_HOME)/defs.mk +include $(VHDL_HOME)/defs.mk SRCS += $(LIB_PATH)/FIFO/src/fifo_ctrl_pkg.vhd SRCS += $(LIB_PATH)/FIFO/src/gray_counter.vhd diff --git a/lib/FIFO/ghdl/tb_reg_stage.make b/lib/FIFO/ghdl/tb_reg_stage.make index c746d78..7306b10 100644 --- a/lib/FIFO/ghdl/tb_reg_stage.make +++ b/lib/FIFO/ghdl/tb_reg_stage.make @@ -1,4 +1,4 @@ -include $(VHDL_MAKE_HOME)/defs.mk +include $(VHDL_HOME)/defs.mk SRCS += $(LIB_PATH)/FIFO/src/reg_stage.vhd SRCS += $(LIB_PATH)/FIFO/src/tb_reg_stage.vhd diff --git a/lib/JBUS/busmaster/ghdl/busmaster_async.inc b/lib/JBUS/busmaster/ghdl/busmaster_async.inc index 3d5faf1..bce7e1f 100644 --- a/lib/JBUS/busmaster/ghdl/busmaster_async.inc +++ b/lib/JBUS/busmaster/ghdl/busmaster_async.inc @@ -1,5 +1,5 @@ # ----------------------------------------------------------- -include $(VHDL_MAKE_HOME)/defs.mk +include $(VHDL_HOME)/defs.mk include $(LIB_PATH)/FIFO/ghdl/fifo_async.inc # ----------------------------------------------------------- PKG_NAME := BUSMASTER_ASYNC diff --git a/lib/JBUS/busmaster/ghdl/busmaster_sync.inc b/lib/JBUS/busmaster/ghdl/busmaster_sync.inc index 2147abd..d44c4b2 100644 --- a/lib/JBUS/busmaster/ghdl/busmaster_sync.inc +++ b/lib/JBUS/busmaster/ghdl/busmaster_sync.inc @@ -1,5 +1,5 @@ # ----------------------------------------------------------- -include $(VHDL_MAKE_HOME)/defs.mk +include $(VHDL_HOME)/defs.mk include $(LIB_PATH)/FIFO/ghdl/fifo_sync.inc # ----------------------------------------------------------- PKG_NAME := BUSMASTER_SYNC diff --git a/lib/JBUS/busmaster/ghdl/tb_busmaster_async.make b/lib/JBUS/busmaster/ghdl/tb_busmaster_async.make index 9d47436..96bcc4f 100644 --- a/lib/JBUS/busmaster/ghdl/tb_busmaster_async.make +++ b/lib/JBUS/busmaster/ghdl/tb_busmaster_async.make @@ -1,4 +1,4 @@ -include $(VHDL_MAKE_HOME)/defs.mk +include $(VHDL_HOME)/defs.mk include $(LIB_PATH)/JBUS/busmaster/ghdl/busmaster_async.inc SRCS += $(BUSMASTER_ASYNC_SRCS) diff --git a/lib/JBUS/busmaster/ghdl/tb_busmaster_sync.make b/lib/JBUS/busmaster/ghdl/tb_busmaster_sync.make index 762792f..cacfe0b 100644 --- a/lib/JBUS/busmaster/ghdl/tb_busmaster_sync.make +++ b/lib/JBUS/busmaster/ghdl/tb_busmaster_sync.make @@ -1,4 +1,4 @@ -include $(VHDL_MAKE_HOME)/defs.mk +include $(VHDL_HOME)/defs.mk include $(LIB_PATH)/JBUS/busmaster/ghdl/busmaster_sync.inc SRCS += $(BUSMASTER_SYNC_SRCS) diff --git a/lib/JBUS/dmac/ghdl/tb_dmac_sync.make b/lib/JBUS/dmac/ghdl/tb_dmac_sync.make index 295c840..11a1c6f 100644 --- a/lib/JBUS/dmac/ghdl/tb_dmac_sync.make +++ b/lib/JBUS/dmac/ghdl/tb_dmac_sync.make @@ -1,4 +1,4 @@ -include $(VHDL_MAKE_HOME)/defs.mk +include $(VHDL_HOME)/defs.mk include $(LIB_PATH)/FIFO/ghdl/fifo_sync.inc MOD_PATH := $(LIB_PATH)/JBUS diff --git a/lib/JBUS/memory/ghdl/tb_ram_wb.make b/lib/JBUS/memory/ghdl/tb_ram_wb.make index cbff319..30e917b 100644 --- a/lib/JBUS/memory/ghdl/tb_ram_wb.make +++ b/lib/JBUS/memory/ghdl/tb_ram_wb.make @@ -1,4 +1,4 @@ -include $(VHDL_MAKE_HOME)/defs.mk +include $(VHDL_HOME)/defs.mk MOD_PATH := $(LIB_PATH)/JBUS/memory diff --git a/lib/JBUS/memory/ghdl/tb_rom_wb.make b/lib/JBUS/memory/ghdl/tb_rom_wb.make index 8283a1e..2546efb 100644 --- a/lib/JBUS/memory/ghdl/tb_rom_wb.make +++ b/lib/JBUS/memory/ghdl/tb_rom_wb.make @@ -1,4 +1,4 @@ -include $(VHDL_MAKE_HOME)/defs.mk +include $(VHDL_HOME)/defs.mk MOD_PATH := $(LIB_PATH)/JBUS/memory 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 69abf8e..a631ee6 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,5 +1,5 @@ # ----------------------------------------------------------- -include $(VHDL_MAKE_HOME)/defs.mk +include $(VHDL_HOME)/defs.mk # ----------------------------------------------------------- include $(LIB_PATH)/FIFO/ghdl/fifo_sync.inc include $(LIB_PATH)/FIFO/ghdl/fifo_async.inc 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 de48341..fc9835f 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,5 +1,5 @@ # ----------------------------------------------------------- -include $(VHDL_MAKE_HOME)/defs.mk +include $(VHDL_HOME)/defs.mk # ----------------------------------------------------------- include $(LIB_PATH)/FIFO/ghdl/fifo_sync.inc include $(LIB_PATH)/FIFO/ghdl/fifo_async.inc diff --git a/lib/VGA_ctrl/ghdl/tb_vga_frontend_jb32.make b/lib/VGA_ctrl/ghdl/tb_vga_frontend_jb32.make index bd268ae..edfcb28 100644 --- a/lib/VGA_ctrl/ghdl/tb_vga_frontend_jb32.make +++ b/lib/VGA_ctrl/ghdl/tb_vga_frontend_jb32.make @@ -1,5 +1,5 @@ # ----------------------------------------------------------- -include $(VHDL_MAKE_HOME)/defs.mk +include $(VHDL_HOME)/defs.mk # ----------------------------------------------------------- include vga_frontend_jb32.inc diff --git a/lib/VGA_ctrl/ghdl/tb_vga_frontend_jb64.make b/lib/VGA_ctrl/ghdl/tb_vga_frontend_jb64.make index a97cd52..5351ce6 100644 --- a/lib/VGA_ctrl/ghdl/tb_vga_frontend_jb64.make +++ b/lib/VGA_ctrl/ghdl/tb_vga_frontend_jb64.make @@ -1,5 +1,5 @@ # ----------------------------------------------------------- -include $(VHDL_MAKE_HOME)/defs.mk +include $(VHDL_HOME)/defs.mk # ----------------------------------------------------------- include vga_frontend_jb64.inc diff --git a/lib/VGA_ctrl/ghdl/vga_backend.inc b/lib/VGA_ctrl/ghdl/vga_backend.inc index 1f4b28d..5046afc 100644 --- a/lib/VGA_ctrl/ghdl/vga_backend.inc +++ b/lib/VGA_ctrl/ghdl/vga_backend.inc @@ -1,5 +1,5 @@ # ----------------------------------------------------------- -include $(VHDL_MAKE_HOME)/defs.mk +include $(VHDL_HOME)/defs.mk # ----------------------------------------------------------- PKG_NAME := VGA_BACKEND diff --git a/lib/VGA_ctrl/ghdl/vga_frontend_jb32.inc b/lib/VGA_ctrl/ghdl/vga_frontend_jb32.inc index 02241c7..e7d5d67 100644 --- a/lib/VGA_ctrl/ghdl/vga_frontend_jb32.inc +++ b/lib/VGA_ctrl/ghdl/vga_frontend_jb32.inc @@ -1,5 +1,5 @@ # ----------------------------------------------------------- -include $(VHDL_MAKE_HOME)/defs.mk +include $(VHDL_HOME)/defs.mk include vga_backend.inc include $(LIB_PATH)/FIFO/ghdl/fifo_async.inc diff --git a/lib/VGA_ctrl/ghdl/vga_frontend_jb64.inc b/lib/VGA_ctrl/ghdl/vga_frontend_jb64.inc index 682c810..ff0cb07 100644 --- a/lib/VGA_ctrl/ghdl/vga_frontend_jb64.inc +++ b/lib/VGA_ctrl/ghdl/vga_frontend_jb64.inc @@ -1,5 +1,5 @@ # ----------------------------------------------------------- -include $(VHDL_MAKE_HOME)/defs.mk +include $(VHDL_HOME)/defs.mk include $(LIB_PATH)/VGA_ctrl/ghdl/vga_backend.inc include $(LIB_PATH)/FIFO/ghdl/fifo_sync.inc include $(LIB_PATH)/FIFO/ghdl/fifo_async.inc diff --git a/lib/emac/ghdl/emac_jbus.inc b/lib/emac/ghdl/emac_jbus.inc index 8f254a0..7c34667 100644 --- a/lib/emac/ghdl/emac_jbus.inc +++ b/lib/emac/ghdl/emac_jbus.inc @@ -1,5 +1,5 @@ # ----------------------------------------------------------- -include $(VHDL_MAKE_HOME)/defs.mk +include $(VHDL_HOME)/defs.mk # ----------------------------------------------------------- include $(LIB_PATH)/emac/ghdl/emac_tx.inc include $(LIB_PATH)/emac/ghdl/emac_rx.inc diff --git a/lib/emac/ghdl/emac_rx.inc b/lib/emac/ghdl/emac_rx.inc index da3a5ba..d092954 100644 --- a/lib/emac/ghdl/emac_rx.inc +++ b/lib/emac/ghdl/emac_rx.inc @@ -1,5 +1,5 @@ # ----------------------------------------------------------- -include $(VHDL_MAKE_HOME)/defs.mk +include $(VHDL_HOME)/defs.mk # ----------------------------------------------------------- include $(LIB_PATH)/FIFO/ghdl/fifo_async.inc diff --git a/lib/emac/ghdl/emac_tx.inc b/lib/emac/ghdl/emac_tx.inc index 2a10e1a..aa25874 100644 --- a/lib/emac/ghdl/emac_tx.inc +++ b/lib/emac/ghdl/emac_tx.inc @@ -1,5 +1,5 @@ # ----------------------------------------------------------- -include $(VHDL_MAKE_HOME)/defs.mk +include $(VHDL_HOME)/defs.mk # ----------------------------------------------------------- include $(LIB_PATH)/FIFO/ghdl/fifo_sync.inc include $(LIB_PATH)/FIFO/ghdl/fifo_async.inc diff --git a/lib/emac/ghdl/tb_emac_top_jb.make b/lib/emac/ghdl/tb_emac_top_jb.make index 1254855..cca7f2a 100644 --- a/lib/emac/ghdl/tb_emac_top_jb.make +++ b/lib/emac/ghdl/tb_emac_top_jb.make @@ -1,4 +1,4 @@ -include $(VHDL_MAKE_HOME)/defs.mk +include $(VHDL_HOME)/defs.mk include emac_jbus.inc SRCS := $(EMAC_JBUS_SRCS) diff --git a/lib/filter/ghdl/fir_iterative.inc b/lib/filter/ghdl/fir_iterative.inc index 51c303e..8ff721b 100644 --- a/lib/filter/ghdl/fir_iterative.inc +++ b/lib/filter/ghdl/fir_iterative.inc @@ -1,5 +1,5 @@ # ----------------------------------------------------------- -include $(VHDL_MAKE_HOME)/defs.mk +include $(VHDL_HOME)/defs.mk # ----------------------------------------------------------- PKG_NAME := FIR_ITERATIVE diff --git a/lib/filter/ghdl/fir_parallel.inc b/lib/filter/ghdl/fir_parallel.inc index d8d3473..a5d7b51 100644 --- a/lib/filter/ghdl/fir_parallel.inc +++ b/lib/filter/ghdl/fir_parallel.inc @@ -1,5 +1,5 @@ # ----------------------------------------------------------- -include $(VHDL_MAKE_HOME)/defs.mk +include $(VHDL_HOME)/defs.mk # ----------------------------------------------------------- PKG_NAME := FIR_PARALLEL diff --git a/lib/filter/ghdl/fir_semi_parallel.inc b/lib/filter/ghdl/fir_semi_parallel.inc index a959d12..c75a1c3 100644 --- a/lib/filter/ghdl/fir_semi_parallel.inc +++ b/lib/filter/ghdl/fir_semi_parallel.inc @@ -1,5 +1,5 @@ # ----------------------------------------------------------- -include $(VHDL_MAKE_HOME)/defs.mk +include $(VHDL_HOME)/defs.mk # ----------------------------------------------------------- PKG_NAME := FIR_SEMI_PARALLEL diff --git a/lib/filter/ghdl/tb_fir_iterative.make b/lib/filter/ghdl/tb_fir_iterative.make index 84b81cb..43fd81c 100644 --- a/lib/filter/ghdl/tb_fir_iterative.make +++ b/lib/filter/ghdl/tb_fir_iterative.make @@ -1,4 +1,4 @@ -include $(VHDL_MAKE_HOME)/defs.mk +include $(VHDL_HOME)/defs.mk include fir_iterative.inc ROOT_PATH := ../../.. diff --git a/lib/filter/ghdl/tb_fir_parallel.make b/lib/filter/ghdl/tb_fir_parallel.make index 4acc778..efa13de 100644 --- a/lib/filter/ghdl/tb_fir_parallel.make +++ b/lib/filter/ghdl/tb_fir_parallel.make @@ -1,4 +1,4 @@ -include $(VHDL_MAKE_HOME)/defs.mk +include $(VHDL_HOME)/defs.mk include fir_parallel.inc ROOT_PATH := ../../.. diff --git a/lib/filter/ghdl/tb_fir_semi_parallel.make b/lib/filter/ghdl/tb_fir_semi_parallel.make index 5afe8b2..e8a6d4d 100644 --- a/lib/filter/ghdl/tb_fir_semi_parallel.make +++ b/lib/filter/ghdl/tb_fir_semi_parallel.make @@ -1,4 +1,4 @@ -include $(VHDL_MAKE_HOME)/defs.mk +include $(VHDL_HOME)/defs.mk include fir_semi_parallel.inc ROOT_PATH := ../../.. diff --git a/lib/filter/ghdl/tb_fir_stage.make b/lib/filter/ghdl/tb_fir_stage.make index 829d56a..4dc009a 100644 --- a/lib/filter/ghdl/tb_fir_stage.make +++ b/lib/filter/ghdl/tb_fir_stage.make @@ -1,4 +1,4 @@ -include $(VHDL_MAKE_HOME)/defs.mk +include $(VHDL_HOME)/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 diff --git a/lib/filter/ghdl/tb_fir_stage_sys.make b/lib/filter/ghdl/tb_fir_stage_sys.make index 62e8fc4..9ec7d06 100644 --- a/lib/filter/ghdl/tb_fir_stage_sys.make +++ b/lib/filter/ghdl/tb_fir_stage_sys.make @@ -1,4 +1,4 @@ -include $(VHDL_MAKE_HOME)/defs.mk +include $(VHDL_HOME)/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 diff --git a/lib/ps2_port/ghdl/tb_ps2_core.make b/lib/ps2_port/ghdl/tb_ps2_core.make index 4b2e399..7231244 100644 --- a/lib/ps2_port/ghdl/tb_ps2_core.make +++ b/lib/ps2_port/ghdl/tb_ps2_core.make @@ -1,4 +1,4 @@ -include $(VHDL_MAKE_HOME)/defs.mk +include $(VHDL_HOME)/defs.mk MOD_PATH := $(VHDL_HOME)/lib/ps2_port diff --git a/lib/radio/cordic/ghdl/cordic_iterative.inc b/lib/radio/cordic/ghdl/cordic_iterative.inc index fa9dfa7..fae5d51 100644 --- a/lib/radio/cordic/ghdl/cordic_iterative.inc +++ b/lib/radio/cordic/ghdl/cordic_iterative.inc @@ -1,5 +1,5 @@ # ----------------------------------------------------------- -include $(VHDL_MAKE_HOME)/defs.mk +include $(VHDL_HOME)/defs.mk # ----------------------------------------------------------- PKG_NAME := CORDIC_ITERATIVE diff --git a/lib/radio/cordic/ghdl/cordic_pipe.inc b/lib/radio/cordic/ghdl/cordic_pipe.inc index 3e89abf..3edcd58 100644 --- a/lib/radio/cordic/ghdl/cordic_pipe.inc +++ b/lib/radio/cordic/ghdl/cordic_pipe.inc @@ -1,5 +1,5 @@ # ----------------------------------------------------------- -include $(VHDL_MAKE_HOME)/defs.mk +include $(VHDL_HOME)/defs.mk # ----------------------------------------------------------- PKG_NAME := CORDIC_PIPE diff --git a/lib/radio/cordic/ghdl/tb_cordic_iterative_top.make b/lib/radio/cordic/ghdl/tb_cordic_iterative_top.make index c486b79..a790249 100644 --- a/lib/radio/cordic/ghdl/tb_cordic_iterative_top.make +++ b/lib/radio/cordic/ghdl/tb_cordic_iterative_top.make @@ -1,5 +1,5 @@ # ------------------------------------------------- -include $(VHDL_MAKE_HOME)/defs.mk +include $(VHDL_HOME)/defs.mk include cordic_iterative.inc # ------------------------------------------------- diff --git a/lib/radio/cordic/ghdl/tb_cordic_pipe_top.make b/lib/radio/cordic/ghdl/tb_cordic_pipe_top.make index c60522a..c82288f 100644 --- a/lib/radio/cordic/ghdl/tb_cordic_pipe_top.make +++ b/lib/radio/cordic/ghdl/tb_cordic_pipe_top.make @@ -1,5 +1,5 @@ # ------------------------------------------------- -include $(VHDL_MAKE_HOME)/defs.mk +include $(VHDL_HOME)/defs.mk include cordic_pipe.inc # ------------------------------------------------- diff --git a/lib/radio/ddc/ghdl/tb_ddc.make b/lib/radio/ddc/ghdl/tb_ddc.make index ef3adcd..b7a8545 100644 --- a/lib/radio/ddc/ghdl/tb_ddc.make +++ b/lib/radio/ddc/ghdl/tb_ddc.make @@ -1,4 +1,4 @@ -include $(VHDL_MAKE_HOME)/defs.mk +include $(VHDL_HOME)/defs.mk include $(LIB_PATH)/FIFO/ghdl/fifo_sync.inc include $(LIB_PATH)/filter/ghdl/fir_semi_parallel.inc diff --git a/lib/radio/ddc/ghdl/tb_syn_ddc.make b/lib/radio/ddc/ghdl/tb_syn_ddc.make index 5240b1e..0be2f73 100644 --- a/lib/radio/ddc/ghdl/tb_syn_ddc.make +++ b/lib/radio/ddc/ghdl/tb_syn_ddc.make @@ -1,4 +1,4 @@ -include $(VHDL_MAKE_HOME)/defs.mk +include $(VHDL_HOME)/defs.mk include $(LIB_PATH)/FIFO/ghdl/fifo_sync.inc include $(LIB_PATH)/FIFO/ghdl/fifo_async.inc diff --git a/lib/radio/decimator/CIC/ghdl/cic_decim_pipe.inc b/lib/radio/decimator/CIC/ghdl/cic_decim_pipe.inc index 6bba4d5..e7e3c30 100644 --- a/lib/radio/decimator/CIC/ghdl/cic_decim_pipe.inc +++ b/lib/radio/decimator/CIC/ghdl/cic_decim_pipe.inc @@ -1,5 +1,5 @@ # ----------------------------------------------------------- -include $(VHDL_MAKE_HOME)/defs.mk +include $(VHDL_HOME)/defs.mk # ----------------------------------------------------------- PKG_NAME := CIC_DECIM_PIPE 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 4b58f46..68ab64f 100644 --- a/lib/radio/decimator/CIC/ghdl/tb_cic_decim_pipe.make +++ b/lib/radio/decimator/CIC/ghdl/tb_cic_decim_pipe.make @@ -1,4 +1,4 @@ -include $(VHDL_MAKE_HOME)/defs.mk +include $(VHDL_HOME)/defs.mk include cic_decim_pipe.inc SRCS += $(CIC_DECIM_PIPE_SRCS) diff --git a/lib/radio/nco/ghdl/mix_cordic_pipe.inc b/lib/radio/nco/ghdl/mix_cordic_pipe.inc index 65af663..5709df0 100644 --- a/lib/radio/nco/ghdl/mix_cordic_pipe.inc +++ b/lib/radio/nco/ghdl/mix_cordic_pipe.inc @@ -1,5 +1,5 @@ # ----------------------------------------------------------- -include $(VHDL_MAKE_HOME)/defs.mk +include $(VHDL_HOME)/defs.mk include $(LIB_PATH)/radio/cordic/ghdl/cordic_pipe.inc # ----------------------------------------------------------- PKG_NAME := MIX_CORDIC_PIPE diff --git a/lib/radio/nco/ghdl/nco_lut.inc b/lib/radio/nco/ghdl/nco_lut.inc index 323d5ea..315b2f0 100644 --- a/lib/radio/nco/ghdl/nco_lut.inc +++ b/lib/radio/nco/ghdl/nco_lut.inc @@ -1,5 +1,5 @@ # ----------------------------------------------------------- -include $(VHDL_MAKE_HOME)/defs.mk +include $(VHDL_HOME)/defs.mk # ----------------------------------------------------------- PKG_NAME := NCO_LUT diff --git a/lib/radio/nco/ghdl/tb_mix_cordic.make b/lib/radio/nco/ghdl/tb_mix_cordic.make index ac1c144..cbbcb20 100644 --- a/lib/radio/nco/ghdl/tb_mix_cordic.make +++ b/lib/radio/nco/ghdl/tb_mix_cordic.make @@ -1,5 +1,5 @@ # ------------------------------------------------- -include $(VHDL_MAKE_HOME)/defs.mk +include $(VHDL_HOME)/defs.mk include $(LIB_PATH)/radio/nco/ghdl/mix_cordic_pipe.inc # ------------------------------------------------- diff --git a/lib/radio/nco/ghdl/tb_nco_cordic.make b/lib/radio/nco/ghdl/tb_nco_cordic.make index 24f4cdf..196844a 100644 --- a/lib/radio/nco/ghdl/tb_nco_cordic.make +++ b/lib/radio/nco/ghdl/tb_nco_cordic.make @@ -1,5 +1,5 @@ # ------------------------------------------------- -include $(VHDL_MAKE_HOME)/defs.mk +include $(VHDL_HOME)/defs.mk include $(LIB_PATH)/radio/nco/ghdl/mix_cordic_pipe.inc # ------------------------------------------------- diff --git a/lib/radio/nco/ghdl/tb_nco_lut.make b/lib/radio/nco/ghdl/tb_nco_lut.make index a0d03c6..00a400d 100644 --- a/lib/radio/nco/ghdl/tb_nco_lut.make +++ b/lib/radio/nco/ghdl/tb_nco_lut.make @@ -1,5 +1,5 @@ # ------------------------------------------------- -include $(VHDL_MAKE_HOME)/defs.mk +include $(VHDL_HOME)/defs.mk include $(LIB_PATH)/radio/nco/ghdl/nco_lut.inc # ------------------------------------------------- diff --git a/lib/uart/ghdl/tb_uart_generic.make b/lib/uart/ghdl/tb_uart_generic.make index ea3fde0..e99c643 100644 --- a/lib/uart/ghdl/tb_uart_generic.make +++ b/lib/uart/ghdl/tb_uart_generic.make @@ -1,5 +1,5 @@ # ----------------------------------------------------------- -include $(VHDL_MAKE_HOME)/defs.mk +include $(VHDL_HOME)/defs.mk # ----------------------------------------------------------- include $(VHDL_HOME)/lib/uart/ghdl/uart_generic.inc diff --git a/lib/uart/ghdl/tb_uart_sim.make b/lib/uart/ghdl/tb_uart_sim.make index c954840..9dd70c7 100644 --- a/lib/uart/ghdl/tb_uart_sim.make +++ b/lib/uart/ghdl/tb_uart_sim.make @@ -1,5 +1,5 @@ # ----------------------------------------------------------- -include $(VHDL_MAKE_HOME)/defs.mk +include $(VHDL_HOME)/defs.mk # ----------------------------------------------------------- include $(VHDL_HOME)/lib/uart/ghdl/uart_sim.inc diff --git a/lib/uart/ghdl/uart_generic.inc b/lib/uart/ghdl/uart_generic.inc index c29fa4e..301a6d0 100644 --- a/lib/uart/ghdl/uart_generic.inc +++ b/lib/uart/ghdl/uart_generic.inc @@ -1,5 +1,5 @@ # ----------------------------------------------------------- -include $(VHDL_MAKE_HOME)/defs.mk +include $(VHDL_HOME)/defs.mk # ----------------------------------------------------------- PKG_NAME := UART_GENERIC diff --git a/lib/uart/ghdl/uart_sim.inc b/lib/uart/ghdl/uart_sim.inc index b5cc23a..0c8a19f 100644 --- a/lib/uart/ghdl/uart_sim.inc +++ b/lib/uart/ghdl/uart_sim.inc @@ -1,5 +1,5 @@ # ----------------------------------------------------------- -include $(VHDL_MAKE_HOME)/defs.mk +include $(VHDL_HOME)/defs.mk # ----------------------------------------------------------- PKG_NAME := UART_SIM