@@ -19,7 +19,7 @@ SDK_BASE_PATH = $(PLATFORM_PATH)/sdk-src/sonic-bluefield-packages/bin
1919
2020# Place here URL where SDK sources exist
2121SDK_SOURCE_BASE_URL =
22- SDK_VERSION = 24.10-RC2
22+ SDK_VERSION = 25.1-RC5
2323
2424SDK_COLLECTX_URL = https://linux.mellanox.com/public/repo/doca/1.5.2/debian12/aarch64/
2525
@@ -176,32 +176,17 @@ export RDMA_CORE_DERIVED_DEBS
176176SDK_DEBS += $(RDMA_CORE ) $(RDMA_CORE_DERIVED_DEBS )
177177SDK_SRC_TARGETS += $(RDMA_CORE )
178178
179- # FlexIO
180-
181- # FLEXIO_VER = $(call get_sdk_package_version_full,"flexio")
182- #
183- # FLEXIO = flexio_$(FLEXIO_VER)_arm64.deb
184- # $(FLEXIO)_SRC_PATH = $(PLATFORM_PATH)/sdk-src/flexio
185- # $(FLEXIO)_DEPENDS = $(IB_VERBS_PROV) $(IB_VERBS) $(IB_VERBS_DEV)
186- # $(FLEXIO)_RDEPENDS = $(IB_VERBS_PROV) $(IB_VERBS) $(IB_VERBS_DEV)
187- #
188- # export FLEXIO_VER FLEXIO
189-
190- SDK_DEBS += $(FLEXIO )
191- SDK_SRC_TARGETS += $(FLEXIO )
192-
193179# DPDK and derived packages
194180
195181DPDK_VER = $(call get_sdk_package_version_full,"dpdk")
196182
197183DPDK = mlnx-dpdk_${DPDK_VER}_${CONFIGURED_ARCH}.deb
198184$(DPDK)_SRC_PATH = $(PLATFORM_PATH ) /sdk-src/dpdk
199- $(DPDK)_DEPENDS = $(FLEXIO )
200- $(DPDK)_RDEPENDS = $(FLEXIO ) $(IB_VERBS_PROV ) $(IB_VERBS ) $(IB_VERBS_DEV )
185+ $(DPDK)_RDEPENDS = $(IB_VERBS_PROV ) $(IB_VERBS ) $(IB_VERBS_DEV )
201186
202187DPDK_DEV = mlnx-dpdk-dev_${DPDK_VER}_${CONFIGURED_ARCH}.deb
203- $(DPDK)_DEPENDS = $(RDMA_CORE ) $(IB_VERBS_PROV ) $(IB_VERBS ) $(IB_VERBS_DEV ) $( FLEXIO )
204- $(DPDK_DEV)_RDEPENDS = $(DPDK ) $( FLEXIO )
188+ $(DPDK)_DEPENDS = $(RDMA_CORE ) $(IB_VERBS_PROV ) $(IB_VERBS ) $(IB_VERBS_DEV )
189+ $(DPDK_DEV)_RDEPENDS = $(DPDK )
205190
206191$(eval $(call add_derived_package,$(DPDK),$(DPDK_DEV)))
207192
@@ -254,31 +239,72 @@ SDK_SRC_TARGETS += $(LIBGRPC_DEV)
254239DOCA_VERSION = $(call get_sdk_package_version_full,"doca")
255240DOCA_DEB_VERSION = $(DOCA_VERSION ) -1
256241
257- DOCA_LIBS = doca-cx-libs_${DOCA_DEB_VERSION}_${CONFIGURED_ARCH}.deb
258- $(DOCA_LIBS)_SRC_PATH = $(PLATFORM_PATH ) /sdk-src/doca
259- $(DOCA_LIBS)_RDEPENDS = $(DPDK ) $(RXPCOMPILER ) $(LIBRXPCOMPILER_DEV ) $(LIBGRPC_DEV ) $(FLEXIO )
260- $(DOCA_LIBS)_DEPENDS = $(RXPCOMPILER ) $(LIBRXPCOMPILER_DEV ) $(DPDK_DEV ) $(LIBGRPC_DEV ) $(FLEXIO )
261- DOCA_LIBS_DEV = libdoca-cx-libs-dev_${DOCA_DEB_VERSION}_${CONFIGURED_ARCH}.deb
262- DOCA_LIBS_DBG = doca-cx-libs-dbgsym_${DOCA_DEB_VERSION}_${CONFIGURED_ARCH}.deb
242+ DOCA_COMMON = doca-sdk-common_${DOCA_DEB_VERSION}_${CONFIGURED_ARCH}.deb
243+ $(DOCA_COMMON)_SRC_PATH = $(PLATFORM_PATH ) /sdk-src/doca
244+ $(DOCA_COMMON)_RDEPENDS = $(DPDK ) $(RXPCOMPILER ) $(LIBRXPCOMPILER_DEV ) $(LIBGRPC_DEV )
245+ $(DOCA_COMMON)_DEPENDS = $(RXPCOMPILER ) $(LIBRXPCOMPILER_DEV ) $(DPDK_DEV ) $(LIBGRPC_DEV )
246+ DOCA_COMMON_DEV = libdoca-sdk-common-dev_${DOCA_DEB_VERSION}_${CONFIGURED_ARCH}.deb
247+ $(DOCA_COMMON_DEV)_DEPENDS = $(DOCA_COMMON )
248+
249+ SDK_SRC_TARGETS += $(DOCA_COMMON )
250+
251+ DOCA_DEV_DEBS += $(DOCA_COMMON_DEV )
252+ export DOCA_COMMON DOCA_COMMON_DEV DOCA_COMMON_DBG
263253
264- $(eval $(call add_derived_package,$(DOCA_LIBS),$(DOCA_LIBS_DEV)))
265- $(eval $(call add_derived_package,$(DOCA_LIBS),$(DOCA_LIBS_DBG)))
254+ DOCA_ARGP = doca-sdk-argp_${DOCA_DEB_VERSION}_${CONFIGURED_ARCH}.deb
255+ $(DOCA_ARGP)_DEPENDS += $(DOCA_COMMON )
256+ DOCA_ARGP_DEV = libdoca-sdk-argp-dev_${DOCA_DEB_VERSION}_${CONFIGURED_ARCH}.deb
257+ $(DOCA_ARGP_DEV)_DEPENDS = $(DOCA_ARGP )
266258
267- export DOCA_LIBS DOCA_LIBS_DEV DOCA_LIBS_DBG
259+ DOCA_DEBS += $(DOCA_ARGP )
260+ DOCA_DEV_DEBS += $(DOCA_ARGP_DEV )
261+ export DOCA_ARGP DOCA_ARGP_DEV DOCA_ARGP_DBG
268262
269- DOCA_LIBS_DERIVED_DEBS = $(DOCA_LIBS_DEV ) $(DOCA_LIBS_DBG )
270- export DOCA_LIBS_DERIVED_DEBS
263+ DOCA_DPDK_BRIDGE = doca-sdk-dpdk-bridge_${DOCA_DEB_VERSION}_${CONFIGURED_ARCH}.deb
264+ $(DOCA_DPDK_BRIDGE)_DEPENDS += $(DOCA_COMMON )
265+ DOCA_DPDK_BRIDGE_DEV = libdoca-sdk-dpdk-bridge-dev_${DOCA_DEB_VERSION}_${CONFIGURED_ARCH}.deb
266+ $(DOCA_DPDK_BRIDGE_DEV)_DEPENDS = $(DOCA_DPDK_BRIDGE )
271267
272- SDK_DEBS += $(DOCA_LIBS ) $(DOCA_LIBS_DERIVED_DEBS )
273- SDK_SRC_TARGETS += $(DOCA_LIBS )
268+ DOCA_DEBS += $(DOCA_DPDK_BRIDGE )
269+ DOCA_DEV_DEBS += $(DOCA_DPDK_BRIDGE_DEV )
270+ export DOCA_DPDK_BRIDGE DOCA_DPDK_BRIDGE_DEV DOCA_DPDK_BRIDGE_DBG
271+
272+ DOCA_FLOW = doca-sdk-flow_${DOCA_DEB_VERSION}_${CONFIGURED_ARCH}.deb
273+ $(DOCA_FLOW)_DEPENDS += $(DOCA_COMMON )
274+ DOCA_FLOW_DEV = libdoca-sdk-flow-dev_${DOCA_DEB_VERSION}_${CONFIGURED_ARCH}.deb
275+ $(DOCA_FLOW_DEV)_DEPENDS = $(DOCA_FLOW )
276+
277+ DOCA_DEBS += $(DOCA_FLOW )
278+ DOCA_DEV_DEBS += $(DOCA_FLOW_DEV )
279+ DOCA_DBG_DEBS += $(DOCA_FLOW_DBG )
280+ export DOCA_FLOW DOCA_FLOW_DEV DOCA_FLOW_DBG
281+ export DOCA_DEBS DOCA_DEV_DEBS
282+
283+ SDK_DEBS += $(DOCA_DEBS ) $(DOCA_DEV_DEBS )
284+
285+ ifeq ($(SDK_FROM_SRC ) , y)
286+ $(eval $(call add_derived_package,$(DOCA_COMMON),$(DOCA_COMMON_DEV)))
287+ $(eval $(call add_derived_package,$(DOCA_COMMON),$(DOCA_COMMON_DBG)))
288+ $(eval $(call add_derived_package,$(DOCA_COMMON),$(DOCA_ARGP)))
289+ $(eval $(call add_derived_package,$(DOCA_COMMON),$(DOCA_ARGP_DEV)))
290+ $(eval $(call add_derived_package,$(DOCA_COMMON),$(DOCA_ARGP_DBG)))
291+ $(eval $(call add_derived_package,$(DOCA_COMMON),$(DOCA_DPDK_BRIDGE)))
292+ $(eval $(call add_derived_package,$(DOCA_COMMON),$(DOCA_DPDK_BRIDGE_DEV)))
293+ $(eval $(call add_derived_package,$(DOCA_COMMON),$(DOCA_DPDK_BRIDGE_DBG)))
294+ $(eval $(call add_derived_package,$(DOCA_COMMON),$(DOCA_FLOW)))
295+ $(eval $(call add_derived_package,$(DOCA_COMMON),$(DOCA_FLOW_DEV)))
296+ $(eval $(call add_derived_package,$(DOCA_COMMON),$(DOCA_FLOW_DBG)))
297+ else
298+ SONIC_ONLINE_DEBS += $(DOCA_DEBS ) $(DOCA_DEV_DEBS )
299+ endif
274300
275301# SDN Appliance
276302
277303SDN_APPL_VER =$(call get_sdk_package_version_full,"nasa")
278304SDN_APPL = sdn-appliance_${SDN_APPL_VER}_${CONFIGURED_ARCH}.deb
279305$(SDN_APPL)_SRC_PATH = $(PLATFORM_PATH ) /sdk-src/sdn
280- $(SDN_APPL)_RDEPENDS = $(DOCA_LIBS ) $(FLEXIO ) $(MLNX_TOOLS ) $(OFED_KERNEL_UTILS ) $(MLNX_IPROUTE2 )
281- $(SDN_APPL)_DEPENDS = $(DOCA_LIBS_DEV ) $(DOCA_LIBS ) $(DPDK_DEV ) $(FLEXIO ) $(MLNX_TOOLS ) $(OFED_KERNEL_UTILS )
306+ $(SDN_APPL)_RDEPENDS = $(DOCA_COMMON ) $(DOCA_DEBS ) $(MLNX_TOOLS ) $(OFED_KERNEL_UTILS ) $(MLNX_IPROUTE2 )
307+ $(SDN_APPL)_DEPENDS = $(DOCA_COMMON ) $(DOCA_DEBS ) $(DOCA_DEV_DEBS ) $(DPDK_DEV ) $(MLNX_TOOLS ) $(OFED_KERNEL_UTILS )
282308
283309export SDN_APPL
284310
0 commit comments