From f99d27266943eecdfa2611b06c2f14b4df84e462 Mon Sep 17 00:00:00 2001 From: Alexander Allen Date: Wed, 29 Jun 2022 00:15:05 -0400 Subject: [PATCH] [Mellanox] Add arch folder to SDK binary location (#11278) - Why I did it This is for the eventual support of multiple architectures for the mellanox platform. - How I did it Change the location of the binaries in Switch-SDK-drivers so that the path specifies the target architecture in addition to the target distribution that the debians are built for. This is the most straightforward way to separate binaries built against different architectures and selectively target them for installation in the mellanox SONiC image. - How to verify it Build SONiC for mellanox and verify it compiles successfully. --- platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers | 2 +- platform/mellanox/sdk.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers b/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers index 9f94bdfc2c..e9fa9a8437 160000 --- a/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers +++ b/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers @@ -1 +1 @@ -Subproject commit 9f94bdfc2c7e3670b5b959138f9d61d40e7cc1ea +Subproject commit e9fa9a843702aa55b13c8eb01c7a1f188e4a16a9 diff --git a/platform/mellanox/sdk.mk b/platform/mellanox/sdk.mk index 0ecc6d6bf0..2412cf0ca7 100644 --- a/platform/mellanox/sdk.mk +++ b/platform/mellanox/sdk.mk @@ -15,7 +15,7 @@ # limitations under the License. # MLNX_SDK_BASE_PATH = $(PLATFORM_PATH)/sdk-src/sx-kernel/Switch-SDK-drivers/bin/ -MLNX_SDK_PKG_BASE_PATH = $(MLNX_SDK_BASE_PATH)/$(BLDENV)/ +MLNX_SDK_PKG_BASE_PATH = $(MLNX_SDK_BASE_PATH)/$(BLDENV)/$(CONFIGURED_ARCH)/ MLNX_SDK_VERSION = 4.5.2262 MLNX_SDK_ISSU_VERSION = 101