Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

platform/marvell renaming to platform/marvell-prestera #20860

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

platform/marvell renaming to platform/marvell-prestera #20860

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d6c9ab
Rename platform/innovium to platform/marvell-teralynx
krismarvell Jun 24, 2024
c9a8974
Renaming platform/marvell to platform/marvell-prestera
krismarvell Aug 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions .azure-pipelines/azure-pipelines-UpgrateVersion.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ parameters:
- centec
- centec-arm64
- generic
- marvell-armhf
- marvell-arm64
- marvell-prestera-armhf
- marvell-prestera-arm64
- mellanox
- pensando
- nvidia-bluefield
Expand Down
12 changes: 6 additions & 6 deletions .azure-pipelines/azure-pipelines-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .azure-pipelines/azure-pipelines-image-template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .azure-pipelines/build-template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ parameters:
values:
- broadcom
- centec-arm64
- marvell-armhf
- marvell-prestera-armhf
- mellanox
- vs

Expand All @@ -21,7 +21,7 @@ parameters:
values:
- brcm
- centec-arm64
- marvell-armhf
- marvell-prestera-armhf
- mlnx
- vs

Expand Down
4 changes: 2 additions & 2 deletions .azure-pipelines/official-build-cache.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
14 changes: 7 additions & 7 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,12 +118,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
[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/sonic-platform-marvell"]
path = platform/marvell/sonic-platform-marvell
[submodule "platform/marvell-prestera/sonic-platform-marvell"]
path = platform/marvell-prestera/sonic-platform-marvell
url = https://github.com/Marvell-switching/sonic-platform-arm64.git
[submodule "platform/innovium/sonic-platform-marvell"]
path = platform/innovium/sonic-platform-marvell
url = https://github.com/Marvell-switching/sonic-platform-marvell
28 changes: 15 additions & 13 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
[![Innovium](https://dev.azure.com/mssonic/build/_apis/build/status/innovium/Azure.sonic-buildimage.official.innovium?branchName=master&label=Innovium)](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)
Expand Down Expand Up @@ -209,13 +209,13 @@ The supported ASIC vendors are:

* PLATFORM=barefoot
* PLATFORM=broadcom
* PLATFORM=marvell
* PLATFORM=marvell-prestera
* PLATFORM=marvell-teralynx
* PLATFORM=mellanox
* PLATFORM=cavium
* PLATFORM=centec
* PLATFORM=nephos
* PLATFORM=nvidia-bluefield
* PLATFORM=innovium
* PLATFORM=vs

## Usage for ARM Architecture
Expand All @@ -236,22 +236,22 @@ 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
To build Arm32 bit for (ARMHF) Marvell Prestera platform on amd64 host for debian buster
using cross-compilation, run the following commands:

```shell
# 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
Expand All @@ -266,7 +266,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**:
Expand Down Expand Up @@ -373,8 +373,10 @@ on the SAI version for each SONiC release.
and Mellanox switch ASIC (gzip tar archive)
* docker-syncd-nephos.gz: docker image for the daemon to sync database
and Nephos switch ASIC (gzip tar archive)
* docker-syncd-invm.gz: docker image for the daemon to sync database
and Innovium switch ASIC (gzip tar archive)
* docker-syncd-mrvl-teralynx.gz: docker image for the daemon to sync database
and Marvell-Teralynx switch ASIC (gzip tar archive)
* docker-syncd-mrvl-prestera.gz: docker image for the daemon to sync database
and Marvell-Prestera switch ASIC (gzip tar archive)
* docker-sonic-p4.gz: docker image for all-in-one for p4 software switch
(gzip tar archive)
* docker-sonic-vs.gz: docker image for all-in-one for software virtual switch
Expand Down
8 changes: 4 additions & 4 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion device/celestica/x86_64-cel_midstone-r0/platform_asic
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
innovium
marvell-teralynx
2 changes: 1 addition & 1 deletion device/delta/x86_64-delta_agc032-r0/platform_asic
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
innovium
marvell-teralynx
2 changes: 1 addition & 1 deletion device/marvell/arm64-marvell_db98cx8580_16cd-r0/platform_asic
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
marvell
marvell-prestera
2 changes: 1 addition & 1 deletion device/marvell/arm64-marvell_db98cx8580_32cd-r0/platform_asic
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
marvell
marvell-prestera
2 changes: 1 addition & 1 deletion device/marvell/arm64-marvell_rd98DX35xx-r0/platform_asic
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
marvell
marvell-prestera
2 changes: 1 addition & 1 deletion device/marvell/arm64-marvell_rd98DX35xx_cn9131-r0/platform_asic
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
marvell
marvell-prestera
2 changes: 1 addition & 1 deletion device/marvell/armhf-marvell_et6448m_52x-r0/platform_asic
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
marvell
marvell-prestera
2 changes: 1 addition & 1 deletion device/marvell/x86_64-marvell_db98cx8514_10cc-r0/platform_asic
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
marvell
marvell-prestera
2 changes: 1 addition & 1 deletion device/marvell/x86_64-marvell_db98cx8540_16cd-r0/platform_asic
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
marvell
marvell-prestera
2 changes: 1 addition & 1 deletion device/marvell/x86_64-marvell_db98cx8580_16cd-r0/platform_asic
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
marvell
marvell-prestera
2 changes: 1 addition & 1 deletion device/marvell/x86_64-marvell_db98cx8580_32cd-r0/platform_asic
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
marvell
marvell-prestera
2 changes: 1 addition & 1 deletion device/marvell/x86_64-marvell_dbmvtx9180-r0/platform_asic
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
innovium
marvell-teralynx
2 changes: 1 addition & 1 deletion device/marvell/x86_64-marvell_rd98DX35xx-r0/platform_asic
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
marvell
marvell-prestera
2 changes: 1 addition & 1 deletion device/marvell/x86_64-marvell_slm5401_54x-r0/platform_asic
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
marvell
marvell-prestera
2 changes: 1 addition & 1 deletion device/netberg/x86_64-netberg_aurora_715-r0/platform_asic
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
innovium
marvell-teralynx
2 changes: 1 addition & 1 deletion device/nokia/arm64-nokia_ixs7215_52xb-r0/platform_asic
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
marvell
marvell-prestera
2 changes: 1 addition & 1 deletion device/nokia/armhf-nokia_ixs7215_52x-r0/platform_asic
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
marvell
marvell-prestera
2 changes: 1 addition & 1 deletion device/supermicro/x86_64-supermicro_sse_t7132s-r0/platform_asic
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
innovium
marvell-teralynx
2 changes: 1 addition & 1 deletion device/wistron/x86_64-wistron_6512_32r-r0/platform_asic
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
innovium
marvell-teralynx
2 changes: 1 addition & 1 deletion device/wistron/x86_64-wistron_sw_to3200k-r0/platform_asic
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
innovium
marvell-teralynx
2 changes: 1 addition & 1 deletion dockers/docker-orchagent/orchagent.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ elif [ "$platform" == "vs" ]; then
ORCHAGENT_ARGS+="-m $MAC_ADDRESS"
elif [ "$platform" == "mellanox" ]; then
ORCHAGENT_ARGS+=""
elif [ "$platform" == "innovium" ]; then
elif [ "$platform" == "marvell-teralynx" ]; then
ORCHAGENT_ARGS+="-m $MAC_ADDRESS"
elif [ "$platform" == "nvidia-bluefield" ]; then
ORCHAGENT_ARGS+="-m $MAC_ADDRESS"
Expand Down
14 changes: 7 additions & 7 deletions dockers/docker-pde/syncd_init_common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ config_syncd_cavium()
done
}

config_syncd_marvell()
config_syncd_marvell_prestera()
{
CMD_ARGS+=" -p $HWSKU_DIR/sai.profile"

Expand Down Expand Up @@ -207,11 +207,11 @@ config_syncd_vs()
CMD_ARGS+=" -p $HWSKU_DIR/sai.profile"
}

config_syncd_innovium()
config_syncd_marvell_teralynx()
{
CMD_ARGS+=" -p $HWSKU_DIR/sai.profile"
ulimit -s 65536
export II_ROOT="/var/log/invm"
export II_ROOT="/var/log/mrvl_teralynx"
export II_APPEND_LOG=1
mkdir -p $II_ROOT
}
Expand All @@ -228,16 +228,16 @@ 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
config_syncd_nephos
elif [ "$SONIC_ASIC_TYPE" == "vs" ]; then
config_syncd_vs
elif [ "$SONIC_ASIC_TYPE" == "innovium" ]; then
config_syncd_innovium
elif [ "$SONIC_ASIC_TYPE" == "marvell-teralynx" ]; then
config_syncd_marvell_teralynx
else
echo "Unknown ASIC type $SONIC_ASIC_TYPE"
exit 1
Expand Down
2 changes: 1 addition & 1 deletion files/build_templates/qos_config.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'] -%}

Expand Down
8 changes: 0 additions & 8 deletions platform/innovium/docker-saiserver-invm.dep
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions platform/innovium/docker-saiserver-invm.mk
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions platform/innovium/docker-syncd-invm-rpc.mk
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions platform/innovium/invm-sai.mk
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions platform/innovium/python-saithrift.mk
View file
Open in desktop

This file was deleted.

Loading
Loading