From d0433ac19d0f98c4d03da5f129c8920343cd66d3 Mon Sep 17 00:00:00 2001 From: Jens Ahrensfeld Date: Sat, 27 Mar 2021 18:51:23 +0000 Subject: [PATCH] - fixed and use emac_jbus git-svn-id: http://moon:8086/svn/vhdl/trunk@1540 cc03376c-175c-47c8-b038-4cd826a8556b --- lib/emac/ghdl/emac_jbus.inc | 20 +++++++------------- lib/emac/ghdl/tb_emac_top_jb.make | 9 ++------- 2 files changed, 9 insertions(+), 20 deletions(-) diff --git a/lib/emac/ghdl/emac_jbus.inc b/lib/emac/ghdl/emac_jbus.inc index f62e324..6321a00 100644 --- a/lib/emac/ghdl/emac_jbus.inc +++ b/lib/emac/ghdl/emac_jbus.inc @@ -1,18 +1,12 @@ +# ----------------------------------------------------------- +include emac_tx.inc +include emac_rx.inc + # ----------------------------------------------------------- PKG_NAME := EMAC_JBUS -# ----------------------------------------------------------- -CUR_PATH := $(PKG_NAME)_CUR -$(CUR_PATH) := $(shell dirname $(lastword $(MAKEFILE_LIST))) - -$(info $($(CUR_PATH))) - -# ----------------------------------------------------------- -include $($(CUR_PATH))/emac_tx.inc -include $($(CUR_PATH))/emac_rx.inc - -# ----------------------------------------------------------- -ROOT_PATH := $($(CUR_PATH))/../../../.. -LIB_PATH := $(ROOT_PATH)/lib +ROOT_PATH := ../../.. +LIB_PATH := $(ROOT_PATH)/lib +CUR_PATH := $(shell dirname $(lastword $(MAKEFILE_LIST))) # ----------------------------------------------------------- SRCS += $(EMAC_RX_SRCS) diff --git a/lib/emac/ghdl/tb_emac_top_jb.make b/lib/emac/ghdl/tb_emac_top_jb.make index 257ee17..ce82e27 100644 --- a/lib/emac/ghdl/tb_emac_top_jb.make +++ b/lib/emac/ghdl/tb_emac_top_jb.make @@ -1,14 +1,9 @@ -include emac_rx.inc -include emac_tx.inc +include emac_jbus.inc ROOT_PATH := ../../.. LIB_PATH := $(ROOT_PATH)/lib -SRCS += $(FIFO_SYNC_SRCS) -SRCS += $(FIFO_ASYNC_SRCS) -SRCS += $(EMAC_RX_SRCS) -SRCS += $(EMAC_TX_SRCS) -SRCS += $(LIB_PATH)/emac/src/emac_top_jb.vhd +SRCS += $(EMAC_JBUS_SRCS) SRCS += $(LIB_PATH)/emac/src/pkt_gen.vhd SRCS += $(LIB_PATH)/emac/src/tb_emac_top_jb.vhd