From 7d6c9ab7a49becb66b0eb302301437f9fcbf1bb8 Mon Sep 17 00:00:00 2001 From: ksridharan Date: Mon, 24 Jun 2024 08:58:49 -0700 Subject: [PATCH 1/2] Rename platform/innovium to platform/marvell-teralynx --- .gitmodules | 6 +-- README.md | 8 +-- .../x86_64-cel_midstone-r0/platform_asic | 2 +- .../x86_64-delta_agc032-r0/platform_asic | 2 +- .../platform_asic | 2 +- .../platform_asic | 2 +- .../platform_asic | 2 +- .../x86_64-wistron_6512_32r-r0/platform_asic | 2 +- .../platform_asic | 2 +- dockers/docker-orchagent/orchagent.sh | 2 +- dockers/docker-pde/syncd_init_common.sh | 8 +-- platform/innovium/docker-saiserver-invm.dep | 8 --- platform/innovium/docker-saiserver-invm.mk | 14 ----- platform/innovium/docker-syncd-invm-rpc.mk | 22 -------- platform/innovium/invm-sai.mk | 17 ------ platform/innovium/python-saithrift.mk | 6 --- platform/innovium/rules.mk | 28 ---------- .../platform-modules-midstone-200i.init | 52 ------------------- .../debian/platform-modules-et-c032if.init | 39 -------------- .../debian/netberg_platform_version.sh | 14 ----- .../docker-saiserver-mrvl-teralynx.dep | 8 +++ .../docker-saiserver-mrvl-teralynx.mk | 14 +++++ .../Dockerfile.j2 | 4 +- .../docker-saiserver-mrvl-teralynx}/start.sh | 0 .../supervisord.conf | 0 .../docker-syncd-mrvl-teralynx-rpc.mk | 22 ++++++++ .../Dockerfile.j2 | 12 ++--- .../ptf_nn_agent.conf | 0 .../docker-syncd-mrvl-teralynx.mk} | 8 +-- .../docker-syncd-mrvl-teralynx}/Dockerfile.j2 | 6 +-- .../critical_processes | 0 .../docker-syncd-mrvl-teralynx}/ivm_start.sh | 0 .../docker-syncd-mrvl-teralynx}/start.sh | 0 .../supervisord.conf | 0 .../libsaithrift-dev.dep | 2 +- .../libsaithrift-dev.mk | 12 ++--- .../one-image.mk | 8 +-- .../platform-modules-cel.mk | 0 .../platform-modules-delta.mk | 0 .../platform-modules-marvell.mk | 2 +- .../platform-modules-netberg.mk | 0 .../platform-modules-supermicro.mk | 0 .../platform-modules-wistron.mk | 0 .../platform.conf | 0 platform/marvell-teralynx/python-saithrift.mk | 6 +++ platform/marvell-teralynx/rules.mk | 28 ++++++++++ platform/marvell-teralynx/sai.mk | 17 ++++++ .../sonic-platform-marvell-teralynx} | 0 .../sonic-platform-modules-cel/.gitignore | 0 .../sonic-platform-modules-cel/LICENSE | 0 .../sonic-platform-modules-cel/README.md | 0 .../debian/changelog | 0 .../sonic-platform-modules-cel/debian/compat | 0 .../sonic-platform-modules-cel/debian/control | 0 .../platform-modules-midstone-200i.install | 0 .../platform-modules-midstone-200i.postinst | 0 .../sonic-platform-modules-cel/debian/rules | 0 .../cfg/midstone-200i-modules.conf | 0 .../midstone-200i/modules/200i_cpld.c | 0 .../midstone-200i/modules/200i_wdt.c | 0 .../midstone-200i/modules/Makefile | 0 .../midstone-200i/modules/mc24lc64t.c | 0 .../platform-modules-midstone-200i.service | 0 .../sonic-platform-modules-delta/LICENSE | 0 .../common/modules/dni_emc2305.c | 0 .../debian/changelog | 0 .../debian/compat | 0 .../debian/control | 0 .../debian/platform-modules-et-c032if.install | 0 .../sonic-platform-modules-delta/debian/rules | 0 .../et-c032if/cfg/et-c032if-modules.conf | 0 .../et-c032if/modules/Makefile | 0 .../modules/delta_et-c032if_platform.c | 0 .../scripts/et-c032if_platform_init.sh | 0 .../platform-modules-et-c032if.service | 0 .../aurora-715/modules/Makefile | 0 .../x86-64-netberg-aurora-715-common.c | 2 +- .../x86-64-netberg-aurora-715-common.h | 0 .../modules/x86-64-netberg-aurora-715-fan.c | 2 +- .../modules/x86-64-netberg-aurora-715-fan.h | 0 .../modules/x86-64-netberg-aurora-715-led.c | 2 +- .../modules/x86-64-netberg-aurora-715-led.h | 0 .../modules/x86-64-netberg-aurora-715-power.c | 2 +- .../modules/x86-64-netberg-aurora-715-power.h | 0 .../modules/x86-64-netberg-aurora-715-qsfp.c | 2 +- .../modules/x86-64-netberg-aurora-715-qsfp.h | 0 .../modules/x86-64-netberg-aurora-715-sys.c | 2 +- .../modules/x86-64-netberg-aurora-715-sys.h | 0 .../x86-64-netberg-aurora-715-thermal.c | 2 +- .../x86-64-netberg-aurora-715-thermal.h | 0 .../modules/x86-64-netberg-aurora-715.h | 0 .../aurora-715/scripts/sensors | 0 .../service/nba715-platform-init.service | 2 +- .../aurora-715/setup.py | 0 .../aurora-715/sonic_platform/__init__.py | 0 .../aurora-715/sonic_platform/chassis.py | 0 .../aurora-715/sonic_platform/component.py | 0 .../aurora-715/sonic_platform/eeprom.py | 0 .../aurora-715/sonic_platform/fan.py | 0 .../aurora-715/sonic_platform/platDev.py | 0 .../aurora-715/sonic_platform/platform.py | 0 .../aurora-715/sonic_platform/psu.py | 0 .../aurora-715/sonic_platform/sfp.py | 0 .../aurora-715/sonic_platform/thermal.py | 0 .../templates/netberg_aurora-715_util.py.j2 | 0 .../aurora-715/utils/halt | 0 .../utils/netberg_nba715_platform.sh | 0 .../utils/netberg_nba715_sensors.py | 0 .../aurora-715/utils/netberg_nba715_startup | 0 .../aurora-715/utils/poweroff | 0 .../aurora-715/utils/shutdown | 0 .../debian/changelog | 0 .../debian/compat | 0 .../debian/control | 0 .../debian/rules | 0 .../sonic-platform-netberg-aurora-715.install | 0 ...sonic-platform-netberg-aurora-715.postinst | 0 .../debian/changelog | 0 .../debian/compat | 0 .../debian/control | 0 .../platform-modules-sse-t7132s.install | 0 .../platform-modules-sse-t7132s.postinst | 0 .../debian/rules | 0 .../sse-t7132s/cfg/iTCO_wdt.conf | 0 .../sse-t7132s/cfg/t7132s-modules.conf | 0 .../sse-t7132s/modules/Makefile | 0 .../sse-t7132s/modules/t7132s.c | 0 .../scripts/health_checker_thermal.py | 0 .../sse-t7132s/scripts/platform.sh | 0 .../sse-t7132s/scripts/sysledctl.py | 0 .../sse-t7132s/scripts/test_cpld.py | 0 .../sse-t7132s/setup.py | 0 .../sse-t7132s/sonic_platform/__init__.py | 0 .../sse-t7132s/sonic_platform/chassis.py | 0 .../sse-t7132s/sonic_platform/component.py | 0 .../sse-t7132s/sonic_platform/eeprom.py | 0 .../sse-t7132s/sonic_platform/fan.py | 0 .../sse-t7132s/sonic_platform/fan_drawer.py | 0 .../sse-t7132s/sonic_platform/helper.py | 0 .../sse-t7132s/sonic_platform/pcie.py | 0 .../sse-t7132s/sonic_platform/platform.py | 0 .../sse-t7132s/sonic_platform/psu.py | 0 .../sse-t7132s/sonic_platform/sfp.py | 0 .../sse-t7132s/sonic_platform/thermal.py | 0 .../sse-t7132s/sonic_platform/watchdog.py | 0 .../platform-modules-sse-t7132s.service | 0 .../sse-t7132s/systemd/sysled.service | 0 .../6512-32r/modules/Makefile | 0 .../6512-32r/modules/i2c-imc.c | 0 .../6512-32r/modules/oldjc42.c | 0 .../6512-32r/modules/wistron_6512_32r_cpld.c | 0 .../6512-32r/modules/wistron_6512_32r_fan.c | 0 .../6512-32r/modules/wistron_6512_32r_leds.c | 0 .../6512-32r/modules/wistron_6512_32r_oom.c | 0 .../6512-32r/modules/wistron_6512_32r_psu.c | 0 .../modules/wistron_6512_32r_syseeprom.c | 0 .../modules/wistron_6512_32r_thermal.c | 0 .../service/6512-32r-firmware_ver.service | 0 .../service/6512-32r-platform.service | 0 .../service/6512-32r-syseeprom.service | 0 .../service/platform-modules-6512-32r.service | 0 .../6512-32r/setup.py | 0 .../6512-32r/sonic_platform/__init__.py | 0 .../6512-32r/sonic_platform/chassis.py | 0 .../6512-32r/sonic_platform/component.py | 0 .../6512-32r/sonic_platform/eeprom.py | 0 .../6512-32r/sonic_platform/fan.py | 0 .../6512-32r/sonic_platform/fan_drawer.py | 0 .../6512-32r/sonic_platform/platform.py | 0 .../6512-32r/sonic_platform/psu.py | 0 .../6512-32r/sonic_platform/sfp.py | 0 .../6512-32r/sonic_platform/thermal.py | 0 .../6512-32r/sonic_platform/watchdog.py | 0 .../6512-32r/utils/platform_firmware_version | 0 .../6512-32r/utils/platform_sync | 0 .../6512-32r/utils/platform_syseeprom | 0 .../6512-32r/utils/sonic-fanthrml-monitor | 0 .../6512-32r/utils/sonic-led-monitor | 0 .../6512-32r/utils/sonic-psu-monitor | 0 .../6512-32r/utils/sonic-qsfp-eeprom-monitor | 0 .../6512-32r/utils/sonic-qsfp-monitor | 0 .../6512-32r/utils/sonic-send-temp-to-bmc | 0 .../6512-32r/utils/wistron_6512_32r_util.py | 0 .../sonic-platform-modules-wistron/LICENSE | 0 .../debian/changelog | 0 .../debian/compat | 0 .../debian/control | 0 .../debian/rules | 0 .../sonic-platform-wistron-6512-32r.install | 0 .../sonic-platform-wistron-6512-32r.postinst | 0 .../sonic-platform-wistron-sw-to3200k.install | 0 ...sonic-platform-wistron-sw-to3200k.postinst | 0 .../sw-to3200k/cfg/sw-to3200k-modules.conf | 0 .../sw-to3200k/classes/__init__.py | 0 .../sw-to3200k/modules/Makefile | 0 .../sw-to3200k/modules/wistron_i2c_psu.c | 0 .../modules/wistron_sw_to3200k_cpld.c | 0 .../modules/wistron_sw_to3200k_fan.c | 0 .../modules/wistron_sw_to3200k_leds.c | 0 .../modules/wistron_sw_to3200k_oom.c | 0 .../modules/wistron_sw_to3200k_psu.c | 0 .../modules/wistron_sw_to3200k_thermal.c | 0 .../platform-modules-sw-to3200k.service | 0 .../service/sw-to3200k-firmware_ver.service | 0 .../sw-to3200k/service/to3200k-led.service | 0 .../service/to3200k-platform.service | 0 .../sw-to3200k/service/to3200k-pld.service | 0 .../sw-to3200k/setup.py | 0 .../sw-to3200k/sonic_platform/__init__.py | 0 .../sw-to3200k/sonic_platform/chassis.py | 0 .../sw-to3200k/sonic_platform/component.py | 0 .../sw-to3200k/sonic_platform/eeprom.py | 0 .../sw-to3200k/sonic_platform/fan.py | 0 .../sw-to3200k/sonic_platform/fan_drawer.py | 0 .../sw-to3200k/sonic_platform/platform.py | 0 .../sw-to3200k/sonic_platform/psu.py | 0 .../sw-to3200k/sonic_platform/sfp.py | 0 .../sw-to3200k/sonic_platform/thermal.py | 0 .../sw-to3200k/sonic_platform/watchdog.py | 0 .../utils/platform_firmware_version | 0 .../sw-to3200k/utils/platform_led | 0 .../sw-to3200k/utils/platform_pld | 0 .../sw-to3200k/utils/platform_sync | 0 .../sw-to3200k/utils/sonic-fanthrml-monitor | 0 .../sw-to3200k/utils/sonic-led-monitor | 0 .../sw-to3200k/utils/sonic-psu-monitor | 0 .../sw-to3200k/utils/sonic-qsfp-monitor | 0 .../sw-to3200k/utils/sw_to3200k_watchdog.sh | 0 .../utils/wistron_sw_to3200k_util.py | 0 229 files changed, 148 insertions(+), 255 deletions(-) delete mode 100644 platform/innovium/docker-saiserver-invm.dep delete mode 100644 platform/innovium/docker-saiserver-invm.mk delete mode 100755 platform/innovium/docker-syncd-invm-rpc.mk delete mode 100755 platform/innovium/invm-sai.mk delete mode 100755 platform/innovium/python-saithrift.mk delete mode 100755 platform/innovium/rules.mk delete mode 100755 platform/innovium/sonic-platform-modules-cel/debian/platform-modules-midstone-200i.init delete mode 100755 platform/innovium/sonic-platform-modules-delta/debian/platform-modules-et-c032if.init delete mode 100755 platform/innovium/sonic-platform-modules-netberg/debian/netberg_platform_version.sh create mode 100644 platform/marvell-teralynx/docker-saiserver-mrvl-teralynx.dep create mode 100644 platform/marvell-teralynx/docker-saiserver-mrvl-teralynx.mk rename platform/{innovium/docker-saiserver-invm => marvell-teralynx/docker-saiserver-mrvl-teralynx}/Dockerfile.j2 (88%) rename platform/{innovium/docker-saiserver-invm => marvell-teralynx/docker-saiserver-mrvl-teralynx}/start.sh (100%) rename platform/{innovium/docker-saiserver-invm => marvell-teralynx/docker-saiserver-mrvl-teralynx}/supervisord.conf (100%) create mode 100755 platform/marvell-teralynx/docker-syncd-mrvl-teralynx-rpc.mk rename platform/{innovium/docker-syncd-invm-rpc => marvell-teralynx/docker-syncd-mrvl-teralynx-rpc}/Dockerfile.j2 (77%) rename platform/{innovium/docker-syncd-invm-rpc => marvell-teralynx/docker-syncd-mrvl-teralynx-rpc}/ptf_nn_agent.conf (100%) rename platform/{innovium/docker-syncd-invm.mk => marvell-teralynx/docker-syncd-mrvl-teralynx.mk} (63%) rename platform/{innovium/docker-syncd-invm => marvell-teralynx/docker-syncd-mrvl-teralynx}/Dockerfile.j2 (84%) rename platform/{innovium/docker-syncd-invm => marvell-teralynx/docker-syncd-mrvl-teralynx}/critical_processes (100%) rename platform/{innovium/docker-syncd-invm => marvell-teralynx/docker-syncd-mrvl-teralynx}/ivm_start.sh (100%) rename platform/{innovium/docker-syncd-invm => marvell-teralynx/docker-syncd-mrvl-teralynx}/start.sh (100%) rename platform/{innovium/docker-syncd-invm => marvell-teralynx/docker-syncd-mrvl-teralynx}/supervisord.conf (100%) rename platform/{innovium => marvell-teralynx}/libsaithrift-dev.dep (82%) rename platform/{innovium => marvell-teralynx}/libsaithrift-dev.mk (59%) rename platform/{innovium => marvell-teralynx}/one-image.mk (76%) rename platform/{innovium => marvell-teralynx}/platform-modules-cel.mk (100%) rename platform/{innovium => marvell-teralynx}/platform-modules-delta.mk (100%) rename platform/{innovium => marvell-teralynx}/platform-modules-marvell.mk (95%) rename platform/{innovium => marvell-teralynx}/platform-modules-netberg.mk (100%) rename platform/{innovium => marvell-teralynx}/platform-modules-supermicro.mk (100%) rename platform/{innovium => marvell-teralynx}/platform-modules-wistron.mk (100%) rename platform/{innovium => marvell-teralynx}/platform.conf (100%) create mode 100755 platform/marvell-teralynx/python-saithrift.mk create mode 100755 platform/marvell-teralynx/rules.mk create mode 100755 platform/marvell-teralynx/sai.mk rename platform/{innovium/sonic-platform-marvell => marvell-teralynx/sonic-platform-marvell-teralynx} (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-cel/.gitignore (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-cel/LICENSE (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-cel/README.md (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-cel/debian/changelog (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-cel/debian/compat (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-cel/debian/control (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-cel/debian/platform-modules-midstone-200i.install (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-cel/debian/platform-modules-midstone-200i.postinst (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-cel/debian/rules (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-cel/midstone-200i/cfg/midstone-200i-modules.conf (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-cel/midstone-200i/modules/200i_cpld.c (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-cel/midstone-200i/modules/200i_wdt.c (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-cel/midstone-200i/modules/Makefile (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-cel/midstone-200i/modules/mc24lc64t.c (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-cel/midstone-200i/systemd/platform-modules-midstone-200i.service (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-delta/LICENSE (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-delta/common/modules/dni_emc2305.c (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-delta/debian/changelog (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-delta/debian/compat (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-delta/debian/control (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-delta/debian/platform-modules-et-c032if.install (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-delta/debian/rules (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-delta/et-c032if/cfg/et-c032if-modules.conf (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-delta/et-c032if/modules/Makefile (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-delta/et-c032if/modules/delta_et-c032if_platform.c (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-delta/et-c032if/scripts/et-c032if_platform_init.sh (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-delta/systemd/platform-modules-et-c032if.service (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-netberg/aurora-715/modules/Makefile (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-common.c (99%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-common.h (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-fan.c (99%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-fan.h (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-led.c (98%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-led.h (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-power.c (99%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-power.h (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-qsfp.c (99%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-qsfp.h (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-sys.c (99%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-sys.h (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-thermal.c (99%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-thermal.h (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715.h (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-netberg/aurora-715/scripts/sensors (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-netberg/aurora-715/service/nba715-platform-init.service (83%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-netberg/aurora-715/setup.py (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-netberg/aurora-715/sonic_platform/__init__.py (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-netberg/aurora-715/sonic_platform/chassis.py (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-netberg/aurora-715/sonic_platform/component.py (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-netberg/aurora-715/sonic_platform/eeprom.py (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-netberg/aurora-715/sonic_platform/fan.py (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-netberg/aurora-715/sonic_platform/platDev.py (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-netberg/aurora-715/sonic_platform/platform.py (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-netberg/aurora-715/sonic_platform/psu.py (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-netberg/aurora-715/sonic_platform/sfp.py (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-netberg/aurora-715/sonic_platform/thermal.py (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-netberg/aurora-715/templates/netberg_aurora-715_util.py.j2 (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-netberg/aurora-715/utils/halt (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-netberg/aurora-715/utils/netberg_nba715_platform.sh (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-netberg/aurora-715/utils/netberg_nba715_sensors.py (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-netberg/aurora-715/utils/netberg_nba715_startup (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-netberg/aurora-715/utils/poweroff (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-netberg/aurora-715/utils/shutdown (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-netberg/debian/changelog (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-netberg/debian/compat (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-netberg/debian/control (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-netberg/debian/rules (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-netberg/debian/sonic-platform-netberg-aurora-715.install (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-netberg/debian/sonic-platform-netberg-aurora-715.postinst (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-supermicro/debian/changelog (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-supermicro/debian/compat (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-supermicro/debian/control (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-supermicro/debian/platform-modules-sse-t7132s.install (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-supermicro/debian/platform-modules-sse-t7132s.postinst (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-supermicro/debian/rules (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-supermicro/sse-t7132s/cfg/iTCO_wdt.conf (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-supermicro/sse-t7132s/cfg/t7132s-modules.conf (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-supermicro/sse-t7132s/modules/Makefile (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-supermicro/sse-t7132s/modules/t7132s.c (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-supermicro/sse-t7132s/scripts/health_checker_thermal.py (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-supermicro/sse-t7132s/scripts/platform.sh (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-supermicro/sse-t7132s/scripts/sysledctl.py (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-supermicro/sse-t7132s/scripts/test_cpld.py (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-supermicro/sse-t7132s/setup.py (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-supermicro/sse-t7132s/sonic_platform/__init__.py (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-supermicro/sse-t7132s/sonic_platform/chassis.py (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-supermicro/sse-t7132s/sonic_platform/component.py (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-supermicro/sse-t7132s/sonic_platform/eeprom.py (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-supermicro/sse-t7132s/sonic_platform/fan.py (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-supermicro/sse-t7132s/sonic_platform/fan_drawer.py (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-supermicro/sse-t7132s/sonic_platform/helper.py (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-supermicro/sse-t7132s/sonic_platform/pcie.py (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-supermicro/sse-t7132s/sonic_platform/platform.py (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-supermicro/sse-t7132s/sonic_platform/psu.py (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-supermicro/sse-t7132s/sonic_platform/sfp.py (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-supermicro/sse-t7132s/sonic_platform/thermal.py (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-supermicro/sse-t7132s/sonic_platform/watchdog.py (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-supermicro/sse-t7132s/systemd/platform-modules-sse-t7132s.service (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-supermicro/sse-t7132s/systemd/sysled.service (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/6512-32r/modules/Makefile (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/6512-32r/modules/i2c-imc.c (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/6512-32r/modules/oldjc42.c (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/6512-32r/modules/wistron_6512_32r_cpld.c (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/6512-32r/modules/wistron_6512_32r_fan.c (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/6512-32r/modules/wistron_6512_32r_leds.c (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/6512-32r/modules/wistron_6512_32r_oom.c (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/6512-32r/modules/wistron_6512_32r_psu.c (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/6512-32r/modules/wistron_6512_32r_syseeprom.c (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/6512-32r/modules/wistron_6512_32r_thermal.c (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/6512-32r/service/6512-32r-firmware_ver.service (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/6512-32r/service/6512-32r-platform.service (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/6512-32r/service/6512-32r-syseeprom.service (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/6512-32r/service/platform-modules-6512-32r.service (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/6512-32r/setup.py (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/6512-32r/sonic_platform/__init__.py (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/6512-32r/sonic_platform/chassis.py (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/6512-32r/sonic_platform/component.py (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/6512-32r/sonic_platform/eeprom.py (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/6512-32r/sonic_platform/fan.py (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/6512-32r/sonic_platform/fan_drawer.py (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/6512-32r/sonic_platform/platform.py (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/6512-32r/sonic_platform/psu.py (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/6512-32r/sonic_platform/sfp.py (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/6512-32r/sonic_platform/thermal.py (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/6512-32r/sonic_platform/watchdog.py (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/6512-32r/utils/platform_firmware_version (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/6512-32r/utils/platform_sync (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/6512-32r/utils/platform_syseeprom (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/6512-32r/utils/sonic-fanthrml-monitor (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/6512-32r/utils/sonic-led-monitor (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/6512-32r/utils/sonic-psu-monitor (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/6512-32r/utils/sonic-qsfp-eeprom-monitor (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/6512-32r/utils/sonic-qsfp-monitor (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/6512-32r/utils/sonic-send-temp-to-bmc (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/6512-32r/utils/wistron_6512_32r_util.py (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/LICENSE (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/debian/changelog (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/debian/compat (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/debian/control (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/debian/rules (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/debian/sonic-platform-wistron-6512-32r.install (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/debian/sonic-platform-wistron-6512-32r.postinst (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/debian/sonic-platform-wistron-sw-to3200k.install (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/debian/sonic-platform-wistron-sw-to3200k.postinst (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/sw-to3200k/cfg/sw-to3200k-modules.conf (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/sw-to3200k/classes/__init__.py (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/sw-to3200k/modules/Makefile (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/sw-to3200k/modules/wistron_i2c_psu.c (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/sw-to3200k/modules/wistron_sw_to3200k_cpld.c (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/sw-to3200k/modules/wistron_sw_to3200k_fan.c (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/sw-to3200k/modules/wistron_sw_to3200k_leds.c (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/sw-to3200k/modules/wistron_sw_to3200k_oom.c (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/sw-to3200k/modules/wistron_sw_to3200k_psu.c (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/sw-to3200k/modules/wistron_sw_to3200k_thermal.c (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/sw-to3200k/service/platform-modules-sw-to3200k.service (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/sw-to3200k/service/sw-to3200k-firmware_ver.service (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/sw-to3200k/service/to3200k-led.service (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/sw-to3200k/service/to3200k-platform.service (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/sw-to3200k/service/to3200k-pld.service (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/sw-to3200k/setup.py (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/sw-to3200k/sonic_platform/__init__.py (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/sw-to3200k/sonic_platform/chassis.py (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/sw-to3200k/sonic_platform/component.py (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/sw-to3200k/sonic_platform/eeprom.py (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/sw-to3200k/sonic_platform/fan.py (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/sw-to3200k/sonic_platform/fan_drawer.py (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/sw-to3200k/sonic_platform/platform.py (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/sw-to3200k/sonic_platform/psu.py (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/sw-to3200k/sonic_platform/sfp.py (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/sw-to3200k/sonic_platform/thermal.py (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/sw-to3200k/sonic_platform/watchdog.py (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/sw-to3200k/utils/platform_firmware_version (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/sw-to3200k/utils/platform_led (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/sw-to3200k/utils/platform_pld (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/sw-to3200k/utils/platform_sync (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/sw-to3200k/utils/sonic-fanthrml-monitor (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/sw-to3200k/utils/sonic-led-monitor (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/sw-to3200k/utils/sonic-psu-monitor (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/sw-to3200k/utils/sonic-qsfp-monitor (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/sw-to3200k/utils/sw_to3200k_watchdog.sh (100%) rename platform/{innovium => marvell-teralynx}/sonic-platform-modules-wistron/sw-to3200k/utils/wistron_sw_to3200k_util.py (100%) diff --git a/.gitmodules b/.gitmodules index 487cf6d8a4a8..d4f3516b5ee9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -124,6 +124,6 @@ [submodule "platform/marvell/sonic-platform-marvell"] path = platform/marvell/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 +[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 diff --git a/README.md b/README.md index 2488f972df41..5799352af345 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ [![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.innovium?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) @@ -215,7 +215,7 @@ The supported ASIC vendors are: * PLATFORM=centec * PLATFORM=nephos * PLATFORM=nvidia-bluefield -* PLATFORM=innovium +* PLATFORM=marvell-teralynx * PLATFORM=vs ## Usage for ARM Architecture @@ -373,8 +373,8 @@ 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-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/device/celestica/x86_64-cel_midstone-r0/platform_asic b/device/celestica/x86_64-cel_midstone-r0/platform_asic index 84083a7415d9..a657472d7ad2 100644 --- a/device/celestica/x86_64-cel_midstone-r0/platform_asic +++ b/device/celestica/x86_64-cel_midstone-r0/platform_asic @@ -1 +1 @@ -innovium +marvell-teralynx diff --git a/device/delta/x86_64-delta_agc032-r0/platform_asic b/device/delta/x86_64-delta_agc032-r0/platform_asic index 84083a7415d9..a657472d7ad2 100644 --- a/device/delta/x86_64-delta_agc032-r0/platform_asic +++ b/device/delta/x86_64-delta_agc032-r0/platform_asic @@ -1 +1 @@ -innovium +marvell-teralynx diff --git a/device/marvell/x86_64-marvell_dbmvtx9180-r0/platform_asic b/device/marvell/x86_64-marvell_dbmvtx9180-r0/platform_asic index 84083a7415d9..a657472d7ad2 100644 --- a/device/marvell/x86_64-marvell_dbmvtx9180-r0/platform_asic +++ b/device/marvell/x86_64-marvell_dbmvtx9180-r0/platform_asic @@ -1 +1 @@ -innovium +marvell-teralynx diff --git a/device/netberg/x86_64-netberg_aurora_715-r0/platform_asic b/device/netberg/x86_64-netberg_aurora_715-r0/platform_asic index 84083a7415d9..a657472d7ad2 100644 --- a/device/netberg/x86_64-netberg_aurora_715-r0/platform_asic +++ b/device/netberg/x86_64-netberg_aurora_715-r0/platform_asic @@ -1 +1 @@ -innovium +marvell-teralynx diff --git a/device/supermicro/x86_64-supermicro_sse_t7132s-r0/platform_asic b/device/supermicro/x86_64-supermicro_sse_t7132s-r0/platform_asic index 84083a7415d9..a657472d7ad2 100644 --- a/device/supermicro/x86_64-supermicro_sse_t7132s-r0/platform_asic +++ b/device/supermicro/x86_64-supermicro_sse_t7132s-r0/platform_asic @@ -1 +1 @@ -innovium +marvell-teralynx diff --git a/device/wistron/x86_64-wistron_6512_32r-r0/platform_asic b/device/wistron/x86_64-wistron_6512_32r-r0/platform_asic index 84083a7415d9..a657472d7ad2 100644 --- a/device/wistron/x86_64-wistron_6512_32r-r0/platform_asic +++ b/device/wistron/x86_64-wistron_6512_32r-r0/platform_asic @@ -1 +1 @@ -innovium +marvell-teralynx diff --git a/device/wistron/x86_64-wistron_sw_to3200k-r0/platform_asic b/device/wistron/x86_64-wistron_sw_to3200k-r0/platform_asic index 84083a7415d9..a657472d7ad2 100644 --- a/device/wistron/x86_64-wistron_sw_to3200k-r0/platform_asic +++ b/device/wistron/x86_64-wistron_sw_to3200k-r0/platform_asic @@ -1 +1 @@ -innovium +marvell-teralynx diff --git a/dockers/docker-orchagent/orchagent.sh b/dockers/docker-orchagent/orchagent.sh index 256def591807..4889597dd703 100755 --- a/dockers/docker-orchagent/orchagent.sh +++ b/dockers/docker-orchagent/orchagent.sh @@ -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" diff --git a/dockers/docker-pde/syncd_init_common.sh b/dockers/docker-pde/syncd_init_common.sh index 0212f842329a..7a28d7208f01 100755 --- a/dockers/docker-pde/syncd_init_common.sh +++ b/dockers/docker-pde/syncd_init_common.sh @@ -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 } @@ -236,8 +236,8 @@ config_syncd() 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 diff --git a/platform/innovium/docker-saiserver-invm.dep b/platform/innovium/docker-saiserver-invm.dep deleted file mode 100644 index cf8cc4b6b0f8..000000000000 --- a/platform/innovium/docker-saiserver-invm.dep +++ /dev/null @@ -1,8 +0,0 @@ -DPATH := $($(DOCKER_SAISERVER_INVM)_PATH) -DEP_FILES := $(SONIC_COMMON_FILES_LIST) platform/innovium/docker-saiserver-invm.mk platform/innovium/docker-saiserver-invm.dep -DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST) -DEP_FILES += $(shell git ls-files $(DPATH)) - -$(DOCKER_SAISERVER_INVM)_CACHE_MODE := GIT_CONTENT_SHA -$(DOCKER_SAISERVER_INVM)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST) -$(DOCKER_SAISERVER_INVM)_DEP_FILES := $(DEP_FILES) diff --git a/platform/innovium/docker-saiserver-invm.mk b/platform/innovium/docker-saiserver-invm.mk deleted file mode 100644 index 1f30efc6b1c8..000000000000 --- a/platform/innovium/docker-saiserver-invm.mk +++ /dev/null @@ -1,14 +0,0 @@ -# docker image for invm saiserver - -DOCKER_SAISERVER_INVM = docker-saiserver$(SAITHRIFT_VER)-invm.gz -$(DOCKER_SAISERVER_INVM)_PATH = $(PLATFORM_PATH)/docker-saiserver-invm -$(DOCKER_SAISERVER_INVM)_DEPENDS += $(SAISERVER) -$(DOCKER_SAISERVER_INVM)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_BOOKWORM) -SONIC_DOCKER_IMAGES += $(DOCKER_SAISERVER_INVM) - -$(DOCKER_SAISERVER_INVM)_CONTAINER_NAME = saiserver$(SAITHRIFT_VER) -$(DOCKER_SAISERVER_INVM)_RUN_OPT += --privileged -t -$(DOCKER_SAISERVER_INVM)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf -$(DOCKER_SAISERVER_INVM)_RUN_OPT += -v /var/run/docker-saiserver:/var/run/sswsyncd -$(DOCKER_SAISERVER_INVM)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro -$(DOCKER_SAISERVER_INVM)_RUN_OPT += -v /host/warmboot:/var/warmboot diff --git a/platform/innovium/docker-syncd-invm-rpc.mk b/platform/innovium/docker-syncd-invm-rpc.mk deleted file mode 100755 index c4e1c8762876..000000000000 --- a/platform/innovium/docker-syncd-invm-rpc.mk +++ /dev/null @@ -1,22 +0,0 @@ -# docker image for innovium syncd with rpc - -DOCKER_SYNCD_INVM_RPC = docker-syncd-invm-rpc.gz -$(DOCKER_SYNCD_INVM_RPC)_PATH = $(PLATFORM_PATH)/docker-syncd-invm-rpc -$(DOCKER_SYNCD_INVM_RPC)_DEPENDS += $(SYNCD_RPC) $(INVM_LIBSAI) $(INVM_SHELL) -$(DOCKER_SYNCD_INVM_RPC)_PYTHON_WHEELS += $(PTF_PY3) -$(DOCKER_SYNCD_INVM_RPC)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT) -$(DOCKER_SYNCD_INVM_RPC)_LOAD_DOCKERS += $(DOCKER_SYNCD_BASE) -SONIC_DOCKER_IMAGES += $(DOCKER_SYNCD_INVM_RPC) -SONIC_BOOKWORM_DOCKERS += $(DOCKER_SYNCD_INVM_RPC) -ifeq ($(ENABLE_SYNCD_RPC),y) -SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_SYNCD_INVM_RPC) -endif - -$(DOCKER_SYNCD_INVM_RPC)_CONTAINER_NAME = syncd -$(DOCKER_SYNCD_INVM_RPC)_VERSION = 1.0.0-rpc -$(DOCKER_SYNCD_INVM_RPC)_PACKAGE_NAME = syncd -$(DOCKER_SYNCD_INVM_RPC)_RUN_OPT += --privileged -t -$(DOCKER_SYNCD_INVM_RPC)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf -$(DOCKER_SYNCD_INVM_RPC)_RUN_OPT += -v /var/run/docker-syncd:/var/run/sswsyncd -$(DOCKER_SYNCD_INVM_RPC)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro -$(DOCKER_SYNCD_INVM_RPC)_RUN_OPT += -v /host/warmboot:/var/warmboot diff --git a/platform/innovium/invm-sai.mk b/platform/innovium/invm-sai.mk deleted file mode 100755 index fa3e8abad9ad..000000000000 --- a/platform/innovium/invm-sai.mk +++ /dev/null @@ -1,17 +0,0 @@ -# INVM SAI - -INVM_SAI_ONLINE = https://github.com/Innovium/SONiC/raw/master/debian/master - -INVM_LIBSAI = isai.deb -INVM_HSAI = saihdr.deb -INVM_DRV = ipd.deb -INVM_SHELL = ishell.deb - -$(INVM_LIBSAI)_URL = $(INVM_SAI_ONLINE)/$(INVM_LIBSAI) -$(INVM_HSAI)_URL = $(INVM_SAI_ONLINE)/$(INVM_HSAI) -$(INVM_DRV)_URL = $(INVM_SAI_ONLINE)/$(INVM_DRV) -$(INVM_SHELL)_URL = $(INVM_SAI_ONLINE)/$(INVM_SHELL) - -$(eval $(call add_conflict_package,$(INVM_HSAI),$(LIBSAIVS_DEV))) - -SONIC_ONLINE_DEBS += $(INVM_LIBSAI) $(INVM_HSAI) $(INVM_DRV) $(INVM_SHELL) diff --git a/platform/innovium/python-saithrift.mk b/platform/innovium/python-saithrift.mk deleted file mode 100755 index 23d7df188346..000000000000 --- a/platform/innovium/python-saithrift.mk +++ /dev/null @@ -1,6 +0,0 @@ -# python-saithrift package - -PYTHON_SAITHRIFT_INVM = python-saithrift_1.2.1_$(CONFIGURED_ARCH).deb -$(PYTHON_SAITHRIFT_INVM)_SRC_PATH = $(SRC_PATH)/SAI -$(PYTHON_SAITHRIFT_INVM)_DEPENDS += $(INVM_LIBSAI) $(INVM_HSAI) $(THRIFT_COMPILER) $(PYTHON_THRIFT) $(LIBTHRIFT_DEV) -SONIC_DPKG_DEBS += $(PYTHON_SAITHRIFT_INVM) diff --git a/platform/innovium/rules.mk b/platform/innovium/rules.mk deleted file mode 100755 index 906d0619d5f5..000000000000 --- a/platform/innovium/rules.mk +++ /dev/null @@ -1,28 +0,0 @@ -include $(PLATFORM_PATH)/invm-sai.mk -include $(PLATFORM_PATH)/platform-modules-cel.mk -include $(PLATFORM_PATH)/platform-modules-supermicro.mk -include $(PLATFORM_PATH)/platform-modules-wistron.mk -include $(PLATFORM_PATH)/platform-modules-marvell.mk -include $(PLATFORM_PATH)/docker-syncd-invm.mk -include $(PLATFORM_PATH)/docker-syncd-invm-rpc.mk -include $(PLATFORM_PATH)/one-image.mk -include $(PLATFORM_PATH)/docker-saiserver-invm.mk -include $(PLATFORM_PATH)/libsaithrift-dev.mk -include $(PLATFORM_PATH)/python-saithrift.mk - -SONIC_ALL += $(SONIC_INVM_ONE_IMAGE) \ - $(DOCKER_FPM) \ - $(DOCKER_PTF_INVM) \ - $(DOCKER_SYNCD_INVM_RPC) - -# Inject invm sai into syncd -$(SYNCD)_DEPENDS += $(INVM_HSAI) $(INVM_LIBSAI) $(INVM_SHELL) -$(SYNCD)_UNINSTALLS += $(INVM_HSAI) - -ifeq ($(ENABLE_SYNCD_RPC),y) -$(SYNCD)_DEPENDS := $(filter-out $(LIBTHRIFT_DEV),$($(SYNCD)_DEPENDS)) -$(SYNCD)_DEPENDS += $(LIBSAITHRIFT_DEV) -endif - -# Runtime dependency on invm sai is set only for syncd -$(SYNCD)_RDEPENDS += $(INVM_HSAI) diff --git a/platform/innovium/sonic-platform-modules-cel/debian/platform-modules-midstone-200i.init b/platform/innovium/sonic-platform-modules-cel/debian/platform-modules-midstone-200i.init deleted file mode 100755 index 7074d2b58125..000000000000 --- a/platform/innovium/sonic-platform-modules-cel/debian/platform-modules-midstone-200i.init +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/bash - -### BEGIN INIT INFO -# Provides: setup-board -# Required-Start: $portmap -# Required-Stop: -# Should-Start: -# Should-Stop: -# Default-Start: S -# Default-Stop: 0 6 -# Short-Description: Setup 200i board. -### END INIT INFO - -case "$1" in -start) - echo -n "Setting up board... " - - # Attach TLV 0x56 eeprom - echo 24lc64t 0x56 > /sys/bus/i2c/devices/i2c-0/new_device - sleep 2 - - modprobe 200i-cpld - sleep 2 - - # Turn off/down lpmod by defult (0 - Normal, 1 - Low Pow) - echo 0x00 > /sys/devices/platform/ms200i_cpld/qsfp_lpmode - - # Attach 64 instances of EEPROM driver QSFP ports - for ((n=1;n<=66;n++)); - do - echo sff8436 0x50 > /sys/bus/i2c/devices/i2c-$n/new_device - sleep 0.1 - done - - echo "done." - ;; - -stop) - echo "done." - ;; - -force-reload|restart) - echo "Not supported" - ;; - -*) - echo "Usage: /etc/init.d/platform-modules-200i.init {start|stop}" - exit 1 - ;; -esac - -exit 0 diff --git a/platform/innovium/sonic-platform-modules-delta/debian/platform-modules-et-c032if.init b/platform/innovium/sonic-platform-modules-delta/debian/platform-modules-et-c032if.init deleted file mode 100755 index f2d24b04a0d4..000000000000 --- a/platform/innovium/sonic-platform-modules-delta/debian/platform-modules-et-c032if.init +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -### BEGIN INIT INFO -# Provides: setup-board -# Required-Start: -# Required-Stop: -# Should-Start: -# Should-Stop: -# Default-Start: S -# Default-Stop: 0 6 -# Short-Description: Setup et-c032if board. -### END INIT INFO - -case "$1" in -start) - echo -n "Setting up board... " - modprobe optoe - modprobe delta_et-c032if_platform - - /usr/local/bin/et-c032if_platform_init.sh - echo "done." - ;; - -stop) - echo "done." - - ;; - -force-reload|restart) - echo "Not supported" - ;; - -*) - echo "Usage: /etc/init.d/platform-modules-et-c032if.init {start|stop}" - exit 1 - ;; -esac - -exit 0 diff --git a/platform/innovium/sonic-platform-modules-netberg/debian/netberg_platform_version.sh b/platform/innovium/sonic-platform-modules-netberg/debian/netberg_platform_version.sh deleted file mode 100755 index 17c6ff4cdd76..000000000000 --- a/platform/innovium/sonic-platform-modules-netberg/debian/netberg_platform_version.sh +++ /dev/null @@ -1,14 +0,0 @@ -#! /bin/sh -# driver version - -PLATFROM=$1 -PLATFROM_PATH=$2 - -export PLATFORM_DRIVER_VER='"0.3.16"' - -echo "PLATFORM_DRIVER_VER = $PLATFORM_DRIVER_VER" - -util_name=$(echo $PLATFROM) - -j2 $PLATFROM_PATH/templates/netberg_${util_name}_util.py.j2 -o $PLATFROM_PATH/utils/netberg_${util_name}_util.py -chmod 775 $PLATFROM_PATH/utils/netberg_${util_name}_util.py diff --git a/platform/marvell-teralynx/docker-saiserver-mrvl-teralynx.dep b/platform/marvell-teralynx/docker-saiserver-mrvl-teralynx.dep new file mode 100644 index 000000000000..5fa3dd443899 --- /dev/null +++ b/platform/marvell-teralynx/docker-saiserver-mrvl-teralynx.dep @@ -0,0 +1,8 @@ +DPATH := $($(DOCKER_SAISERVER_MRVL_TERALYNX)_PATH) +DEP_FILES := $(SONIC_COMMON_FILES_LIST) platform/marvell-teralynx/docker-saiserver-mrvl-teralynx.mk platform/marvell-teralynx/docker-saiserver-mrvl-teralynx.dep +DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST) +DEP_FILES += $(shell git ls-files $(DPATH)) + +$(DOCKER_SAISERVER_MRVL_TERALYNX)_CACHE_MODE := GIT_CONTENT_SHA +$(DOCKER_SAISERVER_MRVL_TERALYNX)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST) +$(DOCKER_SAISERVER_MRVL_TERALYNX)_DEP_FILES := $(DEP_FILES) diff --git a/platform/marvell-teralynx/docker-saiserver-mrvl-teralynx.mk b/platform/marvell-teralynx/docker-saiserver-mrvl-teralynx.mk new file mode 100644 index 000000000000..3c01455d4c67 --- /dev/null +++ b/platform/marvell-teralynx/docker-saiserver-mrvl-teralynx.mk @@ -0,0 +1,14 @@ +# docker image for mrvl-teralynx saiserver + +DOCKER_SAISERVER_MRVL_TERALYNX = docker-saiserver$(SAITHRIFT_VER)-mrvl-teralynx.gz +$(DOCKER_SAISERVER_MRVL_TERALYNX)_PATH = $(PLATFORM_PATH)/docker-saiserver-mrvl-teralynx +$(DOCKER_SAISERVER_MRVL_TERALYNX)_DEPENDS += $(SAISERVER) +$(DOCKER_SAISERVER_MRVL_TERALYNX)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_BOOKWORM) +SONIC_DOCKER_IMAGES += $(DOCKER_SAISERVER_MRVL_TERALYNX) + +$(DOCKER_SAISERVER_MRVL_TERALYNX)_CONTAINER_NAME = saiserver$(SAITHRIFT_VER) +$(DOCKER_SAISERVER_MRVL_TERALYNX)_RUN_OPT += --privileged -t +$(DOCKER_SAISERVER_MRVL_TERALYNX)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf +$(DOCKER_SAISERVER_MRVL_TERALYNX)_RUN_OPT += -v /var/run/docker-saiserver:/var/run/sswsyncd +$(DOCKER_SAISERVER_MRVL_TERALYNX)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro +$(DOCKER_SAISERVER_MRVL_TERALYNX)_RUN_OPT += -v /host/warmboot:/var/warmboot diff --git a/platform/innovium/docker-saiserver-invm/Dockerfile.j2 b/platform/marvell-teralynx/docker-saiserver-mrvl-teralynx/Dockerfile.j2 similarity index 88% rename from platform/innovium/docker-saiserver-invm/Dockerfile.j2 rename to platform/marvell-teralynx/docker-saiserver-mrvl-teralynx/Dockerfile.j2 index c6d0ada17e36..2dd04f57f4e7 100644 --- a/platform/innovium/docker-saiserver-invm/Dockerfile.j2 +++ b/platform/marvell-teralynx/docker-saiserver-mrvl-teralynx/Dockerfile.j2 @@ -21,13 +21,13 @@ RUN pip3 install numpy RUN pip3 install yamlordereddictloader COPY \ -{% for deb in docker_saiserver_invm_debs.split(' ') -%} +{% for deb in docker_saiserver_mrvl_teralynx_debs.split(' ') -%} debs/{{ deb }}{{' '}} {%- endfor -%} debs/ RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; } ; \ -{% for deb in docker_saiserver_invm_debs.split(' ') -%} +{% for deb in docker_saiserver_mrvl_teralynx_debs.split(' ') -%} dpkg_apt debs/{{ deb }}{{'; '}} {%- endfor %} diff --git a/platform/innovium/docker-saiserver-invm/start.sh b/platform/marvell-teralynx/docker-saiserver-mrvl-teralynx/start.sh similarity index 100% rename from platform/innovium/docker-saiserver-invm/start.sh rename to platform/marvell-teralynx/docker-saiserver-mrvl-teralynx/start.sh diff --git a/platform/innovium/docker-saiserver-invm/supervisord.conf b/platform/marvell-teralynx/docker-saiserver-mrvl-teralynx/supervisord.conf similarity index 100% rename from platform/innovium/docker-saiserver-invm/supervisord.conf rename to platform/marvell-teralynx/docker-saiserver-mrvl-teralynx/supervisord.conf diff --git a/platform/marvell-teralynx/docker-syncd-mrvl-teralynx-rpc.mk b/platform/marvell-teralynx/docker-syncd-mrvl-teralynx-rpc.mk new file mode 100755 index 000000000000..c0ba78183dcf --- /dev/null +++ b/platform/marvell-teralynx/docker-syncd-mrvl-teralynx-rpc.mk @@ -0,0 +1,22 @@ +# docker image for marvell-teralynx syncd with rpc + +DOCKER_SYNCD_MRVL_TERALYNX_RPC = docker-syncd-mrvl-teralynx-rpc.gz +$(DOCKER_SYNCD_MRVL_TERALYNX_RPC)_PATH = $(PLATFORM_PATH)/docker-syncd-mrvl-teralynx-rpc +$(DOCKER_SYNCD_MRVL_TERALYNX_RPC)_DEPENDS += $(SYNCD_RPC) $(MRVL_TERALYNX_LIBSAI) $(MRVL_TERALYNX_SHELL) +$(DOCKER_SYNCD_MRVL_TERALYNX_RPC)_PYTHON_WHEELS += $(PTF_PY3) +$(DOCKER_SYNCD_MRVL_TERALYNX_RPC)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT) +$(DOCKER_SYNCD_MRVL_TERALYNX_RPC)_LOAD_DOCKERS += $(DOCKER_SYNCD_BASE) +SONIC_DOCKER_IMAGES += $(DOCKER_SYNCD_MRVL_TERALYNX_RPC) +SONIC_BOOKWORM_DOCKERS += $(DOCKER_SYNCD_MRVL_TERALYNX_RPC) +ifeq ($(ENABLE_SYNCD_RPC),y) +SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_SYNCD_MRVL_TERALYNX_RPC) +endif + +$(DOCKER_SYNCD_MRVL_TERALYNX_RPC)_CONTAINER_NAME = syncd +$(DOCKER_SYNCD_MRVL_TERALYNX_RPC)_VERSION = 1.0.0-rpc +$(DOCKER_SYNCD_MRVL_TERALYNX_RPC)_PACKAGE_NAME = syncd +$(DOCKER_SYNCD_MRVL_TERALYNX_RPC)_RUN_OPT += --privileged -t +$(DOCKER_SYNCD_MRVL_TERALYNX_RPC)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf +$(DOCKER_SYNCD_MRVL_TERALYNX_RPC)_RUN_OPT += -v /var/run/docker-syncd:/var/run/sswsyncd +$(DOCKER_SYNCD_MRVL_TERALYNX_RPC)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro +$(DOCKER_SYNCD_MRVL_TERALYNX_RPC)_RUN_OPT += -v /host/warmboot:/var/warmboot diff --git a/platform/innovium/docker-syncd-invm-rpc/Dockerfile.j2 b/platform/marvell-teralynx/docker-syncd-mrvl-teralynx-rpc/Dockerfile.j2 similarity index 77% rename from platform/innovium/docker-syncd-invm-rpc/Dockerfile.j2 rename to platform/marvell-teralynx/docker-syncd-mrvl-teralynx-rpc/Dockerfile.j2 index b5e00c0a8118..39fe5a21e2ed 100755 --- a/platform/innovium/docker-syncd-invm-rpc/Dockerfile.j2 +++ b/platform/marvell-teralynx/docker-syncd-mrvl-teralynx-rpc/Dockerfile.j2 @@ -1,11 +1,11 @@ -FROM docker-syncd-invm-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}} +FROM docker-syncd-mrvl-teralynx-{{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_invm_rpc_debs.split(' ') -%} +{% for deb in docker_syncd_mrvl_teralynx_rpc_debs.split(' ') -%} debs/{{ deb }}{{' '}} {%- endfor -%} debs/ @@ -34,7 +34,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_invm_rpc_debs.split(' ') -%} +{% for deb in docker_syncd_mrvl_teralynx_rpc_debs.split(' ') -%} dpkg_apt debs/{{ deb }}{{'; '}} {%- endfor %} @@ -46,12 +46,12 @@ RUN pip3 install cffi \ COPY ["ptf_nn_agent.conf", "/etc/supervisor/conf.d/"] -{% if docker_syncd_invm_rpc_whls.strip() -%} +{% if docker_syncd_mrvl_teralynx_rpc_whls.strip() -%} # Copy locally-built Python wheel dependencies -{{ copy_files("python-wheels/", docker_syncd_invm_rpc_whls.split(' '), "/python-wheels/") }} +{{ copy_files("python-wheels/", docker_syncd_mrvl_teralynx_rpc_whls.split(' '), "/python-wheels/") }} # Install locally-built Python wheel dependencies -{{ install_python_wheels(docker_syncd_invm_rpc_whls.split(' ')) }} +{{ install_python_wheels(docker_syncd_mrvl_teralynx_rpc_whls.split(' ')) }} {% endif %} diff --git a/platform/innovium/docker-syncd-invm-rpc/ptf_nn_agent.conf b/platform/marvell-teralynx/docker-syncd-mrvl-teralynx-rpc/ptf_nn_agent.conf similarity index 100% rename from platform/innovium/docker-syncd-invm-rpc/ptf_nn_agent.conf rename to platform/marvell-teralynx/docker-syncd-mrvl-teralynx-rpc/ptf_nn_agent.conf diff --git a/platform/innovium/docker-syncd-invm.mk b/platform/marvell-teralynx/docker-syncd-mrvl-teralynx.mk similarity index 63% rename from platform/innovium/docker-syncd-invm.mk rename to platform/marvell-teralynx/docker-syncd-mrvl-teralynx.mk index 572680721f07..d95e2efbf766 100755 --- a/platform/innovium/docker-syncd-invm.mk +++ b/platform/marvell-teralynx/docker-syncd-mrvl-teralynx.mk @@ -1,9 +1,9 @@ -# docker image for innovium syncd +# docker image for marvell-teralynx syncd -DOCKER_SYNCD_PLATFORM_CODE = invm +DOCKER_SYNCD_PLATFORM_CODE = mrvl-teralynx include $(PLATFORM_PATH)/../template/docker-syncd-bookworm.mk -$(DOCKER_SYNCD_BASE)_DEPENDS += $(SYNCD) $(PYTHON_SDK_API) $(INVM_LIBSAI) $(INVM_SHELL) +$(DOCKER_SYNCD_BASE)_DEPENDS += $(SYNCD) $(PYTHON_SDK_API) $(MRVL_TERALYNX_LIBSAI) $(MRVL_TERALYNX_SHELL) $(DOCKER_SYNCD_BASE)_DBG_DEPENDS += $(SYNCD_DBG) \ $(LIBSWSSCOMMON_DBG) \ @@ -12,6 +12,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 = innovium +$(DOCKER_SYNCD_BASE)_MACHINE = marvell-teralynx $(DOCKER_SYNCD_BASE)_RUN_OPT += -v /host/warmboot:/var/warmboot diff --git a/platform/innovium/docker-syncd-invm/Dockerfile.j2 b/platform/marvell-teralynx/docker-syncd-mrvl-teralynx/Dockerfile.j2 similarity index 84% rename from platform/innovium/docker-syncd-invm/Dockerfile.j2 rename to platform/marvell-teralynx/docker-syncd-mrvl-teralynx/Dockerfile.j2 index 3abe009d0afa..0e93cab95b3b 100755 --- a/platform/innovium/docker-syncd-invm/Dockerfile.j2 +++ b/platform/marvell-teralynx/docker-syncd-mrvl-teralynx/Dockerfile.j2 @@ -9,12 +9,12 @@ ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update COPY \ -{% for deb in docker_syncd_invm_debs.split(' ') -%} +{% for deb in docker_syncd_mrvl_teralynx_debs.split(' ') -%} debs/{{ deb }}{{' '}} {%- endfor -%} debs/ -# Needed for Innovium Debug Shell +# Needed for Marvell Teralynx Debug Shell RUN apt-get install -y net-tools RUN apt-get install -y libjansson4 RUN apt-get install -y libyaml-dev @@ -23,7 +23,7 @@ RUN pip3 install numpy RUN pip3 install yamlordereddictloader RUN dpkg -i \ -{% for deb in docker_syncd_invm_debs.split(' ') -%} +{% for deb in docker_syncd_mrvl_teralynx_debs.split(' ') -%} debs/{{ deb }}{{' '}} {%- endfor %} diff --git a/platform/innovium/docker-syncd-invm/critical_processes b/platform/marvell-teralynx/docker-syncd-mrvl-teralynx/critical_processes similarity index 100% rename from platform/innovium/docker-syncd-invm/critical_processes rename to platform/marvell-teralynx/docker-syncd-mrvl-teralynx/critical_processes diff --git a/platform/innovium/docker-syncd-invm/ivm_start.sh b/platform/marvell-teralynx/docker-syncd-mrvl-teralynx/ivm_start.sh similarity index 100% rename from platform/innovium/docker-syncd-invm/ivm_start.sh rename to platform/marvell-teralynx/docker-syncd-mrvl-teralynx/ivm_start.sh diff --git a/platform/innovium/docker-syncd-invm/start.sh b/platform/marvell-teralynx/docker-syncd-mrvl-teralynx/start.sh similarity index 100% rename from platform/innovium/docker-syncd-invm/start.sh rename to platform/marvell-teralynx/docker-syncd-mrvl-teralynx/start.sh diff --git a/platform/innovium/docker-syncd-invm/supervisord.conf b/platform/marvell-teralynx/docker-syncd-mrvl-teralynx/supervisord.conf similarity index 100% rename from platform/innovium/docker-syncd-invm/supervisord.conf rename to platform/marvell-teralynx/docker-syncd-mrvl-teralynx/supervisord.conf diff --git a/platform/innovium/libsaithrift-dev.dep b/platform/marvell-teralynx/libsaithrift-dev.dep similarity index 82% rename from platform/innovium/libsaithrift-dev.dep rename to platform/marvell-teralynx/libsaithrift-dev.dep index eee628b5f235..6655bf6d0b4d 100644 --- a/platform/innovium/libsaithrift-dev.dep +++ b/platform/marvell-teralynx/libsaithrift-dev.dep @@ -1,6 +1,6 @@ #DPKG FRK SPATH := $($(LIBSAITHRIFT_DEV)_SRC_PATH) -DEP_FILES := $(SONIC_COMMON_FILES_LIST) platform/innovium/libsaithrift-dev.mk platform/innovium/libsaithrift-dev.dep +DEP_FILES := $(SONIC_COMMON_FILES_LIST) platform/marvell-teralynx/libsaithrift-dev.mk platform/marvell-teralynx/libsaithrift-dev.dep DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST) SMDEP_PATHS := $(SPATH) $(SPATH)/test/ptf $(SPATH)/test/saithrift/ctypesgen $(foreach path, $(SMDEP_PATHS), $(eval $(path) :=$(filter-out $(SMDEP_PATHS),$(addprefix $(path)/, $(shell cd $(path) && git ls-files | grep -Ev " " ))))) diff --git a/platform/innovium/libsaithrift-dev.mk b/platform/marvell-teralynx/libsaithrift-dev.mk similarity index 59% rename from platform/innovium/libsaithrift-dev.mk rename to platform/marvell-teralynx/libsaithrift-dev.mk index 2a8b6bf137c4..17972dd7e851 100755 --- a/platform/innovium/libsaithrift-dev.mk +++ b/platform/marvell-teralynx/libsaithrift-dev.mk @@ -4,22 +4,20 @@ SAI_VER = 0.9.4 LIBSAITHRIFT_DEV = libsaithrift$(SAITHRIFT_VER)-dev_$(SAI_VER)_$(CONFIGURED_ARCH).deb $(LIBSAITHRIFT_DEV)_SRC_PATH = $(SRC_PATH)/sonic-sairedis/SAI ifeq ($(SAITHRIFT_V2),y) -$(LIBSAITHRIFT_DEV)_DEPENDS += $(INVM_LIBSAI) $(INVM_HSAI) $(LIBSAIMETADATA) $(LIBSAIMETADATA_DEV) -$(LIBSAITHRIFT_DEV)_RDEPENDS += $(INVM_HSAI) $(LIBSAIMETADATA) +$(LIBSAITHRIFT_DEV)_DEPENDS += $(MRVL_TERALYNX_LIBSAI) $(MRVL_TERALYNX_HSAI) $(MRVL_TERALYNX_SHELL) $(LIBSAIMETADATA) $(LIBSAIMETADATA_DEV) +$(LIBSAITHRIFT_DEV)_RDEPENDS += $(MRVL_TERALYNX_LIBSAI) $(MRVL_TERALYNX_HSAI) $(MRVL_TERALYNX_SHELL) $(LIBSAIMETADATA) $(LIBSAITHRIFT_DEV)_BUILD_ENV = SAITHRIFTV2=true SAITHRIFT_VER=v2 else -$(LIBSAITHRIFT_DEV)_DEPENDS += $(INVM_LIBSAI) $(INVM_HSAI) -$(LIBSAITHRIFT_DEV)_RDEPENDS += $(INVM_HSAI) +$(LIBSAITHRIFT_DEV)_DEPENDS += $(MRVL_TERALYNX_LIBSAI) $(MRVL_TERALYNX_HSAI) $(MRVL_TERALYNX_SHELL) +$(LIBSAITHRIFT_DEV)_RDEPENDS += $(MRVL_TERALYNX_LIBSAI) $(MRVL_TERALYNX_HSAI) $(MRVL_TERALYNX_SHELL) endif -$(LIBSAITHRIFT_DEV)_DEPENDS += $(LIBSAIMETADATA) $(LIBSAIMETADATA_DEV) -$(LIBSAITHRIFT_DEV)_RDEPENDS += $(LIBSAIMETADATA) $(INVM_LIBSAI) $(INVM_SHELL) SONIC_DPKG_DEBS += $(LIBSAITHRIFT_DEV) PYTHON_SAITHRIFT = python-saithrift$(SAITHRIFT_VER)_$(SAI_VER)_$(CONFIGURED_ARCH).deb $(eval $(call add_extra_package,$(LIBSAITHRIFT_DEV),$(PYTHON_SAITHRIFT))) SAISERVER = saiserver$(SAITHRIFT_VER)_$(SAI_VER)_$(CONFIGURED_ARCH).deb -$(SAISERVER)_RDEPENDS += $(LIBSAITHRIFT_DEV) $(INVM_LIBSAI) $(INVM_HSAI) $(INVM_SHELL) +$(SAISERVER)_RDEPENDS += $(LIBSAITHRIFT_DEV) $(MRVL_TERALYNX_LIBSAI) $(MRVL_TERALYNX_HSAI) $(MRVL_TERALYNX_SHELL) $(eval $(call add_extra_package,$(LIBSAITHRIFT_DEV),$(SAISERVER))) SAISERVER_DBG = saiserver$(SAITHRIFT_VER)-dbg_$(SAI_VER)_$(CONFIGURED_ARCH).deb diff --git a/platform/innovium/one-image.mk b/platform/marvell-teralynx/one-image.mk similarity index 76% rename from platform/innovium/one-image.mk rename to platform/marvell-teralynx/one-image.mk index b1abcf613aa4..f62c9aecec31 100755 --- a/platform/innovium/one-image.mk +++ b/platform/marvell-teralynx/one-image.mk @@ -1,7 +1,7 @@ -# sonic innovium ONE image installer +# sonic marvell-teralynx ONE image installer -SONIC_ONE_IMAGE = sonic-innovium.bin -$(SONIC_ONE_IMAGE)_MACHINE = innovium +SONIC_ONE_IMAGE = sonic-marvell-teralynx.bin +$(SONIC_ONE_IMAGE)_MACHINE = marvell-teralynx $(SONIC_ONE_IMAGE)_INSTALLS += $(SYSTEMD_SONIC_GENERATOR) $(SONIC_ONE_IMAGE)_IMAGE_TYPE = onie $(SONIC_ONE_IMAGE)_LAZY_INSTALLS += $(CEL_MIDSTONE_200I_PLATFORM_MODULE) @@ -10,6 +10,6 @@ $(SONIC_ONE_IMAGE)_LAZY_INSTALLS += $(NETBERG_AURORA_715_PLATFORM_MODULE) $(SONIC_ONE_IMAGE)_LAZY_INSTALLS += $(SMCI_SSE_T7132S_PLATFORM_MODULE) $(SONIC_ONE_IMAGE)_LAZY_INSTALLS += $(WISTRON_PLATFORM_MODULE) $(SONIC_ONE_IMAGE)_LAZY_INSTALLS += $(TL10_DBMVTX9180_PLATFORM) -$(SONIC_ONE_IMAGE)_INSTALLS += $(INVM_DRV) +$(SONIC_ONE_IMAGE)_INSTALLS += $(MRVL_TERALYNX_DRV) $(SONIC_ONE_IMAGE)_DOCKERS += $(SONIC_INSTALL_DOCKER_IMAGES) SONIC_INSTALLERS += $(SONIC_ONE_IMAGE) diff --git a/platform/innovium/platform-modules-cel.mk b/platform/marvell-teralynx/platform-modules-cel.mk similarity index 100% rename from platform/innovium/platform-modules-cel.mk rename to platform/marvell-teralynx/platform-modules-cel.mk diff --git a/platform/innovium/platform-modules-delta.mk b/platform/marvell-teralynx/platform-modules-delta.mk similarity index 100% rename from platform/innovium/platform-modules-delta.mk rename to platform/marvell-teralynx/platform-modules-delta.mk diff --git a/platform/innovium/platform-modules-marvell.mk b/platform/marvell-teralynx/platform-modules-marvell.mk similarity index 95% rename from platform/innovium/platform-modules-marvell.mk rename to platform/marvell-teralynx/platform-modules-marvell.mk index b3d720e64dde..eadd190deb11 100644 --- a/platform/innovium/platform-modules-marvell.mk +++ b/platform/marvell-teralynx/platform-modules-marvell.mk @@ -5,7 +5,7 @@ TL10_DBMVTX9180_VERSION = 1.0 export TL10_DBMVTX9180_VERSION TL10_DBMVTX9180_PLATFORM = sonic-platform-marvell-dbmvtx9180_$(TL10_DBMVTX9180_VERSION)_$(CONFIGURED_ARCH).deb -$(TL10_DBMVTX9180_PLATFORM)_SRC_PATH = $(PLATFORM_PATH)/sonic-platform-marvell +$(TL10_DBMVTX9180_PLATFORM)_SRC_PATH = $(PLATFORM_PATH)/sonic-platform-marvell-teralynx $(TL10_DBMVTX9180_PLATFORM)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON) $(TL10_DBMVTX9180_PLATFORM)_PLATFORM = x86_64-marvell_dbmvtx9180-r0 diff --git a/platform/innovium/platform-modules-netberg.mk b/platform/marvell-teralynx/platform-modules-netberg.mk similarity index 100% rename from platform/innovium/platform-modules-netberg.mk rename to platform/marvell-teralynx/platform-modules-netberg.mk diff --git a/platform/innovium/platform-modules-supermicro.mk b/platform/marvell-teralynx/platform-modules-supermicro.mk similarity index 100% rename from platform/innovium/platform-modules-supermicro.mk rename to platform/marvell-teralynx/platform-modules-supermicro.mk diff --git a/platform/innovium/platform-modules-wistron.mk b/platform/marvell-teralynx/platform-modules-wistron.mk similarity index 100% rename from platform/innovium/platform-modules-wistron.mk rename to platform/marvell-teralynx/platform-modules-wistron.mk diff --git a/platform/innovium/platform.conf b/platform/marvell-teralynx/platform.conf similarity index 100% rename from platform/innovium/platform.conf rename to platform/marvell-teralynx/platform.conf diff --git a/platform/marvell-teralynx/python-saithrift.mk b/platform/marvell-teralynx/python-saithrift.mk new file mode 100755 index 000000000000..f220ebc2bae8 --- /dev/null +++ b/platform/marvell-teralynx/python-saithrift.mk @@ -0,0 +1,6 @@ +# python-saithrift package + +PYTHON_SAITHRIFT_MRVL_TERALYNX = python-saithrift_1.2.1_$(CONFIGURED_ARCH).deb +$(PYTHON_SAITHRIFT_MRVL_TERALYNX)_SRC_PATH = $(SRC_PATH)/SAI +$(PYTHON_SAITHRIFT_MRVL_TERALYNX)_DEPENDS += $(MRVL_TERALYNX_LIBSAI) $(MRVL_TERALYNX_HSAI) $(THRIFT_COMPILER) $(PYTHON_THRIFT) $(LIBTHRIFT_DEV) +SONIC_DPKG_DEBS += $(PYTHON_SAITHRIFT_MRVL_TERALYNX) diff --git a/platform/marvell-teralynx/rules.mk b/platform/marvell-teralynx/rules.mk new file mode 100755 index 000000000000..3ba96af2f66b --- /dev/null +++ b/platform/marvell-teralynx/rules.mk @@ -0,0 +1,28 @@ +include $(PLATFORM_PATH)/sai.mk +include $(PLATFORM_PATH)/platform-modules-cel.mk +include $(PLATFORM_PATH)/platform-modules-supermicro.mk +include $(PLATFORM_PATH)/platform-modules-wistron.mk +include $(PLATFORM_PATH)/platform-modules-marvell.mk +include $(PLATFORM_PATH)/docker-syncd-mrvl-teralynx.mk +include $(PLATFORM_PATH)/docker-syncd-mrvl-teralynx-rpc.mk +include $(PLATFORM_PATH)/one-image.mk +include $(PLATFORM_PATH)/docker-saiserver-mrvl-teralynx.mk +include $(PLATFORM_PATH)/libsaithrift-dev.mk +include $(PLATFORM_PATH)/python-saithrift.mk + +SONIC_ALL += $(SONIC_MRVL_TERALYNX_ONE_IMAGE) \ + $(DOCKER_FPM) \ + $(DOCKER_PTF_MRVL_TERALYNX) \ + $(DOCKER_SYNCD_MRVL_TERALYNX_RPC) + +# Inject mrvl-teralynx sai into syncd +$(SYNCD)_DEPENDS += $(MRVL_TERALYNX_HSAI) $(MRVL_TERALYNX_LIBSAI) $(MRVL_TERALYNX_SHELL) +$(SYNCD)_UNINSTALLS += $(MRVL_TERALYNX_HSAI) + +ifeq ($(ENABLE_SYNCD_RPC),y) +$(SYNCD)_DEPENDS := $(filter-out $(LIBTHRIFT_DEV),$($(SYNCD)_DEPENDS)) +$(SYNCD)_DEPENDS += $(LIBSAITHRIFT_DEV) +endif + +# Runtime dependency on mrvl-teralynx sai is set only for syncd +$(SYNCD)_RDEPENDS += $(MRVL_TERALYNX_HSAI) diff --git a/platform/marvell-teralynx/sai.mk b/platform/marvell-teralynx/sai.mk new file mode 100755 index 000000000000..272ddc269a39 --- /dev/null +++ b/platform/marvell-teralynx/sai.mk @@ -0,0 +1,17 @@ +# MRVL_TERALYNX SAI + +MRVL_TERALYNX_SAI_ONLINE = https://github.com/Marvell-switching/sonic-marvell-teralynx-binaries/raw/main/debian/master + +MRVL_TERALYNX_LIBSAI = isai.deb +MRVL_TERALYNX_HSAI = saihdr.deb +MRVL_TERALYNX_DRV = ipd.deb +MRVL_TERALYNX_SHELL = ishell.deb + +$(MRVL_TERALYNX_LIBSAI)_URL = $(MRVL_TERALYNX_SAI_ONLINE)/$(MRVL_TERALYNX_LIBSAI) +$(MRVL_TERALYNX_HSAI)_URL = $(MRVL_TERALYNX_SAI_ONLINE)/$(MRVL_TERALYNX_HSAI) +$(MRVL_TERALYNX_DRV)_URL = $(MRVL_TERALYNX_SAI_ONLINE)/$(MRVL_TERALYNX_DRV) +$(MRVL_TERALYNX_SHELL)_URL = $(MRVL_TERALYNX_SAI_ONLINE)/$(MRVL_TERALYNX_SHELL) + +$(eval $(call add_conflict_package,$(MRVL_TERALYNX_HSAI),$(LIBSAIVS_DEV))) + +SONIC_ONLINE_DEBS += $(MRVL_TERALYNX_LIBSAI) $(MRVL_TERALYNX_HSAI) $(MRVL_TERALYNX_DRV) $(MRVL_TERALYNX_SHELL) diff --git a/platform/innovium/sonic-platform-marvell b/platform/marvell-teralynx/sonic-platform-marvell-teralynx similarity index 100% rename from platform/innovium/sonic-platform-marvell rename to platform/marvell-teralynx/sonic-platform-marvell-teralynx diff --git a/platform/innovium/sonic-platform-modules-cel/.gitignore b/platform/marvell-teralynx/sonic-platform-modules-cel/.gitignore similarity index 100% rename from platform/innovium/sonic-platform-modules-cel/.gitignore rename to platform/marvell-teralynx/sonic-platform-modules-cel/.gitignore diff --git a/platform/innovium/sonic-platform-modules-cel/LICENSE b/platform/marvell-teralynx/sonic-platform-modules-cel/LICENSE similarity index 100% rename from platform/innovium/sonic-platform-modules-cel/LICENSE rename to platform/marvell-teralynx/sonic-platform-modules-cel/LICENSE diff --git a/platform/innovium/sonic-platform-modules-cel/README.md b/platform/marvell-teralynx/sonic-platform-modules-cel/README.md similarity index 100% rename from platform/innovium/sonic-platform-modules-cel/README.md rename to platform/marvell-teralynx/sonic-platform-modules-cel/README.md diff --git a/platform/innovium/sonic-platform-modules-cel/debian/changelog b/platform/marvell-teralynx/sonic-platform-modules-cel/debian/changelog similarity index 100% rename from platform/innovium/sonic-platform-modules-cel/debian/changelog rename to platform/marvell-teralynx/sonic-platform-modules-cel/debian/changelog diff --git a/platform/innovium/sonic-platform-modules-cel/debian/compat b/platform/marvell-teralynx/sonic-platform-modules-cel/debian/compat similarity index 100% rename from platform/innovium/sonic-platform-modules-cel/debian/compat rename to platform/marvell-teralynx/sonic-platform-modules-cel/debian/compat diff --git a/platform/innovium/sonic-platform-modules-cel/debian/control b/platform/marvell-teralynx/sonic-platform-modules-cel/debian/control similarity index 100% rename from platform/innovium/sonic-platform-modules-cel/debian/control rename to platform/marvell-teralynx/sonic-platform-modules-cel/debian/control diff --git a/platform/innovium/sonic-platform-modules-cel/debian/platform-modules-midstone-200i.install b/platform/marvell-teralynx/sonic-platform-modules-cel/debian/platform-modules-midstone-200i.install similarity index 100% rename from platform/innovium/sonic-platform-modules-cel/debian/platform-modules-midstone-200i.install rename to platform/marvell-teralynx/sonic-platform-modules-cel/debian/platform-modules-midstone-200i.install diff --git a/platform/innovium/sonic-platform-modules-cel/debian/platform-modules-midstone-200i.postinst b/platform/marvell-teralynx/sonic-platform-modules-cel/debian/platform-modules-midstone-200i.postinst similarity index 100% rename from platform/innovium/sonic-platform-modules-cel/debian/platform-modules-midstone-200i.postinst rename to platform/marvell-teralynx/sonic-platform-modules-cel/debian/platform-modules-midstone-200i.postinst diff --git a/platform/innovium/sonic-platform-modules-cel/debian/rules b/platform/marvell-teralynx/sonic-platform-modules-cel/debian/rules similarity index 100% rename from platform/innovium/sonic-platform-modules-cel/debian/rules rename to platform/marvell-teralynx/sonic-platform-modules-cel/debian/rules diff --git a/platform/innovium/sonic-platform-modules-cel/midstone-200i/cfg/midstone-200i-modules.conf b/platform/marvell-teralynx/sonic-platform-modules-cel/midstone-200i/cfg/midstone-200i-modules.conf similarity index 100% rename from platform/innovium/sonic-platform-modules-cel/midstone-200i/cfg/midstone-200i-modules.conf rename to platform/marvell-teralynx/sonic-platform-modules-cel/midstone-200i/cfg/midstone-200i-modules.conf diff --git a/platform/innovium/sonic-platform-modules-cel/midstone-200i/modules/200i_cpld.c b/platform/marvell-teralynx/sonic-platform-modules-cel/midstone-200i/modules/200i_cpld.c similarity index 100% rename from platform/innovium/sonic-platform-modules-cel/midstone-200i/modules/200i_cpld.c rename to platform/marvell-teralynx/sonic-platform-modules-cel/midstone-200i/modules/200i_cpld.c diff --git a/platform/innovium/sonic-platform-modules-cel/midstone-200i/modules/200i_wdt.c b/platform/marvell-teralynx/sonic-platform-modules-cel/midstone-200i/modules/200i_wdt.c similarity index 100% rename from platform/innovium/sonic-platform-modules-cel/midstone-200i/modules/200i_wdt.c rename to platform/marvell-teralynx/sonic-platform-modules-cel/midstone-200i/modules/200i_wdt.c diff --git a/platform/innovium/sonic-platform-modules-cel/midstone-200i/modules/Makefile b/platform/marvell-teralynx/sonic-platform-modules-cel/midstone-200i/modules/Makefile similarity index 100% rename from platform/innovium/sonic-platform-modules-cel/midstone-200i/modules/Makefile rename to platform/marvell-teralynx/sonic-platform-modules-cel/midstone-200i/modules/Makefile diff --git a/platform/innovium/sonic-platform-modules-cel/midstone-200i/modules/mc24lc64t.c b/platform/marvell-teralynx/sonic-platform-modules-cel/midstone-200i/modules/mc24lc64t.c similarity index 100% rename from platform/innovium/sonic-platform-modules-cel/midstone-200i/modules/mc24lc64t.c rename to platform/marvell-teralynx/sonic-platform-modules-cel/midstone-200i/modules/mc24lc64t.c diff --git a/platform/innovium/sonic-platform-modules-cel/midstone-200i/systemd/platform-modules-midstone-200i.service b/platform/marvell-teralynx/sonic-platform-modules-cel/midstone-200i/systemd/platform-modules-midstone-200i.service similarity index 100% rename from platform/innovium/sonic-platform-modules-cel/midstone-200i/systemd/platform-modules-midstone-200i.service rename to platform/marvell-teralynx/sonic-platform-modules-cel/midstone-200i/systemd/platform-modules-midstone-200i.service diff --git a/platform/innovium/sonic-platform-modules-delta/LICENSE b/platform/marvell-teralynx/sonic-platform-modules-delta/LICENSE similarity index 100% rename from platform/innovium/sonic-platform-modules-delta/LICENSE rename to platform/marvell-teralynx/sonic-platform-modules-delta/LICENSE diff --git a/platform/innovium/sonic-platform-modules-delta/common/modules/dni_emc2305.c b/platform/marvell-teralynx/sonic-platform-modules-delta/common/modules/dni_emc2305.c similarity index 100% rename from platform/innovium/sonic-platform-modules-delta/common/modules/dni_emc2305.c rename to platform/marvell-teralynx/sonic-platform-modules-delta/common/modules/dni_emc2305.c diff --git a/platform/innovium/sonic-platform-modules-delta/debian/changelog b/platform/marvell-teralynx/sonic-platform-modules-delta/debian/changelog similarity index 100% rename from platform/innovium/sonic-platform-modules-delta/debian/changelog rename to platform/marvell-teralynx/sonic-platform-modules-delta/debian/changelog diff --git a/platform/innovium/sonic-platform-modules-delta/debian/compat b/platform/marvell-teralynx/sonic-platform-modules-delta/debian/compat similarity index 100% rename from platform/innovium/sonic-platform-modules-delta/debian/compat rename to platform/marvell-teralynx/sonic-platform-modules-delta/debian/compat diff --git a/platform/innovium/sonic-platform-modules-delta/debian/control b/platform/marvell-teralynx/sonic-platform-modules-delta/debian/control similarity index 100% rename from platform/innovium/sonic-platform-modules-delta/debian/control rename to platform/marvell-teralynx/sonic-platform-modules-delta/debian/control diff --git a/platform/innovium/sonic-platform-modules-delta/debian/platform-modules-et-c032if.install b/platform/marvell-teralynx/sonic-platform-modules-delta/debian/platform-modules-et-c032if.install similarity index 100% rename from platform/innovium/sonic-platform-modules-delta/debian/platform-modules-et-c032if.install rename to platform/marvell-teralynx/sonic-platform-modules-delta/debian/platform-modules-et-c032if.install diff --git a/platform/innovium/sonic-platform-modules-delta/debian/rules b/platform/marvell-teralynx/sonic-platform-modules-delta/debian/rules similarity index 100% rename from platform/innovium/sonic-platform-modules-delta/debian/rules rename to platform/marvell-teralynx/sonic-platform-modules-delta/debian/rules diff --git a/platform/innovium/sonic-platform-modules-delta/et-c032if/cfg/et-c032if-modules.conf b/platform/marvell-teralynx/sonic-platform-modules-delta/et-c032if/cfg/et-c032if-modules.conf similarity index 100% rename from platform/innovium/sonic-platform-modules-delta/et-c032if/cfg/et-c032if-modules.conf rename to platform/marvell-teralynx/sonic-platform-modules-delta/et-c032if/cfg/et-c032if-modules.conf diff --git a/platform/innovium/sonic-platform-modules-delta/et-c032if/modules/Makefile b/platform/marvell-teralynx/sonic-platform-modules-delta/et-c032if/modules/Makefile similarity index 100% rename from platform/innovium/sonic-platform-modules-delta/et-c032if/modules/Makefile rename to platform/marvell-teralynx/sonic-platform-modules-delta/et-c032if/modules/Makefile diff --git a/platform/innovium/sonic-platform-modules-delta/et-c032if/modules/delta_et-c032if_platform.c b/platform/marvell-teralynx/sonic-platform-modules-delta/et-c032if/modules/delta_et-c032if_platform.c similarity index 100% rename from platform/innovium/sonic-platform-modules-delta/et-c032if/modules/delta_et-c032if_platform.c rename to platform/marvell-teralynx/sonic-platform-modules-delta/et-c032if/modules/delta_et-c032if_platform.c diff --git a/platform/innovium/sonic-platform-modules-delta/et-c032if/scripts/et-c032if_platform_init.sh b/platform/marvell-teralynx/sonic-platform-modules-delta/et-c032if/scripts/et-c032if_platform_init.sh similarity index 100% rename from platform/innovium/sonic-platform-modules-delta/et-c032if/scripts/et-c032if_platform_init.sh rename to platform/marvell-teralynx/sonic-platform-modules-delta/et-c032if/scripts/et-c032if_platform_init.sh diff --git a/platform/innovium/sonic-platform-modules-delta/systemd/platform-modules-et-c032if.service b/platform/marvell-teralynx/sonic-platform-modules-delta/systemd/platform-modules-et-c032if.service similarity index 100% rename from platform/innovium/sonic-platform-modules-delta/systemd/platform-modules-et-c032if.service rename to platform/marvell-teralynx/sonic-platform-modules-delta/systemd/platform-modules-et-c032if.service diff --git a/platform/innovium/sonic-platform-modules-netberg/aurora-715/modules/Makefile b/platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/modules/Makefile similarity index 100% rename from platform/innovium/sonic-platform-modules-netberg/aurora-715/modules/Makefile rename to platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/modules/Makefile diff --git a/platform/innovium/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-common.c b/platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-common.c similarity index 99% rename from platform/innovium/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-common.c rename to platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-common.c index f73295f832bf..466968c92449 100644 --- a/platform/innovium/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-common.c +++ b/platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-common.c @@ -1,4 +1,4 @@ -/* An hwmon driver for Netberg Aurora 715 Innovium i2c Module */ +/* An hwmon driver for Netberg Aurora 715 Marvell Teralynx i2c Module */ #pragma GCC diagnostic ignored "-Wformat-zero-length" #include "x86-64-netberg-aurora-715.h" #include "x86-64-netberg-aurora-715-common.h" diff --git a/platform/innovium/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-common.h b/platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-common.h similarity index 100% rename from platform/innovium/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-common.h rename to platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-common.h diff --git a/platform/innovium/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-fan.c b/platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-fan.c similarity index 99% rename from platform/innovium/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-fan.c rename to platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-fan.c index 4cb4d7ebfa55..12d82161ac7e 100644 --- a/platform/innovium/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-fan.c +++ b/platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-fan.c @@ -1,4 +1,4 @@ -/* An hwmon driver for Netberg Aurora 715 Innovium i2c Module */ +/* An hwmon driver for Netberg Aurora 715 Marvell Teralynx i2c Module */ #pragma GCC diagnostic ignored "-Wformat-zero-length" #include "x86-64-netberg-aurora-715.h" #include "x86-64-netberg-aurora-715-common.h" diff --git a/platform/innovium/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-fan.h b/platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-fan.h similarity index 100% rename from platform/innovium/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-fan.h rename to platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-fan.h diff --git a/platform/innovium/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-led.c b/platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-led.c similarity index 98% rename from platform/innovium/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-led.c rename to platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-led.c index df4957212d1d..940f9e0aaec1 100644 --- a/platform/innovium/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-led.c +++ b/platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-led.c @@ -1,4 +1,4 @@ -/* An hwmon driver for Netberg Aurora 715 Innovium i2c Module */ +/* An hwmon driver for Netberg Aurora 715 Marvell Teralynx i2c Module */ #pragma GCC diagnostic ignored "-Wformat-zero-length" #include "x86-64-netberg-aurora-715.h" #include "x86-64-netberg-aurora-715-common.h" diff --git a/platform/innovium/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-led.h b/platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-led.h similarity index 100% rename from platform/innovium/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-led.h rename to platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-led.h diff --git a/platform/innovium/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-power.c b/platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-power.c similarity index 99% rename from platform/innovium/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-power.c rename to platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-power.c index 1913d1716bbe..1b5c24431141 100644 --- a/platform/innovium/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-power.c +++ b/platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-power.c @@ -1,4 +1,4 @@ -/* An hwmon driver for Netberg Aurora 715 Innovium i2c Module */ +/* An hwmon driver for Netberg Aurora 715 Marvell Teralynx i2c Module */ #pragma GCC diagnostic ignored "-Wformat-zero-length" #include "x86-64-netberg-aurora-715.h" #include "x86-64-netberg-aurora-715-common.h" diff --git a/platform/innovium/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-power.h b/platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-power.h similarity index 100% rename from platform/innovium/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-power.h rename to platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-power.h diff --git a/platform/innovium/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-qsfp.c b/platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-qsfp.c similarity index 99% rename from platform/innovium/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-qsfp.c rename to platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-qsfp.c index 97525e629842..e66d8677f35c 100644 --- a/platform/innovium/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-qsfp.c +++ b/platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-qsfp.c @@ -1,4 +1,4 @@ -/* An hwmon driver for Netberg Aurora 715 Innovium i2c Module */ +/* An hwmon driver for Netberg Aurora 715 Marvell Teralynx i2c Module */ #pragma GCC diagnostic ignored "-Wformat-zero-length" #include "x86-64-netberg-aurora-715.h" #include "x86-64-netberg-aurora-715-common.h" diff --git a/platform/innovium/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-qsfp.h b/platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-qsfp.h similarity index 100% rename from platform/innovium/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-qsfp.h rename to platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-qsfp.h diff --git a/platform/innovium/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-sys.c b/platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-sys.c similarity index 99% rename from platform/innovium/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-sys.c rename to platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-sys.c index 6ee287b9ef6e..1e9169398b83 100644 --- a/platform/innovium/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-sys.c +++ b/platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-sys.c @@ -1,4 +1,4 @@ -/* An hwmon driver for Netberg Aurora 715 Innovium i2c Module */ +/* An hwmon driver for Netberg Aurora 715 Marvell Teralynx i2c Module */ #pragma GCC diagnostic ignored "-Wformat-zero-length" #include "x86-64-netberg-aurora-715.h" #include "x86-64-netberg-aurora-715-common.h" diff --git a/platform/innovium/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-sys.h b/platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-sys.h similarity index 100% rename from platform/innovium/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-sys.h rename to platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-sys.h diff --git a/platform/innovium/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-thermal.c b/platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-thermal.c similarity index 99% rename from platform/innovium/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-thermal.c rename to platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-thermal.c index 8e288f4aa329..e35c3eb221e3 100644 --- a/platform/innovium/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-thermal.c +++ b/platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-thermal.c @@ -1,4 +1,4 @@ -/* An hwmon driver for Netberg Aurora 715 Innovium i2c Module */ +/* An hwmon driver for Netberg Aurora 715 Marvell Teralynx i2c Module */ #pragma GCC diagnostic ignored "-Wformat-zero-length" #include "x86-64-netberg-aurora-715.h" #include "x86-64-netberg-aurora-715-common.h" diff --git a/platform/innovium/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-thermal.h b/platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-thermal.h similarity index 100% rename from platform/innovium/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-thermal.h rename to platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715-thermal.h diff --git a/platform/innovium/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715.h b/platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715.h similarity index 100% rename from platform/innovium/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715.h rename to platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/modules/x86-64-netberg-aurora-715.h diff --git a/platform/innovium/sonic-platform-modules-netberg/aurora-715/scripts/sensors b/platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/scripts/sensors similarity index 100% rename from platform/innovium/sonic-platform-modules-netberg/aurora-715/scripts/sensors rename to platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/scripts/sensors diff --git a/platform/innovium/sonic-platform-modules-netberg/aurora-715/service/nba715-platform-init.service b/platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/service/nba715-platform-init.service similarity index 83% rename from platform/innovium/sonic-platform-modules-netberg/aurora-715/service/nba715-platform-init.service rename to platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/service/nba715-platform-init.service index 6f019485ee82..339ca7a8ea0a 100644 --- a/platform/innovium/sonic-platform-modules-netberg/aurora-715/service/nba715-platform-init.service +++ b/platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/service/nba715-platform-init.service @@ -1,6 +1,6 @@ [Unit] Description=Netberg Aurora 715 Platform initialization service -After=local-fs.target innovium_platform_driver.service +After=local-fs.target teralynx_platform_driver.service Before=pmon.service diff --git a/platform/innovium/sonic-platform-modules-netberg/aurora-715/setup.py b/platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/setup.py similarity index 100% rename from platform/innovium/sonic-platform-modules-netberg/aurora-715/setup.py rename to platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/setup.py diff --git a/platform/innovium/sonic-platform-modules-netberg/aurora-715/sonic_platform/__init__.py b/platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/sonic_platform/__init__.py similarity index 100% rename from platform/innovium/sonic-platform-modules-netberg/aurora-715/sonic_platform/__init__.py rename to platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/sonic_platform/__init__.py diff --git a/platform/innovium/sonic-platform-modules-netberg/aurora-715/sonic_platform/chassis.py b/platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/sonic_platform/chassis.py similarity index 100% rename from platform/innovium/sonic-platform-modules-netberg/aurora-715/sonic_platform/chassis.py rename to platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/sonic_platform/chassis.py diff --git a/platform/innovium/sonic-platform-modules-netberg/aurora-715/sonic_platform/component.py b/platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/sonic_platform/component.py similarity index 100% rename from platform/innovium/sonic-platform-modules-netberg/aurora-715/sonic_platform/component.py rename to platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/sonic_platform/component.py diff --git a/platform/innovium/sonic-platform-modules-netberg/aurora-715/sonic_platform/eeprom.py b/platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/sonic_platform/eeprom.py similarity index 100% rename from platform/innovium/sonic-platform-modules-netberg/aurora-715/sonic_platform/eeprom.py rename to platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/sonic_platform/eeprom.py diff --git a/platform/innovium/sonic-platform-modules-netberg/aurora-715/sonic_platform/fan.py b/platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/sonic_platform/fan.py similarity index 100% rename from platform/innovium/sonic-platform-modules-netberg/aurora-715/sonic_platform/fan.py rename to platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/sonic_platform/fan.py diff --git a/platform/innovium/sonic-platform-modules-netberg/aurora-715/sonic_platform/platDev.py b/platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/sonic_platform/platDev.py similarity index 100% rename from platform/innovium/sonic-platform-modules-netberg/aurora-715/sonic_platform/platDev.py rename to platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/sonic_platform/platDev.py diff --git a/platform/innovium/sonic-platform-modules-netberg/aurora-715/sonic_platform/platform.py b/platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/sonic_platform/platform.py similarity index 100% rename from platform/innovium/sonic-platform-modules-netberg/aurora-715/sonic_platform/platform.py rename to platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/sonic_platform/platform.py diff --git a/platform/innovium/sonic-platform-modules-netberg/aurora-715/sonic_platform/psu.py b/platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/sonic_platform/psu.py similarity index 100% rename from platform/innovium/sonic-platform-modules-netberg/aurora-715/sonic_platform/psu.py rename to platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/sonic_platform/psu.py diff --git a/platform/innovium/sonic-platform-modules-netberg/aurora-715/sonic_platform/sfp.py b/platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/sonic_platform/sfp.py similarity index 100% rename from platform/innovium/sonic-platform-modules-netberg/aurora-715/sonic_platform/sfp.py rename to platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/sonic_platform/sfp.py diff --git a/platform/innovium/sonic-platform-modules-netberg/aurora-715/sonic_platform/thermal.py b/platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/sonic_platform/thermal.py similarity index 100% rename from platform/innovium/sonic-platform-modules-netberg/aurora-715/sonic_platform/thermal.py rename to platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/sonic_platform/thermal.py diff --git a/platform/innovium/sonic-platform-modules-netberg/aurora-715/templates/netberg_aurora-715_util.py.j2 b/platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/templates/netberg_aurora-715_util.py.j2 similarity index 100% rename from platform/innovium/sonic-platform-modules-netberg/aurora-715/templates/netberg_aurora-715_util.py.j2 rename to platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/templates/netberg_aurora-715_util.py.j2 diff --git a/platform/innovium/sonic-platform-modules-netberg/aurora-715/utils/halt b/platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/utils/halt similarity index 100% rename from platform/innovium/sonic-platform-modules-netberg/aurora-715/utils/halt rename to platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/utils/halt diff --git a/platform/innovium/sonic-platform-modules-netberg/aurora-715/utils/netberg_nba715_platform.sh b/platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/utils/netberg_nba715_platform.sh similarity index 100% rename from platform/innovium/sonic-platform-modules-netberg/aurora-715/utils/netberg_nba715_platform.sh rename to platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/utils/netberg_nba715_platform.sh diff --git a/platform/innovium/sonic-platform-modules-netberg/aurora-715/utils/netberg_nba715_sensors.py b/platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/utils/netberg_nba715_sensors.py similarity index 100% rename from platform/innovium/sonic-platform-modules-netberg/aurora-715/utils/netberg_nba715_sensors.py rename to platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/utils/netberg_nba715_sensors.py diff --git a/platform/innovium/sonic-platform-modules-netberg/aurora-715/utils/netberg_nba715_startup b/platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/utils/netberg_nba715_startup similarity index 100% rename from platform/innovium/sonic-platform-modules-netberg/aurora-715/utils/netberg_nba715_startup rename to platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/utils/netberg_nba715_startup diff --git a/platform/innovium/sonic-platform-modules-netberg/aurora-715/utils/poweroff b/platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/utils/poweroff similarity index 100% rename from platform/innovium/sonic-platform-modules-netberg/aurora-715/utils/poweroff rename to platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/utils/poweroff diff --git a/platform/innovium/sonic-platform-modules-netberg/aurora-715/utils/shutdown b/platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/utils/shutdown similarity index 100% rename from platform/innovium/sonic-platform-modules-netberg/aurora-715/utils/shutdown rename to platform/marvell-teralynx/sonic-platform-modules-netberg/aurora-715/utils/shutdown diff --git a/platform/innovium/sonic-platform-modules-netberg/debian/changelog b/platform/marvell-teralynx/sonic-platform-modules-netberg/debian/changelog similarity index 100% rename from platform/innovium/sonic-platform-modules-netberg/debian/changelog rename to platform/marvell-teralynx/sonic-platform-modules-netberg/debian/changelog diff --git a/platform/innovium/sonic-platform-modules-netberg/debian/compat b/platform/marvell-teralynx/sonic-platform-modules-netberg/debian/compat similarity index 100% rename from platform/innovium/sonic-platform-modules-netberg/debian/compat rename to platform/marvell-teralynx/sonic-platform-modules-netberg/debian/compat diff --git a/platform/innovium/sonic-platform-modules-netberg/debian/control b/platform/marvell-teralynx/sonic-platform-modules-netberg/debian/control similarity index 100% rename from platform/innovium/sonic-platform-modules-netberg/debian/control rename to platform/marvell-teralynx/sonic-platform-modules-netberg/debian/control diff --git a/platform/innovium/sonic-platform-modules-netberg/debian/rules b/platform/marvell-teralynx/sonic-platform-modules-netberg/debian/rules similarity index 100% rename from platform/innovium/sonic-platform-modules-netberg/debian/rules rename to platform/marvell-teralynx/sonic-platform-modules-netberg/debian/rules diff --git a/platform/innovium/sonic-platform-modules-netberg/debian/sonic-platform-netberg-aurora-715.install b/platform/marvell-teralynx/sonic-platform-modules-netberg/debian/sonic-platform-netberg-aurora-715.install similarity index 100% rename from platform/innovium/sonic-platform-modules-netberg/debian/sonic-platform-netberg-aurora-715.install rename to platform/marvell-teralynx/sonic-platform-modules-netberg/debian/sonic-platform-netberg-aurora-715.install diff --git a/platform/innovium/sonic-platform-modules-netberg/debian/sonic-platform-netberg-aurora-715.postinst b/platform/marvell-teralynx/sonic-platform-modules-netberg/debian/sonic-platform-netberg-aurora-715.postinst similarity index 100% rename from platform/innovium/sonic-platform-modules-netberg/debian/sonic-platform-netberg-aurora-715.postinst rename to platform/marvell-teralynx/sonic-platform-modules-netberg/debian/sonic-platform-netberg-aurora-715.postinst diff --git a/platform/innovium/sonic-platform-modules-supermicro/debian/changelog b/platform/marvell-teralynx/sonic-platform-modules-supermicro/debian/changelog similarity index 100% rename from platform/innovium/sonic-platform-modules-supermicro/debian/changelog rename to platform/marvell-teralynx/sonic-platform-modules-supermicro/debian/changelog diff --git a/platform/innovium/sonic-platform-modules-supermicro/debian/compat b/platform/marvell-teralynx/sonic-platform-modules-supermicro/debian/compat similarity index 100% rename from platform/innovium/sonic-platform-modules-supermicro/debian/compat rename to platform/marvell-teralynx/sonic-platform-modules-supermicro/debian/compat diff --git a/platform/innovium/sonic-platform-modules-supermicro/debian/control b/platform/marvell-teralynx/sonic-platform-modules-supermicro/debian/control similarity index 100% rename from platform/innovium/sonic-platform-modules-supermicro/debian/control rename to platform/marvell-teralynx/sonic-platform-modules-supermicro/debian/control diff --git a/platform/innovium/sonic-platform-modules-supermicro/debian/platform-modules-sse-t7132s.install b/platform/marvell-teralynx/sonic-platform-modules-supermicro/debian/platform-modules-sse-t7132s.install similarity index 100% rename from platform/innovium/sonic-platform-modules-supermicro/debian/platform-modules-sse-t7132s.install rename to platform/marvell-teralynx/sonic-platform-modules-supermicro/debian/platform-modules-sse-t7132s.install diff --git a/platform/innovium/sonic-platform-modules-supermicro/debian/platform-modules-sse-t7132s.postinst b/platform/marvell-teralynx/sonic-platform-modules-supermicro/debian/platform-modules-sse-t7132s.postinst similarity index 100% rename from platform/innovium/sonic-platform-modules-supermicro/debian/platform-modules-sse-t7132s.postinst rename to platform/marvell-teralynx/sonic-platform-modules-supermicro/debian/platform-modules-sse-t7132s.postinst diff --git a/platform/innovium/sonic-platform-modules-supermicro/debian/rules b/platform/marvell-teralynx/sonic-platform-modules-supermicro/debian/rules similarity index 100% rename from platform/innovium/sonic-platform-modules-supermicro/debian/rules rename to platform/marvell-teralynx/sonic-platform-modules-supermicro/debian/rules diff --git a/platform/innovium/sonic-platform-modules-supermicro/sse-t7132s/cfg/iTCO_wdt.conf b/platform/marvell-teralynx/sonic-platform-modules-supermicro/sse-t7132s/cfg/iTCO_wdt.conf similarity index 100% rename from platform/innovium/sonic-platform-modules-supermicro/sse-t7132s/cfg/iTCO_wdt.conf rename to platform/marvell-teralynx/sonic-platform-modules-supermicro/sse-t7132s/cfg/iTCO_wdt.conf diff --git a/platform/innovium/sonic-platform-modules-supermicro/sse-t7132s/cfg/t7132s-modules.conf b/platform/marvell-teralynx/sonic-platform-modules-supermicro/sse-t7132s/cfg/t7132s-modules.conf similarity index 100% rename from platform/innovium/sonic-platform-modules-supermicro/sse-t7132s/cfg/t7132s-modules.conf rename to platform/marvell-teralynx/sonic-platform-modules-supermicro/sse-t7132s/cfg/t7132s-modules.conf diff --git a/platform/innovium/sonic-platform-modules-supermicro/sse-t7132s/modules/Makefile b/platform/marvell-teralynx/sonic-platform-modules-supermicro/sse-t7132s/modules/Makefile similarity index 100% rename from platform/innovium/sonic-platform-modules-supermicro/sse-t7132s/modules/Makefile rename to platform/marvell-teralynx/sonic-platform-modules-supermicro/sse-t7132s/modules/Makefile diff --git a/platform/innovium/sonic-platform-modules-supermicro/sse-t7132s/modules/t7132s.c b/platform/marvell-teralynx/sonic-platform-modules-supermicro/sse-t7132s/modules/t7132s.c similarity index 100% rename from platform/innovium/sonic-platform-modules-supermicro/sse-t7132s/modules/t7132s.c rename to platform/marvell-teralynx/sonic-platform-modules-supermicro/sse-t7132s/modules/t7132s.c diff --git a/platform/innovium/sonic-platform-modules-supermicro/sse-t7132s/scripts/health_checker_thermal.py b/platform/marvell-teralynx/sonic-platform-modules-supermicro/sse-t7132s/scripts/health_checker_thermal.py similarity index 100% rename from platform/innovium/sonic-platform-modules-supermicro/sse-t7132s/scripts/health_checker_thermal.py rename to platform/marvell-teralynx/sonic-platform-modules-supermicro/sse-t7132s/scripts/health_checker_thermal.py diff --git a/platform/innovium/sonic-platform-modules-supermicro/sse-t7132s/scripts/platform.sh b/platform/marvell-teralynx/sonic-platform-modules-supermicro/sse-t7132s/scripts/platform.sh similarity index 100% rename from platform/innovium/sonic-platform-modules-supermicro/sse-t7132s/scripts/platform.sh rename to platform/marvell-teralynx/sonic-platform-modules-supermicro/sse-t7132s/scripts/platform.sh diff --git a/platform/innovium/sonic-platform-modules-supermicro/sse-t7132s/scripts/sysledctl.py b/platform/marvell-teralynx/sonic-platform-modules-supermicro/sse-t7132s/scripts/sysledctl.py similarity index 100% rename from platform/innovium/sonic-platform-modules-supermicro/sse-t7132s/scripts/sysledctl.py rename to platform/marvell-teralynx/sonic-platform-modules-supermicro/sse-t7132s/scripts/sysledctl.py diff --git a/platform/innovium/sonic-platform-modules-supermicro/sse-t7132s/scripts/test_cpld.py b/platform/marvell-teralynx/sonic-platform-modules-supermicro/sse-t7132s/scripts/test_cpld.py similarity index 100% rename from platform/innovium/sonic-platform-modules-supermicro/sse-t7132s/scripts/test_cpld.py rename to platform/marvell-teralynx/sonic-platform-modules-supermicro/sse-t7132s/scripts/test_cpld.py diff --git a/platform/innovium/sonic-platform-modules-supermicro/sse-t7132s/setup.py b/platform/marvell-teralynx/sonic-platform-modules-supermicro/sse-t7132s/setup.py similarity index 100% rename from platform/innovium/sonic-platform-modules-supermicro/sse-t7132s/setup.py rename to platform/marvell-teralynx/sonic-platform-modules-supermicro/sse-t7132s/setup.py diff --git a/platform/innovium/sonic-platform-modules-supermicro/sse-t7132s/sonic_platform/__init__.py b/platform/marvell-teralynx/sonic-platform-modules-supermicro/sse-t7132s/sonic_platform/__init__.py similarity index 100% rename from platform/innovium/sonic-platform-modules-supermicro/sse-t7132s/sonic_platform/__init__.py rename to platform/marvell-teralynx/sonic-platform-modules-supermicro/sse-t7132s/sonic_platform/__init__.py diff --git a/platform/innovium/sonic-platform-modules-supermicro/sse-t7132s/sonic_platform/chassis.py b/platform/marvell-teralynx/sonic-platform-modules-supermicro/sse-t7132s/sonic_platform/chassis.py similarity index 100% rename from platform/innovium/sonic-platform-modules-supermicro/sse-t7132s/sonic_platform/chassis.py rename to platform/marvell-teralynx/sonic-platform-modules-supermicro/sse-t7132s/sonic_platform/chassis.py diff --git a/platform/innovium/sonic-platform-modules-supermicro/sse-t7132s/sonic_platform/component.py b/platform/marvell-teralynx/sonic-platform-modules-supermicro/sse-t7132s/sonic_platform/component.py similarity index 100% rename from platform/innovium/sonic-platform-modules-supermicro/sse-t7132s/sonic_platform/component.py rename to platform/marvell-teralynx/sonic-platform-modules-supermicro/sse-t7132s/sonic_platform/component.py diff --git a/platform/innovium/sonic-platform-modules-supermicro/sse-t7132s/sonic_platform/eeprom.py b/platform/marvell-teralynx/sonic-platform-modules-supermicro/sse-t7132s/sonic_platform/eeprom.py similarity index 100% rename from platform/innovium/sonic-platform-modules-supermicro/sse-t7132s/sonic_platform/eeprom.py rename to platform/marvell-teralynx/sonic-platform-modules-supermicro/sse-t7132s/sonic_platform/eeprom.py diff --git a/platform/innovium/sonic-platform-modules-supermicro/sse-t7132s/sonic_platform/fan.py b/platform/marvell-teralynx/sonic-platform-modules-supermicro/sse-t7132s/sonic_platform/fan.py similarity index 100% rename from platform/innovium/sonic-platform-modules-supermicro/sse-t7132s/sonic_platform/fan.py rename to platform/marvell-teralynx/sonic-platform-modules-supermicro/sse-t7132s/sonic_platform/fan.py diff --git a/platform/innovium/sonic-platform-modules-supermicro/sse-t7132s/sonic_platform/fan_drawer.py b/platform/marvell-teralynx/sonic-platform-modules-supermicro/sse-t7132s/sonic_platform/fan_drawer.py similarity index 100% rename from platform/innovium/sonic-platform-modules-supermicro/sse-t7132s/sonic_platform/fan_drawer.py rename to platform/marvell-teralynx/sonic-platform-modules-supermicro/sse-t7132s/sonic_platform/fan_drawer.py diff --git a/platform/innovium/sonic-platform-modules-supermicro/sse-t7132s/sonic_platform/helper.py b/platform/marvell-teralynx/sonic-platform-modules-supermicro/sse-t7132s/sonic_platform/helper.py similarity index 100% rename from platform/innovium/sonic-platform-modules-supermicro/sse-t7132s/sonic_platform/helper.py rename to platform/marvell-teralynx/sonic-platform-modules-supermicro/sse-t7132s/sonic_platform/helper.py diff --git a/platform/innovium/sonic-platform-modules-supermicro/sse-t7132s/sonic_platform/pcie.py b/platform/marvell-teralynx/sonic-platform-modules-supermicro/sse-t7132s/sonic_platform/pcie.py similarity index 100% rename from platform/innovium/sonic-platform-modules-supermicro/sse-t7132s/sonic_platform/pcie.py rename to platform/marvell-teralynx/sonic-platform-modules-supermicro/sse-t7132s/sonic_platform/pcie.py diff --git a/platform/innovium/sonic-platform-modules-supermicro/sse-t7132s/sonic_platform/platform.py b/platform/marvell-teralynx/sonic-platform-modules-supermicro/sse-t7132s/sonic_platform/platform.py similarity index 100% rename from platform/innovium/sonic-platform-modules-supermicro/sse-t7132s/sonic_platform/platform.py rename to platform/marvell-teralynx/sonic-platform-modules-supermicro/sse-t7132s/sonic_platform/platform.py diff --git a/platform/innovium/sonic-platform-modules-supermicro/sse-t7132s/sonic_platform/psu.py b/platform/marvell-teralynx/sonic-platform-modules-supermicro/sse-t7132s/sonic_platform/psu.py similarity index 100% rename from platform/innovium/sonic-platform-modules-supermicro/sse-t7132s/sonic_platform/psu.py rename to platform/marvell-teralynx/sonic-platform-modules-supermicro/sse-t7132s/sonic_platform/psu.py diff --git a/platform/innovium/sonic-platform-modules-supermicro/sse-t7132s/sonic_platform/sfp.py b/platform/marvell-teralynx/sonic-platform-modules-supermicro/sse-t7132s/sonic_platform/sfp.py similarity index 100% rename from platform/innovium/sonic-platform-modules-supermicro/sse-t7132s/sonic_platform/sfp.py rename to platform/marvell-teralynx/sonic-platform-modules-supermicro/sse-t7132s/sonic_platform/sfp.py diff --git a/platform/innovium/sonic-platform-modules-supermicro/sse-t7132s/sonic_platform/thermal.py b/platform/marvell-teralynx/sonic-platform-modules-supermicro/sse-t7132s/sonic_platform/thermal.py similarity index 100% rename from platform/innovium/sonic-platform-modules-supermicro/sse-t7132s/sonic_platform/thermal.py rename to platform/marvell-teralynx/sonic-platform-modules-supermicro/sse-t7132s/sonic_platform/thermal.py diff --git a/platform/innovium/sonic-platform-modules-supermicro/sse-t7132s/sonic_platform/watchdog.py b/platform/marvell-teralynx/sonic-platform-modules-supermicro/sse-t7132s/sonic_platform/watchdog.py similarity index 100% rename from platform/innovium/sonic-platform-modules-supermicro/sse-t7132s/sonic_platform/watchdog.py rename to platform/marvell-teralynx/sonic-platform-modules-supermicro/sse-t7132s/sonic_platform/watchdog.py diff --git a/platform/innovium/sonic-platform-modules-supermicro/sse-t7132s/systemd/platform-modules-sse-t7132s.service b/platform/marvell-teralynx/sonic-platform-modules-supermicro/sse-t7132s/systemd/platform-modules-sse-t7132s.service similarity index 100% rename from platform/innovium/sonic-platform-modules-supermicro/sse-t7132s/systemd/platform-modules-sse-t7132s.service rename to platform/marvell-teralynx/sonic-platform-modules-supermicro/sse-t7132s/systemd/platform-modules-sse-t7132s.service diff --git a/platform/innovium/sonic-platform-modules-supermicro/sse-t7132s/systemd/sysled.service b/platform/marvell-teralynx/sonic-platform-modules-supermicro/sse-t7132s/systemd/sysled.service similarity index 100% rename from platform/innovium/sonic-platform-modules-supermicro/sse-t7132s/systemd/sysled.service rename to platform/marvell-teralynx/sonic-platform-modules-supermicro/sse-t7132s/systemd/sysled.service diff --git a/platform/innovium/sonic-platform-modules-wistron/6512-32r/modules/Makefile b/platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/modules/Makefile similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/6512-32r/modules/Makefile rename to platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/modules/Makefile diff --git a/platform/innovium/sonic-platform-modules-wistron/6512-32r/modules/i2c-imc.c b/platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/modules/i2c-imc.c similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/6512-32r/modules/i2c-imc.c rename to platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/modules/i2c-imc.c diff --git a/platform/innovium/sonic-platform-modules-wistron/6512-32r/modules/oldjc42.c b/platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/modules/oldjc42.c similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/6512-32r/modules/oldjc42.c rename to platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/modules/oldjc42.c diff --git a/platform/innovium/sonic-platform-modules-wistron/6512-32r/modules/wistron_6512_32r_cpld.c b/platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/modules/wistron_6512_32r_cpld.c similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/6512-32r/modules/wistron_6512_32r_cpld.c rename to platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/modules/wistron_6512_32r_cpld.c diff --git a/platform/innovium/sonic-platform-modules-wistron/6512-32r/modules/wistron_6512_32r_fan.c b/platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/modules/wistron_6512_32r_fan.c similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/6512-32r/modules/wistron_6512_32r_fan.c rename to platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/modules/wistron_6512_32r_fan.c diff --git a/platform/innovium/sonic-platform-modules-wistron/6512-32r/modules/wistron_6512_32r_leds.c b/platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/modules/wistron_6512_32r_leds.c similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/6512-32r/modules/wistron_6512_32r_leds.c rename to platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/modules/wistron_6512_32r_leds.c diff --git a/platform/innovium/sonic-platform-modules-wistron/6512-32r/modules/wistron_6512_32r_oom.c b/platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/modules/wistron_6512_32r_oom.c similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/6512-32r/modules/wistron_6512_32r_oom.c rename to platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/modules/wistron_6512_32r_oom.c diff --git a/platform/innovium/sonic-platform-modules-wistron/6512-32r/modules/wistron_6512_32r_psu.c b/platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/modules/wistron_6512_32r_psu.c similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/6512-32r/modules/wistron_6512_32r_psu.c rename to platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/modules/wistron_6512_32r_psu.c diff --git a/platform/innovium/sonic-platform-modules-wistron/6512-32r/modules/wistron_6512_32r_syseeprom.c b/platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/modules/wistron_6512_32r_syseeprom.c similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/6512-32r/modules/wistron_6512_32r_syseeprom.c rename to platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/modules/wistron_6512_32r_syseeprom.c diff --git a/platform/innovium/sonic-platform-modules-wistron/6512-32r/modules/wistron_6512_32r_thermal.c b/platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/modules/wistron_6512_32r_thermal.c similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/6512-32r/modules/wistron_6512_32r_thermal.c rename to platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/modules/wistron_6512_32r_thermal.c diff --git a/platform/innovium/sonic-platform-modules-wistron/6512-32r/service/6512-32r-firmware_ver.service b/platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/service/6512-32r-firmware_ver.service similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/6512-32r/service/6512-32r-firmware_ver.service rename to platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/service/6512-32r-firmware_ver.service diff --git a/platform/innovium/sonic-platform-modules-wistron/6512-32r/service/6512-32r-platform.service b/platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/service/6512-32r-platform.service similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/6512-32r/service/6512-32r-platform.service rename to platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/service/6512-32r-platform.service diff --git a/platform/innovium/sonic-platform-modules-wistron/6512-32r/service/6512-32r-syseeprom.service b/platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/service/6512-32r-syseeprom.service similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/6512-32r/service/6512-32r-syseeprom.service rename to platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/service/6512-32r-syseeprom.service diff --git a/platform/innovium/sonic-platform-modules-wistron/6512-32r/service/platform-modules-6512-32r.service b/platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/service/platform-modules-6512-32r.service similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/6512-32r/service/platform-modules-6512-32r.service rename to platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/service/platform-modules-6512-32r.service diff --git a/platform/innovium/sonic-platform-modules-wistron/6512-32r/setup.py b/platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/setup.py similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/6512-32r/setup.py rename to platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/setup.py diff --git a/platform/innovium/sonic-platform-modules-wistron/6512-32r/sonic_platform/__init__.py b/platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/sonic_platform/__init__.py similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/6512-32r/sonic_platform/__init__.py rename to platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/sonic_platform/__init__.py diff --git a/platform/innovium/sonic-platform-modules-wistron/6512-32r/sonic_platform/chassis.py b/platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/sonic_platform/chassis.py similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/6512-32r/sonic_platform/chassis.py rename to platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/sonic_platform/chassis.py diff --git a/platform/innovium/sonic-platform-modules-wistron/6512-32r/sonic_platform/component.py b/platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/sonic_platform/component.py similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/6512-32r/sonic_platform/component.py rename to platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/sonic_platform/component.py diff --git a/platform/innovium/sonic-platform-modules-wistron/6512-32r/sonic_platform/eeprom.py b/platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/sonic_platform/eeprom.py similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/6512-32r/sonic_platform/eeprom.py rename to platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/sonic_platform/eeprom.py diff --git a/platform/innovium/sonic-platform-modules-wistron/6512-32r/sonic_platform/fan.py b/platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/sonic_platform/fan.py similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/6512-32r/sonic_platform/fan.py rename to platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/sonic_platform/fan.py diff --git a/platform/innovium/sonic-platform-modules-wistron/6512-32r/sonic_platform/fan_drawer.py b/platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/sonic_platform/fan_drawer.py similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/6512-32r/sonic_platform/fan_drawer.py rename to platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/sonic_platform/fan_drawer.py diff --git a/platform/innovium/sonic-platform-modules-wistron/6512-32r/sonic_platform/platform.py b/platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/sonic_platform/platform.py similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/6512-32r/sonic_platform/platform.py rename to platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/sonic_platform/platform.py diff --git a/platform/innovium/sonic-platform-modules-wistron/6512-32r/sonic_platform/psu.py b/platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/sonic_platform/psu.py similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/6512-32r/sonic_platform/psu.py rename to platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/sonic_platform/psu.py diff --git a/platform/innovium/sonic-platform-modules-wistron/6512-32r/sonic_platform/sfp.py b/platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/sonic_platform/sfp.py similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/6512-32r/sonic_platform/sfp.py rename to platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/sonic_platform/sfp.py diff --git a/platform/innovium/sonic-platform-modules-wistron/6512-32r/sonic_platform/thermal.py b/platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/sonic_platform/thermal.py similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/6512-32r/sonic_platform/thermal.py rename to platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/sonic_platform/thermal.py diff --git a/platform/innovium/sonic-platform-modules-wistron/6512-32r/sonic_platform/watchdog.py b/platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/sonic_platform/watchdog.py similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/6512-32r/sonic_platform/watchdog.py rename to platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/sonic_platform/watchdog.py diff --git a/platform/innovium/sonic-platform-modules-wistron/6512-32r/utils/platform_firmware_version b/platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/utils/platform_firmware_version similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/6512-32r/utils/platform_firmware_version rename to platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/utils/platform_firmware_version diff --git a/platform/innovium/sonic-platform-modules-wistron/6512-32r/utils/platform_sync b/platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/utils/platform_sync similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/6512-32r/utils/platform_sync rename to platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/utils/platform_sync diff --git a/platform/innovium/sonic-platform-modules-wistron/6512-32r/utils/platform_syseeprom b/platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/utils/platform_syseeprom similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/6512-32r/utils/platform_syseeprom rename to platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/utils/platform_syseeprom diff --git a/platform/innovium/sonic-platform-modules-wistron/6512-32r/utils/sonic-fanthrml-monitor b/platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/utils/sonic-fanthrml-monitor similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/6512-32r/utils/sonic-fanthrml-monitor rename to platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/utils/sonic-fanthrml-monitor diff --git a/platform/innovium/sonic-platform-modules-wistron/6512-32r/utils/sonic-led-monitor b/platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/utils/sonic-led-monitor similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/6512-32r/utils/sonic-led-monitor rename to platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/utils/sonic-led-monitor diff --git a/platform/innovium/sonic-platform-modules-wistron/6512-32r/utils/sonic-psu-monitor b/platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/utils/sonic-psu-monitor similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/6512-32r/utils/sonic-psu-monitor rename to platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/utils/sonic-psu-monitor diff --git a/platform/innovium/sonic-platform-modules-wistron/6512-32r/utils/sonic-qsfp-eeprom-monitor b/platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/utils/sonic-qsfp-eeprom-monitor similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/6512-32r/utils/sonic-qsfp-eeprom-monitor rename to platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/utils/sonic-qsfp-eeprom-monitor diff --git a/platform/innovium/sonic-platform-modules-wistron/6512-32r/utils/sonic-qsfp-monitor b/platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/utils/sonic-qsfp-monitor similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/6512-32r/utils/sonic-qsfp-monitor rename to platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/utils/sonic-qsfp-monitor diff --git a/platform/innovium/sonic-platform-modules-wistron/6512-32r/utils/sonic-send-temp-to-bmc b/platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/utils/sonic-send-temp-to-bmc similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/6512-32r/utils/sonic-send-temp-to-bmc rename to platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/utils/sonic-send-temp-to-bmc diff --git a/platform/innovium/sonic-platform-modules-wistron/6512-32r/utils/wistron_6512_32r_util.py b/platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/utils/wistron_6512_32r_util.py similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/6512-32r/utils/wistron_6512_32r_util.py rename to platform/marvell-teralynx/sonic-platform-modules-wistron/6512-32r/utils/wistron_6512_32r_util.py diff --git a/platform/innovium/sonic-platform-modules-wistron/LICENSE b/platform/marvell-teralynx/sonic-platform-modules-wistron/LICENSE similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/LICENSE rename to platform/marvell-teralynx/sonic-platform-modules-wistron/LICENSE diff --git a/platform/innovium/sonic-platform-modules-wistron/debian/changelog b/platform/marvell-teralynx/sonic-platform-modules-wistron/debian/changelog similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/debian/changelog rename to platform/marvell-teralynx/sonic-platform-modules-wistron/debian/changelog diff --git a/platform/innovium/sonic-platform-modules-wistron/debian/compat b/platform/marvell-teralynx/sonic-platform-modules-wistron/debian/compat similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/debian/compat rename to platform/marvell-teralynx/sonic-platform-modules-wistron/debian/compat diff --git a/platform/innovium/sonic-platform-modules-wistron/debian/control b/platform/marvell-teralynx/sonic-platform-modules-wistron/debian/control similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/debian/control rename to platform/marvell-teralynx/sonic-platform-modules-wistron/debian/control diff --git a/platform/innovium/sonic-platform-modules-wistron/debian/rules b/platform/marvell-teralynx/sonic-platform-modules-wistron/debian/rules similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/debian/rules rename to platform/marvell-teralynx/sonic-platform-modules-wistron/debian/rules diff --git a/platform/innovium/sonic-platform-modules-wistron/debian/sonic-platform-wistron-6512-32r.install b/platform/marvell-teralynx/sonic-platform-modules-wistron/debian/sonic-platform-wistron-6512-32r.install similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/debian/sonic-platform-wistron-6512-32r.install rename to platform/marvell-teralynx/sonic-platform-modules-wistron/debian/sonic-platform-wistron-6512-32r.install diff --git a/platform/innovium/sonic-platform-modules-wistron/debian/sonic-platform-wistron-6512-32r.postinst b/platform/marvell-teralynx/sonic-platform-modules-wistron/debian/sonic-platform-wistron-6512-32r.postinst similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/debian/sonic-platform-wistron-6512-32r.postinst rename to platform/marvell-teralynx/sonic-platform-modules-wistron/debian/sonic-platform-wistron-6512-32r.postinst diff --git a/platform/innovium/sonic-platform-modules-wistron/debian/sonic-platform-wistron-sw-to3200k.install b/platform/marvell-teralynx/sonic-platform-modules-wistron/debian/sonic-platform-wistron-sw-to3200k.install similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/debian/sonic-platform-wistron-sw-to3200k.install rename to platform/marvell-teralynx/sonic-platform-modules-wistron/debian/sonic-platform-wistron-sw-to3200k.install diff --git a/platform/innovium/sonic-platform-modules-wistron/debian/sonic-platform-wistron-sw-to3200k.postinst b/platform/marvell-teralynx/sonic-platform-modules-wistron/debian/sonic-platform-wistron-sw-to3200k.postinst similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/debian/sonic-platform-wistron-sw-to3200k.postinst rename to platform/marvell-teralynx/sonic-platform-modules-wistron/debian/sonic-platform-wistron-sw-to3200k.postinst diff --git a/platform/innovium/sonic-platform-modules-wistron/sw-to3200k/cfg/sw-to3200k-modules.conf b/platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/cfg/sw-to3200k-modules.conf similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/sw-to3200k/cfg/sw-to3200k-modules.conf rename to platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/cfg/sw-to3200k-modules.conf diff --git a/platform/innovium/sonic-platform-modules-wistron/sw-to3200k/classes/__init__.py b/platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/classes/__init__.py similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/sw-to3200k/classes/__init__.py rename to platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/classes/__init__.py diff --git a/platform/innovium/sonic-platform-modules-wistron/sw-to3200k/modules/Makefile b/platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/modules/Makefile similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/sw-to3200k/modules/Makefile rename to platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/modules/Makefile diff --git a/platform/innovium/sonic-platform-modules-wistron/sw-to3200k/modules/wistron_i2c_psu.c b/platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/modules/wistron_i2c_psu.c similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/sw-to3200k/modules/wistron_i2c_psu.c rename to platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/modules/wistron_i2c_psu.c diff --git a/platform/innovium/sonic-platform-modules-wistron/sw-to3200k/modules/wistron_sw_to3200k_cpld.c b/platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/modules/wistron_sw_to3200k_cpld.c similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/sw-to3200k/modules/wistron_sw_to3200k_cpld.c rename to platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/modules/wistron_sw_to3200k_cpld.c diff --git a/platform/innovium/sonic-platform-modules-wistron/sw-to3200k/modules/wistron_sw_to3200k_fan.c b/platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/modules/wistron_sw_to3200k_fan.c similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/sw-to3200k/modules/wistron_sw_to3200k_fan.c rename to platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/modules/wistron_sw_to3200k_fan.c diff --git a/platform/innovium/sonic-platform-modules-wistron/sw-to3200k/modules/wistron_sw_to3200k_leds.c b/platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/modules/wistron_sw_to3200k_leds.c similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/sw-to3200k/modules/wistron_sw_to3200k_leds.c rename to platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/modules/wistron_sw_to3200k_leds.c diff --git a/platform/innovium/sonic-platform-modules-wistron/sw-to3200k/modules/wistron_sw_to3200k_oom.c b/platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/modules/wistron_sw_to3200k_oom.c similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/sw-to3200k/modules/wistron_sw_to3200k_oom.c rename to platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/modules/wistron_sw_to3200k_oom.c diff --git a/platform/innovium/sonic-platform-modules-wistron/sw-to3200k/modules/wistron_sw_to3200k_psu.c b/platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/modules/wistron_sw_to3200k_psu.c similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/sw-to3200k/modules/wistron_sw_to3200k_psu.c rename to platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/modules/wistron_sw_to3200k_psu.c diff --git a/platform/innovium/sonic-platform-modules-wistron/sw-to3200k/modules/wistron_sw_to3200k_thermal.c b/platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/modules/wistron_sw_to3200k_thermal.c similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/sw-to3200k/modules/wistron_sw_to3200k_thermal.c rename to platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/modules/wistron_sw_to3200k_thermal.c diff --git a/platform/innovium/sonic-platform-modules-wistron/sw-to3200k/service/platform-modules-sw-to3200k.service b/platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/service/platform-modules-sw-to3200k.service similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/sw-to3200k/service/platform-modules-sw-to3200k.service rename to platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/service/platform-modules-sw-to3200k.service diff --git a/platform/innovium/sonic-platform-modules-wistron/sw-to3200k/service/sw-to3200k-firmware_ver.service b/platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/service/sw-to3200k-firmware_ver.service similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/sw-to3200k/service/sw-to3200k-firmware_ver.service rename to platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/service/sw-to3200k-firmware_ver.service diff --git a/platform/innovium/sonic-platform-modules-wistron/sw-to3200k/service/to3200k-led.service b/platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/service/to3200k-led.service similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/sw-to3200k/service/to3200k-led.service rename to platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/service/to3200k-led.service diff --git a/platform/innovium/sonic-platform-modules-wistron/sw-to3200k/service/to3200k-platform.service b/platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/service/to3200k-platform.service similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/sw-to3200k/service/to3200k-platform.service rename to platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/service/to3200k-platform.service diff --git a/platform/innovium/sonic-platform-modules-wistron/sw-to3200k/service/to3200k-pld.service b/platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/service/to3200k-pld.service similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/sw-to3200k/service/to3200k-pld.service rename to platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/service/to3200k-pld.service diff --git a/platform/innovium/sonic-platform-modules-wistron/sw-to3200k/setup.py b/platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/setup.py similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/sw-to3200k/setup.py rename to platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/setup.py diff --git a/platform/innovium/sonic-platform-modules-wistron/sw-to3200k/sonic_platform/__init__.py b/platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/sonic_platform/__init__.py similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/sw-to3200k/sonic_platform/__init__.py rename to platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/sonic_platform/__init__.py diff --git a/platform/innovium/sonic-platform-modules-wistron/sw-to3200k/sonic_platform/chassis.py b/platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/sonic_platform/chassis.py similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/sw-to3200k/sonic_platform/chassis.py rename to platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/sonic_platform/chassis.py diff --git a/platform/innovium/sonic-platform-modules-wistron/sw-to3200k/sonic_platform/component.py b/platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/sonic_platform/component.py similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/sw-to3200k/sonic_platform/component.py rename to platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/sonic_platform/component.py diff --git a/platform/innovium/sonic-platform-modules-wistron/sw-to3200k/sonic_platform/eeprom.py b/platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/sonic_platform/eeprom.py similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/sw-to3200k/sonic_platform/eeprom.py rename to platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/sonic_platform/eeprom.py diff --git a/platform/innovium/sonic-platform-modules-wistron/sw-to3200k/sonic_platform/fan.py b/platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/sonic_platform/fan.py similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/sw-to3200k/sonic_platform/fan.py rename to platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/sonic_platform/fan.py diff --git a/platform/innovium/sonic-platform-modules-wistron/sw-to3200k/sonic_platform/fan_drawer.py b/platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/sonic_platform/fan_drawer.py similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/sw-to3200k/sonic_platform/fan_drawer.py rename to platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/sonic_platform/fan_drawer.py diff --git a/platform/innovium/sonic-platform-modules-wistron/sw-to3200k/sonic_platform/platform.py b/platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/sonic_platform/platform.py similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/sw-to3200k/sonic_platform/platform.py rename to platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/sonic_platform/platform.py diff --git a/platform/innovium/sonic-platform-modules-wistron/sw-to3200k/sonic_platform/psu.py b/platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/sonic_platform/psu.py similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/sw-to3200k/sonic_platform/psu.py rename to platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/sonic_platform/psu.py diff --git a/platform/innovium/sonic-platform-modules-wistron/sw-to3200k/sonic_platform/sfp.py b/platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/sonic_platform/sfp.py similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/sw-to3200k/sonic_platform/sfp.py rename to platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/sonic_platform/sfp.py diff --git a/platform/innovium/sonic-platform-modules-wistron/sw-to3200k/sonic_platform/thermal.py b/platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/sonic_platform/thermal.py similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/sw-to3200k/sonic_platform/thermal.py rename to platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/sonic_platform/thermal.py diff --git a/platform/innovium/sonic-platform-modules-wistron/sw-to3200k/sonic_platform/watchdog.py b/platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/sonic_platform/watchdog.py similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/sw-to3200k/sonic_platform/watchdog.py rename to platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/sonic_platform/watchdog.py diff --git a/platform/innovium/sonic-platform-modules-wistron/sw-to3200k/utils/platform_firmware_version b/platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/utils/platform_firmware_version similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/sw-to3200k/utils/platform_firmware_version rename to platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/utils/platform_firmware_version diff --git a/platform/innovium/sonic-platform-modules-wistron/sw-to3200k/utils/platform_led b/platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/utils/platform_led similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/sw-to3200k/utils/platform_led rename to platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/utils/platform_led diff --git a/platform/innovium/sonic-platform-modules-wistron/sw-to3200k/utils/platform_pld b/platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/utils/platform_pld similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/sw-to3200k/utils/platform_pld rename to platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/utils/platform_pld diff --git a/platform/innovium/sonic-platform-modules-wistron/sw-to3200k/utils/platform_sync b/platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/utils/platform_sync similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/sw-to3200k/utils/platform_sync rename to platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/utils/platform_sync diff --git a/platform/innovium/sonic-platform-modules-wistron/sw-to3200k/utils/sonic-fanthrml-monitor b/platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/utils/sonic-fanthrml-monitor similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/sw-to3200k/utils/sonic-fanthrml-monitor rename to platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/utils/sonic-fanthrml-monitor diff --git a/platform/innovium/sonic-platform-modules-wistron/sw-to3200k/utils/sonic-led-monitor b/platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/utils/sonic-led-monitor similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/sw-to3200k/utils/sonic-led-monitor rename to platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/utils/sonic-led-monitor diff --git a/platform/innovium/sonic-platform-modules-wistron/sw-to3200k/utils/sonic-psu-monitor b/platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/utils/sonic-psu-monitor similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/sw-to3200k/utils/sonic-psu-monitor rename to platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/utils/sonic-psu-monitor diff --git a/platform/innovium/sonic-platform-modules-wistron/sw-to3200k/utils/sonic-qsfp-monitor b/platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/utils/sonic-qsfp-monitor similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/sw-to3200k/utils/sonic-qsfp-monitor rename to platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/utils/sonic-qsfp-monitor diff --git a/platform/innovium/sonic-platform-modules-wistron/sw-to3200k/utils/sw_to3200k_watchdog.sh b/platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/utils/sw_to3200k_watchdog.sh similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/sw-to3200k/utils/sw_to3200k_watchdog.sh rename to platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/utils/sw_to3200k_watchdog.sh diff --git a/platform/innovium/sonic-platform-modules-wistron/sw-to3200k/utils/wistron_sw_to3200k_util.py b/platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/utils/wistron_sw_to3200k_util.py similarity index 100% rename from platform/innovium/sonic-platform-modules-wistron/sw-to3200k/utils/wistron_sw_to3200k_util.py rename to platform/marvell-teralynx/sonic-platform-modules-wistron/sw-to3200k/utils/wistron_sw_to3200k_util.py From c9a8974a7748888fa2c245abf1c5148047b94c6f Mon Sep 17 00:00:00 2001 From: ksridharan Date: Thu, 1 Aug 2024 06:05:05 -0700 Subject: [PATCH 2/2] 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 | 4 ++-- .../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, 88 insertions(+), 86 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 (87%) 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 46372e51a45d..d5fa119054b0 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 f934bf366484..1f90d97e365e 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 d4f3516b5ee9..c0ac969f5c14 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 - 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 5799352af345..b3a8537b64c5 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) @@ -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=marvell-teralynx * PLATFORM=vs ## Usage for ARM Architecture @@ -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 @@ -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**: @@ -375,6 +375,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 3956a7c94448..eac3b320bfb1 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 87% rename from platform/marvell/docker-saiserver-mrvl/Dockerfile.j2 rename to platform/marvell-prestera/docker-saiserver-mrvl-prestera/Dockerfile.j2 index 1760fb872b92..21b0bcce8017 100644 --- a/platform/marvell/docker-saiserver-mrvl/Dockerfile.j2 +++ b/platform/marvell-prestera/docker-saiserver-mrvl-prestera/Dockerfile.j2 @@ -15,13 +15,13 @@ RUN apt-get update \ libthrift-0.17.0 COPY \ -{% for deb in docker_saiserver_mrvl_debs.split(' ') -%} +{% for deb in docker_saiserver_mrvl_prestera_debs.split(' ') -%} debs/{{ deb }}{{' '}} {%- endfor -%} debs/ RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; } ; \ -{% for deb in docker_saiserver_mrvl_debs.split(' ') -%} +{% for deb in docker_saiserver_mrvl_prestera_debs.split(' ') -%} dpkg_apt debs/{{ deb }}{{'; '}} {%- endfor %} 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 9608c8c41e46..000000000000 --- a/platform/marvell/mrvl-prestera +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9608c8c41e462998cd144ed34780e34f1b48e081 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 75e8dcb5761a..c7ff66c12150 100644 --- a/src/sonic-py-common/sonic_py_common/device_info.py +++ b/src/sonic-py-common/sonic_py_common/device_info.py @@ -760,7 +760,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()