diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 076d88b59f137d756eba8b378e4406af50c9e15a..69ab82826fc101fab5862584c210f9bae7bd1b20 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,7 +8,7 @@ variables: PROJECT_ALGORITHM: top/charm PROJECT_NAME: mprocessor EMPHUB_TAG: $CI_COMMIT_REF_NAME-$CI_COMMIT_SHORT_SHA - IPBB_VER: "dev-2023a-v1.3" + IPBB_VER: "dev-2024b-v1.5" .vivado-job-build: diff --git a/dependencies.yml b/dependencies.yml index ef253d7730975e2d593f390d9369d84a5370b2f7..97125dece18912fc57bca55d3e5e299206814eb9 100644 --- a/dependencies.yml +++ b/dependencies.yml @@ -1,7 +1,7 @@ --- sources: emp-fwk: - branch: v0.9.0-alpha2 + branch: v0.9.0-alpha3 url: https://gitlab.cern.ch/p2-xware/firmware/emp-fwk.git ttc_legacy: @@ -29,7 +29,7 @@ sources: url: https://gitlab.cern.ch/cms-tcds/cms-tcds2-firmware.git tclink: - commit: fda0bcf + commit: fda0bcf07c501f81daeec1421ffdfb46f828f823 url: https://gitlab.cern.ch/HPTD/tclink.git slink-ip: diff --git a/top/charm/firmware/cfg/top.dep b/top/charm/firmware/cfg/top.dep index fa18f1e2134c88f7ab42329e53cfe65796958dfa..10ba27b79829552a20f57fe1d90e45e1934c3b2c 100644 --- a/top/charm/firmware/cfg/top.dep +++ b/top/charm/firmware/cfg/top.dep @@ -5,7 +5,7 @@ include -c dtc:dtc-be/common daqpath.dep include -c dtc:dtc-be/common common.dep include -c dtc-stub-processing:common tools.dep -src -c emp-fwk:components/payload ../ucf/emp_simple_payload.tcl +src -c emp-fwk:components/payload --usefor implementation ../ucf/emp_simple_payload.tcl src -c ipbus-firmware:components/ipbus_slaves ipbus_dpram.vhd src -c ipbus-firmware:components/ipbus_slaves ipbus_reg_v.vhd src -c ipbus-firmware:components/ipbus_slaves ipbus_ctrlreg_v.vhd diff --git a/top/muone/firmware/cfg/top.dep b/top/muone/firmware/cfg/top.dep index 0f54808fb32be2d0babe105a76bda51f169cf6f8..7e7695da00fd8bb787025f29eb1bb9509b8c22ab 100644 --- a/top/muone/firmware/cfg/top.dep +++ b/top/muone/firmware/cfg/top.dep @@ -5,7 +5,7 @@ include -c dtc:dtc-be/common daqpath.dep include -c dtc:dtc-be/common common.dep include -c dtc-stub-processing:common tools.dep -src -c emp-fwk:components/payload ../ucf/emp_simple_payload.tcl +src -c emp-fwk:components/payload --usefor implementation ../ucf/emp_simple_payload.tcl src -c ipbus-firmware:components/ipbus_slaves ipbus_dpram.vhd src -c ipbus-firmware:components/ipbus_slaves ipbus_reg_v.vhd src -c ipbus-firmware:components/ipbus_slaves ipbus_ctrlreg_v.vhd