Skip to content

Commit

Permalink
includes: Update makefile variable name
Browse files Browse the repository at this point in the history
Signed-off-by: Istvan-Zsolt Szekely <[email protected]>
  • Loading branch information
IstvanZsSzekely committed Nov 7, 2024
1 parent 6e37cf2 commit f924d7a
Show file tree
Hide file tree
Showing 30 changed files with 37 additions and 37 deletions.
4 changes: 2 additions & 2 deletions library/includes/Makeinclude_common
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ SV_DEPS += system_tb.sv

ENV_DEPS += system_project.tcl
ENV_DEPS += system_bd.tcl
ENV_DEPS += $(TB_PATH)/scripts/adi_sim.tcl
ENV_DEPS += $(TB_PATH)/scripts/run_sim.tcl
ENV_DEPS += $(ADI_TB_DIR)/scripts/adi_sim.tcl
ENV_DEPS += $(ADI_TB_DIR)/scripts/run_sim.tcl
4 changes: 2 additions & 2 deletions scripts/make_tb_path
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
# Assumes this file is in <HDL>/testbenches/scripts/make_tb_path
ADI_HDL_DIR := $(subst /testbenches/scripts/make_tb_path,,$(abspath $(lastword $(MAKEFILE_LIST))))
HDL_LIBRARY_PATH := $(ADI_HDL_DIR)/library/
TB_PATH := $(ADI_HDL_DIR)/testbenches/
TB_LIBRARY_PATH := $(TB_PATH)/library/
ADI_TB_DIR := $(ADI_HDL_DIR)/testbenches/
TB_LIBRARY_PATH := $(ADI_TB_DIR)/library/
12 changes: 6 additions & 6 deletions scripts/project-sim.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
####################################################################################
####################################################################################

include $(TB_PATH)/library/includes/Makeinclude_common
include $(ADI_TB_DIR)/library/includes/Makeinclude_common

include $(ADI_HDL_DIR)/quiet.mk

ENV_DEPS += $(foreach dep,$(LIB_DEPS),$(HDL_LIBRARY_PATH)$(dep)/component.xml)
ENV_DEPS += $(foreach dep,$(SIM_LIB_DEPS),$(TB_PATH)/library/vip/adi/$(dep)/component.xml)
ENV_DEPS += $(foreach dep,$(SIM_LIB_DEPS),$(ADI_TB_DIR)/library/vip/adi/$(dep)/component.xml)

SHELL:=/bin/bash

Expand Down Expand Up @@ -70,11 +70,11 @@ endef
ifeq ($(OS), Windows_NT)
CMD_PRE = cmd /C "
CMD_POST = "
RUN_SIM_PATH = $(shell cygpath -m $(TB_PATH)/scripts/run_sim.tcl)
RUN_SIM_PATH = $(shell cygpath -m $(ADI_TB_DIR)/scripts/run_sim.tcl)
else
CMD_PRE =
CMD_POST =
RUN_SIM_PATH = $(TB_PATH)/scripts/run_sim.tcl
RUN_SIM_PATH = $(ADI_TB_DIR)/scripts/run_sim.tcl
endif

# This rule template will build the environment
Expand Down Expand Up @@ -159,9 +159,9 @@ $(HDL_LIBRARY_PATH)%/component.xml: FORCE
"; exit $$?

# Create here the targets which build the sim libraries
$(TB_PATH)/library/vip/adi/%/component.xml: TARGET:=xilinx
$(ADI_TB_DIR)/library/vip/adi/%/component.xml: TARGET:=xilinx
FORCE:
$(TB_PATH)/library/vip/adi/%/component.xml: FORCE
$(ADI_TB_DIR)/library/vip/adi/%/component.xml: FORCE
flock $(dir $@).lock -c " \
$(MAKE) -C $(dir $@) xilinx; \
"; exit $$?
Expand Down
2 changes: 1 addition & 1 deletion testbenches/ip/axi_tdd/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ TESTS := $(foreach cfg, $(basename $(CFG_FILES)), $(cfg):$(TP))
#TESTS += cfg2_fsync:test_program
#TESTS += cfg2_fsync:test_frame_delay

