From 006f4b209c919b41a7c1ebd0afdfe07885ef4cad Mon Sep 17 00:00:00 2001 From: Pavan Naregundi <92989231+pavannaregundi@users.noreply.github.com> Date: Mon, 15 Apr 2024 08:55:45 +0530 Subject: [PATCH] [Marvell] Build infrastructure enhancements (#18143) * Move mrvl-prestera and sonic-platform-marvell submodule 'mrvl-prestera' and 'sonic-platform-marvell' submodules are moved from 'marvell-arm64'to 'marvell'. Additionaly submodules are changed to support multi-architecture build. Signed-off-by: Pavan Naregundi --- .azure-pipelines/azure-pipelines-build.yml | 2 + .../azure-pipelines-image-template.yml | 3 +- .azure-pipelines/official-build-cache.yml | 1 + .gitmodules | 8 +-- README.md | 6 +- azure-pipelines.yml | 2 + build_debian.sh | 2 +- build_image.sh | 12 +++- .../arm64-marvell_rd98DX35xx-r0/platform_asic | 2 +- .../platform_asic | 2 +- .../arm64-nokia_ixs7215_52xb-r0/platform_asic | 2 +- .../armhf-nokia_ixs7215_52x-r0/platform_asic | 2 +- onie-image-armhf.conf | 8 +-- onie-mk-demo.sh | 2 +- .../marvell-arm64/docker-syncd-mrvl-rpc.mk | 27 -------- .../docker-syncd-mrvl-rpc/99-syncd.conf | 1 - .../docker-syncd-mrvl-rpc/Dockerfile.j2 | 56 ---------------- .../docker-syncd-mrvl-rpc/ptf_nn_agent.conf | 10 --- platform/marvell-arm64/docker-syncd-mrvl.mk | 16 ----- .../docker-syncd-mrvl/Dockerfile.j2 | 37 ----------- .../docker-syncd-mrvl/critical_processes | 1 - .../docker-syncd-mrvl/supervisord.conf | 39 ----------- .../marvell-arm64/docker-syncd-mrvl/syncd.sh | 12 ---- platform/marvell-arm64/libsaithrift-dev.mk | 20 ------ platform/marvell-arm64/mrvl-prestera | 1 - platform/marvell-arm64/one-image.mk | 17 ----- platform/marvell-arm64/rules.mk | 26 -------- platform/marvell-arm64/sai.mk | 9 --- platform/marvell-arm64/sai/Makefile | 9 --- platform/marvell-arm64/sonic-platform-marvell | 1 - .../debian/sonic-platform-nokia-7215.install | 6 -- .../marvell-armhf/docker-saiserver-mrvl.dep | 8 --- .../marvell-armhf/docker-saiserver-mrvl.mk | 15 ----- .../marvell-armhf/docker-syncd-mrvl-rpc.dep | 8 --- .../marvell-armhf/docker-syncd-mrvl-rpc.mk | 25 -------- .../docker-syncd-mrvl-rpc/99-syncd.conf | 1 - .../docker-syncd-mrvl-rpc/Dockerfile.j2 | 56 ---------------- .../docker-syncd-mrvl-rpc/ptf_nn_agent.conf | 10 --- platform/marvell-armhf/docker-syncd-mrvl.dep | 10 --- platform/marvell-armhf/docker-syncd-mrvl.mk | 16 ----- .../docker-syncd-mrvl/Dockerfile.j2 | 37 ----------- .../docker-syncd-mrvl/critical_processes | 1 - .../docker-syncd-mrvl/supervisord.conf | 39 ----------- platform/marvell-armhf/libsaithrift-dev.dep | 11 ---- platform/marvell-armhf/libsaithrift-dev.mk | 20 ------ platform/marvell-armhf/one-image.dep | 1 - platform/marvell-armhf/one-image.mk | 16 ----- platform/marvell-armhf/platform-et6448m.dep | 8 --- platform/marvell-armhf/platform-et6448m.mk | 8 --- platform/marvell-armhf/platform-nokia.dep | 8 --- platform/marvell-armhf/platform-nokia.mk | 10 --- platform/marvell-armhf/prestera.dep | 8 --- platform/marvell-armhf/prestera.mk | 11 ---- .../marvell-armhf/prestera/debian/changelog | 5 -- platform/marvell-armhf/prestera/debian/compat | 1 - .../marvell-armhf/prestera/debian/control | 15 ----- .../debian/mrvlprestera.install.template | 2 - platform/marvell-armhf/prestera/debian/rules | 56 ---------------- platform/marvell-armhf/rules.dep | 9 --- platform/marvell-armhf/rules.mk | 28 -------- platform/marvell-armhf/sai.dep | 9 --- platform/marvell-armhf/sai.mk | 9 --- platform/marvell-armhf/sai/Makefile | 9 --- .../sonic-platform-et6448m/.gitignore | 50 --------------- .../sonic-platform-et6448m/debian/changelog | 5 -- .../sonic-platform-et6448m/debian/compat | 1 - .../sonic-platform-et6448m/debian/control | 15 ----- .../sonic-platform-et6448m/debian/install | 3 - .../sonic-platform-et6448m/debian/postinst | 40 ------------ .../sonic-platform-et6448m/debian/rules | 25 -------- .../sonic-platform-et6448m/entropy.py | 22 ------- .../et6448m_plt_setup.sh | 60 ----------------- .../sonic-platform-et6448m/inband_mgmt.sh | 40 ------------ .../sonic-platform-nokia/debian/changelog | 5 -- .../sonic-platform-nokia/debian/compat | 1 - .../sonic-platform-nokia/debian/control | 15 ----- .../sonic-platform-nokia/debian/rules | 64 ------------------- .../docker-saiserver-mrvl.dep | 0 .../docker-saiserver-mrvl.mk | 1 + .../docker-syncd-mrvl-rpc.dep | 0 platform/marvell/docker-syncd-mrvl-rpc.mk | 3 + .../docker-syncd-mrvl-rpc/99-syncd.conf | 1 - .../docker-syncd-mrvl-rpc/Dockerfile.j2 | 11 ++-- .../docker-syncd-mrvl.dep | 0 platform/marvell/docker-syncd-mrvl.mk | 5 +- .../marvell/docker-syncd-mrvl/Dockerfile.j2 | 12 ++-- .../docker-syncd-mrvl/supervisord.conf | 2 +- .../libsaithrift-dev.dep | 0 platform/marvell/libsaithrift-dev.mk | 10 +-- platform/marvell/mrvl-prestera | 1 + .../mrvl-prestera.dep | 0 .../mrvl-prestera.mk | 1 - .../{marvell-arm64 => marvell}/one-image.dep | 0 platform/marvell/one-image.mk | 13 ++++ platform/marvell/onie-image-arm64.conf | 55 ++++++++++++++++ .../platform-marvell.dep | 0 .../platform-marvell.mk | 4 +- .../platform-nokia.dep | 0 .../platform-nokia.mk | 13 +++- platform/marvell/platform.conf | 0 .../platform_arm64.conf} | 0 .../platform_armhf.conf} | 0 platform/{marvell-arm64 => marvell}/rules.dep | 4 +- platform/marvell/rules.mk | 10 ++- platform/{marvell-arm64 => marvell}/sai.dep | 2 - platform/marvell/sai.mk | 18 ++++-- platform/marvell/sai/Makefile | 9 --- platform/marvell/sonic-platform-marvell | 1 + .../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 | 2 +- .../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 .../sonic_platform/thermal_actions.py | 0 .../sonic_platform/thermal_conditions.py | 0 .../7215-a1}/sonic_platform/thermal_infos.py | 0 .../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 | 2 +- .../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 | 2 +- .../sonic-platform-nokia/debian/compat | 0 .../sonic-platform-nokia/debian/control | 11 +++- .../sonic-platform-nokia/debian/rules | 44 +++++++++---- .../sonic-platform-nokia-7215-a1.install | 6 ++ .../sonic-platform-nokia-7215-a1.postinst} | 0 .../debian/sonic-platform-nokia-7215.install | 4 +- .../debian/sonic-platform-nokia-7215.postinst | 2 + .../{marvell-arm64 => marvell}/sonic_fit.its | 0 184 files changed, 223 insertions(+), 1184 deletions(-) delete mode 100644 platform/marvell-arm64/docker-syncd-mrvl-rpc.mk delete mode 100644 platform/marvell-arm64/docker-syncd-mrvl-rpc/99-syncd.conf delete mode 100644 platform/marvell-arm64/docker-syncd-mrvl-rpc/Dockerfile.j2 delete mode 100644 platform/marvell-arm64/docker-syncd-mrvl-rpc/ptf_nn_agent.conf delete mode 100644 platform/marvell-arm64/docker-syncd-mrvl.mk delete mode 100755 platform/marvell-arm64/docker-syncd-mrvl/Dockerfile.j2 delete mode 100644 platform/marvell-arm64/docker-syncd-mrvl/critical_processes delete mode 100644 platform/marvell-arm64/docker-syncd-mrvl/supervisord.conf delete mode 100755 platform/marvell-arm64/docker-syncd-mrvl/syncd.sh delete mode 100644 platform/marvell-arm64/libsaithrift-dev.mk delete mode 160000 platform/marvell-arm64/mrvl-prestera delete mode 100644 platform/marvell-arm64/one-image.mk delete mode 100644 platform/marvell-arm64/rules.mk delete mode 100644 platform/marvell-arm64/sai.mk delete mode 100644 platform/marvell-arm64/sai/Makefile delete mode 160000 platform/marvell-arm64/sonic-platform-marvell delete mode 100644 platform/marvell-arm64/sonic-platform-nokia/debian/sonic-platform-nokia-7215.install delete mode 100644 platform/marvell-armhf/docker-saiserver-mrvl.dep delete mode 100644 platform/marvell-armhf/docker-saiserver-mrvl.mk delete mode 100644 platform/marvell-armhf/docker-syncd-mrvl-rpc.dep delete mode 100644 platform/marvell-armhf/docker-syncd-mrvl-rpc.mk delete mode 100644 platform/marvell-armhf/docker-syncd-mrvl-rpc/99-syncd.conf delete mode 100644 platform/marvell-armhf/docker-syncd-mrvl-rpc/Dockerfile.j2 delete mode 100644 platform/marvell-armhf/docker-syncd-mrvl-rpc/ptf_nn_agent.conf delete mode 100644 platform/marvell-armhf/docker-syncd-mrvl.dep delete mode 100644 platform/marvell-armhf/docker-syncd-mrvl.mk delete mode 100755 platform/marvell-armhf/docker-syncd-mrvl/Dockerfile.j2 delete mode 100644 platform/marvell-armhf/docker-syncd-mrvl/critical_processes delete mode 100644 platform/marvell-armhf/docker-syncd-mrvl/supervisord.conf delete mode 100644 platform/marvell-armhf/libsaithrift-dev.dep delete mode 100644 platform/marvell-armhf/libsaithrift-dev.mk delete mode 100644 platform/marvell-armhf/one-image.dep delete mode 100644 platform/marvell-armhf/one-image.mk delete mode 100644 platform/marvell-armhf/platform-et6448m.dep delete mode 100644 platform/marvell-armhf/platform-et6448m.mk delete mode 100644 platform/marvell-armhf/platform-nokia.dep delete mode 100644 platform/marvell-armhf/platform-nokia.mk delete mode 100644 platform/marvell-armhf/prestera.dep delete mode 100644 platform/marvell-armhf/prestera.mk delete mode 100644 platform/marvell-armhf/prestera/debian/changelog delete mode 100644 platform/marvell-armhf/prestera/debian/compat delete mode 100755 platform/marvell-armhf/prestera/debian/control delete mode 100644 platform/marvell-armhf/prestera/debian/mrvlprestera.install.template delete mode 100755 platform/marvell-armhf/prestera/debian/rules delete mode 100644 platform/marvell-armhf/rules.dep delete mode 100644 platform/marvell-armhf/rules.mk delete mode 100644 platform/marvell-armhf/sai.dep delete mode 100644 platform/marvell-armhf/sai.mk delete mode 100644 platform/marvell-armhf/sai/Makefile delete mode 100644 platform/marvell-armhf/sonic-platform-et6448m/.gitignore delete mode 100755 platform/marvell-armhf/sonic-platform-et6448m/debian/changelog delete mode 100644 platform/marvell-armhf/sonic-platform-et6448m/debian/compat delete mode 100755 platform/marvell-armhf/sonic-platform-et6448m/debian/control delete mode 100644 platform/marvell-armhf/sonic-platform-et6448m/debian/install delete mode 100644 platform/marvell-armhf/sonic-platform-et6448m/debian/postinst delete mode 100755 platform/marvell-armhf/sonic-platform-et6448m/debian/rules delete mode 100644 platform/marvell-armhf/sonic-platform-et6448m/entropy.py delete mode 100755 platform/marvell-armhf/sonic-platform-et6448m/et6448m_plt_setup.sh delete mode 100644 platform/marvell-armhf/sonic-platform-et6448m/inband_mgmt.sh delete mode 100755 platform/marvell-armhf/sonic-platform-nokia/debian/changelog delete mode 100644 platform/marvell-armhf/sonic-platform-nokia/debian/compat delete mode 100755 platform/marvell-armhf/sonic-platform-nokia/debian/control delete mode 100755 platform/marvell-armhf/sonic-platform-nokia/debian/rules rename platform/{marvell-arm64 => marvell}/docker-saiserver-mrvl.dep (100%) rename platform/{marvell-arm64 => marvell}/docker-saiserver-mrvl.mk (93%) rename platform/{marvell-arm64 => marvell}/docker-syncd-mrvl-rpc.dep (100%) rename platform/{marvell-arm64 => marvell}/docker-syncd-mrvl.dep (100%) rename platform/{marvell-arm64 => marvell}/libsaithrift-dev.dep (100%) create mode 160000 platform/marvell/mrvl-prestera rename platform/{marvell-arm64 => marvell}/mrvl-prestera.dep (100%) rename platform/{marvell-arm64 => marvell}/mrvl-prestera.mk (80%) rename platform/{marvell-arm64 => marvell}/one-image.dep (100%) create mode 100644 platform/marvell/onie-image-arm64.conf rename platform/{marvell-arm64 => marvell}/platform-marvell.dep (100%) rename platform/{marvell-arm64 => marvell}/platform-marvell.mk (89%) rename platform/{marvell-arm64 => marvell}/platform-nokia.dep (100%) rename platform/{marvell-arm64 => marvell}/platform-nokia.mk (61%) delete mode 100644 platform/marvell/platform.conf rename platform/{marvell-arm64/platform.conf => marvell/platform_arm64.conf} (100%) rename platform/{marvell-armhf/platform.conf => marvell/platform_armhf.conf} (100%) rename platform/{marvell-arm64 => marvell}/rules.dep (84%) rename platform/{marvell-arm64 => marvell}/sai.dep (76%) delete mode 100644 platform/marvell/sai/Makefile create mode 160000 platform/marvell/sonic-platform-marvell rename platform/{marvell-arm64/sonic-platform-nokia/7215 => marvell/sonic-platform-nokia/7215-a1}/modules/Makefile (100%) rename platform/{marvell-arm64/sonic-platform-nokia/7215 => marvell/sonic-platform-nokia/7215-a1}/modules/cn9130_cpu_thermal_sensor.c (100%) rename platform/{marvell-arm64/sonic-platform-nokia/7215 => marvell/sonic-platform-nokia/7215-a1}/modules/nokia_7215_ixs_a1_cpld.c (100%) rename platform/{marvell-arm64/sonic-platform-nokia/7215 => marvell/sonic-platform-nokia/7215-a1}/scripts/cpu_wdt.py (100%) rename platform/{marvell-arm64/sonic-platform-nokia/7215 => marvell/sonic-platform-nokia/7215-a1}/scripts/nokia-7215-init.sh (100%) rename platform/{marvell-arm64/sonic-platform-nokia/7215 => marvell/sonic-platform-nokia/7215-a1}/service/cpu_wdt.service (100%) rename platform/{marvell-arm64/sonic-platform-nokia/7215 => marvell/sonic-platform-nokia/7215-a1}/service/nokia-7215init.service (100%) rename platform/{marvell-armhf/sonic-platform-nokia/7215 => marvell/sonic-platform-nokia/7215-a1}/setup.py (80%) rename platform/{marvell-arm64/sonic-platform-nokia/7215 => marvell/sonic-platform-nokia/7215-a1}/sonic_platform/__init__.py (100%) rename platform/{marvell-arm64/sonic-platform-nokia/7215 => marvell/sonic-platform-nokia/7215-a1}/sonic_platform/chassis.py (100%) rename platform/{marvell-arm64/sonic-platform-nokia/7215 => marvell/sonic-platform-nokia/7215-a1}/sonic_platform/component.py (100%) rename platform/{marvell-arm64/sonic-platform-nokia/7215 => marvell/sonic-platform-nokia/7215-a1}/sonic_platform/eeprom.py (100%) rename platform/{marvell-arm64/sonic-platform-nokia/7215 => marvell/sonic-platform-nokia/7215-a1}/sonic_platform/fan.py (100%) rename platform/{marvell-arm64/sonic-platform-nokia/7215 => marvell/sonic-platform-nokia/7215-a1}/sonic_platform/fan_drawer.py (100%) rename platform/{marvell-arm64/sonic-platform-nokia/7215 => marvell/sonic-platform-nokia/7215-a1}/sonic_platform/platform.py (100%) rename platform/{marvell-arm64/sonic-platform-nokia/7215 => marvell/sonic-platform-nokia/7215-a1}/sonic_platform/psu.py (100%) rename platform/{marvell-arm64/sonic-platform-nokia/7215 => marvell/sonic-platform-nokia/7215-a1}/sonic_platform/sfp.py (100%) rename platform/{marvell-arm64/sonic-platform-nokia/7215 => marvell/sonic-platform-nokia/7215-a1}/sonic_platform/sfp_event.py (100%) rename platform/{marvell-arm64/sonic-platform-nokia/7215 => marvell/sonic-platform-nokia/7215-a1}/sonic_platform/test/README (100%) rename platform/{marvell-arm64/sonic-platform-nokia/7215 => marvell/sonic-platform-nokia/7215-a1}/sonic_platform/test/test-chassis.py (100%) rename platform/{marvell-arm64/sonic-platform-nokia/7215 => marvell/sonic-platform-nokia/7215-a1}/sonic_platform/test/test-component.py (100%) rename platform/{marvell-arm64/sonic-platform-nokia/7215 => marvell/sonic-platform-nokia/7215-a1}/sonic_platform/test/test-eeprom.py (100%) rename platform/{marvell-arm64/sonic-platform-nokia/7215 => marvell/sonic-platform-nokia/7215-a1}/sonic_platform/test/test-fan.py (100%) rename platform/{marvell-arm64/sonic-platform-nokia/7215 => marvell/sonic-platform-nokia/7215-a1}/sonic_platform/test/test-psu.py (100%) rename platform/{marvell-arm64/sonic-platform-nokia/7215 => marvell/sonic-platform-nokia/7215-a1}/sonic_platform/test/test-sfp.py (100%) rename platform/{marvell-arm64/sonic-platform-nokia/7215 => marvell/sonic-platform-nokia/7215-a1}/sonic_platform/test/test-thermal.py (100%) rename platform/{marvell-arm64/sonic-platform-nokia/7215 => marvell/sonic-platform-nokia/7215-a1}/sonic_platform/test/test-watchdog.py (100%) rename platform/{marvell-arm64/sonic-platform-nokia/7215 => marvell/sonic-platform-nokia/7215-a1}/sonic_platform/thermal.py (100%) rename platform/{marvell-arm64/sonic-platform-nokia/7215 => marvell/sonic-platform-nokia/7215-a1}/sonic_platform/thermal_actions.py (100%) rename platform/{marvell-arm64/sonic-platform-nokia/7215 => marvell/sonic-platform-nokia/7215-a1}/sonic_platform/thermal_conditions.py (100%) rename platform/{marvell-arm64/sonic-platform-nokia/7215 => marvell/sonic-platform-nokia/7215-a1}/sonic_platform/thermal_infos.py (100%) rename platform/{marvell-arm64/sonic-platform-nokia/7215 => marvell/sonic-platform-nokia/7215-a1}/sonic_platform/thermal_manager.py (100%) rename platform/{marvell-arm64/sonic-platform-nokia/7215 => marvell/sonic-platform-nokia/7215-a1}/sonic_platform/watchdog.py (100%) rename platform/{marvell-arm64/sonic-platform-nokia/7215 => marvell/sonic-platform-nokia/7215-a1}/utils/sonic_ssd.py (100%) rename platform/{marvell-armhf => marvell}/sonic-platform-nokia/7215/scripts/cpu_wdt.py (100%) rename platform/{marvell-armhf/sonic-platform-nokia => marvell/sonic-platform-nokia/7215/scripts}/inband_mgmt.sh (100%) rename platform/{marvell-armhf/sonic-platform-nokia => marvell/sonic-platform-nokia/7215/scripts}/nokia-7215_plt_setup.sh (100%) rename platform/{marvell-armhf => marvell}/sonic-platform-nokia/7215/scripts/nokia-7215init.sh (100%) rename platform/{marvell-armhf => marvell}/sonic-platform-nokia/7215/service/cpu_wdt.service (100%) rename platform/{marvell-armhf => marvell}/sonic-platform-nokia/7215/service/fstrim.timer/timer-override.conf (100%) rename platform/{marvell-armhf => marvell}/sonic-platform-nokia/7215/service/nokia-7215init.service (100%) rename platform/{marvell-arm64 => marvell}/sonic-platform-nokia/7215/setup.py (80%) rename platform/{marvell-armhf => marvell}/sonic-platform-nokia/7215/sonic_platform/__init__.py (100%) rename platform/{marvell-armhf => marvell}/sonic-platform-nokia/7215/sonic_platform/chassis.py (100%) rename platform/{marvell-armhf => marvell}/sonic-platform-nokia/7215/sonic_platform/component.py (100%) rename platform/{marvell-armhf => marvell}/sonic-platform-nokia/7215/sonic_platform/eeprom.py (100%) rename platform/{marvell-armhf => marvell}/sonic-platform-nokia/7215/sonic_platform/fan.py (100%) rename platform/{marvell-armhf => marvell}/sonic-platform-nokia/7215/sonic_platform/fan_drawer.py (100%) rename platform/{marvell-armhf => marvell}/sonic-platform-nokia/7215/sonic_platform/platform.py (100%) rename platform/{marvell-armhf => marvell}/sonic-platform-nokia/7215/sonic_platform/psu.py (100%) rename platform/{marvell-armhf => marvell}/sonic-platform-nokia/7215/sonic_platform/sfp.py (100%) rename platform/{marvell-armhf => marvell}/sonic-platform-nokia/7215/sonic_platform/sfp_event.py (100%) rename platform/{marvell-armhf => marvell}/sonic-platform-nokia/7215/sonic_platform/test/README (100%) rename platform/{marvell-armhf => marvell}/sonic-platform-nokia/7215/sonic_platform/test/test-chassis.py (100%) rename platform/{marvell-armhf => marvell}/sonic-platform-nokia/7215/sonic_platform/test/test-component.py (100%) rename platform/{marvell-armhf => marvell}/sonic-platform-nokia/7215/sonic_platform/test/test-eeprom.py (100%) rename platform/{marvell-armhf => marvell}/sonic-platform-nokia/7215/sonic_platform/test/test-fan.py (100%) rename platform/{marvell-armhf => marvell}/sonic-platform-nokia/7215/sonic_platform/test/test-psu.py (100%) rename platform/{marvell-armhf => marvell}/sonic-platform-nokia/7215/sonic_platform/test/test-sfp.py (100%) rename platform/{marvell-armhf => marvell}/sonic-platform-nokia/7215/sonic_platform/test/test-thermal.py (100%) rename platform/{marvell-armhf => marvell}/sonic-platform-nokia/7215/sonic_platform/test/test-watchdog.py (100%) rename platform/{marvell-armhf => marvell}/sonic-platform-nokia/7215/sonic_platform/thermal.py (100%) rename platform/{marvell-armhf => marvell}/sonic-platform-nokia/7215/sonic_platform/thermal_actions.py (100%) rename platform/{marvell-armhf => marvell}/sonic-platform-nokia/7215/sonic_platform/thermal_conditions.py (100%) rename platform/{marvell-armhf => marvell}/sonic-platform-nokia/7215/sonic_platform/thermal_infos.py (100%) rename platform/{marvell-armhf => marvell}/sonic-platform-nokia/7215/sonic_platform/thermal_manager.py (100%) rename platform/{marvell-armhf => marvell}/sonic-platform-nokia/7215/sonic_platform/watchdog.py (100%) rename platform/{marvell-arm64 => marvell}/sonic-platform-nokia/debian/changelog (65%) rename platform/{marvell-arm64 => marvell}/sonic-platform-nokia/debian/compat (100%) rename platform/{marvell-arm64 => marvell}/sonic-platform-nokia/debian/control (60%) rename platform/{marvell-arm64 => marvell}/sonic-platform-nokia/debian/rules (51%) create mode 100644 platform/marvell/sonic-platform-nokia/debian/sonic-platform-nokia-7215-a1.install rename platform/{marvell-arm64/sonic-platform-nokia/debian/sonic-platform-nokia-7215.postinst => marvell/sonic-platform-nokia/debian/sonic-platform-nokia-7215-a1.postinst} (100%) rename platform/{marvell-armhf => marvell}/sonic-platform-nokia/debian/sonic-platform-nokia-7215.install (82%) rename platform/{marvell-armhf => marvell}/sonic-platform-nokia/debian/sonic-platform-nokia-7215.postinst (89%) rename platform/{marvell-arm64 => marvell}/sonic_fit.its (100%) diff --git a/.azure-pipelines/azure-pipelines-build.yml b/.azure-pipelines/azure-pipelines-build.yml index b5e5c732286a..cf2b8404162e 100644 --- a/.azure-pipelines/azure-pipelines-build.yml +++ b/.azure-pipelines/azure-pipelines-build.yml @@ -90,6 +90,7 @@ jobs: pool: sonicbld-armhf timeoutInMinutes: 2880 variables: + PLATFORM_NAME: marvell PLATFORM_ARCH: armhf - name: marvell-arm64 @@ -97,6 +98,7 @@ jobs: pool: sonicbld-arm64 timeoutInMinutes: 2880 variables: + PLATFORM_NAME: marvell PLATFORM_ARCH: arm64 - name: marvell diff --git a/.azure-pipelines/azure-pipelines-image-template.yml b/.azure-pipelines/azure-pipelines-image-template.yml index c412edb4234b..c2e8b8856f50 100644 --- a/.azure-pipelines/azure-pipelines-image-template.yml +++ b/.azure-pipelines/azure-pipelines-image-template.yml @@ -49,7 +49,8 @@ jobs: sudo modprobe overlay sudo apt-get install -y acl sudo bash -c "echo 1 > /proc/sys/vm/compact_memory" - ENABLE_DOCKER_BASE_PULL=y make PLATFORM=$(PLATFORM_AZP) PLATFORM_ARCH=$(PLATFORM_ARCH) $(BUILD_OPTIONS) configure + [ -z "$PLATFORM_NAME" ] && PLATFORM_NAME=$(PLATFORM_AZP) + ENABLE_DOCKER_BASE_PULL=y make PLATFORM=$PLATFORM_NAME PLATFORM_ARCH=$(PLATFORM_ARCH) $(BUILD_OPTIONS) configure displayName: 'Make configure' postSteps: - script: | diff --git a/.azure-pipelines/official-build-cache.yml b/.azure-pipelines/official-build-cache.yml index c4261a72092c..cc398bab7117 100644 --- a/.azure-pipelines/official-build-cache.yml +++ b/.azure-pipelines/official-build-cache.yml @@ -49,4 +49,5 @@ stages: pool: sonicbld-armhf timeoutInMinutes: 1200 variables: + PLATFORM_NAME: marvell PLATFORM_ARCH: armhf diff --git a/.gitmodules b/.gitmodules index e9b57673b2dd..71cfffa1b6c1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -115,9 +115,9 @@ [submodule "src/sonic-dash-api"] path = src/sonic-dash-api url = https://github.com/sonic-net/sonic-dash-api.git -[submodule "platform/marvell-arm64/mrvl-prestera"] - path = platform/marvell-arm64/mrvl-prestera +[submodule "platform/marvell/mrvl-prestera"] + path = platform/marvell/mrvl-prestera url = https://github.com/Marvell-switching/mrvl-prestera.git -[submodule "platform/marvell-arm64/sonic-platform-marvell"] - path = platform/marvell-arm64/sonic-platform-marvell +[submodule "platform/marvell/sonic-platform-marvell"] + path = platform/marvell/sonic-platform-marvell url = https://github.com/Marvell-switching/sonic-platform-arm64.git diff --git a/README.md b/README.md index 534540e3edf7..1fbcb128c539 100644 --- a/README.md +++ b/README.md @@ -204,7 +204,7 @@ make target/sonic-[ASIC_VENDER]-armhf.bin _example:_ ```shell -make configure PLATFORM=marvell-armhf PLATFORM_ARCH=armhf +make configure PLATFORM=marvell PLATFORM_ARCH=armhf make target/sonic-marvell-armhf.bin ``` @@ -215,7 +215,7 @@ using cross-compilation, run the following commands: # Execute make configure once to configure ASIC and ARCH for cross-compilation build NOJESSIE=1 NOSTRETCH=1 BLDENV=buster CROSS_BLDENV=1 \ -make configure PLATFORM=marvell-armhf PLATFORM_ARCH=armhf +make configure PLATFORM=marvell PLATFORM_ARCH=armhf # Execute Arm32 build using cross-compilation environment @@ -234,7 +234,7 @@ make configure PLATFORM=[ASIC_VENDOR] PLATFORM_ARCH=arm64 # example: -make configure PLATFORM=marvell-arm64 PLATFORM_ARCH=arm64 +make configure PLATFORM=marvell PLATFORM_ARCH=arm64 ``` **NOTE**: diff --git a/azure-pipelines.yml b/azure-pipelines.yml index ed8632203290..cafd813e5e92 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -79,11 +79,13 @@ stages: - name: marvell-arm64 pool: sonicbld-arm64 variables: + PLATFORM_NAME: marvell PLATFORM_ARCH: arm64 - name: marvell-armhf pool: sonicbld-armhf timeoutInMinutes: 1200 variables: + PLATFORM_NAME: marvell PLATFORM_ARCH: armhf INCLUDE_RESTAPI: y diff --git a/build_debian.sh b/build_debian.sh index 4b0504b40b52..508c5dffa8f6 100755 --- a/build_debian.sh +++ b/build_debian.sh @@ -781,7 +781,7 @@ if [[ $TARGET_BOOTLOADER == uboot ]]; then ## Overwriting the initrd image with uInitrd sudo LANG=C chroot $FILESYSTEM_ROOT mv /boot/u${INITRD_FILE} /boot/$INITRD_FILE else - sudo cp -v $PLATFORM_DIR/${sonic_asic_platform}-${CONFIGURED_ARCH}/sonic_fit.its $FILESYSTEM_ROOT/boot/ + sudo cp -v $PLATFORM_DIR/$CONFIGURED_PLATFORM/sonic_fit.its $FILESYSTEM_ROOT/boot/ sudo LANG=C chroot $FILESYSTEM_ROOT mkimage -f /boot/sonic_fit.its /boot/sonic_${CONFIGURED_ARCH}.fit fi fi diff --git a/build_image.sh b/build_image.sh index 7fafba29efd1..fe75bcaf332f 100755 --- a/build_image.sh +++ b/build_image.sh @@ -9,7 +9,11 @@ set -x -e CONFIGURED_ARCH=$([ -f .arch ] && cat .arch || echo amd64) if [[ $CONFIGURED_ARCH == armhf || $CONFIGURED_ARCH == arm64 ]]; then - . ./onie-image-${CONFIGURED_ARCH}.conf + if [ -r ./platform/${CONFIGURED_PLATFORM}/onie-image-${CONFIGURED_ARCH}.conf ]; then + . ./platform/${CONFIGURED_PLATFORM}/onie-image-${CONFIGURED_ARCH}.conf + else + . ./onie-image-${CONFIGURED_ARCH}.conf + fi else . ./onie-image.conf fi @@ -82,10 +86,14 @@ generate_onie_installer_image() done done + platform_conf_file="platform/$TARGET_MACHINE/platform_${CONFIGURED_ARCH}.conf" + if [ ! -f $platform_conf_file ]; then + platform_conf_file="platform/$TARGET_MACHINE/platform.conf" + fi ## Generate an ONIE installer image ## Note: Don't leave blank between lines. It is single line command. ./onie-mk-demo.sh $CONFIGURED_ARCH $TARGET_MACHINE $TARGET_PLATFORM-$TARGET_MACHINE-$ONIEIMAGE_VERSION \ - installer platform/$TARGET_MACHINE/platform.conf $output_file OS $IMAGE_VERSION $ONIE_IMAGE_PART_SIZE \ + installer $platform_conf_file $output_file OS $IMAGE_VERSION $ONIE_IMAGE_PART_SIZE \ $INSTALLER_PAYLOAD $SECURE_UPGRADE_SIGNING_CERT $SECURE_UPGRADE_DEV_SIGNING_KEY } diff --git a/device/marvell/arm64-marvell_rd98DX35xx-r0/platform_asic b/device/marvell/arm64-marvell_rd98DX35xx-r0/platform_asic index 558e01e1845e..a554752878b7 100644 --- a/device/marvell/arm64-marvell_rd98DX35xx-r0/platform_asic +++ b/device/marvell/arm64-marvell_rd98DX35xx-r0/platform_asic @@ -1 +1 @@ -marvell-arm64 +marvell diff --git a/device/marvell/arm64-marvell_rd98DX35xx_cn9131-r0/platform_asic b/device/marvell/arm64-marvell_rd98DX35xx_cn9131-r0/platform_asic index 558e01e1845e..a554752878b7 100644 --- a/device/marvell/arm64-marvell_rd98DX35xx_cn9131-r0/platform_asic +++ b/device/marvell/arm64-marvell_rd98DX35xx_cn9131-r0/platform_asic @@ -1 +1 @@ -marvell-arm64 +marvell diff --git a/device/nokia/arm64-nokia_ixs7215_52xb-r0/platform_asic b/device/nokia/arm64-nokia_ixs7215_52xb-r0/platform_asic index 558e01e1845e..a554752878b7 100644 --- a/device/nokia/arm64-nokia_ixs7215_52xb-r0/platform_asic +++ b/device/nokia/arm64-nokia_ixs7215_52xb-r0/platform_asic @@ -1 +1 @@ -marvell-arm64 +marvell diff --git a/device/nokia/armhf-nokia_ixs7215_52x-r0/platform_asic b/device/nokia/armhf-nokia_ixs7215_52x-r0/platform_asic index 64b1d7dbb42b..a554752878b7 100644 --- a/device/nokia/armhf-nokia_ixs7215_52x-r0/platform_asic +++ b/device/nokia/armhf-nokia_ixs7215_52x-r0/platform_asic @@ -1 +1 @@ -marvell-armhf +marvell diff --git a/onie-image-armhf.conf b/onie-image-armhf.conf index 2672187d95f8..f3d88fc6f97c 100644 --- a/onie-image-armhf.conf +++ b/onie-image-armhf.conf @@ -31,22 +31,22 @@ DOCKERFS_DIR=docker DOCKER_RAMFS_SIZE=2500M ## Output file name for onie installer -OUTPUT_ONIE_IMAGE=target/sonic-$TARGET_MACHINE.bin +OUTPUT_ONIE_IMAGE=target/sonic-$TARGET_MACHINE-$CONFIGURED_ARCH.bin ## Output file name for raw image -OUTPUT_RAW_IMAGE=target/sonic-$TARGET_MACHINE.raw +OUTPUT_RAW_IMAGE=target/sonic-$TARGET_MACHINE-$CONFIGURED_ARCH.raw ## Raw image size in MB RAW_IMAGE_DISK_SIZE=4096 ## Output file name for kvm image -OUTPUT_KVM_IMAGE=target/sonic-$TARGET_MACHINE.img +OUTPUT_KVM_IMAGE=target/sonic-$TARGET_MACHINE-$CONFIGURED_ARCH.img ## Kvm image size in GB KVM_IMAGE_DISK_SIZE=16 ## Output file name for aboot installer -OUTPUT_ABOOT_IMAGE=target/sonic-aboot-$TARGET_MACHINE.swi +OUTPUT_ABOOT_IMAGE=target/sonic-aboot-$TARGET_MACHINE-$CONFIGURED_ARCH.swi ## Aboot boot image name ABOOT_BOOT_IMAGE=.sonic-boot.swi diff --git a/onie-mk-demo.sh b/onie-mk-demo.sh index 72140407f2ec..713c1c440351 100755 --- a/onie-mk-demo.sh +++ b/onie-mk-demo.sh @@ -107,7 +107,7 @@ echo -n "." cp -r $onie_installer_payload $tmp_installdir || clean_up 1 echo -n "." [ -r "$platform_conf" ] && { - cp $platform_conf $tmp_installdir || clean_up 1 + cp $platform_conf $tmp_installdir/platform.conf || clean_up 1 } echo "machine=$machine" > $tmp_installdir/machine.conf echo "platform=$platform" >> $tmp_installdir/machine.conf diff --git a/platform/marvell-arm64/docker-syncd-mrvl-rpc.mk b/platform/marvell-arm64/docker-syncd-mrvl-rpc.mk deleted file mode 100644 index 5879023364e3..000000000000 --- a/platform/marvell-arm64/docker-syncd-mrvl-rpc.mk +++ /dev/null @@ -1,27 +0,0 @@ -# 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)_DEPENDS += $(SYNCD_RPC) $(LIBTHRIFT) $(PTF) -$(DOCKER_SYNCD_MRVL_RPC)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT) -ifeq ($(INSTALL_DEBUG_TOOLS), y) -$(DOCKER_SYNCD_MRVL_RPC)_DEPENDS += $(SYNCD_RPC_DBG) \ - $(LIBSWSSCOMMON_DBG) \ - $(LIBSAIMETADATA_DBG) \ - $(LIBSAIREDIS_DBG) -endif -$(DOCKER_SYNCD_MRVL_RPC)_LOAD_DOCKERS += $(DOCKER_SYNCD_BASE) -SONIC_DOCKER_IMAGES += $(DOCKER_SYNCD_MRVL_RPC) -ifeq ($(ENABLE_SYNCD_RPC),y) -SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_SYNCD_MRVL_RPC) -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)_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 -$(DOCKER_SYNCD_MRVL_RPC)_RUN_OPT += -v /host/warmboot:/var/warmboot - -SONIC_BULLSEYE_DOCKERS += $(DOCKER_SYNCD_MRVL_RPC) diff --git a/platform/marvell-arm64/docker-syncd-mrvl-rpc/99-syncd.conf b/platform/marvell-arm64/docker-syncd-mrvl-rpc/99-syncd.conf deleted file mode 100644 index 3fabe208d815..000000000000 --- a/platform/marvell-arm64/docker-syncd-mrvl-rpc/99-syncd.conf +++ /dev/null @@ -1 +0,0 @@ -sysctl -w net.core.rmem_max=509430500 diff --git a/platform/marvell-arm64/docker-syncd-mrvl-rpc/Dockerfile.j2 b/platform/marvell-arm64/docker-syncd-mrvl-rpc/Dockerfile.j2 deleted file mode 100644 index 6bd7fb9c7f64..000000000000 --- a/platform/marvell-arm64/docker-syncd-mrvl-rpc/Dockerfile.j2 +++ /dev/null @@ -1,56 +0,0 @@ -FROM docker-syncd-mrvl-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}} - -## Make apt-get non-interactive -ENV DEBIAN_FRONTEND=noninteractive - -COPY \ -{% for deb in docker_syncd_mrvl_rpc_debs.split(' ') -%} -debs/{{ deb }}{{' '}} -{%- endfor -%} -debs/ - -RUN apt-get purge -y syncd - -## Pre-install the fundamental packages -RUN apt-get update \ - && apt-get -y install \ - net-tools \ - python3-pip \ - python3-setuptools \ - build-essential \ - libssl-dev \ - libffi-dev \ - python-dev \ - wget \ - cmake \ - libqt5core5a \ - libqt5network5 \ - libboost-atomic1.74.0 - -RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; } ; \ -{% for deb in docker_syncd_mrvl_rpc_debs.split(' ') -%} -dpkg_apt debs/{{ deb }}{{'; '}} -{%- endfor %} - -RUN wget https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz \ - && tar xvfz 1.0.0.tar.gz \ - && cd nanomsg-1.0.0 \ - && mkdir -p build \ - && cmake . \ - && make install \ - && ldconfig \ - && cd .. \ - && rm -fr nanomsg-1.0.0 \ - && rm -f 1.0.0.tar.gz \ - && pip3 install cffi==1.7.0 \ - && pip3 install --upgrade cffi==1.7.0 \ - && pip3 install nnpy \ - && mkdir -p /opt \ - && cd /opt \ - && wget https://github.com/raw/p4lang/ptf/master/ptf_nn/ptf_nn_agent.py \ - && apt-get clean -y; apt-get autoclean -y; apt-get autoremove -y \ - && rm -rf /root/deps - -COPY ["ptf_nn_agent.conf", "/etc/supervisor/conf.d/"] - -ENTRYPOINT ["/usr/local/bin/supervisord"] diff --git a/platform/marvell-arm64/docker-syncd-mrvl-rpc/ptf_nn_agent.conf b/platform/marvell-arm64/docker-syncd-mrvl-rpc/ptf_nn_agent.conf deleted file mode 100644 index fa1ed0eb1622..000000000000 --- a/platform/marvell-arm64/docker-syncd-mrvl-rpc/ptf_nn_agent.conf +++ /dev/null @@ -1,10 +0,0 @@ -[program:ptf_nn_agent] -command=/usr/bin/python /opt/ptf_nn_agent.py --device-socket 1@tcp://0.0.0.0:10900 -i 1-3@Ethernet12 --set-iface-rcv-buffer=109430400 -process_name=ptf_nn_agent -stdout_logfile=/tmp/ptf_nn_agent.out.log -stderr_logfile=/tmp/ptf_nn_agent.err.log -redirect_stderr=false -autostart=true -autorestart=true -startsecs=1 -numprocs=1 diff --git a/platform/marvell-arm64/docker-syncd-mrvl.mk b/platform/marvell-arm64/docker-syncd-mrvl.mk deleted file mode 100644 index 236f8a437b44..000000000000 --- a/platform/marvell-arm64/docker-syncd-mrvl.mk +++ /dev/null @@ -1,16 +0,0 @@ -# docker image for mrvl syncd - -DOCKER_SYNCD_PLATFORM_CODE = mrvl -include $(PLATFORM_PATH)/../template/docker-syncd-bullseye.mk - -$(DOCKER_SYNCD_BASE)_DEPENDS += $(SYNCD) - -$(DOCKER_SYNCD_BASE)_DBG_DEPENDS += $(SYNCD_DBG) \ - $(LIBSWSSCOMMON_DBG) \ - $(LIBSAIMETADATA_DBG) \ - $(LIBSAIREDIS_DBG) - -$(DOCKER_SYNCD_BASE)_VERSION = 1.0.0 -$(DOCKER_SYNCD_BASE)_PACKAGE_NAME = syncd - -#$(DOCKER_SYNCD_BASE)_RUN_OPT += -v /host/warmboot:/var/warmboot diff --git a/platform/marvell-arm64/docker-syncd-mrvl/Dockerfile.j2 b/platform/marvell-arm64/docker-syncd-mrvl/Dockerfile.j2 deleted file mode 100755 index 84e3d5bde2fb..000000000000 --- a/platform/marvell-arm64/docker-syncd-mrvl/Dockerfile.j2 +++ /dev/null @@ -1,37 +0,0 @@ -{% from "dockers/dockerfile-macros.j2" import install_debian_packages %} -FROM docker-config-engine-bullseye-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}} - -ARG docker_container_name - -## Make apt-get non-interactive -ENV DEBIAN_FRONTEND=noninteractive - -RUN apt-get update - -COPY \ -{% for deb in docker_syncd_mrvl_debs.split(' ') -%} -debs/{{ deb }}{{' '}} -{%- endfor -%} -debs/ - -RUN apt-get update \ - && apt-get -y install \ - net-tools \ - iputils-ping - -RUN apt-get -y install libpcap-dev libxml2-dev python-dev swig libsensors4-dev nfs-common - -RUN dpkg -i \ -{% for deb in docker_syncd_mrvl_debs.split(' ') -%} -debs/{{ deb }}{{' '}} -{%- endfor %} - -COPY ["supervisord.conf", "/etc/supervisor/conf.d/"] -COPY ["files/supervisor-proc-exit-listener", "/usr/bin/"] -COPY ["critical_processes", "/etc/supervisor/"] - -## Clean up -RUN apt-get clean -y; apt-get autoclean -y; apt-get autoremove -y -RUN rm -rf /debs - -ENTRYPOINT ["/usr/local/bin/supervisord"] diff --git a/platform/marvell-arm64/docker-syncd-mrvl/critical_processes b/platform/marvell-arm64/docker-syncd-mrvl/critical_processes deleted file mode 100644 index bdd6903c5690..000000000000 --- a/platform/marvell-arm64/docker-syncd-mrvl/critical_processes +++ /dev/null @@ -1 +0,0 @@ -program:syncd diff --git a/platform/marvell-arm64/docker-syncd-mrvl/supervisord.conf b/platform/marvell-arm64/docker-syncd-mrvl/supervisord.conf deleted file mode 100644 index 62a283872483..000000000000 --- a/platform/marvell-arm64/docker-syncd-mrvl/supervisord.conf +++ /dev/null @@ -1,39 +0,0 @@ -[supervisord] -logfile_maxbytes=1MB -logfile_backups=2 -nodaemon=true - -[eventlistener:dependent-startup] -command=python3 -m supervisord_dependent_startup -autostart=true -autorestart=unexpected -startretries=0 -exitcodes=0,3 -events=PROCESS_STATE -buffer_size=1024 - -[eventlistener:supervisor-proc-exit-listener] -command=python3 /usr/bin/supervisor-proc-exit-listener --container-name syncd -events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING -autostart=true -autorestart=unexpected -buffer_size=1024 - -[program:rsyslogd] -command=/usr/sbin/rsyslogd -n -iNONE -priority=1 -autostart=false -autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog -dependent_startup=true - -[program:syncd] -command=/usr/bin/syncd_start.sh -priority=3 -autostart=false -autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog -dependent_startup=true -dependent_startup_wait_for=rsyslogd:running diff --git a/platform/marvell-arm64/docker-syncd-mrvl/syncd.sh b/platform/marvell-arm64/docker-syncd-mrvl/syncd.sh deleted file mode 100755 index 993cf100f2f0..000000000000 --- a/platform/marvell-arm64/docker-syncd-mrvl/syncd.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash - -function clean_up { - service syncd stop - exit -} - -trap clean_up SIGTERM SIGKILL - -service syncd start - -read diff --git a/platform/marvell-arm64/libsaithrift-dev.mk b/platform/marvell-arm64/libsaithrift-dev.mk deleted file mode 100644 index e1c3da156ec2..000000000000 --- a/platform/marvell-arm64/libsaithrift-dev.mk +++ /dev/null @@ -1,20 +0,0 @@ -# libsaithrift-dev package - -SAI_VER = 0.9.4 - -LIBSAITHRIFT_DEV = libsaithrift-dev_$(SAI_VER)_$(CONFIGURED_ARCH).deb -$(LIBSAITHRIFT_DEV)_SRC_PATH = $(SRC_PATH)/sonic-sairedis/SAI -$(LIBSAITHRIFT_DEV)_DEPENDS += $(LIBTHRIFT) $(LIBTHRIFT_DEV) $(PYTHON_THRIFT) $(THRIFT_COMPILER) $(MRVL_FPA) $(MRVL_SAI) -$(LIBSAITHRIFT_DEV)_RDEPENDS += $(LIBTHRIFT) $(MRVL_SAI) -SONIC_DPKG_DEBS += $(LIBSAITHRIFT_DEV) - -PYTHON_SAITHRIFT = python-saithrift_$(SAI_VER)_$(CONFIGURED_ARCH).deb -$(eval $(call add_extra_package,$(LIBSAITHRIFT_DEV),$(PYTHON_SAITHRIFT))) - -SAISERVER = saiserver_$(SAI_VER)_$(CONFIGURED_ARCH).deb -$(SAISERVER)_RDEPENDS += $(LIBTHRIFT) $(MRVL_SAI) -$(eval $(call add_extra_package,$(LIBSAITHRIFT_DEV),$(SAISERVER))) - -SAISERVER_DBG = saiserver-dbg_$(SAI_VER)_$(CONFIGURED_ARCH).deb -$(SAISERVER_DBG)_RDEPENDS += $(SAISERVER) -$(eval $(call add_extra_package,$(LIBSAITHRIFT_DEV),$(SAISERVER_DBG))) diff --git a/platform/marvell-arm64/mrvl-prestera b/platform/marvell-arm64/mrvl-prestera deleted file mode 160000 index 8f9bcdaf5840..000000000000 --- a/platform/marvell-arm64/mrvl-prestera +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8f9bcdaf58406c71a9038aea834fc8255de59848 diff --git a/platform/marvell-arm64/one-image.mk b/platform/marvell-arm64/one-image.mk deleted file mode 100644 index 1aa36f2b1dce..000000000000 --- a/platform/marvell-arm64/one-image.mk +++ /dev/null @@ -1,17 +0,0 @@ -# sonic marvell one image installer - -SONIC_ONE_IMAGE = sonic-marvell-arm64.bin -$(SONIC_ONE_IMAGE)_MACHINE = marvell-arm64 -$(SONIC_ONE_IMAGE)_IMAGE_TYPE = onie -$(SONIC_ONE_IMAGE)_INSTALLS += $(SYSTEMD_SONIC_GENERATOR) -$(SONIC_ONE_IMAGE)_INSTALLS += $(MRVL_PRESTERA_DEB) -$(SONIC_ONE_IMAGE)_LAZY_INSTALLS += $(NOKIA_7215_PLATFORM) \ - $(AC5X_RD98DX35xx_PLATFORM) \ - $(AC5X_RD98DX35xxCN9131_PLATFORM) -ifeq ($(INSTALL_DEBUG_TOOLS),y) -$(SONIC_ONE_IMAGE)_DOCKERS += $(SONIC_INSTALL_DOCKER_DBG_IMAGES) -$(SONIC_ONE_IMAGE)_DOCKERS += $(filter-out $(patsubst %-$(DBG_IMAGE_MARK).gz,%.gz, $(SONIC_INSTALL_DOCKER_DBG_IMAGES)), $(SONIC_INSTALL_DOCKER_IMAGES)) -else -$(SONIC_ONE_IMAGE)_DOCKERS = $(SONIC_INSTALL_DOCKER_IMAGES) -endif -SONIC_INSTALLERS += $(SONIC_ONE_IMAGE) diff --git a/platform/marvell-arm64/rules.mk b/platform/marvell-arm64/rules.mk deleted file mode 100644 index 882a9451e99d..000000000000 --- a/platform/marvell-arm64/rules.mk +++ /dev/null @@ -1,26 +0,0 @@ -#include $(PLATFORM_PATH)/sdk.mk -include $(PLATFORM_PATH)/sai.mk -include $(PLATFORM_PATH)/docker-syncd-mrvl.mk -include $(PLATFORM_PATH)/docker-syncd-mrvl-rpc.mk -include $(PLATFORM_PATH)/docker-saiserver-mrvl.mk -include $(PLATFORM_PATH)/libsaithrift-dev.mk -include $(PLATFORM_PATH)/one-image.mk -include $(PLATFORM_PATH)/mrvl-prestera.mk -include $(PLATFORM_PATH)/platform-nokia.mk -include $(PLATFORM_PATH)/platform-marvell.mk - -SONIC_ALL += $(SONIC_ONE_IMAGE) \ - $(DOCKER_FPM) \ - $(DOCKER_PTF_MRVL) \ - $(DOCKER_SYNCD_MRVL_RPC) - -# Inject mrvl sai into syncd -$(SYNCD)_DEPENDS += $(MRVL_SAI) -$(SYNCD)_UNINSTALLS += $(MRVL_SAI) - -ifeq ($(ENABLE_SYNCD_RPC),y) -$(SYNCD)_DEPENDS += $(LIBSAITHRIFT_DEV) -endif - -# Runtime dependency on mrvl sai is set only for syncd -$(SYNCD)_RDEPENDS += $(MRVL_SAI) diff --git a/platform/marvell-arm64/sai.mk b/platform/marvell-arm64/sai.mk deleted file mode 100644 index fe4f91b8393a..000000000000 --- a/platform/marvell-arm64/sai.mk +++ /dev/null @@ -1,9 +0,0 @@ -# Marvell SAI - -export MRVL_SAI_VERSION = 1.12.0-2 -export MRVL_SAI = mrvllibsai_$(MRVL_SAI_VERSION)_$(PLATFORM_ARCH).deb - -$(MRVL_SAI)_SRC_PATH = $(PLATFORM_PATH)/sai -$(eval $(call add_conflict_package,$(MRVL_SAI),$(LIBSAIVS_DEV))) - -SONIC_MAKE_DEBS += $(MRVL_SAI) diff --git a/platform/marvell-arm64/sai/Makefile b/platform/marvell-arm64/sai/Makefile deleted file mode 100644 index 07048e0141ea..000000000000 --- a/platform/marvell-arm64/sai/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -.ONESHELL: -SHELL = /bin/bash -.SHELLFLAGS += -e - -MRVL_SAI_URL = https://github.com/Marvell-switching/sonic-marvell-binaries/raw/master/arm64/sai-plugin/$(MRVL_SAI) - -$(addprefix $(DEST)/, $(MRVL_SAI)): $(DEST)/% : - # get deb package - wget -O $(DEST)/$(MRVL_SAI) $(MRVL_SAI_URL) || rm -f $(DEST)/$(MRVL_SAI) diff --git a/platform/marvell-arm64/sonic-platform-marvell b/platform/marvell-arm64/sonic-platform-marvell deleted file mode 160000 index f6b5e6cc8f38..000000000000 --- a/platform/marvell-arm64/sonic-platform-marvell +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f6b5e6cc8f382275e9d1647321ecd27e87038b90 diff --git a/platform/marvell-arm64/sonic-platform-nokia/debian/sonic-platform-nokia-7215.install b/platform/marvell-arm64/sonic-platform-nokia/debian/sonic-platform-nokia-7215.install deleted file mode 100644 index efa3c696be2f..000000000000 --- a/platform/marvell-arm64/sonic-platform-nokia/debian/sonic-platform-nokia-7215.install +++ /dev/null @@ -1,6 +0,0 @@ -7215/scripts/nokia-7215-init.sh usr/local/bin -7215/scripts/cpu_wdt.py usr/local/bin -7215/service/nokia-7215init.service etc/systemd/system -7215/service/cpu_wdt.service etc/systemd/system -7215/sonic_platform-1.0-py3-none-any.whl usr/share/sonic/device/arm64-nokia_ixs7215_52xb-r0 -../mrvl-prestera/platform/arm64/ac5x/* / diff --git a/platform/marvell-armhf/docker-saiserver-mrvl.dep b/platform/marvell-armhf/docker-saiserver-mrvl.dep deleted file mode 100644 index 73851b9bf3ec..000000000000 --- a/platform/marvell-armhf/docker-saiserver-mrvl.dep +++ /dev/null @@ -1,8 +0,0 @@ -DPATH := $($(DOCKER_SAISERVER_MRVL)_PATH) -DEP_FILES := $(SONIC_COMMON_FILES_LIST) platform/marvell-armhf/docker-saiserver-mrvl.mk platform/marvell-armhf/docker-saiserver-mrvl.dep -DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST) -DEP_FILES += $(shell git ls-files $(DPATH)) - -$(DOCKER_SAISERVER_MRVL)_CACHE_MODE := GIT_CONTENT_SHA -$(DOCKER_SAISERVER_MRVL)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST) -$(DOCKER_SAISERVER_MRVL)_DEP_FILES := $(DEP_FILES) diff --git a/platform/marvell-armhf/docker-saiserver-mrvl.mk b/platform/marvell-armhf/docker-saiserver-mrvl.mk deleted file mode 100644 index 963335b57901..000000000000 --- a/platform/marvell-armhf/docker-saiserver-mrvl.mk +++ /dev/null @@ -1,15 +0,0 @@ -# docker image for mrvl saiserver - -DOCKER_SAISERVER_MRVL = docker-saiserver-mrvl.gz -$(DOCKER_SAISERVER_MRVL)_PATH = $(PLATFORM_PATH)/docker-saiserver-mrvl -$(DOCKER_SAISERVER_MRVL)_DEPENDS += $(SAISERVER) -$(DOCKER_SAISERVER_MRVL)_FILES += $(DSSERVE) $(BCMCMD) -$(DOCKER_SAISERVER_MRVL)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_BULLSEYE) -SONIC_DOCKER_IMAGES += $(DOCKER_SAISERVER_MRVL) - -$(DOCKER_SAISERVER_MRVL)_CONTAINER_NAME = saiserver -$(DOCKER_SAISERVER_MRVL)_RUN_OPT += --privileged -t -$(DOCKER_SAISERVER_MRVL)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf -$(DOCKER_SAISERVER_MRVL)_RUN_OPT += -v /var/run/docker-saiserver:/var/run/sswsyncd -$(DOCKER_SAISERVER_MRVL)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro -$(DOCKER_SAISERVER_MRVL)_RUN_OPT += -v /host/warmboot:/var/warmboot diff --git a/platform/marvell-armhf/docker-syncd-mrvl-rpc.dep b/platform/marvell-armhf/docker-syncd-mrvl-rpc.dep deleted file mode 100644 index 957d3f9e7ab0..000000000000 --- a/platform/marvell-armhf/docker-syncd-mrvl-rpc.dep +++ /dev/null @@ -1,8 +0,0 @@ -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_BASE_FILES_LIST) -DEP_FILES += $(shell git ls-files $(DPATH)) - -$(DOCKER_SYNCD_MRVL_RPC)_CACHE_MODE := GIT_CONTENT_SHA -$(DOCKER_SYNCD_MRVL_RPC)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST) -$(DOCKER_SYNCD_MRVL_RPC)_DEP_FILES := $(DEP_FILES) diff --git a/platform/marvell-armhf/docker-syncd-mrvl-rpc.mk b/platform/marvell-armhf/docker-syncd-mrvl-rpc.mk deleted file mode 100644 index 20698efdf9e3..000000000000 --- a/platform/marvell-armhf/docker-syncd-mrvl-rpc.mk +++ /dev/null @@ -1,25 +0,0 @@ -# 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)_DEPENDS += $(SYNCD_RPC) $(LIBTHRIFT) $(PTF) -$(DOCKER_SYNCD_MRVL_RPC)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT) -ifeq ($(INSTALL_DEBUG_TOOLS), y) -$(DOCKER_SYNCD_MRVL_RPC)_DEPENDS += $(SYNCD_RPC_DBG) \ - $(LIBSWSSCOMMON_DBG) \ - $(LIBSAIMETADATA_DBG) \ - $(LIBSAIREDIS_DBG) -endif -$(DOCKER_SYNCD_MRVL_RPC)_LOAD_DOCKERS += $(DOCKER_SYNCD_BASE) -SONIC_DOCKER_IMAGES += $(DOCKER_SYNCD_MRVL_RPC) -ifeq ($(ENABLE_SYNCD_RPC),y) -SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_SYNCD_MRVL_RPC) -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)_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 -$(DOCKER_SYNCD_MRVL_RPC)_RUN_OPT += -v /host/warmboot:/var/warmboot diff --git a/platform/marvell-armhf/docker-syncd-mrvl-rpc/99-syncd.conf b/platform/marvell-armhf/docker-syncd-mrvl-rpc/99-syncd.conf deleted file mode 100644 index 3fabe208d815..000000000000 --- a/platform/marvell-armhf/docker-syncd-mrvl-rpc/99-syncd.conf +++ /dev/null @@ -1 +0,0 @@ -sysctl -w net.core.rmem_max=509430500 diff --git a/platform/marvell-armhf/docker-syncd-mrvl-rpc/Dockerfile.j2 b/platform/marvell-armhf/docker-syncd-mrvl-rpc/Dockerfile.j2 deleted file mode 100644 index b8bd6f64e719..000000000000 --- a/platform/marvell-armhf/docker-syncd-mrvl-rpc/Dockerfile.j2 +++ /dev/null @@ -1,56 +0,0 @@ -FROM docker-syncd-mrvl-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}} - -## Make apt-get non-interactive -ENV DEBIAN_FRONTEND=noninteractive - -COPY \ -{% for deb in docker_syncd_mrvl_rpc_debs.split(' ') -%} -debs/{{ deb }}{{' '}} -{%- endfor -%} -debs/ - -RUN apt-get purge -y syncd - -## Pre-install the fundamental packages -RUN apt-get update \ - && apt-get -y install \ - net-tools \ - python3-pip \ - python-setuptools \ - build-essential \ - libssl-dev \ - libffi-dev \ - python-dev \ - wget \ - cmake \ - libqt5core5a \ - libqt5network5 \ - libboost-atomic1.74.0 - -RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; } ; \ -{% for deb in docker_syncd_mrvl_rpc_debs.split(' ') -%} -dpkg_apt debs/{{ deb }}{{'; '}} -{%- endfor %} - -RUN wget https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz \ - && tar xvfz 1.0.0.tar.gz \ - && cd nanomsg-1.0.0 \ - && mkdir -p build \ - && cmake . \ - && make install \ - && ldconfig \ - && cd .. \ - && rm -fr nanomsg-1.0.0 \ - && rm -f 1.0.0.tar.gz \ - && pip2 install cffi==1.7.0 \ - && pip2 install --upgrade cffi==1.7.0 \ - && pip2 install nnpy \ - && mkdir -p /opt \ - && cd /opt \ - && wget https://github.com/raw/p4lang/ptf/master/ptf_nn/ptf_nn_agent.py \ - && apt-get clean -y; apt-get autoclean -y; apt-get autoremove -y \ - && rm -rf /root/deps - -COPY ["ptf_nn_agent.conf", "/etc/supervisor/conf.d/"] - -ENTRYPOINT ["/usr/local/bin/supervisord"] diff --git a/platform/marvell-armhf/docker-syncd-mrvl-rpc/ptf_nn_agent.conf b/platform/marvell-armhf/docker-syncd-mrvl-rpc/ptf_nn_agent.conf deleted file mode 100644 index fa1ed0eb1622..000000000000 --- a/platform/marvell-armhf/docker-syncd-mrvl-rpc/ptf_nn_agent.conf +++ /dev/null @@ -1,10 +0,0 @@ -[program:ptf_nn_agent] -command=/usr/bin/python /opt/ptf_nn_agent.py --device-socket 1@tcp://0.0.0.0:10900 -i 1-3@Ethernet12 --set-iface-rcv-buffer=109430400 -process_name=ptf_nn_agent -stdout_logfile=/tmp/ptf_nn_agent.out.log -stderr_logfile=/tmp/ptf_nn_agent.err.log -redirect_stderr=false -autostart=true -autorestart=true -startsecs=1 -numprocs=1 diff --git a/platform/marvell-armhf/docker-syncd-mrvl.dep b/platform/marvell-armhf/docker-syncd-mrvl.dep deleted file mode 100644 index 2aaef3b506f9..000000000000 --- a/platform/marvell-armhf/docker-syncd-mrvl.dep +++ /dev/null @@ -1,10 +0,0 @@ -DPATH := $($(DOCKER_SYNCD_BASE)_PATH) -DEP_FILES := $(SONIC_COMMON_FILES_LIST) platform/marvell-armhf/docker-syncd-mrvl.mk platform/marvell-armhf/docker-syncd-mrvl.dep platform/marvell-armhf/sai.mk -DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST) -DEP_FILES += $(shell git ls-files $(DPATH)) - -$(DOCKER_SYNCD_BASE)_CACHE_MODE := GIT_CONTENT_SHA -$(DOCKER_SYNCD_BASE)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST) -$(DOCKER_SYNCD_BASE)_DEP_FILES := $(DEP_FILES) - -$(eval $(call add_dbg_docker,$(DOCKER_SYNCD_BASE),$(DOCKER_SYNCD_BASE_DBG))) diff --git a/platform/marvell-armhf/docker-syncd-mrvl.mk b/platform/marvell-armhf/docker-syncd-mrvl.mk deleted file mode 100644 index 236f8a437b44..000000000000 --- a/platform/marvell-armhf/docker-syncd-mrvl.mk +++ /dev/null @@ -1,16 +0,0 @@ -# docker image for mrvl syncd - -DOCKER_SYNCD_PLATFORM_CODE = mrvl -include $(PLATFORM_PATH)/../template/docker-syncd-bullseye.mk - -$(DOCKER_SYNCD_BASE)_DEPENDS += $(SYNCD) - -$(DOCKER_SYNCD_BASE)_DBG_DEPENDS += $(SYNCD_DBG) \ - $(LIBSWSSCOMMON_DBG) \ - $(LIBSAIMETADATA_DBG) \ - $(LIBSAIREDIS_DBG) - -$(DOCKER_SYNCD_BASE)_VERSION = 1.0.0 -$(DOCKER_SYNCD_BASE)_PACKAGE_NAME = syncd - -#$(DOCKER_SYNCD_BASE)_RUN_OPT += -v /host/warmboot:/var/warmboot diff --git a/platform/marvell-armhf/docker-syncd-mrvl/Dockerfile.j2 b/platform/marvell-armhf/docker-syncd-mrvl/Dockerfile.j2 deleted file mode 100755 index 84e3d5bde2fb..000000000000 --- a/platform/marvell-armhf/docker-syncd-mrvl/Dockerfile.j2 +++ /dev/null @@ -1,37 +0,0 @@ -{% from "dockers/dockerfile-macros.j2" import install_debian_packages %} -FROM docker-config-engine-bullseye-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}} - -ARG docker_container_name - -## Make apt-get non-interactive -ENV DEBIAN_FRONTEND=noninteractive - -RUN apt-get update - -COPY \ -{% for deb in docker_syncd_mrvl_debs.split(' ') -%} -debs/{{ deb }}{{' '}} -{%- endfor -%} -debs/ - -RUN apt-get update \ - && apt-get -y install \ - net-tools \ - iputils-ping - -RUN apt-get -y install libpcap-dev libxml2-dev python-dev swig libsensors4-dev nfs-common - -RUN dpkg -i \ -{% for deb in docker_syncd_mrvl_debs.split(' ') -%} -debs/{{ deb }}{{' '}} -{%- endfor %} - -COPY ["supervisord.conf", "/etc/supervisor/conf.d/"] -COPY ["files/supervisor-proc-exit-listener", "/usr/bin/"] -COPY ["critical_processes", "/etc/supervisor/"] - -## Clean up -RUN apt-get clean -y; apt-get autoclean -y; apt-get autoremove -y -RUN rm -rf /debs - -ENTRYPOINT ["/usr/local/bin/supervisord"] diff --git a/platform/marvell-armhf/docker-syncd-mrvl/critical_processes b/platform/marvell-armhf/docker-syncd-mrvl/critical_processes deleted file mode 100644 index bdd6903c5690..000000000000 --- a/platform/marvell-armhf/docker-syncd-mrvl/critical_processes +++ /dev/null @@ -1 +0,0 @@ -program:syncd diff --git a/platform/marvell-armhf/docker-syncd-mrvl/supervisord.conf b/platform/marvell-armhf/docker-syncd-mrvl/supervisord.conf deleted file mode 100644 index 55f095d2be91..000000000000 --- a/platform/marvell-armhf/docker-syncd-mrvl/supervisord.conf +++ /dev/null @@ -1,39 +0,0 @@ -[supervisord] -logfile_maxbytes=1MB -logfile_backups=2 -nodaemon=true - -[eventlistener:dependent-startup] -command=python3 -m supervisord_dependent_startup -autostart=true -autorestart=unexpected -startretries=0 -exitcodes=0,3 -events=PROCESS_STATE -buffer_size=1024 - -[eventlistener:supervisor-proc-exit-listener] -command=python3 /usr/bin/supervisor-proc-exit-listener --container-name syncd -events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING -autostart=true -autorestart=unexpected -buffer_size=1024 - -[program:rsyslogd] -command=/usr/sbin/rsyslogd -n -iNONE -priority=1 -autostart=false -autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog -dependent_startup=true - -[program:syncd] -command=/usr/bin/syncd_start.sh -priority=2 -autostart=false -autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog -dependent_startup=true -dependent_startup_wait_for=rsyslogd:running diff --git a/platform/marvell-armhf/libsaithrift-dev.dep b/platform/marvell-armhf/libsaithrift-dev.dep deleted file mode 100644 index be9da37e8d0a..000000000000 --- a/platform/marvell-armhf/libsaithrift-dev.dep +++ /dev/null @@ -1,11 +0,0 @@ -SPATH := $($(LIBSAITHRIFT_DEV)_SRC_PATH) -DEP_FILES := $(SONIC_COMMON_FILES_LIST) platform/marvell-armhf/libsaithrift-dev.mk platform/marvell-armhf/libsaithrift-dev.dep -DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST) -SMDEP_PATHS := $(SPATH) $(SPATH)/bm/behavioral-model $(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 " " ))))) - -$(LIBSAITHRIFT_DEV)_CACHE_MODE := GIT_CONTENT_SHA -$(LIBSAITHRIFT_DEV)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST) -$(LIBSAITHRIFT_DEV)_DEP_FILES := $(DEP_FILES) -$(LIBSAITHRIFT_DEV)_SMDEP_FILES := $(foreach path, $(SMDEP_PATHS), $($(path))) -$(LIBSAITHRIFT_DEV)_SMDEP_PATHS := $(SMDEP_PATHS) diff --git a/platform/marvell-armhf/libsaithrift-dev.mk b/platform/marvell-armhf/libsaithrift-dev.mk deleted file mode 100644 index e1c3da156ec2..000000000000 --- a/platform/marvell-armhf/libsaithrift-dev.mk +++ /dev/null @@ -1,20 +0,0 @@ -# libsaithrift-dev package - -SAI_VER = 0.9.4 - -LIBSAITHRIFT_DEV = libsaithrift-dev_$(SAI_VER)_$(CONFIGURED_ARCH).deb -$(LIBSAITHRIFT_DEV)_SRC_PATH = $(SRC_PATH)/sonic-sairedis/SAI -$(LIBSAITHRIFT_DEV)_DEPENDS += $(LIBTHRIFT) $(LIBTHRIFT_DEV) $(PYTHON_THRIFT) $(THRIFT_COMPILER) $(MRVL_FPA) $(MRVL_SAI) -$(LIBSAITHRIFT_DEV)_RDEPENDS += $(LIBTHRIFT) $(MRVL_SAI) -SONIC_DPKG_DEBS += $(LIBSAITHRIFT_DEV) - -PYTHON_SAITHRIFT = python-saithrift_$(SAI_VER)_$(CONFIGURED_ARCH).deb -$(eval $(call add_extra_package,$(LIBSAITHRIFT_DEV),$(PYTHON_SAITHRIFT))) - -SAISERVER = saiserver_$(SAI_VER)_$(CONFIGURED_ARCH).deb -$(SAISERVER)_RDEPENDS += $(LIBTHRIFT) $(MRVL_SAI) -$(eval $(call add_extra_package,$(LIBSAITHRIFT_DEV),$(SAISERVER))) - -SAISERVER_DBG = saiserver-dbg_$(SAI_VER)_$(CONFIGURED_ARCH).deb -$(SAISERVER_DBG)_RDEPENDS += $(SAISERVER) -$(eval $(call add_extra_package,$(LIBSAITHRIFT_DEV),$(SAISERVER_DBG))) diff --git a/platform/marvell-armhf/one-image.dep b/platform/marvell-armhf/one-image.dep deleted file mode 100644 index 154112a82abc..000000000000 --- a/platform/marvell-armhf/one-image.dep +++ /dev/null @@ -1 +0,0 @@ -$(SONIC_ONE_IMAGE)_CACHE_MODE := none diff --git a/platform/marvell-armhf/one-image.mk b/platform/marvell-armhf/one-image.mk deleted file mode 100644 index b72b553487f2..000000000000 --- a/platform/marvell-armhf/one-image.mk +++ /dev/null @@ -1,16 +0,0 @@ -# sonic marvell one image installer - -SONIC_ONE_IMAGE = sonic-marvell-armhf.bin -$(SONIC_ONE_IMAGE)_MACHINE = marvell-armhf -$(SONIC_ONE_IMAGE)_IMAGE_TYPE = onie -$(SONIC_ONE_IMAGE)_INSTALLS += $(SYSTEMD_SONIC_GENERATOR) -$(SONIC_ONE_IMAGE)_INSTALLS += $(MRVL_PRESTERA_DEB) -$(SONIC_ONE_IMAGE)_LAZY_INSTALLS += $(ET6448M_PLATFORM) \ - $(NOKIA_7215_PLATFORM) -ifeq ($(INSTALL_DEBUG_TOOLS),y) -$(SONIC_ONE_IMAGE)_DOCKERS += $(SONIC_INSTALL_DOCKER_DBG_IMAGES) -$(SONIC_ONE_IMAGE)_DOCKERS += $(filter-out $(patsubst %-$(DBG_IMAGE_MARK).gz,%.gz, $(SONIC_INSTALL_DOCKER_DBG_IMAGES)), $(SONIC_INSTALL_DOCKER_IMAGES)) -else -$(SONIC_ONE_IMAGE)_DOCKERS = $(SONIC_INSTALL_DOCKER_IMAGES) -endif -SONIC_INSTALLERS += $(SONIC_ONE_IMAGE) diff --git a/platform/marvell-armhf/platform-et6448m.dep b/platform/marvell-armhf/platform-et6448m.dep deleted file mode 100644 index 5f7e41d1f745..000000000000 --- a/platform/marvell-armhf/platform-et6448m.dep +++ /dev/null @@ -1,8 +0,0 @@ -MPATH := $($(ET6448M_PLATFORM)_SRC_PATH) -DEP_FILES := $(SONIC_COMMON_FILES_LIST) platform/marvell-armhf/platform-et6448m.mk platform/marvell-armhf/platform-et6448m.dep -DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST) -DEP_FILES += $(shell git ls-files $(MPATH)) - -$(ET6448M_PLATFORM)_CACHE_MODE := GIT_CONTENT_SHA -$(ET6448M_PLATFORM)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST) -$(ET6448M_PLATFORM)_DEP_FILES := $(DEP_FILES) diff --git a/platform/marvell-armhf/platform-et6448m.mk b/platform/marvell-armhf/platform-et6448m.mk deleted file mode 100644 index 1f0ee201cc76..000000000000 --- a/platform/marvell-armhf/platform-et6448m.mk +++ /dev/null @@ -1,8 +0,0 @@ -# ET6448M Platform - -ET6448M_VERSION=0.1 -ET6448M_PLATFORM = sonic-platform-et6448m_$(ET6448M_VERSION)_$(CONFIGURED_ARCH).deb -$(ET6448M_PLATFORM)_SRC_PATH = $(PLATFORM_PATH)/sonic-platform-et6448m -$(ET6448M_PLATFORM)_PLATFORM = armhf-marvell_et6448m_52x-r0 -SONIC_DPKG_DEBS += $(ET6448M_PLATFORM) - diff --git a/platform/marvell-armhf/platform-nokia.dep b/platform/marvell-armhf/platform-nokia.dep deleted file mode 100644 index 752a2016b6c5..000000000000 --- a/platform/marvell-armhf/platform-nokia.dep +++ /dev/null @@ -1,8 +0,0 @@ -MPATH := $($(NOKIA_7215_PLATFORM)_SRC_PATH) -DEP_FILES := $(SONIC_COMMON_FILES_LIST) platform/marvell-armhf/platform-nokia.mk platform/marvell-armhf/platform-nokia.dep -DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST) -DEP_FILES += $(shell git ls-files $(MPATH)) - -$(NOKIA_7215_PLATFORM)_CACHE_MODE := GIT_CONTENT_SHA -$(NOKIA_7215_PLATFORM)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST) -$(NOKIA_7215_PLATFORM)_DEP_FILES := $(DEP_FILES) diff --git a/platform/marvell-armhf/platform-nokia.mk b/platform/marvell-armhf/platform-nokia.mk deleted file mode 100644 index e8d6d106d651..000000000000 --- a/platform/marvell-armhf/platform-nokia.mk +++ /dev/null @@ -1,10 +0,0 @@ -# Nokia Platform - -NOKIA_7215_PLATFORM_VERSION = 1.0 -export NOKIA_7215_PLATFORM_VERSION - -NOKIA_7215_PLATFORM = sonic-platform-nokia-7215_$(NOKIA_7215_PLATFORM_VERSION)_$(CONFIGURED_ARCH).deb -$(NOKIA_7215_PLATFORM)_SRC_PATH = $(PLATFORM_PATH)/sonic-platform-nokia -$(NOKIA_7215_PLATFORM)_PLATFORM = armhf-nokia_ixs7215_52x-r0 -SONIC_DPKG_DEBS += $(NOKIA_7215_PLATFORM) - diff --git a/platform/marvell-armhf/prestera.dep b/platform/marvell-armhf/prestera.dep deleted file mode 100644 index 4fd2883b1193..000000000000 --- a/platform/marvell-armhf/prestera.dep +++ /dev/null @@ -1,8 +0,0 @@ -MPATH := $($(MRVL_PRESTERA_DEB)_SRC_PATH) -DEP_FILES := $(SONIC_COMMON_FILES_LIST) platform/marvell-armhf/prestera.mk platform/marvell-armhf/prestera.dep -DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST) -DEP_FILES += $(shell git ls-files $(MPATH)) - -$(MRVL_PRESTERA_DEB)_CACHE_MODE := GIT_CONTENT_SHA -$(MRVL_PRESTERA_DEB)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST) -$(MRVL_PRESTERA_DEB)_DEP_FILES := $(DEP_FILES) diff --git a/platform/marvell-armhf/prestera.mk b/platform/marvell-armhf/prestera.mk deleted file mode 100644 index 50f44804fdbc..000000000000 --- a/platform/marvell-armhf/prestera.mk +++ /dev/null @@ -1,11 +0,0 @@ -# Marvell Prestera - -export MRVL_PRESTERA_VER = 1.0 -export MRVL_PRESTERA = mrvlprestera_$(MRVL_PRESTERA_VER)_$(PLATFORM_ARCH) -export MRVL_PRESTERA_DEB = $(MRVL_PRESTERA).deb -export MRVL_PRESTERA_SRC_URL = https://github.com/Marvell-switching/mrvl-prestera.git -export MRVL_PRESTERA_SRC_TAG = MRVL_PRESTERA_DRIVER_1.8 - -$(MRVL_PRESTERA_DEB)_SRC_PATH = $(PLATFORM_PATH)/prestera -$(MRVL_PRESTERA_DEB)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON) -SONIC_DPKG_DEBS += $(MRVL_PRESTERA_DEB) diff --git a/platform/marvell-armhf/prestera/debian/changelog b/platform/marvell-armhf/prestera/debian/changelog deleted file mode 100644 index ab8de1dfa386..000000000000 --- a/platform/marvell-armhf/prestera/debian/changelog +++ /dev/null @@ -1,5 +0,0 @@ -mrvlprestera (1.0) unstable; urgency=low - - * Prestera switch driver - - -- Marvell Fri, 19 Feb 2021 10:39:18 +0800 diff --git a/platform/marvell-armhf/prestera/debian/compat b/platform/marvell-armhf/prestera/debian/compat deleted file mode 100644 index ec635144f600..000000000000 --- a/platform/marvell-armhf/prestera/debian/compat +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/platform/marvell-armhf/prestera/debian/control b/platform/marvell-armhf/prestera/debian/control deleted file mode 100755 index 51cb0579a263..000000000000 --- a/platform/marvell-armhf/prestera/debian/control +++ /dev/null @@ -1,15 +0,0 @@ -Source: mrvlprestera -Section: unknown -Priority: optional -Maintainer: Marvell -Build-Depends: debhelper (>=9) -Standards-Version: 3.9.6 -Homepage: -#Vcs-Git: git://anonscm.debian.org/collab-maint/mrvlprestera.git -#Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/mrvlprestera.git - -Package: mrvlprestera -Architecture: armhf -Homepage: -Description: - kernel modules for prestera switch driver diff --git a/platform/marvell-armhf/prestera/debian/mrvlprestera.install.template b/platform/marvell-armhf/prestera/debian/mrvlprestera.install.template deleted file mode 100644 index 70a9655ddea2..000000000000 --- a/platform/marvell-armhf/prestera/debian/mrvlprestera.install.template +++ /dev/null @@ -1,2 +0,0 @@ -mrvl-prestera/drivers/armhf/cpssEnabler/linuxNoKernelModule/drivers/mvcpss.ko /lib/modules/KVERSION/kernel/extra -mrvl-prestera/platform/armhf/* / diff --git a/platform/marvell-armhf/prestera/debian/rules b/platform/marvell-armhf/prestera/debian/rules deleted file mode 100755 index aab9a1bcd9b0..000000000000 --- a/platform/marvell-armhf/prestera/debian/rules +++ /dev/null @@ -1,56 +0,0 @@ -#!/usr/bin/make -f - -include /usr/share/dpkg/pkg-info.mk - -PACKAGE_PRE_NAME := mrvlprestera -ifneq ($(CROSS_BUILD_ENVIRON), y) -KVERSION ?= $(shell uname -r) -endif -KERNEL_SRC := /lib/modules/$(KVERSION) -MOD_SRC_DIR:= $(shell pwd) -MODULE_DIR := mrvl-prestera/drivers/armhf/cpssEnabler/linuxNoKernelModule/drivers - -%: - dh $@ --with systemd,python3 --buildsystem=pybuild - -clean: - dh_testdir - dh_testroot - dh_clean - -build: - # get sources - rm -rf mrvl-prestera || true - git clone ${MRVL_PRESTERA_SRC_URL} - cd mrvl-prestera && git checkout ${MRVL_PRESTERA_SRC_TAG} && cd .. - sed "s/KVERSION/${KVERSION}/g" /sonic/platform/marvell-armhf/prestera/debian/mrvlprestera.install.template > /sonic/platform/marvell-armhf/prestera/debian/mrvlprestera.install - - make modules -C $(KERNEL_SRC)/build M=$(MOD_SRC_DIR)/$(MODULE_DIR)/ CONFIG_KM_MVPCI=y CONFIG_KM_MVDMA=y CONFIG_KM_MVINT=y - -binary: binary-arch binary-indep - # Nothing to do - -binary-arch: - # Nothing to do - -binary-indep: - dh_testdir - dh_installdirs - - # Resuming debhelper scripts - dh_testroot - dh_install - dh_installchangelogs - dh_installdocs - dh_systemd_enable - dh_installinit - dh_systemd_start - dh_link - dh_fixperms - dh_compress - dh_strip - dh_installdeb - dh_gencontrol - dh_md5sums - dh_builddeb -.PHONY: build binary binary-arch binary-indep clean diff --git a/platform/marvell-armhf/rules.dep b/platform/marvell-armhf/rules.dep deleted file mode 100644 index 427219b355d6..000000000000 --- a/platform/marvell-armhf/rules.dep +++ /dev/null @@ -1,9 +0,0 @@ -include $(PLATFORM_PATH)/sai.dep -include $(PLATFORM_PATH)/prestera.dep -include $(PLATFORM_PATH)/docker-syncd-mrvl.dep -include $(PLATFORM_PATH)/docker-syncd-mrvl-rpc.dep -include $(PLATFORM_PATH)/docker-saiserver-mrvl.dep -include $(PLATFORM_PATH)/libsaithrift-dev.dep -include $(PLATFORM_PATH)/platform-et6448m.dep -include $(PLATFORM_PATH)/platform-nokia.dep -include $(PLATFORM_PATH)/one-image.dep diff --git a/platform/marvell-armhf/rules.mk b/platform/marvell-armhf/rules.mk deleted file mode 100644 index fd320e8caa41..000000000000 --- a/platform/marvell-armhf/rules.mk +++ /dev/null @@ -1,28 +0,0 @@ -#include $(PLATFORM_PATH)/sdk.mk -include $(PLATFORM_PATH)/sai.mk -include $(PLATFORM_PATH)/docker-syncd-mrvl.mk -include $(PLATFORM_PATH)/docker-syncd-mrvl-rpc.mk -include $(PLATFORM_PATH)/docker-saiserver-mrvl.mk -include $(PLATFORM_PATH)/libsaithrift-dev.mk -include $(PLATFORM_PATH)/one-image.mk -include $(PLATFORM_PATH)/platform-et6448m.mk -include $(PLATFORM_PATH)/platform-nokia.mk -include $(PLATFORM_PATH)/prestera.mk - -ENABLE_SYNCD_RPC = "" -INCLUDE_MGMT_FRAMEWORK = "" - -SONIC_ALL += $(SONIC_ONE_IMAGE) \ - $(DOCKER_FPM) - #$(DOCKER_SYNCD_MRVL_RPC) - -# Inject mrvl sai into syncd -$(SYNCD)_DEPENDS += $(MRVL_SAI) -$(SYNCD)_UNINSTALLS += $(MRVL_SAI) - -ifeq ($(ENABLE_SYNCD_RPC),y) -$(SYNCD)_DEPENDS += $(LIBSAITHRIFT_DEV) -endif - -# Runtime dependency on mrvl sai is set only for syncd -$(SYNCD)_RDEPENDS += $(MRVL_SAI) diff --git a/platform/marvell-armhf/sai.dep b/platform/marvell-armhf/sai.dep deleted file mode 100644 index d14927cdde20..000000000000 --- a/platform/marvell-armhf/sai.dep +++ /dev/null @@ -1,9 +0,0 @@ -SPATH := $($(MRVL_SAI)_SRC_PATH) -DEP_FILES := $(SONIC_COMMON_FILES_LIST) platform/marvell-armhf/sai.mk platform/marvell-armhf/sai.dep -DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST) -DEP_FILES += $(shell git ls-files $(SPATH)) -SMDEP_PATHS := $(SPATH) - -$(MRVL_SAI)_CACHE_MODE := GIT_CONTENT_SHA -$(MRVL_SAI)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST) -$(MRVL_SAI)_DEP_FILES := $(DEP_FILES) diff --git a/platform/marvell-armhf/sai.mk b/platform/marvell-armhf/sai.mk deleted file mode 100644 index f7d8782ac0e3..000000000000 --- a/platform/marvell-armhf/sai.mk +++ /dev/null @@ -1,9 +0,0 @@ -# Marvell SAI - -export MRVL_SAI_VERSION = 1.13.0-1 -export MRVL_SAI = mrvllibsai_$(MRVL_SAI_VERSION)_$(PLATFORM_ARCH).deb - -$(MRVL_SAI)_SRC_PATH = $(PLATFORM_PATH)/sai -$(eval $(call add_conflict_package,$(MRVL_SAI),$(LIBSAIVS_DEV))) - -SONIC_MAKE_DEBS += $(MRVL_SAI) diff --git a/platform/marvell-armhf/sai/Makefile b/platform/marvell-armhf/sai/Makefile deleted file mode 100644 index cf78504388c6..000000000000 --- a/platform/marvell-armhf/sai/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -.ONESHELL: -SHELL = /bin/bash -.SHELLFLAGS += -e - -MRVL_SAI_URL = https://github.com/Marvell-switching/sonic-marvell-binaries/raw/master/armhf/sai-plugin/$(MRVL_SAI) - -$(addprefix $(DEST)/, $(MRVL_SAI)): $(DEST)/% : - # get deb package - wget -O $(DEST)/$(MRVL_SAI) $(MRVL_SAI_URL) diff --git a/platform/marvell-armhf/sonic-platform-et6448m/.gitignore b/platform/marvell-armhf/sonic-platform-et6448m/.gitignore deleted file mode 100644 index 7f287d538227..000000000000 --- a/platform/marvell-armhf/sonic-platform-et6448m/.gitignore +++ /dev/null @@ -1,50 +0,0 @@ -# Object files -*.o -*.ko -*.obj -*.elf - -# Precompiled Headers -*.gch -*.pch - -# Libraries -*.lib -*.a -*.la -*.lo - -# Shared objects (inc. Windows DLLs) -*.dll -*.so -*.so.* -*.dylib - -# Executables -*.exe -*.out -*.app -*.i*86 -*.x86_64 -*.hex - -# Debug files -*.dSYM/ -*.su - -# Kernel Module Compile Results -*.mod* -*.cmd -*.o.d -.tmp_versions/ -modules.order -Module.symvers -Mkfile.old -dkms.conf - -# Debian packaging -*.debhelper.log -*.postinst.debhelper -*.postrm.debhelper -*.prerm.debhelper -*.substvars diff --git a/platform/marvell-armhf/sonic-platform-et6448m/debian/changelog b/platform/marvell-armhf/sonic-platform-et6448m/debian/changelog deleted file mode 100755 index 98934823b4f5..000000000000 --- a/platform/marvell-armhf/sonic-platform-et6448m/debian/changelog +++ /dev/null @@ -1,5 +0,0 @@ -sonic-platform-et6448m (0.1) unstable; urgency=low - - * Add support for ET6448M. - - -- Marvell Mon, 11 Nov 2019 09:35:58 +0800 diff --git a/platform/marvell-armhf/sonic-platform-et6448m/debian/compat b/platform/marvell-armhf/sonic-platform-et6448m/debian/compat deleted file mode 100644 index ec635144f600..000000000000 --- a/platform/marvell-armhf/sonic-platform-et6448m/debian/compat +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/platform/marvell-armhf/sonic-platform-et6448m/debian/control b/platform/marvell-armhf/sonic-platform-et6448m/debian/control deleted file mode 100755 index 52c9593a1ea5..000000000000 --- a/platform/marvell-armhf/sonic-platform-et6448m/debian/control +++ /dev/null @@ -1,15 +0,0 @@ -Source: sonic-platform-et6448m -Section: unknown -Priority: optional -Maintainer: Marvell -Build-Depends: debhelper (>=9) -Standards-Version: 3.9.6 -Homepage: -#Vcs-Git: git://anonscm.debian.org/collab-maint/sonic-platform-et6448m.git -#Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/sonic-platform-et6448m.git - -Package: sonic-platform-et6448m -Architecture: armhf -Depends: ${misc:Depends} -Description: - diff --git a/platform/marvell-armhf/sonic-platform-et6448m/debian/install b/platform/marvell-armhf/sonic-platform-et6448m/debian/install deleted file mode 100644 index ceb6090c4058..000000000000 --- a/platform/marvell-armhf/sonic-platform-et6448m/debian/install +++ /dev/null @@ -1,3 +0,0 @@ -et6448m_plt_setup.sh usr/sbin -entropy.py etc/ -inband_mgmt.sh etc/ diff --git a/platform/marvell-armhf/sonic-platform-et6448m/debian/postinst b/platform/marvell-armhf/sonic-platform-et6448m/debian/postinst deleted file mode 100644 index a3a727c7222c..000000000000 --- a/platform/marvell-armhf/sonic-platform-et6448m/debian/postinst +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh -# postinst script for sonic-platform-et6448m -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `configure' -# * `abort-upgrade' -# * `abort-remove' `in-favour' -# -# * `abort-remove' -# * `abort-deconfigure' `in-favour' -# `removing' -# -# for details, see https://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - configure) - sh /usr/sbin/et6448m_plt_setup.sh - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 diff --git a/platform/marvell-armhf/sonic-platform-et6448m/debian/rules b/platform/marvell-armhf/sonic-platform-et6448m/debian/rules deleted file mode 100755 index 2f54c4710f17..000000000000 --- a/platform/marvell-armhf/sonic-platform-et6448m/debian/rules +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/make -f -# See debhelper(7) (uncomment to enable) -# output every command that modifies files on the build system. -#export DH_VERBOSE = 1 - - -# see FEATURE AREAS in dpkg-buildflags(1) -#export DEB_BUILD_MAINT_OPTIONS = hardening=+all - -# see ENVIRONMENT in dpkg-buildflags(1) -# package maintainers to append CFLAGS -#export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic -# package maintainers to append LDFLAGS -#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed - - -%: - dh $@ - - -# dh_make generated override targets -# This is example for Cmake (See https://bugs.debian.org/641051 ) -#override_dh_auto_configure: -# dh_auto_configure -- # -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) - diff --git a/platform/marvell-armhf/sonic-platform-et6448m/entropy.py b/platform/marvell-armhf/sonic-platform-et6448m/entropy.py deleted file mode 100644 index a2131cdc17fb..000000000000 --- a/platform/marvell-armhf/sonic-platform-et6448m/entropy.py +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/python -import fcntl, struct -import time -from os import path - -RNDADDENTROPY=0x40085203 - -def avail(): - if path.exists("/proc/sys/kernel/random/entropy_avail"): - with open("/proc/sys/kernel/random/entropy_avail", mode='r') as avail: - return int(avail.read()) - else: - return int(2048) - -if path.exists("/proc/sys/kernel/random/entropy_avail"): - while 1: - while avail() < 2048: - with open('/dev/urandom', 'rb') as urnd, open("/dev/random", mode='wb') as rnd: - d = urnd.read(512) - t = struct.pack('ii', 4 * len(d), len(d)) + d - fcntl.ioctl(rnd, RNDADDENTROPY, t) - time.sleep(30) diff --git a/platform/marvell-armhf/sonic-platform-et6448m/et6448m_plt_setup.sh b/platform/marvell-armhf/sonic-platform-et6448m/et6448m_plt_setup.sh deleted file mode 100755 index a587b3b17ca5..000000000000 --- a/platform/marvell-armhf/sonic-platform-et6448m/et6448m_plt_setup.sh +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/bash - -fw_uboot_env_cfg() -{ - echo "Setting up U-Boot environment..." - FW_ENV_DEFAULT='/dev/mtd0 0x00500000 0x80000 0x100000 8' - UBOOT_FW_DFAULT=1 - - DTB_HAS_ENV_BLK=$(grep uboot-env /proc/mtd | sed -e 's/:.*$//') - if [ -c "/dev/$DTB_HAS_ENV_BLK" ]; then - PROC_ENV_FILE=$(find /proc/device-tree/ -name env_size) - if [ -n "$PROC_ENV_FILE" ] - then - UBOOT_ENV_SIZ="0x$(hd $PROC_ENV_FILE | awk 'FNR==1 {print $2 $3 $4 $5}')" - UBOOT_ENV_ERASE_SIZ="0x$(grep uboot-env /proc/mtd | awk '{print $3}')" - if [[ -n "$UBOOT_ENV_SIZ" && -n "$UBOOT_ENV_ERASE_SIZ" ]] - then - # Env info from DTB - FW_ENV_DTB="/dev/$DTB_HAS_ENV_BLK 0x00000000 $UBOOT_ENV_SIZ $UBOOT_ENV_ERASE_SIZ" - fi - fi - fi - if [ -n "$FW_ENV_DTB" ] - then - echo $FW_ENV_DTB > /etc/fw_env.config - echo "Found uboot env offset in device tree" - UBOOT_ENV_CRC=$(fw_printenv -c /etc/fw_env.config 2>&1 | grep -c 'Warning: Bad CRC') - if [ $UBOOT_ENV_CRC -eq 0 ] - then - echo "Uboot env offset in device tree is valid" - UBOOT_FW_DFAULT=0 - else - echo "Uboot env offset in device tree is NOT valid" - UBOOT_FW_DFAULT=1 - fi - fi - if [ $UBOOT_FW_DFAULT -eq 1 ] - then - echo $FW_ENV_DEFAULT > /etc/fw_env.config - echo "Using pre-configured uboot env" - fi -} - -et6448m_profile() -{ - MAC_ADDR=$(fw_printenv -n ethaddr) - sed -i "s/switchMacAddress=.*/switchMacAddress=$MAC_ADDR/g" /usr/share/sonic/device/armhf-marvell_et6448m_52x-r0/et6448m/profile.ini - echo "ET6448M: Updating switch mac address ${MAC_ADDR}" -} - -main() -{ - fw_uboot_env_cfg - et6448m_profile - - python /etc/entropy.py & - /bin/sh /etc/inband_mgmt.sh -} - -main $@ diff --git a/platform/marvell-armhf/sonic-platform-et6448m/inband_mgmt.sh b/platform/marvell-armhf/sonic-platform-et6448m/inband_mgmt.sh deleted file mode 100644 index 3d3d77abeb33..000000000000 --- a/platform/marvell-armhf/sonic-platform-et6448m/inband_mgmt.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh - -#inband_mgmt - -inband_mgmt(){ - -# The intent of this sequence is to ensure 12c bus enumeration order by -# controlling the order in which the various i2c device drivers are -# loaded. Hence the drivers are unloaded and then reloaded in the prescribed -# order. -# NOTE: In the nokia platform the following sequence is performed by the Nokia -# platform service init script and thus should not be performed here - if [ ! -f /host/machine.conf ]; then - exit 0 - fi - grep ^onie_platform /host/machine.conf 2>/dev/null | grep nokia >/dev/null - if [ $? != 0 ]; then - rmmod i2c-dev - rmmod i2c_mux_gpio - rmmod i2c_mv64xxx - modprobe i2c_mv64xxx - modprobe i2c-dev - modprobe i2c_mux_gpio - sleep 60 - fi - while :; do - ip -br link show eth0 2> /dev/null - if [ $? -eq 0 ]; then - ip address show eth0 | grep -qw "inet" 2>/dev/null - if [ $? -ne 0 ]; then - ifconfig eth0 down - systemctl restart networking - fi - sleep 120 - else - sleep 3 - fi - done -} -(inband_mgmt > /dev/null)& diff --git a/platform/marvell-armhf/sonic-platform-nokia/debian/changelog b/platform/marvell-armhf/sonic-platform-nokia/debian/changelog deleted file mode 100755 index f4c860fab861..000000000000 --- a/platform/marvell-armhf/sonic-platform-nokia/debian/changelog +++ /dev/null @@ -1,5 +0,0 @@ -sonic-platform-nokia-7215 (1.0) unstable; urgency=low - - * Add support for nokia-7215. - - -- Nokia Wed, 15 Apr 2020 09:35:58 +0800 diff --git a/platform/marvell-armhf/sonic-platform-nokia/debian/compat b/platform/marvell-armhf/sonic-platform-nokia/debian/compat deleted file mode 100644 index ec635144f600..000000000000 --- a/platform/marvell-armhf/sonic-platform-nokia/debian/compat +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/platform/marvell-armhf/sonic-platform-nokia/debian/control b/platform/marvell-armhf/sonic-platform-nokia/debian/control deleted file mode 100755 index 0da04ac89842..000000000000 --- a/platform/marvell-armhf/sonic-platform-nokia/debian/control +++ /dev/null @@ -1,15 +0,0 @@ -Source: sonic-platform-nokia-7215 -Section: unknown -Priority: optional -Maintainer: Nokia -Build-Depends: debhelper (>=9) -Standards-Version: 3.9.6 -Homepage: -#Vcs-Git: git://anonscm.debian.org/collab-maint/sonic-platform-et6448m.git -#Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/sonic-platform-et6448m.git - -Package: sonic-platform-nokia-7215 -Architecture: armhf -Depends: ${misc:Depends} -Description: - diff --git a/platform/marvell-armhf/sonic-platform-nokia/debian/rules b/platform/marvell-armhf/sonic-platform-nokia/debian/rules deleted file mode 100755 index b7592c2b51e9..000000000000 --- a/platform/marvell-armhf/sonic-platform-nokia/debian/rules +++ /dev/null @@ -1,64 +0,0 @@ -#!/usr/bin/make -f -# See debhelper(7) (uncomment to enable) -# output every command that modifies files on the build system. -#export DH_VERBOSE = 1 - -include /usr/share/dpkg/pkg-info.mk -#-------------------------------------------------------- - -PACKAGE_PRE_NAME := sonic-platform-nokia -MOD_SRC_DIR:= $(shell pwd) -MODULE_DIRS:= 7215 -UTILS_DIR := utils -SERVICE_DIR := service -PLATFORM_DIR := sonic_platform - -%: - dh $@ --with systemd,python3 --buildsystem=pybuild - -clean: - dh_testdir - dh_testroot - dh_clean - -build: - (for mod in $(MODULE_DIRS); do \ - python3 $${mod}/setup.py bdist_wheel -d $(MOD_SRC_DIR)/$${mod}; \ - done) - -binary: binary-arch binary-indep - # Nothing to do - -binary-arch: - # Nothing to do - -binary-indep: - dh_testdir - dh_installdirs - - # Custom package commands - (for mod in $(MODULE_DIRS); do \ - dh_installdirs -p$(PACKAGE_PRE_NAME)-$${mod} /usr/local/bin; \ - cp $(MOD_SRC_DIR)/$${mod}/$(SERVICE_DIR)/*.service debian/$(PACKAGE_PRE_NAME)-$${mod}/lib/systemd/system/; \ - cp $(MOD_SRC_DIR)/$${mod}/$(UTILS_DIR)/* debian/$(PACKAGE_PRE_NAME)-$${mod}/usr/local/bin/; \ - python3 $${mod}/setup.py install --root=$(MOD_SRC_DIR)/debian/$(PACKAGE_PRE_NAME)-$${mod} --install-layout=deb; \ - done) - - # Resuming debhelper scripts - dh_testroot - dh_install - dh_installchangelogs - dh_installdocs - dh_systemd_enable - dh_installinit - dh_systemd_start - dh_link - dh_fixperms - dh_compress - dh_strip - dh_installdeb - dh_gencontrol - dh_md5sums - dh_builddeb - -.PHONY: build binary binary-arch binary-indep clean diff --git a/platform/marvell-arm64/docker-saiserver-mrvl.dep b/platform/marvell/docker-saiserver-mrvl.dep similarity index 100% rename from platform/marvell-arm64/docker-saiserver-mrvl.dep rename to platform/marvell/docker-saiserver-mrvl.dep diff --git a/platform/marvell-arm64/docker-saiserver-mrvl.mk b/platform/marvell/docker-saiserver-mrvl.mk similarity index 93% rename from platform/marvell-arm64/docker-saiserver-mrvl.mk rename to platform/marvell/docker-saiserver-mrvl.mk index 498f35ffa32d..7e5c83ffc344 100644 --- a/platform/marvell-arm64/docker-saiserver-mrvl.mk +++ b/platform/marvell/docker-saiserver-mrvl.mk @@ -5,6 +5,7 @@ $(DOCKER_SAISERVER_MRVL)_PATH = $(PLATFORM_PATH)/docker-saiserver-mrvl $(DOCKER_SAISERVER_MRVL)_DEPENDS += $(SAISERVER) $(DOCKER_SAISERVER_MRVL)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_BULLSEYE) SONIC_DOCKER_IMAGES += $(DOCKER_SAISERVER_MRVL) +SONIC_BULLSEYE_DOCKERS += $(DOCKER_SAISERVER_MRVL) $(DOCKER_SAISERVER_MRVL)_CONTAINER_NAME = saiserver $(DOCKER_SAISERVER_MRVL)_RUN_OPT += --privileged -t diff --git a/platform/marvell-arm64/docker-syncd-mrvl-rpc.dep b/platform/marvell/docker-syncd-mrvl-rpc.dep similarity index 100% rename from platform/marvell-arm64/docker-syncd-mrvl-rpc.dep rename to platform/marvell/docker-syncd-mrvl-rpc.dep diff --git a/platform/marvell/docker-syncd-mrvl-rpc.mk b/platform/marvell/docker-syncd-mrvl-rpc.mk index 20698efdf9e3..d642f4da4d9c 100644 --- a/platform/marvell/docker-syncd-mrvl-rpc.mk +++ b/platform/marvell/docker-syncd-mrvl-rpc.mk @@ -19,7 +19,10 @@ 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)_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 $(DOCKER_SYNCD_MRVL_RPC)_RUN_OPT += -v /host/warmboot:/var/warmboot + +SONIC_BULLSEYE_DOCKERS += $(DOCKER_SYNCD_MRVL_RPC) diff --git a/platform/marvell/docker-syncd-mrvl-rpc/99-syncd.conf b/platform/marvell/docker-syncd-mrvl-rpc/99-syncd.conf index f3b57e3b1964..3fabe208d815 100644 --- a/platform/marvell/docker-syncd-mrvl-rpc/99-syncd.conf +++ b/platform/marvell/docker-syncd-mrvl-rpc/99-syncd.conf @@ -1,2 +1 @@ sysctl -w net.core.rmem_max=509430500 - diff --git a/platform/marvell/docker-syncd-mrvl-rpc/Dockerfile.j2 b/platform/marvell/docker-syncd-mrvl-rpc/Dockerfile.j2 index 68670343bf37..6bd7fb9c7f64 100644 --- a/platform/marvell/docker-syncd-mrvl-rpc/Dockerfile.j2 +++ b/platform/marvell/docker-syncd-mrvl-rpc/Dockerfile.j2 @@ -15,7 +15,8 @@ RUN apt-get purge -y syncd RUN apt-get update \ && apt-get -y install \ net-tools \ - python-pip \ + python3-pip \ + python3-setuptools \ build-essential \ libssl-dev \ libffi-dev \ @@ -24,7 +25,7 @@ RUN apt-get update \ cmake \ libqt5core5a \ libqt5network5 \ - libboost-atomic1.71.0 + libboost-atomic1.74.0 RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; } ; \ {% for deb in docker_syncd_mrvl_rpc_debs.split(' ') -%} @@ -41,9 +42,9 @@ RUN wget https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz \ && cd .. \ && rm -fr nanomsg-1.0.0 \ && rm -f 1.0.0.tar.gz \ - && pip install cffi==1.7.0 \ - && pip install --upgrade cffi==1.7.0 \ - && pip install nnpy \ + && pip3 install cffi==1.7.0 \ + && pip3 install --upgrade cffi==1.7.0 \ + && pip3 install nnpy \ && mkdir -p /opt \ && cd /opt \ && wget https://github.com/raw/p4lang/ptf/master/ptf_nn/ptf_nn_agent.py \ diff --git a/platform/marvell-arm64/docker-syncd-mrvl.dep b/platform/marvell/docker-syncd-mrvl.dep similarity index 100% rename from platform/marvell-arm64/docker-syncd-mrvl.dep rename to platform/marvell/docker-syncd-mrvl.dep diff --git a/platform/marvell/docker-syncd-mrvl.mk b/platform/marvell/docker-syncd-mrvl.mk index d8a2050901f4..566de773b338 100644 --- a/platform/marvell/docker-syncd-mrvl.mk +++ b/platform/marvell/docker-syncd-mrvl.mk @@ -1,9 +1,10 @@ # docker image for mrvl syncd DOCKER_SYNCD_PLATFORM_CODE = mrvl -include $(PLATFORM_PATH)/../template/docker-syncd-base.mk +include $(PLATFORM_PATH)/../template/docker-syncd-bullseye.mk $(DOCKER_SYNCD_BASE)_DEPENDS += $(SYNCD) +$(DOCKER_SYNCD_BASE)_DEPENDS += $(MRVL_SAI) $(DOCKER_SYNCD_BASE)_DBG_DEPENDS += $(SYNCD_DBG) \ $(LIBSWSSCOMMON_DBG) \ @@ -12,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)_RUN_OPT += -v /host/warmboot:/var/warmboot -$(DOCKER_SYNCD_BASE)_RUN_OPT += -v /var/run/docker-syncd:/var/run/sswsyncd diff --git a/platform/marvell/docker-syncd-mrvl/Dockerfile.j2 b/platform/marvell/docker-syncd-mrvl/Dockerfile.j2 index 4de6df313834..84e3d5bde2fb 100755 --- a/platform/marvell/docker-syncd-mrvl/Dockerfile.j2 +++ b/platform/marvell/docker-syncd-mrvl/Dockerfile.j2 @@ -1,5 +1,5 @@ {% from "dockers/dockerfile-macros.j2" import install_debian_packages %} -FROM docker-config-engine-buster-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}} +FROM docker-config-engine-bullseye-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}} ARG docker_container_name @@ -14,16 +14,20 @@ debs/{{ deb }}{{' '}} {%- endfor -%} debs/ -RUN apt-get -y install libpcap-dev libxml2-dev python-dev swig libsensors4-dev libatomic1 liblua5.1-0 lua-bitop lua-cjson nfs-common +RUN apt-get update \ + && apt-get -y install \ + net-tools \ + iputils-ping + +RUN apt-get -y install libpcap-dev libxml2-dev python-dev swig libsensors4-dev nfs-common RUN dpkg -i \ {% for deb in docker_syncd_mrvl_debs.split(' ') -%} debs/{{ deb }}{{' '}} {%- endfor %} -COPY ["syncd.sh", "/usr/bin/"] COPY ["supervisord.conf", "/etc/supervisor/conf.d/"] -COPY ["files/supervisor-proc-exit-listener", "/usr/bin"] +COPY ["files/supervisor-proc-exit-listener", "/usr/bin/"] COPY ["critical_processes", "/etc/supervisor/"] ## Clean up diff --git a/platform/marvell/docker-syncd-mrvl/supervisord.conf b/platform/marvell/docker-syncd-mrvl/supervisord.conf index 3829f6a81fd2..62a283872483 100644 --- a/platform/marvell/docker-syncd-mrvl/supervisord.conf +++ b/platform/marvell/docker-syncd-mrvl/supervisord.conf @@ -23,7 +23,7 @@ buffer_size=1024 command=/usr/sbin/rsyslogd -n -iNONE priority=1 autostart=false -autorestart=unexpected +autorestart=false stdout_logfile=syslog stderr_logfile=syslog dependent_startup=true diff --git a/platform/marvell-arm64/libsaithrift-dev.dep b/platform/marvell/libsaithrift-dev.dep similarity index 100% rename from platform/marvell-arm64/libsaithrift-dev.dep rename to platform/marvell/libsaithrift-dev.dep diff --git a/platform/marvell/libsaithrift-dev.mk b/platform/marvell/libsaithrift-dev.mk index dd178c0b1304..e1c3da156ec2 100644 --- a/platform/marvell/libsaithrift-dev.mk +++ b/platform/marvell/libsaithrift-dev.mk @@ -2,19 +2,19 @@ SAI_VER = 0.9.4 -LIBSAITHRIFT_DEV = libsaithrift-dev_$(SAI_VER)_amd64.deb +LIBSAITHRIFT_DEV = libsaithrift-dev_$(SAI_VER)_$(CONFIGURED_ARCH).deb $(LIBSAITHRIFT_DEV)_SRC_PATH = $(SRC_PATH)/sonic-sairedis/SAI $(LIBSAITHRIFT_DEV)_DEPENDS += $(LIBTHRIFT) $(LIBTHRIFT_DEV) $(PYTHON_THRIFT) $(THRIFT_COMPILER) $(MRVL_FPA) $(MRVL_SAI) $(LIBSAITHRIFT_DEV)_RDEPENDS += $(LIBTHRIFT) $(MRVL_SAI) SONIC_DPKG_DEBS += $(LIBSAITHRIFT_DEV) -PYTHON_SAITHRIFT = python-saithrift_$(SAI_VER)_amd64.deb +PYTHON_SAITHRIFT = python-saithrift_$(SAI_VER)_$(CONFIGURED_ARCH).deb $(eval $(call add_extra_package,$(LIBSAITHRIFT_DEV),$(PYTHON_SAITHRIFT))) -SAISERVER = saiserver_$(SAI_VER)_amd64.deb -$(SAISERVER)_RDEPENDS += $(LIBTHRIFT) $(BRCM_XGS_SAI) +SAISERVER = saiserver_$(SAI_VER)_$(CONFIGURED_ARCH).deb +$(SAISERVER)_RDEPENDS += $(LIBTHRIFT) $(MRVL_SAI) $(eval $(call add_extra_package,$(LIBSAITHRIFT_DEV),$(SAISERVER))) -SAISERVER_DBG = saiserver-dbg_$(SAI_VER)_amd64.deb +SAISERVER_DBG = saiserver-dbg_$(SAI_VER)_$(CONFIGURED_ARCH).deb $(SAISERVER_DBG)_RDEPENDS += $(SAISERVER) $(eval $(call add_extra_package,$(LIBSAITHRIFT_DEV),$(SAISERVER_DBG))) diff --git a/platform/marvell/mrvl-prestera b/platform/marvell/mrvl-prestera new file mode 160000 index 000000000000..b7a14a93b21c --- /dev/null +++ b/platform/marvell/mrvl-prestera @@ -0,0 +1 @@ +Subproject commit b7a14a93b21c099fab6b53f5fc4917ca0eb9b6c9 diff --git a/platform/marvell-arm64/mrvl-prestera.dep b/platform/marvell/mrvl-prestera.dep similarity index 100% rename from platform/marvell-arm64/mrvl-prestera.dep rename to platform/marvell/mrvl-prestera.dep diff --git a/platform/marvell-arm64/mrvl-prestera.mk b/platform/marvell/mrvl-prestera.mk similarity index 80% rename from platform/marvell-arm64/mrvl-prestera.mk rename to platform/marvell/mrvl-prestera.mk index 6a3f4df2a543..36207041dc7f 100644 --- a/platform/marvell-arm64/mrvl-prestera.mk +++ b/platform/marvell/mrvl-prestera.mk @@ -4,5 +4,4 @@ export MRVL_PRESTERA = mrvlprestera_$(MRVL_PRESTERA_VER)_$(PLATFORM_ARCH) export MRVL_PRESTERA_DEB = $(MRVL_PRESTERA).deb $(MRVL_PRESTERA_DEB)_SRC_PATH = $(PLATFORM_PATH)/mrvl-prestera -$(MRVL_PRESTERA_DEB)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON) SONIC_DPKG_DEBS += $(MRVL_PRESTERA_DEB) diff --git a/platform/marvell-arm64/one-image.dep b/platform/marvell/one-image.dep similarity index 100% rename from platform/marvell-arm64/one-image.dep rename to platform/marvell/one-image.dep diff --git a/platform/marvell/one-image.mk b/platform/marvell/one-image.mk index fcac03854348..155662aa66e5 100644 --- a/platform/marvell/one-image.mk +++ b/platform/marvell/one-image.mk @@ -1,9 +1,22 @@ # sonic marvell one image installer +ifeq ($(CONFIGURED_ARCH),$(filter $(CONFIGURED_ARCH),arm64 armhf)) +SONIC_ONE_IMAGE = sonic-marvell-$(CONFIGURED_ARCH).bin +else SONIC_ONE_IMAGE = sonic-marvell.bin +endif $(SONIC_ONE_IMAGE)_MACHINE = marvell $(SONIC_ONE_IMAGE)_IMAGE_TYPE = onie $(SONIC_ONE_IMAGE)_INSTALLS += $(SYSTEMD_SONIC_GENERATOR) +ifeq ($(CONFIGURED_ARCH),arm64) +$(SONIC_ONE_IMAGE)_INSTALLS += $(MRVL_PRESTERA_DEB) +$(SONIC_ONE_IMAGE)_LAZY_INSTALLS += $(NOKIA_7215_PLATFORM) \ + $(AC5X_RD98DX35xx_PLATFORM) \ + $(AC5X_RD98DX35xxCN9131_PLATFORM) +else ifeq ($(CONFIGURED_ARCH),armhf) +$(SONIC_ONE_IMAGE)_INSTALLS += $(MRVL_PRESTERA_DEB) +$(SONIC_ONE_IMAGE)_LAZY_INSTALLS += $(NOKIA_7215_PLATFORM) +endif ifeq ($(INSTALL_DEBUG_TOOLS),y) $(SONIC_ONE_IMAGE)_DOCKERS += $(SONIC_INSTALL_DOCKER_DBG_IMAGES) $(SONIC_ONE_IMAGE)_DOCKERS += $(filter-out $(patsubst %-$(DBG_IMAGE_MARK).gz,%.gz, $(SONIC_INSTALL_DOCKER_DBG_IMAGES)), $(SONIC_INSTALL_DOCKER_IMAGES)) diff --git a/platform/marvell/onie-image-arm64.conf b/platform/marvell/onie-image-arm64.conf new file mode 100644 index 000000000000..69d93d722984 --- /dev/null +++ b/platform/marvell/onie-image-arm64.conf @@ -0,0 +1,55 @@ +## DESCRIPTION: +## config for ONIE image +## + +## Partition size in MB +## The default size is 32GB +: ${ONIE_IMAGE_PART_SIZE:=32768} + +## Target hardware information +: ${TARGET_PLATFORM:=arm64} +: ${TARGET_MACHINE:=generic} + +ONIEIMAGE_VERSION=r0 + +## Filesystem root +FILESYSTEM_ROOT=./fsroot-${TARGET_MACHINE} + +## Filename for squashfs file system +FILESYSTEM_SQUASHFS=fs.squashfs + +## Filename for onie installer payload, will be the main part of onie installer +INSTALLER_PAYLOAD=fs.zip + +## Filename for docker file system +FILESYSTEM_DOCKERFS=dockerfs.tar.gz + +## docker directory on the root filesystem +DOCKERFS_DIR=docker + +## docker ramfs disk space +DOCKER_RAMFS_SIZE=2500M + +## Output file name for onie installer +OUTPUT_ONIE_IMAGE=target/sonic-$TARGET_MACHINE-$CONFIGURED_ARCH.bin + +## Output file name for raw image +OUTPUT_RAW_IMAGE=target/sonic-$TARGET_MACHINE-$CONFIGURED_ARCH.raw + +## Raw image size in MB +RAW_IMAGE_DISK_SIZE=4096 + +## Output file name for kvm image +OUTPUT_KVM_IMAGE=target/sonic-$TARGET_MACHINE-$CONFIGURED_ARCH.img + +## Kvm image size in GB +KVM_IMAGE_DISK_SIZE=16 + +## Output file name for aboot installer +OUTPUT_ABOOT_IMAGE=target/sonic-aboot-$TARGET_MACHINE-$CONFIGURED_ARCH.swi + +## Aboot boot image name +ABOOT_BOOT_IMAGE=.sonic-boot.swi + +## Output file name for dsc installer +OUTPUT_DSC_IMAGE=target/sonic-$TARGET_MACHINE-$CONFIGURED_ARCH.tar diff --git a/platform/marvell-arm64/platform-marvell.dep b/platform/marvell/platform-marvell.dep similarity index 100% rename from platform/marvell-arm64/platform-marvell.dep rename to platform/marvell/platform-marvell.dep diff --git a/platform/marvell-arm64/platform-marvell.mk b/platform/marvell/platform-marvell.mk similarity index 89% rename from platform/marvell-arm64/platform-marvell.mk rename to platform/marvell/platform-marvell.mk index 3f2ba3df09f8..9dffbf5e5bf8 100644 --- a/platform/marvell-arm64/platform-marvell.mk +++ b/platform/marvell/platform-marvell.mk @@ -3,8 +3,7 @@ AC5X_RD98DX35xx_PLATFORM_MODULE_VERSION = 1.0 AC5X_RD98DX35xxCN9131_PLATFORM_MODULE_VERSION = 1.0 -export AC5X_RD98DX35xx_PLATFORM_MODULE_VERSION -export AC5X_RD98DX35xxCN9131_PLATFORM_MODULE_VERSION +ifeq ($(CONFIGURED_ARCH),arm64) AC5X_RD98DX35xx_PLATFORM = sonic-platform-rd98dx35xx_$(AC5X_RD98DX35xx_PLATFORM_MODULE_VERSION)_$(CONFIGURED_ARCH).deb $(AC5X_RD98DX35xx_PLATFORM)_SRC_PATH = $(PLATFORM_PATH)/sonic-platform-marvell @@ -16,3 +15,4 @@ AC5X_RD98DX35xxCN9131_PLATFORM = sonic-platform-rd98dx35xx-cn9131_$(AC5X_RD98DX3 $(AC5X_RD98DX35xxCN9131_PLATFORM)_PLATFORM = arm64-marvell_rd98DX35xx_cn9131-r0 $(eval $(call add_extra_package,$(AC5X_RD98DX35xx_PLATFORM),$(AC5X_RD98DX35xxCN9131_PLATFORM))) +endif diff --git a/platform/marvell-arm64/platform-nokia.dep b/platform/marvell/platform-nokia.dep similarity index 100% rename from platform/marvell-arm64/platform-nokia.dep rename to platform/marvell/platform-nokia.dep diff --git a/platform/marvell-arm64/platform-nokia.mk b/platform/marvell/platform-nokia.mk similarity index 61% rename from platform/marvell-arm64/platform-nokia.mk rename to platform/marvell/platform-nokia.mk index 7d89c1190ecf..f8136070861c 100644 --- a/platform/marvell-arm64/platform-nokia.mk +++ b/platform/marvell/platform-nokia.mk @@ -5,19 +5,26 @@ export NOKIA_7215_PLATFORM_VERSION SONIC_KERNEL_DEB_PKG = $(LINUX_KERNEL) export SONIC_KERNEL_DEB_PKG -NOKIA_7215_PLATFORM = sonic-platform-nokia-7215_$(NOKIA_7215_PLATFORM_VERSION)_$(CONFIGURED_ARCH).deb +ifeq ($(CONFIGURED_ARCH),arm64) +NOKIA_7215_PLATFORM = sonic-platform-nokia-7215-a1_$(NOKIA_7215_PLATFORM_VERSION)_$(CONFIGURED_ARCH).deb $(NOKIA_7215_PLATFORM)_SRC_PATH = $(PLATFORM_PATH)/sonic-platform-nokia $(NOKIA_7215_PLATFORM)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON) $(NOKIA_7215_PLATFORM)_PLATFORM = arm64-nokia_ixs7215_52xb-r0 MPATH := $($(NOKIA_7215_PLATFORM)_SRC_PATH) -DEP_FILES := $(SONIC_COMMON_FILES_LIST) platform/marvell-arm64/platform-nokia.mk +DEP_FILES := $(SONIC_COMMON_FILES_LIST) platform/marvell/platform-nokia.mk DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST) DEP_FILES += $(shell git ls-files $(MPATH)) $(NOKIA_7215_PLATFORM)_CACHE_MODE := GIT_CONTENT_SHA $(NOKIA_7215_PLATFORM)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST) $(NOKIA_7215_PLATFORM)_DEP_FILES := $(DEP_FILES) - SONIC_DPKG_DEBS += $(NOKIA_7215_PLATFORM) +else ifeq ($(CONFIGURED_ARCH),armhf) +NOKIA_7215_PLATFORM = sonic-platform-nokia-7215_$(NOKIA_7215_PLATFORM_VERSION)_$(CONFIGURED_ARCH).deb +$(NOKIA_7215_PLATFORM)_SRC_PATH = $(PLATFORM_PATH)/sonic-platform-nokia +$(NOKIA_7215_PLATFORM)_PLATFORM = armhf-nokia_ixs7215_52x-r0 +$(NOKIA_7215_PLATFORM)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON) +SONIC_DPKG_DEBS += $(NOKIA_7215_PLATFORM) +endif diff --git a/platform/marvell/platform.conf b/platform/marvell/platform.conf deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/platform/marvell-arm64/platform.conf b/platform/marvell/platform_arm64.conf similarity index 100% rename from platform/marvell-arm64/platform.conf rename to platform/marvell/platform_arm64.conf diff --git a/platform/marvell-armhf/platform.conf b/platform/marvell/platform_armhf.conf similarity index 100% rename from platform/marvell-armhf/platform.conf rename to platform/marvell/platform_armhf.conf diff --git a/platform/marvell-arm64/rules.dep b/platform/marvell/rules.dep similarity index 84% rename from platform/marvell-arm64/rules.dep rename to platform/marvell/rules.dep index b14b76ef03dc..a5bdbf59d16b 100644 --- a/platform/marvell-arm64/rules.dep +++ b/platform/marvell/rules.dep @@ -2,8 +2,10 @@ 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)/libsaithrift-dev.dep -include $(PLATFORM_PATH)/mrvl-prestera.dep include $(PLATFORM_PATH)/one-image.dep include $(PLATFORM_PATH)/platform-marvell.dep +ifeq ($(CONFIGURED_ARCH),$(filter $(CONFIGURED_ARCH),arm64 armhf)) +include $(PLATFORM_PATH)/mrvl-prestera.dep include $(PLATFORM_PATH)/platform-nokia.dep +endif include $(PLATFORM_PATH)/sai.dep diff --git a/platform/marvell/rules.mk b/platform/marvell/rules.mk index da23e53f26bc..0b78cd088a01 100644 --- a/platform/marvell/rules.mk +++ b/platform/marvell/rules.mk @@ -1,15 +1,21 @@ 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)/libsaithrift-dev.mk include $(PLATFORM_PATH)/one-image.mk +include $(PLATFORM_PATH)/platform-marvell.mk +ifeq ($(CONFIGURED_ARCH),$(filter $(CONFIGURED_ARCH),arm64 armhf)) +include $(PLATFORM_PATH)/mrvl-prestera.mk +include $(PLATFORM_PATH)/platform-nokia.mk +endif SONIC_ALL += $(SONIC_ONE_IMAGE) \ - $(DOCKER_FPM) \ + $(DOCKER_FPM) \ $(DOCKER_SYNCD_MRVL_RPC) # Inject mrvl sai into syncd -$(SYNCD)_DEPENDS += $(MRVL_FPA) $(MRVL_SAI) +$(SYNCD)_DEPENDS += $(MRVL_SAI) $(SYNCD)_UNINSTALLS += $(MRVL_SAI) ifeq ($(ENABLE_SYNCD_RPC),y) diff --git a/platform/marvell-arm64/sai.dep b/platform/marvell/sai.dep similarity index 76% rename from platform/marvell-arm64/sai.dep rename to platform/marvell/sai.dep index 618babe65ace..fee88c0fa0b8 100644 --- a/platform/marvell-arm64/sai.dep +++ b/platform/marvell/sai.dep @@ -1,7 +1,5 @@ -SPATH := $($(MRVL_SAI)_SRC_PATH) DEP_FILES := $(SONIC_COMMON_FILES_LIST) $(PLATFORM_PATH)/sai.mk $(PLATFORM_PATH)/sai.dep DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST) -DEP_FILES += $(shell git ls-files $(SPATH)) $(MRVL_SAI)_CACHE_MODE := GIT_CONTENT_SHA $(MRVL_SAI)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST) diff --git a/platform/marvell/sai.mk b/platform/marvell/sai.mk index 231bdfc810a7..4fd89bf6cf83 100644 --- a/platform/marvell/sai.mk +++ b/platform/marvell/sai.mk @@ -1,9 +1,19 @@ # Marvell SAI -export MRVL_SAI_VERSION = 1.13.0-1 -export MRVL_SAI = mrvllibsai_amd64_$(MRVL_SAI_VERSION).deb +BRANCH = master +ifeq ($(CONFIGURED_ARCH),arm64) +MRVL_SAI_VERSION = 1.13.0-1 +else ifeq ($(CONFIGURED_ARCH),armhf) +MRVL_SAI_VERSION = 1.13.0-2 +else +MRVL_SAI_VERSION = 1.13.0-1 +endif -$(MRVL_SAI)_SRC_PATH = $(PLATFORM_PATH)/sai +MRVL_SAI_URL_PREFIX = https://github.com/Marvell-switching/sonic-marvell-binaries/raw/master/$(CONFIGURED_ARCH)/sai-plugin/$(BRANCH)/ +MRVL_SAI = mrvllibsai_$(MRVL_SAI_VERSION)_$(PLATFORM_ARCH).deb +$(MRVL_SAI)_URL = $(MRVL_SAI_URL_PREFIX)/$(MRVL_SAI) + +SONIC_ONLINE_DEBS += $(MRVL_SAI) +$(MRVL_SAI)_SKIP_VERSION=y $(eval $(call add_conflict_package,$(MRVL_SAI),$(LIBSAIVS_DEV))) -SONIC_MAKE_DEBS += $(MRVL_SAI) diff --git a/platform/marvell/sai/Makefile b/platform/marvell/sai/Makefile deleted file mode 100644 index 1cd6d0267fa2..000000000000 --- a/platform/marvell/sai/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -.ONESHELL: -SHELL = /bin/bash -.SHELLFLAGS += -e - -MRVL_SAI_URL = https://github.com/Marvell-switching/sonic-marvell-binaries/raw/master/amd64/sai-plugin/$(MRVL_SAI) - -$(addprefix $(DEST)/, $(MRVL_SAI)): $(DEST)/% : - # get deb package - wget -O $(DEST)/$(MRVL_SAI) $(MRVL_SAI_URL) diff --git a/platform/marvell/sonic-platform-marvell b/platform/marvell/sonic-platform-marvell new file mode 160000 index 000000000000..078a6fff30f3 --- /dev/null +++ b/platform/marvell/sonic-platform-marvell @@ -0,0 +1 @@ +Subproject commit 078a6fff30f3af786aae1208588030a3fcfe0876 diff --git a/platform/marvell-arm64/sonic-platform-nokia/7215/modules/Makefile b/platform/marvell/sonic-platform-nokia/7215-a1/modules/Makefile similarity index 100% rename from platform/marvell-arm64/sonic-platform-nokia/7215/modules/Makefile rename to platform/marvell/sonic-platform-nokia/7215-a1/modules/Makefile diff --git a/platform/marvell-arm64/sonic-platform-nokia/7215/modules/cn9130_cpu_thermal_sensor.c b/platform/marvell/sonic-platform-nokia/7215-a1/modules/cn9130_cpu_thermal_sensor.c similarity index 100% rename from platform/marvell-arm64/sonic-platform-nokia/7215/modules/cn9130_cpu_thermal_sensor.c rename to platform/marvell/sonic-platform-nokia/7215-a1/modules/cn9130_cpu_thermal_sensor.c diff --git a/platform/marvell-arm64/sonic-platform-nokia/7215/modules/nokia_7215_ixs_a1_cpld.c b/platform/marvell/sonic-platform-nokia/7215-a1/modules/nokia_7215_ixs_a1_cpld.c similarity index 100% rename from platform/marvell-arm64/sonic-platform-nokia/7215/modules/nokia_7215_ixs_a1_cpld.c rename to platform/marvell/sonic-platform-nokia/7215-a1/modules/nokia_7215_ixs_a1_cpld.c diff --git a/platform/marvell-arm64/sonic-platform-nokia/7215/scripts/cpu_wdt.py b/platform/marvell/sonic-platform-nokia/7215-a1/scripts/cpu_wdt.py similarity index 100% rename from platform/marvell-arm64/sonic-platform-nokia/7215/scripts/cpu_wdt.py rename to platform/marvell/sonic-platform-nokia/7215-a1/scripts/cpu_wdt.py diff --git a/platform/marvell-arm64/sonic-platform-nokia/7215/scripts/nokia-7215-init.sh b/platform/marvell/sonic-platform-nokia/7215-a1/scripts/nokia-7215-init.sh similarity index 100% rename from platform/marvell-arm64/sonic-platform-nokia/7215/scripts/nokia-7215-init.sh rename to platform/marvell/sonic-platform-nokia/7215-a1/scripts/nokia-7215-init.sh diff --git a/platform/marvell-arm64/sonic-platform-nokia/7215/service/cpu_wdt.service b/platform/marvell/sonic-platform-nokia/7215-a1/service/cpu_wdt.service similarity index 100% rename from platform/marvell-arm64/sonic-platform-nokia/7215/service/cpu_wdt.service rename to platform/marvell/sonic-platform-nokia/7215-a1/service/cpu_wdt.service diff --git a/platform/marvell-arm64/sonic-platform-nokia/7215/service/nokia-7215init.service b/platform/marvell/sonic-platform-nokia/7215-a1/service/nokia-7215init.service similarity index 100% rename from platform/marvell-arm64/sonic-platform-nokia/7215/service/nokia-7215init.service rename to platform/marvell/sonic-platform-nokia/7215-a1/service/nokia-7215init.service diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/setup.py b/platform/marvell/sonic-platform-nokia/7215-a1/setup.py similarity index 80% rename from platform/marvell-armhf/sonic-platform-nokia/7215/setup.py rename to platform/marvell/sonic-platform-nokia/7215-a1/setup.py index 65f4853bec83..67663d3567a4 100755 --- a/platform/marvell-armhf/sonic-platform-nokia/7215/setup.py +++ b/platform/marvell/sonic-platform-nokia/7215-a1/setup.py @@ -10,6 +10,6 @@ description='Module to initialize Nokia IXS 7215 platforms', packages=['sonic_platform','sonic_platform.test'], - package_dir={'sonic_platform': '7215/sonic_platform'}, + package_dir={'sonic_platform': 'sonic_platform'}, ) diff --git a/platform/marvell-arm64/sonic-platform-nokia/7215/sonic_platform/__init__.py b/platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/__init__.py similarity index 100% rename from platform/marvell-arm64/sonic-platform-nokia/7215/sonic_platform/__init__.py rename to platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/__init__.py diff --git a/platform/marvell-arm64/sonic-platform-nokia/7215/sonic_platform/chassis.py b/platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/chassis.py similarity index 100% rename from platform/marvell-arm64/sonic-platform-nokia/7215/sonic_platform/chassis.py rename to platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/chassis.py diff --git a/platform/marvell-arm64/sonic-platform-nokia/7215/sonic_platform/component.py b/platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/component.py similarity index 100% rename from platform/marvell-arm64/sonic-platform-nokia/7215/sonic_platform/component.py rename to platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/component.py diff --git a/platform/marvell-arm64/sonic-platform-nokia/7215/sonic_platform/eeprom.py b/platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/eeprom.py similarity index 100% rename from platform/marvell-arm64/sonic-platform-nokia/7215/sonic_platform/eeprom.py rename to platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/eeprom.py diff --git a/platform/marvell-arm64/sonic-platform-nokia/7215/sonic_platform/fan.py b/platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/fan.py similarity index 100% rename from platform/marvell-arm64/sonic-platform-nokia/7215/sonic_platform/fan.py rename to platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/fan.py diff --git a/platform/marvell-arm64/sonic-platform-nokia/7215/sonic_platform/fan_drawer.py b/platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/fan_drawer.py similarity index 100% rename from platform/marvell-arm64/sonic-platform-nokia/7215/sonic_platform/fan_drawer.py rename to platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/fan_drawer.py diff --git a/platform/marvell-arm64/sonic-platform-nokia/7215/sonic_platform/platform.py b/platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/platform.py similarity index 100% rename from platform/marvell-arm64/sonic-platform-nokia/7215/sonic_platform/platform.py rename to platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/platform.py diff --git a/platform/marvell-arm64/sonic-platform-nokia/7215/sonic_platform/psu.py b/platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/psu.py similarity index 100% rename from platform/marvell-arm64/sonic-platform-nokia/7215/sonic_platform/psu.py rename to platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/psu.py diff --git a/platform/marvell-arm64/sonic-platform-nokia/7215/sonic_platform/sfp.py b/platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/sfp.py similarity index 100% rename from platform/marvell-arm64/sonic-platform-nokia/7215/sonic_platform/sfp.py rename to platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/sfp.py diff --git a/platform/marvell-arm64/sonic-platform-nokia/7215/sonic_platform/sfp_event.py b/platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/sfp_event.py similarity index 100% rename from platform/marvell-arm64/sonic-platform-nokia/7215/sonic_platform/sfp_event.py rename to platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/sfp_event.py diff --git a/platform/marvell-arm64/sonic-platform-nokia/7215/sonic_platform/test/README b/platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/test/README similarity index 100% rename from platform/marvell-arm64/sonic-platform-nokia/7215/sonic_platform/test/README rename to platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/test/README diff --git a/platform/marvell-arm64/sonic-platform-nokia/7215/sonic_platform/test/test-chassis.py b/platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/test/test-chassis.py similarity index 100% rename from platform/marvell-arm64/sonic-platform-nokia/7215/sonic_platform/test/test-chassis.py rename to platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/test/test-chassis.py diff --git a/platform/marvell-arm64/sonic-platform-nokia/7215/sonic_platform/test/test-component.py b/platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/test/test-component.py similarity index 100% rename from platform/marvell-arm64/sonic-platform-nokia/7215/sonic_platform/test/test-component.py rename to platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/test/test-component.py diff --git a/platform/marvell-arm64/sonic-platform-nokia/7215/sonic_platform/test/test-eeprom.py b/platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/test/test-eeprom.py similarity index 100% rename from platform/marvell-arm64/sonic-platform-nokia/7215/sonic_platform/test/test-eeprom.py rename to platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/test/test-eeprom.py diff --git a/platform/marvell-arm64/sonic-platform-nokia/7215/sonic_platform/test/test-fan.py b/platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/test/test-fan.py similarity index 100% rename from platform/marvell-arm64/sonic-platform-nokia/7215/sonic_platform/test/test-fan.py rename to platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/test/test-fan.py diff --git a/platform/marvell-arm64/sonic-platform-nokia/7215/sonic_platform/test/test-psu.py b/platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/test/test-psu.py similarity index 100% rename from platform/marvell-arm64/sonic-platform-nokia/7215/sonic_platform/test/test-psu.py rename to platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/test/test-psu.py diff --git a/platform/marvell-arm64/sonic-platform-nokia/7215/sonic_platform/test/test-sfp.py b/platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/test/test-sfp.py similarity index 100% rename from platform/marvell-arm64/sonic-platform-nokia/7215/sonic_platform/test/test-sfp.py rename to platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/test/test-sfp.py diff --git a/platform/marvell-arm64/sonic-platform-nokia/7215/sonic_platform/test/test-thermal.py b/platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/test/test-thermal.py similarity index 100% rename from platform/marvell-arm64/sonic-platform-nokia/7215/sonic_platform/test/test-thermal.py rename to platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/test/test-thermal.py diff --git a/platform/marvell-arm64/sonic-platform-nokia/7215/sonic_platform/test/test-watchdog.py b/platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/test/test-watchdog.py similarity index 100% rename from platform/marvell-arm64/sonic-platform-nokia/7215/sonic_platform/test/test-watchdog.py rename to platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/test/test-watchdog.py diff --git a/platform/marvell-arm64/sonic-platform-nokia/7215/sonic_platform/thermal.py b/platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/thermal.py similarity index 100% rename from platform/marvell-arm64/sonic-platform-nokia/7215/sonic_platform/thermal.py rename to platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/thermal.py diff --git a/platform/marvell-arm64/sonic-platform-nokia/7215/sonic_platform/thermal_actions.py b/platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/thermal_actions.py similarity index 100% rename from platform/marvell-arm64/sonic-platform-nokia/7215/sonic_platform/thermal_actions.py rename to platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/thermal_actions.py diff --git a/platform/marvell-arm64/sonic-platform-nokia/7215/sonic_platform/thermal_conditions.py b/platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/thermal_conditions.py similarity index 100% rename from platform/marvell-arm64/sonic-platform-nokia/7215/sonic_platform/thermal_conditions.py rename to platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/thermal_conditions.py diff --git a/platform/marvell-arm64/sonic-platform-nokia/7215/sonic_platform/thermal_infos.py b/platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/thermal_infos.py similarity index 100% rename from platform/marvell-arm64/sonic-platform-nokia/7215/sonic_platform/thermal_infos.py rename to platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/thermal_infos.py diff --git a/platform/marvell-arm64/sonic-platform-nokia/7215/sonic_platform/thermal_manager.py b/platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/thermal_manager.py similarity index 100% rename from platform/marvell-arm64/sonic-platform-nokia/7215/sonic_platform/thermal_manager.py rename to platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/thermal_manager.py diff --git a/platform/marvell-arm64/sonic-platform-nokia/7215/sonic_platform/watchdog.py b/platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/watchdog.py similarity index 100% rename from platform/marvell-arm64/sonic-platform-nokia/7215/sonic_platform/watchdog.py rename to platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/watchdog.py diff --git a/platform/marvell-arm64/sonic-platform-nokia/7215/utils/sonic_ssd.py b/platform/marvell/sonic-platform-nokia/7215-a1/utils/sonic_ssd.py similarity index 100% rename from platform/marvell-arm64/sonic-platform-nokia/7215/utils/sonic_ssd.py rename to platform/marvell/sonic-platform-nokia/7215-a1/utils/sonic_ssd.py diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/scripts/cpu_wdt.py b/platform/marvell/sonic-platform-nokia/7215/scripts/cpu_wdt.py similarity index 100% rename from platform/marvell-armhf/sonic-platform-nokia/7215/scripts/cpu_wdt.py rename to platform/marvell/sonic-platform-nokia/7215/scripts/cpu_wdt.py diff --git a/platform/marvell-armhf/sonic-platform-nokia/inband_mgmt.sh b/platform/marvell/sonic-platform-nokia/7215/scripts/inband_mgmt.sh similarity index 100% rename from platform/marvell-armhf/sonic-platform-nokia/inband_mgmt.sh rename to platform/marvell/sonic-platform-nokia/7215/scripts/inband_mgmt.sh diff --git a/platform/marvell-armhf/sonic-platform-nokia/nokia-7215_plt_setup.sh b/platform/marvell/sonic-platform-nokia/7215/scripts/nokia-7215_plt_setup.sh similarity index 100% rename from platform/marvell-armhf/sonic-platform-nokia/nokia-7215_plt_setup.sh rename to platform/marvell/sonic-platform-nokia/7215/scripts/nokia-7215_plt_setup.sh diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/scripts/nokia-7215init.sh b/platform/marvell/sonic-platform-nokia/7215/scripts/nokia-7215init.sh similarity index 100% rename from platform/marvell-armhf/sonic-platform-nokia/7215/scripts/nokia-7215init.sh rename to platform/marvell/sonic-platform-nokia/7215/scripts/nokia-7215init.sh diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/service/cpu_wdt.service b/platform/marvell/sonic-platform-nokia/7215/service/cpu_wdt.service similarity index 100% rename from platform/marvell-armhf/sonic-platform-nokia/7215/service/cpu_wdt.service rename to platform/marvell/sonic-platform-nokia/7215/service/cpu_wdt.service diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/service/fstrim.timer/timer-override.conf b/platform/marvell/sonic-platform-nokia/7215/service/fstrim.timer/timer-override.conf similarity index 100% rename from platform/marvell-armhf/sonic-platform-nokia/7215/service/fstrim.timer/timer-override.conf rename to platform/marvell/sonic-platform-nokia/7215/service/fstrim.timer/timer-override.conf diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/service/nokia-7215init.service b/platform/marvell/sonic-platform-nokia/7215/service/nokia-7215init.service similarity index 100% rename from platform/marvell-armhf/sonic-platform-nokia/7215/service/nokia-7215init.service rename to platform/marvell/sonic-platform-nokia/7215/service/nokia-7215init.service diff --git a/platform/marvell-arm64/sonic-platform-nokia/7215/setup.py b/platform/marvell/sonic-platform-nokia/7215/setup.py similarity index 80% rename from platform/marvell-arm64/sonic-platform-nokia/7215/setup.py rename to platform/marvell/sonic-platform-nokia/7215/setup.py index 65f4853bec83..67663d3567a4 100755 --- a/platform/marvell-arm64/sonic-platform-nokia/7215/setup.py +++ b/platform/marvell/sonic-platform-nokia/7215/setup.py @@ -10,6 +10,6 @@ description='Module to initialize Nokia IXS 7215 platforms', packages=['sonic_platform','sonic_platform.test'], - package_dir={'sonic_platform': '7215/sonic_platform'}, + package_dir={'sonic_platform': 'sonic_platform'}, ) diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/__init__.py b/platform/marvell/sonic-platform-nokia/7215/sonic_platform/__init__.py similarity index 100% rename from platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/__init__.py rename to platform/marvell/sonic-platform-nokia/7215/sonic_platform/__init__.py diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/chassis.py b/platform/marvell/sonic-platform-nokia/7215/sonic_platform/chassis.py similarity index 100% rename from platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/chassis.py rename to platform/marvell/sonic-platform-nokia/7215/sonic_platform/chassis.py diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/component.py b/platform/marvell/sonic-platform-nokia/7215/sonic_platform/component.py similarity index 100% rename from platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/component.py rename to platform/marvell/sonic-platform-nokia/7215/sonic_platform/component.py diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/eeprom.py b/platform/marvell/sonic-platform-nokia/7215/sonic_platform/eeprom.py similarity index 100% rename from platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/eeprom.py rename to platform/marvell/sonic-platform-nokia/7215/sonic_platform/eeprom.py diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/fan.py b/platform/marvell/sonic-platform-nokia/7215/sonic_platform/fan.py similarity index 100% rename from platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/fan.py rename to platform/marvell/sonic-platform-nokia/7215/sonic_platform/fan.py diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/fan_drawer.py b/platform/marvell/sonic-platform-nokia/7215/sonic_platform/fan_drawer.py similarity index 100% rename from platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/fan_drawer.py rename to platform/marvell/sonic-platform-nokia/7215/sonic_platform/fan_drawer.py diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/platform.py b/platform/marvell/sonic-platform-nokia/7215/sonic_platform/platform.py similarity index 100% rename from platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/platform.py rename to platform/marvell/sonic-platform-nokia/7215/sonic_platform/platform.py diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/psu.py b/platform/marvell/sonic-platform-nokia/7215/sonic_platform/psu.py similarity index 100% rename from platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/psu.py rename to platform/marvell/sonic-platform-nokia/7215/sonic_platform/psu.py diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/sfp.py b/platform/marvell/sonic-platform-nokia/7215/sonic_platform/sfp.py similarity index 100% rename from platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/sfp.py rename to platform/marvell/sonic-platform-nokia/7215/sonic_platform/sfp.py diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/sfp_event.py b/platform/marvell/sonic-platform-nokia/7215/sonic_platform/sfp_event.py similarity index 100% rename from platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/sfp_event.py rename to platform/marvell/sonic-platform-nokia/7215/sonic_platform/sfp_event.py diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/README b/platform/marvell/sonic-platform-nokia/7215/sonic_platform/test/README similarity index 100% rename from platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/README rename to platform/marvell/sonic-platform-nokia/7215/sonic_platform/test/README diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-chassis.py b/platform/marvell/sonic-platform-nokia/7215/sonic_platform/test/test-chassis.py similarity index 100% rename from platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-chassis.py rename to platform/marvell/sonic-platform-nokia/7215/sonic_platform/test/test-chassis.py diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-component.py b/platform/marvell/sonic-platform-nokia/7215/sonic_platform/test/test-component.py similarity index 100% rename from platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-component.py rename to platform/marvell/sonic-platform-nokia/7215/sonic_platform/test/test-component.py diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-eeprom.py b/platform/marvell/sonic-platform-nokia/7215/sonic_platform/test/test-eeprom.py similarity index 100% rename from platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-eeprom.py rename to platform/marvell/sonic-platform-nokia/7215/sonic_platform/test/test-eeprom.py diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-fan.py b/platform/marvell/sonic-platform-nokia/7215/sonic_platform/test/test-fan.py similarity index 100% rename from platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-fan.py rename to platform/marvell/sonic-platform-nokia/7215/sonic_platform/test/test-fan.py diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-psu.py b/platform/marvell/sonic-platform-nokia/7215/sonic_platform/test/test-psu.py similarity index 100% rename from platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-psu.py rename to platform/marvell/sonic-platform-nokia/7215/sonic_platform/test/test-psu.py diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-sfp.py b/platform/marvell/sonic-platform-nokia/7215/sonic_platform/test/test-sfp.py similarity index 100% rename from platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-sfp.py rename to platform/marvell/sonic-platform-nokia/7215/sonic_platform/test/test-sfp.py diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-thermal.py b/platform/marvell/sonic-platform-nokia/7215/sonic_platform/test/test-thermal.py similarity index 100% rename from platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-thermal.py rename to platform/marvell/sonic-platform-nokia/7215/sonic_platform/test/test-thermal.py diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-watchdog.py b/platform/marvell/sonic-platform-nokia/7215/sonic_platform/test/test-watchdog.py similarity index 100% rename from platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-watchdog.py rename to platform/marvell/sonic-platform-nokia/7215/sonic_platform/test/test-watchdog.py diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/thermal.py b/platform/marvell/sonic-platform-nokia/7215/sonic_platform/thermal.py similarity index 100% rename from platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/thermal.py rename to platform/marvell/sonic-platform-nokia/7215/sonic_platform/thermal.py diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/thermal_actions.py b/platform/marvell/sonic-platform-nokia/7215/sonic_platform/thermal_actions.py similarity index 100% rename from platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/thermal_actions.py rename to platform/marvell/sonic-platform-nokia/7215/sonic_platform/thermal_actions.py diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/thermal_conditions.py b/platform/marvell/sonic-platform-nokia/7215/sonic_platform/thermal_conditions.py similarity index 100% rename from platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/thermal_conditions.py rename to platform/marvell/sonic-platform-nokia/7215/sonic_platform/thermal_conditions.py diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/thermal_infos.py b/platform/marvell/sonic-platform-nokia/7215/sonic_platform/thermal_infos.py similarity index 100% rename from platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/thermal_infos.py rename to platform/marvell/sonic-platform-nokia/7215/sonic_platform/thermal_infos.py diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/thermal_manager.py b/platform/marvell/sonic-platform-nokia/7215/sonic_platform/thermal_manager.py similarity index 100% rename from platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/thermal_manager.py rename to platform/marvell/sonic-platform-nokia/7215/sonic_platform/thermal_manager.py diff --git a/platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/watchdog.py b/platform/marvell/sonic-platform-nokia/7215/sonic_platform/watchdog.py similarity index 100% rename from platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/watchdog.py rename to platform/marvell/sonic-platform-nokia/7215/sonic_platform/watchdog.py diff --git a/platform/marvell-arm64/sonic-platform-nokia/debian/changelog b/platform/marvell/sonic-platform-nokia/debian/changelog similarity index 65% rename from platform/marvell-arm64/sonic-platform-nokia/debian/changelog rename to platform/marvell/sonic-platform-nokia/debian/changelog index f6573c957c5f..a369a030e40a 100755 --- a/platform/marvell-arm64/sonic-platform-nokia/debian/changelog +++ b/platform/marvell/sonic-platform-nokia/debian/changelog @@ -1,4 +1,4 @@ -sonic-platform-nokia-7215 (1.0) unstable; urgency=low +sonic-platform-nokia (1.0) unstable; urgency=low * Add support for nokia-7215. diff --git a/platform/marvell-arm64/sonic-platform-nokia/debian/compat b/platform/marvell/sonic-platform-nokia/debian/compat similarity index 100% rename from platform/marvell-arm64/sonic-platform-nokia/debian/compat rename to platform/marvell/sonic-platform-nokia/debian/compat diff --git a/platform/marvell-arm64/sonic-platform-nokia/debian/control b/platform/marvell/sonic-platform-nokia/debian/control similarity index 60% rename from platform/marvell-arm64/sonic-platform-nokia/debian/control rename to platform/marvell/sonic-platform-nokia/debian/control index acab75a481ec..3bdaa1973670 100755 --- a/platform/marvell-arm64/sonic-platform-nokia/debian/control +++ b/platform/marvell/sonic-platform-nokia/debian/control @@ -1,4 +1,4 @@ -Source: sonic-platform-nokia-7215 +Source: sonic-platform-nokia Section: unknown Priority: optional Maintainer: Nokia @@ -6,8 +6,15 @@ Build-Depends: debhelper (>=9) Standards-Version: 3.9.6 Homepage: +Package: sonic-platform-nokia-7215-a1 +Architecture: any +Depends: ${misc:Depends} +Description: + + Package: sonic-platform-nokia-7215 -Architecture: arm64 +Architecture: any Depends: ${misc:Depends} Description: + diff --git a/platform/marvell-arm64/sonic-platform-nokia/debian/rules b/platform/marvell/sonic-platform-nokia/debian/rules similarity index 51% rename from platform/marvell-arm64/sonic-platform-nokia/debian/rules rename to platform/marvell/sonic-platform-nokia/debian/rules index de6ed670d0c3..f3fe01d1b5aa 100755 --- a/platform/marvell-arm64/sonic-platform-nokia/debian/rules +++ b/platform/marvell/sonic-platform-nokia/debian/rules @@ -13,11 +13,13 @@ endif KERNEL_SRC := /lib/modules/$(KVERSION) INSTALL_MOD_DIR := kernel/extra/ MOD_SRC_DIR:= $(shell pwd) -MODULE_DIRS:= 7215 +MODULE_DIRS:= 7215 7215-a1 UTILS_DIR := utils MODULE_DIR:= modules MRVL_MODULE_DIR:= mrvl-modules -PRESTERA_MODULE_SRC := mrvl-prestera/drivers/generic/cpssEnabler/linuxNoKernelModule/drivers +PRESTERA_MODULE_PREFIX := mrvl-prestera/drivers/generic/ +PRESTERA_MODULE_PREFIX_ARMHF := mrvl-prestera/drivers/armhf/ +PRESTERA_MODULE_SRC := /cpssEnabler/linuxNoKernelModule/drivers/ SERVICE_DIR := service PLATFORM_DIR := sonic_platform @@ -28,17 +30,35 @@ clean: dh_testdir dh_testroot dh_clean + (for mod in $(MODULE_DIRS); do \ + cd $(MOD_SRC_DIR)/$${mod}; \ + rm -rf build/; \ + rm -rf $(MRVL_MODULE_DIR)/; \ + rm -rf *.egg-info/; \ + rm -f *.whl; \ + cd $(MOD_SRC_DIR)/; \ + done) build: (for mod in $(MODULE_DIRS); do \ - cd $(MOD_SRC_DIR)/../$(PRESTERA_MODULE_SRC)/; \ - make clean; \ - make modules -C $(KERNEL_SRC)/build M=`pwd` CONFIG_KM_MVPCI=y CONFIG_KM_MVINT=y || exit 1; \ - mkdir $(MOD_SRC_DIR)/$${mod}/$(MRVL_MODULE_DIR); \ - cp *.ko $(MOD_SRC_DIR)/$${mod}/$(MRVL_MODULE_DIR)/; \ + mkdir -p $(MOD_SRC_DIR)/$${mod}/$(MRVL_MODULE_DIR); \ + if [ $$mod = "7215-a1" ] && [ $(CONFIGURED_ARCH) = "arm64" ]; then \ + cp -r $(MOD_SRC_DIR)/../$(PRESTERA_MODULE_PREFIX)/* $(MOD_SRC_DIR)/$${mod}/$(MRVL_MODULE_DIR)/; \ + cd $(MOD_SRC_DIR)/$${mod}/$(MRVL_MODULE_DIR)/$(PRESTERA_MODULE_SRC); \ + make clean; \ + make modules -C $(KERNEL_SRC)/build M=`pwd` CONFIG_KM_MVPCI=y CONFIG_KM_MVINT=y || exit 1; \ + cd $(MOD_SRC_DIR); \ + make modules -C $(KERNEL_SRC)/build M=$(MOD_SRC_DIR)/$${mod}/modules || exit 1; \ + elif [ $$mod = "7215" ] && [ $(CONFIGURED_ARCH) = "armhf" ]; then \ + cp -r $(MOD_SRC_DIR)/../$(PRESTERA_MODULE_PREFIX_ARMHF)/* $(MOD_SRC_DIR)/$${mod}/$(MRVL_MODULE_DIR)/; \ + cd $(MOD_SRC_DIR)/$${mod}/$(MRVL_MODULE_DIR)/$(PRESTERA_MODULE_SRC); \ + make clean; \ + make modules -C $(KERNEL_SRC)/build M=`pwd` CONFIG_KM_MVPCI=y CONFIG_KM_MVDMA=y CONFIG_KM_MVINT=y || exit 1; \ + fi; \ + cd $(MOD_SRC_DIR)/$${mod}; \ + python3 setup.py build; \ + python3 setup.py bdist_wheel -d $(MOD_SRC_DIR)/$${mod}; \ cd $(MOD_SRC_DIR); \ - make modules -C $(KERNEL_SRC)/build M=$(MOD_SRC_DIR)/$${mod}/modules || exit 1; \ - python3 $${mod}/setup.py bdist_wheel -d $(MOD_SRC_DIR)/$${mod}; \ done) binary: binary-arch binary-indep @@ -59,9 +79,11 @@ binary-indep: dh_installdirs -p$(PACKAGE_PRE_NAME)-$${mod} /lib/systemd/system; \ cp $(MOD_SRC_DIR)/$${mod}/$(SERVICE_DIR)/*.service debian/$(PACKAGE_PRE_NAME)-$${mod}/lib/systemd/system/; \ cp $(MOD_SRC_DIR)/$${mod}/$(UTILS_DIR)/* debian/$(PACKAGE_PRE_NAME)-$${mod}/usr/local/bin/; \ - cp $(MOD_SRC_DIR)/$${mod}/$(MRVL_MODULE_DIR)/mvcpss.ko debian/$(PACKAGE_PRE_NAME)-$${mod}/$(KERNEL_SRC)/$(INSTALL_MOD_DIR); \ + cp $(MOD_SRC_DIR)/$${mod}/$(MRVL_MODULE_DIR)/$(PRESTERA_MODULE_SRC)/mvcpss.ko debian/$(PACKAGE_PRE_NAME)-$${mod}/$(KERNEL_SRC)/$(INSTALL_MOD_DIR); \ cp $(MOD_SRC_DIR)/$${mod}/$(MODULE_DIR)/*.ko debian/$(PACKAGE_PRE_NAME)-$${mod}/$(KERNEL_SRC)/$(INSTALL_MOD_DIR); \ - python3 $${mod}/setup.py install --root=$(MOD_SRC_DIR)/debian/$(PACKAGE_PRE_NAME)-$${mod} --install-layout=deb; \ + cd $(MOD_SRC_DIR)/$${mod}; \ + python3 setup.py install --root=$(MOD_SRC_DIR)/debian/$(PACKAGE_PRE_NAME)-$${mod} --install-layout=deb; \ + cd $(MOD_SRC_DIR); \ done) # Resuming debhelper scripts diff --git a/platform/marvell/sonic-platform-nokia/debian/sonic-platform-nokia-7215-a1.install b/platform/marvell/sonic-platform-nokia/debian/sonic-platform-nokia-7215-a1.install new file mode 100644 index 000000000000..dc35c1385b18 --- /dev/null +++ b/platform/marvell/sonic-platform-nokia/debian/sonic-platform-nokia-7215-a1.install @@ -0,0 +1,6 @@ +7215-a1/scripts/nokia-7215-init.sh usr/local/bin +7215-a1/scripts/cpu_wdt.py usr/local/bin +7215-a1/service/nokia-7215init.service etc/systemd/system +7215-a1/service/cpu_wdt.service etc/systemd/system +7215-a1/sonic_platform-1.0-py3-none-any.whl usr/share/sonic/device/arm64-nokia_ixs7215_52xb-r0 +../mrvl-prestera/platform/arm64/ac5x/* / diff --git a/platform/marvell-arm64/sonic-platform-nokia/debian/sonic-platform-nokia-7215.postinst b/platform/marvell/sonic-platform-nokia/debian/sonic-platform-nokia-7215-a1.postinst similarity index 100% rename from platform/marvell-arm64/sonic-platform-nokia/debian/sonic-platform-nokia-7215.postinst rename to platform/marvell/sonic-platform-nokia/debian/sonic-platform-nokia-7215-a1.postinst diff --git a/platform/marvell-armhf/sonic-platform-nokia/debian/sonic-platform-nokia-7215.install b/platform/marvell/sonic-platform-nokia/debian/sonic-platform-nokia-7215.install similarity index 82% rename from platform/marvell-armhf/sonic-platform-nokia/debian/sonic-platform-nokia-7215.install rename to platform/marvell/sonic-platform-nokia/debian/sonic-platform-nokia-7215.install index bca328306eab..187c1ee4dd79 100644 --- a/platform/marvell-armhf/sonic-platform-nokia/debian/sonic-platform-nokia-7215.install +++ b/platform/marvell/sonic-platform-nokia/debian/sonic-platform-nokia-7215.install @@ -1,8 +1,8 @@ -nokia-7215_plt_setup.sh usr/sbin +7215/scripts/nokia-7215_plt_setup.sh usr/sbin 7215/scripts/nokia-7215init.sh usr/local/bin 7215/scripts/cpu_wdt.py usr/local/bin 7215/service/nokia-7215init.service etc/systemd/system 7215/service/cpu_wdt.service etc/systemd/system 7215/service/fstrim.timer/timer-override.conf /lib/systemd/system/fstrim.timer.d 7215/sonic_platform-1.0-py3-none-any.whl usr/share/sonic/device/armhf-nokia_ixs7215_52x-r0 -inband_mgmt.sh etc/ +7215/scripts/inband_mgmt.sh etc/ diff --git a/platform/marvell-armhf/sonic-platform-nokia/debian/sonic-platform-nokia-7215.postinst b/platform/marvell/sonic-platform-nokia/debian/sonic-platform-nokia-7215.postinst similarity index 89% rename from platform/marvell-armhf/sonic-platform-nokia/debian/sonic-platform-nokia-7215.postinst rename to platform/marvell/sonic-platform-nokia/debian/sonic-platform-nokia-7215.postinst index 76d40865a0ac..9dfcc91de046 100644 --- a/platform/marvell-armhf/sonic-platform-nokia/debian/sonic-platform-nokia-7215.postinst +++ b/platform/marvell/sonic-platform-nokia/debian/sonic-platform-nokia-7215.postinst @@ -4,6 +4,8 @@ # see: dh_installdeb(1) sh /usr/sbin/nokia-7215_plt_setup.sh +depmod -a +systemctl restart kmod systemctl enable nokia-7215init.service systemctl start nokia-7215init.service diff --git a/platform/marvell-arm64/sonic_fit.its b/platform/marvell/sonic_fit.its similarity index 100% rename from platform/marvell-arm64/sonic_fit.its rename to platform/marvell/sonic_fit.its