From 71592fc86669bfcf54a6459e2a0b4ed7f2df7a75 Mon Sep 17 00:00:00 2001 From: "arheneus@marvell.com" <51254330+antony-rheneus@users.noreply.github.com> Date: Tue, 25 Feb 2020 23:14:45 +0530 Subject: [PATCH] [Platform] Marvell Makefile updates/cleanup (#4168) Signed-off-by: Antony Rheneus --- platform/marvell-arm64/sai.mk | 2 -- platform/marvell-armhf/sai.mk | 2 -- platform/marvell/docker-syncd-mrvl-rpc.mk | 4 +++- platform/marvell/sai.mk | 3 ++- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/platform/marvell-arm64/sai.mk b/platform/marvell-arm64/sai.mk index d5f044c6cb..ebdd7030a3 100644 --- a/platform/marvell-arm64/sai.mk +++ b/platform/marvell-arm64/sai.mk @@ -1,9 +1,7 @@ # Marvell SAI export MRVL_SAI_VERSION = 1.5.1 -export MRVL_SAI_TAG = SONiC.201904 export MRVL_SAI = mrvllibsai_$(PLATFORM_ARCH)_$(MRVL_SAI_VERSION).deb $(MRVL_SAI)_SRC_PATH = $(PLATFORM_PATH)/sai -#$(MRVL_SAI)_DEPENDS += $(MRVL_FPA) SONIC_MAKE_DEBS += $(MRVL_SAI) diff --git a/platform/marvell-armhf/sai.mk b/platform/marvell-armhf/sai.mk index d5f044c6cb..ebdd7030a3 100644 --- a/platform/marvell-armhf/sai.mk +++ b/platform/marvell-armhf/sai.mk @@ -1,9 +1,7 @@ # Marvell SAI export MRVL_SAI_VERSION = 1.5.1 -export MRVL_SAI_TAG = SONiC.201904 export MRVL_SAI = mrvllibsai_$(PLATFORM_ARCH)_$(MRVL_SAI_VERSION).deb $(MRVL_SAI)_SRC_PATH = $(PLATFORM_PATH)/sai -#$(MRVL_SAI)_DEPENDS += $(MRVL_FPA) SONIC_MAKE_DEBS += $(MRVL_SAI) diff --git a/platform/marvell/docker-syncd-mrvl-rpc.mk b/platform/marvell/docker-syncd-mrvl-rpc.mk index 5b1968bde3..0e1b65f2fd 100644 --- a/platform/marvell/docker-syncd-mrvl-rpc.mk +++ b/platform/marvell/docker-syncd-mrvl-rpc.mk @@ -10,8 +10,9 @@ $(DOCKER_SYNCD_MRVL_RPC)_DEPENDS += $(SYNCD_RPC_DBG) \ $(LIBSAIMETADATA_DBG) \ $(LIBSAIREDIS_DBG) endif -$(DOCKER_SYNCD_MRVL_RPC)_LOAD_DOCKERS += $(DOCKER_SYNCD_MRVL) +$(DOCKER_SYNCD_MRVL_RPC)_LOAD_DOCKERS += $(DOCKER_SYNCD_BASE) SONIC_DOCKER_IMAGES += $(DOCKER_SYNCD_MRVL_RPC) +SONIC_STRETCH_DOCKERS += $(DOCKER_SYNCD_MRVL_RPC) ifeq ($(ENABLE_SYNCD_RPC),y) SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_SYNCD_MRVL_RPC) endif @@ -20,3 +21,4 @@ $(DOCKER_SYNCD_MRVL_RPC)_CONTAINER_NAME = syncd $(DOCKER_SYNCD_MRVL_RPC)_RUN_OPT += --net=host --privileged -t $(DOCKER_SYNCD_MRVL_RPC)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf $(DOCKER_SYNCD_MRVL_RPC)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro +$(DOCKER_SYNCD_MRVL_RPC)_RUN_OPT += -v /host/warmboot:/var/warmboot diff --git a/platform/marvell/sai.mk b/platform/marvell/sai.mk index 7953ad5dd8..5531881000 100644 --- a/platform/marvell/sai.mk +++ b/platform/marvell/sai.mk @@ -1,6 +1,7 @@ # Marvell SAI -export MRVL_SAI = mrvllibsai_amd64_1.4.1.deb +export MRVL_SAI_VERSION = 1.5.1 +export MRVL_SAI = mrvllibsai_amd64_$(MRVL_SAI_VERSION).deb $(MRVL_SAI)_SRC_PATH = $(PLATFORM_PATH)/sai SONIC_MAKE_DEBS += $(MRVL_SAI)