[Platform] Updated Marvell x86 platform makefiles (#3606)

Signed-off-by: Antony Rheneus <arheneus@marvell.com>

platform/marvell/docker-syncd-mrvl.mk

@@ -1,21 +1,14 @@
 # docker image for mrvl syncd
 
-DOCKER_SYNCD_MRVL = docker-syncd-mrvl.gz
-$(DOCKER_SYNCD_MRVL)_PATH = $(PLATFORM_PATH)/docker-syncd-mrvl
-$(DOCKER_SYNCD_MRVL)_DEPENDS += $(SYNCD) $(MRVL_FPA) $(REDIS_TOOLS)
-ifeq ($(INSTALL_DEBUG_TOOLS), y)
-$(DOCKER_SYNCD_MRVL)_DEPENDS += $(SYNCD_DBG) \
+DOCKER_SYNCD_PLATFORM_CODE = mrvl
+include $(PLATFORM_PATH)/../template/docker-syncd-base.mk
+
+$(DOCKER_SYNCD_BASE)_DEPENDS += $(SYNCD)
+
+$(DOCKER_SYNCD_BASE)_DBG_DEPENDS += $(SYNCD_DBG) \
                                 $(LIBSWSSCOMMON_DBG) \
                                 $(LIBSAIMETADATA_DBG) \
                                 $(LIBSAIREDIS_DBG)
-endif
-$(DOCKER_SYNCD_MRVL)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE)
-SONIC_DOCKER_IMAGES += $(DOCKER_SYNCD_MRVL)
-ifneq ($(ENABLE_SYNCD_RPC),y)
-SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_SYNCD_MRVL)
-endif
 
-$(DOCKER_SYNCD_MRVL)_CONTAINER_NAME = syncd
-$(DOCKER_SYNCD_MRVL)_RUN_OPT += --net=host --privileged -t
-$(DOCKER_SYNCD_MRVL)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf
-$(DOCKER_SYNCD_MRVL)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
+$(DOCKER_SYNCD_BASE)_RUN_OPT += -v /host/warmboot:/var/warmboot
+$(DOCKER_SYNCD_BASE)_RUN_OPT += -v /var/run/docker-syncd:/var/run/sswsyncd

platform/marvell/docker-syncd-mrvl/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM docker-config-engine
+FROM docker-config-engine-stretch
 
 ARG docker_container_name
 RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf

platform/marvell/rules.mk

@@ -1,4 +1,3 @@
-include $(PLATFORM_PATH)/sdk.mk
 include $(PLATFORM_PATH)/sai.mk
 include $(PLATFORM_PATH)/docker-syncd-mrvl.mk
 include $(PLATFORM_PATH)/docker-syncd-mrvl-rpc.mk

platform/marvell/sai.mk

@@ -1,9 +1,6 @@
 # Marvell SAI
 
-export MRVL_SAI_VERSION = 1.2.1
-export MRVL_SAI_TAG = SONiC.201803
-export MRVL_SAI = mrvllibsai_$(MRVL_SAI_VERSION).deb
+export MRVL_SAI = mrvllibsai_amd64_1.4.1.deb
 
 $(MRVL_SAI)_SRC_PATH = $(PLATFORM_PATH)/sai
-$(MRVL_SAI)_DEPENDS += $(MRVL_FPA)
 SONIC_MAKE_DEBS += $(MRVL_SAI)

platform/marvell/sai/Makefile

@@ -2,7 +2,7 @@
 SHELL = /bin/bash
 .SHELLFLAGS += -e
 
-MRVL_SAI_URL = https://github.com/Marvell-switching/SAI-plugin/raw/$(MRVL_SAI_TAG)/sai_deb/$(MRVL_SAI)
+MRVL_SAI_URL = https://github.com/Marvell-switching/sonic-marvell-binaries/raw/master/amd64/sai-plugin/$(MRVL_SAI)
 
 $(addprefix $(DEST)/, $(MRVL_SAI)): $(DEST)/% :
 	# get deb package