include $(TB_PATH)/scripts/project-sim.mk
include $(ADI_TB_DIR)/scripts/project-sim.mk

# usage :
#
Expand Down
2 changes: 1 addition & 1 deletion testbenches/ip/axis_sequencers/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ TESTS := $(foreach cfg, $(basename $(CFG_FILES)), $(cfg):$(TP))
#TESTS += cfg2_fsync:test_program
#TESTS += cfg2_fsync:test_frame_delay

include $(TB_PATH)/scripts/project-sim.mk
include $(ADI_TB_DIR)/scripts/project-sim.mk

# usage :
#
Expand Down
2 changes: 1 addition & 1 deletion testbenches/ip/base/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ CFG_FILES := $(notdir $(wildcard cfgs/cfg*.tcl))
TESTS := $(foreach cfg, $(basename $(CFG_FILES)), $(addprefix $(cfg):, $(TP)))
#TESTS += cfg1:test_program

include $(TB_PATH)/scripts/project-sim.mk
include $(ADI_TB_DIR)/scripts/project-sim.mk

# usage :
#
Expand Down
2 changes: 1 addition & 1 deletion testbenches/ip/data_offload/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ $(warning $(CFG_FILES))
# Format is: <configuration>:<test name>
TESTS := $(foreach cfg, $(basename $(CFG_FILES)), $(cfg):$(TP))

include $(TB_PATH)/scripts/project-sim.mk
include $(ADI_TB_DIR)/scripts/project-sim.mk

####################################################################################
####################################################################################
2 changes: 1 addition & 1 deletion testbenches/ip/data_offload_2/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ $(warning $(CFG_FILES))
TESTS := $(foreach cfg, $(basename $(CFG_FILES)), $(cfg):$(TP))
TESTS += cfg3:test_program_sync

include $(TB_PATH)/scripts/project-sim.mk
include $(ADI_TB_DIR)/scripts/project-sim.mk

####################################################################################
####################################################################################
2 changes: 1 addition & 1 deletion testbenches/ip/dma_loopback/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ TESTS := $(foreach cfg, $(basename $(CFG_FILES)), $(cfg):$(TP))
#TESTS += cfg2_fsync:test_program
#TESTS += cfg2_fsync:test_frame_delay

include $(TB_PATH)/scripts/project-sim.mk
include $(ADI_TB_DIR)/scripts/project-sim.mk

# usage :
#
Expand Down
2 changes: 1 addition & 1 deletion testbenches/ip/dma_sg/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ TESTS += cfg1:test_program_1d
TESTS += cfg2:test_program_2d
TESTS += cfg1:test_program_tr_queue

include $(TB_PATH)/scripts/project-sim.mk
include $(ADI_TB_DIR)/scripts/project-sim.mk

# usage :
#
Expand Down
2 changes: 1 addition & 1 deletion testbenches/ip/hbm/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ TESTS := $(foreach cfg, $(basename $(CFG_FILES)), $(cfg):$(TP))
#TESTS += cfg2_fsync:test_program
#TESTS += cfg2_fsync:test_frame_delay

include $(TB_PATH)/scripts/project-sim.mk
include $(ADI_TB_DIR)/scripts/project-sim.mk

# usage :
#
Expand Down
2 changes: 1 addition & 1 deletion testbenches/ip/i3c_controller/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ CFG_FILES := $(notdir $(wildcard cfgs/cfg*.tcl))
# Format is: <configuration>:<test name>
TESTS := $(foreach cfg, $(basename $(CFG_FILES)), $(cfg):$(TP))

include $(TB_PATH)/scripts/project-sim.mk
include $(ADI_TB_DIR)/scripts/project-sim.mk

# usage :
#
Expand Down
2 changes: 1 addition & 1 deletion testbenches/ip/jesd_loopback/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ TESTS := $(foreach cfg, $(basename $(CFG_FILES)), $(cfg):$(TP))
#TESTS += cfg2_fsync:test_program
#TESTS += cfg2_fsync:test_frame_delay

