matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Update Broadcom SAI version to 6.1 (#10344)

Browse Source
This commit is contained in:
tjchadaga 2022-03-29 13:41:31 -07:00 committed by Judy Joseph
parent 43b2e5eff4
commit 5eea8e965e
6 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
platform/broadcom/sai-modules.mk
View File

@ -1,6 +1,6 @@
# Broadcom SAI modules
BRCM_OPENNSL_KERNEL_VERSION = 6.0.0.13
BRCM_OPENNSL_KERNEL_VERSION = 6.1.0.3
BRCM_OPENNSL_KERNEL = opennsl-modules_$(BRCM_OPENNSL_KERNEL_VERSION)_amd64.deb
$(BRCM_OPENNSL_KERNEL)_SRC_PATH = $(PLATFORM_PATH)/saibcm-modules
@ -10,7 +10,7 @@ $(BRCM_OPENNSL_KERNEL)_MACHINE = broadcom
SONIC_DPKG_DEBS += $(BRCM_OPENNSL_KERNEL)
# SAI bcm modules for DNX family ASIC
BRCM_DNX_OPENNSL_KERNEL_VERSION = 6.0.0.13
BRCM_DNX_OPENNSL_KERNEL_VERSION = 6.1.0.3
BRCM_DNX_OPENNSL_KERNEL = opennsl-modules-dnx_$(BRCM_DNX_OPENNSL_KERNEL_VERSION)_amd64.deb
$(BRCM_DNX_OPENNSL_KERNEL)_SRC_PATH = $(PLATFORM_PATH)/saibcm-modules-dnx

4
platform/broadcom/sai.mk
View File

@ -1,5 +1,5 @@
LIBSAIBCM_VERSION = 6.0.0.13-1
LIBSAIBCM_BRANCH_NAME = REL_6.0
LIBSAIBCM_VERSION = 6.1.0.3
LIBSAIBCM_BRANCH_NAME = REL_6.1
LIBSAIBCM_URL_PREFIX = "https://sonicstorage.blob.core.windows.net/public/sai/bcmsai/$(LIBSAIBCM_BRANCH_NAME)/$(LIBSAIBCM_VERSION)"
BRCM_SAI = libsaibcm_$(LIBSAIBCM_VERSION)_amd64.deb

2
platform/broadcom/saibcm-modules-dnx

@ -1 +1 @@
Subproject commit 3fc83d5e5f9d1abad3ddf7fa6767b8cdd6121232
Subproject commit 6bf58f8310bcb29168ae5b2dabed84fc942429fc

6
platform/broadcom/saibcm-modules/debian/changelog
View File

@ -1,3 +1,9 @@
opennsl (6.1.0.3) unstable; urgency=medium
* Update to Broadcom SAI 6.1.0.3
-- Tejaswini Chadaga <tchadaga@microsoft.com> Fri, 24 MAR 2022 12:30:00 +0000
opennsl (6.0.0.13) unstable; urgency=medium
* Update to Broadcom SAI 6.0.0.13

5
platform/broadcom/saibcm-modules/make/Make.config
View File

@ -120,7 +120,12 @@ ifndef SDKBUILD
SDKBUILD :=build
endif
ifdef SDK_OUTDIR
BLDROOT = ${SDK_OUTDIR}/${SDKBUILD}/$(if ${BLDCONFIG},${BLDCONFIG}/)${target}${all_suffix}${bldroot_suffix}
export DEST_DIR := ${SDK_OUTDIR}/${SDKBUILD}$(if ${BLDCONFIG},/${BLDCONFIG})$(DEST_DIR_SUFFIX)
else
BLDROOT = ${SDK}/${SDKBUILD}/$(if ${BLDCONFIG},${BLDCONFIG}/)${target}${all_suffix}${bldroot_suffix}
endif
endif # ifeq "$(HOSTTYPE)" "Windows2000PC"

4
platform/broadcom/saibcm-modules/systems/linux/user/common/Makefile
View File

@ -69,8 +69,12 @@ kernel-override=linux-$(platform)
ifdef BLDCONFIG
KERN_BLDROOT=${SDK}/${SDKBUILD}/${BLDCONFIG}/$(kernel-override)$(bldroot_suffix)
else
ifdef SDK_OUTDIR
KERN_BLDROOT=${SDK_OUTDIR}/${SDKBUILD}/$(kernel-override)$(bldroot_suffix)
else
KERN_BLDROOT=${SDK}/${SDKBUILD}/$(kernel-override)$(bldroot_suffix)
endif
endif
ifeq (,$(kernel_version))
kernel_version=2_4