Merge pull request #220 from mikey/ghdl-makefile

Use $(GHDL) rather than ghdl in Makefile
jtag-port
Anton Blanchard 4 years ago committed by GitHub
commit 4e977bf8a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -72,7 +72,7 @@ unisim_lib = $(unisim_dir)/unisim-obj08.cf
unisim_lib_files = $(unisim_dir)/BSCANE2.vhdl $(unisim_dir)/BUFG.vhdl \ unisim_lib_files = $(unisim_dir)/BSCANE2.vhdl $(unisim_dir)/BUFG.vhdl \
$(unisim_dir)/unisim_vcomponents.vhdl $(unisim_dir)/unisim_vcomponents.vhdl
$(unisim_lib): $(unisim_lib_files) $(unisim_lib): $(unisim_lib_files)
ghdl -i --std=08 --work=unisim --workdir=$(unisim_dir) $^ $(GHDL) -i --std=08 --work=unisim --workdir=$(unisim_dir) $^
GHDLFLAGS += -P$(unisim_dir) GHDLFLAGS += -P$(unisim_dir)


core_tbs = multiply_tb divider_tb rotator_tb countzero_tb core_tbs = multiply_tb divider_tb rotator_tb countzero_tb
@ -86,7 +86,7 @@ fmf_lib = $(fmf_dir)/fmf-obj08.cf
fmf_lib_files = $(wildcard $(fmf_dir)/*.vhd) fmf_lib_files = $(wildcard $(fmf_dir)/*.vhd)
GHDLFLAGS += -P$(fmf_dir) GHDLFLAGS += -P$(fmf_dir)
$(fmf_lib): $(fmf_lib_files) $(fmf_lib): $(fmf_lib_files)
ghdl -i --std=08 --work=fmf --workdir=$(fmf_dir) $^ $(GHDL) -i --std=08 --work=fmf --workdir=$(fmf_dir) $^


flash_model_files=$(FLASH_MODEL_PATH)/s25fl128s.vhd flash_model_files=$(FLASH_MODEL_PATH)/s25fl128s.vhd
flash_model_files: $(fmf_lib) flash_model_files: $(fmf_lib)

Loading…
Cancel
Save