Renaming platform/marvell to platform/marvell-prestera

sonic-net · Aug 7, 2024 · af0c1c4 · af0c1c4
1 parent 1ea3254
commit af0c1c4
Show file tree

Hide file tree

Showing 136 changed files with 82 additions and 82 deletions.
diff --git a/.azure-pipelines/azure-pipelines-UpgrateVersion.yml b/.azure-pipelines/azure-pipelines-UpgrateVersion.yml
@@ -37,8 +37,8 @@ parameters:
   - centec
   - centec-arm64
   - generic
-  - marvell-armhf
-  - marvell-arm64
+  - marvell-prestera-armhf
+  - marvell-prestera-arm64
   - mellanox
   - pensando
   - nvidia-bluefield

diff --git a/.azure-pipelines/azure-pipelines-build.yml b/.azure-pipelines/azure-pipelines-build.yml
@@ -81,27 +81,27 @@ jobs:
           variables:
             dbg_image: yes
 
-        - name: innovium
+        - name: marvell-teralynx
           variables:
             dbg_image: yes
 
-        - name: marvell-armhf
+        - name: marvell-prestera-armhf
           ${{ if not(parameters.qemuOrCrossBuild) }}:
             pool: sonicbld-armhf
           timeoutInMinutes: 2880
           variables:
-            PLATFORM_NAME: marvell
+            PLATFORM_NAME: marvell-prestera
             PLATFORM_ARCH: armhf
 
-        - name: marvell-arm64
+        - name: marvell-prestera-arm64
           ${{ if not(parameters.qemuOrCrossBuild) }}:
             pool: sonicbld-arm64
           timeoutInMinutes: 2880
           variables:
-            PLATFORM_NAME: marvell
+            PLATFORM_NAME: marvell-prestera
             PLATFORM_ARCH: arm64
 
-        - name: marvell
+        - name: marvell-prestera
 
         - name: mellanox
           variables:

diff --git a/.azure-pipelines/azure-pipelines-image-template.yml b/.azure-pipelines/azure-pipelines-image-template.yml
@@ -30,7 +30,7 @@ jobs:
       - script: |
           [ -n "$OVERRIDE_BUILD_OPTIONS" ] && OVERRIDE_BUILD_OPTIONS=$(OVERRIDE_BUILD_OPTIONS)
           BUILD_OPTIONS="$(BUILD_OPTIONS) $OVERRIDE_BUILD_OPTIONS"
-          if [ -n "$(CACHE_MODE)" ] && echo $(PLATFORM_AZP) | grep -E -q "^(vs|broadcom|mellanox|marvell-armhf|marvell-arm64)$"; then
+          if [ -n "$(CACHE_MODE)" ] && echo $(PLATFORM_AZP) | grep -E -q "^(vs|broadcom|mellanox|marvell-prestera-armhf|marvell-prestera-arm64)$"; then
             CACHE_OPTIONS="SONIC_DPKG_CACHE_METHOD=$(CACHE_MODE) SONIC_DPKG_CACHE_SOURCE=/nfs/dpkg_cache/$(PLATFORM_AZP)"
             BUILD_OPTIONS="$BUILD_OPTIONS $CACHE_OPTIONS"
           fi

diff --git a/.azure-pipelines/build-template.yml b/.azure-pipelines/build-template.yml
@@ -4,7 +4,7 @@ parameters:
   values:
   - broadcom
   - centec-arm64
-  - marvell-armhf
+  - marvell-prestera-armhf
   - mellanox
   - vs
 
@@ -21,7 +21,7 @@ parameters:
   values:
   - brcm
   - centec-arm64
-  - marvell-armhf
+  - marvell-prestera-armhf
   - mlnx
   - vs
 

diff --git a/.azure-pipelines/official-build-cache.yml b/.azure-pipelines/official-build-cache.yml
@@ -45,9 +45,9 @@ stages:
           variables:
             docker_syncd_rpc_image: yes
             platform_rpc: mlnx
-        - name: marvell-armhf
+        - name: marvell-prestera-armhf
           pool: sonicbld-armhf
           timeoutInMinutes: 1200
           variables:
-            PLATFORM_NAME: marvell
+            PLATFORM_NAME: marvell-prestera
             PLATFORM_ARCH: armhf
