Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Broadcom SAI version to 6.1 #10344

Merged
merged 3 commits into from
Mar 29, 2022
Merged

Update Broadcom SAI version to 6.1 #10344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
59be39c
Update SAI version to 6.1
tjchadaga Mar 24, 2022
5da07d1
sai module update
tjchadaga Mar 24, 2022
d3dabec
Update saibcm-modules-dnx
tjchadaga Mar 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions platform/broadcom/sai-modules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions platform/broadcom/sai.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
LIBSAIBCM_VERSION = 6.0.0.13-3
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
Expand Down
2 changes: 1 addition & 1 deletion platform/broadcom/saibcm-modules-dnx
Open in desktop
Submodule saibcm-modules-dnx updated from 3fc83d to 6bf58f
6 changes: 6 additions & 0 deletions platform/broadcom/saibcm-modules/debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
opennsl (6.1.0.3) unstable; urgency=medium
tjchadaga marked this conversation as resolved.
Show resolved Hide resolved

* 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
Expand Down
5 changes: 5 additions & 0 deletions platform/broadcom/saibcm-modules/make/Make.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
4 changes: 4 additions & 0 deletions platform/broadcom/saibcm-modules/systems/linux/user/common/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down