From ed35536a98e2046d1c6a8f04624fd4672caebbae Mon Sep 17 00:00:00 2001 From: ksridharan Date: Thu, 1 Aug 2024 06:05:05 -0700 Subject: [PATCH] Renaming platform/marvell to platform/marvell-prestera --- .../azure-pipelines-UpgrateVersion.yml | 4 ++-- .azure-pipelines/azure-pipelines-build.yml | 12 +++++----- .../azure-pipelines-image-template.yml | 2 +- .azure-pipelines/build-template.yml | 4 ++-- .azure-pipelines/official-build-cache.yml | 4 ++-- .gitmodules | 12 +++++----- README.md | 24 ++++++++++--------- azure-pipelines.yml | 8 +++---- .../platform_asic | 2 +- .../platform_asic | 2 +- .../arm64-marvell_rd98DX35xx-r0/platform_asic | 2 +- .../platform_asic | 2 +- .../platform_asic | 2 +- .../platform_asic | 2 +- .../platform_asic | 2 +- .../platform_asic | 2 +- .../platform_asic | 2 +- .../platform_asic | 2 +- .../platform_asic | 2 +- .../arm64-nokia_ixs7215_52xb-r0/platform_asic | 2 +- .../armhf-nokia_ixs7215_52x-r0/platform_asic | 2 +- dockers/docker-pde/syncd_init_common.sh | 6 ++--- files/build_templates/qos_config.j2 | 2 +- .../docker-saiserver-mrvl-prestera.dep} | 2 +- .../docker-saiserver-mrvl-prestera.mk} | 4 ++-- .../Dockerfile.j2 | 0 .../docker-saiserver-mrvl-prestera}/start.sh | 0 .../supervisord.conf | 0 .../docker-syncd-mrvl-prestera-rpc.dep} | 2 +- .../docker-syncd-mrvl-prestera-rpc.mk} | 6 ++--- .../99-syncd.conf | 0 .../Dockerfile.j2 | 14 +++++------ .../ptf_nn_agent.conf | 0 .../docker-syncd-mrvl-prestera.dep} | 2 +- .../docker-syncd-mrvl-prestera.mk} | 4 ++-- .../docker-syncd-mrvl-prestera}/Dockerfile.j2 | 4 ++-- .../critical_processes | 0 .../supervisord.conf | 0 .../docker-syncd-mrvl-prestera}/syncd.sh | 0 .../libsaithrift-dev.dep | 0 .../libsaithrift-dev.mk | 0 platform/marvell-prestera/mrvl-prestera | 1 + .../mrvl-prestera.dep | 0 .../mrvl-prestera.mk | 0 .../one-image.dep | 0 .../one-image.mk | 8 +++---- .../onie-image-arm64.conf | 0 .../platform-marvell.dep | 0 .../platform-marvell.mk | 0 .../platform-nokia.dep | 0 .../platform-nokia.mk | 0 .../platform_arm64.conf | 0 .../platform_armhf.conf | 0 .../{marvell => marvell-prestera}/rules.dep | 6 ++--- .../{marvell => marvell-prestera}/rules.mk | 10 ++++---- .../{marvell => marvell-prestera}/sai.dep | 0 platform/{marvell => marvell-prestera}/sai.mk | 0 .../sonic-platform-marvell | 0 .../7215-a1/modules/Makefile | 0 .../modules/cn9130_cpu_thermal_sensor.c | 0 .../7215-a1/modules/nokia_7215_ixs_a1_cpld.c | 0 .../7215-a1/scripts/cpu_wdt.py | 0 .../7215-a1/scripts/nokia-7215-init.sh | 0 .../7215-a1/service/cpu_wdt.service | 0 .../7215-a1/service/nokia-7215init.service | 0 .../sonic-platform-nokia/7215-a1/setup.py | 0 .../7215-a1/sonic_platform/__init__.py | 0 .../7215-a1/sonic_platform/chassis.py | 0 .../7215-a1/sonic_platform/component.py | 0 .../7215-a1/sonic_platform/eeprom.py | 0 .../7215-a1/sonic_platform/fan.py | 0 .../7215-a1/sonic_platform/fan_drawer.py | 0 .../7215-a1/sonic_platform/platform.py | 0 .../7215-a1/sonic_platform/psu.py | 0 .../7215-a1/sonic_platform/sfp.py | 0 .../7215-a1/sonic_platform/sfp_event.py | 0 .../7215-a1/sonic_platform/test/README | 0 .../sonic_platform/test/test-chassis.py | 0 .../sonic_platform/test/test-component.py | 0 .../sonic_platform/test/test-eeprom.py | 0 .../7215-a1/sonic_platform/test/test-fan.py | 0 .../7215-a1/sonic_platform/test/test-psu.py | 0 .../7215-a1/sonic_platform/test/test-sfp.py | 0 .../sonic_platform/test/test-thermal.py | 0 .../sonic_platform/test/test-watchdog.py | 0 .../7215-a1/sonic_platform/thermal.py | 0 .../7215-a1/sonic_platform/thermal_actions.py | 0 .../sonic_platform/thermal_conditions.py | 0 .../7215-a1/sonic_platform/thermal_infos.py | 0 .../7215-a1/sonic_platform/thermal_manager.py | 0 .../7215-a1/sonic_platform/watchdog.py | 0 .../7215-a1/utils/sonic_ssd.py | 0 .../7215/scripts/cpu_wdt.py | 0 .../7215/scripts/inband_mgmt.sh | 0 .../7215/scripts/nokia-7215_plt_setup.sh | 0 .../7215/scripts/nokia-7215init.sh | 0 .../7215/service/cpu_wdt.service | 0 .../service/fstrim.timer/timer-override.conf | 0 .../7215/service/nokia-7215init.service | 0 .../sonic-platform-nokia/7215/setup.py | 0 .../7215/sonic_platform/__init__.py | 0 .../7215/sonic_platform/chassis.py | 0 .../7215/sonic_platform/component.py | 0 .../7215/sonic_platform/eeprom.py | 0 .../7215/sonic_platform/fan.py | 0 .../7215/sonic_platform/fan_drawer.py | 0 .../7215/sonic_platform/platform.py | 0 .../7215/sonic_platform/psu.py | 0 .../7215/sonic_platform/sfp.py | 0 .../7215/sonic_platform/sfp_event.py | 0 .../7215/sonic_platform/test/README | 0 .../7215/sonic_platform/test/test-chassis.py | 0 .../sonic_platform/test/test-component.py | 0 .../7215/sonic_platform/test/test-eeprom.py | 0 .../7215/sonic_platform/test/test-fan.py | 0 .../7215/sonic_platform/test/test-psu.py | 0 .../7215/sonic_platform/test/test-sfp.py | 0 .../7215/sonic_platform/test/test-thermal.py | 0 .../7215/sonic_platform/test/test-watchdog.py | 0 .../7215/sonic_platform/thermal.py | 0 .../7215/sonic_platform/thermal_actions.py | 0 .../7215/sonic_platform/thermal_conditions.py | 0 .../7215/sonic_platform/thermal_infos.py | 0 .../7215/sonic_platform/thermal_manager.py | 0 .../7215/sonic_platform/watchdog.py | 0 .../sonic-platform-nokia/debian/changelog | 0 .../sonic-platform-nokia/debian/compat | 0 .../sonic-platform-nokia/debian/control | 0 .../sonic-platform-nokia/debian/rules | 0 .../sonic-platform-nokia-7215-a1.install | 0 .../sonic-platform-nokia-7215-a1.postinst | 0 .../debian/sonic-platform-nokia-7215.install | 0 .../debian/sonic-platform-nokia-7215.postinst | 0 .../sonic_fit.its | 0 platform/marvell/mrvl-prestera | 1 - .../sonic_py_common/device_info.py | 2 +- 136 files changed, 86 insertions(+), 84 deletions(-) rename platform/{marvell/docker-saiserver-mrvl.dep => marvell-prestera/docker-saiserver-mrvl-prestera.dep} (82%) rename platform/{marvell/docker-saiserver-mrvl.mk => marvell-prestera/docker-saiserver-mrvl-prestera.mk} (89%) rename platform/{marvell/docker-saiserver-mrvl => marvell-prestera/docker-saiserver-mrvl-prestera}/Dockerfile.j2 (100%) rename platform/{marvell/docker-saiserver-mrvl => marvell-prestera/docker-saiserver-mrvl-prestera}/start.sh (100%) rename platform/{marvell/docker-saiserver-mrvl => marvell-prestera/docker-saiserver-mrvl-prestera}/supervisord.conf (100%) rename platform/{marvell/docker-syncd-mrvl-rpc.dep => marvell-prestera/docker-syncd-mrvl-prestera-rpc.dep} (82%) rename platform/{marvell/docker-syncd-mrvl-rpc.mk => marvell-prestera/docker-syncd-mrvl-prestera-rpc.mk} (90%) rename platform/{marvell/docker-syncd-mrvl-rpc => marvell-prestera/docker-syncd-mrvl-prestera-rpc}/99-syncd.conf (100%) rename platform/{marvell/docker-syncd-mrvl-rpc => marvell-prestera/docker-syncd-mrvl-prestera-rpc}/Dockerfile.j2 (74%) rename platform/{marvell/docker-syncd-mrvl-rpc => marvell-prestera/docker-syncd-mrvl-prestera-rpc}/ptf_nn_agent.conf (100%) rename platform/{marvell/docker-syncd-mrvl.dep => marvell-prestera/docker-syncd-mrvl-prestera.dep} (82%) rename platform/{marvell/docker-syncd-mrvl.mk => marvell-prestera/docker-syncd-mrvl-prestera.mk} (85%) rename platform/{marvell/docker-syncd-mrvl => marvell-prestera/docker-syncd-mrvl-prestera}/Dockerfile.j2 (87%) rename platform/{marvell/docker-syncd-mrvl => marvell-prestera/docker-syncd-mrvl-prestera}/critical_processes (100%) rename platform/{marvell/docker-syncd-mrvl => marvell-prestera/docker-syncd-mrvl-prestera}/supervisord.conf (100%) rename platform/{marvell/docker-syncd-mrvl => marvell-prestera/docker-syncd-mrvl-prestera}/syncd.sh (100%) rename platform/{marvell => marvell-prestera}/libsaithrift-dev.dep (100%) rename platform/{marvell => marvell-prestera}/libsaithrift-dev.mk (100%) create mode 160000 platform/marvell-prestera/mrvl-prestera rename platform/{marvell => marvell-prestera}/mrvl-prestera.dep (100%) rename platform/{marvell => marvell-prestera}/mrvl-prestera.mk (100%) rename platform/{marvell => marvell-prestera}/one-image.dep (100%) rename platform/{marvell => marvell-prestera}/one-image.mk (85%) rename platform/{marvell => marvell-prestera}/onie-image-arm64.conf (100%) rename platform/{marvell => marvell-prestera}/platform-marvell.dep (100%) rename platform/{marvell => marvell-prestera}/platform-marvell.mk (100%) rename platform/{marvell => marvell-prestera}/platform-nokia.dep (100%) rename platform/{marvell => marvell-prestera}/platform-nokia.mk (100%) rename platform/{marvell => marvell-prestera}/platform_arm64.conf (100%) rename platform/{marvell => marvell-prestera}/platform_armhf.conf (100%) rename platform/{marvell => marvell-prestera}/rules.dep (64%) rename platform/{marvell => marvell-prestera}/rules.mk (70%) rename platform/{marvell => marvell-prestera}/sai.dep (100%) rename platform/{marvell => marvell-prestera}/sai.mk (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-marvell (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/7215-a1/modules/Makefile (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/7215-a1/modules/cn9130_cpu_thermal_sensor.c (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/7215-a1/modules/nokia_7215_ixs_a1_cpld.c (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/7215-a1/scripts/cpu_wdt.py (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/7215-a1/scripts/nokia-7215-init.sh (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/7215-a1/service/cpu_wdt.service (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/7215-a1/service/nokia-7215init.service (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/7215-a1/setup.py (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/7215-a1/sonic_platform/__init__.py (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/7215-a1/sonic_platform/chassis.py (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/7215-a1/sonic_platform/component.py (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/7215-a1/sonic_platform/eeprom.py (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/7215-a1/sonic_platform/fan.py (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/7215-a1/sonic_platform/fan_drawer.py (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/7215-a1/sonic_platform/platform.py (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/7215-a1/sonic_platform/psu.py (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/7215-a1/sonic_platform/sfp.py (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/7215-a1/sonic_platform/sfp_event.py (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/7215-a1/sonic_platform/test/README (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/7215-a1/sonic_platform/test/test-chassis.py (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/7215-a1/sonic_platform/test/test-component.py (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/7215-a1/sonic_platform/test/test-eeprom.py (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/7215-a1/sonic_platform/test/test-fan.py (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/7215-a1/sonic_platform/test/test-psu.py (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/7215-a1/sonic_platform/test/test-sfp.py (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/7215-a1/sonic_platform/test/test-thermal.py (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/7215-a1/sonic_platform/test/test-watchdog.py (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/7215-a1/sonic_platform/thermal.py (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/7215-a1/sonic_platform/thermal_actions.py (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/7215-a1/sonic_platform/thermal_conditions.py (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/7215-a1/sonic_platform/thermal_infos.py (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/7215-a1/sonic_platform/thermal_manager.py (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/7215-a1/sonic_platform/watchdog.py (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/7215-a1/utils/sonic_ssd.py (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/7215/scripts/cpu_wdt.py (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/7215/scripts/inband_mgmt.sh (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/7215/scripts/nokia-7215_plt_setup.sh (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/7215/scripts/nokia-7215init.sh (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/7215/service/cpu_wdt.service (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/7215/service/fstrim.timer/timer-override.conf (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/7215/service/nokia-7215init.service (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/7215/setup.py (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/7215/sonic_platform/__init__.py (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/7215/sonic_platform/chassis.py (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/7215/sonic_platform/component.py (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/7215/sonic_platform/eeprom.py (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/7215/sonic_platform/fan.py (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/7215/sonic_platform/fan_drawer.py (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/7215/sonic_platform/platform.py (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/7215/sonic_platform/psu.py (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/7215/sonic_platform/sfp.py (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/7215/sonic_platform/sfp_event.py (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/7215/sonic_platform/test/README (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/7215/sonic_platform/test/test-chassis.py (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/7215/sonic_platform/test/test-component.py (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/7215/sonic_platform/test/test-eeprom.py (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/7215/sonic_platform/test/test-fan.py (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/7215/sonic_platform/test/test-psu.py (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/7215/sonic_platform/test/test-sfp.py (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/7215/sonic_platform/test/test-thermal.py (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/7215/sonic_platform/test/test-watchdog.py (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/7215/sonic_platform/thermal.py (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/7215/sonic_platform/thermal_actions.py (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/7215/sonic_platform/thermal_conditions.py (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/7215/sonic_platform/thermal_infos.py (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/7215/sonic_platform/thermal_manager.py (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/7215/sonic_platform/watchdog.py (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/debian/changelog (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/debian/compat (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/debian/control (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/debian/rules (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/debian/sonic-platform-nokia-7215-a1.install (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/debian/sonic-platform-nokia-7215-a1.postinst (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/debian/sonic-platform-nokia-7215.install (100%) rename platform/{marvell => marvell-prestera}/sonic-platform-nokia/debian/sonic-platform-nokia-7215.postinst (100%) rename platform/{marvell => marvell-prestera}/sonic_fit.its (100%) delete mode 160000 platform/marvell/mrvl-prestera diff --git a/.azure-pipelines/azure-pipelines-UpgrateVersion.yml b/.azure-pipelines/azure-pipelines-UpgrateVersion.yml index b40a5d03330b..b0fafd57b68f 100644 --- 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 index 9ef929530d50..1567a41afab3 100644 --- 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 index c2e8b8856f50..9699d22bed93 100644 --- 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 index 813126792e69..11efaaf9e324 100644 --- 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 index 0f7b34e9bd5b..17e9f95201dd 100644 --- 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 index 793bafdfa4ca..7189f37051f2 100644 --- 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 index 11a0a83fa101..0c8ad8fa892d 100644 --- 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,13 +195,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=marvell-teralynx * PLATFORM=vs ## Usage for ARM Architecture @@ -222,22 +222,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 @@ -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**: @@ -361,6 +361,8 @@ on the SAI version for each SONiC release. and Nephos 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 diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b72aa967cc2e..a6647e84bd12 100644 --- 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 index a554752878b7..5cbe9d002a53 100644 --- 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 index a554752878b7..5cbe9d002a53 100644 --- 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 index a554752878b7..5cbe9d002a53 100644 --- 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 index a554752878b7..5cbe9d002a53 100644 --- 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 index a554752878b7..5cbe9d002a53 100644 --- 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 index a554752878b7..5cbe9d002a53 100644 --- 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 index a554752878b7..5cbe9d002a53 100644 --- 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 index a554752878b7..5cbe9d002a53 100644 --- 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 index a554752878b7..5cbe9d002a53 100644 --- 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 index a554752878b7..5cbe9d002a53 100644 --- 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 index a554752878b7..5cbe9d002a53 100644 --- 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 index a554752878b7..5cbe9d002a53 100644 --- 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 index a554752878b7..5cbe9d002a53 100644 --- 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 index 7a28d7208f01..06a4cee4f956 100755 --- 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 index bf5007471a48..f3a1e1eb2077 100644 --- 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 b/platform/marvell-prestera/docker-saiserver-mrvl-prestera.dep similarity index 82% rename from platform/marvell/docker-saiserver-mrvl.dep rename to platform/marvell-prestera/docker-saiserver-mrvl-prestera.dep index 3ded7bc916eb..5a01493bd23b 100644 --- a/platform/marvell/docker-saiserver-mrvl.dep +++ b/platform/marvell-prestera/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 b/platform/marvell-prestera/docker-saiserver-mrvl-prestera.mk similarity index 89% rename from platform/marvell/docker-saiserver-mrvl.mk rename to platform/marvell-prestera/docker-saiserver-mrvl-prestera.mk index c6bd3e2ca1e7..88eb35940548 100644 --- a/platform/marvell/docker-saiserver-mrvl.mk +++ b/platform/marvell-prestera/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/platform/marvell/docker-saiserver-mrvl/Dockerfile.j2 b/platform/marvell-prestera/docker-saiserver-mrvl-prestera/Dockerfile.j2 similarity index 100% rename from platform/marvell/docker-saiserver-mrvl/Dockerfile.j2 rename to platform/marvell-prestera/docker-saiserver-mrvl-prestera/Dockerfile.j2 diff --git a/platform/marvell/docker-saiserver-mrvl/start.sh b/platform/marvell-prestera/docker-saiserver-mrvl-prestera/start.sh similarity index 100% rename from platform/marvell/docker-saiserver-mrvl/start.sh rename to platform/marvell-prestera/docker-saiserver-mrvl-prestera/start.sh diff --git a/platform/marvell/docker-saiserver-mrvl/supervisord.conf b/platform/marvell-prestera/docker-saiserver-mrvl-prestera/supervisord.conf similarity index 100% rename from platform/marvell/docker-saiserver-mrvl/supervisord.conf rename to platform/marvell-prestera/docker-saiserver-mrvl-prestera/supervisord.conf diff --git a/platform/marvell/docker-syncd-mrvl-rpc.dep b/platform/marvell-prestera/docker-syncd-mrvl-prestera-rpc.dep similarity index 82% rename from platform/marvell/docker-syncd-mrvl-rpc.dep rename to platform/marvell-prestera/docker-syncd-mrvl-prestera-rpc.dep index 3ab0dec8eb52..cb6ed4eebc39 100644 --- a/platform/marvell/docker-syncd-mrvl-rpc.dep +++ b/platform/marvell-prestera/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 b/platform/marvell-prestera/docker-syncd-mrvl-prestera-rpc.mk similarity index 90% rename from platform/marvell/docker-syncd-mrvl-rpc.mk rename to platform/marvell-prestera/docker-syncd-mrvl-prestera-rpc.mk index bf4bb103635f..b8bf565d1cb8 100644 --- a/platform/marvell/docker-syncd-mrvl-rpc.mk +++ b/platform/marvell-prestera/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/platform/marvell/docker-syncd-mrvl-rpc/99-syncd.conf b/platform/marvell-prestera/docker-syncd-mrvl-prestera-rpc/99-syncd.conf similarity index 100% rename from platform/marvell/docker-syncd-mrvl-rpc/99-syncd.conf rename to platform/marvell-prestera/docker-syncd-mrvl-prestera-rpc/99-syncd.conf diff --git a/platform/marvell/docker-syncd-mrvl-rpc/Dockerfile.j2 b/platform/marvell-prestera/docker-syncd-mrvl-prestera-rpc/Dockerfile.j2 similarity index 74% rename from platform/marvell/docker-syncd-mrvl-rpc/Dockerfile.j2 rename to platform/marvell-prestera/docker-syncd-mrvl-prestera-rpc/Dockerfile.j2 index 02d962d19cee..4e18df32a378 100644 --- a/platform/marvell/docker-syncd-mrvl-rpc/Dockerfile.j2 +++ b/platform/marvell-prestera/docker-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/platform/marvell/docker-syncd-mrvl-rpc/ptf_nn_agent.conf b/platform/marvell-prestera/docker-syncd-mrvl-prestera-rpc/ptf_nn_agent.conf similarity index 100% rename from platform/marvell/docker-syncd-mrvl-rpc/ptf_nn_agent.conf rename to platform/marvell-prestera/docker-syncd-mrvl-prestera-rpc/ptf_nn_agent.conf diff --git a/platform/marvell/docker-syncd-mrvl.dep b/platform/marvell-prestera/docker-syncd-mrvl-prestera.dep similarity index 82% rename from platform/marvell/docker-syncd-mrvl.dep rename to platform/marvell-prestera/docker-syncd-mrvl-prestera.dep index d3f213a2da84..9bb5f572a9ce 100644 --- a/platform/marvell/docker-syncd-mrvl.dep +++ b/platform/marvell-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 b/platform/marvell-prestera/docker-syncd-mrvl-prestera.mk similarity index 85% rename from platform/marvell/docker-syncd-mrvl.mk rename to platform/marvell-prestera/docker-syncd-mrvl-prestera.mk index d4c990cfe426..177f9a10e524 100644 --- a/platform/marvell/docker-syncd-mrvl.mk +++ b/platform/marvell-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/platform/marvell/docker-syncd-mrvl/Dockerfile.j2 b/platform/marvell-prestera/docker-syncd-mrvl-prestera/Dockerfile.j2 similarity index 87% rename from platform/marvell/docker-syncd-mrvl/Dockerfile.j2 rename to platform/marvell-prestera/docker-syncd-mrvl-prestera/Dockerfile.j2 index a721a86428fa..a67a19a00b57 100755 --- a/platform/marvell/docker-syncd-mrvl/Dockerfile.j2 +++ b/platform/marvell-prestera/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/platform/marvell/docker-syncd-mrvl/critical_processes b/platform/marvell-prestera/docker-syncd-mrvl-prestera/critical_processes similarity index 100% rename from platform/marvell/docker-syncd-mrvl/critical_processes rename to platform/marvell-prestera/docker-syncd-mrvl-prestera/critical_processes diff --git a/platform/marvell/docker-syncd-mrvl/supervisord.conf b/platform/marvell-prestera/docker-syncd-mrvl-prestera/supervisord.conf similarity index 100% rename from platform/marvell/docker-syncd-mrvl/supervisord.conf rename to platform/marvell-prestera/docker-syncd-mrvl-prestera/supervisord.conf diff --git a/platform/marvell/docker-syncd-mrvl/syncd.sh b/platform/marvell-prestera/docker-syncd-mrvl-prestera/syncd.sh similarity index 100% rename from platform/marvell/docker-syncd-mrvl/syncd.sh rename to platform/marvell-prestera/docker-syncd-mrvl-prestera/syncd.sh diff --git a/platform/marvell/libsaithrift-dev.dep b/platform/marvell-prestera/libsaithrift-dev.dep similarity index 100% rename from platform/marvell/libsaithrift-dev.dep rename to platform/marvell-prestera/libsaithrift-dev.dep diff --git a/platform/marvell/libsaithrift-dev.mk b/platform/marvell-prestera/libsaithrift-dev.mk similarity index 100% rename from platform/marvell/libsaithrift-dev.mk rename to platform/marvell-prestera/libsaithrift-dev.mk diff --git a/platform/marvell-prestera/mrvl-prestera b/platform/marvell-prestera/mrvl-prestera new file mode 160000 index 000000000000..36fa3a3f4e31 --- /dev/null +++ b/platform/marvell-prestera/mrvl-prestera @@ -0,0 +1 @@ +Subproject commit 36fa3a3f4e317d8c0c111cc74aafffce12e1546d diff --git a/platform/marvell/mrvl-prestera.dep b/platform/marvell-prestera/mrvl-prestera.dep similarity index 100% rename from platform/marvell/mrvl-prestera.dep rename to platform/marvell-prestera/mrvl-prestera.dep diff --git a/platform/marvell/mrvl-prestera.mk b/platform/marvell-prestera/mrvl-prestera.mk similarity index 100% rename from platform/marvell/mrvl-prestera.mk rename to platform/marvell-prestera/mrvl-prestera.mk diff --git a/platform/marvell/one-image.dep b/platform/marvell-prestera/one-image.dep similarity index 100% rename from platform/marvell/one-image.dep rename to platform/marvell-prestera/one-image.dep diff --git a/platform/marvell/one-image.mk b/platform/marvell-prestera/one-image.mk similarity index 85% rename from platform/marvell/one-image.mk rename to platform/marvell-prestera/one-image.mk index b58a6179c255..522d1433e327 100644 --- a/platform/marvell/one-image.mk +++ b/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 b/platform/marvell-prestera/onie-image-arm64.conf similarity index 100% rename from platform/marvell/onie-image-arm64.conf rename to platform/marvell-prestera/onie-image-arm64.conf diff --git a/platform/marvell/platform-marvell.dep b/platform/marvell-prestera/platform-marvell.dep similarity index 100% rename from platform/marvell/platform-marvell.dep rename to platform/marvell-prestera/platform-marvell.dep diff --git a/platform/marvell/platform-marvell.mk b/platform/marvell-prestera/platform-marvell.mk similarity index 100% rename from platform/marvell/platform-marvell.mk rename to platform/marvell-prestera/platform-marvell.mk diff --git a/platform/marvell/platform-nokia.dep b/platform/marvell-prestera/platform-nokia.dep similarity index 100% rename from platform/marvell/platform-nokia.dep rename to platform/marvell-prestera/platform-nokia.dep diff --git a/platform/marvell/platform-nokia.mk b/platform/marvell-prestera/platform-nokia.mk similarity index 100% rename from platform/marvell/platform-nokia.mk rename to platform/marvell-prestera/platform-nokia.mk diff --git a/platform/marvell/platform_arm64.conf b/platform/marvell-prestera/platform_arm64.conf similarity index 100% rename from platform/marvell/platform_arm64.conf rename to platform/marvell-prestera/platform_arm64.conf diff --git a/platform/marvell/platform_armhf.conf b/platform/marvell-prestera/platform_armhf.conf similarity index 100% rename from platform/marvell/platform_armhf.conf rename to platform/marvell-prestera/platform_armhf.conf diff --git a/platform/marvell/rules.dep b/platform/marvell-prestera/rules.dep similarity index 64% rename from platform/marvell/rules.dep rename to platform/marvell-prestera/rules.dep index a5bdbf59d16b..c31677b4ad91 100644 --- a/platform/marvell/rules.dep +++ b/platform/marvell-prestera/rules.dep @@ -1,6 +1,6 @@ -include $(PLATFORM_PATH)/docker-saiserver-mrvl.dep -include $(PLATFORM_PATH)/docker-syncd-mrvl-rpc.dep -include $(PLATFORM_PATH)/docker-syncd-mrvl.dep +include $(PLATFORM_PATH)/docker-saiserver-mrvl-prestera.dep +include $(PLATFORM_PATH)/docker-syncd-mrvl-prestera-rpc.dep +include $(PLATFORM_PATH)/docker-syncd-mrvl-prestera.dep include $(PLATFORM_PATH)/libsaithrift-dev.dep include $(PLATFORM_PATH)/one-image.dep include $(PLATFORM_PATH)/platform-marvell.dep diff --git a/platform/marvell/rules.mk b/platform/marvell-prestera/rules.mk similarity index 70% rename from platform/marvell/rules.mk rename to platform/marvell-prestera/rules.mk index 825d8d331a17..74792e9889b8 100644 --- a/platform/marvell/rules.mk +++ b/platform/marvell-prestera/rules.mk @@ -1,7 +1,7 @@ include $(PLATFORM_PATH)/sai.mk -include $(PLATFORM_PATH)/docker-syncd-mrvl.mk -include $(PLATFORM_PATH)/docker-syncd-mrvl-rpc.mk -include $(PLATFORM_PATH)/docker-saiserver-mrvl.mk +include $(PLATFORM_PATH)/docker-syncd-mrvl-prestera.mk +include $(PLATFORM_PATH)/docker-syncd-mrvl-prestera-rpc.mk +include $(PLATFORM_PATH)/docker-saiserver-mrvl-prestera.mk include $(PLATFORM_PATH)/libsaithrift-dev.mk include $(PLATFORM_PATH)/one-image.mk include $(PLATFORM_PATH)/platform-marvell.mk @@ -14,7 +14,7 @@ SONIC_ALL += $(SONIC_ONE_IMAGE) \ $(DOCKER_FPM) \ $(DOCKER_SYNCD_MRVL_RPC) -# Inject mrvl sai into syncd +# Inject mrvl-prestera sai into syncd $(SYNCD)_DEPENDS += $(MRVL_SAI) $(SYNCD)_UNINSTALLS += $(MRVL_SAI) @@ -23,5 +23,5 @@ $(SYNCD)_DEPENDS := $(filter-out $(LIBTHRIFT_DEV),$($(SYNCD)_DEPENDS)) $(SYNCD)_DEPENDS += $(LIBSAITHRIFT_DEV) endif -# Runtime dependency on mrvl sai is set only for syncd +# Runtime dependency on mrvl-prestera sai is set only for syncd $(SYNCD)_RDEPENDS += $(MRVL_SAI) diff --git a/platform/marvell/sai.dep b/platform/marvell-prestera/sai.dep similarity index 100% rename from platform/marvell/sai.dep rename to platform/marvell-prestera/sai.dep diff --git a/platform/marvell/sai.mk b/platform/marvell-prestera/sai.mk similarity index 100% rename from platform/marvell/sai.mk rename to platform/marvell-prestera/sai.mk diff --git a/platform/marvell/sonic-platform-marvell b/platform/marvell-prestera/sonic-platform-marvell similarity index 100% rename from platform/marvell/sonic-platform-marvell rename to platform/marvell-prestera/sonic-platform-marvell diff --git a/platform/marvell/sonic-platform-nokia/7215-a1/modules/Makefile b/platform/marvell-prestera/sonic-platform-nokia/7215-a1/modules/Makefile similarity index 100% rename from platform/marvell/sonic-platform-nokia/7215-a1/modules/Makefile rename to platform/marvell-prestera/sonic-platform-nokia/7215-a1/modules/Makefile diff --git a/platform/marvell/sonic-platform-nokia/7215-a1/modules/cn9130_cpu_thermal_sensor.c b/platform/marvell-prestera/sonic-platform-nokia/7215-a1/modules/cn9130_cpu_thermal_sensor.c similarity index 100% rename from platform/marvell/sonic-platform-nokia/7215-a1/modules/cn9130_cpu_thermal_sensor.c rename to platform/marvell-prestera/sonic-platform-nokia/7215-a1/modules/cn9130_cpu_thermal_sensor.c diff --git a/platform/marvell/sonic-platform-nokia/7215-a1/modules/nokia_7215_ixs_a1_cpld.c b/platform/marvell-prestera/sonic-platform-nokia/7215-a1/modules/nokia_7215_ixs_a1_cpld.c similarity index 100% rename from platform/marvell/sonic-platform-nokia/7215-a1/modules/nokia_7215_ixs_a1_cpld.c rename to platform/marvell-prestera/sonic-platform-nokia/7215-a1/modules/nokia_7215_ixs_a1_cpld.c diff --git a/platform/marvell/sonic-platform-nokia/7215-a1/scripts/cpu_wdt.py b/platform/marvell-prestera/sonic-platform-nokia/7215-a1/scripts/cpu_wdt.py similarity index 100% rename from platform/marvell/sonic-platform-nokia/7215-a1/scripts/cpu_wdt.py rename to platform/marvell-prestera/sonic-platform-nokia/7215-a1/scripts/cpu_wdt.py diff --git a/platform/marvell/sonic-platform-nokia/7215-a1/scripts/nokia-7215-init.sh b/platform/marvell-prestera/sonic-platform-nokia/7215-a1/scripts/nokia-7215-init.sh similarity index 100% rename from platform/marvell/sonic-platform-nokia/7215-a1/scripts/nokia-7215-init.sh rename to platform/marvell-prestera/sonic-platform-nokia/7215-a1/scripts/nokia-7215-init.sh diff --git a/platform/marvell/sonic-platform-nokia/7215-a1/service/cpu_wdt.service b/platform/marvell-prestera/sonic-platform-nokia/7215-a1/service/cpu_wdt.service similarity index 100% rename from platform/marvell/sonic-platform-nokia/7215-a1/service/cpu_wdt.service rename to platform/marvell-prestera/sonic-platform-nokia/7215-a1/service/cpu_wdt.service diff --git a/platform/marvell/sonic-platform-nokia/7215-a1/service/nokia-7215init.service b/platform/marvell-prestera/sonic-platform-nokia/7215-a1/service/nokia-7215init.service similarity index 100% rename from platform/marvell/sonic-platform-nokia/7215-a1/service/nokia-7215init.service rename to platform/marvell-prestera/sonic-platform-nokia/7215-a1/service/nokia-7215init.service diff --git a/platform/marvell/sonic-platform-nokia/7215-a1/setup.py b/platform/marvell-prestera/sonic-platform-nokia/7215-a1/setup.py similarity index 100% rename from platform/marvell/sonic-platform-nokia/7215-a1/setup.py rename to platform/marvell-prestera/sonic-platform-nokia/7215-a1/setup.py diff --git a/platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/__init__.py b/platform/marvell-prestera/sonic-platform-nokia/7215-a1/sonic_platform/__init__.py similarity index 100% rename from platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/__init__.py rename to platform/marvell-prestera/sonic-platform-nokia/7215-a1/sonic_platform/__init__.py diff --git a/platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/chassis.py b/platform/marvell-prestera/sonic-platform-nokia/7215-a1/sonic_platform/chassis.py similarity index 100% rename from platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/chassis.py rename to platform/marvell-prestera/sonic-platform-nokia/7215-a1/sonic_platform/chassis.py diff --git a/platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/component.py b/platform/marvell-prestera/sonic-platform-nokia/7215-a1/sonic_platform/component.py similarity index 100% rename from platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/component.py rename to platform/marvell-prestera/sonic-platform-nokia/7215-a1/sonic_platform/component.py diff --git a/platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/eeprom.py b/platform/marvell-prestera/sonic-platform-nokia/7215-a1/sonic_platform/eeprom.py similarity index 100% rename from platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/eeprom.py rename to platform/marvell-prestera/sonic-platform-nokia/7215-a1/sonic_platform/eeprom.py diff --git a/platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/fan.py b/platform/marvell-prestera/sonic-platform-nokia/7215-a1/sonic_platform/fan.py similarity index 100% rename from platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/fan.py rename to platform/marvell-prestera/sonic-platform-nokia/7215-a1/sonic_platform/fan.py diff --git a/platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/fan_drawer.py b/platform/marvell-prestera/sonic-platform-nokia/7215-a1/sonic_platform/fan_drawer.py similarity index 100% rename from platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/fan_drawer.py rename to platform/marvell-prestera/sonic-platform-nokia/7215-a1/sonic_platform/fan_drawer.py diff --git a/platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/platform.py b/platform/marvell-prestera/sonic-platform-nokia/7215-a1/sonic_platform/platform.py similarity index 100% rename from platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/platform.py rename to platform/marvell-prestera/sonic-platform-nokia/7215-a1/sonic_platform/platform.py diff --git a/platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/psu.py b/platform/marvell-prestera/sonic-platform-nokia/7215-a1/sonic_platform/psu.py similarity index 100% rename from platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/psu.py rename to platform/marvell-prestera/sonic-platform-nokia/7215-a1/sonic_platform/psu.py diff --git a/platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/sfp.py b/platform/marvell-prestera/sonic-platform-nokia/7215-a1/sonic_platform/sfp.py similarity index 100% rename from platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/sfp.py rename to platform/marvell-prestera/sonic-platform-nokia/7215-a1/sonic_platform/sfp.py diff --git a/platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/sfp_event.py b/platform/marvell-prestera/sonic-platform-nokia/7215-a1/sonic_platform/sfp_event.py similarity index 100% rename from platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/sfp_event.py rename to platform/marvell-prestera/sonic-platform-nokia/7215-a1/sonic_platform/sfp_event.py diff --git a/platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/test/README b/platform/marvell-prestera/sonic-platform-nokia/7215-a1/sonic_platform/test/README similarity index 100% rename from platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/test/README rename to platform/marvell-prestera/sonic-platform-nokia/7215-a1/sonic_platform/test/README diff --git a/platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/test/test-chassis.py b/platform/marvell-prestera/sonic-platform-nokia/7215-a1/sonic_platform/test/test-chassis.py similarity index 100% rename from platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/test/test-chassis.py rename to platform/marvell-prestera/sonic-platform-nokia/7215-a1/sonic_platform/test/test-chassis.py diff --git a/platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/test/test-component.py b/platform/marvell-prestera/sonic-platform-nokia/7215-a1/sonic_platform/test/test-component.py similarity index 100% rename from platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/test/test-component.py rename to platform/marvell-prestera/sonic-platform-nokia/7215-a1/sonic_platform/test/test-component.py diff --git a/platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/test/test-eeprom.py b/platform/marvell-prestera/sonic-platform-nokia/7215-a1/sonic_platform/test/test-eeprom.py similarity index 100% rename from platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/test/test-eeprom.py rename to platform/marvell-prestera/sonic-platform-nokia/7215-a1/sonic_platform/test/test-eeprom.py diff --git a/platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/test/test-fan.py b/platform/marvell-prestera/sonic-platform-nokia/7215-a1/sonic_platform/test/test-fan.py similarity index 100% rename from platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/test/test-fan.py rename to platform/marvell-prestera/sonic-platform-nokia/7215-a1/sonic_platform/test/test-fan.py diff --git a/platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/test/test-psu.py b/platform/marvell-prestera/sonic-platform-nokia/7215-a1/sonic_platform/test/test-psu.py similarity index 100% rename from platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/test/test-psu.py rename to platform/marvell-prestera/sonic-platform-nokia/7215-a1/sonic_platform/test/test-psu.py diff --git a/platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/test/test-sfp.py b/platform/marvell-prestera/sonic-platform-nokia/7215-a1/sonic_platform/test/test-sfp.py similarity index 100% rename from platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/test/test-sfp.py rename to platform/marvell-prestera/sonic-platform-nokia/7215-a1/sonic_platform/test/test-sfp.py diff --git a/platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/test/test-thermal.py b/platform/marvell-prestera/sonic-platform-nokia/7215-a1/sonic_platform/test/test-thermal.py similarity index 100% rename from platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/test/test-thermal.py rename to platform/marvell-prestera/sonic-platform-nokia/7215-a1/sonic_platform/test/test-thermal.py diff --git a/platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/test/test-watchdog.py b/platform/marvell-prestera/sonic-platform-nokia/7215-a1/sonic_platform/test/test-watchdog.py similarity index 100% rename from platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/test/test-watchdog.py rename to platform/marvell-prestera/sonic-platform-nokia/7215-a1/sonic_platform/test/test-watchdog.py diff --git a/platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/thermal.py b/platform/marvell-prestera/sonic-platform-nokia/7215-a1/sonic_platform/thermal.py similarity index 100% rename from platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/thermal.py rename to platform/marvell-prestera/sonic-platform-nokia/7215-a1/sonic_platform/thermal.py diff --git a/platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/thermal_actions.py b/platform/marvell-prestera/sonic-platform-nokia/7215-a1/sonic_platform/thermal_actions.py similarity index 100% rename from platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/thermal_actions.py rename to platform/marvell-prestera/sonic-platform-nokia/7215-a1/sonic_platform/thermal_actions.py diff --git a/platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/thermal_conditions.py b/platform/marvell-prestera/sonic-platform-nokia/7215-a1/sonic_platform/thermal_conditions.py similarity index 100% rename from platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/thermal_conditions.py rename to platform/marvell-prestera/sonic-platform-nokia/7215-a1/sonic_platform/thermal_conditions.py diff --git a/platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/thermal_infos.py b/platform/marvell-prestera/sonic-platform-nokia/7215-a1/sonic_platform/thermal_infos.py similarity index 100% rename from platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/thermal_infos.py rename to platform/marvell-prestera/sonic-platform-nokia/7215-a1/sonic_platform/thermal_infos.py diff --git a/platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/thermal_manager.py b/platform/marvell-prestera/sonic-platform-nokia/7215-a1/sonic_platform/thermal_manager.py similarity index 100% rename from platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/thermal_manager.py rename to platform/marvell-prestera/sonic-platform-nokia/7215-a1/sonic_platform/thermal_manager.py diff --git a/platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/watchdog.py b/platform/marvell-prestera/sonic-platform-nokia/7215-a1/sonic_platform/watchdog.py similarity index 100% rename from platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/watchdog.py rename to platform/marvell-prestera/sonic-platform-nokia/7215-a1/sonic_platform/watchdog.py diff --git a/platform/marvell/sonic-platform-nokia/7215-a1/utils/sonic_ssd.py b/platform/marvell-prestera/sonic-platform-nokia/7215-a1/utils/sonic_ssd.py similarity index 100% rename from platform/marvell/sonic-platform-nokia/7215-a1/utils/sonic_ssd.py rename to platform/marvell-prestera/sonic-platform-nokia/7215-a1/utils/sonic_ssd.py diff --git a/platform/marvell/sonic-platform-nokia/7215/scripts/cpu_wdt.py b/platform/marvell-prestera/sonic-platform-nokia/7215/scripts/cpu_wdt.py similarity index 100% rename from platform/marvell/sonic-platform-nokia/7215/scripts/cpu_wdt.py rename to platform/marvell-prestera/sonic-platform-nokia/7215/scripts/cpu_wdt.py diff --git a/platform/marvell/sonic-platform-nokia/7215/scripts/inband_mgmt.sh b/platform/marvell-prestera/sonic-platform-nokia/7215/scripts/inband_mgmt.sh similarity index 100% rename from platform/marvell/sonic-platform-nokia/7215/scripts/inband_mgmt.sh rename to platform/marvell-prestera/sonic-platform-nokia/7215/scripts/inband_mgmt.sh diff --git a/platform/marvell/sonic-platform-nokia/7215/scripts/nokia-7215_plt_setup.sh b/platform/marvell-prestera/sonic-platform-nokia/7215/scripts/nokia-7215_plt_setup.sh similarity index 100% rename from platform/marvell/sonic-platform-nokia/7215/scripts/nokia-7215_plt_setup.sh rename to platform/marvell-prestera/sonic-platform-nokia/7215/scripts/nokia-7215_plt_setup.sh diff --git a/platform/marvell/sonic-platform-nokia/7215/scripts/nokia-7215init.sh b/platform/marvell-prestera/sonic-platform-nokia/7215/scripts/nokia-7215init.sh similarity index 100% rename from platform/marvell/sonic-platform-nokia/7215/scripts/nokia-7215init.sh rename to platform/marvell-prestera/sonic-platform-nokia/7215/scripts/nokia-7215init.sh diff --git a/platform/marvell/sonic-platform-nokia/7215/service/cpu_wdt.service b/platform/marvell-prestera/sonic-platform-nokia/7215/service/cpu_wdt.service similarity index 100% rename from platform/marvell/sonic-platform-nokia/7215/service/cpu_wdt.service rename to platform/marvell-prestera/sonic-platform-nokia/7215/service/cpu_wdt.service diff --git a/platform/marvell/sonic-platform-nokia/7215/service/fstrim.timer/timer-override.conf b/platform/marvell-prestera/sonic-platform-nokia/7215/service/fstrim.timer/timer-override.conf similarity index 100% rename from platform/marvell/sonic-platform-nokia/7215/service/fstrim.timer/timer-override.conf rename to platform/marvell-prestera/sonic-platform-nokia/7215/service/fstrim.timer/timer-override.conf diff --git a/platform/marvell/sonic-platform-nokia/7215/service/nokia-7215init.service b/platform/marvell-prestera/sonic-platform-nokia/7215/service/nokia-7215init.service similarity index 100% rename from platform/marvell/sonic-platform-nokia/7215/service/nokia-7215init.service rename to platform/marvell-prestera/sonic-platform-nokia/7215/service/nokia-7215init.service diff --git a/platform/marvell/sonic-platform-nokia/7215/setup.py b/platform/marvell-prestera/sonic-platform-nokia/7215/setup.py similarity index 100% rename from platform/marvell/sonic-platform-nokia/7215/setup.py rename to platform/marvell-prestera/sonic-platform-nokia/7215/setup.py diff --git a/platform/marvell/sonic-platform-nokia/7215/sonic_platform/__init__.py b/platform/marvell-prestera/sonic-platform-nokia/7215/sonic_platform/__init__.py similarity index 100% rename from platform/marvell/sonic-platform-nokia/7215/sonic_platform/__init__.py rename to platform/marvell-prestera/sonic-platform-nokia/7215/sonic_platform/__init__.py diff --git a/platform/marvell/sonic-platform-nokia/7215/sonic_platform/chassis.py b/platform/marvell-prestera/sonic-platform-nokia/7215/sonic_platform/chassis.py similarity index 100% rename from platform/marvell/sonic-platform-nokia/7215/sonic_platform/chassis.py rename to platform/marvell-prestera/sonic-platform-nokia/7215/sonic_platform/chassis.py diff --git a/platform/marvell/sonic-platform-nokia/7215/sonic_platform/component.py b/platform/marvell-prestera/sonic-platform-nokia/7215/sonic_platform/component.py similarity index 100% rename from platform/marvell/sonic-platform-nokia/7215/sonic_platform/component.py rename to platform/marvell-prestera/sonic-platform-nokia/7215/sonic_platform/component.py diff --git a/platform/marvell/sonic-platform-nokia/7215/sonic_platform/eeprom.py b/platform/marvell-prestera/sonic-platform-nokia/7215/sonic_platform/eeprom.py similarity index 100% rename from platform/marvell/sonic-platform-nokia/7215/sonic_platform/eeprom.py rename to platform/marvell-prestera/sonic-platform-nokia/7215/sonic_platform/eeprom.py diff --git a/platform/marvell/sonic-platform-nokia/7215/sonic_platform/fan.py b/platform/marvell-prestera/sonic-platform-nokia/7215/sonic_platform/fan.py similarity index 100% rename from platform/marvell/sonic-platform-nokia/7215/sonic_platform/fan.py rename to platform/marvell-prestera/sonic-platform-nokia/7215/sonic_platform/fan.py diff --git a/platform/marvell/sonic-platform-nokia/7215/sonic_platform/fan_drawer.py b/platform/marvell-prestera/sonic-platform-nokia/7215/sonic_platform/fan_drawer.py similarity index 100% rename from platform/marvell/sonic-platform-nokia/7215/sonic_platform/fan_drawer.py rename to platform/marvell-prestera/sonic-platform-nokia/7215/sonic_platform/fan_drawer.py diff --git a/platform/marvell/sonic-platform-nokia/7215/sonic_platform/platform.py b/platform/marvell-prestera/sonic-platform-nokia/7215/sonic_platform/platform.py similarity index 100% rename from platform/marvell/sonic-platform-nokia/7215/sonic_platform/platform.py rename to platform/marvell-prestera/sonic-platform-nokia/7215/sonic_platform/platform.py diff --git a/platform/marvell/sonic-platform-nokia/7215/sonic_platform/psu.py b/platform/marvell-prestera/sonic-platform-nokia/7215/sonic_platform/psu.py similarity index 100% rename from platform/marvell/sonic-platform-nokia/7215/sonic_platform/psu.py rename to platform/marvell-prestera/sonic-platform-nokia/7215/sonic_platform/psu.py diff --git a/platform/marvell/sonic-platform-nokia/7215/sonic_platform/sfp.py b/platform/marvell-prestera/sonic-platform-nokia/7215/sonic_platform/sfp.py similarity index 100% rename from platform/marvell/sonic-platform-nokia/7215/sonic_platform/sfp.py rename to platform/marvell-prestera/sonic-platform-nokia/7215/sonic_platform/sfp.py diff --git a/platform/marvell/sonic-platform-nokia/7215/sonic_platform/sfp_event.py b/platform/marvell-prestera/sonic-platform-nokia/7215/sonic_platform/sfp_event.py similarity index 100% rename from platform/marvell/sonic-platform-nokia/7215/sonic_platform/sfp_event.py rename to platform/marvell-prestera/sonic-platform-nokia/7215/sonic_platform/sfp_event.py diff --git a/platform/marvell/sonic-platform-nokia/7215/sonic_platform/test/README b/platform/marvell-prestera/sonic-platform-nokia/7215/sonic_platform/test/README similarity index 100% rename from platform/marvell/sonic-platform-nokia/7215/sonic_platform/test/README rename to platform/marvell-prestera/sonic-platform-nokia/7215/sonic_platform/test/README diff --git a/platform/marvell/sonic-platform-nokia/7215/sonic_platform/test/test-chassis.py b/platform/marvell-prestera/sonic-platform-nokia/7215/sonic_platform/test/test-chassis.py similarity index 100% rename from platform/marvell/sonic-platform-nokia/7215/sonic_platform/test/test-chassis.py rename to platform/marvell-prestera/sonic-platform-nokia/7215/sonic_platform/test/test-chassis.py diff --git a/platform/marvell/sonic-platform-nokia/7215/sonic_platform/test/test-component.py b/platform/marvell-prestera/sonic-platform-nokia/7215/sonic_platform/test/test-component.py similarity index 100% rename from platform/marvell/sonic-platform-nokia/7215/sonic_platform/test/test-component.py rename to platform/marvell-prestera/sonic-platform-nokia/7215/sonic_platform/test/test-component.py diff --git a/platform/marvell/sonic-platform-nokia/7215/sonic_platform/test/test-eeprom.py b/platform/marvell-prestera/sonic-platform-nokia/7215/sonic_platform/test/test-eeprom.py similarity index 100% rename from platform/marvell/sonic-platform-nokia/7215/sonic_platform/test/test-eeprom.py rename to platform/marvell-prestera/sonic-platform-nokia/7215/sonic_platform/test/test-eeprom.py diff --git a/platform/marvell/sonic-platform-nokia/7215/sonic_platform/test/test-fan.py b/platform/marvell-prestera/sonic-platform-nokia/7215/sonic_platform/test/test-fan.py similarity index 100% rename from platform/marvell/sonic-platform-nokia/7215/sonic_platform/test/test-fan.py rename to platform/marvell-prestera/sonic-platform-nokia/7215/sonic_platform/test/test-fan.py diff --git a/platform/marvell/sonic-platform-nokia/7215/sonic_platform/test/test-psu.py b/platform/marvell-prestera/sonic-platform-nokia/7215/sonic_platform/test/test-psu.py similarity index 100% rename from platform/marvell/sonic-platform-nokia/7215/sonic_platform/test/test-psu.py rename to platform/marvell-prestera/sonic-platform-nokia/7215/sonic_platform/test/test-psu.py diff --git a/platform/marvell/sonic-platform-nokia/7215/sonic_platform/test/test-sfp.py b/platform/marvell-prestera/sonic-platform-nokia/7215/sonic_platform/test/test-sfp.py similarity index 100% rename from platform/marvell/sonic-platform-nokia/7215/sonic_platform/test/test-sfp.py rename to platform/marvell-prestera/sonic-platform-nokia/7215/sonic_platform/test/test-sfp.py diff --git a/platform/marvell/sonic-platform-nokia/7215/sonic_platform/test/test-thermal.py b/platform/marvell-prestera/sonic-platform-nokia/7215/sonic_platform/test/test-thermal.py similarity index 100% rename from platform/marvell/sonic-platform-nokia/7215/sonic_platform/test/test-thermal.py rename to platform/marvell-prestera/sonic-platform-nokia/7215/sonic_platform/test/test-thermal.py diff --git a/platform/marvell/sonic-platform-nokia/7215/sonic_platform/test/test-watchdog.py b/platform/marvell-prestera/sonic-platform-nokia/7215/sonic_platform/test/test-watchdog.py similarity index 100% rename from platform/marvell/sonic-platform-nokia/7215/sonic_platform/test/test-watchdog.py rename to platform/marvell-prestera/sonic-platform-nokia/7215/sonic_platform/test/test-watchdog.py diff --git a/platform/marvell/sonic-platform-nokia/7215/sonic_platform/thermal.py b/platform/marvell-prestera/sonic-platform-nokia/7215/sonic_platform/thermal.py similarity index 100% rename from platform/marvell/sonic-platform-nokia/7215/sonic_platform/thermal.py rename to platform/marvell-prestera/sonic-platform-nokia/7215/sonic_platform/thermal.py diff --git a/platform/marvell/sonic-platform-nokia/7215/sonic_platform/thermal_actions.py b/platform/marvell-prestera/sonic-platform-nokia/7215/sonic_platform/thermal_actions.py similarity index 100% rename from platform/marvell/sonic-platform-nokia/7215/sonic_platform/thermal_actions.py rename to platform/marvell-prestera/sonic-platform-nokia/7215/sonic_platform/thermal_actions.py diff --git a/platform/marvell/sonic-platform-nokia/7215/sonic_platform/thermal_conditions.py b/platform/marvell-prestera/sonic-platform-nokia/7215/sonic_platform/thermal_conditions.py similarity index 100% rename from platform/marvell/sonic-platform-nokia/7215/sonic_platform/thermal_conditions.py rename to platform/marvell-prestera/sonic-platform-nokia/7215/sonic_platform/thermal_conditions.py diff --git a/platform/marvell/sonic-platform-nokia/7215/sonic_platform/thermal_infos.py b/platform/marvell-prestera/sonic-platform-nokia/7215/sonic_platform/thermal_infos.py similarity index 100% rename from platform/marvell/sonic-platform-nokia/7215/sonic_platform/thermal_infos.py rename to platform/marvell-prestera/sonic-platform-nokia/7215/sonic_platform/thermal_infos.py diff --git a/platform/marvell/sonic-platform-nokia/7215/sonic_platform/thermal_manager.py b/platform/marvell-prestera/sonic-platform-nokia/7215/sonic_platform/thermal_manager.py similarity index 100% rename from platform/marvell/sonic-platform-nokia/7215/sonic_platform/thermal_manager.py rename to platform/marvell-prestera/sonic-platform-nokia/7215/sonic_platform/thermal_manager.py diff --git a/platform/marvell/sonic-platform-nokia/7215/sonic_platform/watchdog.py b/platform/marvell-prestera/sonic-platform-nokia/7215/sonic_platform/watchdog.py similarity index 100% rename from platform/marvell/sonic-platform-nokia/7215/sonic_platform/watchdog.py rename to platform/marvell-prestera/sonic-platform-nokia/7215/sonic_platform/watchdog.py diff --git a/platform/marvell/sonic-platform-nokia/debian/changelog b/platform/marvell-prestera/sonic-platform-nokia/debian/changelog similarity index 100% rename from platform/marvell/sonic-platform-nokia/debian/changelog rename to platform/marvell-prestera/sonic-platform-nokia/debian/changelog diff --git a/platform/marvell/sonic-platform-nokia/debian/compat b/platform/marvell-prestera/sonic-platform-nokia/debian/compat similarity index 100% rename from platform/marvell/sonic-platform-nokia/debian/compat rename to platform/marvell-prestera/sonic-platform-nokia/debian/compat diff --git a/platform/marvell/sonic-platform-nokia/debian/control b/platform/marvell-prestera/sonic-platform-nokia/debian/control similarity index 100% rename from platform/marvell/sonic-platform-nokia/debian/control rename to platform/marvell-prestera/sonic-platform-nokia/debian/control diff --git a/platform/marvell/sonic-platform-nokia/debian/rules b/platform/marvell-prestera/sonic-platform-nokia/debian/rules similarity index 100% rename from platform/marvell/sonic-platform-nokia/debian/rules rename to platform/marvell-prestera/sonic-platform-nokia/debian/rules diff --git a/platform/marvell/sonic-platform-nokia/debian/sonic-platform-nokia-7215-a1.install b/platform/marvell-prestera/sonic-platform-nokia/debian/sonic-platform-nokia-7215-a1.install similarity index 100% rename from platform/marvell/sonic-platform-nokia/debian/sonic-platform-nokia-7215-a1.install rename to platform/marvell-prestera/sonic-platform-nokia/debian/sonic-platform-nokia-7215-a1.install diff --git a/platform/marvell/sonic-platform-nokia/debian/sonic-platform-nokia-7215-a1.postinst b/platform/marvell-prestera/sonic-platform-nokia/debian/sonic-platform-nokia-7215-a1.postinst similarity index 100% rename from platform/marvell/sonic-platform-nokia/debian/sonic-platform-nokia-7215-a1.postinst rename to platform/marvell-prestera/sonic-platform-nokia/debian/sonic-platform-nokia-7215-a1.postinst diff --git a/platform/marvell/sonic-platform-nokia/debian/sonic-platform-nokia-7215.install b/platform/marvell-prestera/sonic-platform-nokia/debian/sonic-platform-nokia-7215.install similarity index 100% rename from platform/marvell/sonic-platform-nokia/debian/sonic-platform-nokia-7215.install rename to platform/marvell-prestera/sonic-platform-nokia/debian/sonic-platform-nokia-7215.install diff --git a/platform/marvell/sonic-platform-nokia/debian/sonic-platform-nokia-7215.postinst b/platform/marvell-prestera/sonic-platform-nokia/debian/sonic-platform-nokia-7215.postinst similarity index 100% rename from platform/marvell/sonic-platform-nokia/debian/sonic-platform-nokia-7215.postinst rename to platform/marvell-prestera/sonic-platform-nokia/debian/sonic-platform-nokia-7215.postinst diff --git a/platform/marvell/sonic_fit.its b/platform/marvell-prestera/sonic_fit.its similarity index 100% rename from platform/marvell/sonic_fit.its rename to platform/marvell-prestera/sonic_fit.its diff --git a/platform/marvell/mrvl-prestera b/platform/marvell/mrvl-prestera deleted file mode 160000 index 5834b7338ff9..000000000000 --- a/platform/marvell/mrvl-prestera +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5834b7338ff9ac6f03d45ab85568048be1f62199 diff --git a/src/sonic-py-common/sonic_py_common/device_info.py b/src/sonic-py-common/sonic_py_common/device_info.py index a5f982130484..41bd5ca2708c 100644 --- a/src/sonic-py-common/sonic_py_common/device_info.py +++ b/src/sonic-py-common/sonic_py_common/device_info.py @@ -744,7 +744,7 @@ def get_system_mac(namespace=None, hostname=None): (mac, err) = run_command(syseeprom_cmd) hw_mac_entry_outputs.append((mac, err)) - elif (version_info['asic_type'] == 'marvell'): + elif (version_info['asic_type'] == 'marvell-prestera'): # Try valid mac in eeprom, else fetch it from eth0 machine_key = "onie_machine" machine_vars = get_machine_info()