diff --git a/make/defs.mk b/Common/make/defs.mk similarity index 100% rename from make/defs.mk rename to Common/make/defs.mk diff --git a/make/ghdl.mk b/Common/make/ghdl.mk similarity index 100% rename from make/ghdl.mk rename to Common/make/ghdl.mk diff --git a/make/ise.mk b/Common/make/ise.mk similarity index 100% rename from make/ise.mk rename to Common/make/ise.mk diff --git a/make/package_new.inc b/Common/make/package_new.inc similarity index 100% rename from make/package_new.inc rename to Common/make/package_new.inc diff --git a/make/tb_new.make b/Common/make/tb_new.make similarity index 100% rename from make/tb_new.make rename to Common/make/tb_new.make diff --git a/lib/CPUs/JCpu/Makefile b/lib/CPUs/JCpu/Makefile index 7cae93b..b826375 100644 --- a/lib/CPUs/JCpu/Makefile +++ b/lib/CPUs/JCpu/Makefile @@ -1,4 +1,4 @@ -include $(VHDL_HOME)/make/defs.mk +include $(VHDL_MAKE_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 4810ae0..a908544 100644 --- a/lib/CPUs/JCpu/ghdl/cpu_itest.make +++ b/lib/CPUs/JCpu/ghdl/cpu_itest.make @@ -1,5 +1,5 @@ # ----------------------------------------------------------- -include $(VHDL_HOME)/make/defs.mk +include $(VHDL_MAKE_HOME)/defs.mk # ----------------------------------------------------------- include jcpu_core.inc @@ -14,5 +14,5 @@ TARGET := cpu_itest ENTITY := tb_cpu WAVE_FORMAT := ghw -include $(VHDL_HOME)/make/ghdl.mk +include $(VHDL_MAKE_HOME)/ghdl.mk diff --git a/lib/CPUs/JCpu/ghdl/jcpu_core.inc b/lib/CPUs/JCpu/ghdl/jcpu_core.inc index d532cd2..c6e8c15 100644 --- a/lib/CPUs/JCpu/ghdl/jcpu_core.inc +++ b/lib/CPUs/JCpu/ghdl/jcpu_core.inc @@ -1,5 +1,5 @@ # ----------------------------------------------------------- -include $(VHDL_HOME)/make/defs.mk +include $(VHDL_MAKE_HOME)/defs.mk # ----------------------------------------------------------- PKG_NAME := JCPU_CORE diff --git a/lib/CPUs/JCpu/ghdl/mul8x8.make b/lib/CPUs/JCpu/ghdl/mul8x8.make index 3513791..440f47a 100644 --- a/lib/CPUs/JCpu/ghdl/mul8x8.make +++ b/lib/CPUs/JCpu/ghdl/mul8x8.make @@ -1,5 +1,5 @@ # ----------------------------------------------------------- -include $(VHDL_HOME)/make/defs.mk +include $(VHDL_MAKE_HOME)/defs.mk # ----------------------------------------------------------- include jcpu_core.inc @@ -13,5 +13,5 @@ TARGET := mul8x8 ENTITY := tb_cpu_embedded WAVE_FORMAT := ghw -include $(VHDL_HOME)/make/ghdl.mk +include $(VHDL_MAKE_HOME)/ghdl.mk diff --git a/lib/CPUs/JCpu/ghdl/reti_issue.make b/lib/CPUs/JCpu/ghdl/reti_issue.make index d1b869a..618759f 100644 --- a/lib/CPUs/JCpu/ghdl/reti_issue.make +++ b/lib/CPUs/JCpu/ghdl/reti_issue.make @@ -1,5 +1,5 @@ # ----------------------------------------------------------- -include $(VHDL_HOME)/make/defs.mk +include $(VHDL_MAKE_HOME)/defs.mk # ----------------------------------------------------------- include jcpu_core.inc @@ -14,5 +14,5 @@ TARGET := reti_issue ENTITY := tb_cpu WAVE_FORMAT := ghw -include $(VHDL_HOME)/make/ghdl.mk +include $(VHDL_MAKE_HOME)/ghdl.mk diff --git a/lib/CPUs/JCpu/ghdl/tb_cpu_embedded.make b/lib/CPUs/JCpu/ghdl/tb_cpu_embedded.make index b68d4b1..42b6aa3 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_HOME)/make/defs.mk +include $(VHDL_MAKE_HOME)/defs.mk # ----------------------------------------------------------- include jcpu_core.inc @@ -12,5 +12,5 @@ SRCS += ../src/tb_cpu_embedded.vhd TARGET := tb_cpu_embedded ENTITY := tb_cpu_embedded -include $(VHDL_HOME)/make/ghdl.mk +include $(VHDL_MAKE_HOME)/ghdl.mk 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 ca1c114..edcf153 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_HOME)/make/defs.mk +include $(VHDL_MAKE_HOME)/defs.mk # ----------------------------------------------------------- include $(VHDL_HOME)/lib/uart/ghdl/uart_sim.inc include jcpu_core.inc @@ -16,5 +16,5 @@ TARGET := tb_cpu_embedded_with_uart ENTITY := tb_cpu_embedded_with_uart RUN_TIME := 100us -include $(VHDL_HOME)/make/ghdl.mk +include $(VHDL_MAKE_HOME)/ghdl.mk diff --git a/lib/CPUs/MIPS/ghdl/mips_core.inc b/lib/CPUs/MIPS/ghdl/mips_core.inc index c496623..9e05ce2 100644 --- a/lib/CPUs/MIPS/ghdl/mips_core.inc +++ b/lib/CPUs/MIPS/ghdl/mips_core.inc @@ -1,5 +1,5 @@ # ----------------------------------------------------------- -include $(VHDL_HOME)/make/defs.mk +include $(VHDL_MAKE_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 0fd97dc..d567289 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_HOME)/make/defs.mk +include $(VHDL_MAKE_HOME)/defs.mk # ----------------------------------------------------------- include mips_core.inc @@ -34,5 +34,5 @@ TARGET := tb_mips_top ENTITY := tb_mips_top RUN_TIME ?= 1500us -include $(VHDL_HOME)/make/ghdl.mk +include $(VHDL_MAKE_HOME)/ghdl.mk diff --git a/lib/CPUs/MIPS/syn/ise101/Makefile b/lib/CPUs/MIPS/syn/ise101/Makefile index 0324ed2..b569f07 100644 --- a/lib/CPUs/MIPS/syn/ise101/Makefile +++ b/lib/CPUs/MIPS/syn/ise101/Makefile @@ -4,5 +4,5 @@ PRJ := mips_top PREQ := $(PRJDIR)/$(PRJ).prj $(PRJDIR)/$(PRJ).xst $(PRJDIR)/$(PRJ).lso DEVICE := "xc4vsx35-ff668-10" -include $(VHDL_HOME)/make/ise.mk +include $(VHDL_MAKE_HOME)/ise.mk diff --git a/lib/FIFO/ghdl/fifo_async.inc b/lib/FIFO/ghdl/fifo_async.inc index c9f1943..80185a4 100644 --- a/lib/FIFO/ghdl/fifo_async.inc +++ b/lib/FIFO/ghdl/fifo_async.inc @@ -1,5 +1,5 @@ # ----------------------------------------------------------- -include $(VHDL_HOME)/make/defs.mk +include $(VHDL_MAKE_HOME)/defs.mk # ----------------------------------------------------------- PKG_NAME := FIFO_ASYNC diff --git a/lib/FIFO/ghdl/fifo_sync.inc b/lib/FIFO/ghdl/fifo_sync.inc index e7a1c0c..5531d26 100644 --- a/lib/FIFO/ghdl/fifo_sync.inc +++ b/lib/FIFO/ghdl/fifo_sync.inc @@ -1,5 +1,5 @@ # ----------------------------------------------------------- -include $(VHDL_HOME)/make/defs.mk +include $(VHDL_MAKE_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 98a882b..ad6fbdd 100644 --- a/lib/FIFO/ghdl/tb_fifo_async.make +++ b/lib/FIFO/ghdl/tb_fifo_async.make @@ -1,4 +1,4 @@ -include $(VHDL_HOME)/make/defs.mk +include $(VHDL_MAKE_HOME)/defs.mk include fifo_async.inc ROOT_PATH := ../../.. @@ -12,5 +12,5 @@ TARGET := tb_fifo_async ENTITY := tb_fifo_async RUN_TIME := 5us -include $(VHDL_HOME)/make/ghdl.mk +include $(VHDL_MAKE_HOME)/ghdl.mk diff --git a/lib/FIFO/ghdl/tb_fifo_sync.make b/lib/FIFO/ghdl/tb_fifo_sync.make index d2525e8..79139f3 100644 --- a/lib/FIFO/ghdl/tb_fifo_sync.make +++ b/lib/FIFO/ghdl/tb_fifo_sync.make @@ -1,4 +1,4 @@ -include $(VHDL_HOME)/make/defs.mk +include $(VHDL_MAKE_HOME)/defs.mk include fifo_sync.inc ROOT_PATH := ../../.. @@ -12,5 +12,5 @@ TARGET := tb_fifo_sync ENTITY := tb_fifo_sync RUN_TIME := 5us -include $(VHDL_HOME)/make/ghdl.mk +include $(VHDL_MAKE_HOME)/ghdl.mk diff --git a/lib/FIFO/ghdl/tb_gray_counter.make b/lib/FIFO/ghdl/tb_gray_counter.make index 869b0a5..3e92afd 100644 --- a/lib/FIFO/ghdl/tb_gray_counter.make +++ b/lib/FIFO/ghdl/tb_gray_counter.make @@ -1,4 +1,4 @@ -include $(VHDL_HOME)/make/defs.mk +include $(VHDL_MAKE_HOME)/defs.mk SRCS += $(LIB_PATH)/FIFO/src/fifo_ctrl_pkg.vhd SRCS += $(LIB_PATH)/FIFO/src/gray_counter.vhd @@ -9,5 +9,5 @@ TARGET := tb_gray_counter ENTITY := tb_gray_counter RUN_TIME := 1us -include $(VHDL_HOME)/make/ghdl.mk +include $(VHDL_MAKE_HOME)/ghdl.mk diff --git a/lib/FIFO/ghdl/tb_reg_stage.make b/lib/FIFO/ghdl/tb_reg_stage.make index 6e7b09f..c746d78 100644 --- a/lib/FIFO/ghdl/tb_reg_stage.make +++ b/lib/FIFO/ghdl/tb_reg_stage.make @@ -1,4 +1,4 @@ -include $(VHDL_HOME)/make/defs.mk +include $(VHDL_MAKE_HOME)/defs.mk SRCS += $(LIB_PATH)/FIFO/src/reg_stage.vhd SRCS += $(LIB_PATH)/FIFO/src/tb_reg_stage.vhd @@ -8,5 +8,5 @@ TARGET := tb_reg_stage ENTITY := tb_reg_stage RUN_TIME := 1us -include $(VHDL_HOME)/make/ghdl.mk +include $(VHDL_MAKE_HOME)/ghdl.mk diff --git a/lib/JBUS/busmaster/ghdl/tb_busmaster_async.make b/lib/JBUS/busmaster/ghdl/tb_busmaster_async.make index efa6b02..ea707ef 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_HOME)/make/defs.mk +include $(VHDL_MAKE_HOME)/defs.mk include $(LIB_PATH)/FIFO/ghdl/fifo_async.inc MOD_PATH := $(LIB_PATH)/JBUS/busmaster @@ -15,5 +15,5 @@ ENTITY := tb_busmaster_async RUN_TIME := 80us WAVE_FORMAT := vcd -include $(VHDL_HOME)/make/ghdl.mk +include $(VHDL_MAKE_HOME)/ghdl.mk diff --git a/lib/JBUS/busmaster/ghdl/tb_busmaster_sync.make b/lib/JBUS/busmaster/ghdl/tb_busmaster_sync.make index 6fe4bb8..cfe5c0a 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_HOME)/make/defs.mk +include $(VHDL_MAKE_HOME)/defs.mk include $(LIB_PATH)/FIFO/ghdl/fifo_sync.inc MOD_PATH := $(LIB_PATH)/JBUS/busmaster @@ -15,5 +15,5 @@ ENTITY := tb_busmaster_sync RUN_TIME := 40us WAVE_FORMAT := vcd -include $(VHDL_HOME)/make/ghdl.mk +include $(VHDL_MAKE_HOME)/ghdl.mk diff --git a/lib/JBUS/dmac/ghdl/tb_dmac_sync.make b/lib/JBUS/dmac/ghdl/tb_dmac_sync.make index 0858138..295c840 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_HOME)/make/defs.mk +include $(VHDL_MAKE_HOME)/defs.mk include $(LIB_PATH)/FIFO/ghdl/fifo_sync.inc MOD_PATH := $(LIB_PATH)/JBUS @@ -16,5 +16,5 @@ ENTITY := tb_dmac RUN_TIME := 6us WAVE_FORMAT := vcd -include $(VHDL_HOME)/make/ghdl.mk +include $(VHDL_MAKE_HOME)/ghdl.mk diff --git a/lib/JBUS/memory/ghdl/tb_ram_wb.make b/lib/JBUS/memory/ghdl/tb_ram_wb.make index e0d7d96..cbff319 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_HOME)/make/defs.mk +include $(VHDL_MAKE_HOME)/defs.mk MOD_PATH := $(LIB_PATH)/JBUS/memory @@ -13,4 +13,4 @@ ENTITY := tb_ram_wb RUN_TIME := 1500ns WAVE_FORMAT := vcd -include $(VHDL_HOME)/make/ghdl.mk +include $(VHDL_MAKE_HOME)/ghdl.mk diff --git a/lib/JBUS/memory/ghdl/tb_rom_wb.make b/lib/JBUS/memory/ghdl/tb_rom_wb.make index aea6656..8283a1e 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_HOME)/make/defs.mk +include $(VHDL_MAKE_HOME)/defs.mk MOD_PATH := $(LIB_PATH)/JBUS/memory @@ -12,5 +12,5 @@ ENTITY := tb_rom_wb RUN_TIME := 1500ns WAVE_FORMAT := vcd -include $(VHDL_HOME)/make/ghdl.mk +include $(VHDL_MAKE_HOME)/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 b4bb269..69abf8e 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_HOME)/make/defs.mk +include $(VHDL_MAKE_HOME)/defs.mk # ----------------------------------------------------------- include $(LIB_PATH)/FIFO/ghdl/fifo_sync.inc include $(LIB_PATH)/FIFO/ghdl/fifo_async.inc @@ -31,5 +31,5 @@ WAVE_FORMAT := vcd GHDL_OPTS := -P$(VHDL_HOME)/Common/sim/build/ghdl/unisim -fsynopsys -fexplicit -include $(VHDL_HOME)/make/ghdl.mk +include $(VHDL_MAKE_HOME)/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 476abb9..de48341 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_HOME)/make/defs.mk +include $(VHDL_MAKE_HOME)/defs.mk # ----------------------------------------------------------- include $(LIB_PATH)/FIFO/ghdl/fifo_sync.inc include $(LIB_PATH)/FIFO/ghdl/fifo_async.inc @@ -30,5 +30,5 @@ WAVE_FORMAT := vcd GHDL_OPTS := -P$(VHDL_HOME)/Common/sim/build/ghdl/unisim -fsynopsys -fexplicit -include $(VHDL_HOME)/make/ghdl.mk +include $(VHDL_MAKE_HOME)/ghdl.mk diff --git a/lib/VGA_ctrl/ghdl/tb_vga_frontend_jb32.make b/lib/VGA_ctrl/ghdl/tb_vga_frontend_jb32.make index 9900c34..bd268ae 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_HOME)/make/defs.mk +include $(VHDL_MAKE_HOME)/defs.mk # ----------------------------------------------------------- include vga_frontend_jb32.inc @@ -13,6 +13,6 @@ TARGET := tb_vga_frontend_jb32 ENTITY := tb_vga_frontend_jb32 RUN_TIME := 20ms -include $(VHDL_HOME)/make/ghdl.mk +include $(VHDL_MAKE_HOME)/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 5d6fa88..a97cd52 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_HOME)/make/defs.mk +include $(VHDL_MAKE_HOME)/defs.mk # ----------------------------------------------------------- include vga_frontend_jb64.inc @@ -13,6 +13,6 @@ TARGET := tb_vga_frontend_jb64 ENTITY := tb_vga_frontend_jb64 RUN_TIME := 2ms -include $(VHDL_HOME)/make/ghdl.mk +include $(VHDL_MAKE_HOME)/ghdl.mk # ----------------------------------------------------------- diff --git a/lib/VGA_ctrl/ghdl/vga_backend.inc b/lib/VGA_ctrl/ghdl/vga_backend.inc index 9553200..1f4b28d 100644 --- a/lib/VGA_ctrl/ghdl/vga_backend.inc +++ b/lib/VGA_ctrl/ghdl/vga_backend.inc @@ -1,5 +1,5 @@ # ----------------------------------------------------------- -include $(VHDL_HOME)/make/defs.mk +include $(VHDL_MAKE_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 d79710e..02241c7 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_HOME)/make/defs.mk +include $(VHDL_MAKE_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 9f0e538..682c810 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_HOME)/make/defs.mk +include $(VHDL_MAKE_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 2dc5c6d..8f254a0 100644 --- a/lib/emac/ghdl/emac_jbus.inc +++ b/lib/emac/ghdl/emac_jbus.inc @@ -1,5 +1,5 @@ # ----------------------------------------------------------- -include $(VHDL_HOME)/make/defs.mk +include $(VHDL_MAKE_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 79fc2cf..da3a5ba 100644 --- a/lib/emac/ghdl/emac_rx.inc +++ b/lib/emac/ghdl/emac_rx.inc @@ -1,5 +1,5 @@ # ----------------------------------------------------------- -include $(VHDL_HOME)/make/defs.mk +include $(VHDL_MAKE_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 8db857b..2a10e1a 100644 --- a/lib/emac/ghdl/emac_tx.inc +++ b/lib/emac/ghdl/emac_tx.inc @@ -1,5 +1,5 @@ # ----------------------------------------------------------- -include $(VHDL_HOME)/make/defs.mk +include $(VHDL_MAKE_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 cb50eda..1254855 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_HOME)/make/defs.mk +include $(VHDL_MAKE_HOME)/defs.mk include emac_jbus.inc SRCS := $(EMAC_JBUS_SRCS) @@ -10,5 +10,5 @@ TARGET := tb_emac_top_jb ENTITY := tb_emac_top_jb RUN_TIME := 2000us -include $(VHDL_HOME)/make/ghdl.mk +include $(VHDL_MAKE_HOME)/ghdl.mk diff --git a/lib/filter/ghdl/fir_iterative.inc b/lib/filter/ghdl/fir_iterative.inc index b437885..51c303e 100644 --- a/lib/filter/ghdl/fir_iterative.inc +++ b/lib/filter/ghdl/fir_iterative.inc @@ -1,5 +1,5 @@ # ----------------------------------------------------------- -include $(VHDL_HOME)/make/defs.mk +include $(VHDL_MAKE_HOME)/defs.mk # ----------------------------------------------------------- PKG_NAME := FIR_ITERATIVE diff --git a/lib/filter/ghdl/fir_parallel.inc b/lib/filter/ghdl/fir_parallel.inc index 95e914b..d8d3473 100644 --- a/lib/filter/ghdl/fir_parallel.inc +++ b/lib/filter/ghdl/fir_parallel.inc @@ -1,5 +1,5 @@ # ----------------------------------------------------------- -include $(VHDL_HOME)/make/defs.mk +include $(VHDL_MAKE_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 ae56b3e..a959d12 100644 --- a/lib/filter/ghdl/fir_semi_parallel.inc +++ b/lib/filter/ghdl/fir_semi_parallel.inc @@ -1,5 +1,5 @@ # ----------------------------------------------------------- -include $(VHDL_HOME)/make/defs.mk +include $(VHDL_MAKE_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 fb0a705..84b81cb 100644 --- a/lib/filter/ghdl/tb_fir_iterative.make +++ b/lib/filter/ghdl/tb_fir_iterative.make @@ -1,4 +1,4 @@ -include $(VHDL_HOME)/make/defs.mk +include $(VHDL_MAKE_HOME)/defs.mk include fir_iterative.inc ROOT_PATH := ../../.. @@ -15,5 +15,5 @@ ENTITY := tb_fir_iterative GHDL_OPTS := -P$(LIB_PATH)/fixed/ieee_proposed/build/fixed_pkg/ieee_proposed RUN_TIME := 6us -include $(VHDL_HOME)/make/ghdl.mk +include $(VHDL_MAKE_HOME)/ghdl.mk diff --git a/lib/filter/ghdl/tb_fir_parallel.make b/lib/filter/ghdl/tb_fir_parallel.make index e7eb356..4acc778 100644 --- a/lib/filter/ghdl/tb_fir_parallel.make +++ b/lib/filter/ghdl/tb_fir_parallel.make @@ -1,4 +1,4 @@ -include $(VHDL_HOME)/make/defs.mk +include $(VHDL_MAKE_HOME)/defs.mk include fir_parallel.inc ROOT_PATH := ../../.. @@ -15,5 +15,5 @@ ENTITY := tb_fir_parallel GHDL_OPTS := -P$(LIB_PATH)/fixed/ieee_proposed/build/fixed_pkg/ieee_proposed RUN_TIME := 200us -include $(VHDL_HOME)/make/ghdl.mk +include $(VHDL_MAKE_HOME)/ghdl.mk diff --git a/lib/filter/ghdl/tb_fir_semi_parallel.make b/lib/filter/ghdl/tb_fir_semi_parallel.make index ffaa233..5afe8b2 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_HOME)/make/defs.mk +include $(VHDL_MAKE_HOME)/defs.mk include fir_semi_parallel.inc ROOT_PATH := ../../.. @@ -15,5 +15,5 @@ ENTITY := tb_fir_semi_parallel GHDL_OPTS := -P$(LIB_PATH)/fixed/ieee_proposed/build/fixed_pkg/ieee_proposed RUN_TIME := 50us -include $(VHDL_HOME)/make/ghdl.mk +include $(VHDL_MAKE_HOME)/ghdl.mk diff --git a/lib/filter/ghdl/tb_fir_stage.make b/lib/filter/ghdl/tb_fir_stage.make index c66b87a..829d56a 100644 --- a/lib/filter/ghdl/tb_fir_stage.make +++ b/lib/filter/ghdl/tb_fir_stage.make @@ -1,4 +1,4 @@ -include $(VHDL_HOME)/make/defs.mk +include $(VHDL_MAKE_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 @@ -15,5 +15,5 @@ ENTITY := tb_fir_stage GHDL_OPTS := -P$(LIB_PATH)/fixed/ieee_proposed/build/fixed_pkg/ieee_proposed RUN_TIME := 2us -include $(VHDL_HOME)/make/ghdl.mk +include $(VHDL_MAKE_HOME)/ghdl.mk diff --git a/lib/filter/ghdl/tb_fir_stage_sys.make b/lib/filter/ghdl/tb_fir_stage_sys.make index 5255fc1..62e8fc4 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_HOME)/make/defs.mk +include $(VHDL_MAKE_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 @@ -15,5 +15,5 @@ ENTITY := tb_fir_stage_sys GHDL_OPTS := -P$(LIB_PATH)/fixed/ieee_proposed/build/fixed_pkg/ieee_proposed RUN_TIME := 2us -include $(VHDL_HOME)/make/ghdl.mk +include $(VHDL_MAKE_HOME)/ghdl.mk diff --git a/lib/ps2_port/ghdl/tb_ps2_core.make b/lib/ps2_port/ghdl/tb_ps2_core.make index e057b85..4b2e399 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_HOME)/make/defs.mk +include $(VHDL_MAKE_HOME)/defs.mk MOD_PATH := $(VHDL_HOME)/lib/ps2_port @@ -11,5 +11,5 @@ ENTITY := tb_ps2_core RUN_TIME := 10ms WAVE_FORMAT := vcd -include $(VHDL_HOME)/make/ghdl.mk +include $(VHDL_MAKE_HOME)/ghdl.mk diff --git a/lib/radio/cordic/ghdl/cordic_iterative.inc b/lib/radio/cordic/ghdl/cordic_iterative.inc index 9090a0c..fa9dfa7 100644 --- a/lib/radio/cordic/ghdl/cordic_iterative.inc +++ b/lib/radio/cordic/ghdl/cordic_iterative.inc @@ -1,5 +1,5 @@ # ----------------------------------------------------------- -include $(VHDL_HOME)/make/defs.mk +include $(VHDL_MAKE_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 59883b7..3e89abf 100644 --- a/lib/radio/cordic/ghdl/cordic_pipe.inc +++ b/lib/radio/cordic/ghdl/cordic_pipe.inc @@ -1,5 +1,5 @@ # ----------------------------------------------------------- -include $(VHDL_HOME)/make/defs.mk +include $(VHDL_MAKE_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 76096a3..c486b79 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_HOME)/make/defs.mk +include $(VHDL_MAKE_HOME)/defs.mk include cordic_iterative.inc # ------------------------------------------------- @@ -26,5 +26,5 @@ WAVE_FORMAT := vcd GHDL_OPTS := -P$(LIB_PATH)/fixed/ieee_proposed/build/fixed_pkg/ieee_proposed -include $(VHDL_HOME)/make/ghdl.mk +include $(VHDL_MAKE_HOME)/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 dda9465..c60522a 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_HOME)/make/defs.mk +include $(VHDL_MAKE_HOME)/defs.mk include cordic_pipe.inc # ------------------------------------------------- @@ -26,6 +26,6 @@ WAVE_FORMAT := vcd GHDL_OPTS := -P$(LIB_PATH)/fixed/ieee_proposed/build/fixed_pkg/ieee_proposed -include $(VHDL_HOME)/make/ghdl.mk +include $(VHDL_MAKE_HOME)/ghdl.mk # ------------------------------------------------- diff --git a/lib/radio/ddc/ghdl/tb_ddc.make b/lib/radio/ddc/ghdl/tb_ddc.make index 6bece9f..ef3adcd 100644 --- a/lib/radio/ddc/ghdl/tb_ddc.make +++ b/lib/radio/ddc/ghdl/tb_ddc.make @@ -1,4 +1,4 @@ -include $(VHDL_HOME)/make/defs.mk +include $(VHDL_MAKE_HOME)/defs.mk include $(LIB_PATH)/FIFO/ghdl/fifo_sync.inc include $(LIB_PATH)/filter/ghdl/fir_semi_parallel.inc @@ -22,5 +22,5 @@ WAVE_FORMAT := vcd GHDL_OPTS := -P$(LIB_PATH)/fixed/ieee_proposed/build/fixed_pkg/ieee_proposed -include $(VHDL_HOME)/make/ghdl.mk +include $(VHDL_MAKE_HOME)/ghdl.mk diff --git a/lib/radio/ddc/ghdl/tb_syn_ddc.make b/lib/radio/ddc/ghdl/tb_syn_ddc.make index a5e8ec9..5240b1e 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_HOME)/make/defs.mk +include $(VHDL_MAKE_HOME)/defs.mk include $(LIB_PATH)/FIFO/ghdl/fifo_sync.inc include $(LIB_PATH)/FIFO/ghdl/fifo_async.inc @@ -26,5 +26,5 @@ WAVE_FORMAT := vcd GHDL_OPTS := -P$(LIB_PATH)/fixed/ieee_proposed/build/fixed_pkg/ieee_proposed -include $(VHDL_HOME)/make/ghdl.mk +include $(VHDL_MAKE_HOME)/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 e9262eb..6bba4d5 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_HOME)/make/defs.mk +include $(VHDL_MAKE_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 3a0c99c..4b58f46 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_HOME)/make/defs.mk +include $(VHDL_MAKE_HOME)/defs.mk include cic_decim_pipe.inc SRCS += $(CIC_DECIM_PIPE_SRCS) @@ -14,5 +14,5 @@ WAVE_FORMAT := vcd GHDL_OPTS := -P$(LIB_PATH)/fixed/ieee_proposed/build/fixed_pkg/ieee_proposed -include $(VHDL_HOME)/make/ghdl.mk +include $(VHDL_MAKE_HOME)/ghdl.mk diff --git a/lib/radio/nco/ghdl/mix_cordic_pipe.inc b/lib/radio/nco/ghdl/mix_cordic_pipe.inc index b2647e7..65af663 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_HOME)/make/defs.mk +include $(VHDL_MAKE_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 f99f5d2..323d5ea 100644 --- a/lib/radio/nco/ghdl/nco_lut.inc +++ b/lib/radio/nco/ghdl/nco_lut.inc @@ -1,5 +1,5 @@ # ----------------------------------------------------------- -include $(VHDL_HOME)/make/defs.mk +include $(VHDL_MAKE_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 fcafc98..ac1c144 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_HOME)/make/defs.mk +include $(VHDL_MAKE_HOME)/defs.mk include $(LIB_PATH)/radio/nco/ghdl/mix_cordic_pipe.inc # ------------------------------------------------- @@ -26,7 +26,7 @@ WAVE_FORMAT := vcd GHDL_OPTS := -P$(LIB_PATH)/fixed/ieee_proposed/build/fixed_pkg/ieee_proposed -include $(VHDL_HOME)/make/ghdl.mk +include $(VHDL_MAKE_HOME)/ghdl.mk # ------------------------------------------------- diff --git a/lib/radio/nco/ghdl/tb_nco_cordic.make b/lib/radio/nco/ghdl/tb_nco_cordic.make index f77ebd1..24f4cdf 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_HOME)/make/defs.mk +include $(VHDL_MAKE_HOME)/defs.mk include $(LIB_PATH)/radio/nco/ghdl/mix_cordic_pipe.inc # ------------------------------------------------- @@ -26,7 +26,7 @@ WAVE_FORMAT := vcd GHDL_OPTS := -P$(LIB_PATH)/fixed/ieee_proposed/build/fixed_pkg/ieee_proposed -include $(VHDL_HOME)/make/ghdl.mk +include $(VHDL_MAKE_HOME)/ghdl.mk # ------------------------------------------------- diff --git a/lib/radio/nco/ghdl/tb_nco_lut.make b/lib/radio/nco/ghdl/tb_nco_lut.make index 7293e30..a0d03c6 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_HOME)/make/defs.mk +include $(VHDL_MAKE_HOME)/defs.mk include $(LIB_PATH)/radio/nco/ghdl/nco_lut.inc # ------------------------------------------------- @@ -26,6 +26,6 @@ WAVE_FORMAT := vcd GHDL_OPTS := -P$(LIB_PATH)/fixed/ieee_proposed/build/fixed_pkg/ieee_proposed -include $(VHDL_HOME)/make/ghdl.mk +include $(VHDL_MAKE_HOME)/ghdl.mk # ------------------------------------------------- diff --git a/lib/uart/ghdl/tb_uart_generic.make b/lib/uart/ghdl/tb_uart_generic.make index 7bd715e..ea3fde0 100644 --- a/lib/uart/ghdl/tb_uart_generic.make +++ b/lib/uart/ghdl/tb_uart_generic.make @@ -1,5 +1,5 @@ # ----------------------------------------------------------- -include $(VHDL_HOME)/make/defs.mk +include $(VHDL_MAKE_HOME)/defs.mk # ----------------------------------------------------------- include $(VHDL_HOME)/lib/uart/ghdl/uart_generic.inc @@ -15,6 +15,6 @@ TARGET := tb_uart_generic ENTITY := tb_uart RUN_TIME := 880us -include $(VHDL_HOME)/make/ghdl.mk +include $(VHDL_MAKE_HOME)/ghdl.mk # ----------------------------------------------------------- diff --git a/lib/uart/ghdl/tb_uart_sim.make b/lib/uart/ghdl/tb_uart_sim.make index a5b4bf4..c954840 100644 --- a/lib/uart/ghdl/tb_uart_sim.make +++ b/lib/uart/ghdl/tb_uart_sim.make @@ -1,5 +1,5 @@ # ----------------------------------------------------------- -include $(VHDL_HOME)/make/defs.mk +include $(VHDL_MAKE_HOME)/defs.mk # ----------------------------------------------------------- include $(VHDL_HOME)/lib/uart/ghdl/uart_sim.inc @@ -15,6 +15,6 @@ TARGET := tb_uart_sim ENTITY := tb_uart RUN_TIME := 880us -include $(VHDL_HOME)/make/ghdl.mk +include $(VHDL_MAKE_HOME)/ghdl.mk # ----------------------------------------------------------- diff --git a/lib/uart/ghdl/uart_generic.inc b/lib/uart/ghdl/uart_generic.inc index 1d03c4a..c29fa4e 100644 --- a/lib/uart/ghdl/uart_generic.inc +++ b/lib/uart/ghdl/uart_generic.inc @@ -1,5 +1,5 @@ # ----------------------------------------------------------- -include $(VHDL_HOME)/make/defs.mk +include $(VHDL_MAKE_HOME)/defs.mk # ----------------------------------------------------------- PKG_NAME := UART_GENERIC diff --git a/lib/uart/ghdl/uart_sim.inc b/lib/uart/ghdl/uart_sim.inc index b17e906..b5cc23a 100644 --- a/lib/uart/ghdl/uart_sim.inc +++ b/lib/uart/ghdl/uart_sim.inc @@ -1,5 +1,5 @@ # ----------------------------------------------------------- -include $(VHDL_HOME)/make/defs.mk +include $(VHDL_MAKE_HOME)/defs.mk # ----------------------------------------------------------- PKG_NAME := UART_SIM