diff --git a/README.md b/README.md index 37406f0d67d..fad301935ed 100644 --- a/README.md +++ b/README.md @@ -211,7 +211,6 @@ The supported ASIC vendors are: * PLATFORM=broadcom * PLATFORM=marvell * PLATFORM=mellanox -* PLATFORM=cavium * PLATFORM=centec * PLATFORM=nephos * PLATFORM=nvidia-bluefield diff --git a/device/accton/x86_64-accton_as7512_32x-r0/AS7512-C32/port_config.ini b/device/accton/x86_64-accton_as7512_32x-r0/AS7512-C32/port_config.ini deleted file mode 100644 index c10cd278694..00000000000 --- a/device/accton/x86_64-accton_as7512_32x-r0/AS7512-C32/port_config.ini +++ /dev/null @@ -1,33 +0,0 @@ -# name lanes -Ethernet0 16,17,18,19 -Ethernet4 20,21,22,23 -Ethernet8 24,25,26,27 -Ethernet12 28,29,30,31 -Ethernet16 32,33,34,35 -Ethernet20 36,37,38,39 -Ethernet24 40,41,42,43 -Ethernet28 44,45,46,47 -Ethernet32 0,1,2,3 -Ethernet36 4,5,6,7 -Ethernet40 8,9,10,11 -Ethernet44 12,13,14,15 -Ethernet48 48,49,50,51 -Ethernet52 52,53,54,55 -Ethernet56 56,57,58,59 -Ethernet60 60,61,62,63 -Ethernet64 127,126,125,124 -Ethernet68 123,122,121,120 -Ethernet72 115,114,113,112 -Ethernet76 119,118,117,116 -Ethernet80 79,78,77,76 -Ethernet84 75,74,73,72 -Ethernet88 64,65,66,67 -Ethernet92 71,70,68,69 -Ethernet96 111,110,109,108 -Ethernet100 107,106,105,104 -Ethernet104 103,102,101,100 -Ethernet108 99,98,97,96 -Ethernet112 95,94,93,92 -Ethernet116 91,90,89,88 -Ethernet120 87,86,85,84 -Ethernet124 83,82,81,80 diff --git a/device/accton/x86_64-accton_as7512_32x-r0/AS7512-C32/sai.profile b/device/accton/x86_64-accton_as7512_32x-r0/AS7512-C32/sai.profile deleted file mode 100644 index 457c339c58a..00000000000 --- a/device/accton/x86_64-accton_as7512_32x-r0/AS7512-C32/sai.profile +++ /dev/null @@ -1,2 +0,0 @@ -mode=3 -hwId=as7512 diff --git a/device/accton/x86_64-accton_as7512_32x-r0/AS7512-S128/port_config.ini b/device/accton/x86_64-accton_as7512_32x-r0/AS7512-S128/port_config.ini deleted file mode 100644 index c3b66995040..00000000000 --- a/device/accton/x86_64-accton_as7512_32x-r0/AS7512-S128/port_config.ini +++ /dev/null @@ -1,129 +0,0 @@ -# name lanes -Ethernet1 0 -Ethernet2 1 -Ethernet3 2 -Ethernet4 3 -Ethernet5 4 -Ethernet6 5 -Ethernet7 6 -Ethernet8 7 -Ethernet9 8 -Ethernet10 9 -Ethernet11 10 -Ethernet12 11 -Ethernet13 12 -Ethernet14 13 -Ethernet15 14 -Ethernet16 15 -Ethernet17 16 -Ethernet18 17 -Ethernet19 18 -Ethernet20 19 -Ethernet21 20 -Ethernet22 21 -Ethernet23 22 -Ethernet24 23 -Ethernet25 24 -Ethernet26 25 -Ethernet27 26 -Ethernet28 27 -Ethernet29 28 -Ethernet30 29 -Ethernet31 30 -Ethernet32 31 -Ethernet33 32 -Ethernet34 33 -Ethernet35 34 -Ethernet36 35 -Ethernet37 36 -Ethernet38 37 -Ethernet39 38 -Ethernet40 39 -Ethernet41 40 -Ethernet42 41 -Ethernet43 42 -Ethernet44 43 -Ethernet45 44 -Ethernet46 45 -Ethernet47 46 -Ethernet48 47 -Ethernet49 48 -Ethernet50 49 -Ethernet51 50 -Ethernet52 51 -Ethernet53 52 -Ethernet54 53 -Ethernet55 54 -Ethernet56 55 -Ethernet57 56 -Ethernet58 57 -Ethernet59 58 -Ethernet60 59 -Ethernet61 60 -Ethernet62 61 -Ethernet63 62 -Ethernet64 63 -Ethernet65 64 -Ethernet66 65 -Ethernet67 66 -Ethernet68 67 -Ethernet69 68 -Ethernet70 69 -Ethernet71 70 -Ethernet72 71 -Ethernet73 72 -Ethernet74 73 -Ethernet75 74 -Ethernet76 75 -Ethernet77 76 -Ethernet78 77 -Ethernet79 78 -Ethernet80 79 -Ethernet81 80 -Ethernet82 81 -Ethernet83 82 -Ethernet84 83 -Ethernet85 84 -Ethernet86 85 -Ethernet87 86 -Ethernet88 87 -Ethernet89 88 -Ethernet90 89 -Ethernet91 90 -Ethernet92 91 -Ethernet93 92 -Ethernet94 93 -Ethernet95 94 -Ethernet96 95 -Ethernet97 96 -Ethernet98 97 -Ethernet99 98 -Ethernet100 99 -Ethernet101 100 -Ethernet102 101 -Ethernet103 102 -Ethernet104 103 -Ethernet105 104 -Ethernet106 105 -Ethernet107 106 -Ethernet108 107 -Ethernet109 108 -Ethernet110 109 -Ethernet111 110 -Ethernet112 111 -Ethernet113 112 -Ethernet114 113 -Ethernet115 114 -Ethernet116 115 -Ethernet117 116 -Ethernet118 117 -Ethernet119 118 -Ethernet120 119 -Ethernet121 120 -Ethernet122 121 -Ethernet123 122 -Ethernet124 123 -Ethernet125 124 -Ethernet126 125 -Ethernet127 126 -Ethernet128 127 diff --git a/device/accton/x86_64-accton_as7512_32x-r0/AS7512-S128/sai.profile b/device/accton/x86_64-accton_as7512_32x-r0/AS7512-S128/sai.profile deleted file mode 100644 index 471c4395758..00000000000 --- a/device/accton/x86_64-accton_as7512_32x-r0/AS7512-S128/sai.profile +++ /dev/null @@ -1,2 +0,0 @@ -mode=0 -hwId=as7512 diff --git a/device/accton/x86_64-accton_as7512_32x-r0/AS7512/port_config.ini b/device/accton/x86_64-accton_as7512_32x-r0/AS7512/port_config.ini deleted file mode 100644 index c10cd278694..00000000000 --- a/device/accton/x86_64-accton_as7512_32x-r0/AS7512/port_config.ini +++ /dev/null @@ -1,33 +0,0 @@ -# name lanes -Ethernet0 16,17,18,19 -Ethernet4 20,21,22,23 -Ethernet8 24,25,26,27 -Ethernet12 28,29,30,31 -Ethernet16 32,33,34,35 -Ethernet20 36,37,38,39 -Ethernet24 40,41,42,43 -Ethernet28 44,45,46,47 -Ethernet32 0,1,2,3 -Ethernet36 4,5,6,7 -Ethernet40 8,9,10,11 -Ethernet44 12,13,14,15 -Ethernet48 48,49,50,51 -Ethernet52 52,53,54,55 -Ethernet56 56,57,58,59 -Ethernet60 60,61,62,63 -Ethernet64 127,126,125,124 -Ethernet68 123,122,121,120 -Ethernet72 115,114,113,112 -Ethernet76 119,118,117,116 -Ethernet80 79,78,77,76 -Ethernet84 75,74,73,72 -Ethernet88 64,65,66,67 -Ethernet92 71,70,68,69 -Ethernet96 111,110,109,108 -Ethernet100 107,106,105,104 -Ethernet104 103,102,101,100 -Ethernet108 99,98,97,96 -Ethernet112 95,94,93,92 -Ethernet116 91,90,89,88 -Ethernet120 87,86,85,84 -Ethernet124 83,82,81,80 diff --git a/device/accton/x86_64-accton_as7512_32x-r0/AS7512/sai.profile b/device/accton/x86_64-accton_as7512_32x-r0/AS7512/sai.profile deleted file mode 100644 index 017996f7d7c..00000000000 --- a/device/accton/x86_64-accton_as7512_32x-r0/AS7512/sai.profile +++ /dev/null @@ -1,2 +0,0 @@ -mode=1 -hwId=as7512 diff --git a/device/accton/x86_64-accton_as7512_32x-r0/default_sku b/device/accton/x86_64-accton_as7512_32x-r0/default_sku deleted file mode 100644 index 45eb53f68a9..00000000000 --- a/device/accton/x86_64-accton_as7512_32x-r0/default_sku +++ /dev/null @@ -1 +0,0 @@ -AS7512 t1 diff --git a/device/accton/x86_64-accton_as7512_32x-r0/fancontrol b/device/accton/x86_64-accton_as7512_32x-r0/fancontrol deleted file mode 100644 index c80163771e8..00000000000 --- a/device/accton/x86_64-accton_as7512_32x-r0/fancontrol +++ /dev/null @@ -1,7 +0,0 @@ -INTERVAL=10 -FCTEMPS=/sys/bus/i2c/devices/2-0066/fan_pwm=/sys/bus/i2c/devices/3-004b/hwmon/hwmon[[:print:]]*/temp1_input /sys/bus/i2c/devices/2-0066/fan_pwm=/sys/bus/i2c/devices/3-004a/hwmon/hwmon[[:print:]]*/temp1_input -FCFANS=/sys/bus/i2c/devices/2-0066/fan_pwm=/sys/bus/i2c/devices/2-0066/fan1_front_speed_rpm /sys/bus/i2c/devices/2-0066/fan_pwm=/sys/bus/i2c/devices/2-0066/fan2_front_speed_rpm /sys/bus/i2c/devices/2-0066/fan_pwm=/sys/bus/i2c/devices/2-0066/fan3_front_speed_rpm /sys/bus/i2c/devices/2-0066/fan_pwm=/sys/bus/i2c/devices/2-0066/fan4_front_speed_rpm /sys/bus/i2c/devices/2-0066/fan_pwm=/sys/bus/i2c/devices/2-0066/fan5_front_speed_rpm /sys/bus/i2c/devices/2-0066/fan_pwm=/sys/bus/i2c/devices/2-0066/fan6_front_speed_rpm -MINTEMP=/sys/bus/i2c/devices/2-0066/fan_pwm=20 -MAXTEMP=/sys/bus/i2c/devices/2-0066/fan_pwm=60 -MINSTART=/sys/bus/i2c/devices/2-0066/fan_pwm=150 -MINSTOP=/sys/bus/i2c/devices/2-0066/fan_pwm=7 diff --git a/device/accton/x86_64-accton_as7512_32x-r0/installer.conf b/device/accton/x86_64-accton_as7512_32x-r0/installer.conf deleted file mode 100644 index 14404194ef5..00000000000 --- a/device/accton/x86_64-accton_as7512_32x-r0/installer.conf +++ /dev/null @@ -1,3 +0,0 @@ -CONSOLE_PORT=0x2f8 -CONSOLE_DEV=1 -CONSOLE_SPEED=115200 diff --git a/device/accton/x86_64-accton_as7512_32x-r0/platform_asic b/device/accton/x86_64-accton_as7512_32x-r0/platform_asic deleted file mode 100644 index 9f633e3d176..00000000000 --- a/device/accton/x86_64-accton_as7512_32x-r0/platform_asic +++ /dev/null @@ -1 +0,0 @@ -cavium diff --git a/device/accton/x86_64-accton_as7512_32x-r0/plugins/eeprom.py b/device/accton/x86_64-accton_as7512_32x-r0/plugins/eeprom.py deleted file mode 100644 index f2f0703f0a1..00000000000 --- a/device/accton/x86_64-accton_as7512_32x-r0/plugins/eeprom.py +++ /dev/null @@ -1,30 +0,0 @@ -############################################################################# -# Cavium -# -# Platform and model specific eeprom subclass, inherits from the base class, -# and provides the followings: -# - the eeprom format definition -# - specific encoder/decoder if there is special need -############################################################################# - -try: - import binascii - import time - import optparse - import warnings - import os - import sys - from sonic_eeprom import eeprom_base - from sonic_eeprom import eeprom_tlvinfo - import subprocess -except ImportError as e: - raise ImportError(str(e) + "- required module not found") - - -class board(eeprom_tlvinfo.TlvInfoDecoder): - - _TLV_INFO_MAX_LEN = 256 - - def __init__(self, name, path, cpld_root, ro): - self.eeprom_path = "/sys/bus/i2c/devices/1-0057/eeprom" - super(board, self).__init__(self.eeprom_path, 0, '', True) diff --git a/device/accton/x86_64-accton_as7512_32x-r0/plugins/sfputil.py b/device/accton/x86_64-accton_as7512_32x-r0/plugins/sfputil.py deleted file mode 100644 index a999ecc2409..00000000000 --- a/device/accton/x86_64-accton_as7512_32x-r0/plugins/sfputil.py +++ /dev/null @@ -1,136 +0,0 @@ -#! /usr/bin/python - -try: - import time - import string - from ctypes import create_string_buffer - from sonic_sfp.sfputilbase import SfpUtilBase -except ImportError as e: - raise ImportError(str(e) + "- required module not found") - - -class SfpUtil(SfpUtilBase): - """Platform specific sfputil class""" - - _port_start = 0 - _port_end = 31 - ports_in_block = 32 - - _port_to_eeprom_mapping = {} - - _qsfp_ports = list(range(0, ports_in_block + 1)) - - def __init__(self): - # Override port_to_eeprom_mapping for class initialization - eeprom_path = '/sys/bus/i2c/devices/{0}-0050/sfp_eeprom' - for x in range(self.port_start, self.port_end + 1): - self._port_to_eeprom_mapping[x] = eeprom_path.format(x + 18) - SfpUtilBase.__init__(self) - - def reset(self, port_num): - raise NotImplementedError - - def get_presence(self, port_num): - # Check for invalid port_num - if port_num < self._port_start or port_num > self._port_end: - return False - - path = "/sys/bus/i2c/devices/{0}-0050/sfp_is_present" - port_ps = path.format(port_num+18) - - reg_value = '0' - try: - reg_file = open(port_ps) - reg_value = reg_file.readline().rstrip() - reg_file.close() - except IOError as e: - print("Error: unable to access file: %s" % str(e)) - return False - - if reg_value == '1': - return True - - return False - - @property - def port_start(self): - return self._port_start - - @property - def port_end(self): - return self._port_end - - @property - def qsfp_ports(self): - return list(range(0, self.ports_in_block + 1)) - - @property - def port_to_eeprom_mapping(self): - return self._port_to_eeprom_mapping - - def get_transceiver_change_event(self): - """ - TODO: This function need to be implemented - when decide to support monitoring SFP(Xcvrd) - on this platform. - """ - raise NotImplementedError - - def get_low_power_mode(self, port_num): - # Check for invalid port_num - if port_num < self._port_start or port_num > self._port_end: - return False - - try: - eeprom = None - - if not self.get_presence(port_num): - return False - - eeprom = open(self.port_to_eeprom_mapping[port_num], "rb") - eeprom.seek(93) - lpmode = ord(eeprom.read(1)) - - if ((lpmode & 0x3) == 0x3): - return True # Low Power Mode if "Power override" bit is 1 and "Power set" bit is 1 - else: - # High Power Mode if one of the following conditions is matched: - # 1. "Power override" bit is 0 - # 2. "Power override" bit is 1 and "Power set" bit is 0 - return False - except IOError as e: - print("Error: unable to open file: %s" % str(e)) - return False - finally: - if eeprom is not None: - eeprom.close() - time.sleep(0.01) - - def set_low_power_mode(self, port_num, lpmode): - # Check for invalid port_num - if port_num < self._port_start or port_num > self._port_end: - return False - - try: - eeprom = None - - if not self.get_presence(port_num): - return False # Port is not present, unable to set the eeprom - - # Fill in write buffer - regval = 0x3 if lpmode else 0x1 # 0x3:Low Power Mode, 0x1:High Power Mode - buffer = create_string_buffer(1) - buffer[0] = chr(regval) - - # Write to eeprom - eeprom = open(self.port_to_eeprom_mapping[port_num], "r+b") - eeprom.seek(93) - eeprom.write(buffer[0]) - return True - except IOError as e: - print("Error: unable to open file: %s" % str(e)) - return False - finally: - if eeprom is not None: - eeprom.close() - time.sleep(0.01) diff --git a/device/accton/x86_64-accton_as7512_32x-r0/pmon_daemon_control.json b/device/accton/x86_64-accton_as7512_32x-r0/pmon_daemon_control.json deleted file mode 100644 index 584a14b9d94..00000000000 --- a/device/accton/x86_64-accton_as7512_32x-r0/pmon_daemon_control.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "skip_ledd": true, - "skip_thermalctld": true -} - diff --git a/dockers/docker-orchagent/orchagent.sh b/dockers/docker-orchagent/orchagent.sh index 4889597dd70..cd84893e377 100755 --- a/dockers/docker-orchagent/orchagent.sh +++ b/dockers/docker-orchagent/orchagent.sh @@ -51,8 +51,6 @@ fi # Add platform specific arguments if necessary if [ "$platform" == "broadcom" ]; then ORCHAGENT_ARGS+="-m $MAC_ADDRESS" -elif [ "$platform" == "cavium" ]; then - ORCHAGENT_ARGS+="-m $MAC_ADDRESS" elif [ "$platform" == "nephos" ]; then ORCHAGENT_ARGS+="-m $MAC_ADDRESS" elif [ "$platform" == "centec" ]; then diff --git a/dockers/docker-pde/syncd_init_common.sh b/dockers/docker-pde/syncd_init_common.sh index 7a28d7208f0..762242b659c 100755 --- a/dockers/docker-pde/syncd_init_common.sh +++ b/dockers/docker-pde/syncd_init_common.sh @@ -153,18 +153,6 @@ config_syncd_centec() [ -e /dev/net/tun ] || ( mkdir -p /dev/net && mknod /dev/net/tun c 10 200 ) } -config_syncd_cavium() -{ - CMD_ARGS+=" -p $HWSKU_DIR/sai.profile -d" - - export XP_ROOT=/usr/bin/ - - # Wait until redis-server starts - until [ $(sonic-db-cli PING | grep -c PONG) -gt 0 ]; do - sleep 1 - done -} - config_syncd_marvell() { CMD_ARGS+=" -p $HWSKU_DIR/sai.profile" @@ -224,8 +212,6 @@ config_syncd() config_syncd_bcm elif [ "$SONIC_ASIC_TYPE" == "mellanox" ]; then config_syncd_mlnx - elif [ "$SONIC_ASIC_TYPE" == "cavium" ]; then - config_syncd_cavium elif [ "$SONIC_ASIC_TYPE" == "centec" ]; then config_syncd_centec elif [ "$SONIC_ASIC_TYPE" == "marvell" ]; then diff --git a/files/scripts/syncd.sh b/files/scripts/syncd.sh index 562af4fd2c3..3c59b168f0e 100755 --- a/files/scripts/syncd.sh +++ b/files/scripts/syncd.sh @@ -64,12 +64,6 @@ function startplatform() { fi fi - if [[ x"$WARM_BOOT" != x"true" ]]; then - if [ x$sonic_asic_platform == x'cavium' ]; then - /etc/init.d/xpnet.sh start - fi - fi - if [[ x"$sonic_asic_platform" == x"nvidia-bluefield" ]]; then /usr/bin/bfnet.sh start if [[ $? != "0" ]]; then @@ -140,9 +134,6 @@ function stopplatform2() { if [ x$sonic_asic_platform == x'mellanox' ]; then /etc/init.d/sxdkernel stop /usr/bin/mst stop - elif [ x$sonic_asic_platform == x'cavium' ]; then - /etc/init.d/xpnet.sh stop - /etc/init.d/xpnet.sh start elif [ x"$sonic_asic_platform" == x"nvidia-bluefield" ]; then /usr/bin/bfnet.sh stop fi diff --git a/platform/cavium/cavm-platform-modules.mk b/platform/cavium/cavm-platform-modules.mk deleted file mode 100644 index 4ac72a4c4aa..00000000000 --- a/platform/cavium/cavm-platform-modules.mk +++ /dev/null @@ -1,3 +0,0 @@ -CAVM_PLATFORM_DEB = cavm_platform_modules.deb -$(CAVM_PLATFORM_DEB)_SRC_PATH = $(PLATFORM_PATH)/cavm_platform_modules -SONIC_MAKE_DEBS += $(CAVM_PLATFORM_DEB) diff --git a/platform/cavium/cavm-sai.mk b/platform/cavium/cavm-sai.mk deleted file mode 100644 index 0008135729c..00000000000 --- a/platform/cavium/cavm-sai.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Cavium SAI - -CAVM_SAI_GITHUB = https://github.com/XPliant/OpenXPS/raw/13a7eaf10f523e7887964ca235f19095fcc88537/SAI/cavm-sai/ - -CAVM_LIBSAI = libsai.deb -CAVM_SAI = sai.deb -XP_TOOLS = xp-tools.deb - -$(CAVM_LIBSAI)_URL = $(CAVM_SAI_GITHUB)/$(CAVM_LIBSAI) -$(CAVM_SAI)_URL = $(CAVM_SAI_GITHUB)/$(CAVM_SAI) -$(XP_TOOLS)_URL = $(CAVM_SAI_GITHUB)/$(XP_TOOLS) - -SONIC_ONLINE_DEBS += $(CAVM_LIBSAI) $(CAVM_SAI) $(XP_TOOLS) diff --git a/platform/cavium/cavm-xpnet.mk b/platform/cavium/cavm-xpnet.mk deleted file mode 100644 index ed86558a36a..00000000000 --- a/platform/cavium/cavm-xpnet.mk +++ /dev/null @@ -1,6 +0,0 @@ -CAVM_SAI_URL = https://github.com/XPliant/OpenXPS/raw/c26aea6a7098936ab3692e148238d73fa8962585/SAI - -CAVM_XPNET_DEB = xp80-Pcie-Endpoint.deb -$(CAVM_XPNET_DEB)_URL = $(CAVM_SAI_URL)/netdev/$(CAVM_XPNET_DEB) - -SONIC_ONLINE_DEBS += $(CAVM_XPNET_DEB) diff --git a/platform/cavium/cavm_platform_modules/DEBIAN/changelog b/platform/cavium/cavm_platform_modules/DEBIAN/changelog deleted file mode 100644 index b138dba2628..00000000000 --- a/platform/cavium/cavm_platform_modules/DEBIAN/changelog +++ /dev/null @@ -1,6 +0,0 @@ - -cavm-platform-modules (1.0) unstable; urgency=low - - * Initial release - --- Nadiya.Stetskovych@cavium.com Thu, 12 Jan 2017 19:24:41 +0200 diff --git a/platform/cavium/cavm_platform_modules/DEBIAN/control b/platform/cavium/cavm_platform_modules/DEBIAN/control deleted file mode 100755 index 6a665e88c71..00000000000 --- a/platform/cavium/cavm_platform_modules/DEBIAN/control +++ /dev/null @@ -1,6 +0,0 @@ -Package: cavm-platform-modules -Version: 1.0 -Architecture: amd64 -Depends: linux-image-4.19.0-12-2-amd64-unsigned -Maintainer: Nadiya.Stetskovych@cavium.com -Description: kernel modules for platform devices such as fan, led, sfp diff --git a/platform/cavium/cavm_platform_modules/Makefile b/platform/cavium/cavm_platform_modules/Makefile deleted file mode 100644 index aeb274aa5a4..00000000000 --- a/platform/cavium/cavm_platform_modules/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -.ONESHELL: -SHELL = /bin/bash -.SHELLFLAGS += -e - -MAIN_TARGET = cavm_platform_modules.deb -DEB_BUILD_DIR = cavm-platform-modules-deb -SCRIPT_SRC = $(DEB_BUILD_DIR)/ -SYSTEMD_DIR = /etc/systemd/system - -$(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% : - # get sources - rm -rf SONiC - git clone https://github.com/edge-core/SONiC.git - - # build - pushd SONiC/AS7512-32X/module/ - - KERNEL_SRC=/lib/modules/$(KVERSION)/build make - popd - mkdir -p $(DEB_BUILD_DIR)/lib/modules/$(KVERSION) - mkdir -p $(DEB_BUILD_DIR)/usr/bin - mkdir -p $(DEB_BUILD_DIR)$(SYSTEMD_DIR)/multi-user.target.wants/ - - cp SONiC/AS7512-32X/module/*.ko $(DEB_BUILD_DIR)/lib/modules/$(KVERSION) - cp SONiC/AS7512-32X/accton_as7512_util.py $(DEB_BUILD_DIR)/usr/bin - chmod +x $(DEB_BUILD_DIR)/usr/bin/accton_as7512_util.py - cp as7512-platform-init.service $(DEB_BUILD_DIR)$(SYSTEMD_DIR) - ln -s $(SYSTEMD_DIR)/as7512-platform-init.service $(DEB_BUILD_DIR)$(SYSTEMD_DIR)/multi-user.target.wants/as7512-platform-init.service - cp -r DEBIAN $(DEB_BUILD_DIR) - dpkg-deb -b $(DEB_BUILD_DIR) $(MAIN_TARGET) - - mv $(MAIN_TARGET) $(DEST)/ - rm -rf $(DEB_BUILD_DIR) diff --git a/platform/cavium/cavm_platform_modules/as7512-platform-init.service b/platform/cavium/cavm_platform_modules/as7512-platform-init.service deleted file mode 100644 index 69f03c0b2e4..00000000000 --- a/platform/cavium/cavm_platform_modules/as7512-platform-init.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Accton AS7512-32X Platform initialization service -Before=pmon.service -DefaultDependencies=no - -[Service] -Type=oneshot -ExecStart=/usr/bin/accton_as7512_util.py install -ExecStop=/usr/bin/accton_as7512_util.py clean -RemainAfterExit=yes - -[Install] -WantedBy=multi-user.target diff --git a/platform/cavium/cavm_sdk/filelist.txt b/platform/cavium/cavm_sdk/filelist.txt deleted file mode 100644 index bc40295dfbd..00000000000 --- a/platform/cavium/cavm_sdk/filelist.txt +++ /dev/null @@ -1,7 +0,0 @@ -## Get vendor SAI SDK -## https://github.com/Azure/sonic-buildimage/blob/master/README.md#3-get-vendor-sai-sdk - -libsai.deb -sai.deb -xp-tools.deb -xpshell.deb diff --git a/platform/cavium/docker-saiserver-cavm/Dockerfile b/platform/cavium/docker-saiserver-cavm/Dockerfile deleted file mode 100644 index d15b16cbfd4..00000000000 --- a/platform/cavium/docker-saiserver-cavm/Dockerfile +++ /dev/null @@ -1,30 +0,0 @@ -FROM docker-base - -RUN apt-get update \ - && apt-get install -y libsensors4-dev \ - python \ - python-dev - -COPY deps /root/deps - -RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; }; \ - dpkg_apt /root/deps/xp-tools.deb \ - && dpkg_apt /root/deps/libsai.deb \ - && dpkg_apt /root/deps/sai.deb \ - && dpkg_apt /root/deps/libthrift-0.9.3_*.deb \ - && dpkg_apt /root/deps/libnl-3-200_*.deb \ - && dpkg_apt /root/deps/libnl-genl-3-200_*.deb \ - && dpkg_apt /root/deps/libnl-route-3-200_*.deb - - -COPY ["deps/saiserver", "start.sh", "/usr/bin/"] - -COPY ["supervisord.conf", "/etc/supervisor/conf.d/"] - -COPY ["portmap.ini", "profile.ini", "/etc/sai/"] - -## Clean up -RUN apt-get clean -y; apt-get autoclean -y; apt-get autoremove -y -RUN rm -rf deps - -ENTRYPOINT ["/usr/local/bin/supervisord"] diff --git a/platform/cavium/docker-saiserver-cavm/portmap.ini b/platform/cavium/docker-saiserver-cavm/portmap.ini deleted file mode 100644 index c35776dcfcc..00000000000 --- a/platform/cavium/docker-saiserver-cavm/portmap.ini +++ /dev/null @@ -1,33 +0,0 @@ -# alias lanes -Ethernet0 16,17,18,19 -Ethernet4 20,21,22,23 -Ethernet8 24,25,26,27 -Ethernet12 28,29,30,31 -Ethernet16 32,33,34,35 -Ethernet20 36,37,38,39 -Ethernet24 40,41,42,43 -Ethernet28 44,45,46,47 -Ethernet32 0,1,2,3 -Ethernet36 4,5,6,7 -Ethernet40 8,9,10,11 -Ethernet44 12,13,14,15 -Ethernet48 48,49,50,51 -Ethernet52 52,53,54,55 -Ethernet56 56,57,58,59 -Ethernet60 60,61,62,63 -Ethernet64 127,126,125,124 -Ethernet68 123,122,121,120 -Ethernet72 115,114,113,112 -Ethernet76 119,118,117,116 -Ethernet80 79,78,77,76 -Ethernet84 75,74,73,72 -Ethernet88 64,65,66,67 -Ethernet92 71,70,68,69 -Ethernet96 111,110,109,108 -Ethernet100 107,106,105,104 -Ethernet104 103,102,101,100 -Ethernet108 99,98,97,96 -Ethernet112 95,94,93,92 -Ethernet116 91,90,89,88 -Ethernet120 87,86,85,84 -Ethernet124 83,82,81,80 diff --git a/platform/cavium/docker-saiserver-cavm/profile.ini b/platform/cavium/docker-saiserver-cavm/profile.ini deleted file mode 100644 index 2b85ae77ebe..00000000000 --- a/platform/cavium/docker-saiserver-cavm/profile.ini +++ /dev/null @@ -1,4 +0,0 @@ -#SKU_128X10 -mode=0 - -hwId=as7512 diff --git a/platform/cavium/docker-saiserver-cavm/start.sh b/platform/cavium/docker-saiserver-cavm/start.sh deleted file mode 100755 index 09cc0ddb541..00000000000 --- a/platform/cavium/docker-saiserver-cavm/start.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -rm -f /var/run/rsyslogd.pid - -supervisorctl start rsyslogd - -supervisorctl start saiserver diff --git a/platform/cavium/docker-saiserver-cavm/supervisord.conf b/platform/cavium/docker-saiserver-cavm/supervisord.conf deleted file mode 100644 index d8fef1c012f..00000000000 --- a/platform/cavium/docker-saiserver-cavm/supervisord.conf +++ /dev/null @@ -1,34 +0,0 @@ -[supervisord] -logfile_maxbytes=1MB -logfile_backups=2 -nodaemon=true - -[program:start.sh] -command=/usr/bin/start.sh -priority=1 -autostart=true -autorestart=false -stdout_logfile=NONE -stdout_syslog=true -stderr_logfile=NONE -stderr_syslog=true - -[program:rsyslogd] -command=/usr/sbin/rsyslogd -n -priority=2 -autostart=false -autorestart=false -stdout_logfile=NONE -stdout_syslog=true -stderr_logfile=NONE -stderr_syslog=true - -[program:saiserver] -command=/usr/bin/saiserver -p /etc/sai/profile.ini -f /etc/sai/portmap.ini -priority=3 -autostart=false -autorestart=false -stdout_logfile=NONE -stdout_syslog=true -stderr_logfile=NONE -stderr_syslog=true diff --git a/platform/cavium/docker-syncd-cavm-rpc.mk b/platform/cavium/docker-syncd-cavm-rpc.mk deleted file mode 100644 index b6add442469..00000000000 --- a/platform/cavium/docker-syncd-cavm-rpc.mk +++ /dev/null @@ -1,24 +0,0 @@ -# docker image for cavium syncd with rpc - -DOCKER_SYNCD_CAVM_RPC = docker-syncd-cavm-rpc.gz -$(DOCKER_SYNCD_CAVM_RPC)_PATH = $(PLATFORM_PATH)/docker-syncd-cavm-rpc -$(DOCKER_SYNCD_CAVM_RPC)_DEPENDS += $(SYNCD_RPC) $(LIBTHRIFT) $(CAVM_LIBSAI) $(XP_TOOLS) $(PTF) -$(DOCKER_SYNCD_CAVM_RPC)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT) -ifeq ($(INSTALL_DEBUG_TOOLS), y) -$(DOCKER_SYNCD_CAVM_RPC)_DEPENDS += $(SYNCD_RPC_DBG) \ - $(LIBSWSSCOMMON_DBG) \ - $(LIBSAIMETADATA_DBG) \ - $(LIBSAIREDIS_DBG) -endif -$(DOCKER_SYNCD_CAVM_RPC)_LOAD_DOCKERS += $(DOCKER_SYNCD_CAVM) -SONIC_DOCKER_IMAGES += $(DOCKER_SYNCD_CAVM_RPC) -ifeq ($(ENABLE_SYNCD_RPC),y) -SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_SYNCD_CAVM_RPC) -endif - -$(DOCKER_SYNCD_CAVM_RPC)_CONTAINER_NAME = syncd -$(DOCKER_SYNCD_CAVM_RPC)_VERSION = 1.0.0+rpc -$(DOCKER_SYNCD_CAVM_RPC)_PACKAGE_NAME = syncd -$(DOCKER_SYNCD_CAVM_RPC)_RUN_OPT += --privileged -t -$(DOCKER_SYNCD_CAVM_RPC)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf -$(DOCKER_SYNCD_CAVM_RPC)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro diff --git a/platform/cavium/docker-syncd-cavm-rpc/Dockerfile.j2 b/platform/cavium/docker-syncd-cavm-rpc/Dockerfile.j2 deleted file mode 100644 index 3c962f5da98..00000000000 --- a/platform/cavium/docker-syncd-cavm-rpc/Dockerfile.j2 +++ /dev/null @@ -1,55 +0,0 @@ -FROM docker-syncd-cavm-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}} - -## Make apt-get non-interactive -ENV DEBIAN_FRONTEND=noninteractive - -COPY \ -{% for deb in docker_syncd_cavm_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 \ - python-pip \ - build-essential \ - libssl-dev \ - libffi-dev \ - python-dev \ - wget \ - cmake \ - libqt5core5a \ - libqt5network5 \ - libboost-atomic1.71.0 - -RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; } ; \ -{% for deb in docker_syncd_cavm_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 \ - && pip install cffi==1.7.0 \ - && pip install --upgrade cffi==1.7.0 \ - && pip install nnpy \ - && mkdir -p /opt \ - && cd /opt \ - && wget https://raw.githubusercontent.com/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/cavium/docker-syncd-cavm-rpc/ptf_nn_agent.conf b/platform/cavium/docker-syncd-cavm-rpc/ptf_nn_agent.conf deleted file mode 100644 index fa1ed0eb162..00000000000 --- a/platform/cavium/docker-syncd-cavm-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/cavium/docker-syncd-cavm.mk b/platform/cavium/docker-syncd-cavm.mk deleted file mode 100644 index d0a8b0b14b4..00000000000 --- a/platform/cavium/docker-syncd-cavm.mk +++ /dev/null @@ -1,25 +0,0 @@ -# docker image for cavium syncd - -DOCKER_SYNCD_CAVM = docker-syncd-cavm.gz -$(DOCKER_SYNCD_CAVM)_PATH = $(PLATFORM_PATH)/docker-syncd-cavm -$(DOCKER_SYNCD_CAVM)_DEPENDS += $(SYNCD) $(CAVM_LIBSAI) $(XP_TOOLS) -$(DOCKER_SYNCD_CAVM)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT) -ifeq ($(INSTALL_DEBUG_TOOLS), y) -$(DOCKER_SYNCD_CAVM)_DEPENDS += $(SYNCD_DBG) \ - $(LIBSWSSCOMMON_DBG) \ - $(LIBSAIMETADATA_DBG) \ - $(LIBSAIREDIS_DBG) -endif -$(DOCKER_SYNCD_CAVM)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE) -SONIC_DOCKER_IMAGES += $(DOCKER_SYNCD_CAVM) -ifneq ($(ENABLE_SYNCD_RPC),y) -SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_SYNCD_CAVM) -endif - -$(DOCKER_SYNCD_BASE)_VERSION = 1.0.0 -$(DOCKER_SYNCD_BASE)_PACKAGE_NAME = syncd - -$(DOCKER_SYNCD_CAVM)_CONTAINER_NAME = syncd -$(DOCKER_SYNCD_CAVM)_RUN_OPT += --privileged -t -$(DOCKER_SYNCD_CAVM)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf -$(DOCKER_SYNCD_CAVM)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro diff --git a/platform/cavium/docker-syncd-cavm/Dockerfile.j2 b/platform/cavium/docker-syncd-cavm/Dockerfile.j2 deleted file mode 100755 index 5932da25320..00000000000 --- a/platform/cavium/docker-syncd-cavm/Dockerfile.j2 +++ /dev/null @@ -1,34 +0,0 @@ -FROM docker-config-engine-{{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_cavm_debs.split(' ') -%} -debs/{{ deb }}{{' '}} -{%- endfor -%} -debs/ - -RUN apt-get -y install libpcap-dev libxml2-dev python-dev swig libsensors4-dev libatomic1 libjemalloc1 liblua5.1-0 lua-bitop lua-cjson - -RUN dpkg -i \ -{% for deb in docker_syncd_cavm_debs.split(' ') -%} -debs/{{ deb }}{{' '}} -{%- endfor %} - -COPY ["start.sh", "/usr/bin/"] -COPY ["supervisord.conf", "/etc/supervisor/conf.d/"] -COPY ["files/supervisor-proc-exit-listener", "/usr/bin"] -COPY ["critical_processes", "/etc/supervisor/"] - -COPY ["profile.ini", "/etc/ssw/AS7512/"] - -## 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/cavium/docker-syncd-cavm/critical_processes b/platform/cavium/docker-syncd-cavm/critical_processes deleted file mode 100644 index bdd6903c569..00000000000 --- a/platform/cavium/docker-syncd-cavm/critical_processes +++ /dev/null @@ -1 +0,0 @@ -program:syncd diff --git a/platform/cavium/docker-syncd-cavm/profile.ini b/platform/cavium/docker-syncd-cavm/profile.ini deleted file mode 100644 index 017996f7d7c..00000000000 --- a/platform/cavium/docker-syncd-cavm/profile.ini +++ /dev/null @@ -1,2 +0,0 @@ -mode=1 -hwId=as7512 diff --git a/platform/cavium/docker-syncd-cavm/start.sh b/platform/cavium/docker-syncd-cavm/start.sh deleted file mode 100755 index 62331605047..00000000000 --- a/platform/cavium/docker-syncd-cavm/start.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -rm -f /var/run/rsyslogd.pid - -supervisorctl start rsyslogd - -supervisorctl start syncd diff --git a/platform/cavium/docker-syncd-cavm/supervisord.conf b/platform/cavium/docker-syncd-cavm/supervisord.conf deleted file mode 100644 index e19a41baca9..00000000000 --- a/platform/cavium/docker-syncd-cavm/supervisord.conf +++ /dev/null @@ -1,41 +0,0 @@ -[supervisord] -logfile_maxbytes=1MB -logfile_backups=2 -nodaemon=true - -[eventlistener:supervisor-proc-exit-listener] -command=/usr/bin/supervisor-proc-exit-listener --container-name syncd -events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING -autostart=true -autorestart=unexpected -buffer_size=1024 - -[program:start.sh] -command=/usr/bin/start.sh -priority=1 -autostart=true -autorestart=false -stdout_logfile=NONE -stdout_syslog=true -stderr_logfile=NONE -stderr_syslog=true - -[program:rsyslogd] -command=/usr/sbin/rsyslogd -n -priority=2 -autostart=false -autorestart=unexpected -stdout_logfile=NONE -stdout_syslog=true -stderr_logfile=NONE -stderr_syslog=true - -[program:syncd] -command=/usr/bin/syncd_start.sh -priority=3 -autostart=false -autorestart=false -stdout_logfile=NONE -stdout_syslog=true -stderr_logfile=NONE -stderr_syslog=true diff --git a/platform/cavium/libsaithrift-dev.mk b/platform/cavium/libsaithrift-dev.mk deleted file mode 100644 index 7883a307d96..00000000000 --- a/platform/cavium/libsaithrift-dev.mk +++ /dev/null @@ -1,20 +0,0 @@ -# libsaithrift-dev package - -SAI_VER = 0.9.4 - -LIBSAITHRIFT_DEV = libsaithrift-dev_$(SAI_VER)_amd64.deb -$(LIBSAITHRIFT_DEV)_SRC_PATH = $(SRC_PATH)/sonic-sairedis/SAI -$(LIBSAITHRIFT_DEV)_DEPENDS += $(LIBTHRIFT) $(LIBTHRIFT_DEV) $(PYTHON_THRIFT) $(THRIFT_COMPILER) $(CAVM_LIBSAI) $(CAVM_SAI) -$(LIBSAITHRIFT_DEV)_RDEPENDS += $(LIBTHRIFT) $(CAVM_SAI) -SONIC_DPKG_DEBS += $(LIBSAITHRIFT_DEV) - -PYTHON_SAITHRIFT = python-saithrift_$(SAI_VER)_amd64.deb -$(eval $(call add_extra_package,$(LIBSAITHRIFT_DEV),$(PYTHON_SAITHRIFT))) - -SAISERVER = saiserver_$(SAI_VER)_amd64.deb -$(SAISERVER)_RDEPENDS += $(LIBTHRIFT) $(CAVM_SAI) -$(eval $(call add_extra_package,$(LIBSAITHRIFT_DEV),$(SAISERVER))) - -SAISERVER_DBG = saiserver-dbg_$(SAI_VER)_amd64.deb -$(SAISERVER_DBG)_RDEPENDS += $(SAISERVER) -$(eval $(call add_extra_package,$(LIBSAITHRIFT_DEV),$(SAISERVER_DBG))) diff --git a/platform/cavium/one-image.mk b/platform/cavium/one-image.mk deleted file mode 100644 index d81763430c0..00000000000 --- a/platform/cavium/one-image.mk +++ /dev/null @@ -1,15 +0,0 @@ -# sonic cavium one image installer - -SONIC_ONE_IMAGE = sonic-cavium.bin -$(SONIC_ONE_IMAGE)_MACHINE = cavium -$(SONIC_ONE_IMAGE)_IMAGE_TYPE = onie -$(SONIC_ONE_IMAGE)_INSTALLS += $(CAVM_PLATFORM_DEB) -$(SONIC_ONE_IMAGE)_INSTALLS += $(CAVM_XPNET_DEB) -$(SONIC_ONE_IMAGE)_INSTALLS += $(SYSTEMD_SONIC_GENERATOR) -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/cavium/platform.conf b/platform/cavium/platform.conf deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/platform/cavium/rules.mk b/platform/cavium/rules.mk deleted file mode 100644 index a526774d295..00000000000 --- a/platform/cavium/rules.mk +++ /dev/null @@ -1,23 +0,0 @@ -include $(PLATFORM_PATH)/cavm-sai.mk -include $(PLATFORM_PATH)/docker-syncd-cavm.mk -include $(PLATFORM_PATH)/docker-syncd-cavm-rpc.mk -include $(PLATFORM_PATH)/cavm-platform-modules.mk -include $(PLATFORM_PATH)/cavm-xpnet.mk -include $(PLATFORM_PATH)/one-image.mk -include $(PLATFORM_PATH)/libsaithrift-dev.mk - -SONIC_ALL += $(SONIC_ONE_IMAGE) \ - $(DOCKER_FPM) \ - $(DOCKER_PTF_CAVM) \ - $(DOCKER_SYNCD_CAVM_RPC) - -# Inject cavium sai into syncd -$(SYNCD)_DEPENDS += $(CAVM_SAI) $(CAVM_LIBSAI) -$(SYNCD)_UNINSTALLS += $(CAVM_LIBSAI) - -ifeq ($(ENABLE_SYNCD_RPC),y) -$(SYNCD)_DEPENDS += $(LIBSAITHRIFT_DEV_CAVM) -endif - -# Runtime dependency on cavium sai is set only for syncd -$(SYNCD)_RDEPENDS += $(CAVM_SAI)