diff --git a/.gitmodules b/.gitmodules index d499af1f55159269e34f17b35cd69f8eff76fb3e..3854bd5f6fb96ccbedb79a4e5ef596d3e4fbe0aa 100644 --- a/.gitmodules +++ b/.gitmodules @@ -61,9 +61,9 @@ [submodule "edge"] path = edge url = ssh://git@gitlab.cern.ch:7999/be-cem-edl/fec/utilities/edge.git -[submodule "pcie-to-vme-bridge"] - path = pcie-to-vme-bridge - url = https://gitlab.cern.ch/be-cem-edl/fec/hardware-modules/pcie-to-vme-bridge.git +[submodule "vme-bridge"] + path = vme-bridge + url = https://gitlab.cern.ch/be-cem-edl/fec/hardware-modules/vme-bridge.git [submodule "vmod"] path = vmod url = ssh://git@gitlab.cern.ch:7999/be-cem-edl/fec/hardware-modules/vmod.git diff --git a/Makefile b/Makefile index b06e2a9c7d5ac0637045adcef20428ae04ed94c8..1009d7bf18872d905582b04c3345c7a7070103c2 100644 --- a/Makefile +++ b/Makefile @@ -39,7 +39,7 @@ DIRS-$(CONFIG_soft_cpu_toolchains) += soft-cpu-toolchains DIRS-$(CONFIG_spec) += spec/software DIRS-$(CONFIG_svec) += svec/software DIRS-$(CONFIG_vd80) += vd80 -DIRS-$(CONFIG_vmebridge_ng) += pcie-to-vme-bridge/software +DIRS-$(CONFIG_vmebridge_ng) += vme-bridge/software DIRS-$(CONFIG_vmod) += vmod DIRS-$(CONFIG_zio) += zio @@ -57,7 +57,7 @@ $(DIRS-y): # dependencies pickeringmux: pciioconfig -ctr cvorb cvorg fmc-adc-100m14b4cha/software icv196 ipack jtag mtt sis33 svec/software vd80 vmod: pcie-to-vme-bridge/software +ctr cvorb cvorg fmc-adc-100m14b4cha/software icv196 ipack jtag mtt sis33 svec/software vd80 vmod: vme-bridge/software # ctc needs encore ctc: encore diff --git a/change.log.md b/change.log.md index 45acc42e448e40d8a180733dcba20f9e4a12afa5..df75131c8270a6bd149395f0a06faa30e9249dee 100644 --- a/change.log.md +++ b/change.log.md @@ -1,5 +1,9 @@ # Change log +### September 2023 + +- pcie-to-vme-bridge` submodule updated to `vme-bridge`. + ### June 2023 - `vmebridge-ng` project has been shifted to `pcie-to-vme-bridge/software`, which is now a submodule in this project. diff --git a/common.mk b/common.mk index a0121eb69b095c3d9e96a45d26b43e57cac85abc..32838d475ce3355fdfe2c38f072d44a66bbabfb5 100644 --- a/common.mk +++ b/common.mk @@ -96,7 +96,7 @@ ifndef FPGA_MGR FPGA_MGR := $(REPO_PARENT)/fpga-mgr-backport endif ifndef VMEBRIDGE -VMEBRIDGE := $(REPO_PARENT)/pcie-to-vme-bridge/software +VMEBRIDGE := $(REPO_PARENT)/vme-bridge/software endif ifndef ZIO ZIO := $(REPO_PARENT)/zio diff --git a/jtag/Makefile b/jtag/Makefile index ef98cba9e41fc17e985deaaa07b41b2bfe4ef8fb..603b4e516ebee1388dbd9e398884fef4f2a59db2 100644 --- a/jtag/Makefile +++ b/jtag/Makefile @@ -4,7 +4,7 @@ REPO_PARENT ?= $(TOPDIR)/.. # include the build environment -include $(REPO_PARENT)/common.mk -VMEBUS_PATH ?= $(REPO_PARENT)/pcie-to-vme-bridge/software +VMEBUS_PATH ?= $(REPO_PARENT)/vme-bridge/software CFLAGS = -g -I$(VMEBUS_PATH)/include CFLAGS += -I$(VMEBUS_PATH)/lib diff --git a/rawio/Makefile b/rawio/Makefile index 4f539aac9db320fad10d431eb2448465673b534f..6c5eb7dc0987ff5da74f519f58f6ace591dbd2da 100644 --- a/rawio/Makefile +++ b/rawio/Makefile @@ -3,7 +3,7 @@ REPO_PARENT ?= $(shell pwd)/.. # include the build environment -include $(REPO_PARENT)/common.mk -CFLAGS+=-I$(REPO_PARENT)/pcie-to-vme-bridge/software/include +CFLAGS+=-I$(REPO_PARENT)/vme-bridge/software/include CFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\" all: vmeio diff --git a/pcie-to-vme-bridge b/vme-bridge similarity index 100% rename from pcie-to-vme-bridge rename to vme-bridge