Skip to content

Commit 1098f6e

Browse files
authored
[Mellanox] update sdk/fw build procedure (#14104)
* sdk debs are now downloaded as Spectrum-SDK-Drivers-SONiC-Bins release * sx kernel is downloaded as zip from Spectrum-SDK-Drivers Signed-off-by: Yakiv Huryk <[email protected]>
1 parent a1f9ee5 commit 1098f6e

File tree

5 files changed

+25
-19
lines changed

5 files changed

+25
-19
lines changed

.gitmodules

-3
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,6 @@
8181
[submodule "src/sonic-telemetry"]
8282
path = src/sonic-telemetry
8383
url = https://github.com/sonic-net/sonic-gnmi
84-
[submodule "Switch-SDK-drivers"]
85-
path = platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
86-
url = https://github.com/Mellanox/Switch-SDK-drivers
8784
[submodule "src/sonic-ztp"]
8885
path = src/sonic-ztp
8986
url = https://github.com/sonic-net/sonic-ztp

platform/mellanox/fw.mk

+6-3
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,13 @@ MLNX_FW_BASE_URL =
2323

2424
SIMX_VERSION = 5.1-1065
2525

26-
ifneq ($(MLNX_FW_BASE_URL), )
2726
FW_FROM_URL = y
28-
else
29-
FW_FROM_URL = n
27+
28+
MLNX_FW_ASSETS_RELEASE_TAG = fw-2010.4150
29+
MLNX_FW_ASSETS_URL = $(MLNX_ASSETS_GITHUB_URL)/releases/download/$(MLNX_FW_ASSETS_RELEASE_TAG)
30+
31+
ifeq ($(MLNX_FW_BASE_URL), )
32+
MLNX_FW_BASE_URL = $(MLNX_FW_ASSETS_URL)
3033
endif
3134

3235
MLNX_SPC_FW_VERSION = 13.2010.4150

platform/mellanox/sdk-src/sx-kernel/Makefile

+11-3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ MAIN_TARGET = sx-kernel_1.mlnx.$(MLNX_SDK_DEB_VERSION)_amd64.deb
55
DERIVED_TARGETS = sx-kernel-dev_1.mlnx.$(MLNX_SDK_DEB_VERSION)_amd64.deb
66
PACKAGE_NAME = sx_kernel
77

8+
MLNX_SX_KERNEL_GITHUB_URL_BASE = https://github.com/Mellanox/Spectrum-SDK-Drivers/archive/refs/heads
9+
810
$(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
911
# get sources
1012

@@ -13,9 +15,15 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
1315
wget -c $(MLNX_SDK_SOURCE_BASE_URL)/$(PACKAGE_NAME)-$(MLNX_SDK_VERSION)-$(MLNX_SDK_ISSU_VERSION).tar.gz -O - | tar -xz
1416
pushd sx_kernel-$(MLNX_SDK_VERSION)-$(MLNX_SDK_ISSU_VERSION)
1517
else
16-
pushd Switch-SDK-drivers
17-
git reset --hard
18-
git clean -xfd
18+
rm -rf Spectrum-SDK-Drivers-$(MLNX_SDK_VERSION)
19+
wget -c $(MLNX_SX_KERNEL_GITHUB_URL_BASE)/$(MLNX_SDK_VERSION).zip
20+
unzip $(MLNX_SDK_VERSION).zip
21+
rm -rf $(MLNX_SDK_VERSION).zip
22+
23+
pushd Spectrum-SDK-Drivers-$(MLNX_SDK_VERSION)
24+
ln -s ./sx_scripts/Makefile ./Makefile
25+
ln -s ./sx_scripts/makefile ./makefile
26+
ln -s ./sx_scripts/configure ./configure
1927
fi
2028

2129
# build
This file was deleted.

platform/mellanox/sdk.mk

+8-9
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,12 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616
#
17-
MLNX_SDK_BASE_PATH = $(PLATFORM_PATH)/sdk-src/sx-kernel/Switch-SDK-drivers/bin/
18-
MLNX_SDK_PKG_BASE_PATH = $(MLNX_SDK_BASE_PATH)/$(BLDENV)/$(CONFIGURED_ARCH)/
1917
MLNX_SDK_VERSION = 4.5.4150
2018
MLNX_SDK_ISSU_VERSION = 101
2119

20+
MLNX_ASSETS_GITHUB_URL = https://github.com/Mellanox/Spectrum-SDK-Drivers-SONiC-Bins
21+
MLNX_SDK_ASSETS_RELEASE_TAG = sdk-$(MLNX_SDK_VERSION)-$(BLDENV)-$(CONFIGURED_ARCH)
22+
MLNX_SDK_ASSETS_URL = $(MLNX_ASSETS_GITHUB_URL)/releases/download/$(MLNX_SDK_ASSETS_RELEASE_TAG)
2223
MLNX_SDK_DEB_VERSION = $(subst -,.,$(subst _,.,$(MLNX_SDK_VERSION)))
2324

2425
# Place here URL where SDK sources exist
@@ -30,7 +31,7 @@ else
3031
SDK_FROM_SRC = n
3132
endif
3233

33-
export MLNX_SDK_SOURCE_BASE_URL MLNX_SDK_VERSION MLNX_SDK_ISSU_VERSION MLNX_SDK_DEB_VERSION
34+
export MLNX_SDK_SOURCE_BASE_URL MLNX_SDK_VERSION MLNX_SDK_ISSU_VERSION MLNX_SDK_DEB_VERSION MLNX_ASSETS_GITHUB_URL
3435

3536
MLNX_SDK_RDEBS += $(APPLIBS) $(IPROUTE2_MLNX) $(SX_COMPLIB) $(SX_EXAMPLES) \
3637
$(SX_GEN_UTILS) $(SX_SCEW) $(SXD_LIBS) $(WJH_LIBS) $(SX_ACL_HELPER)
@@ -152,21 +153,19 @@ $(SX_KERNEL)_SRC_PATH = $(PLATFORM_PATH)/sdk-src/sx-kernel
152153
SX_KERNEL_DEV = sx-kernel-dev_1.mlnx.$(MLNX_SDK_DEB_VERSION)_amd64.deb
153154
$(eval $(call add_derived_package,$(SX_KERNEL),$(SX_KERNEL_DEV)))
154155

155-
define make_path
156-
$(1)_PATH = $(MLNX_SDK_PKG_BASE_PATH)
156+
define make_url
157+
$(1)_URL = $(MLNX_SDK_ASSETS_URL)/$(1)
157158

158159
endef
159160

160-
$(eval $(foreach deb,$(MLNX_SDK_DEBS),$(call make_path,$(deb))))
161-
$(eval $(foreach deb,$(MLNX_SDK_RDEBS),$(call make_path,$(deb))))
162-
$(eval $(foreach deb,$(PYTHON_SDK_API) $(SX_KERNEL) $(SX_KERNEL_DEV),$(call make_path,$(deb))))
161+
$(eval $(foreach deb,$(MLNX_SDK_DEBS) $(MLNX_SDK_RDEBS) $(PYTHON_SDK_API),$(call make_url,$(deb))))
163162

164163
SONIC_MAKE_DEBS += $(SX_KERNEL)
165164

166165
ifeq ($(SDK_FROM_SRC), y)
167166
SONIC_MAKE_DEBS += $(MLNX_SDK_RDEBS) $(PYTHON_SDK_API)
168167
else
169-
SONIC_COPY_DEBS += $(MLNX_SDK_RDEBS) $(PYTHON_SDK_API)
168+
SONIC_ONLINE_DEBS += $(MLNX_SDK_RDEBS) $(PYTHON_SDK_API)
170169
endif
171170

172171
mlnx-sdk-packages: $(addprefix $(DEBS_PATH)/, $(MLNX_SDK_RDEBS) $(PYTHON_SDK_API) $(SX_KERNEL))

0 commit comments

Comments
 (0)