diff --git a/.gitmodules b/.gitmodules
@@ -115,12 +115,12 @@
 [submodule "src/sonic-dash-api"]
 	path = src/sonic-dash-api
 	url = https://github.com/sonic-net/sonic-dash-api.git
-[submodule "platform/marvell/mrvl-prestera"]
-	path = platform/marvell/mrvl-prestera
-	url = https://github.com/Marvell-switching/mrvl-prestera.git
-[submodule "platform/marvell/sonic-platform-marvell"]
-	path = platform/marvell/sonic-platform-marvell
-	url = https://github.com/Marvell-switching/sonic-platform-arm64.git
 [submodule "platform/marvell-teralynx/sonic-platform-marvell-teralynx"]
 	path = platform/marvell-teralynx/sonic-platform-marvell-teralynx
 	url = https://github.com/Marvell-switching/sonic-platform-marvell.git
+[submodule "platform/marvell-prestera/mrvl-prestera"]
+	path = platform/marvell-prestera/mrvl-prestera
+	url = https://github.com/Marvell-switching/mrvl-prestera.git
+[submodule "platform/marvell-prestera/sonic-platform-marvell"]
+	path = platform/marvell-prestera/sonic-platform-marvell
+	url = https://github.com/Marvell-switching/sonic-platform-arm64.git
diff --git a/README.md b/README.md
@@ -3,10 +3,10 @@
 [![Broadcom](https://dev.azure.com/mssonic/build/_apis/build/status/broadcom/Azure.sonic-buildimage.official.broadcom?branchName=master&label=Broadcom)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=138&branchName=master)
 [![Centec](https://dev.azure.com/mssonic/build/_apis/build/status/centec/Azure.sonic-buildimage.official.centec?branchName=master&label=Centec)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=143&branchName=master)
 [![Centec(arm64)](https://dev.azure.com/mssonic/build/_apis/build/status/centec/Azure.sonic-buildimage.official.centec-arm64?branchName=master&label=Centec-arm64)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=140&branchName=master)
-[![Marvell-Teralynx](https://dev.azure.com/mssonic/build/_apis/build/status/marvell-teralynx/Azure.sonic-buildimage.official.innovium?branchName=master&label=Marvell-Teralynx)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=148&branchName=master)
+[![Marvell-Teralynx](https://dev.azure.com/mssonic/build/_apis/build/status/marvell-teralynx/Azure.sonic-buildimage.official.marvell-teralynx?branchName=master&label=Marvell-Teralynx)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=148&branchName=master)
 [![Mellanox](https://dev.azure.com/mssonic/build/_apis/build/status/mellanox/Azure.sonic-buildimage.official.mellanox?branchName=master&label=Mellanox)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=139&branchName=master)
-[![Marvell(armhf)](https://dev.azure.com/mssonic/build/_apis/build/status/marvell/Azure.sonic-buildimage.official.marvell-armhf?branchName=master&label=Marvell-armhf)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=141&branchName=master)
-[![Marvell(arm64)](https://dev.azure.com/mssonic/build/_apis/build/status/marvell/Azure.sonic-buildimage.official.marvell-arm64?branchName=master&label=Marvell-arm64)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=999&branchName=master)
+[![Marvell-Prestera(armhf)](https://dev.azure.com/mssonic/build/_apis/build/status/marvell-prestera/Azure.sonic-buildimage.official.marvell-prestera-armhf?branchName=master&label=Marvell-Prestera-armhf)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=141&branchName=master)
+[![Marvell-Prestera(arm64)](https://dev.azure.com/mssonic/build/_apis/build/status/marvell-prestera/Azure.sonic-buildimage.official.marvell-prestera-arm64?branchName=master&label=Marvell-prestera-arm64)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=999&branchName=master)
 [![Nephos](https://dev.azure.com/mssonic/build/_apis/build/status/nephos/Azure.sonic-buildimage.official.nephos?branchName=master&label=Nephos)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=149&branchName=master)
 [![Nvidia-Bluefield](https://dev.azure.com/mssonic/build/_apis/build/status/nvidia/Azure.sonic-buildimage.official.nvidia-bluefield?branchName=master&label=Nvidia-Bluefield)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=1665&branchName=master)
 [![Pensando](https://dev.azure.com/mssonic/build/_apis/build/status/pensando/Azure.sonic-buildimage.official.pensando?branchName=master&label=Pensando)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=1366&branchName=master)
@@ -195,7 +195,7 @@ The supported ASIC vendors are:
 
 * PLATFORM=barefoot
 * PLATFORM=broadcom
-* PLATFORM=marvell
+* PLATFORM=marvell-prestera
 * PLATFORM=mellanox
 * PLATFORM=cavium
 * PLATFORM=centec
@@ -222,8 +222,8 @@ make target/sonic-[ASIC_VENDER]-armhf.bin
 _example:_
 
 ```shell
-make configure PLATFORM=marvell PLATFORM_ARCH=armhf
-make target/sonic-marvell-armhf.bin
+make configure PLATFORM=marvell-prestera PLATFORM_ARCH=armhf
+make target/sonic-marvell-prestera-armhf.bin
 ```
 
 To build Arm32 bit for (ARMHF) Marvell platform on amd64 host for debian buster
@@ -233,11 +233,11 @@ using cross-compilation, run the following commands:
 # Execute make configure once to configure ASIC and ARCH for cross-compilation build
 
 NOJESSIE=1 NOSTRETCH=1 BLDENV=buster CROSS_BLDENV=1 \
-make configure PLATFORM=marvell PLATFORM_ARCH=armhf
+make configure PLATFORM=marvell-prestera PLATFORM_ARCH=armhf
 
 # Execute Arm32 build using cross-compilation environment
 
-NOJESSIE=1 NOSTRETCH=1 BLDENV=buster CROSS_BLDENV=1 make target/sonic-marvell-armhf.bin
+NOJESSIE=1 NOSTRETCH=1 BLDENV=buster CROSS_BLDENV=1 make target/sonic-marvell-prestera-armhf.bin
 ```
 
 Running the above Arm32 build using cross-compilation instead of qemu emulator
@@ -252,7 +252,7 @@ make configure PLATFORM=[ASIC_VENDOR] PLATFORM_ARCH=arm64
 
 # example:
 
-make configure PLATFORM=marvell PLATFORM_ARCH=arm64
+make configure PLATFORM=marvell-prestera PLATFORM_ARCH=arm64
 ```
 
  **NOTE**:

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -76,16 +76,16 @@ stages:
           dbg_image: yes
           docker_syncd_rpc_image: yes
           platform_rpc: mlnx
-      - name: marvell-arm64
+      - name: marvell-prestera-arm64
         pool: sonicbld-arm64
         variables:
-           PLATFORM_NAME: marvell
+           PLATFORM_NAME: marvell-prestera
            PLATFORM_ARCH: arm64
-      - name: marvell-armhf
+      - name: marvell-prestera-armhf
         pool: sonicbld-armhf
         timeoutInMinutes: 1200
         variables:
-          PLATFORM_NAME: marvell
+          PLATFORM_NAME: marvell-prestera
           PLATFORM_ARCH: armhf
           INCLUDE_RESTAPI: y
 

diff --git a/device/marvell/arm64-marvell_db98cx8580_16cd-r0/platform_asic b/device/marvell/arm64-marvell_db98cx8580_16cd-r0/platform_asic
@@ -1 +1 @@
-marvell
+marvell-prestera
diff --git a/device/marvell/arm64-marvell_db98cx8580_32cd-r0/platform_asic b/device/marvell/arm64-marvell_db98cx8580_32cd-r0/platform_asic
@@ -1 +1 @@
-marvell
+marvell-prestera
diff --git a/device/marvell/arm64-marvell_rd98DX35xx-r0/platform_asic b/device/marvell/arm64-marvell_rd98DX35xx-r0/platform_asic
@@ -1 +1 @@
-marvell
+marvell-prestera
diff --git a/device/marvell/arm64-marvell_rd98DX35xx_cn9131-r0/platform_asic b/device/marvell/arm64-marvell_rd98DX35xx_cn9131-r0/platform_asic
@@ -1 +1 @@
-marvell
+marvell-prestera
diff --git a/device/marvell/armhf-marvell_et6448m_52x-r0/platform_asic b/device/marvell/armhf-marvell_et6448m_52x-r0/platform_asic
@@ -1 +1 @@
-marvell
+marvell-prestera
diff --git a/device/marvell/x86_64-marvell_db98cx8514_10cc-r0/platform_asic b/device/marvell/x86_64-marvell_db98cx8514_10cc-r0/platform_asic
@@ -1 +1 @@
-marvell
+marvell-prestera
diff --git a/device/marvell/x86_64-marvell_db98cx8540_16cd-r0/platform_asic b/device/marvell/x86_64-marvell_db98cx8540_16cd-r0/platform_asic
@@ -1 +1 @@
-marvell
+marvell-prestera
diff --git a/device/marvell/x86_64-marvell_db98cx8580_16cd-r0/platform_asic b/device/marvell/x86_64-marvell_db98cx8580_16cd-r0/platform_asic
@@ -1 +1 @@
-marvell
+marvell-prestera
diff --git a/device/marvell/x86_64-marvell_db98cx8580_32cd-r0/platform_asic b/device/marvell/x86_64-marvell_db98cx8580_32cd-r0/platform_asic
@@ -1 +1 @@
-marvell
+marvell-prestera
diff --git a/device/marvell/x86_64-marvell_rd98DX35xx-r0/platform_asic b/device/marvell/x86_64-marvell_rd98DX35xx-r0/platform_asic
@@ -1 +1 @@
-marvell
+marvell-prestera
diff --git a/device/marvell/x86_64-marvell_slm5401_54x-r0/platform_asic b/device/marvell/x86_64-marvell_slm5401_54x-r0/platform_asic
@@ -1 +1 @@
-marvell
+marvell-prestera
diff --git a/device/nokia/arm64-nokia_ixs7215_52xb-r0/platform_asic b/device/nokia/arm64-nokia_ixs7215_52xb-r0/platform_asic
@@ -1 +1 @@
-marvell
+marvell-prestera
diff --git a/device/nokia/armhf-nokia_ixs7215_52x-r0/platform_asic b/device/nokia/armhf-nokia_ixs7215_52x-r0/platform_asic
@@ -1 +1 @@
-marvell
+marvell-prestera
diff --git a/dockers/docker-pde/syncd_init_common.sh b/dockers/docker-pde/syncd_init_common.sh
@@ -165,7 +165,7 @@ config_syncd_cavium()
     done
 }
 
-config_syncd_marvell()
+config_syncd_marvell_prestera()
 {
     CMD_ARGS+=" -p $HWSKU_DIR/sai.profile"
 
@@ -228,8 +228,8 @@ config_syncd()
         config_syncd_cavium
     elif [ "$SONIC_ASIC_TYPE" == "centec" ]; then
         config_syncd_centec
-    elif [ "$SONIC_ASIC_TYPE" == "marvell" ]; then
-        config_syncd_marvell
+    elif [ "$SONIC_ASIC_TYPE" == "marvell-prestera" ]; then
+        config_syncd_marvell_prestera
      elif [ "$SONIC_ASIC_TYPE" == "barefoot" ]; then
          config_syncd_barefoot
     elif [ "$SONIC_ASIC_TYPE" == "nephos" ]; then

diff --git a/files/build_templates/qos_config.j2 b/files/build_templates/qos_config.j2
@@ -77,7 +77,7 @@
 {% endif %}
 {%- endfor %}
 
-{%- set pfc_to_pg_map_supported_asics = ['mellanox', 'barefoot', 'marvell'] -%}
+{%- set pfc_to_pg_map_supported_asics = ['mellanox', 'barefoot', 'marvell-prestera'] -%}
 {%- set backend_device_types = ['BackEndToRRouter', 'BackEndLeafRouter'] -%}
 {%- set apollo_resource_types = ['DL-NPU-Apollo'] -%}
 

diff --git a/platform/marvell/docker-saiserver-mrvl.dep → ...estera/docker-saiserver-mrvl-prestera.dep b/platform/marvell/docker-saiserver-mrvl.dep → ...estera/docker-saiserver-mrvl-prestera.dep
@@ -1,5 +1,5 @@
 DPATH       := $($(DOCKER_SAISERVER_MRVL)_PATH)
-DEP_FILES   := $(SONIC_COMMON_FILES_LIST) $(PLATFORM_PATH)/docker-saiserver-mrvl.mk $(PLATFORM_PATH)/docker-saiserver-mrvl.dep
+DEP_FILES   := $(SONIC_COMMON_FILES_LIST) $(PLATFORM_PATH)/docker-saiserver-mrvl-prestera.mk $(PLATFORM_PATH)/docker-saiserver-mrvl-prestera.dep
 DEP_FILES   += $(SONIC_COMMON_BASE_FILES_LIST)
 DEP_FILES   += $(shell git ls-files $(DPATH))
 

diff --git a/platform/marvell/docker-saiserver-mrvl.mk → ...restera/docker-saiserver-mrvl-prestera.mk b/platform/marvell/docker-saiserver-mrvl.mk → ...restera/docker-saiserver-mrvl-prestera.mk
@@ -1,7 +1,7 @@
 # docker image for mrvl saiserver
 
-DOCKER_SAISERVER_MRVL = docker-saiserver$(SAITHRIFT_VER)-mrvl.gz
-$(DOCKER_SAISERVER_MRVL)_PATH = $(PLATFORM_PATH)/docker-saiserver-mrvl
+DOCKER_SAISERVER_MRVL = docker-saiserver$(SAITHRIFT_VER)-mrvl-prestera.gz
+$(DOCKER_SAISERVER_MRVL)_PATH = $(PLATFORM_PATH)/docker-saiserver-mrvl-prestera
 $(DOCKER_SAISERVER_MRVL)_DEPENDS += $(SAISERVER)
 $(DOCKER_SAISERVER_MRVL)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_BOOKWORM)
 SONIC_DOCKER_IMAGES += $(DOCKER_SAISERVER_MRVL)

diff --git a/...rvell/docker-saiserver-mrvl/Dockerfile.j2 → ...ker-saiserver-mrvl-prestera/Dockerfile.j2 b/...rvell/docker-saiserver-mrvl/Dockerfile.j2 → ...ker-saiserver-mrvl-prestera/Dockerfile.j2
diff --git a/...rm/marvell/docker-saiserver-mrvl/start.sh → ...a/docker-saiserver-mrvl-prestera/start.sh b/...rm/marvell/docker-saiserver-mrvl/start.sh → ...a/docker-saiserver-mrvl-prestera/start.sh
diff --git a/...ll/docker-saiserver-mrvl/supervisord.conf → ...-saiserver-mrvl-prestera/supervisord.conf b/...ll/docker-saiserver-mrvl/supervisord.conf → ...-saiserver-mrvl-prestera/supervisord.conf
diff --git a/platform/marvell/docker-syncd-mrvl-rpc.dep → ...estera/docker-syncd-mrvl-prestera-rpc.dep b/platform/marvell/docker-syncd-mrvl-rpc.dep → ...estera/docker-syncd-mrvl-prestera-rpc.dep
@@ -1,5 +1,5 @@
 DPATH       := $($(DOCKER_SYNCD_MRVL_RPC)_PATH)
-DEP_FILES   := $(SONIC_COMMON_FILES_LIST) $(PLATFORM_PATH)/docker-syncd-mrvl-rpc.mk $(PLATFORM_PATH)/docker-syncd-mrvl-rpc.dep
+DEP_FILES   := $(SONIC_COMMON_FILES_LIST) $(PLATFORM_PATH)/docker-syncd-mrvl-prestera-rpc.mk $(PLATFORM_PATH)/docker-syncd-mrvl-prestera-rpc.dep
 DEP_FILES   += $(SONIC_COMMON_BASE_FILES_LIST)
 DEP_FILES   += $(shell git ls-files $(DPATH))
 

diff --git a/platform/marvell/docker-syncd-mrvl-rpc.mk → ...restera/docker-syncd-mrvl-prestera-rpc.mk b/platform/marvell/docker-syncd-mrvl-rpc.mk → ...restera/docker-syncd-mrvl-prestera-rpc.mk
@@ -1,7 +1,7 @@
 # docker image for mrvl syncd with rpc
 
-DOCKER_SYNCD_MRVL_RPC = docker-syncd-mrvl-rpc.gz
-$(DOCKER_SYNCD_MRVL_RPC)_PATH = $(PLATFORM_PATH)/docker-syncd-mrvl-rpc
+DOCKER_SYNCD_MRVL_RPC = docker-syncd-mrvl-prestera-rpc.gz
+$(DOCKER_SYNCD_MRVL_RPC)_PATH = $(PLATFORM_PATH)/docker-syncd-mrvl-prestera-rpc
 $(DOCKER_SYNCD_MRVL_RPC)_DEPENDS += $(SYNCD_RPC)
 $(DOCKER_SYNCD_MRVL_RPC)_PYTHON_WHEELS += $(PTF_PY3)
 $(DOCKER_SYNCD_MRVL_RPC)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT)
@@ -20,7 +20,7 @@ endif
 $(DOCKER_SYNCD_MRVL_RPC)_CONTAINER_NAME = syncd
 $(DOCKER_SYNCD_MRVL_RPC)_VERSION = 1.0.0+rpc
 $(DOCKER_SYNCD_MRVL_RPC)_PACKAGE_NAME = syncd
-$(DOCKER_SYNCD_MRVL_RPC)_MACHINE = marvell
+$(DOCKER_SYNCD_MRVL_RPC)_MACHINE = marvell-prestera
 $(DOCKER_SYNCD_MRVL_RPC)_RUN_OPT += --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

diff --git a/...rvell/docker-syncd-mrvl-rpc/99-syncd.conf → ...ker-syncd-mrvl-prestera-rpc/99-syncd.conf b/...rvell/docker-syncd-mrvl-rpc/99-syncd.conf → ...ker-syncd-mrvl-prestera-rpc/99-syncd.conf
diff --git a/...rvell/docker-syncd-mrvl-rpc/Dockerfile.j2 → ...ker-syncd-mrvl-prestera-rpc/Dockerfile.j2 b/...rvell/docker-syncd-mrvl-rpc/Dockerfile.j2 → ...ker-syncd-mrvl-prestera-rpc/Dockerfile.j2
@@ -1,18 +1,18 @@
-FROM docker-syncd-mrvl-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
+FROM docker-syncd-mrvl-prestera-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
 {% from "dockers/dockerfile-macros.j2" import install_python_wheels, copy_files %}
 
 ## Make apt-get non-interactive
 ENV DEBIAN_FRONTEND=noninteractive
 
 COPY \
-{% for deb in docker_syncd_mrvl_rpc_debs.split(' ') -%}
+{% for deb in docker_syncd_mrvl_prestera_rpc_debs.split(' ') -%}
 debs/{{ deb }}{{' '}}
 {%- endfor -%}
 debs/
 
 RUN apt-get purge -y syncd
 
-## Pre-install the fundamental packages
+## Pre-install the fundamental packages ##
 RUN apt-get update \
  && apt-get -y install  \
     net-tools           \
@@ -31,7 +31,7 @@ RUN apt-get update \
     libnanomsg-dev
 
 RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; } ; \
-{% for deb in docker_syncd_mrvl_rpc_debs.split(' ') -%}
+{% for deb in docker_syncd_mrvl_prestera_rpc_debs.split(' ') -%}
 dpkg_apt debs/{{ deb }}{{'; '}}
 {%- endfor %}
 
@@ -43,12 +43,12 @@ RUN pip3 install cffi    \
 
 COPY ["ptf_nn_agent.conf", "/etc/supervisor/conf.d/"]
 
-{% if docker_syncd_mrvl_rpc_whls.strip() -%}
+{% if docker_syncd_mrvl_prestera_rpc_whls.strip() -%}
 # Copy locally-built Python wheel dependencies
-{{ copy_files("python-wheels/", docker_syncd_mrvl_rpc_whls.split(' '), "/python-wheels/") }}
+{{ copy_files("python-wheels/", docker_syncd_mrvl_prestera_rpc_whls.split(' '), "/python-wheels/") }}
 
 # Install locally-built Python wheel dependencies
-{{ install_python_wheels(docker_syncd_mrvl_rpc_whls.split(' ')) }}
+{{ install_python_wheels(docker_syncd_mrvl_prestera_rpc_whls.split(' ')) }}
 {% endif %}
 
 ## Clean up

diff --git a/...l/docker-syncd-mrvl-rpc/ptf_nn_agent.conf → ...syncd-mrvl-prestera-rpc/ptf_nn_agent.conf b/...l/docker-syncd-mrvl-rpc/ptf_nn_agent.conf → ...syncd-mrvl-prestera-rpc/ptf_nn_agent.conf
diff --git a/platform/marvell/docker-syncd-mrvl.dep → ...l-prestera/docker-syncd-mrvl-prestera.dep b/platform/marvell/docker-syncd-mrvl.dep → ...l-prestera/docker-syncd-mrvl-prestera.dep
@@ -1,5 +1,5 @@
 DPATH       := $($(DOCKER_SYNCD_BASE)_PATH)
-DEP_FILES   := $(SONIC_COMMON_FILES_LIST) $(PLATFORM_PATH)/docker-syncd-mrvl.mk $(PLATFORM_PATH)/docker-syncd-mrvl.dep $(PLATFORM_PATH)/sai.mk
+DEP_FILES   := $(SONIC_COMMON_FILES_LIST) $(PLATFORM_PATH)/docker-syncd-mrvl-prestera.mk $(PLATFORM_PATH)/docker-syncd-mrvl-prestera.dep $(PLATFORM_PATH)/sai.mk
 DEP_FILES   += $(SONIC_COMMON_BASE_FILES_LIST)
 DEP_FILES   += $(shell git ls-files $(DPATH))
 

diff --git a/platform/marvell/docker-syncd-mrvl.mk → ...ll-prestera/docker-syncd-mrvl-prestera.mk b/platform/marvell/docker-syncd-mrvl.mk → ...ll-prestera/docker-syncd-mrvl-prestera.mk
@@ -1,6 +1,6 @@
 # docker image for mrvl syncd
 
-DOCKER_SYNCD_PLATFORM_CODE = mrvl
+DOCKER_SYNCD_PLATFORM_CODE = mrvl-prestera
 include $(PLATFORM_PATH)/../template/docker-syncd-bookworm.mk
 
 $(DOCKER_SYNCD_BASE)_DEPENDS += $(SYNCD)
@@ -13,6 +13,6 @@ $(DOCKER_SYNCD_BASE)_DBG_DEPENDS += $(SYNCD_DBG) \
 
 $(DOCKER_SYNCD_BASE)_VERSION = 1.0.0
 $(DOCKER_SYNCD_BASE)_PACKAGE_NAME = syncd
-$(DOCKER_SYNCD_BASE)_MACHINE = marvell
+$(DOCKER_SYNCD_BASE)_MACHINE = marvell-prestera
 
 $(DOCKER_SYNCD_BASE)_RUN_OPT += -v /host/warmboot:/var/warmboot
diff --git a/...m/marvell/docker-syncd-mrvl/Dockerfile.j2 → .../docker-syncd-mrvl-prestera/Dockerfile.j2 b/...m/marvell/docker-syncd-mrvl/Dockerfile.j2 → .../docker-syncd-mrvl-prestera/Dockerfile.j2
@@ -9,7 +9,7 @@ ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update
 
 COPY \
-{% for deb in docker_syncd_mrvl_debs.split(' ') -%}
+{% for deb in docker_syncd_mrvl_prestera_debs.split(' ') -%}
 debs/{{ deb }}{{' '}}
 {%- endfor -%}
 debs/
@@ -22,7 +22,7 @@ RUN apt-get update \
 RUN apt-get -y install libpcap-dev libxml2-dev python3-dev swig
 
 RUN dpkg -i \
-{% for deb in docker_syncd_mrvl_debs.split(' ') -%}
+{% for deb in docker_syncd_mrvl_prestera_debs.split(' ') -%}
 debs/{{ deb }}{{' '}}
 {%- endfor %}
 

diff --git a/...vell/docker-syncd-mrvl/critical_processes → ...er-syncd-mrvl-prestera/critical_processes b/...vell/docker-syncd-mrvl/critical_processes → ...er-syncd-mrvl-prestera/critical_processes
diff --git a/...arvell/docker-syncd-mrvl/supervisord.conf → ...cker-syncd-mrvl-prestera/supervisord.conf b/...arvell/docker-syncd-mrvl/supervisord.conf → ...cker-syncd-mrvl-prestera/supervisord.conf
diff --git a/platform/marvell/docker-syncd-mrvl/syncd.sh → ...stera/docker-syncd-mrvl-prestera/syncd.sh b/platform/marvell/docker-syncd-mrvl/syncd.sh → ...stera/docker-syncd-mrvl-prestera/syncd.sh
diff --git a/platform/marvell/libsaithrift-dev.dep → ...orm/marvell-prestera/libsaithrift-dev.dep b/platform/marvell/libsaithrift-dev.dep → ...orm/marvell-prestera/libsaithrift-dev.dep
diff --git a/platform/marvell/libsaithrift-dev.mk → ...form/marvell-prestera/libsaithrift-dev.mk b/platform/marvell/libsaithrift-dev.mk → ...form/marvell-prestera/libsaithrift-dev.mk
diff --git a/platform/marvell-prestera/mrvl-prestera b/platform/marvell-prestera/mrvl-prestera
diff --git a/platform/marvell/mrvl-prestera.dep → platform/marvell-prestera/mrvl-prestera.dep b/platform/marvell/mrvl-prestera.dep → platform/marvell-prestera/mrvl-prestera.dep
diff --git a/platform/marvell/mrvl-prestera.mk → platform/marvell-prestera/mrvl-prestera.mk b/platform/marvell/mrvl-prestera.mk → platform/marvell-prestera/mrvl-prestera.mk
diff --git a/platform/marvell/one-image.dep → platform/marvell-prestera/one-image.dep b/platform/marvell/one-image.dep → platform/marvell-prestera/one-image.dep
diff --git a/platform/marvell/one-image.mk → platform/marvell-prestera/one-image.mk b/platform/marvell/one-image.mk → platform/marvell-prestera/one-image.mk
@@ -1,11 +1,11 @@
-# sonic marvell one image installer
+# sonic marvell-prestera one image installer
 
 ifeq ($(CONFIGURED_ARCH),$(filter $(CONFIGURED_ARCH),arm64 armhf))
-SONIC_ONE_IMAGE = sonic-marvell-$(CONFIGURED_ARCH).bin
+SONIC_ONE_IMAGE = sonic-marvell-prestera-$(CONFIGURED_ARCH).bin
 else
-SONIC_ONE_IMAGE = sonic-marvell.bin
+SONIC_ONE_IMAGE = sonic-marvell-prestera.bin
 endif
-$(SONIC_ONE_IMAGE)_MACHINE = marvell
+$(SONIC_ONE_IMAGE)_MACHINE = marvell-prestera
 $(SONIC_ONE_IMAGE)_IMAGE_TYPE = onie
 $(SONIC_ONE_IMAGE)_INSTALLS += $(SYSTEMD_SONIC_GENERATOR)
 ifeq ($(CONFIGURED_ARCH),arm64)

diff --git a/platform/marvell/onie-image-arm64.conf → ...rm/marvell-prestera/onie-image-arm64.conf b/platform/marvell/onie-image-arm64.conf → ...rm/marvell-prestera/onie-image-arm64.conf
diff --git a/platform/marvell/platform-marvell.dep → ...orm/marvell-prestera/platform-marvell.dep b/platform/marvell/platform-marvell.dep → ...orm/marvell-prestera/platform-marvell.dep
diff --git a/platform/marvell/platform-marvell.mk → ...form/marvell-prestera/platform-marvell.mk b/platform/marvell/platform-marvell.mk → ...form/marvell-prestera/platform-marvell.mk
diff --git a/platform/marvell/platform-nokia.dep → platform/marvell-prestera/platform-nokia.dep b/platform/marvell/platform-nokia.dep → platform/marvell-prestera/platform-nokia.dep
diff --git a/platform/marvell/platform-nokia.mk → platform/marvell-prestera/platform-nokia.mk b/platform/marvell/platform-nokia.mk → platform/marvell-prestera/platform-nokia.mk
diff --git a/platform/marvell/platform_arm64.conf → ...form/marvell-prestera/platform_arm64.conf b/platform/marvell/platform_arm64.conf → ...form/marvell-prestera/platform_arm64.conf
diff --git a/platform/marvell/platform_armhf.conf → ...form/marvell-prestera/platform_armhf.conf b/platform/marvell/platform_armhf.conf → ...form/marvell-prestera/platform_armhf.conf