Skip to content

Commit 18bc044

Browse files
authored
Remove support to Mellanox SPC4 ASIC (sonic-net#13932) (sonic-net#13957)
1 parent 310827c commit 18bc044

File tree

4 files changed

+1
-18
lines changed

4 files changed

+1
-18
lines changed

files/build_templates/sonic_debian_extension.j2

-1
Original file line numberDiff line numberDiff line change
@@ -927,7 +927,6 @@ sudo mkdir -p $FILESYSTEM_ROOT/etc/mlnx/
927927
sudo cp $files_path/$MLNX_SPC_FW_FILE $FILESYSTEM_ROOT/etc/mlnx/fw-SPC.mfa
928928
sudo cp $files_path/$MLNX_SPC2_FW_FILE $FILESYSTEM_ROOT/etc/mlnx/fw-SPC2.mfa
929929
sudo cp $files_path/$MLNX_SPC3_FW_FILE $FILESYSTEM_ROOT/etc/mlnx/fw-SPC3.mfa
930-
sudo cp $files_path/$MLNX_SPC4_FW_FILE $FILESYSTEM_ROOT/etc/mlnx/fw-SPC4.mfa
931930
sudo cp $files_path/$ISSU_VERSION_FILE $FILESYSTEM_ROOT/etc/mlnx/issu-version
932931
sudo cp $files_path/$MLNX_FFB_SCRIPT $FILESYSTEM_ROOT/usr/bin/mlnx-ffb.sh
933932
sudo cp $files_path/$MLNX_ONIE_FW_UPDATE $FILESYSTEM_ROOT/usr/bin/$MLNX_ONIE_FW_UPDATE

platform/mellanox/fw.dep

-4
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,3 @@ $(MLNX_SPC2_FW_FILE)_DEP_FILES := $(DEP_FILES)
1414
$(MLNX_SPC3_FW_FILE)_CACHE_MODE := GIT_CONTENT_SHA
1515
$(MLNX_SPC3_FW_FILE)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)
1616
$(MLNX_SPC3_FW_FILE)_DEP_FILES := $(DEP_FILES)
17-
18-
$(MLNX_SPC4_FW_FILE)_CACHE_MODE := GIT_CONTENT_SHA
19-
$(MLNX_SPC4_FW_FILE)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)
20-
$(MLNX_SPC4_FW_FILE)_DEP_FILES := $(DEP_FILES)

platform/mellanox/fw.mk

+1-7
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,7 @@ MLNX_SPC3_FW_FILE = fw-SPC3-rel-$(subst .,_,$(MLNX_SPC3_FW_VERSION))-EVB.mfa
4444
$(MLNX_SPC3_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
4545
$(MLNX_SPC3_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC3_FW_FILE)
4646

47-
MLNX_SPC4_FW_VERSION = 34.2010.4150
48-
MLNX_SPC4_FW_FILE = fw-SPC4-rel-$(subst .,_,$(MLNX_SPC4_FW_VERSION))-EVB.mfa
49-
$(MLNX_SPC4_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
50-
$(MLNX_SPC4_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC4_FW_FILE)
51-
52-
MLNX_FW_FILES = $(MLNX_SPC_FW_FILE) $(MLNX_SPC2_FW_FILE) $(MLNX_SPC3_FW_FILE) $(MLNX_SPC4_FW_FILE)
47+
MLNX_FW_FILES = $(MLNX_SPC_FW_FILE) $(MLNX_SPC2_FW_FILE) $(MLNX_SPC3_FW_FILE)
5348

5449
ifeq ($(FW_FROM_URL),n)
5550
SONIC_COPY_FILES += $(MLNX_FW_FILES)
@@ -62,4 +57,3 @@ MLNX_FILES += $(MLNX_FW_FILES)
6257
export MLNX_SPC_FW_FILE
6358
export MLNX_SPC2_FW_FILE
6459
export MLNX_SPC3_FW_FILE
65-
export MLNX_SPC4_FW_FILE

platform/mellanox/mlnx-fw-upgrade.j2

-6
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,13 @@ declare -r LIST_CONTENT_FILE="/tmp/mlxfwmanager-list-content.log"
2828
declare -r SPC1_ASIC="spc1"
2929
declare -r SPC2_ASIC="spc2"
3030
declare -r SPC3_ASIC="spc3"
31-
declare -r SPC4_ASIC="spc4"
3231
declare -r UNKN_ASIC="unknown"
3332
declare -r UNKN_MST="unknown"
3433

3534
declare -rA FW_FILE_MAP=( \
3635
[$SPC1_ASIC]="/etc/mlnx/fw-SPC.mfa" \
3736
[$SPC2_ASIC]="/etc/mlnx/fw-SPC2.mfa" \
3837
[$SPC3_ASIC]="/etc/mlnx/fw-SPC3.mfa" \
39-
[$SPC4_ASIC]="/etc/mlnx/fw-SPC4.mfa" \
4038
)
4139

4240
IMAGE_UPGRADE="${NO_PARAM}"
@@ -162,7 +160,6 @@ function GetAsicType() {
162160
local -r SPC1_PRODUCT_ID="cb84"
163161
local -r SPC2_PRODUCT_ID="cf6c"
164162
local -r SPC3_PRODUCT_ID="cf70"
165-
local -r SPC4_PRODUCT_ID="cf80"
166163

167164
if lspci -n | grep "${VENDOR_ID}:${SPC1_PRODUCT_ID}" &>/dev/null; then
168165
echo "${SPC1_ASIC}"
@@ -173,9 +170,6 @@ function GetAsicType() {
173170
elif lspci -n | grep "${VENDOR_ID}:${SPC3_PRODUCT_ID}" &>/dev/null; then
174171
echo "${SPC3_ASIC}"
175172
exit "${EXIT_SUCCESS}"
176-
elif lspci -n | grep "${VENDOR_ID}:${SPC4_PRODUCT_ID}" &>/dev/null; then
177-
echo "${SPC4_ASIC}"
178-
exit "${EXIT_SUCCESS}"
179173
fi
180174

181175
echo "${UNKN_ASIC}"

0 commit comments

Comments
 (0)