Merge branch 'master' into coreplex_peripheral_interrupts
This commit is contained in:
commit
abfaae8f4b
@ -35,7 +35,7 @@ test:
|
|||||||
# Run assembly tests and benchmarks
|
# Run assembly tests and benchmarks
|
||||||
#--------------------------------------------------------------------
|
#--------------------------------------------------------------------
|
||||||
|
|
||||||
ifneq ($(MAKECMDGOALS),clean)
|
ifneq ($(filter run% %.run %.out %.vpd %.vcd,$(MAKECMDGOALS)),)
|
||||||
-include $(generated_dir)/$(MODEL).$(CONFIG).d
|
-include $(generated_dir)/$(MODEL).$(CONFIG).d
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
@ -21,7 +21,7 @@ TB ?= TestDriver
|
|||||||
|
|
||||||
include $(base_dir)/Makefrag
|
include $(base_dir)/Makefrag
|
||||||
include $(sim_dir)/Makefrag
|
include $(sim_dir)/Makefrag
|
||||||
ifneq ($(MAKECMDGOALS),clean)
|
ifneq ($(filter run% %.run %.out %.vpd %.vcd,$(MAKECMDGOALS)),)
|
||||||
-include $(generated_dir)/$(MODEL).$(CONFIG).d
|
-include $(generated_dir)/$(MODEL).$(CONFIG).d
|
||||||
endif
|
endif
|
||||||
include $(base_dir)/vsim/Makefrag-verilog
|
include $(base_dir)/vsim/Makefrag-verilog
|
||||||
|
Loading…
Reference in New Issue
Block a user