include $(TB_PATH)/scripts/project-sim.mk
include $(ADI_TB_DIR)/scripts/project-sim.mk

# usage :
#
Expand Down
2 changes: 1 addition & 1 deletion testbenches/ip/jesd_loopback_64b/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ TESTS := $(foreach cfg, $(basename $(CFG_FILES)), $(cfg):$(TP))
#TESTS += cfg2_fsync:test_program
#TESTS += cfg2_fsync:test_frame_delay

include $(TB_PATH)/scripts/project-sim.mk
include $(ADI_TB_DIR)/scripts/project-sim.mk

# usage :
#
Expand Down
2 changes: 1 addition & 1 deletion testbenches/ip/scoreboard/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ TESTS := $(foreach cfg, $(basename $(CFG_FILES)), $(cfg):$(TP))
#TESTS += cfg2_fsync:test_program
#TESTS += cfg2_fsync:test_frame_delay

include $(TB_PATH)/scripts/project-sim.mk
include $(ADI_TB_DIR)/scripts/project-sim.mk

# usage :
#
Expand Down
2 changes: 1 addition & 1 deletion testbenches/ip/spi_engine/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ CFG_FILES := $(notdir $(wildcard cfgs/cfg*.tcl))
# Format is: <configuration>:<test name>
TESTS := $(foreach cfg, $(basename $(CFG_FILES)), $(addprefix $(cfg):, $(TP)))

include $(TB_PATH)/scripts/project-sim.mk
include $(ADI_TB_DIR)/scripts/project-sim.mk

# usage :
#
Expand Down
2 changes: 1 addition & 1 deletion testbenches/ip/util_pack/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ TESTS := $(foreach cfg, $(basename $(CFG_FILES)), $(cfg):$(TP))
#TESTS += cfg1:test_program
#TESTS += cfg_rand:test_program

include $(TB_PATH)/scripts/project-sim.mk
include $(ADI_TB_DIR)/scripts/project-sim.mk

# usage :
#
Expand Down
2 changes: 1 addition & 1 deletion testbenches/project/ad463x/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ TESTS := $(foreach cfg, $(basename $(CFG_FILES)), $(cfg):$(TP))
#TESTS += cfg2_fsync:test_program
#TESTS += cfg2_fsync:test_frame_delay

include $(TB_PATH)/scripts/project-sim.mk
include $(ADI_TB_DIR)/scripts/project-sim.mk

# usage :
#
Expand Down
2 changes: 1 addition & 1 deletion testbenches/project/ad57xx/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ CFG_FILES := $(notdir $(wildcard cfgs/cfg*.tcl))
# Format is: <configuration>:<test name>
TESTS := $(foreach cfg, $(basename $(CFG_FILES)), $(addprefix $(cfg):, $(TP)))

include $(TB_PATH)/scripts/project-sim.mk
include $(ADI_TB_DIR)/scripts/project-sim.mk

# usage :
#
Expand Down
2 changes: 1 addition & 1 deletion testbenches/project/ad738x/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ CFG_FILES := $(notdir $(wildcard cfgs/cfg*.tcl))
# Format is: <configuration>:<test name>
TESTS := $(foreach cfg, $(basename $(CFG_FILES)), $(addprefix $(cfg):, $(TP)))

include $(TB_PATH)/scripts/project-sim.mk
include $(ADI_TB_DIR)/scripts/project-sim.mk

# usage :
#
Expand Down
2 changes: 1 addition & 1 deletion testbenches/project/ad7606x/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ TESTS := $(foreach cfg, $(basename $(CFG_FILES)), $(cfg):$(TP))

#TESTS += cfg1:test_program_pi

include $(TB_PATH)/scripts/project-sim.mk
include $(ADI_TB_DIR)/scripts/project-sim.mk

# usage :
#
Expand Down
2 changes: 1 addition & 1 deletion testbenches/project/ad7616/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ TP := test_program_si
TESTS += cfg_pi:test_program_pi
TESTS += cfg_si:test_program_si

include $(TB_PATH)/scripts/project-sim.mk
include $(ADI_TB_DIR)/scripts/project-sim.mk

# usage :
#
Expand Down
2 changes: 1 addition & 1 deletion testbenches/project/ad9083/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ TESTS := $(foreach cfg, $(basename $(CFG_FILES)), $(cfg):$(TP))
#TESTS += cfg2_fsync:test_program
#TESTS += cfg2_fsync:test_frame_delay

include $(TB_PATH)/scripts/project-sim.mk
include $(ADI_TB_DIR)/scripts/project-sim.mk

# usage :
#
Expand Down
2 changes: 1 addition & 1 deletion testbenches/project/ad_quadmxfe1_ebz/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ TESTS := $(foreach cfg, $(basename $(CFG_FILES)), $(cfg):$(TP))
#TESTS += cfg5_64b66b_Tx23_Rx25_LR_24_75:test_dma
#TESTS += cfg6_64b66b_Tx29_Rx24_LR_24_75:test_dma

include $(TB_PATH)/scripts/project-sim.mk
include $(ADI_TB_DIR)/scripts/project-sim.mk

# usage :
#
Expand Down
2 changes: 1 addition & 1 deletion testbenches/project/adrv9001/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ TESTS := $(foreach cfg, $(basename $(CFG_FILES)), $(cfg):$(TP))
#TESTS += cfg2_fsync:test_program
#TESTS += cfg2_fsync:test_frame_delay

include $(TB_PATH)/scripts/project-sim.mk
include $(ADI_TB_DIR)/scripts/project-sim.mk

# usage :
#
Expand Down
2 changes: 1 addition & 1 deletion testbenches/project/adrv9009/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ TESTS := $(foreach cfg, $(basename $(CFG_FILES)), $(cfg):$(TP))
#TESTS += cfg2_fsync:test_program
#TESTS += cfg2_fsync:test_frame_delay

include $(TB_PATH)/scripts/project-sim.mk
include $(ADI_TB_DIR)/scripts/project-sim.mk

# usage :
#
Expand Down
2 changes: 1 addition & 1 deletion testbenches/project/fmcomms2/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ TESTS := $(foreach cfg, $(basename $(CFG_FILES)), $(cfg):$(TP))
#TESTS += cfg2_fsync:test_program
#TESTS += cfg2_fsync:test_frame_delay

include $(TB_PATH)/scripts/project-sim.mk
include $(ADI_TB_DIR)/scripts/project-sim.mk

# usage :
#
Expand Down
2 changes: 1 addition & 1 deletion testbenches/project/mxfe/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ TESTS := $(foreach cfg, $(basename $(CFG_FILES)), $(cfg):$(TP))
#TESTS += cfg2_fsync:test_program
#TESTS += cfg2_fsync:test_frame_delay

include $(TB_PATH)/scripts/project-sim.mk
include $(ADI_TB_DIR)/scripts/project-sim.mk

# usage :
#
Expand Down
2 changes: 1 addition & 1 deletion testbenches/project/pluto/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ TESTS := $(foreach cfg, $(basename $(CFG_FILES)), $(cfg):$(TP))
#TESTS += cfg2_fsync:test_program
#TESTS += cfg2_fsync:test_frame_delay

include $(TB_PATH)/scripts/project-sim.mk
include $(ADI_TB_DIR)/scripts/project-sim.mk
2 changes: 1 addition & 1 deletion testbenches/project/pulsar_adc_pmdz/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ CFG_FILES := $(notdir $(wildcard cfgs/cfg*.tcl))
# Format is: <configuration>:<test name>
TESTS := $(foreach cfg, $(basename $(CFG_FILES)), $(addprefix $(cfg):, $(TP)))

include $(TB_PATH)/scripts/project-sim.mk
include $(ADI_TB_DIR)/scripts/project-sim.mk

# usage :
#
Expand Down

0 comments on commit f924d7a

Please sign in to comment.