[submodule] Update submodule sonic-swss to the latest HEAD automatically (#18448 )

#### Why I did it src/sonic-swss ``` * d33b854e - (HEAD -> 202305, origin/202305) [acl] Add IN_PORTS qualifier for L3 table (#3078) (4 hours ago) [Neetha John] ``` #### How I did it #### How to verify it #### Description for the changelog
Update cisco-8000.ini (#18412 )
2024-03-23 19:01:22 +08:00 · 2024-03-22 21:57:15 +08:00 · 2024-03-21 19:01:30 +08:00 · 2024-03-21 19:01:25 +08:00 · 2024-03-21 19:01:19 +08:00 · 2024-03-21 19:01:14 +08:00
1270 changed files with 171236 additions and 16107 deletions
--- a/.azure-pipelines/azure-pipelines-UpgrateVersion.yml
+++ b/.azure-pipelines/azure-pipelines-UpgrateVersion.yml
@ -161,8 +161,8 @@ stages:
        git branch -u remote/$BRANCH_NAME

        echo $GIT_PASSWORD | gh auth login --with-token
-        TITLE="Upgrade SONiC Versions"
-        BODY="Upgrade SONiC Versions"
+        TITLE="[${SOURCE_BRANCH#refs/heads/}] Upgrade SONiC package Versions"
+        BODY=$TITLE
        RET=0
        if ! gh pr create -t "$TITLE" -b "$BODY" -B $(Build.SourceBranch) -R $(Build.Repository.Name) > pr.log 2>&1; then
          if ! grep -q "already exists" pr.log; then
--- a/.azure-pipelines/run-test-scheduler-template.yml
+++ b/.azure-pipelines/run-test-scheduler-template.yml
@ -18,6 +18,10 @@ parameters:
  type: string
  default: 1

+- name: NUM_ASIC
+  type: number
+  default: 1
+
 - name: TEST_SET
  type: string
  default: ""
@ -34,17 +38,73 @@ parameters:
  type: string
  default: "ceos"

- name: SPECIFIED_PARAMS
+- name: TESTBED_NAME
  type: string
-  default: "{}"
+  default: ""
+
+- name: IMAGE_URL
+  type: string
+  default: ""
+
+- name: HWSKU
+  type: string
+  default: ""
+
+- name: TEST_PLAN_TYPE
+  type: string
+  default: ""
+
+- name: PLATFORM
+  type: string
+  default: ""
+
+- name: SCRIPTS
+  type: string
+  default: ""
+
+- name: FEATURES
+  type: string
+  default: ""
+
+- name: SCRIPTS_EXCLUDE
+  type: string
+  default: ""
+
+- name: FEATURES_EXCLUDE
+  type: string
+  default: ""
+
+- name: REPO_NAME
+  type: string
+  default: ""

 - name: MGMT_BRANCH
  type: string
-  default: master
+  default: ""

- name: NUM_ASIC
+- name: STOP_ON_FAILURE
+  type: string
+  default: ""
+
+- name: RETRY_TIMES
+  type: string
+  default: ""
+
+- name: DUMP_KVM_IF_FAIL
+  type: string
+  default: "True"
+  values:
+  - "True"
+  - "False"
+
+- name: REQUESTER
+  type: string
+  default: ""
+
+- name: MAX_RUN_TEST_MINUTES
  type: number
-  default: 1
+  default: 480
+

 steps:
  - script: |
@ -57,12 +117,20 @@ steps:
      set -e
      pip install PyYAML
      rm -f new_test_plan_id.txt
-      python ./.azure-pipelines/test_plan.py create -t ${{ parameters.TOPOLOGY }} -o new_test_plan_id.txt \
-      --min-worker ${{ parameters.MIN_WORKER }} --max-worker ${{ parameters.MAX_WORKER }} \
-      --test-set ${{ parameters.TEST_SET }} --kvm-build-id $(KVM_BUILD_ID) \
-      --deploy-mg-extra-params "${{ parameters.DEPLOY_MG_EXTRA_PARAMS }}" --common-extra-params "${{ parameters.COMMON_EXTRA_PARAMS }}" \
-      --mgmt-branch ${{ parameters.MGMT_BRANCH }} --vm-type ${{ parameters.VM_TYPE }} --specified-params "${{ parameters.SPECIFIED_PARAMS }}" \
+      
+      python ./.azure-pipelines/test_plan.py create \
+      -t ${{ parameters.TOPOLOGY }} \
+      -o new_test_plan_id.txt \
+      --min-worker ${{ parameters.MIN_WORKER }} \
+      --max-worker ${{ parameters.MAX_WORKER }} \
+      --test-set ${{ parameters.TEST_SET }} \
+      --kvm-build-id $(KVM_BUILD_ID) \
+      --deploy-mg-extra-params "${{ parameters.DEPLOY_MG_EXTRA_PARAMS }}" \
+      --common-extra-params "${{ parameters.COMMON_EXTRA_PARAMS }}" \
+      --mgmt-branch ${{ parameters.MGMT_BRANCH }} \
+      --vm-type ${{ parameters.VM_TYPE }} \
      --num-asic ${{ parameters.NUM_ASIC }}
+      
      TEST_PLAN_ID=`cat new_test_plan_id.txt`

      echo "Created test plan $TEST_PLAN_ID"
@ -108,18 +176,20 @@ steps:
    env:
      TESTBED_TOOLS_URL: $(TESTBED_TOOLS_URL)
    displayName: Run test
+    timeoutInMinutes: ${{ parameters.MAX_RUN_TEST_MINUTES }}

-  - script: |
-      set -e
-      echo "KVM dump"
-      echo "SONiC PR system-level test is powered by SONiC Elastictest, for any issue, please send email to sonicelastictest@microsoft.com"
-      echo "Runtime detailed progress at $(FRONTEND_URL)/scheduler/testplan/$TEST_PLAN_ID "
-      # When "KVMDUMP" finish, it changes into "FAILED", "CANCELLED" or "FINISHED"
-      python ./.azure-pipelines/test_plan.py poll -i "$(TEST_PLAN_ID)" --expected-state KVMDUMP
-    condition: succeededOrFailed()
-    env:
-      TESTBED_TOOLS_URL: $(TESTBED_TOOLS_URL)
-    displayName: KVM dump
+  - ${{ if eq(parameters.DUMP_KVM_IF_FAIL, 'True') }}:
+    - script: |
+        set -e
+        echo "KVM dump"
+        echo "SONiC PR system-level test is powered by SONiC Elastictest, for any issue, please send email to sonicelastictest@microsoft.com"
+        echo "Runtime detailed progress at $(FRONTEND_URL)/scheduler/testplan/$TEST_PLAN_ID "
+        # When "KVMDUMP" finish, it changes into "FAILED", "CANCELLED" or "FINISHED"
+        python ./.azure-pipelines/test_plan.py poll -i "$(TEST_PLAN_ID)" --expected-state KVMDUMP
+      condition: succeededOrFailed()
+      env:
+        TESTBED_TOOLS_URL: $(TESTBED_TOOLS_URL)
+      displayName: KVM dump

  - script: |
      set -e
--- a/.gitmodules
+++ b/.gitmodules
@ -1,15 +1,19 @@
 [submodule "sonic-swss-common"]
 	path = src/sonic-swss-common
 	url = https://github.com/sonic-net/sonic-swss-common
+	branch = 202305
 [submodule "sonic-linux-kernel"]
 	path = src/sonic-linux-kernel
 	url = https://github.com/sonic-net/sonic-linux-kernel
+	branch = 202305
 [submodule "sonic-sairedis"]
 	path = src/sonic-sairedis
 	url = https://github.com/sonic-net/sonic-sairedis
+	branch = 202305
 [submodule "sonic-swss"]
 	path = src/sonic-swss
 	url = https://github.com/sonic-net/sonic-swss
+	branch = 202305
 [submodule "src/p4c-bm/p4c-bm"]
 	path = platform/p4/p4c-bm/p4c-bm
 	url = https://github.com/krambn/p4c-bm
@ -31,22 +35,25 @@
 [submodule "src/sonic-utilities"]
 	path = src/sonic-utilities
 	url = https://github.com/sonic-net/sonic-utilities
+	branch = 202305
 [submodule "platform/broadcom/sonic-platform-modules-arista"]
 	path = platform/broadcom/sonic-platform-modules-arista
 	url = https://github.com/aristanetworks/sonic
 [submodule "src/sonic-platform-common"]
 	path = src/sonic-platform-common
 	url = https://github.com/sonic-net/sonic-platform-common
+	branch = 202305
 [submodule "src/sonic-platform-daemons"]
 	path = src/sonic-platform-daemons
 	url = https://github.com/sonic-net/sonic-platform-daemons
+	branch = 202305
 [submodule "src/sonic-platform-pde"]
 	path = src/sonic-platform-pde
 	url = https://github.com/sonic-net/sonic-platform-pdk-pde
 [submodule "src/sonic-frr/frr"]
 	path = src/sonic-frr/frr
 	url = https://github.com/sonic-net/sonic-frr.git
-	branch = frr/8.2
+	branch = frr/8.5
 [submodule "platform/p4/p4-hlir/p4-hlir-v1.1"]
 	path = platform/p4/p4-hlir/p4-hlir-v1.1
 	url = https://github.com/p4lang/p4-hlir.git
@ -65,9 +72,6 @@
 [submodule "src/scapy"]
 	path = src/scapy
 	url = https://github.com/secdev/scapy.git
-[submodule "platform/mellanox/mlnx-sai/SAI-Implementation"]
-	path = platform/mellanox/mlnx-sai/SAI-Implementation
-	url = https://github.com/Mellanox/SAI-Implementation
 [submodule "src/sonic-mgmt-framework"]
 	path = src/sonic-mgmt-framework
 	url = https://github.com/sonic-net/sonic-mgmt-framework
@ -94,6 +98,7 @@
 [submodule "src/linkmgrd"]
 	path = src/linkmgrd
 	url = https://github.com/sonic-net/sonic-linkmgrd.git
+	branch = 202305
 [submodule "src/sonic-p4rt/sonic-pins"]
 	path = src/sonic-p4rt/sonic-pins
 	url = https://github.com/sonic-net/sonic-pins.git
@ -106,12 +111,17 @@
 [submodule "src/sonic-host-services"]
 	path = src/sonic-host-services
 	url = https://github.com/sonic-net/sonic-host-services
+	branch = 202305
 [submodule "src/sonic-gnmi"]
 	path = src/sonic-gnmi
 	url = https://github.com/sonic-net/sonic-gnmi.git
+	branch = 202305
 [submodule "src/sonic-genl-packet"]
 	path = src/sonic-genl-packet
 	url = https://github.com/sonic-net/sonic-genl-packet
 [submodule "src/dhcpmon"]
 	path = src/dhcpmon
 	url = https://github.com/sonic-net/sonic-dhcpmon.git
+[submodule "platform/marvell-arm64/mrvl-prestera"]
+	path = platform/marvell-arm64/mrvl-prestera
+	url = https://github.com/Marvell-switching/mrvl-prestera.git
--- a/Makefile.work
+++ b/Makefile.work
@ -40,6 +40,9 @@
 #  * ENABLE_NATIVE_WRITE: Enable native write/config operations via the gNMI interface.
 #  *                 Default: unset
 #  *                 Values: y
+#  * ENABLE_DIALOUT: Enable dialout client in telemetry.
+#  *                 Default: unset
+#  *                 Values: y
 #  * SONIC_DPKG_CACHE_METHOD: Specifying method of obtaining the Debian packages from cache: none or cache
 #  * SONIC_DPKG_CACHE_SOURCE: Debian package cache location when cache enabled for debian packages
 #  * BUILD_LOG_TIMESTAMP: Set timestamp in the build log (simple/none)
@ -138,6 +141,7 @@ rules/config.user:

 include rules/config
 -include rules/config.user
+include rules/sonic-fips.mk

 ifneq ($(DEFAULT_CONTAINER_REGISTRY),)
 override DEFAULT_CONTAINER_REGISTRY := $(DEFAULT_CONTAINER_REGISTRY)/
@ -174,12 +178,6 @@ endif
 SLAVE_IMAGE = $(SLAVE_BASE_IMAGE)-$(USER_LC)
 DOCKER_ROOT = $(PWD)/fsroot.docker.$(BLDENV)

-# Support FIPS feature, armhf not supported yet
-ifeq ($(PLATFORM_ARCH),armhf)
-ENABLE_FIPS_FEATURE := n
-ENABLE_FIPS := n
-endif
-
 ifeq ($(ENABLE_FIPS_FEATURE), n)
 ifeq ($(ENABLE_FIPS), y)
    $(error Cannot set fips config ENABLE_FIPS=y when ENABLE_FIPS_FEATURE=n)
@ -213,6 +211,8 @@ $(shell CONFIGURED_ARCH=$(CONFIGURED_ARCH) \
 	DOCKER_EXTRA_OPTS=$(DOCKER_EXTRA_OPTS) \
 	DEFAULT_CONTAINER_REGISTRY=$(DEFAULT_CONTAINER_REGISTRY) \
 	GZ_COMPRESS_PROGRAM=$(GZ_COMPRESS_PROGRAM) \
+	FIPS_VERSION=$(FIPS_VERSION) \
+	FIPS_GOLANG_VERSION=$(FIPS_GOLANG_VERSION) \
 	j2 $(SLAVE_DIR)/Dockerfile.j2 > $(SLAVE_DIR)/Dockerfile)

 $(shell CONFIGURED_ARCH=$(CONFIGURED_ARCH) \
@ -536,12 +536,14 @@ SONIC_BUILD_INSTRUCTION :=  $(MAKE) \
                           DOCKER_LOCKFILE_SAVE=$(DOCKER_LOCKFILE_SAVE) \
                           SONIC_CONFIG_USE_NATIVE_DOCKERD_FOR_BUILD=$(SONIC_CONFIG_USE_NATIVE_DOCKERD_FOR_BUILD) \
                           SONIC_INCLUDE_SYSTEM_TELEMETRY=$(INCLUDE_SYSTEM_TELEMETRY) \
+                           SONIC_INCLUDE_SYSTEM_EVENTD=$(INCLUDE_SYSTEM_EVENTD) \
                           INCLUDE_DHCP_RELAY=$(INCLUDE_DHCP_RELAY) \
                           INCLUDE_MACSEC=$(INCLUDE_MACSEC) \
                           SONIC_INCLUDE_RESTAPI=$(INCLUDE_RESTAPI) \
                           SONIC_INCLUDE_MUX=$(INCLUDE_MUX) \
                           ENABLE_TRANSLIB_WRITE=$(ENABLE_TRANSLIB_WRITE) \
                           ENABLE_NATIVE_WRITE=$(ENABLE_NATIVE_WRITE) \
+			   ENABLE_DIALOUT=$(ENABLE_DIALOUT) \
                           EXTRA_DOCKER_TARGETS=$(EXTRA_DOCKER_TARGETS) \
                           BUILD_LOG_TIMESTAMP=$(BUILD_LOG_TIMESTAMP) \
                           SONIC_ENABLE_IMAGE_SIGNATURE=$(ENABLE_IMAGE_SIGNATURE) \
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@ -28,6 +28,7 @@ resources:
  - repository: sonic-mgmt
    type: github
    name: sonic-net/sonic-mgmt
+    ref: master
    endpoint: sonic-net
  - repository: buildimage
    type: github
@ -153,11 +154,12 @@ stages:
    timeoutInMinutes: 240
    continueOnError: false
    steps:
-    - template: .azure-pipelines/run-test-scheduler-template.yml
+    - template: .azure-pipelines/run-test-elastictest-template.yml@sonic-mgmt
      parameters:
        TOPOLOGY: t0
        MIN_WORKER: $(T0_INSTANCE_NUM)
        MAX_WORKER: $(T0_INSTANCE_NUM)
+        MGMT_BRANCH: "202305"

  - job: t0_2vlans_elastictest
    pool: ubuntu-20.04
@ -165,12 +167,13 @@ stages:
    timeoutInMinutes: 240
    continueOnError: false
    steps:
-    - template: .azure-pipelines/run-test-scheduler-template.yml
+    - template: .azure-pipelines/run-test-elastictest-template.yml@sonic-mgmt
      parameters:
        TOPOLOGY: t0
        TEST_SET: t0-2vlans
        MIN_WORKER: $(T0_2VLANS_INSTANCE_NUM)
        MAX_WORKER: $(T0_2VLANS_INSTANCE_NUM)
+        MGMT_BRANCH: "202305"
        DEPLOY_MG_EXTRA_PARAMS: "-e vlan_config=two_vlan_a"

  - job: t1_lag_elastictest
@ -179,11 +182,12 @@ stages:
    timeoutInMinutes: 240
    continueOnError: false
    steps:
-    - template: .azure-pipelines/run-test-scheduler-template.yml
+    - template: .azure-pipelines/run-test-elastictest-template.yml@sonic-mgmt
      parameters:
        TOPOLOGY: t1-lag
        MIN_WORKER: $(T1_LAG_INSTANCE_NUM)
        MAX_WORKER: $(T1_LAG_INSTANCE_NUM)
+        MGMT_BRANCH: "202305"

  - job: multi_asic_elastictest
    displayName: "kvmtest-multi-asic-t1-lag by Elastictest"
@ -191,13 +195,14 @@ stages:
    timeoutInMinutes: 240
    continueOnError: false
    steps:
-      - template: .azure-pipelines/run-test-scheduler-template.yml
+      - template: .azure-pipelines/run-test-elastictest-template.yml@sonic-mgmt
        parameters:
          TOPOLOGY: t1-8-lag
          TEST_SET: multi-asic-t1-lag
          MIN_WORKER: $(MULTI_ASIC_INSTANCE_NUM)
          MAX_WORKER: $(MULTI_ASIC_INSTANCE_NUM)
          NUM_ASIC: 4
+          MGMT_BRANCH: "202305"

  - job: dualtor_elastictest
    pool: ubuntu-20.04
@ -205,11 +210,12 @@ stages:
    timeoutInMinutes: 240
    continueOnError: false
    steps:
-      - template: .azure-pipelines/run-test-scheduler-template.yml
+      - template: .azure-pipelines/run-test-elastictest-template.yml@sonic-mgmt
        parameters:
          TOPOLOGY: dualtor
          MIN_WORKER: $(T0_DUALTOR_INSTANCE_NUM)
          MAX_WORKER: $(T0_DUALTOR_INSTANCE_NUM)
+          MGMT_BRANCH: "202305"
          COMMON_EXTRA_PARAMS: "--disable_loganalyzer "

  - job: sonic_t0_elastictest
@ -218,25 +224,25 @@ stages:
    timeoutInMinutes: 240
    continueOnError: false
    steps:
-      - template: .azure-pipelines/run-test-scheduler-template.yml
+      - template: .azure-pipelines/run-test-elastictest-template.yml@sonic-mgmt
        parameters:
          TOPOLOGY: t0-64-32
          MIN_WORKER: $(T0_SONIC_INSTANCE_NUM)
          MAX_WORKER: $(T0_SONIC_INSTANCE_NUM)
          TEST_SET: t0-sonic
-          COMMON_EXTRA_PARAMS: "--neighbor_type=sonic --enable_macsec --macsec_profile=128_SCI,256_XPN_SCI"
+          MGMT_BRANCH: "202305"
+          COMMON_EXTRA_PARAMS: "--neighbor_type=sonic "
          VM_TYPE: vsonic
-          SPECIFIED_PARAMS: '{\"test_pretest.py\":[\"--completeness_level=confident\",\"--allow_recover\"],\"test_posttest.py\":[\"--completeness_level=confident\",\"--allow_recover\"]}'

-  - job: wan_elastictest
-    displayName: "kvmtest-wan by Elastictest"
-    pool: ubuntu-20.04
-    timeoutInMinutes: 240
-    continueOnError: false
-    steps:
-      - template: .azure-pipelines/run-test-scheduler-template.yml
-        parameters:
-          TOPOLOGY: wan-pub
-          MIN_WORKER: $(WAN_INSTANCE_NUM)
-          MAX_WORKER: $(WAN_INSTANCE_NUM)
-          COMMON_EXTRA_PARAMS: "--skip_sanity "
+#  - job: wan_elastictest
+#    displayName: "kvmtest-wan by Elastictest"
+#    pool: ubuntu-20.04
+#    timeoutInMinutes: 240
+#    continueOnError: false
+#    steps:
+#      - template: .azure-pipelines/run-test-scheduler-template.yml
+#        parameters:
+#          TOPOLOGY: wan-pub
+#          MIN_WORKER: $(WAN_INSTANCE_NUM)
+#          MAX_WORKER: $(WAN_INSTANCE_NUM)
+#          COMMON_EXTRA_PARAMS: "--skip_sanity "
--- a/build_debian.sh
+++ b/build_debian.sh
@ -33,7 +33,7 @@ CONFIGURED_ARCH=$([ -f .arch ] && cat .arch || echo amd64)
 ## docker engine version (with platform)
 DOCKER_VERSION=5:20.10.14~3-0~debian-$IMAGE_DISTRO
 CONTAINERD_IO_VERSION=1.5.11-1
-LINUX_KERNEL_VERSION=5.10.0-18-2
+LINUX_KERNEL_VERSION=5.10.0-23-2

 ## Working directory to prepare the file system
 FILESYSTEM_ROOT=./fsroot
@ -59,15 +59,24 @@ TRUSTED_GPG_DIR=$BUILD_TOOL_PATH/trusted.gpg.d
    exit 1
 }

+if [ "$IMAGE_TYPE" = "aboot" ]; then
+    TARGET_BOOTLOADER="aboot"
+fi
+
 ## Prepare the file system directory
 if [[ -d $FILESYSTEM_ROOT ]]; then
    sudo rm -rf $FILESYSTEM_ROOT || die "Failed to clean chroot directory"
 fi
 mkdir -p $FILESYSTEM_ROOT
 mkdir -p $FILESYSTEM_ROOT/$PLATFORM_DIR
-mkdir -p $FILESYSTEM_ROOT/$PLATFORM_DIR/grub
 touch $FILESYSTEM_ROOT/$PLATFORM_DIR/firsttime

+bootloader_packages=""
+if [ "$TARGET_BOOTLOADER" != "aboot" ]; then
+    mkdir -p $FILESYSTEM_ROOT/$PLATFORM_DIR/grub
+    bootloader_packages="grub2-common"
+fi
+
 ## ensure proc is mounted
 sudo mount proc /proc -t proc || true

@ -111,7 +120,7 @@ sudo LANG=C chroot $FILESYSTEM_ROOT mount
 [ -d $TRUSTED_GPG_DIR ] && [ ! -z "$(ls $TRUSTED_GPG_DIR)" ] && sudo cp $TRUSTED_GPG_DIR/* ${FILESYSTEM_ROOT}/etc/apt/trusted.gpg.d/

 ## Pointing apt to public apt mirrors and getting latest packages, needed for latest security updates
-scripts/build_mirror_config.sh files/apt $CONFIGURED_ARCH $IMAGE_DISTRO 
+scripts/build_mirror_config.sh files/apt $CONFIGURED_ARCH $IMAGE_DISTRO
 sudo cp files/apt/sources.list.$CONFIGURED_ARCH $FILESYSTEM_ROOT/etc/apt/sources.list
 sudo cp files/apt/apt.conf.d/{81norecommends,apt-{clean,gzip-indexes,no-languages},no-check-valid-until,apt-multiple-retries} $FILESYSTEM_ROOT/etc/apt/apt.conf.d/

@ -294,7 +303,7 @@ then
    ## Install Kubernetes master
    echo '[INFO] Install kubernetes master'
    install_kubernetes ${MASTER_KUBERNETES_VERSION}
-    
+
    sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT curl -fsSL \
        https://packages.microsoft.com/keys/microsoft.asc | \
        sudo LANG=C chroot $FILESYSTEM_ROOT apt-key add -
@ -309,7 +318,7 @@ then
    sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y remove gnupg
    sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT curl -o /tmp/cri-dockerd.deb -fsSL \
        https://github.com/Mirantis/cri-dockerd/releases/download/v${MASTER_CRI_DOCKERD}/cri-dockerd_${MASTER_CRI_DOCKERD}.3-0.debian-${IMAGE_DISTRO}_amd64.deb
-    sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install -f /tmp/cri-dockerd.deb 
+    sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install -f /tmp/cri-dockerd.deb
    sudo LANG=C chroot $FILESYSTEM_ROOT rm -f /tmp/cri-dockerd.deb
 else
    echo '[INFO] Skipping Install kubernetes master'
@ -375,7 +384,7 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
    gdisk                   \
    sysfsutils              \
    squashfs-tools          \
-    grub2-common            \
+    $bootloader_packages    \
    screen                  \
    hping3                  \
    tcptraceroute           \
@ -415,6 +424,10 @@ LogsDirectory=audit
 LogsDirectoryMode=0750
 EOF

+# latest tcpdump control resource access with AppArmor.
+# override tcpdump profile to allow tcpdump access TACACS config file.
+sudo cp files/apparmor/usr.bin.tcpdump $FILESYSTEM_ROOT/etc/apparmor.d/local/usr.bin.tcpdump
+
 if [[ $CONFIGURED_ARCH == amd64 ]]; then
 ## Pre-install the fundamental packages for amd64 (x86)
 sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install      \
@ -447,6 +460,14 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
    systemd-sysv \
    ntp

+# Workaround for issue: The udev rule may fail to be executed because the
+#                       daemon-reload command is executed in parallel
+# Github issue: https://github.com/systemd/systemd/issues/24668
+# Github PR: https://github.com/systemd/systemd/pull/24673
+# This workaround should be removed after a upstream already contains the fixes
+sudo patch $FILESYSTEM_ROOT/lib/systemd/system/systemd-udevd.service \
+    files/image_config/systemd/systemd-udevd/fix-udev-rule-may-fail-if-daemon-reload-command-runs.patch
+
 if [[ $TARGET_BOOTLOADER == grub ]]; then
    if [[ $CONFIGURED_ARCH == amd64 ]]; then
        GRUB_PKG=grub-pc-bin
@ -537,6 +558,9 @@ sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install 'docke
 # Install scapy
 sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install 'scapy==2.4.4'

+# The option --no-build-isolation can be removed when upgrading PyYAML to 6.0.1
+sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install 'PyYAML==5.4.1' --no-build-isolation
+
 ## Note: keep pip installed for maintainance purpose

 # Install GCC, needed for building/installing some Python packages
@ -633,11 +657,15 @@ then

 fi

+## Set FIPS runtime default option
+sudo LANG=C chroot $FILESYSTEM_ROOT /bin/bash -c "mkdir -p /etc/fips"
+sudo LANG=C chroot $FILESYSTEM_ROOT /bin/bash -c "echo 0 > /etc/fips/fips_enable"
+
 # #################
-#   secure boot 
+#   secure boot
 # #################
 if [[ $SECURE_UPGRADE_MODE == 'dev' || $SECURE_UPGRADE_MODE == "prod" && $SONIC_ENABLE_SECUREBOOT_SIGNATURE != 'y' ]]; then
-    # note: SONIC_ENABLE_SECUREBOOT_SIGNATURE is a feature that signing just kernel, 
+    # note: SONIC_ENABLE_SECUREBOOT_SIGNATURE is a feature that signing just kernel,
    # SECURE_UPGRADE_MODE is signing all the boot component including kernel.
    # its required to do not enable both features together to avoid conflicts.
    echo "Secure Boot support build stage: Starting .."
@ -646,14 +674,14 @@ if [[ $SECURE_UPGRADE_MODE == 'dev' || $SECURE_UPGRADE_MODE == "prod" && $SONIC_
    sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install      \
        shim-unsigned \
        grub-efi
-    
+
    if [ ! -f $SECURE_UPGRADE_SIGNING_CERT ]; then
        echo "Error: SONiC SECURE_UPGRADE_SIGNING_CERT=$SECURE_UPGRADE_SIGNING_CERT key missing"
        exit 1
    fi

    if [[ $SECURE_UPGRADE_MODE == 'dev' ]]; then
-        # development signing & verification 
+        # development signing & verification

        if [ ! -f $SECURE_UPGRADE_DEV_SIGNING_KEY ]; then
            echo "Error: SONiC SECURE_UPGRADE_DEV_SIGNING_KEY=$SECURE_UPGRADE_DEV_SIGNING_KEY key missing"
@ -763,6 +791,18 @@ sudo rm -f $ONIE_INSTALLER_PAYLOAD $FILESYSTEM_SQUASHFS
 sudo du -hsx $FILESYSTEM_ROOT
 sudo mkdir -p $FILESYSTEM_ROOT/var/lib/docker
 sudo cp files/image_config/resolv-config/resolv.conf $FILESYSTEM_ROOT/etc/resolv.conf
+
+## Optimize filesystem size
+if [ "$BUILD_REDUCE_IMAGE_SIZE" = "y" ]; then
+   sudo scripts/build-optimize-fs-size.py "$FILESYSTEM_ROOT" \
+      --image-type "$IMAGE_TYPE" \
+      --hardlinks var/lib/docker \
+      --hardlinks usr/share/sonic/device \
+      --remove-docs \
+      --remove-mans \
+      --remove-licenses
+fi
+
 sudo mksquashfs $FILESYSTEM_ROOT $FILESYSTEM_SQUASHFS -comp zstd -b 1M -e boot -e var/lib/docker -e $PLATFORM_DIR

 # Ensure admin gid is 1000
--- a/build_image.sh
+++ b/build_image.sh
@ -86,7 +86,7 @@ generate_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 \
-          $ONIE_INSTALLER_PAYLOAD
+          $ONIE_INSTALLER_PAYLOAD $SECURE_UPGRADE_SIGNING_CERT $SECURE_UPGRADE_DEV_SIGNING_KEY
 }

 # Generate asic-specific device list
--- a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/sai.profile
+++ b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/sai.profile
@ -1,2 +0,0 @@
-SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td2-a7050-qx32-32x40G.config.bcm
-SAI_NUM_ECMP_MEMBERS=32
--- a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/sai.profile.j2
+++ b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/sai.profile.j2
@ -0,0 +1,14 @@
+{# Get sai.profile based on switch_role #}
+{%- if DEVICE_METADATA is defined -%}
+{%-     set switch_role = DEVICE_METADATA['localhost']['type'] -%}
+{%-     if 'leafrouter' in switch_role.lower() -%}
+{%         set sai_profile_contents = 'SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td2-a7050-qx32-32x40G-t1.config.bcm' -%}
+{%-     else %}
+{%-         set sai_profile_contents = 'SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td2-a7050-qx32-32x40G-t0.config.bcm' -%}
+{%-     endif %}
+{%- else %}
+{%-     set sai_profile_contents = 'SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td2-a7050-qx32-32x40G-t0.config.bcm' -%}
+{%- endif %}
+{# Write the contents of sai_ profile_filename to sai.profile file #}
+{{ sai_profile_contents }}
+SAI_NUM_ECMP_MEMBERS=32
--- a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/td2-a7050-qx32-32x40G-t0.config.bcm
+++ b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/td2-a7050-qx32-32x40G-t0.config.bcm
--- a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/td2-a7050-qx32-32x40G-t1.config.bcm
+++ b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/td2-a7050-qx32-32x40G-t1.config.bcm
@ -0,0 +1,880 @@
+#/******************************************************************************
+# *
+# *      File:   config.bcm.cloverdales (7050-QX32)
+# *      Name:
+# *
+# *      Description: This file contains SDK properties for an Arista
+# *      Cloverdales platform.
+# *
+# *-----------------------------------------------------------------------------
+# ******************************************************************************/
+####################################################################
+# BCM Config file for Cloverdale platform
+#  - 32x40g Portmode
+
+sai_hash_seed_config_hash_offset_enable=1
+
+# Old LPM only configuration
+# l2_mem_entries=163840
+# l3_mem_entries=90112
+# l3_alpm_enable=0
+# ipv6_lpm_128b_enable=0
+#
+# ALPM enable
+l3_alpm_enable=2
+ipv6_lpm_128b_enable=1
+l2_mem_entries=32768
+l3_mem_entries=16384
+
+# disables bcmALPMDH (ALPM distributed hitbit) thread.  This thread is purely for debug purpose
+l3_alpm_hit_skip=1
+
+# Disable Counting ACL Drop towards interface RX_DRP counter
+sai_adjust_acl_drop_in_rx_drop=1
+
+# From old config file
+os=unix
+higig2_hdr_mode=1
+
+# Parity
+parity_correction=1
+parity_enable=1
+stat_if_parity_enable=0
+
+# l2 thread related config vars
+l2xmsg_hostbuf_size=8192
+l2xmsg_mode=1
+
+bcm_num_cos=10
+bcm_stat_interval=2000000
+lls_num_l2uc=12
+max_vp_lags=0
+miim_intr_enable=0
+mmu_lossless=0
+module_64ports=0
+schan_intr_enable=0
+stable_size=0x2000000
+tdma_timeout_usec=5000000
+
+# for GLC transceiver
+phy_an_c73=0x0
+phy_an_c37=0x3
+
+###########################
+#port_init_speed_xe=40000
+#port_init_speed_xe.0=40000
+
+#load_firmware=0x0102
+load_firmware.0=2
+
+#########################
+# All ports are in oversubscription mode
+pbmp_oversubscribe=0x1fffffffffffffffffffffffffe
+pbmp_xport_xe.0=0x1fffffffe
+
+phy_84328_1.0=1
+phy_84328_2.0=1
+phy_84328_29.0=1
+phy_84328_3.0=1
+phy_84328_30.0=1
+phy_84328_31.0=1
+phy_84328_32.0=1
+phy_84328_4.0=1
+phy_an_c37_1.0=3
+phy_an_c37_10.0=3
+phy_an_c37_11.0=3
+phy_an_c37_12.0=3
+phy_an_c37_13.0=3
+phy_an_c37_14.0=3
+phy_an_c37_15.0=3
+phy_an_c37_16.0=3
+phy_an_c37_17.0=3
+phy_an_c37_18.0=3
+phy_an_c37_19.0=3
+phy_an_c37_2.0=3
+phy_an_c37_20.0=3
+phy_an_c37_21.0=3
+phy_an_c37_22.0=3
+phy_an_c37_23.0=3
+phy_an_c37_24.0=3
+phy_an_c37_25.0=3
+phy_an_c37_26.0=3
+phy_an_c37_27.0=3
+phy_an_c37_28.0=3
+phy_an_c37_29.0=3
+phy_an_c37_3.0=3
+phy_an_c37_30.0=3
+phy_an_c37_31.0=3
+phy_an_c37_32.0=3
+phy_an_c37_4.0=3
+phy_an_c37_5.0=3
+phy_an_c37_6.0=3
+phy_an_c37_7.0=3
+phy_an_c37_8.0=3
+phy_an_c37_9.0=3
+phy_an_c73_1.0=1
+phy_an_c73_10.0=1
+phy_an_c73_11.0=1
+phy_an_c73_12.0=1
+phy_an_c73_13.0=1
+phy_an_c73_14.0=1
+phy_an_c73_15.0=1
+phy_an_c73_16.0=1
+phy_an_c73_17.0=1
+phy_an_c73_18.0=1
+phy_an_c73_19.0=1
+phy_an_c73_2.0=1
+phy_an_c73_20.0=1
+phy_an_c73_21.0=1
+phy_an_c73_22.0=1
+phy_an_c73_23.0=1
+phy_an_c73_24.0=1
+phy_an_c73_25.0=1
+phy_an_c73_26.0=1
+phy_an_c73_27.0=1
+phy_an_c73_28.0=1
+phy_an_c73_29.0=1
+phy_an_c73_3.0=1
+phy_an_c73_30.0=1
+phy_an_c73_31.0=1
+phy_an_c73_32.0=1
+phy_an_c73_4.0=1
+phy_an_c73_5.0=1
+phy_an_c73_6.0=1
+phy_an_c73_7.0=1
+phy_an_c73_8.0=1
+phy_an_c73_9.0=1
+phy_aux_voltage_enable_1.0=0x1
+phy_aux_voltage_enable_2.0=0x1
+phy_aux_voltage_enable_29.0=0x1
+phy_aux_voltage_enable_3.0=0x1
+phy_aux_voltage_enable_30.0=0x1
+phy_aux_voltage_enable_31.0=0x1
+phy_aux_voltage_enable_32.0=0x1
+phy_aux_voltage_enable_4.0=0x1
+phy_ext_rom_boot.0=0
+phy_ext_rom_boot_1.0=0x0
+phy_ext_rom_boot_2.0=0x0
+phy_ext_rom_boot_29.0=0x0
+phy_ext_rom_boot_3.0=0x0
+phy_ext_rom_boot_30.0=0x0
+phy_ext_rom_boot_31.0=0x0
+phy_ext_rom_boot_32.0=0x0
+phy_ext_rom_boot_4.0=0x0
+phy_line_tx_mode_1.0=1
+phy_line_tx_mode_2.0=1
+phy_line_tx_mode_29.0=1
+phy_line_tx_mode_3.0=1
+phy_line_tx_mode_30.0=1
+phy_line_tx_mode_31.0=1
+phy_line_tx_mode_32.0=1
+phy_line_tx_mode_4.0=1
+phy_rx_polarity_flip_1.0=0x0
+phy_rx_polarity_flip_2.0=0x0
+phy_rx_polarity_flip_29.0=0x0
+phy_rx_polarity_flip_3.0=0x0
+phy_rx_polarity_flip_30.0=0x0
+phy_rx_polarity_flip_31.0=0x0
+phy_rx_polarity_flip_32.0=0x0
+phy_rx_polarity_flip_4.0=0x0
+phy_system_tx_mode_1.0=0
+phy_system_tx_mode_2.0=0
+phy_system_tx_mode_29.0=0
+phy_system_tx_mode_3.0=0
+phy_system_tx_mode_30.0=0
+phy_system_tx_mode_31.0=0
+phy_system_tx_mode_32.0=0
+phy_system_tx_mode_4.0=0
+phy_tx_polarity_flip_1.0=0x0
+phy_tx_polarity_flip_2.0=0x0
+phy_tx_polarity_flip_29.0=0x0
+phy_tx_polarity_flip_3.0=0x0
+phy_tx_polarity_flip_30.0=0x0
+phy_tx_polarity_flip_31.0=0x0
+phy_tx_polarity_flip_32.0=0x0
+phy_tx_polarity_flip_4.0=0x0
+phy_xaui_rx_polarity_flip_1.0=0x0
+phy_xaui_rx_polarity_flip_10.0=0x0
+phy_xaui_rx_polarity_flip_11.0=0x0
+phy_xaui_rx_polarity_flip_12.0=0x0
+phy_xaui_rx_polarity_flip_13.0=0x0
+phy_xaui_rx_polarity_flip_14.0=0x0
+phy_xaui_rx_polarity_flip_15.0=0x0
+phy_xaui_rx_polarity_flip_16.0=0x0
+phy_xaui_rx_polarity_flip_17.0=0x0
+phy_xaui_rx_polarity_flip_18.0=0x0
+phy_xaui_rx_polarity_flip_19.0=0x0
+phy_xaui_rx_polarity_flip_2.0=0x0
+phy_xaui_rx_polarity_flip_20.0=0x0
+phy_xaui_rx_polarity_flip_21.0=0x0
+phy_xaui_rx_polarity_flip_22.0=0x0
+phy_xaui_rx_polarity_flip_23.0=0x0
+phy_xaui_rx_polarity_flip_24.0=0x0
+phy_xaui_rx_polarity_flip_25.0=0x0
+phy_xaui_rx_polarity_flip_26.0=0x0
+phy_xaui_rx_polarity_flip_27.0=0x0
+phy_xaui_rx_polarity_flip_28.0=0x0
+phy_xaui_rx_polarity_flip_29.0=0x0
+phy_xaui_rx_polarity_flip_3.0=0x0
+phy_xaui_rx_polarity_flip_30.0=0x0
+phy_xaui_rx_polarity_flip_31.0=0x0
+phy_xaui_rx_polarity_flip_32.0=0x0
+phy_xaui_rx_polarity_flip_4.0=0x0
+phy_xaui_rx_polarity_flip_5.0=0x0
+phy_xaui_rx_polarity_flip_6.0=0x0
+phy_xaui_rx_polarity_flip_7.0=0x0
+phy_xaui_rx_polarity_flip_8.0=0x0
+phy_xaui_rx_polarity_flip_9.0=0x0
+phy_xaui_tx_polarity_flip_1.0=0x0
+phy_xaui_tx_polarity_flip_10.0=0x0
+phy_xaui_tx_polarity_flip_11.0=0x0
+phy_xaui_tx_polarity_flip_12.0=0x0
+phy_xaui_tx_polarity_flip_13.0=0x0
+phy_xaui_tx_polarity_flip_14.0=0x0
+phy_xaui_tx_polarity_flip_15.0=0x0
+phy_xaui_tx_polarity_flip_16.0=0x0
+phy_xaui_tx_polarity_flip_17.0=0x0
+phy_xaui_tx_polarity_flip_18.0=0x0
+phy_xaui_tx_polarity_flip_19.0=0x0
+phy_xaui_tx_polarity_flip_2.0=0x0
+phy_xaui_tx_polarity_flip_20.0=0x0
+phy_xaui_tx_polarity_flip_21.0=0x0
+phy_xaui_tx_polarity_flip_22.0=0x0
+phy_xaui_tx_polarity_flip_23.0=0x0
+phy_xaui_tx_polarity_flip_24.0=0x0
+phy_xaui_tx_polarity_flip_25.0=0x0
+phy_xaui_tx_polarity_flip_26.0=0x0
+phy_xaui_tx_polarity_flip_27.0=0x0
+phy_xaui_tx_polarity_flip_28.0=0x0
+phy_xaui_tx_polarity_flip_29.0=0x0
+phy_xaui_tx_polarity_flip_3.0=0x0
+phy_xaui_tx_polarity_flip_30.0=0x0
+phy_xaui_tx_polarity_flip_31.0=0x0
+phy_xaui_tx_polarity_flip_32.0=0x0
+phy_xaui_tx_polarity_flip_4.0=0x0
+phy_xaui_tx_polarity_flip_5.0=0x0
+phy_xaui_tx_polarity_flip_6.0=0x0
+phy_xaui_tx_polarity_flip_7.0=0x0
+phy_xaui_tx_polarity_flip_8.0=0x0
+phy_xaui_tx_polarity_flip_9.0=0x0
+port_init_autoneg_10.0=0
+port_init_autoneg_11.0=0
+port_init_autoneg_12.0=0
+port_init_autoneg_13.0=0
+port_init_autoneg_14.0=0
+port_init_autoneg_15.0=0
+port_init_autoneg_16.0=0
+port_init_autoneg_17.0=0
+port_init_autoneg_18.0=0
+port_init_autoneg_19.0=0
+port_init_autoneg_20.0=0
+port_init_autoneg_21.0=0
+port_init_autoneg_22.0=0
+port_init_autoneg_23.0=0
+port_init_autoneg_24.0=0
+port_init_autoneg_25.0=0
+port_init_autoneg_26.0=0
+port_init_autoneg_27.0=0
+port_init_autoneg_28.0=0
+port_init_autoneg_5.0=0
+port_init_autoneg_6.0=0
+port_init_autoneg_7.0=0
+port_init_autoneg_8.0=0
+port_init_autoneg_9.0=0
+port_init_cl72_hg.0=0x11
+port_phy_addr_1.0=0x4
+port_phy_addr_10.0=0x7f
+port_phy_addr_11.0=0x7f
+port_phy_addr_12.0=0x7f
+port_phy_addr_13.0=0x7f
+port_phy_addr_14.0=0x7f
+port_phy_addr_15.0=0x7f
+port_phy_addr_16.0=0x7f
+port_phy_addr_17.0=0x7f
+port_phy_addr_18.0=0x7f
+port_phy_addr_19.0=0x7f
+port_phy_addr_2.0=0x0
+port_phy_addr_20.0=0x7f
+port_phy_addr_21.0=0x7f
+port_phy_addr_22.0=0x7f
+port_phy_addr_23.0=0x7f
+port_phy_addr_24.0=0x7f
+port_phy_addr_25.0=0x7f
+port_phy_addr_26.0=0x7f
+port_phy_addr_27.0=0x7f
+port_phy_addr_28.0=0x7f
+port_phy_addr_29.0=0x54
+port_phy_addr_3.0=0x2c
+port_phy_addr_30.0=0x50
+port_phy_addr_31.0=0x7c
+port_phy_addr_32.0=0x78
+port_phy_addr_4.0=0x28
+port_phy_addr_5.0=0x7f
+port_phy_addr_6.0=0x7f
+port_phy_addr_7.0=0x7f
+port_phy_addr_8.0=0x7f
+port_phy_addr_9.0=0x7f
+port_phy_clause_1.0=0x2d
+port_phy_clause_2.0=0x2d
+port_phy_clause_29.0=0x2d
+port_phy_clause_3.0=0x2d
+port_phy_clause_30.0=0x2d
+port_phy_clause_31.0=0x2d
+port_phy_clause_32.0=0x2d
+port_phy_clause_4.0=0x2d
+port_phy_id0_1.0=0x600d
+port_phy_id0_2.0=0x600d
+port_phy_id0_29.0=0x600d
+port_phy_id0_3.0=0x600d
+port_phy_id0_30.0=0x600d
+port_phy_id0_31.0=0x600d
+port_phy_id0_32.0=0x600d
+port_phy_id0_4.0=0x600d
+port_phy_id1_1.0=0x8500
+port_phy_id1_2.0=0x8500
+port_phy_id1_29.0=0x8500
+port_phy_id1_3.0=0x8500
+port_phy_id1_30.0=0x8500
+port_phy_id1_31.0=0x8500
+port_phy_id1_32.0=0x8500
+port_phy_id1_4.0=0x8500
+portmap_1.0=125:40
+portmap_10.0=33:40
+portmap_11.0=45:40
+portmap_12.0=41:40
+portmap_13.0=53:40
+portmap_14.0=49:40
+portmap_15.0=69:40
+portmap_16.0=65:40
+portmap_17.0=77:40
+portmap_18.0=73:40
+portmap_19.0=93:40
+portmap_2.0=121:40
+portmap_20.0=89:40
+portmap_21.0=101:40
+portmap_22.0=97:40
+portmap_23.0=109:40
+portmap_24.0=105:40
+portmap_25.0=61:40
+portmap_26.0=57:40
+portmap_27.0=81:40
+portmap_28.0=85:40
+portmap_29.0=117:40
+portmap_3.0=13:40
+portmap_30.0=113:40
+portmap_31.0=5:40
+portmap_32.0=1:40
+portmap_4.0=9:40
+portmap_5.0=17:40
+portmap_6.0=21:40
+portmap_7.0=25:40
+portmap_8.0=29:40
+portmap_9.0=37:40
+serdes_firmware_mode_1.0=1
+serdes_firmware_mode_10.0=2
+serdes_firmware_mode_11.0=2
+serdes_firmware_mode_12.0=2
+serdes_firmware_mode_13.0=2
+serdes_firmware_mode_14.0=2
+serdes_firmware_mode_15.0=2
+serdes_firmware_mode_16.0=2
+serdes_firmware_mode_17.0=2
+serdes_firmware_mode_18.0=2
+serdes_firmware_mode_19.0=2
+serdes_firmware_mode_2.0=1
+serdes_firmware_mode_20.0=2
+serdes_firmware_mode_21.0=2
+serdes_firmware_mode_22.0=2
+serdes_firmware_mode_23.0=2
+serdes_firmware_mode_24.0=2
+serdes_firmware_mode_25.0=2
+serdes_firmware_mode_26.0=2
+serdes_firmware_mode_27.0=2
+serdes_firmware_mode_28.0=2
+serdes_firmware_mode_29.0=1
+serdes_firmware_mode_3.0=1
+serdes_firmware_mode_30.0=1
+serdes_firmware_mode_31.0=1
+serdes_firmware_mode_32.0=1
+serdes_firmware_mode_4.0=1
+serdes_firmware_mode_5.0=2
+serdes_firmware_mode_6.0=2
+serdes_firmware_mode_7.0=2
+serdes_firmware_mode_8.0=2
+serdes_firmware_mode_9.0=2
+xgxs_lcpll_xtal_refclk.0=1
+xgxs_rx_lane_map_1.0=0x0123
+xgxs_rx_lane_map_10.0=0x3120
+xgxs_rx_lane_map_11.0=0x3120
+xgxs_rx_lane_map_12.0=0x3120
+xgxs_rx_lane_map_13.0=0x3120
+xgxs_rx_lane_map_14.0=0x3120
+xgxs_rx_lane_map_15.0=0x3120
+xgxs_rx_lane_map_16.0=0x3120
+xgxs_rx_lane_map_17.0=0x3120
+xgxs_rx_lane_map_18.0=0x3120
+xgxs_rx_lane_map_19.0=0x3120
+xgxs_rx_lane_map_2.0=0x0123
+xgxs_rx_lane_map_20.0=0x3120
+xgxs_rx_lane_map_21.0=0x3120
+xgxs_rx_lane_map_22.0=0x3120
+xgxs_rx_lane_map_23.0=0x3120
+xgxs_rx_lane_map_24.0=0x3120
+xgxs_rx_lane_map_25.0=0x2031
+xgxs_rx_lane_map_26.0=0x2031
+xgxs_rx_lane_map_27.0=0x0213
+xgxs_rx_lane_map_28.0=0x0213
+xgxs_rx_lane_map_29.0=0x0123
+xgxs_rx_lane_map_3.0=0x0123
+xgxs_rx_lane_map_30.0=0x0123
+xgxs_rx_lane_map_31.0=0x0123
+xgxs_rx_lane_map_32.0=0x0123
+xgxs_rx_lane_map_4.0=0x0123
+xgxs_rx_lane_map_5.0=0x2031
+xgxs_rx_lane_map_6.0=0x2031
+xgxs_rx_lane_map_7.0=0x2031
+xgxs_rx_lane_map_8.0=0x2031
+xgxs_rx_lane_map_9.0=0x3120
+xgxs_tx_lane_map_1.0=0x0123
+xgxs_tx_lane_map_10.0=0x3120
+xgxs_tx_lane_map_11.0=0x3120
+xgxs_tx_lane_map_12.0=0x3120
+xgxs_tx_lane_map_13.0=0x3120
+xgxs_tx_lane_map_14.0=0x3120
+xgxs_tx_lane_map_15.0=0x3120
+xgxs_tx_lane_map_16.0=0x3120
+xgxs_tx_lane_map_17.0=0x3120
+xgxs_tx_lane_map_18.0=0x3120
+xgxs_tx_lane_map_19.0=0x3120
+xgxs_tx_lane_map_2.0=0x0123
+xgxs_tx_lane_map_20.0=0x3120
+xgxs_tx_lane_map_21.0=0x3120
+xgxs_tx_lane_map_22.0=0x3120
+xgxs_tx_lane_map_23.0=0x3120
+xgxs_tx_lane_map_24.0=0x3120
+xgxs_tx_lane_map_25.0=0x2031
+xgxs_tx_lane_map_26.0=0x2031
+xgxs_tx_lane_map_27.0=0x0213
+xgxs_tx_lane_map_28.0=0x0213
+xgxs_tx_lane_map_29.0=0x0123
+xgxs_tx_lane_map_3.0=0x0123
+xgxs_tx_lane_map_30.0=0x0123
+xgxs_tx_lane_map_31.0=0x0123
+xgxs_tx_lane_map_32.0=0x0123
+xgxs_tx_lane_map_4.0=0x0123
+xgxs_tx_lane_map_5.0=0x1302
+xgxs_tx_lane_map_6.0=0x1302
+xgxs_tx_lane_map_7.0=0x1302
+xgxs_tx_lane_map_8.0=0x1302
+xgxs_tx_lane_map_9.0=0x3120
+
+##########################################
+#skip_L2_USER_ENTRY=0
+phy_aux_voltage_enable=1
+###############################
+serdes_fiber_pref=1
+###############################
+mdio_output_delay.0=0x0d
+###############################
+serdes_sgmii_m=0
+xgxs_lcpll_xtal_refclk=1
+xgxs_lcpll_xtal_refclk.1=1
+xgxs_lcpll_xtal_refclk.2=1
+xgxs_lcpll_xtal_refclk.3=1
+tdma_intr_enable=1
+tslam_intr_enable=1
+tslam_dma_enable.2=1
+tslam_dma_enable.3=1
+#dport_map_port=0
+#dport_map_enable=0
+#dport_map_indexed=0
+#bcm_xlate_port_enable.0=0
+#xgxs_pdetect_1=0
+table_dma_enable.0=1
+table_dma_enable.1=1
+table_dma_enable.2=1
+table_dma_enable.3=1
+serdes_driver_current_lane0_1=2
+serdes_pre_driver_current_lane0_1=2
+serdes_preemphasis_lane0_1=0x8fc0
+serdes_driver_current_lane1_1=2
+serdes_pre_driver_current_lane1_1=2
+serdes_preemphasis_lane1_1=0x8fc0
+serdes_driver_current_lane2_1=2
+serdes_pre_driver_current_lane2_1=2
+serdes_preemphasis_lane2_1=0x8fc0
+serdes_driver_current_lane3_1=2
+serdes_pre_driver_current_lane3_1=2
+serdes_preemphasis_lane3_1=0x8fc0
+serdes_driver_current_lane0_2=3
+serdes_pre_driver_current_lane0_2=2
+serdes_preemphasis_lane0_2=0x8fc0
+serdes_driver_current_lane1_2=3
+serdes_pre_driver_current_lane1_2=2
+serdes_preemphasis_lane1_2=0x8fc0
+serdes_driver_current_lane2_2=3
+serdes_pre_driver_current_lane2_2=2
+serdes_preemphasis_lane2_2=0x8fc0
+serdes_driver_current_lane3_2=3
+serdes_pre_driver_current_lane3_2=2
+serdes_preemphasis_lane3_2=0x8fc0
+serdes_driver_current_lane0_3=2
+serdes_pre_driver_current_lane0_3=2
+serdes_preemphasis_lane0_3=0x8fc0
+serdes_driver_current_lane1_3=2
+serdes_pre_driver_current_lane1_3=2
+serdes_preemphasis_lane1_3=0x8fc0
+serdes_driver_current_lane2_3=2
+serdes_pre_driver_current_lane2_3=2
+serdes_preemphasis_lane2_3=0x8fc0
+serdes_driver_current_lane3_3=2
+serdes_pre_driver_current_lane3_3=2
+serdes_preemphasis_lane3_3=0x8fc0
+serdes_driver_current_lane0_4=2
+serdes_pre_driver_current_lane0_4=2
+serdes_preemphasis_lane0_4=0x8fc0
+serdes_driver_current_lane1_4=2
+serdes_pre_driver_current_lane1_4=2
+serdes_preemphasis_lane1_4=0x8fc0
+serdes_driver_current_lane2_4=2
+serdes_pre_driver_current_lane2_4=2
+serdes_preemphasis_lane2_4=0x8fc0
+serdes_driver_current_lane3_4=2
+serdes_pre_driver_current_lane3_4=2
+serdes_preemphasis_lane3_4=0x8fc0
+serdes_driver_current_lane0_5=4
+serdes_pre_driver_current_lane0_5=4
+serdes_preemphasis_lane0_5=0xbf00
+serdes_driver_current_lane1_5=4
+serdes_pre_driver_current_lane1_5=4
+serdes_preemphasis_lane1_5=0xbf00
+serdes_driver_current_lane2_5=4
+serdes_pre_driver_current_lane2_5=4
+serdes_preemphasis_lane2_5=0xbf00
+serdes_driver_current_lane3_5=4
+serdes_pre_driver_current_lane3_5=4
+serdes_preemphasis_lane3_5=0xbf00
+serdes_driver_current_lane0_6=4
+serdes_pre_driver_current_lane0_6=4
+serdes_preemphasis_lane0_6=0xbb10
+serdes_driver_current_lane1_6=4
+serdes_pre_driver_current_lane1_6=4
+serdes_preemphasis_lane1_6=0xbb10
+serdes_driver_current_lane2_6=4
+serdes_pre_driver_current_lane2_6=4
+serdes_preemphasis_lane2_6=0xbb10
+serdes_driver_current_lane3_6=4
+serdes_pre_driver_current_lane3_6=4
+serdes_preemphasis_lane3_6=0xbb10
+serdes_driver_current_lane0_7=3
+serdes_pre_driver_current_lane0_7=3
+serdes_preemphasis_lane0_7=0xcad0
+serdes_driver_current_lane1_7=3
+serdes_pre_driver_current_lane1_7=3
+serdes_preemphasis_lane1_7=0xcad0
+serdes_driver_current_lane2_7=3
+serdes_pre_driver_current_lane2_7=3
+serdes_preemphasis_lane2_7=0xcad0
+serdes_driver_current_lane3_7=3
+serdes_pre_driver_current_lane3_7=3
+serdes_preemphasis_lane3_7=0xcad0
+serdes_driver_current_lane0_8=3
+serdes_pre_driver_current_lane0_8=3
+serdes_preemphasis_lane0_8=0xcad0
+serdes_driver_current_lane1_8=3
+serdes_pre_driver_current_lane1_8=3
+serdes_preemphasis_lane1_8=0xcad0
+serdes_driver_current_lane2_8=3
+serdes_pre_driver_current_lane2_8=3
+serdes_preemphasis_lane2_8=0xcad0
+serdes_driver_current_lane3_8=3
+serdes_pre_driver_current_lane3_8=3
+serdes_preemphasis_lane3_8=0xcad0
+serdes_driver_current_lane0_9=3
+serdes_pre_driver_current_lane0_9=3
+serdes_preemphasis_lane0_9=0xc2f0
+serdes_driver_current_lane1_9=3
+serdes_pre_driver_current_lane1_9=3
+serdes_preemphasis_lane1_9=0xc2f0
+serdes_driver_current_lane2_9=3
+serdes_pre_driver_current_lane2_9=3
+serdes_preemphasis_lane2_9=0xc2f0
+serdes_driver_current_lane3_9=3
+serdes_pre_driver_current_lane3_9=3
+serdes_preemphasis_lane3_9=0xc2f0
+serdes_driver_current_lane0_10=3
+serdes_pre_driver_current_lane0_10=3
+serdes_preemphasis_lane0_10=0xc6e0
+serdes_driver_current_lane1_10=3
+serdes_pre_driver_current_lane1_10=3
+serdes_preemphasis_lane1_10=0xc6e0
+serdes_driver_current_lane2_10=3
+serdes_pre_driver_current_lane2_10=3
+serdes_preemphasis_lane2_10=0xc6e0
+serdes_driver_current_lane3_10=3
+serdes_pre_driver_current_lane3_10=3
+serdes_preemphasis_lane3_10=0xc6e0
+serdes_driver_current_lane0_11=3
+serdes_pre_driver_current_lane0_11=3
+serdes_preemphasis_lane0_11=0xc2f0
+serdes_driver_current_lane1_11=3
+serdes_pre_driver_current_lane1_11=3
+serdes_preemphasis_lane1_11=0xc2f0
+serdes_driver_current_lane2_11=3
+serdes_pre_driver_current_lane2_11=3
+serdes_preemphasis_lane2_11=0xc2f0
+serdes_driver_current_lane3_11=3
+serdes_pre_driver_current_lane3_11=3
+serdes_preemphasis_lane3_11=0xc2f0
+serdes_driver_current_lane0_12=3
+serdes_pre_driver_current_lane0_12=3
+serdes_preemphasis_lane0_12=0xc2f0
+serdes_driver_current_lane1_12=3
+serdes_pre_driver_current_lane1_12=3
+serdes_preemphasis_lane1_12=0xc2f0
+serdes_driver_current_lane2_12=3
+serdes_pre_driver_current_lane2_12=3
+serdes_preemphasis_lane2_12=0xc2f0
+serdes_driver_current_lane3_12=3
+serdes_pre_driver_current_lane3_12=3
+serdes_preemphasis_lane3_12=0xc2f0
+serdes_driver_current_lane0_13=3
+serdes_pre_driver_current_lane0_13=3
+serdes_preemphasis_lane0_13=0xc2f0
+serdes_driver_current_lane1_13=3
+serdes_pre_driver_current_lane1_13=3
+serdes_preemphasis_lane1_13=0xc2f0
+serdes_driver_current_lane2_13=3
+serdes_pre_driver_current_lane2_13=3
+serdes_preemphasis_lane2_13=0xc2f0
+serdes_driver_current_lane3_13=3
+serdes_pre_driver_current_lane3_13=3
+serdes_preemphasis_lane3_13=0xc2f0
+serdes_driver_current_lane0_14=3
+serdes_pre_driver_current_lane0_14=3
+serdes_preemphasis_lane0_14=0xc2f0
+serdes_driver_current_lane1_14=3
+serdes_pre_driver_current_lane1_14=3
+serdes_preemphasis_lane1_14=0xc2f0
+serdes_driver_current_lane2_14=3
+serdes_pre_driver_current_lane2_14=3
+serdes_preemphasis_lane2_14=0xc2f0
+serdes_driver_current_lane3_14=3
+serdes_pre_driver_current_lane3_14=3
+serdes_preemphasis_lane3_14=0xc2f0
+serdes_driver_current_lane0_15=3
+serdes_pre_driver_current_lane0_15=3
+serdes_preemphasis_lane0_15=0xc2f0
+serdes_driver_current_lane1_15=3
+serdes_pre_driver_current_lane1_15=3
+serdes_preemphasis_lane1_15=0xc2f0
+serdes_driver_current_lane2_15=3
+serdes_pre_driver_current_lane2_15=3
+serdes_preemphasis_lane2_15=0xc2f0
+serdes_driver_current_lane3_15=3
+serdes_pre_driver_current_lane3_15=3
+serdes_preemphasis_lane3_15=0xc2f0
+serdes_driver_current_lane0_16=3
+serdes_pre_driver_current_lane0_16=3
+serdes_preemphasis_lane0_16=0xc2f0
+serdes_driver_current_lane1_16=3
+serdes_pre_driver_current_lane1_16=3
+serdes_preemphasis_lane1_16=0xc2f0
+serdes_driver_current_lane2_16=3
+serdes_pre_driver_current_lane2_16=3
+serdes_preemphasis_lane2_16=0xc2f0
+serdes_driver_current_lane3_16=3
+serdes_pre_driver_current_lane3_16=3
+serdes_preemphasis_lane3_16=0xc2f0
+serdes_driver_current_lane0_17=3
+serdes_pre_driver_current_lane0_17=3
+serdes_preemphasis_lane0_17=0xc2f0
+serdes_driver_current_lane1_17=3
+serdes_pre_driver_current_lane1_17=3
+serdes_preemphasis_lane1_17=0xc2f0
+serdes_driver_current_lane2_17=3
+serdes_pre_driver_current_lane2_17=3
+serdes_preemphasis_lane2_17=0xc2f0
+serdes_driver_current_lane3_17=3
+serdes_pre_driver_current_lane3_17=3
+serdes_preemphasis_lane3_17=0xc2f0
+serdes_driver_current_lane0_18=3
+serdes_pre_driver_current_lane0_18=3
+serdes_preemphasis_lane0_18=0xc2f0
+serdes_driver_current_lane1_18=3
+serdes_pre_driver_current_lane1_18=3
+serdes_preemphasis_lane1_18=0xc2f0
+serdes_driver_current_lane2_18=3
+serdes_pre_driver_current_lane2_18=3
+serdes_preemphasis_lane2_18=0xc2f0
+serdes_driver_current_lane3_18=3
+serdes_pre_driver_current_lane3_18=3
+serdes_preemphasis_lane3_18=0xc2f0
+serdes_driver_current_lane0_19=3
+serdes_pre_driver_current_lane0_19=3
+serdes_preemphasis_lane0_19=0xc2f0
+serdes_driver_current_lane1_19=3
+serdes_pre_driver_current_lane1_19=3
+serdes_preemphasis_lane1_19=0xc2f0
+serdes_driver_current_lane2_19=3
+serdes_pre_driver_current_lane2_19=3
+serdes_preemphasis_lane2_19=0xc2f0
+serdes_driver_current_lane3_19=3
+serdes_pre_driver_current_lane3_19=3
+serdes_preemphasis_lane3_19=0xc2f0
+serdes_driver_current_lane0_20=3
+serdes_pre_driver_current_lane0_20=3
+serdes_preemphasis_lane0_20=0xc2f0
+serdes_driver_current_lane1_20=3
+serdes_pre_driver_current_lane1_20=3
+serdes_preemphasis_lane1_20=0xc2f0
+serdes_driver_current_lane2_20=3
+serdes_pre_driver_current_lane2_20=3
+serdes_preemphasis_lane2_20=0xc2f0
+serdes_driver_current_lane3_20=3
+serdes_pre_driver_current_lane3_20=3
+serdes_preemphasis_lane3_20=0xc2f0
+serdes_driver_current_lane0_21=3
+serdes_pre_driver_current_lane0_21=3
+serdes_preemphasis_lane0_21=0xc6e0
+serdes_driver_current_lane1_21=3
+serdes_pre_driver_current_lane1_21=3
+serdes_preemphasis_lane1_21=0xc6e0
+serdes_driver_current_lane2_21=3
+serdes_pre_driver_current_lane2_21=3
+serdes_preemphasis_lane2_21=0xc6e0
+serdes_driver_current_lane3_21=3
+serdes_pre_driver_current_lane3_21=3
+serdes_preemphasis_lane3_21=0xc6e0
+serdes_driver_current_lane0_22=3
+serdes_pre_driver_current_lane0_22=3
+serdes_preemphasis_lane0_22=0xc6e0
+serdes_driver_current_lane1_22=3
+serdes_pre_driver_current_lane1_22=3
+serdes_preemphasis_lane1_22=0xc6e0
+serdes_driver_current_lane2_22=3
+serdes_pre_driver_current_lane2_22=3
+serdes_preemphasis_lane2_22=0xc6e0
+serdes_driver_current_lane3_22=3
+serdes_pre_driver_current_lane3_22=3
+serdes_preemphasis_lane3_22=0xc6e0
+serdes_driver_current_lane0_23=3
+serdes_pre_driver_current_lane0_23=3
+serdes_preemphasis_lane0_23=0xcad0
+serdes_driver_current_lane1_23=3
+serdes_pre_driver_current_lane1_23=3
+serdes_preemphasis_lane1_23=0xcad0
+serdes_driver_current_lane2_23=3
+serdes_pre_driver_current_lane2_23=3
+serdes_preemphasis_lane2_23=0xcad0
+serdes_driver_current_lane3_23=3
+serdes_pre_driver_current_lane3_23=3
+serdes_preemphasis_lane3_23=0xcad0
+serdes_driver_current_lane0_24=3
+serdes_pre_driver_current_lane0_24=3
+serdes_preemphasis_lane0_24=0xcad0
+serdes_driver_current_lane1_24=3
+serdes_pre_driver_current_lane1_24=3
+serdes_preemphasis_lane1_24=0xcad0
+serdes_driver_current_lane2_24=3
+serdes_pre_driver_current_lane2_24=3
+serdes_preemphasis_lane2_24=0xcad0
+serdes_driver_current_lane3_24=3
+serdes_pre_driver_current_lane3_24=3
+serdes_preemphasis_lane3_24=0xcad0
+serdes_driver_current_lane0_25=5
+serdes_pre_driver_current_lane0_25=5
+serdes_preemphasis_lane0_25=0xc2f0
+serdes_driver_current_lane1_25=5
+serdes_pre_driver_current_lane1_25=5
+serdes_preemphasis_lane1_25=0xc2f0
+serdes_driver_current_lane2_25=5
+serdes_pre_driver_current_lane2_25=5
+serdes_preemphasis_lane2_25=0xc2f0
+serdes_driver_current_lane3_25=5
+serdes_pre_driver_current_lane3_25=5
+serdes_preemphasis_lane3_25=0xc2f0
+serdes_driver_current_lane0_26=5
+serdes_pre_driver_current_lane0_26=5
+serdes_preemphasis_lane0_26=0xc2f0
+serdes_driver_current_lane1_26=5
+serdes_pre_driver_current_lane1_26=5
+serdes_preemphasis_lane1_26=0xc2f0
+serdes_driver_current_lane2_26=5
+serdes_pre_driver_current_lane2_26=5
+serdes_preemphasis_lane2_26=0xc2f0
+serdes_driver_current_lane3_26=5
+serdes_pre_driver_current_lane3_26=5
+serdes_preemphasis_lane3_26=0xc2f0
+serdes_driver_current_lane0_27=5
+serdes_pre_driver_current_lane0_27=5
+serdes_preemphasis_lane0_27=0xc2f0
+serdes_driver_current_lane1_27=5
+serdes_pre_driver_current_lane1_27=5
+serdes_preemphasis_lane1_27=0xc2f0
+serdes_driver_current_lane2_27=5
+serdes_pre_driver_current_lane2_27=5
+serdes_preemphasis_lane2_27=0xc2f0
+serdes_driver_current_lane3_27=5
+serdes_pre_driver_current_lane3_27=5
+serdes_preemphasis_lane3_27=0xc2f0
+serdes_driver_current_lane0_28=8
+serdes_pre_driver_current_lane0_28=6
+serdes_preemphasis_lane0_28=0xc2f0
+serdes_driver_current_lane1_28=8
+serdes_pre_driver_current_lane1_28=6
+serdes_preemphasis_lane1_28=0xc2f0
+serdes_driver_current_lane2_28=8
+serdes_pre_driver_current_lane2_28=6
+serdes_preemphasis_lane2_28=0xc2f0
+serdes_driver_current_lane3_28=8
+serdes_pre_driver_current_lane3_28=6
+serdes_preemphasis_lane3_28=0xc2f0
+serdes_driver_current_lane0_29=2
+serdes_pre_driver_current_lane0_29=2
+serdes_preemphasis_lane0_29=0x8fc0
+serdes_driver_current_lane1_29=2
+serdes_pre_driver_current_lane1_29=2
+serdes_preemphasis_lane1_29=0x8fc0
+serdes_driver_current_lane2_29=2
+serdes_pre_driver_current_lane2_29=2
+serdes_preemphasis_lane2_29=0x8fc0
+serdes_driver_current_lane3_29=2
+serdes_pre_driver_current_lane3_29=2
+serdes_preemphasis_lane3_29=0x8fc0
+serdes_driver_current_lane0_30=2
+serdes_pre_driver_current_lane0_30=2
+serdes_preemphasis_lane0_30=0x8fc0
+serdes_driver_current_lane1_30=2
+serdes_pre_driver_current_lane1_30=2
+serdes_preemphasis_lane1_30=0x8fc0
+serdes_driver_current_lane2_30=2
+serdes_pre_driver_current_lane2_30=2
+serdes_preemphasis_lane2_30=0x8fc0
+serdes_driver_current_lane3_30=2
+serdes_pre_driver_current_lane3_30=2
+serdes_preemphasis_lane3_30=0x8fc0
+serdes_driver_current_lane0_31=2
+serdes_pre_driver_current_lane0_31=2
+serdes_preemphasis_lane0_31=0x8fc0
+serdes_driver_current_lane1_31=2
+serdes_pre_driver_current_lane1_31=2
+serdes_preemphasis_lane1_31=0x8fc0
+serdes_driver_current_lane2_31=2
+serdes_pre_driver_current_lane2_31=2
+serdes_preemphasis_lane2_31=0x8fc0
+serdes_driver_current_lane3_31=2
+serdes_pre_driver_current_lane3_31=2
+serdes_preemphasis_lane3_31=0x8fc0
+serdes_driver_current_lane0_32=2
+serdes_pre_driver_current_lane0_32=2
+serdes_preemphasis_lane0_32=0x8fc0
+serdes_driver_current_lane1_32=2
+serdes_pre_driver_current_lane1_32=2
+serdes_preemphasis_lane1_32=0x8fc0
+serdes_driver_current_lane2_32=2
+serdes_pre_driver_current_lane2_32=2
+serdes_preemphasis_lane2_32=0x8fc0
+serdes_driver_current_lane3_32=2
+serdes_pre_driver_current_lane3_32=2
+serdes_preemphasis_lane3_32=0x8fc0
--- a/device/arista/x86_64-arista_7050_qx32/platform.json
+++ b/device/arista/x86_64-arista_7050_qx32/platform.json
@ -1,7 +1,17 @@
 {
    "chassis": {
        "name": "DCS-7050QX-32",
-        "components": [],
+        "components": [
+            {
+                "name": "Scd(addr=0000:04:00.0)"
+            },
+            {
+                "name": "Ucd90120A(addr=6-004e)"
+            },
+            {
+                "name": "Ucd90160(addr=10-004e)"
+            }
+	],
        "fans": [
            {
                "name": "fan1"
--- a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/hwsku.json
+++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/hwsku.json
@ -1,132 +0,0 @@
-{
-    "interfaces": {
-        "Ethernet0": {
-            "default_brkout_mode": "3x10G(3)+1x1G(1)",
-            "port_type": "RJ45"
-        },
-        "Ethernet4": {
-            "default_brkout_mode": "1x40G[10G]",
-            "port_type": "QSFP+"
-        },
-        "Ethernet8": {
-            "default_brkout_mode": "1x40G[10G]",
-            "port_type": "QSFP+"
-        },
-        "Ethernet12": {
-            "default_brkout_mode": "1x40G[10G]",
-            "port_type": "QSFP+"
-        },
-        "Ethernet16": {
-            "default_brkout_mode": "1x40G[10G]",
-            "port_type": "QSFP+"
-        },
-        "Ethernet20": {
-            "default_brkout_mode": "1x40G[10G]",
-            "port_type": "QSFP+"
-        },
-        "Ethernet24": {
-            "default_brkout_mode": "1x40G[10G]",
-            "port_type": "QSFP+"
-        },
-        "Ethernet28": {
-            "default_brkout_mode": "1x40G[10G]",
-            "port_type": "QSFP+"
-        },
-        "Ethernet32": {
-            "default_brkout_mode": "1x40G[10G]",
-            "port_type": "QSFP+"
-        },
-        "Ethernet36": {
-            "default_brkout_mode": "1x40G[10G]",
-            "port_type": "QSFP+"
-        },
-        "Ethernet40": {
-            "default_brkout_mode": "1x40G[10G]",
-            "port_type": "QSFP+"
-        },
-        "Ethernet44": {
-            "default_brkout_mode": "1x40G[10G]",
-            "port_type": "QSFP+"
-        },
-        "Ethernet48": {
-            "default_brkout_mode": "1x40G[10G]",
-            "port_type": "QSFP+"
-        },
-        "Ethernet52": {
-            "default_brkout_mode": "1x40G[10G]",
-            "port_type": "QSFP+"
-        },
-        "Ethernet56": {
-            "default_brkout_mode": "1x40G[10G]",
-            "port_type": "QSFP+"
-        },
-        "Ethernet60": {
-            "default_brkout_mode": "1x40G[10G]",
-            "port_type": "QSFP+"
-        },
-        "Ethernet64": {
-            "default_brkout_mode": "1x40G[10G]",
-            "port_type": "QSFP+"
-        },
-        "Ethernet68": {
-            "default_brkout_mode": "1x40G[10G]",
-            "port_type": "QSFP+"
-        },
-        "Ethernet72": {
-            "default_brkout_mode": "1x40G[10G]",
-            "port_type": "QSFP+"
-        },
-        "Ethernet76": {
-            "default_brkout_mode": "1x40G[10G]",
-            "port_type": "QSFP+"
-        },
-        "Ethernet80": {
-            "default_brkout_mode": "1x40G[10G]",
-            "port_type": "QSFP+"
-        },
-        "Ethernet84": {
-            "default_brkout_mode": "1x40G[10G]",
-            "port_type": "QSFP+"
-        },
-        "Ethernet88": {
-            "default_brkout_mode": "1x40G[10G]",
-            "port_type": "QSFP+"
-        },
-        "Ethernet92": {
-            "default_brkout_mode": "1x40G[10G]",
-            "port_type": "QSFP+"
-        },
-        "Ethernet96": {
-            "default_brkout_mode": "1x40G[10G]",
-            "port_type": "QSFP+"
-        },
-        "Ethernet100": {
-            "default_brkout_mode": "1x40G[10G]",
-            "port_type": "QSFP+"
-        },
-        "Ethernet104": {
-            "default_brkout_mode": "1x40G[10G]",
-            "port_type": "QSFP+"
-        },
-        "Ethernet108": {
-            "default_brkout_mode": "1x40G[10G]",
-            "port_type": "QSFP+"
-        },
-        "Ethernet112": {
-            "default_brkout_mode": "1x40G[10G]",
-            "port_type": "QSFP+"
-        },
-        "Ethernet116": {
-            "default_brkout_mode": "1x40G[10G]",
-            "port_type": "QSFP+"
-        },
-        "Ethernet120": {
-            "default_brkout_mode": "1x40G[10G]",
-            "port_type": "QSFP+"
-        },
-        "Ethernet124": {
-            "default_brkout_mode": "1x40G[10G]",
-            "port_type": "QSFP+"
-        }
-    }
-}
--- a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/port_config.ini
+++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/port_config.ini
@ -1,36 +1,36 @@
-# name          lanes             alias         index
-Ethernet0       9                 Ethernet1     1
-Ethernet1       10                Ethernet2     2
-Ethernet2       11                Ethernet3     3
-Ethernet3       12                Ethernet4     4
-Ethernet4       13,14,15,16       Ethernet6/1   6
-Ethernet8       17,18,19,20       Ethernet7/1   7
-Ethernet12      21,22,23,24       Ethernet8/1   8
-Ethernet16      29,30,31,32       Ethernet9/1   9
-Ethernet20      25,26,27,28       Ethernet10/1  10
-Ethernet24      33,34,35,36       Ethernet11/1  11
-Ethernet28      37,38,39,40       Ethernet12/1  12
-Ethernet32      45,46,47,48       Ethernet13/1  13
-Ethernet36      41,42,43,44       Ethernet14/1  14
-Ethernet40      49,50,51,52       Ethernet15/1  15
-Ethernet44      53,54,55,56       Ethernet16/1  16
-Ethernet48      69,70,71,72       Ethernet17/1  17
-Ethernet52      65,66,67,68       Ethernet18/1  18
-Ethernet56      73,74,75,76       Ethernet19/1  19
-Ethernet60      77,78,79,80       Ethernet20/1  20
-Ethernet64      93,94,95,96       Ethernet21/1  21
-Ethernet68      89,90,91,92       Ethernet22/1  22
-Ethernet72      97,98,99,100      Ethernet23/1  23
-Ethernet76      101,102,103,104   Ethernet24/1  24
-Ethernet80      109,110,111,112   Ethernet25/1  25
-Ethernet84      105,106,107,108   Ethernet26/1  26
-Ethernet88      121,122,123,124   Ethernet27/1  27
-Ethernet92      125,126,127,128   Ethernet28/1  28
-Ethernet96      61,62,63,64       Ethernet29    29
-Ethernet100     57,58,59,60       Ethernet30    30
-Ethernet104     81,82,83,84       Ethernet31    31
-Ethernet108     85,86,87,88       Ethernet32    32
-Ethernet112     117,118,119,120   Ethernet33    33
-Ethernet116     113,114,115,116   Ethernet34    34
-Ethernet120     1,2,3,4           Ethernet35    35
-Ethernet124     5,6,7,8           Ethernet36    36
+# name          lanes             alias         index    speed
+Ethernet0       9                 Ethernet1     1        10000
+Ethernet1       10                Ethernet2     2        10000
+Ethernet2       11                Ethernet3     3        10000
+Ethernet3       12                Ethernet4     4        1000
+Ethernet4       13,14,15,16       Ethernet6/1   6        40000
+Ethernet8       17,18,19,20       Ethernet7/1   7        40000
+Ethernet12      21,22,23,24       Ethernet8/1   8        40000
+Ethernet16      29,30,31,32       Ethernet9/1   9        40000
+Ethernet20      25,26,27,28       Ethernet10/1  10       40000
+Ethernet24      33,34,35,36       Ethernet11/1  11       40000
+Ethernet28      37,38,39,40       Ethernet12/1  12       40000
+Ethernet32      45,46,47,48       Ethernet13/1  13       40000
+Ethernet36      41,42,43,44       Ethernet14/1  14       40000
+Ethernet40      49,50,51,52       Ethernet15/1  15       40000
+Ethernet44      53,54,55,56       Ethernet16/1  16       40000
+Ethernet48      69,70,71,72       Ethernet17/1  17       40000
+Ethernet52      65,66,67,68       Ethernet18/1  18       40000
+Ethernet56      73,74,75,76       Ethernet19/1  19       40000
+Ethernet60      77,78,79,80       Ethernet20/1  20       40000
+Ethernet64      93,94,95,96       Ethernet21/1  21       40000
+Ethernet68      89,90,91,92       Ethernet22/1  22       40000
+Ethernet72      97,98,99,100      Ethernet23/1  23       40000
+Ethernet76      101,102,103,104   Ethernet24/1  24       40000
+Ethernet80      109,110,111,112   Ethernet25/1  25       40000
+Ethernet84      105,106,107,108   Ethernet26/1  26       40000
+Ethernet88      121,122,123,124   Ethernet27/1  27       40000
+Ethernet92      125,126,127,128   Ethernet28/1  28       40000
+Ethernet96      61,62,63,64       Ethernet29    29       40000
+Ethernet100     57,58,59,60       Ethernet30    30       40000
+Ethernet104     81,82,83,84       Ethernet31    31       40000
+Ethernet108     85,86,87,88       Ethernet32    32       40000
+Ethernet112     117,118,119,120   Ethernet33    33       40000
+Ethernet116     113,114,115,116   Ethernet34    34       40000
+Ethernet120     1,2,3,4           Ethernet35    35       40000
+Ethernet124     5,6,7,8           Ethernet36    36       40000
--- a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/sai.profile
+++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/sai.profile
@ -1,2 +0,0 @@
-SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td2-a7050-q31s4-31x40G-4x10G.config.bcm
-SAI_NUM_ECMP_MEMBERS=64
--- a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/sai.profile.j2
+++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/sai.profile.j2
@ -0,0 +1,14 @@
+{# Get sai.profile based on switch_role #}
+{%- if DEVICE_METADATA is defined -%}
+{%-     set switch_role = DEVICE_METADATA['localhost']['type'] -%}
+{%-     if 'leafrouter' in switch_role.lower() -%}
+{%         set sai_profile_contents = 'SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td2-a7050-q31s4-31x40G-4x10G-t1.config.bcm' -%}
+{%-     else %}
+{%-         set sai_profile_contents = 'SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td2-a7050-q31s4-31x40G-4x10G-t0.config.bcm' -%}
+{%-     endif %}
+{%- else %}
+{%-     set sai_profile_contents = 'SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td2-a7050-q31s4-31x40G-4x10G-t0.config.bcm' -%}
+{%- endif %}
+{# Write the contents of sai_ profile_filename to sai.profile file #}
+{{ sai_profile_contents }}
+SAI_NUM_ECMP_MEMBERS=64
--- a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/td2-a7050-q31s4-31x40G-4x10G-t0.config.bcm
+++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/td2-a7050-q31s4-31x40G-4x10G-t0.config.bcm
--- a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/td2-a7050-q31s4-31x40G-4x10G-t1.config.bcm
+++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/td2-a7050-q31s4-31x40G-4x10G-t1.config.bcm
@ -0,0 +1,713 @@
+# ALPM enable
+l3_alpm_enable=2
+ipv6_lpm_128b_enable=1
+l2_mem_entries=32768
+l3_mem_entries=16384
+
+sai_hash_seed_config_hash_offset_enable=1
+
+# disables bcmALPMDH (ALPM distributed hitbit) thread.  This thread is purely for debug purpose
+l3_alpm_hit_skip=1
+
+# Disable Counting ACL Drop towards interface RX_DRP counter
+sai_adjust_acl_drop_in_rx_drop=1
+
+# From old config file
+os=unix
+higig2_hdr_mode=1
+
+# Parity
+parity_correction=1
+parity_enable=1
+stat_if_parity_enable=0
+
+# l2 thread related config vars
+l2xmsg_hostbuf_size=8192
+l2xmsg_mode=1
+
+bcm_num_cos=10
+bcm_stat_interval=2000000
+lls_num_l2uc=12
+max_vp_lags=0
+miim_intr_enable=0
+mmu_lossless=0
+module_64ports=0
+
+stable_size=0x2000000
+
+tdma_timeout_usec=5000000
+tslam_timeout_usec=15000000
+cdma_timeout_usec=15000000
+dma_desc_timeout_usec=15000000
+
+###############################
+serdes_fiber_pref=1
+###############################
+mdio_output_delay=0x0d
+###############################
+xgxs_lcpll_xtal_refclk=1
+tdma_intr_enable=1
+tslam_intr_enable=1
+table_dma_enable=1
+
+arl_clean_timeout_usec=15000000
+bcm_stat_flags=1
+bcm_stat_jumbo.0=9236
+
+pbmp_oversubscribe.0=0x1fffffffffffffffffffffffffe
+pbmp_xport_xe.0=0x1fffffffffffffffffffffffffe
+phy_an_c37_1.0=3
+phy_an_c37_5.0=3
+phy_an_c37_9.0=3
+phy_an_c37_13.0=3
+phy_an_c37_17.0=3
+phy_an_c37_21.0=3
+phy_an_c37_25.0=3
+phy_an_c37_29.0=3
+phy_an_c37_33.0=3
+phy_an_c37_37.0=3
+phy_an_c37_41.0=3
+phy_an_c37_45.0=3
+phy_an_c37_49.0=3
+phy_an_c37_53.0=3
+phy_an_c37_57.0=3
+phy_an_c37_61.0=3
+phy_an_c37_65.0=3
+phy_an_c37_69.0=3
+phy_an_c37_73.0=3
+phy_an_c37_77.0=3
+phy_an_c37_81.0=3
+phy_an_c37_85.0=3
+phy_an_c37_89.0=3
+phy_an_c37_93.0=3
+phy_an_c37_97.0=0
+phy_an_c37_98.0=0
+phy_an_c37_99.0=0
+phy_an_c37_100.0=0
+phy_an_c37_101.0=0
+phy_an_c37_102.0=0
+phy_an_c37_103.0=0
+phy_an_c37_104.0=0
+phy_an_c73_1.0=0
+phy_an_c73_5.0=0
+phy_an_c73_9.0=0
+phy_an_c73_13.0=0
+phy_an_c73_17.0=0
+phy_an_c73_21.0=0
+phy_an_c73_25.0=0
+phy_an_c73_29.0=0
+phy_an_c73_33.0=0
+phy_an_c73_37.0=0
+phy_an_c73_41.0=0
+phy_an_c73_45.0=0
+phy_an_c73_49.0=0
+phy_an_c73_53.0=0
+phy_an_c73_57.0=0
+phy_an_c73_61.0=0
+phy_an_c73_65.0=0
+phy_an_c73_69.0=0
+phy_an_c73_73.0=0
+phy_an_c73_77.0=0
+phy_an_c73_81.0=0
+phy_an_c73_85.0=0
+phy_an_c73_89.0=0
+phy_an_c73_93.0=0
+phy_an_c73_97.0=2
+phy_an_c73_98.0=2
+phy_an_c73_99.0=2
+phy_an_c73_100.0=2
+phy_an_c73_101.0=2
+phy_an_c73_102.0=2
+phy_an_c73_103.0=2
+phy_an_c73_104.0=2
+phy_xaui_rx_polarity_flip_1.0=0x0
+phy_xaui_rx_polarity_flip_5.0=0x0
+phy_xaui_rx_polarity_flip_9.0=0x4
+phy_xaui_rx_polarity_flip_13.0=0x0
+phy_xaui_rx_polarity_flip_17.0=0xb
+phy_xaui_rx_polarity_flip_21.0=0x3
+phy_xaui_rx_polarity_flip_25.0=0xb
+phy_xaui_rx_polarity_flip_29.0=0xf
+phy_xaui_rx_polarity_flip_33.0=0xb
+phy_xaui_rx_polarity_flip_37.0=0x3
+phy_xaui_rx_polarity_flip_41.0=0xb
+phy_xaui_rx_polarity_flip_45.0=0x0
+phy_xaui_rx_polarity_flip_49.0=0x4
+phy_xaui_rx_polarity_flip_53.0=0xc
+phy_xaui_rx_polarity_flip_57.0=0x4
+phy_xaui_rx_polarity_flip_61.0=0x0
+phy_xaui_rx_polarity_flip_65.0=0xb
+phy_xaui_rx_polarity_flip_69.0=0x3
+phy_xaui_rx_polarity_flip_73.0=0xb
+phy_xaui_rx_polarity_flip_77.0=0xf
+phy_xaui_rx_polarity_flip_81.0=0xb
+phy_xaui_rx_polarity_flip_85.0=0x3
+phy_xaui_rx_polarity_flip_89.0=0x4
+phy_xaui_rx_polarity_flip_93.0=0x0
+phy_xaui_rx_polarity_flip_97.0=0xb
+phy_xaui_rx_polarity_flip_98.0=0x3
+phy_xaui_rx_polarity_flip_99.0=0x4
+phy_xaui_rx_polarity_flip_100.0=0x0
+phy_xaui_rx_polarity_flip_101.0=0x0
+phy_xaui_rx_polarity_flip_102.0=0xe
+phy_xaui_rx_polarity_flip_103.0=0x0
+phy_xaui_rx_polarity_flip_104.0=0x0
+phy_xaui_tx_polarity_flip_1.0=0x0
+phy_xaui_tx_polarity_flip_5.0=0x0
+phy_xaui_tx_polarity_flip_9.0=0x2
+phy_xaui_tx_polarity_flip_13.0=0x0
+phy_xaui_tx_polarity_flip_17.0=0xd
+phy_xaui_tx_polarity_flip_21.0=0xc
+phy_xaui_tx_polarity_flip_25.0=0xd
+phy_xaui_tx_polarity_flip_29.0=0xf
+phy_xaui_tx_polarity_flip_33.0=0xd
+phy_xaui_tx_polarity_flip_37.0=0xc
+phy_xaui_tx_polarity_flip_41.0=0xd
+phy_xaui_tx_polarity_flip_45.0=0x0
+phy_xaui_tx_polarity_flip_49.0=0x2
+phy_xaui_tx_polarity_flip_53.0=0x3
+phy_xaui_tx_polarity_flip_57.0=0x2
+phy_xaui_tx_polarity_flip_61.0=0x0
+phy_xaui_tx_polarity_flip_65.0=0xd
+phy_xaui_tx_polarity_flip_69.0=0xc
+phy_xaui_tx_polarity_flip_73.0=0xd
+phy_xaui_tx_polarity_flip_77.0=0xf
+phy_xaui_tx_polarity_flip_81.0=0xd
+phy_xaui_tx_polarity_flip_85.0=0xc
+phy_xaui_tx_polarity_flip_89.0=0x2
+phy_xaui_tx_polarity_flip_93.0=0x0
+phy_xaui_tx_polarity_flip_97.0=0xd
+phy_xaui_tx_polarity_flip_98.0=0xc
+phy_xaui_tx_polarity_flip_99.0=0x2
+phy_xaui_tx_polarity_flip_100.0=0x0
+phy_xaui_tx_polarity_flip_101.0=0x0
+phy_xaui_tx_polarity_flip_102.0=0x7
+phy_xaui_tx_polarity_flip_103.0=0x2
+phy_xaui_tx_polarity_flip_104.0=0x0
+port_init_autoneg_1.0=0
+port_init_autoneg_5.0=0
+port_init_autoneg_9.0=0
+port_init_autoneg_13.0=0
+port_init_autoneg_17.0=0
+port_init_autoneg_21.0=0
+port_init_autoneg_25.0=0
+port_init_autoneg_29.0=0
+port_init_autoneg_33.0=0
+port_init_autoneg_37.0=0
+port_init_autoneg_41.0=0
+port_init_autoneg_45.0=0
+port_init_autoneg_49.0=0
+port_init_autoneg_53.0=0
+port_init_autoneg_57.0=0
+port_init_autoneg_61.0=0
+port_init_autoneg_65.0=0
+port_init_autoneg_69.0=0
+port_init_autoneg_73.0=0
+port_init_autoneg_77.0=0
+port_init_autoneg_81.0=0
+port_init_autoneg_85.0=0
+port_init_autoneg_89.0=0
+port_init_autoneg_93.0=0
+port_init_autoneg_97.0=0
+port_init_autoneg_98.0=0
+port_init_autoneg_99.0=0
+port_init_autoneg_100.0=0
+port_init_autoneg_101.0=0
+port_init_autoneg_102.0=0
+port_init_autoneg_103.0=0
+port_init_autoneg_104.0=0
+port_init_cl72.0=0
+portmap_1.0=9:10
+portmap_2.0=10:10
+portmap_3.0=11:10
+portmap_4.0=12:10
+portmap_5.0=13:40
+portmap_9.0=17:40
+portmap_13.0=21:40
+portmap_17.0=29:40
+portmap_21.0=25:40
+portmap_25.0=33:40
+portmap_29.0=37:40
+portmap_33.0=45:40
+portmap_37.0=41:40
+portmap_41.0=49:40
+portmap_45.0=53:40
+portmap_49.0=69:40
+portmap_53.0=65:40
+portmap_57.0=73:40
+portmap_61.0=77:40
+portmap_65.0=93:40
+portmap_69.0=89:40
+portmap_73.0=97:40
+portmap_77.0=101:40
+portmap_81.0=109:40
+portmap_85.0=105:40
+portmap_89.0=121:40
+portmap_93.0=125:40
+portmap_97.0=61:40
+portmap_98.0=57:40
+portmap_99.0=81:40
+portmap_100.0=85:40
+portmap_101.0=117:40
+portmap_102.0=113:40
+portmap_103.0=1:40
+portmap_104.0=5:40
+schan_intr_enable=0
+serdes_firmware_mode_1.0=2
+serdes_firmware_mode_5.0=2
+serdes_firmware_mode_9.0=2
+serdes_firmware_mode_13.0=2
+serdes_firmware_mode_17.0=2
+serdes_firmware_mode_21.0=2
+serdes_firmware_mode_25.0=2
+serdes_firmware_mode_29.0=2
+serdes_firmware_mode_33.0=2
+serdes_firmware_mode_37.0=2
+serdes_firmware_mode_41.0=2
+serdes_firmware_mode_45.0=2
+serdes_firmware_mode_49.0=2
+serdes_firmware_mode_53.0=2
+serdes_firmware_mode_57.0=2
+serdes_firmware_mode_61.0=2
+serdes_firmware_mode_65.0=2
+serdes_firmware_mode_69.0=2
+serdes_firmware_mode_73.0=2
+serdes_firmware_mode_77.0=2
+serdes_firmware_mode_81.0=2
+serdes_firmware_mode_85.0=2
+serdes_firmware_mode_89.0=2
+serdes_firmware_mode_93.0=2
+serdes_firmware_mode_97.0=2
+serdes_firmware_mode_98.0=2
+serdes_firmware_mode_99.0=2
+serdes_firmware_mode_100.0=2
+serdes_firmware_mode_101.0=2
+serdes_firmware_mode_102.0=2
+serdes_firmware_mode_103.0=2
+serdes_firmware_mode_104.0=2
+xgxs_rx_lane_map_1.0=0x3210
+xgxs_rx_lane_map_5.0=0x0321
+xgxs_rx_lane_map_9.0=0x1302
+xgxs_rx_lane_map_13.0=0x0213
+xgxs_rx_lane_map_17.0=0x1302
+xgxs_rx_lane_map_21.0=0x1302
+xgxs_rx_lane_map_25.0=0x1302
+xgxs_rx_lane_map_29.0=0x0213
+xgxs_rx_lane_map_33.0=0x1302
+xgxs_rx_lane_map_37.0=0x1302
+xgxs_rx_lane_map_41.0=0x1302
+xgxs_rx_lane_map_45.0=0x0213
+xgxs_rx_lane_map_49.0=0x1302
+xgxs_rx_lane_map_53.0=0x1302
+xgxs_rx_lane_map_57.0=0x1302
+xgxs_rx_lane_map_61.0=0x0213
+xgxs_rx_lane_map_65.0=0x1302
+xgxs_rx_lane_map_69.0=0x1302
+xgxs_rx_lane_map_73.0=0x1302
+xgxs_rx_lane_map_77.0=0x0213
+xgxs_rx_lane_map_81.0=0x1302
+xgxs_rx_lane_map_85.0=0x1302
+xgxs_rx_lane_map_89.0=0x1302
+xgxs_rx_lane_map_93.0=0x0213
+xgxs_rx_lane_map_97.0=0x1302
+xgxs_rx_lane_map_98.0=0x1302
+xgxs_rx_lane_map_99.0=0x1302
+xgxs_rx_lane_map_100.0=0x0213
+xgxs_rx_lane_map_101.0=0x0213
+xgxs_rx_lane_map_102.0=0x1302
+xgxs_rx_lane_map_103.0=0x0123
+xgxs_rx_lane_map_104.0=0x2031
+xgxs_tx_lane_map_1.0=0x0123
+xgxs_tx_lane_map_5.0=0x0321
+xgxs_tx_lane_map_9.0=0x2031
+xgxs_tx_lane_map_13.0=0x0213
+xgxs_tx_lane_map_17.0=0x2031
+xgxs_tx_lane_map_21.0=0x2031
+xgxs_tx_lane_map_25.0=0x2031
+xgxs_tx_lane_map_29.0=0x0213
+xgxs_tx_lane_map_33.0=0x2031
+xgxs_tx_lane_map_37.0=0x2031
+xgxs_tx_lane_map_41.0=0x2031
+xgxs_tx_lane_map_45.0=0x0213
+xgxs_tx_lane_map_49.0=0x2031
+xgxs_tx_lane_map_53.0=0x2031
+xgxs_tx_lane_map_57.0=0x2031
+xgxs_tx_lane_map_61.0=0x0213
+xgxs_tx_lane_map_65.0=0x2031
+xgxs_tx_lane_map_69.0=0x2031
+xgxs_tx_lane_map_73.0=0x2031
+xgxs_tx_lane_map_77.0=0x0213
+xgxs_tx_lane_map_81.0=0x2031
+xgxs_tx_lane_map_85.0=0x2031
+xgxs_tx_lane_map_89.0=0x2031
+xgxs_tx_lane_map_93.0=0x0213
+xgxs_tx_lane_map_97.0=0x2031
+xgxs_tx_lane_map_98.0=0x2031
+xgxs_tx_lane_map_99.0=0x2031
+xgxs_tx_lane_map_100.0=0x0213
+xgxs_tx_lane_map_101.0=0x0213
+xgxs_tx_lane_map_102.0=0x2031
+xgxs_tx_lane_map_103.0=0x3120
+xgxs_tx_lane_map_104.0=0x1302
+
+# tuning parameters
+serdes_preemphasis_lane0_1.0=0x81f7
+serdes_preemphasis_lane1_1.0=0x81f7
+serdes_preemphasis_lane2_1.0=0x81f7
+serdes_preemphasis_lane3_1.0=0x81f7
+serdes_pre_driver_current_lane0_5.0=0x7
+serdes_driver_current_lane0_5.0=0x7
+serdes_preemphasis_lane0_5.0=0xc2f0
+serdes_pre_driver_current_lane1_5.0=0x7
+serdes_driver_current_lane1_5.0=0x7
+serdes_preemphasis_lane1_5.0=0xc2f0
+serdes_pre_driver_current_lane2_5.0=0x7
+serdes_driver_current_lane2_5.0=0x7
+serdes_preemphasis_lane2_5.0=0xc2f0
+serdes_pre_driver_current_lane3_5.0=0x7
+serdes_driver_current_lane3_5.0=0x7
+serdes_preemphasis_lane3_5.0=0xc2f0
+serdes_pre_driver_current_lane0_9.0=0x7
+serdes_driver_current_lane0_9.0=0x7
+serdes_preemphasis_lane0_9.0=0xbb10
+serdes_pre_driver_current_lane1_9.0=0x7
+serdes_driver_current_lane1_9.0=0x7
+serdes_preemphasis_lane1_9.0=0xbb10
+serdes_pre_driver_current_lane2_9.0=0x7
+serdes_driver_current_lane2_9.0=0x7
+serdes_preemphasis_lane2_9.0=0xbb10
+serdes_pre_driver_current_lane3_9.0=0x7
+serdes_driver_current_lane3_9.0=0x7
+serdes_preemphasis_lane3_9.0=0xbb10
+serdes_pre_driver_current_lane0_13.0=0x7
+serdes_driver_current_lane0_13.0=0x7
+serdes_preemphasis_lane0_13.0=0xbb10
+serdes_pre_driver_current_lane1_13.0=0x7
+serdes_driver_current_lane1_13.0=0x7
+serdes_preemphasis_lane1_13.0=0xbb10
+serdes_pre_driver_current_lane2_13.0=0x7
+serdes_driver_current_lane2_13.0=0x7
+serdes_preemphasis_lane2_13.0=0xbb10
+serdes_pre_driver_current_lane3_13.0=0x7
+serdes_driver_current_lane3_13.0=0x7
+serdes_preemphasis_lane3_13.0=0xbb10
+serdes_pre_driver_current_lane0_17.0=0x6
+serdes_driver_current_lane0_17.0=0x6
+serdes_preemphasis_lane0_17.0=0xb720
+serdes_pre_driver_current_lane1_17.0=0x6
+serdes_driver_current_lane1_17.0=0x6
+serdes_preemphasis_lane1_17.0=0xb720
+serdes_pre_driver_current_lane2_17.0=0x6
+serdes_driver_current_lane2_17.0=0x6
+serdes_preemphasis_lane2_17.0=0xb720
+serdes_pre_driver_current_lane3_17.0=0x6
+serdes_driver_current_lane3_17.0=0x6
+serdes_preemphasis_lane3_17.0=0xb720
+serdes_pre_driver_current_lane0_21.0=0x7
+serdes_driver_current_lane0_21.0=0x7
+serdes_preemphasis_lane0_21.0=0xbb10
+serdes_pre_driver_current_lane1_21.0=0x7
+serdes_driver_current_lane1_21.0=0x7
+serdes_preemphasis_lane1_21.0=0xbb10
+serdes_pre_driver_current_lane2_21.0=0x7
+serdes_driver_current_lane2_21.0=0x7
+serdes_preemphasis_lane2_21.0=0xbb10
+serdes_pre_driver_current_lane3_21.0=0x7
+serdes_driver_current_lane3_21.0=0x7
+serdes_preemphasis_lane3_21.0=0xbb10
+serdes_pre_driver_current_lane0_25.0=0x5
+serdes_driver_current_lane0_25.0=0x5
+serdes_preemphasis_lane0_25.0=0xb720
+serdes_pre_driver_current_lane1_25.0=0x5
+serdes_driver_current_lane1_25.0=0x5
+serdes_preemphasis_lane1_25.0=0xb720
+serdes_pre_driver_current_lane2_25.0=0x5
+serdes_driver_current_lane2_25.0=0x5
+serdes_preemphasis_lane2_25.0=0xb720
+serdes_pre_driver_current_lane3_25.0=0x5
+serdes_driver_current_lane3_25.0=0x5
+serdes_preemphasis_lane3_25.0=0xb720
+serdes_pre_driver_current_lane0_29.0=0x5
+serdes_driver_current_lane0_29.0=0x5
+serdes_preemphasis_lane0_29.0=0xb720
+serdes_pre_driver_current_lane1_29.0=0x5
+serdes_driver_current_lane1_29.0=0x5
+serdes_preemphasis_lane1_29.0=0xb720
+serdes_pre_driver_current_lane2_29.0=0x5
+serdes_driver_current_lane2_29.0=0x5
+serdes_preemphasis_lane2_29.0=0xb720
+serdes_pre_driver_current_lane3_29.0=0x5
+serdes_driver_current_lane3_29.0=0x5
+serdes_preemphasis_lane3_29.0=0xb720
+serdes_pre_driver_current_lane0_33.0=0x4
+serdes_driver_current_lane0_33.0=0x4
+serdes_preemphasis_lane0_33.0=0xb720
+serdes_pre_driver_current_lane1_33.0=0x4
+serdes_driver_current_lane1_33.0=0x4
+serdes_preemphasis_lane1_33.0=0xb720
+serdes_pre_driver_current_lane2_33.0=0x4
+serdes_driver_current_lane2_33.0=0x4
+serdes_preemphasis_lane2_33.0=0xb720
+serdes_pre_driver_current_lane3_33.0=0x4
+serdes_driver_current_lane3_33.0=0x4
+serdes_preemphasis_lane3_33.0=0xb720
+serdes_pre_driver_current_lane0_37.0=0x5
+serdes_driver_current_lane0_37.0=0x5
+serdes_preemphasis_lane0_37.0=0xb720
+serdes_pre_driver_current_lane1_37.0=0x5
+serdes_driver_current_lane1_37.0=0x5
+serdes_preemphasis_lane1_37.0=0xb720
+serdes_pre_driver_current_lane2_37.0=0x5
+serdes_driver_current_lane2_37.0=0x5
+serdes_preemphasis_lane2_37.0=0xb720
+serdes_pre_driver_current_lane3_37.0=0x5
+serdes_driver_current_lane3_37.0=0x5
+serdes_preemphasis_lane3_37.0=0xb720
+serdes_pre_driver_current_lane0_41.0=0x3
+serdes_driver_current_lane0_41.0=0x3
+serdes_preemphasis_lane0_41.0=0xb330
+serdes_pre_driver_current_lane1_41.0=0x3
+serdes_driver_current_lane1_41.0=0x3
+serdes_preemphasis_lane1_41.0=0xb330
+serdes_pre_driver_current_lane2_41.0=0x3
+serdes_driver_current_lane2_41.0=0x3
+serdes_preemphasis_lane2_41.0=0xb330
+serdes_pre_driver_current_lane3_41.0=0x3
+serdes_driver_current_lane3_41.0=0x3
+serdes_preemphasis_lane3_41.0=0xb330
+serdes_pre_driver_current_lane0_45.0=0x4
+serdes_driver_current_lane0_45.0=0x4
+serdes_preemphasis_lane0_45.0=0xb720
+serdes_pre_driver_current_lane1_45.0=0x4
+serdes_driver_current_lane1_45.0=0x4
+serdes_preemphasis_lane1_45.0=0xb720
+serdes_pre_driver_current_lane2_45.0=0x4
+serdes_driver_current_lane2_45.0=0x4
+serdes_preemphasis_lane2_45.0=0xb720
+serdes_pre_driver_current_lane3_45.0=0x4
+serdes_driver_current_lane3_45.0=0x4
+serdes_preemphasis_lane3_45.0=0xb720
+serdes_pre_driver_current_lane0_49.0=0x3
+serdes_driver_current_lane0_49.0=0x3
+serdes_preemphasis_lane0_49.0=0xb330
+serdes_pre_driver_current_lane1_49.0=0x3
+serdes_driver_current_lane1_49.0=0x3
+serdes_preemphasis_lane1_49.0=0xb330
+serdes_pre_driver_current_lane2_49.0=0x3
+serdes_driver_current_lane2_49.0=0x3
+serdes_preemphasis_lane2_49.0=0xb330
+serdes_pre_driver_current_lane3_49.0=0x3
+serdes_driver_current_lane3_49.0=0x3
+serdes_preemphasis_lane3_49.0=0xb330
+serdes_pre_driver_current_lane0_53.0=0x4
+serdes_driver_current_lane0_53.0=0x4
+serdes_preemphasis_lane0_53.0=0xb720
+serdes_pre_driver_current_lane1_53.0=0x4
+serdes_driver_current_lane1_53.0=0x4
+serdes_preemphasis_lane1_53.0=0xb720
+serdes_pre_driver_current_lane2_53.0=0x4
+serdes_driver_current_lane2_53.0=0x4
+serdes_preemphasis_lane2_53.0=0xb720
+serdes_pre_driver_current_lane3_53.0=0x4
+serdes_driver_current_lane3_53.0=0x4
+serdes_preemphasis_lane3_53.0=0xb720
+serdes_pre_driver_current_lane0_57.0=0x3
+serdes_driver_current_lane0_57.0=0x3
+serdes_preemphasis_lane0_57.0=0xb330
+serdes_pre_driver_current_lane1_57.0=0x3
+serdes_driver_current_lane1_57.0=0x3
+serdes_preemphasis_lane1_57.0=0xb330
+serdes_pre_driver_current_lane2_57.0=0x3
+serdes_driver_current_lane2_57.0=0x3
+serdes_preemphasis_lane2_57.0=0xb330
+serdes_pre_driver_current_lane3_57.0=0x3
+serdes_driver_current_lane3_57.0=0x3
+serdes_preemphasis_lane3_57.0=0xb330
+serdes_pre_driver_current_lane0_61.0=0x4
+serdes_driver_current_lane0_61.0=0x4
+serdes_preemphasis_lane0_61.0=0xb720
+serdes_pre_driver_current_lane1_61.0=0x4
+serdes_driver_current_lane1_61.0=0x4
+serdes_preemphasis_lane1_61.0=0xb720
+serdes_pre_driver_current_lane2_61.0=0x4
+serdes_driver_current_lane2_61.0=0x4
+serdes_preemphasis_lane2_61.0=0xb720
+serdes_pre_driver_current_lane3_61.0=0x4
+serdes_driver_current_lane3_61.0=0x4
+serdes_preemphasis_lane3_61.0=0xb720
+serdes_pre_driver_current_lane0_65.0=0x4
+serdes_driver_current_lane0_65.0=0x4
+serdes_preemphasis_lane0_65.0=0xb720
+serdes_pre_driver_current_lane1_65.0=0x4
+serdes_driver_current_lane1_65.0=0x4
+serdes_preemphasis_lane1_65.0=0xb720
+serdes_pre_driver_current_lane2_65.0=0x4
+serdes_driver_current_lane2_65.0=0x4
+serdes_preemphasis_lane2_65.0=0xb720
+serdes_pre_driver_current_lane3_65.0=0x4
+serdes_driver_current_lane3_65.0=0x4
+serdes_preemphasis_lane3_65.0=0xb720
+serdes_pre_driver_current_lane0_69.0=0x4
+serdes_driver_current_lane0_69.0=0x4
+serdes_preemphasis_lane0_69.0=0xb720
+serdes_pre_driver_current_lane1_69.0=0x4
+serdes_driver_current_lane1_69.0=0x4
+serdes_preemphasis_lane1_69.0=0xb720
+serdes_pre_driver_current_lane2_69.0=0x4
+serdes_driver_current_lane2_69.0=0x4
+serdes_preemphasis_lane2_69.0=0xb720
+serdes_pre_driver_current_lane3_69.0=0x4
+serdes_driver_current_lane3_69.0=0x4
+serdes_preemphasis_lane3_69.0=0xb720
+serdes_pre_driver_current_lane0_73.0=0x4
+serdes_driver_current_lane0_73.0=0x4
+serdes_preemphasis_lane0_73.0=0xb720
+serdes_pre_driver_current_lane1_73.0=0x4
+serdes_driver_current_lane1_73.0=0x4
+serdes_preemphasis_lane1_73.0=0xb720
+serdes_pre_driver_current_lane2_73.0=0x4
+serdes_driver_current_lane2_73.0=0x4
+serdes_preemphasis_lane2_73.0=0xb720
+serdes_pre_driver_current_lane3_73.0=0x4
+serdes_driver_current_lane3_73.0=0x4
+serdes_preemphasis_lane3_73.0=0xb720
+serdes_pre_driver_current_lane0_77.0=0x5
+serdes_driver_current_lane0_77.0=0x5
+serdes_preemphasis_lane0_77.0=0xb720
+serdes_pre_driver_current_lane1_77.0=0x5
+serdes_driver_current_lane1_77.0=0x5
+serdes_preemphasis_lane1_77.0=0xb720
+serdes_pre_driver_current_lane2_77.0=0x5
+serdes_driver_current_lane2_77.0=0x5
+serdes_preemphasis_lane2_77.0=0xb720
+serdes_pre_driver_current_lane3_77.0=0x5
+serdes_driver_current_lane3_77.0=0x5
+serdes_preemphasis_lane3_77.0=0xb720
+serdes_pre_driver_current_lane0_81.0=0x5
+serdes_driver_current_lane0_81.0=0x5
+serdes_preemphasis_lane0_81.0=0xb720
+serdes_pre_driver_current_lane1_81.0=0x5
+serdes_driver_current_lane1_81.0=0x5
+serdes_preemphasis_lane1_81.0=0xb720
+serdes_pre_driver_current_lane2_81.0=0x5
+serdes_driver_current_lane2_81.0=0x5
+serdes_preemphasis_lane2_81.0=0xb720
+serdes_pre_driver_current_lane3_81.0=0x5
+serdes_driver_current_lane3_81.0=0x5
+serdes_preemphasis_lane3_81.0=0xb720
+serdes_pre_driver_current_lane0_85.0=0x5
+serdes_driver_current_lane0_85.0=0x5
+serdes_preemphasis_lane0_85.0=0xb720
+serdes_pre_driver_current_lane1_85.0=0x5
+serdes_driver_current_lane1_85.0=0x5
+serdes_preemphasis_lane1_85.0=0xb720
+serdes_pre_driver_current_lane2_85.0=0x5
+serdes_driver_current_lane2_85.0=0x5
+serdes_preemphasis_lane2_85.0=0xb720
+serdes_pre_driver_current_lane3_85.0=0x5
+serdes_driver_current_lane3_85.0=0x5
+serdes_preemphasis_lane3_85.0=0xb720
+serdes_pre_driver_current_lane0_89.0=0x6
+serdes_driver_current_lane0_89.0=0x6
+serdes_preemphasis_lane0_89.0=0xb720
+serdes_pre_driver_current_lane1_89.0=0x6
+serdes_driver_current_lane1_89.0=0x6
+serdes_preemphasis_lane1_89.0=0xb720
+serdes_pre_driver_current_lane2_89.0=0x6
+serdes_driver_current_lane2_89.0=0x6
+serdes_preemphasis_lane2_89.0=0xb720
+serdes_pre_driver_current_lane3_89.0=0x6
+serdes_driver_current_lane3_89.0=0x6
+serdes_preemphasis_lane3_89.0=0xb720
+serdes_pre_driver_current_lane0_93.0=0x7
+serdes_driver_current_lane0_93.0=0x7
+serdes_preemphasis_lane0_93.0=0xbb10
+serdes_pre_driver_current_lane1_93.0=0x7
+serdes_driver_current_lane1_93.0=0x7
+serdes_preemphasis_lane1_93.0=0xbb10
+serdes_pre_driver_current_lane2_93.0=0x7
+serdes_driver_current_lane2_93.0=0x7
+serdes_preemphasis_lane2_93.0=0xbb10
+serdes_pre_driver_current_lane3_93.0=0x7
+serdes_driver_current_lane3_93.0=0x7
+serdes_preemphasis_lane3_93.0=0xbb10
+serdes_pre_driver_current_lane0_97.0=0x5
+serdes_driver_current_lane0_97.0=0x5
+serdes_preemphasis_lane0_97.0=0xb720
+serdes_pre_driver_current_lane1_97.0=0x5
+serdes_driver_current_lane1_97.0=0x5
+serdes_preemphasis_lane1_97.0=0xb720
+serdes_pre_driver_current_lane2_97.0=0x5
+serdes_driver_current_lane2_97.0=0x5
+serdes_preemphasis_lane2_97.0=0xb720
+serdes_pre_driver_current_lane3_97.0=0x5
+serdes_driver_current_lane3_97.0=0x5
+serdes_preemphasis_lane3_97.0=0xb720
+serdes_pre_driver_current_lane0_98.0=0x6
+serdes_driver_current_lane0_98.0=0x6
+serdes_preemphasis_lane0_98.0=0xb720
+serdes_pre_driver_current_lane1_98.0=0x6
+serdes_driver_current_lane1_98.0=0x6
+serdes_preemphasis_lane1_98.0=0xb720
+serdes_pre_driver_current_lane2_98.0=0x6
+serdes_driver_current_lane2_98.0=0x6
+serdes_preemphasis_lane2_98.0=0xb720
+serdes_pre_driver_current_lane3_98.0=0x6
+serdes_driver_current_lane3_98.0=0x6
+serdes_preemphasis_lane3_98.0=0xb720
+serdes_pre_driver_current_lane0_99.0=0x5
+serdes_driver_current_lane0_99.0=0x5
+serdes_preemphasis_lane0_99.0=0xb720
+serdes_pre_driver_current_lane1_99.0=0x5
+serdes_driver_current_lane1_99.0=0x5
+serdes_preemphasis_lane1_99.0=0xb720
+serdes_pre_driver_current_lane2_99.0=0x5
+serdes_driver_current_lane2_99.0=0x5
+serdes_preemphasis_lane2_99.0=0xb720
+serdes_pre_driver_current_lane3_99.0=0x5
+serdes_driver_current_lane3_99.0=0x5
+serdes_preemphasis_lane3_99.0=0xb720
+serdes_pre_driver_current_lane0_100.0=0x7
+serdes_driver_current_lane0_100.0=0x7
+serdes_preemphasis_lane0_100.0=0xbb10
+serdes_pre_driver_current_lane1_100.0=0x7
+serdes_driver_current_lane1_100.0=0x7
+serdes_preemphasis_lane1_100.0=0xbb10
+serdes_pre_driver_current_lane2_100.0=0x7
+serdes_driver_current_lane2_100.0=0x7
+serdes_preemphasis_lane2_100.0=0xbb10
+serdes_pre_driver_current_lane3_100.0=0x7
+serdes_driver_current_lane3_100.0=0x7
+serdes_preemphasis_lane3_100.0=0xbb10
+serdes_pre_driver_current_lane0_101.0=0x7
+serdes_driver_current_lane0_101.0=0x7
+serdes_preemphasis_lane0_101.0=0xbb10
+serdes_pre_driver_current_lane1_101.0=0x7
+serdes_driver_current_lane1_101.0=0x7
+serdes_preemphasis_lane1_101.0=0xbb10
+serdes_pre_driver_current_lane2_101.0=0x7
+serdes_driver_current_lane2_101.0=0x7
+serdes_preemphasis_lane2_101.0=0xbb10
+serdes_pre_driver_current_lane3_101.0=0x7
+serdes_driver_current_lane3_101.0=0x7
+serdes_preemphasis_lane3_101.0=0xbb10
+serdes_pre_driver_current_lane0_102.0=0x7
+serdes_driver_current_lane0_102.0=0x7
+serdes_preemphasis_lane0_102.0=0xbb10
+serdes_pre_driver_current_lane1_102.0=0x7
+serdes_driver_current_lane1_102.0=0x7
+serdes_preemphasis_lane1_102.0=0xbb10
+serdes_pre_driver_current_lane2_102.0=0x7
+serdes_driver_current_lane2_102.0=0x7
+serdes_preemphasis_lane2_102.0=0xbb10
+serdes_pre_driver_current_lane3_102.0=0x7
+serdes_driver_current_lane3_102.0=0x7
+serdes_preemphasis_lane3_102.0=0xbb10
+serdes_preemphasis_lane0_103.0=0x81f4
+serdes_preemphasis_lane1_103.0=0x81f4
+serdes_preemphasis_lane2_103.0=0x81f4
+serdes_preemphasis_lane3_103.0=0x81f4
+serdes_preemphasis_lane0_104.0=0x81f5
+serdes_preemphasis_lane1_104.0=0x81f5
+serdes_preemphasis_lane2_104.0=0x81f5
+serdes_preemphasis_lane3_104.0=0x81f5
--- a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/sai.profile
+++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/sai.profile
@ -1,2 +0,0 @@
-SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td2-a7050-qx32s-32x40G.config.bcm
-SAI_NUM_ECMP_MEMBERS=64
--- a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/sai.profile.j2
+++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/sai.profile.j2
@ -0,0 +1,14 @@
+{# Get sai.profile based on switch_role #}
+{%- if DEVICE_METADATA is defined -%}
+{%-     set switch_role = DEVICE_METADATA['localhost']['type'] -%}
+{%-     if 'leafrouter' in switch_role.lower() -%}
+{%         set sai_profile_contents = 'SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td2-a7050-qx32s-32x40G-t1.config.bcm' -%}
+{%-     else %}
+{%-         set sai_profile_contents = 'SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td2-a7050-qx32s-32x40G-t0.config.bcm' -%}
+{%-     endif %}
+{%- else %}
+{%-     set sai_profile_contents = 'SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td2-a7050-qx32s-32x40G-t0.config.bcm' -%}
+{%- endif %}
+{# Write the contents of sai_ profile_filename to sai.profile file #}
+{{ sai_profile_contents }}
+SAI_NUM_ECMP_MEMBERS=64
--- a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/td2-a7050-qx32s-32x40G-t0.config.bcm
+++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/td2-a7050-qx32s-32x40G-t0.config.bcm
--- a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/td2-a7050-qx32s-32x40G-t1.config.bcm
+++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/td2-a7050-qx32s-32x40G-t1.config.bcm
@ -0,0 +1,752 @@
+#/******************************************************************************
+# *
+# *      File:   config.bcm.clearlake (7050-QX32S)
+# *      Name:
+# *
+# *      Description: This file contains SDK properties for an Arista
+# *      Clearlake platform.
+# *
+# *-----------------------------------------------------------------------------
+# ******************************************************************************/
+####################################################################
+# BCM Config file for Clearlake platform
+#  - 32x40g Portmode
+
+# ALPM enable
+l3_alpm_enable=2
+ipv6_lpm_128b_enable=1
+l2_mem_entries=32768
+l3_mem_entries=16384
+
+sai_hash_seed_config_hash_offset_enable=1
+
+# disables bcmALPMDH (ALPM distributed hitbit) thread.  This thread is purely for debug purpose
+l3_alpm_hit_skip=1
+
+# Disable Counting ACL Drop towards interface RX_DRP counter
+sai_adjust_acl_drop_in_rx_drop=1
+
+# From old config file
+os=unix
+higig2_hdr_mode=1
+
+# Parity
+parity_correction=1
+parity_enable=1
+stat_if_parity_enable=0
+
+# l2 thread related config vars
+l2xmsg_hostbuf_size=8192
+l2xmsg_mode=1
+
+bcm_num_cos=10
+bcm_stat_interval=2000000
+lls_num_l2uc=12
+max_vp_lags=0
+miim_intr_enable=0
+mmu_lossless=0
+module_64ports=0
+
+stable_size=0x2000000
+
+schan_intr_enable=0
+tdma_timeout_usec=5000000
+tslam_timeout_usec=15000000
+cdma_timeout_usec=15000000
+dma_desc_timeout_usec=15000000
+
+###############################
+serdes_fiber_pref=1
+###############################
+mdio_output_delay=0x0d
+###############################
+xgxs_lcpll_xtal_refclk=1
+tdma_intr_enable=1
+tslam_intr_enable=1
+table_dma_enable=1
+
+pbmp_oversubscribe.0=0x1fffffffffffffffffffffffffe
+pbmp_xport_xe.0=0x1fffffffffffffffffffffffffe
+phy_an_c37_1.0=3
+phy_an_c37_5.0=3
+phy_an_c37_9.0=3
+phy_an_c37_13.0=3
+phy_an_c37_17.0=3
+phy_an_c37_21.0=3
+phy_an_c37_25.0=3
+phy_an_c37_29.0=3
+phy_an_c37_33.0=3
+phy_an_c37_37.0=3
+phy_an_c37_41.0=3
+phy_an_c37_45.0=3
+phy_an_c37_49.0=3
+phy_an_c37_53.0=3
+phy_an_c37_57.0=3
+phy_an_c37_61.0=3
+phy_an_c37_65.0=3
+phy_an_c37_69.0=3
+phy_an_c37_73.0=3
+phy_an_c37_77.0=3
+phy_an_c37_81.0=3
+phy_an_c37_85.0=3
+phy_an_c37_89.0=3
+phy_an_c37_93.0=3
+phy_an_c37_97.0=0
+phy_an_c37_98.0=0
+phy_an_c37_99.0=0
+phy_an_c37_100.0=0
+phy_an_c37_101.0=0
+phy_an_c37_102.0=0
+phy_an_c37_103.0=0
+phy_an_c37_104.0=0
+phy_an_c73_1.0=0
+phy_an_c73_5.0=0
+phy_an_c73_9.0=0
+phy_an_c73_13.0=0
+phy_an_c73_17.0=0
+phy_an_c73_21.0=0
+phy_an_c73_25.0=0
+phy_an_c73_29.0=0
+phy_an_c73_33.0=0
+phy_an_c73_37.0=0
+phy_an_c73_41.0=0
+phy_an_c73_45.0=0
+phy_an_c73_49.0=0
+phy_an_c73_53.0=0
+phy_an_c73_57.0=0
+phy_an_c73_61.0=0
+phy_an_c73_65.0=0
+phy_an_c73_69.0=0
+phy_an_c73_73.0=0
+phy_an_c73_77.0=0
+phy_an_c73_81.0=0
+phy_an_c73_85.0=0
+phy_an_c73_89.0=0
+phy_an_c73_93.0=0
+phy_an_c73_97.0=2
+phy_an_c73_98.0=2
+phy_an_c73_99.0=2
+phy_an_c73_100.0=2
+phy_an_c73_101.0=2
+phy_an_c73_102.0=2
+phy_an_c73_103.0=2
+phy_an_c73_104.0=2
+phy_xaui_rx_polarity_flip_1.0=0x0
+phy_xaui_rx_polarity_flip_5.0=0x0
+phy_xaui_rx_polarity_flip_9.0=0x4
+phy_xaui_rx_polarity_flip_13.0=0x0
+phy_xaui_rx_polarity_flip_17.0=0xb
+phy_xaui_rx_polarity_flip_21.0=0x3
+phy_xaui_rx_polarity_flip_25.0=0xb
+phy_xaui_rx_polarity_flip_29.0=0xf
+phy_xaui_rx_polarity_flip_33.0=0xb
+phy_xaui_rx_polarity_flip_37.0=0x3
+phy_xaui_rx_polarity_flip_41.0=0xb
+phy_xaui_rx_polarity_flip_45.0=0x0
+phy_xaui_rx_polarity_flip_49.0=0x4
+phy_xaui_rx_polarity_flip_53.0=0xc
+phy_xaui_rx_polarity_flip_57.0=0x4
+phy_xaui_rx_polarity_flip_61.0=0x0
+phy_xaui_rx_polarity_flip_65.0=0xb
+phy_xaui_rx_polarity_flip_69.0=0x3
+phy_xaui_rx_polarity_flip_73.0=0xb
+phy_xaui_rx_polarity_flip_77.0=0xf
+phy_xaui_rx_polarity_flip_81.0=0xb
+phy_xaui_rx_polarity_flip_85.0=0x3
+phy_xaui_rx_polarity_flip_89.0=0x4
+phy_xaui_rx_polarity_flip_93.0=0x0
+phy_xaui_rx_polarity_flip_97.0=0xb
+phy_xaui_rx_polarity_flip_98.0=0x3
+phy_xaui_rx_polarity_flip_99.0=0x4
+phy_xaui_rx_polarity_flip_100.0=0x0
+phy_xaui_rx_polarity_flip_101.0=0x0
+phy_xaui_rx_polarity_flip_102.0=0xe
+phy_xaui_rx_polarity_flip_103.0=0x0
+phy_xaui_rx_polarity_flip_104.0=0x0
+phy_xaui_tx_polarity_flip_1.0=0x0
+phy_xaui_tx_polarity_flip_5.0=0x0
+phy_xaui_tx_polarity_flip_9.0=0x2
+phy_xaui_tx_polarity_flip_13.0=0x0
+phy_xaui_tx_polarity_flip_17.0=0xd
+phy_xaui_tx_polarity_flip_21.0=0xc
+phy_xaui_tx_polarity_flip_25.0=0xd
+phy_xaui_tx_polarity_flip_29.0=0xf
+phy_xaui_tx_polarity_flip_33.0=0xd
+phy_xaui_tx_polarity_flip_37.0=0xc
+phy_xaui_tx_polarity_flip_41.0=0xd
+phy_xaui_tx_polarity_flip_45.0=0x0
+phy_xaui_tx_polarity_flip_49.0=0x2
+phy_xaui_tx_polarity_flip_53.0=0x3
+phy_xaui_tx_polarity_flip_57.0=0x2
+phy_xaui_tx_polarity_flip_61.0=0x0
+phy_xaui_tx_polarity_flip_65.0=0xd
+phy_xaui_tx_polarity_flip_69.0=0xc
+phy_xaui_tx_polarity_flip_73.0=0xd
+phy_xaui_tx_polarity_flip_77.0=0xf
+phy_xaui_tx_polarity_flip_81.0=0xd
+phy_xaui_tx_polarity_flip_85.0=0xc
+phy_xaui_tx_polarity_flip_89.0=0x2
+phy_xaui_tx_polarity_flip_93.0=0x0
+phy_xaui_tx_polarity_flip_97.0=0xd
+phy_xaui_tx_polarity_flip_98.0=0xc
+phy_xaui_tx_polarity_flip_99.0=0x2
+phy_xaui_tx_polarity_flip_100.0=0x0
+phy_xaui_tx_polarity_flip_101.0=0x0
+phy_xaui_tx_polarity_flip_102.0=0x7
+phy_xaui_tx_polarity_flip_103.0=0x2
+phy_xaui_tx_polarity_flip_104.0=0x0
+port_init_autoneg_1.0=0
+port_init_autoneg_5.0=0
+port_init_autoneg_9.0=0
+port_init_autoneg_13.0=0
+port_init_autoneg_17.0=0
+port_init_autoneg_21.0=0
+port_init_autoneg_25.0=0
+port_init_autoneg_29.0=0
+port_init_autoneg_33.0=0
+port_init_autoneg_37.0=0
+port_init_autoneg_41.0=0
+port_init_autoneg_45.0=0
+port_init_autoneg_49.0=0
+port_init_autoneg_53.0=0
+port_init_autoneg_57.0=0
+port_init_autoneg_61.0=0
+port_init_autoneg_65.0=0
+port_init_autoneg_69.0=0
+port_init_autoneg_73.0=0
+port_init_autoneg_77.0=0
+port_init_autoneg_81.0=0
+port_init_autoneg_85.0=0
+port_init_autoneg_89.0=0
+port_init_autoneg_93.0=0
+port_init_autoneg_97.0=0
+port_init_autoneg_98.0=0
+port_init_autoneg_99.0=0
+port_init_autoneg_100.0=0
+port_init_autoneg_101.0=0
+port_init_autoneg_102.0=0
+port_init_autoneg_103.0=0
+port_init_autoneg_104.0=0
+port_init_cl72_hg.0=0x11
+port_phy_addr_1.0=0x7f
+port_phy_addr_5.0=0x7f
+port_phy_addr_9.0=0x7f
+port_phy_addr_13.0=0x7f
+port_phy_addr_17.0=0x7f
+port_phy_addr_21.0=0x7f
+port_phy_addr_25.0=0x7f
+port_phy_addr_29.0=0x7f
+port_phy_addr_33.0=0x7f
+port_phy_addr_37.0=0x7f
+port_phy_addr_41.0=0x7f
+port_phy_addr_45.0=0x7f
+port_phy_addr_49.0=0x7f
+port_phy_addr_53.0=0x7f
+port_phy_addr_57.0=0x7f
+port_phy_addr_61.0=0x7f
+port_phy_addr_65.0=0x7f
+port_phy_addr_69.0=0x7f
+port_phy_addr_73.0=0x7f
+port_phy_addr_77.0=0x7f
+port_phy_addr_81.0=0x7f
+port_phy_addr_85.0=0x7f
+port_phy_addr_89.0=0x7f
+port_phy_addr_93.0=0x7f
+port_phy_addr_97.0=0x7f
+port_phy_addr_98.0=0x7f
+port_phy_addr_99.0=0x7f
+port_phy_addr_100.0=0x7f
+port_phy_addr_101.0=0x7f
+port_phy_addr_102.0=0x7f
+port_phy_addr_103.0=0x7f
+port_phy_addr_104.0=0x7f
+portmap_1.0=9:40
+portmap_5.0=13:40
+portmap_9.0=17:40
+portmap_13.0=21:40
+portmap_17.0=29:40
+portmap_21.0=25:40
+portmap_25.0=33:40
+portmap_29.0=37:40
+portmap_33.0=45:40
+portmap_37.0=41:40
+portmap_41.0=49:40
+portmap_45.0=53:40
+portmap_49.0=69:40
+portmap_53.0=65:40
+portmap_57.0=73:40
+portmap_61.0=77:40
+portmap_65.0=93:40
+portmap_69.0=89:40
+portmap_73.0=97:40
+portmap_77.0=101:40
+portmap_81.0=109:40
+portmap_85.0=105:40
+portmap_89.0=121:40
+portmap_93.0=125:40
+portmap_97.0=61:40
+portmap_98.0=57:40
+portmap_99.0=81:40
+portmap_100.0=85:40
+portmap_101.0=117:40
+portmap_102.0=113:40
+portmap_103.0=1:40
+portmap_104.0=5:40
+serdes_firmware_mode_1.0=2
+serdes_firmware_mode_5.0=2
+serdes_firmware_mode_9.0=2
+serdes_firmware_mode_13.0=2
+serdes_firmware_mode_17.0=2
+serdes_firmware_mode_21.0=2
+serdes_firmware_mode_25.0=2
+serdes_firmware_mode_29.0=2
+serdes_firmware_mode_33.0=2
+serdes_firmware_mode_37.0=2
+serdes_firmware_mode_41.0=2
+serdes_firmware_mode_45.0=2
+serdes_firmware_mode_49.0=2
+serdes_firmware_mode_53.0=2
+serdes_firmware_mode_57.0=2
+serdes_firmware_mode_61.0=2
+serdes_firmware_mode_65.0=2
+serdes_firmware_mode_69.0=2
+serdes_firmware_mode_73.0=2
+serdes_firmware_mode_77.0=2
+serdes_firmware_mode_81.0=2
+serdes_firmware_mode_85.0=2
+serdes_firmware_mode_89.0=2
+serdes_firmware_mode_93.0=2
+serdes_firmware_mode_97.0=2
+serdes_firmware_mode_98.0=2
+serdes_firmware_mode_99.0=2
+serdes_firmware_mode_100.0=2
+serdes_firmware_mode_101.0=2
+serdes_firmware_mode_102.0=2
+serdes_firmware_mode_103.0=2
+serdes_firmware_mode_104.0=2
+xgxs_rx_lane_map_1.0=0x3210
+xgxs_rx_lane_map_5.0=0x0321
+xgxs_rx_lane_map_9.0=0x1302
+xgxs_rx_lane_map_13.0=0x0213
+xgxs_rx_lane_map_17.0=0x1302
+xgxs_rx_lane_map_21.0=0x1302
+xgxs_rx_lane_map_25.0=0x1302
+xgxs_rx_lane_map_29.0=0x0213
+xgxs_rx_lane_map_33.0=0x1302
+xgxs_rx_lane_map_37.0=0x1302
+xgxs_rx_lane_map_41.0=0x1302
+xgxs_rx_lane_map_45.0=0x0213
+xgxs_rx_lane_map_49.0=0x1302
+xgxs_rx_lane_map_53.0=0x1302
+xgxs_rx_lane_map_57.0=0x1302
+xgxs_rx_lane_map_61.0=0x0213
+xgxs_rx_lane_map_65.0=0x1302
+xgxs_rx_lane_map_69.0=0x1302
+xgxs_rx_lane_map_73.0=0x1302
+xgxs_rx_lane_map_77.0=0x0213
+xgxs_rx_lane_map_81.0=0x1302
+xgxs_rx_lane_map_85.0=0x1302
+xgxs_rx_lane_map_89.0=0x1302
+xgxs_rx_lane_map_93.0=0x0213
+xgxs_rx_lane_map_97.0=0x1302
+xgxs_rx_lane_map_98.0=0x1302
+xgxs_rx_lane_map_99.0=0x1302
+xgxs_rx_lane_map_100.0=0x0213
+xgxs_rx_lane_map_101.0=0x0213
+xgxs_rx_lane_map_102.0=0x1302
+xgxs_rx_lane_map_103.0=0x0123
+xgxs_rx_lane_map_104.0=0x2031
+xgxs_tx_lane_map_1.0=0x0123
+xgxs_tx_lane_map_5.0=0x0321
+xgxs_tx_lane_map_9.0=0x2031
+xgxs_tx_lane_map_13.0=0x0213
+xgxs_tx_lane_map_17.0=0x2031
+xgxs_tx_lane_map_21.0=0x2031
+xgxs_tx_lane_map_25.0=0x2031
+xgxs_tx_lane_map_29.0=0x0213
+xgxs_tx_lane_map_33.0=0x2031
+xgxs_tx_lane_map_37.0=0x2031
+xgxs_tx_lane_map_41.0=0x2031
+xgxs_tx_lane_map_45.0=0x0213
+xgxs_tx_lane_map_49.0=0x2031
+xgxs_tx_lane_map_53.0=0x2031
+xgxs_tx_lane_map_57.0=0x2031
+xgxs_tx_lane_map_61.0=0x0213
+xgxs_tx_lane_map_65.0=0x2031
+xgxs_tx_lane_map_69.0=0x2031
+xgxs_tx_lane_map_73.0=0x2031
+xgxs_tx_lane_map_77.0=0x0213
+xgxs_tx_lane_map_81.0=0x2031
+xgxs_tx_lane_map_85.0=0x2031
+xgxs_tx_lane_map_89.0=0x2031
+xgxs_tx_lane_map_93.0=0x0213
+xgxs_tx_lane_map_97.0=0x2031
+xgxs_tx_lane_map_98.0=0x2031
+xgxs_tx_lane_map_99.0=0x2031
+xgxs_tx_lane_map_100.0=0x0213
+xgxs_tx_lane_map_101.0=0x0213
+xgxs_tx_lane_map_102.0=0x2031
+xgxs_tx_lane_map_103.0=0x3120
+xgxs_tx_lane_map_104.0=0x1302
+
+# tuning parameters
+serdes_preemphasis_lane0_1.0=0x81f7
+serdes_preemphasis_lane1_1.0=0x81f7
+serdes_preemphasis_lane2_1.0=0x81f7
+serdes_preemphasis_lane3_1.0=0x81f7
+serdes_pre_driver_current_lane0_5.0=0x7
+serdes_driver_current_lane0_5.0=0x7
+serdes_preemphasis_lane0_5.0=0xc2f0
+serdes_pre_driver_current_lane1_5.0=0x7
+serdes_driver_current_lane1_5.0=0x7
+serdes_preemphasis_lane1_5.0=0xc2f0
+serdes_pre_driver_current_lane2_5.0=0x7
+serdes_driver_current_lane2_5.0=0x7
+serdes_preemphasis_lane2_5.0=0xc2f0
+serdes_pre_driver_current_lane3_5.0=0x7
+serdes_driver_current_lane3_5.0=0x7
+serdes_preemphasis_lane3_5.0=0xc2f0
+serdes_pre_driver_current_lane0_9.0=0x7
+serdes_driver_current_lane0_9.0=0x7
+serdes_preemphasis_lane0_9.0=0xbb10
+serdes_pre_driver_current_lane1_9.0=0x7
+serdes_driver_current_lane1_9.0=0x7
+serdes_preemphasis_lane1_9.0=0xbb10
+serdes_pre_driver_current_lane2_9.0=0x7
+serdes_driver_current_lane2_9.0=0x7
+serdes_preemphasis_lane2_9.0=0xbb10
+serdes_pre_driver_current_lane3_9.0=0x7
+serdes_driver_current_lane3_9.0=0x7
+serdes_preemphasis_lane3_9.0=0xbb10
+serdes_pre_driver_current_lane0_13.0=0x7
+serdes_driver_current_lane0_13.0=0x7
+serdes_preemphasis_lane0_13.0=0xbb10
+serdes_pre_driver_current_lane1_13.0=0x7
+serdes_driver_current_lane1_13.0=0x7
+serdes_preemphasis_lane1_13.0=0xbb10
+serdes_pre_driver_current_lane2_13.0=0x7
+serdes_driver_current_lane2_13.0=0x7
+serdes_preemphasis_lane2_13.0=0xbb10
+serdes_pre_driver_current_lane3_13.0=0x7
+serdes_driver_current_lane3_13.0=0x7
+serdes_preemphasis_lane3_13.0=0xbb10
+serdes_pre_driver_current_lane0_17.0=0x6
+serdes_driver_current_lane0_17.0=0x6
+serdes_preemphasis_lane0_17.0=0xb720
+serdes_pre_driver_current_lane1_17.0=0x6
+serdes_driver_current_lane1_17.0=0x6
+serdes_preemphasis_lane1_17.0=0xb720
+serdes_pre_driver_current_lane2_17.0=0x6
+serdes_driver_current_lane2_17.0=0x6
+serdes_preemphasis_lane2_17.0=0xb720
+serdes_pre_driver_current_lane3_17.0=0x6
+serdes_driver_current_lane3_17.0=0x6
+serdes_preemphasis_lane3_17.0=0xb720
+serdes_pre_driver_current_lane0_21.0=0x7
+serdes_driver_current_lane0_21.0=0x7
+serdes_preemphasis_lane0_21.0=0xbb10
+serdes_pre_driver_current_lane1_21.0=0x7
+serdes_driver_current_lane1_21.0=0x7
+serdes_preemphasis_lane1_21.0=0xbb10
+serdes_pre_driver_current_lane2_21.0=0x7
+serdes_driver_current_lane2_21.0=0x7
+serdes_preemphasis_lane2_21.0=0xbb10
+serdes_pre_driver_current_lane3_21.0=0x7
+serdes_driver_current_lane3_21.0=0x7
+serdes_preemphasis_lane3_21.0=0xbb10
+serdes_pre_driver_current_lane0_25.0=0x5
+serdes_driver_current_lane0_25.0=0x5
+serdes_preemphasis_lane0_25.0=0xb720
+serdes_pre_driver_current_lane1_25.0=0x5
+serdes_driver_current_lane1_25.0=0x5
+serdes_preemphasis_lane1_25.0=0xb720
+serdes_pre_driver_current_lane2_25.0=0x5
+serdes_driver_current_lane2_25.0=0x5
+serdes_preemphasis_lane2_25.0=0xb720
+serdes_pre_driver_current_lane3_25.0=0x5
+serdes_driver_current_lane3_25.0=0x5
+serdes_preemphasis_lane3_25.0=0xb720
+serdes_pre_driver_current_lane0_29.0=0x5
+serdes_driver_current_lane0_29.0=0x5
+serdes_preemphasis_lane0_29.0=0xb720
+serdes_pre_driver_current_lane1_29.0=0x5
+serdes_driver_current_lane1_29.0=0x5
+serdes_preemphasis_lane1_29.0=0xb720
+serdes_pre_driver_current_lane2_29.0=0x5
+serdes_driver_current_lane2_29.0=0x5
+serdes_preemphasis_lane2_29.0=0xb720
+serdes_pre_driver_current_lane3_29.0=0x5
+serdes_driver_current_lane3_29.0=0x5
+serdes_preemphasis_lane3_29.0=0xb720
+serdes_pre_driver_current_lane0_33.0=0x4
+serdes_driver_current_lane0_33.0=0x4
+serdes_preemphasis_lane0_33.0=0xb720
+serdes_pre_driver_current_lane1_33.0=0x4
+serdes_driver_current_lane1_33.0=0x4
+serdes_preemphasis_lane1_33.0=0xb720
+serdes_pre_driver_current_lane2_33.0=0x4
+serdes_driver_current_lane2_33.0=0x4
+serdes_preemphasis_lane2_33.0=0xb720
+serdes_pre_driver_current_lane3_33.0=0x4
+serdes_driver_current_lane3_33.0=0x4
+serdes_preemphasis_lane3_33.0=0xb720
+serdes_pre_driver_current_lane0_37.0=0x5
+serdes_driver_current_lane0_37.0=0x5
+serdes_preemphasis_lane0_37.0=0xb720
+serdes_pre_driver_current_lane1_37.0=0x5
+serdes_driver_current_lane1_37.0=0x5
+serdes_preemphasis_lane1_37.0=0xb720
+serdes_pre_driver_current_lane2_37.0=0x5
+serdes_driver_current_lane2_37.0=0x5
+serdes_preemphasis_lane2_37.0=0xb720
+serdes_pre_driver_current_lane3_37.0=0x5
+serdes_driver_current_lane3_37.0=0x5
+serdes_preemphasis_lane3_37.0=0xb720
+serdes_pre_driver_current_lane0_41.0=0x3
+serdes_driver_current_lane0_41.0=0x3
+serdes_preemphasis_lane0_41.0=0xb330
+serdes_pre_driver_current_lane1_41.0=0x3
+serdes_driver_current_lane1_41.0=0x3
+serdes_preemphasis_lane1_41.0=0xb330
+serdes_pre_driver_current_lane2_41.0=0x3
+serdes_driver_current_lane2_41.0=0x3
+serdes_preemphasis_lane2_41.0=0xb330
+serdes_pre_driver_current_lane3_41.0=0x3
+serdes_driver_current_lane3_41.0=0x3
+serdes_preemphasis_lane3_41.0=0xb330
+serdes_pre_driver_current_lane0_45.0=0x4
+serdes_driver_current_lane0_45.0=0x4
+serdes_preemphasis_lane0_45.0=0xb720
+serdes_pre_driver_current_lane1_45.0=0x4
+serdes_driver_current_lane1_45.0=0x4
+serdes_preemphasis_lane1_45.0=0xb720
+serdes_pre_driver_current_lane2_45.0=0x4
+serdes_driver_current_lane2_45.0=0x4
+serdes_preemphasis_lane2_45.0=0xb720
+serdes_pre_driver_current_lane3_45.0=0x4
+serdes_driver_current_lane3_45.0=0x4
+serdes_preemphasis_lane3_45.0=0xb720
+serdes_pre_driver_current_lane0_49.0=0x3
+serdes_driver_current_lane0_49.0=0x3
+serdes_preemphasis_lane0_49.0=0xb330
+serdes_pre_driver_current_lane1_49.0=0x3
+serdes_driver_current_lane1_49.0=0x3
+serdes_preemphasis_lane1_49.0=0xb330
+serdes_pre_driver_current_lane2_49.0=0x3
+serdes_driver_current_lane2_49.0=0x3
+serdes_preemphasis_lane2_49.0=0xb330
+serdes_pre_driver_current_lane3_49.0=0x3
+serdes_driver_current_lane3_49.0=0x3
+serdes_preemphasis_lane3_49.0=0xb330
+serdes_pre_driver_current_lane0_53.0=0x4
+serdes_driver_current_lane0_53.0=0x4
+serdes_preemphasis_lane0_53.0=0xb720
+serdes_pre_driver_current_lane1_53.0=0x4
+serdes_driver_current_lane1_53.0=0x4
+serdes_preemphasis_lane1_53.0=0xb720
+serdes_pre_driver_current_lane2_53.0=0x4
+serdes_driver_current_lane2_53.0=0x4
+serdes_preemphasis_lane2_53.0=0xb720
+serdes_pre_driver_current_lane3_53.0=0x4
+serdes_driver_current_lane3_53.0=0x4
+serdes_preemphasis_lane3_53.0=0xb720
+serdes_pre_driver_current_lane0_57.0=0x3
+serdes_driver_current_lane0_57.0=0x3
+serdes_preemphasis_lane0_57.0=0xb330
+serdes_pre_driver_current_lane1_57.0=0x3
+serdes_driver_current_lane1_57.0=0x3
+serdes_preemphasis_lane1_57.0=0xb330
+serdes_pre_driver_current_lane2_57.0=0x3
+serdes_driver_current_lane2_57.0=0x3
+serdes_preemphasis_lane2_57.0=0xb330
+serdes_pre_driver_current_lane3_57.0=0x3
+serdes_driver_current_lane3_57.0=0x3
+serdes_preemphasis_lane3_57.0=0xb330
+serdes_pre_driver_current_lane0_61.0=0x4
+serdes_driver_current_lane0_61.0=0x4
+serdes_preemphasis_lane0_61.0=0xb720
+serdes_pre_driver_current_lane1_61.0=0x4
+serdes_driver_current_lane1_61.0=0x4
+serdes_preemphasis_lane1_61.0=0xb720
+serdes_pre_driver_current_lane2_61.0=0x4
+serdes_driver_current_lane2_61.0=0x4
+serdes_preemphasis_lane2_61.0=0xb720
+serdes_pre_driver_current_lane3_61.0=0x4
+serdes_driver_current_lane3_61.0=0x4
+serdes_preemphasis_lane3_61.0=0xb720
+serdes_pre_driver_current_lane0_65.0=0x4
+serdes_driver_current_lane0_65.0=0x4
+serdes_preemphasis_lane0_65.0=0xb720
+serdes_pre_driver_current_lane1_65.0=0x4
+serdes_driver_current_lane1_65.0=0x4
+serdes_preemphasis_lane1_65.0=0xb720
+serdes_pre_driver_current_lane2_65.0=0x4
+serdes_driver_current_lane2_65.0=0x4
+serdes_preemphasis_lane2_65.0=0xb720
+serdes_pre_driver_current_lane3_65.0=0x4
+serdes_driver_current_lane3_65.0=0x4
+serdes_preemphasis_lane3_65.0=0xb720
+serdes_pre_driver_current_lane0_69.0=0x4
+serdes_driver_current_lane0_69.0=0x4
+serdes_preemphasis_lane0_69.0=0xb720
+serdes_pre_driver_current_lane1_69.0=0x4
+serdes_driver_current_lane1_69.0=0x4
+serdes_preemphasis_lane1_69.0=0xb720
+serdes_pre_driver_current_lane2_69.0=0x4
+serdes_driver_current_lane2_69.0=0x4
+serdes_preemphasis_lane2_69.0=0xb720
+serdes_pre_driver_current_lane3_69.0=0x4
+serdes_driver_current_lane3_69.0=0x4
+serdes_preemphasis_lane3_69.0=0xb720
+serdes_pre_driver_current_lane0_73.0=0x4
+serdes_driver_current_lane0_73.0=0x4
+serdes_preemphasis_lane0_73.0=0xb720
+serdes_pre_driver_current_lane1_73.0=0x4
+serdes_driver_current_lane1_73.0=0x4
+serdes_preemphasis_lane1_73.0=0xb720
+serdes_pre_driver_current_lane2_73.0=0x4
+serdes_driver_current_lane2_73.0=0x4
+serdes_preemphasis_lane2_73.0=0xb720
+serdes_pre_driver_current_lane3_73.0=0x4
+serdes_driver_current_lane3_73.0=0x4
+serdes_preemphasis_lane3_73.0=0xb720
+serdes_pre_driver_current_lane0_77.0=0x5
+serdes_driver_current_lane0_77.0=0x5
+serdes_preemphasis_lane0_77.0=0xb720
+serdes_pre_driver_current_lane1_77.0=0x5
+serdes_driver_current_lane1_77.0=0x5
+serdes_preemphasis_lane1_77.0=0xb720
+serdes_pre_driver_current_lane2_77.0=0x5
+serdes_driver_current_lane2_77.0=0x5
+serdes_preemphasis_lane2_77.0=0xb720
+serdes_pre_driver_current_lane3_77.0=0x5
+serdes_driver_current_lane3_77.0=0x5
+serdes_preemphasis_lane3_77.0=0xb720
+serdes_pre_driver_current_lane0_81.0=0x5
+serdes_driver_current_lane0_81.0=0x5
+serdes_preemphasis_lane0_81.0=0xb720
+serdes_pre_driver_current_lane1_81.0=0x5
+serdes_driver_current_lane1_81.0=0x5
+serdes_preemphasis_lane1_81.0=0xb720
+serdes_pre_driver_current_lane2_81.0=0x5
+serdes_driver_current_lane2_81.0=0x5
+serdes_preemphasis_lane2_81.0=0xb720
+serdes_pre_driver_current_lane3_81.0=0x5
+serdes_driver_current_lane3_81.0=0x5
+serdes_preemphasis_lane3_81.0=0xb720
+serdes_pre_driver_current_lane0_85.0=0x5
+serdes_driver_current_lane0_85.0=0x5
+serdes_preemphasis_lane0_85.0=0xb720
+serdes_pre_driver_current_lane1_85.0=0x5
+serdes_driver_current_lane1_85.0=0x5
+serdes_preemphasis_lane1_85.0=0xb720
+serdes_pre_driver_current_lane2_85.0=0x5
+serdes_driver_current_lane2_85.0=0x5
+serdes_preemphasis_lane2_85.0=0xb720
+serdes_pre_driver_current_lane3_85.0=0x5
+serdes_driver_current_lane3_85.0=0x5
+serdes_preemphasis_lane3_85.0=0xb720
+serdes_pre_driver_current_lane0_89.0=0x6
+serdes_driver_current_lane0_89.0=0x6
+serdes_preemphasis_lane0_89.0=0xb720
+serdes_pre_driver_current_lane1_89.0=0x6
+serdes_driver_current_lane1_89.0=0x6
+serdes_preemphasis_lane1_89.0=0xb720
+serdes_pre_driver_current_lane2_89.0=0x6
+serdes_driver_current_lane2_89.0=0x6
+serdes_preemphasis_lane2_89.0=0xb720
+serdes_pre_driver_current_lane3_89.0=0x6
+serdes_driver_current_lane3_89.0=0x6
+serdes_preemphasis_lane3_89.0=0xb720
+serdes_pre_driver_current_lane0_93.0=0x7
+serdes_driver_current_lane0_93.0=0x7
+serdes_preemphasis_lane0_93.0=0xbb10
+serdes_pre_driver_current_lane1_93.0=0x7
+serdes_driver_current_lane1_93.0=0x7
+serdes_preemphasis_lane1_93.0=0xbb10
+serdes_pre_driver_current_lane2_93.0=0x7
+serdes_driver_current_lane2_93.0=0x7
+serdes_preemphasis_lane2_93.0=0xbb10
+serdes_pre_driver_current_lane3_93.0=0x7
+serdes_driver_current_lane3_93.0=0x7
+serdes_preemphasis_lane3_93.0=0xbb10
+serdes_pre_driver_current_lane0_97.0=0x5
+serdes_driver_current_lane0_97.0=0x5
+serdes_preemphasis_lane0_97.0=0xb720
+serdes_pre_driver_current_lane1_97.0=0x5
+serdes_driver_current_lane1_97.0=0x5
+serdes_preemphasis_lane1_97.0=0xb720
+serdes_pre_driver_current_lane2_97.0=0x5
+serdes_driver_current_lane2_97.0=0x5
+serdes_preemphasis_lane2_97.0=0xb720
+serdes_pre_driver_current_lane3_97.0=0x5
+serdes_driver_current_lane3_97.0=0x5
+serdes_preemphasis_lane3_97.0=0xb720
+serdes_pre_driver_current_lane0_98.0=0x6
+serdes_driver_current_lane0_98.0=0x6
+serdes_preemphasis_lane0_98.0=0xb720
+serdes_pre_driver_current_lane1_98.0=0x6
+serdes_driver_current_lane1_98.0=0x6
+serdes_preemphasis_lane1_98.0=0xb720
+serdes_pre_driver_current_lane2_98.0=0x6
+serdes_driver_current_lane2_98.0=0x6
+serdes_preemphasis_lane2_98.0=0xb720
+serdes_pre_driver_current_lane3_98.0=0x6
+serdes_driver_current_lane3_98.0=0x6
+serdes_preemphasis_lane3_98.0=0xb720
+serdes_pre_driver_current_lane0_99.0=0x5
+serdes_driver_current_lane0_99.0=0x5
+serdes_preemphasis_lane0_99.0=0xb720
+serdes_pre_driver_current_lane1_99.0=0x5
+serdes_driver_current_lane1_99.0=0x5
+serdes_preemphasis_lane1_99.0=0xb720
+serdes_pre_driver_current_lane2_99.0=0x5
+serdes_driver_current_lane2_99.0=0x5
+serdes_preemphasis_lane2_99.0=0xb720
+serdes_pre_driver_current_lane3_99.0=0x5
+serdes_driver_current_lane3_99.0=0x5
+serdes_preemphasis_lane3_99.0=0xb720
+serdes_pre_driver_current_lane0_100.0=0x7
+serdes_driver_current_lane0_100.0=0x7
+serdes_preemphasis_lane0_100.0=0xbb10
+serdes_pre_driver_current_lane1_100.0=0x7
+serdes_driver_current_lane1_100.0=0x7
+serdes_preemphasis_lane1_100.0=0xbb10
+serdes_pre_driver_current_lane2_100.0=0x7
+serdes_driver_current_lane2_100.0=0x7
+serdes_preemphasis_lane2_100.0=0xbb10
+serdes_pre_driver_current_lane3_100.0=0x7
+serdes_driver_current_lane3_100.0=0x7
+serdes_preemphasis_lane3_100.0=0xbb10
+serdes_pre_driver_current_lane0_101.0=0x7
+serdes_driver_current_lane0_101.0=0x7
+serdes_preemphasis_lane0_101.0=0xbb10
+serdes_pre_driver_current_lane1_101.0=0x7
+serdes_driver_current_lane1_101.0=0x7
+serdes_preemphasis_lane1_101.0=0xbb10
+serdes_pre_driver_current_lane2_101.0=0x7
+serdes_driver_current_lane2_101.0=0x7
+serdes_preemphasis_lane2_101.0=0xbb10
+serdes_pre_driver_current_lane3_101.0=0x7
+serdes_driver_current_lane3_101.0=0x7
+serdes_preemphasis_lane3_101.0=0xbb10
+serdes_pre_driver_current_lane0_102.0=0x7
+serdes_driver_current_lane0_102.0=0x7
+serdes_preemphasis_lane0_102.0=0xbb10
+serdes_pre_driver_current_lane1_102.0=0x7
+serdes_driver_current_lane1_102.0=0x7
+serdes_preemphasis_lane1_102.0=0xbb10
+serdes_pre_driver_current_lane2_102.0=0x7
+serdes_driver_current_lane2_102.0=0x7
+serdes_preemphasis_lane2_102.0=0xbb10
+serdes_pre_driver_current_lane3_102.0=0x7
+serdes_driver_current_lane3_102.0=0x7
+serdes_preemphasis_lane3_102.0=0xbb10
+serdes_preemphasis_lane0_103.0=0x81f4
+serdes_preemphasis_lane1_103.0=0x81f4
+serdes_preemphasis_lane2_103.0=0x81f4
+serdes_preemphasis_lane3_103.0=0x81f4
+serdes_preemphasis_lane0_104.0=0x81f5
+serdes_preemphasis_lane1_104.0=0x81f5
+serdes_preemphasis_lane2_104.0=0x81f5
+serdes_preemphasis_lane3_104.0=0x81f5
--- a/device/arista/x86_64-arista_7050_qx32s/platform.json
+++ b/device/arista/x86_64-arista_7050_qx32s/platform.json
@ -1,7 +1,23 @@
 {
    "chassis": {
        "name": "DCS-7050QX-32S",
-        "components": [],
+        "components": [
+	    {
+                "name": "Aboot()"
+            },
+            {
+                "name": "Scd(addr=0000:02:00.0)"
+            },
+            {
+                "name": "Ucd90120A(addr=4-004e)"
+            },
+            {
+                "name": "Ucd90120A(addr=8-004e)"
+            },
+            {
+                "name": "CrowSysCpld(addr=2-0023)"
+            }
+	],
        "fans": [],
        "fan_drawers": [
            {
--- a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/sai.profile
+++ b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/sai.profile
@ -1,2 +0,0 @@
-SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th-a7060-cx32s-32x100G-t1.config.bcm
-SAI_NUM_ECMP_MEMBERS=64
--- a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/sai.profile.j2
+++ b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/sai.profile.j2
@ -0,0 +1,14 @@
+{# Get sai.profile based on switch_role #}
+{%- if DEVICE_METADATA is defined -%}
+{%-     set switch_role = DEVICE_METADATA['localhost']['type'] -%}
+{%-     if 'leafrouter' in switch_role.lower() -%}
+{%         set sai_profile_contents = 'SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th-a7060-cx32s-32x100G-t1.config.bcm' -%}
+{%-     else %}
+{%-         set sai_profile_contents = 'SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th-a7060-cx32s-32x100G-t0.config.bcm' -%}
+{%-     endif %}
+{%- else %}
+{%-     set sai_profile_contents = 'SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th-a7060-cx32s-32x100G-t1.config.bcm' -%}
+{%- endif %}
+{# Write the contents of sai_ profile_filename to sai.profile file #}
+{{ sai_profile_contents }}
+SAI_NUM_ECMP_MEMBERS=64
--- a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/th-a7060-cx32s-32x100G-t0.config.bcm
+++ b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/th-a7060-cx32s-32x100G-t0.config.bcm
@ -0,0 +1,453 @@
+# Arista 7060CX-32S
+
+# disables bcmALPMDH (ALPM distributed hitbit) thread.  This thread is purely for debug purpose
+l3_alpm_hit_skip=1
+
+# Disable Counting ACL Drop towards interface RX_DRP counter
+sai_adjust_acl_drop_in_rx_drop=1
+
+phy_an_allow_pll_change=1
+arl_clean_timeout_usec=15000000
+asf_mem_profile=2
+bcm_num_cos=10
+bcm_stat_flags=1
+bcm_stat_jumbo=9236
+cdma_timeout_usec=15000000
+dma_desc_timeout_usec=15000000
+higig2_hdr_mode=1
+ipv6_lpm_128b_enable=1
+l3_alpm_enable=2
+lpm_scaling_enable=0
+l2xmsg_mode=1
+max_vp_lags=0
+miim_intr_enable=0
+module_64ports=1
+os=unix
+oversubscribe_mode=1
+ptp_bs_fref.0=25000000
+ptp_ts_pll_fref.0=25000000
+robust_hash_disable_egress_vlan.0=1
+robust_hash_disable_mpls.0=1
+robust_hash_disable_vlan.0=1
+tdma_timeout_usec.0=15000000
+tslam_timeout_usec.0=15000000
+pbmp_xport_xe.0=0x7ffffffffffffffffffffffffffffffffe
+phy_an_allow_pll_change_hg.0=0
+phy_an_c73_1.0=1
+phy_an_c73_2.0=1
+phy_an_c73_3.0=1
+phy_an_c73_4.0=1
+phy_an_c73_5.0=1
+phy_an_c73_6.0=1
+phy_an_c73_7.0=1
+phy_an_c73_8.0=1
+phy_an_c73_34.0=1
+phy_an_c73_35.0=1
+phy_an_c73_36.0=1
+phy_an_c73_37.0=1
+phy_an_c73_38.0=1
+phy_an_c73_39.0=1
+phy_an_c73_40.0=1
+phy_an_c73_41.0=1
+phy_an_c73_68.0=1
+phy_an_c73_69.0=1
+phy_an_c73_70.0=1
+phy_an_c73_71.0=1
+phy_an_c73_72.0=1
+phy_an_c73_73.0=1
+phy_an_c73_74.0=1
+phy_an_c73_75.0=1
+phy_an_c73_102.0=1
+phy_an_c73_103.0=1
+phy_an_c73_104.0=1
+phy_an_c73_105.0=1
+phy_an_c73_106.0=1
+phy_an_c73_107.0=1
+phy_an_c73_108.0=1
+phy_an_c73_109.0=1
+phy_an_fec_1.0=1
+phy_an_fec_2.0=1
+phy_an_fec_3.0=1
+phy_an_fec_4.0=1
+phy_an_fec_5.0=1
+phy_an_fec_6.0=1
+phy_an_fec_7.0=1
+phy_an_fec_8.0=1
+phy_an_fec_9.0=1
+phy_an_fec_10.0=1
+phy_an_fec_11.0=1
+phy_an_fec_12.0=1
+phy_an_fec_13.0=1
+phy_an_fec_14.0=1
+phy_an_fec_15.0=1
+phy_an_fec_16.0=1
+phy_an_fec_17.0=1
+phy_an_fec_18.0=1
+phy_an_fec_19.0=1
+phy_an_fec_20.0=1
+phy_an_fec_21.0=1
+phy_an_fec_22.0=1
+phy_an_fec_23.0=1
+phy_an_fec_24.0=1
+phy_an_fec_25.0=1
+phy_an_fec_26.0=1
+phy_an_fec_27.0=1
+phy_an_fec_28.0=1
+phy_an_fec_29.0=1
+phy_an_fec_30.0=1
+phy_an_fec_31.0=1
+phy_an_fec_32.0=1
+phy_an_fec_34.0=1
+phy_an_fec_38.0=1
+phy_an_fec_39.0=1
+phy_an_fec_40.0=1
+phy_an_fec_41.0=1
+phy_an_fec_42.0=1
+phy_an_fec_43.0=1
+phy_an_fec_44.0=1
+phy_an_fec_45.0=1
+phy_an_fec_46.0=1
+phy_an_fec_47.0=1
+phy_an_fec_48.0=1
+phy_an_fec_49.0=1
+phy_an_fec_50.0=1
+phy_an_fec_51.0=1
+phy_an_fec_52.0=1
+phy_an_fec_53.0=1
+phy_an_fec_54.0=1
+phy_an_fec_55.0=1
+phy_an_fec_56.0=1
+phy_an_fec_57.0=1
+phy_an_fec_58.0=1
+phy_an_fec_59.0=1
+phy_an_fec_60.0=1
+phy_an_fec_61.0=1
+phy_an_fec_62.0=1
+phy_an_fec_63.0=1
+phy_an_fec_64.0=1
+phy_an_fec_65.0=1
+phy_an_fec_68.0=1
+phy_an_fec_69.0=1
+phy_an_fec_70.0=1
+phy_an_fec_71.0=1
+phy_an_fec_72.0=1
+phy_an_fec_73.0=1
+phy_an_fec_74.0=1
+phy_an_fec_75.0=1
+phy_an_fec_76.0=1
+phy_an_fec_77.0=1
+phy_an_fec_78.0=1
+phy_an_fec_79.0=1
+phy_an_fec_80.0=1
+phy_an_fec_81.0=1
+phy_an_fec_82.0=1
+phy_an_fec_83.0=1
+phy_an_fec_84.0=1
+phy_an_fec_85.0=1
+phy_an_fec_86.0=1
+phy_an_fec_87.0=1
+phy_an_fec_88.0=1
+phy_an_fec_89.0=1
+phy_an_fec_90.0=1
+phy_an_fec_91.0=1
+phy_an_fec_92.0=1
+phy_an_fec_93.0=1
+phy_an_fec_94.0=1
+phy_an_fec_95.0=1
+phy_an_fec_96.0=1
+phy_an_fec_97.0=1
+phy_an_fec_98.0=1
+phy_an_fec_99.0=1
+phy_an_fec_102.0=1
+phy_an_fec_103.0=1
+phy_an_fec_104.0=1
+phy_an_fec_105.0=1
+phy_an_fec_106.0=1
+phy_an_fec_107.0=1
+phy_an_fec_108.0=1
+phy_an_fec_109.0=1
+phy_an_fec_110.0=1
+phy_an_fec_111.0=1
+phy_an_fec_112.0=1
+phy_an_fec_113.0=1
+phy_an_fec_114.0=1
+phy_an_fec_115.0=1
+phy_an_fec_116.0=1
+phy_an_fec_117.0=1
+phy_an_fec_118.0=1
+phy_an_fec_119.0=1
+phy_an_fec_120.0=1
+phy_an_fec_121.0=1
+phy_an_fec_122.0=1
+phy_an_fec_123.0=1
+phy_an_fec_124.0=1
+phy_an_fec_125.0=1
+phy_an_fec_126.0=1
+phy_an_fec_127.0=1
+phy_an_fec_128.0=1
+phy_an_fec_129.0=1
+phy_an_fec_130.0=1
+phy_an_fec_131.0=1
+phy_an_fec_132.0=1
+phy_an_fec_133.0=1
+phy_xaui_rx_polarity_flip_1.0=0x1
+phy_xaui_rx_polarity_flip_2.0=0x5
+phy_xaui_rx_polarity_flip_3.0=0x1
+phy_xaui_rx_polarity_flip_4.0=0x7
+phy_xaui_rx_polarity_flip_5.0=0xc
+phy_xaui_rx_polarity_flip_6.0=0xf
+phy_xaui_rx_polarity_flip_7.0=0xc
+phy_xaui_rx_polarity_flip_8.0=0xf
+phy_xaui_rx_polarity_flip_34.0=0x0
+phy_xaui_rx_polarity_flip_35.0=0x7
+phy_xaui_rx_polarity_flip_36.0=0x4
+phy_xaui_rx_polarity_flip_37.0=0x7
+phy_xaui_rx_polarity_flip_38.0=0x4
+phy_xaui_rx_polarity_flip_39.0=0x6
+phy_xaui_rx_polarity_flip_40.0=0x1
+phy_xaui_rx_polarity_flip_41.0=0x2
+phy_xaui_rx_polarity_flip_68.0=0xd
+phy_xaui_rx_polarity_flip_69.0=0x6
+phy_xaui_rx_polarity_flip_70.0=0x1
+phy_xaui_rx_polarity_flip_71.0=0x8
+phy_xaui_rx_polarity_flip_72.0=0x7
+phy_xaui_rx_polarity_flip_73.0=0xc
+phy_xaui_rx_polarity_flip_74.0=0x7
+phy_xaui_rx_polarity_flip_75.0=0x8
+phy_xaui_rx_polarity_flip_102.0=0xb
+phy_xaui_rx_polarity_flip_103.0=0xc
+phy_xaui_rx_polarity_flip_104.0=0x3
+phy_xaui_rx_polarity_flip_105.0=0xc
+phy_xaui_rx_polarity_flip_106.0=0xb
+phy_xaui_rx_polarity_flip_107.0=0x5
+phy_xaui_rx_polarity_flip_108.0=0x1
+phy_xaui_rx_polarity_flip_109.0=0x9
+phy_xaui_tx_polarity_flip_1.0=0x0
+phy_xaui_tx_polarity_flip_2.0=0xe
+phy_xaui_tx_polarity_flip_3.0=0x2
+phy_xaui_tx_polarity_flip_4.0=0xe
+phy_xaui_tx_polarity_flip_5.0=0xc
+phy_xaui_tx_polarity_flip_6.0=0xf
+phy_xaui_tx_polarity_flip_7.0=0xc
+phy_xaui_tx_polarity_flip_8.0=0xf
+phy_xaui_tx_polarity_flip_34.0=0x0
+phy_xaui_tx_polarity_flip_35.0=0xe
+phy_xaui_tx_polarity_flip_36.0=0x0
+phy_xaui_tx_polarity_flip_37.0=0xe
+phy_xaui_tx_polarity_flip_38.0=0xf
+phy_xaui_tx_polarity_flip_39.0=0xe
+phy_xaui_tx_polarity_flip_40.0=0x6
+phy_xaui_tx_polarity_flip_41.0=0xb
+phy_xaui_tx_polarity_flip_68.0=0x9
+phy_xaui_tx_polarity_flip_69.0=0xb
+phy_xaui_tx_polarity_flip_70.0=0xd
+phy_xaui_tx_polarity_flip_71.0=0x9
+phy_xaui_tx_polarity_flip_72.0=0x6
+phy_xaui_tx_polarity_flip_73.0=0xc
+phy_xaui_tx_polarity_flip_74.0=0x9
+phy_xaui_tx_polarity_flip_75.0=0x9
+phy_xaui_tx_polarity_flip_102.0=0x6
+phy_xaui_tx_polarity_flip_103.0=0xb
+phy_xaui_tx_polarity_flip_104.0=0x6
+phy_xaui_tx_polarity_flip_105.0=0xb
+phy_xaui_tx_polarity_flip_106.0=0x6
+phy_xaui_tx_polarity_flip_107.0=0xf
+phy_xaui_tx_polarity_flip_108.0=0x6
+phy_xaui_tx_polarity_flip_109.0=0xc
+portmap_1.0=1:100
+portmap_2.0=5:100
+portmap_3.0=9:100
+portmap_4.0=13:100
+portmap_5.0=17:100
+portmap_6.0=21:100
+portmap_7.0=25:100
+portmap_8.0=29:100
+portmap_34.0=33:100
+portmap_35.0=37:100
+portmap_36.0=41:100
+portmap_37.0=45:100
+portmap_38.0=49:100
+portmap_39.0=53:100
+portmap_40.0=57:100
+portmap_41.0=61:100
+portmap_68.0=65:100
+portmap_69.0=69:100
+portmap_70.0=73:100
+portmap_71.0=77:100
+portmap_72.0=81:100
+portmap_73.0=85:100
+portmap_74.0=89:100
+portmap_75.0=93:100
+portmap_102.0=97:100
+portmap_103.0=101:100
+portmap_104.0=105:100
+portmap_105.0=109:100
+portmap_106.0=113:100
+portmap_107.0=117:100
+portmap_108.0=121:100
+portmap_109.0=125:100
+port_phy_addr_1.0=0xff
+port_phy_addr_2.0=0xff
+port_phy_addr_3.0=0xff
+port_phy_addr_4.0=0xff
+port_phy_addr_5.0=0xff
+port_phy_addr_6.0=0xff
+port_phy_addr_7.0=0xff
+port_phy_addr_8.0=0xff
+port_phy_addr_34.0=0xff
+port_phy_addr_35.0=0xff
+port_phy_addr_36.0=0xff
+port_phy_addr_37.0=0xff
+port_phy_addr_38.0=0xff
+port_phy_addr_39.0=0xff
+port_phy_addr_40.0=0xff
+port_phy_addr_41.0=0xff
+port_phy_addr_68.0=0xff
+port_phy_addr_69.0=0xff
+port_phy_addr_70.0=0xff
+port_phy_addr_71.0=0xff
+port_phy_addr_72.0=0xff
+port_phy_addr_73.0=0xff
+port_phy_addr_74.0=0xff
+port_phy_addr_75.0=0xff
+port_phy_addr_102.0=0xff
+port_phy_addr_103.0=0xff
+port_phy_addr_104.0=0xff
+port_phy_addr_105.0=0xff
+port_phy_addr_106.0=0xff
+port_phy_addr_107.0=0xff
+port_phy_addr_108.0=0xff
+port_phy_addr_109.0=0xff
+xgxs_rx_lane_map_1.0=0x3210
+xgxs_rx_lane_map_2.0=0x3210
+xgxs_rx_lane_map_3.0=0x3210
+xgxs_rx_lane_map_4.0=0x3210
+xgxs_rx_lane_map_5.0=0x0123
+xgxs_rx_lane_map_6.0=0x2301
+xgxs_rx_lane_map_7.0=0x0123
+xgxs_rx_lane_map_8.0=0x2301
+xgxs_rx_lane_map_34.0=0x0123
+xgxs_rx_lane_map_35.0=0x0321
+xgxs_rx_lane_map_36.0=0x0321
+xgxs_rx_lane_map_37.0=0x0321
+xgxs_rx_lane_map_38.0=0x1230
+xgxs_rx_lane_map_39.0=0x2301
+xgxs_rx_lane_map_40.0=0x1230
+xgxs_rx_lane_map_41.0=0x2103
+xgxs_rx_lane_map_68.0=0x1230
+xgxs_rx_lane_map_69.0=0x2301
+xgxs_rx_lane_map_70.0=0x1230
+xgxs_rx_lane_map_71.0=0x2103
+xgxs_rx_lane_map_72.0=0x1230
+xgxs_rx_lane_map_73.0=0x2301
+xgxs_rx_lane_map_74.0=0x1230
+xgxs_rx_lane_map_75.0=0x2103
+xgxs_rx_lane_map_102.0=0x3210
+xgxs_rx_lane_map_103.0=0x3210
+xgxs_rx_lane_map_104.0=0x3210
+xgxs_rx_lane_map_105.0=0x3210
+xgxs_rx_lane_map_106.0=0x3210
+xgxs_rx_lane_map_107.0=0x3210
+xgxs_rx_lane_map_108.0=0x3210
+xgxs_rx_lane_map_109.0=0x3210
+xgxs_tx_lane_map_1.0=0x0321
+xgxs_tx_lane_map_2.0=0x2301
+xgxs_tx_lane_map_3.0=0x0321
+xgxs_tx_lane_map_4.0=0x2301
+xgxs_tx_lane_map_5.0=0x0123
+xgxs_tx_lane_map_6.0=0x0123
+xgxs_tx_lane_map_7.0=0x0123
+xgxs_tx_lane_map_8.0=0x0123
+xgxs_tx_lane_map_34.0=0x2301
+xgxs_tx_lane_map_35.0=0x0321
+xgxs_tx_lane_map_36.0=0x2301
+xgxs_tx_lane_map_37.0=0x0321
+xgxs_tx_lane_map_38.0=0x0123
+xgxs_tx_lane_map_39.0=0x1230
+xgxs_tx_lane_map_40.0=0x2301
+xgxs_tx_lane_map_41.0=0x1032
+xgxs_tx_lane_map_68.0=0x0123
+xgxs_tx_lane_map_69.0=0x1230
+xgxs_tx_lane_map_70.0=0x2301
+xgxs_tx_lane_map_71.0=0x1032
+xgxs_tx_lane_map_72.0=0x0123
+xgxs_tx_lane_map_73.0=0x1230
+xgxs_tx_lane_map_74.0=0x2301
+xgxs_tx_lane_map_75.0=0x1032
+xgxs_tx_lane_map_102.0=0x0321
+xgxs_tx_lane_map_103.0=0x2301
+xgxs_tx_lane_map_104.0=0x0321
+xgxs_tx_lane_map_105.0=0x2301
+xgxs_tx_lane_map_106.0=0x0321
+xgxs_tx_lane_map_107.0=0x2301
+xgxs_tx_lane_map_108.0=0x0321
+xgxs_tx_lane_map_109.0=0x2301
+
+# tuning parameters for 25g serdes fiber
+serdes_driver_current_1=0xa
+serdes_preemphasis_1=0x284008
+serdes_driver_current_2=0xa
+serdes_preemphasis_2=0x284008
+serdes_driver_current_3=0xa
+serdes_preemphasis_3=0x284008
+serdes_driver_current_4=0xa
+serdes_preemphasis_4=0x284008
+serdes_driver_current_5=0xa
+serdes_preemphasis_5=0x284008
+serdes_driver_current_6=0xa
+serdes_preemphasis_6=0x284008
+serdes_driver_current_7=0xa
+serdes_preemphasis_7=0x284008
+serdes_driver_current_8=0xd
+serdes_preemphasis_8=0x303808
+serdes_driver_current_34=0xd
+serdes_preemphasis_34=0x303808
+serdes_driver_current_35=0xd
+serdes_preemphasis_35=0x303808
+serdes_driver_current_36=0xd
+serdes_preemphasis_36=0x303808
+serdes_driver_current_37=0xd
+serdes_preemphasis_37=0x303808
+serdes_driver_current_38=0xf
+serdes_preemphasis_38=0x373108
+serdes_driver_current_39=0xf
+serdes_preemphasis_39=0x373108
+serdes_driver_current_40=0xf
+serdes_preemphasis_40=0x373108
+serdes_driver_current_41=0xf
+serdes_preemphasis_41=0x373108
+serdes_driver_current_68=0xf
+serdes_preemphasis_68=0x373108
+serdes_driver_current_69=0xf
+serdes_preemphasis_69=0x373108
+serdes_driver_current_70=0xf
+serdes_preemphasis_70=0x373108
+serdes_driver_current_71=0xf
+serdes_preemphasis_71=0x373108
+serdes_driver_current_72=0xd
+serdes_preemphasis_72=0x303808
+serdes_driver_current_73=0xd
+serdes_preemphasis_73=0x303808
+serdes_driver_current_74=0xd
+serdes_preemphasis_74=0x303808
+serdes_driver_current_75=0xd
+serdes_preemphasis_75=0x303808
+serdes_driver_current_102=0xa
+serdes_preemphasis_102=0x284008
+serdes_driver_current_103=0xa
+serdes_preemphasis_103=0x284008
+serdes_driver_current_104=0xa
+serdes_preemphasis_104=0x284008
+serdes_driver_current_105=0xa
+serdes_preemphasis_105=0x284008
+serdes_driver_current_106=0xa
+serdes_preemphasis_106=0x284008
+serdes_driver_current_107=0xa
+serdes_preemphasis_107=0x284008
+serdes_driver_current_108=0xa
+serdes_preemphasis_108=0x284008
+serdes_driver_current_109=0xa
+serdes_preemphasis_109=0x284008
+
+mmu_init_config="MSFT-TH-Tier1"
+phy_an_lt_msft=1
--- a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/th-a7060-cx32s-32x100G-t1.config.bcm
+++ b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/th-a7060-cx32s-32x100G-t1.config.bcm
@ -3,6 +3,8 @@
 # disables bcmALPMDH (ALPM distributed hitbit) thread.  This thread is purely for debug purpose
 l3_alpm_hit_skip=1

+sai_hash_seed_config_hash_offset_enable=1
+
 # Disable Counting ACL Drop towards interface RX_DRP counter
 sai_adjust_acl_drop_in_rx_drop=1

--- a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/th-a7060-cx32s-32x40G-t1.config.bcm
+++ b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/th-a7060-cx32s-32x40G-t1.config.bcm
@ -6,6 +6,8 @@ l3_alpm_hit_skip=1
 # Disable Counting ACL Drop towards interface RX_DRP counter
 sai_adjust_acl_drop_in_rx_drop=1

+sai_hash_seed_config_hash_offset_enable=1
+
 phy_an_allow_pll_change=1
 arl_clean_timeout_usec=15000000
 asf_mem_profile=2
@ -449,3 +451,4 @@ serdes_preemphasis_109=0x145c00

 mmu_init_config="MSFT-TH-Tier1"
 phy_an_lt_msft=1
+phy_unlos_msft=1
--- a/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32-200Gx48-100Gx32/hwsku.json
+++ b/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32-200Gx48-100Gx32/hwsku.json
@ -0,0 +1,104 @@
+{
+    "interfaces": {
+        "Ethernet0": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G]"
+        },
+        "Ethernet8": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G]"
+        },
+        "Ethernet16": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G]"
+        },
+        "Ethernet24": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G]"
+        },
+        "Ethernet32": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G]"
+        },
+        "Ethernet40": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G]"
+        },
+        "Ethernet48": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G]"
+        },
+        "Ethernet56": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G]"
+        },
+        "Ethernet64": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G]"
+        },
+        "Ethernet72": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G]"
+        },
+        "Ethernet80": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G]"
+        },
+        "Ethernet88": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G]"
+        },
+        "Ethernet96": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G]"
+        },
+        "Ethernet104": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G]"
+        },
+        "Ethernet112": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G]"
+        },
+        "Ethernet120": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G]"
+        },
+        "Ethernet128": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G]"
+        },
+        "Ethernet136": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G]"
+        },
+        "Ethernet144": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G]"
+        },
+        "Ethernet152": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G]"
+        },
+        "Ethernet160": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G]"
+        },
+        "Ethernet168": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G]"
+        },
+        "Ethernet176": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G]"
+        },
+        "Ethernet184": {
+            "default_brkout_mode": "2x200G[100G,50G,40G,25G,10G]"
+        },
+        "Ethernet192": {
+            "default_brkout_mode": "4x100G[50G,40G,25G,10G]"
+        },
+        "Ethernet200": {
+            "default_brkout_mode": "4x100G[50G,40G,25G,10G]"
+        },
+        "Ethernet208": {
+            "default_brkout_mode": "4x100G[50G,40G,25G,10G]"
+        },
+        "Ethernet216": {
+            "default_brkout_mode": "4x100G[50G,40G,25G,10G]"
+        },
+        "Ethernet224": {
+            "default_brkout_mode": "4x100G[50G,40G,25G,10G]"
+        },
+        "Ethernet232": {
+            "default_brkout_mode": "4x100G[50G,40G,25G,10G]"
+        },
+        "Ethernet240": {
+            "default_brkout_mode": "4x100G[50G,40G,25G,10G]"
+        },
+        "Ethernet248": {
+            "default_brkout_mode": "4x100G[50G,40G,25G,10G]"
+        },
+        "Ethernet256": {
+            "default_brkout_mode": "1x10G",
+            "fec": "none"
+        }
+    }
+}
--- a/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32-200Gx48-100Gx32/sai.profile
+++ b/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32-200Gx48-100Gx32/sai.profile
@ -0,0 +1 @@
+SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th4-a7060dx5-32-200Gx48-100Gx32.config.bcm
--- a/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32-200Gx48-100Gx32/th4-a7060dx5-32-200Gx48-100Gx32.config.bcm
+++ b/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32-200Gx48-100Gx32/th4-a7060dx5-32-200Gx48-100Gx32.config.bcm
@ -0,0 +1,879 @@
+# configuration yaml file
+#   device:
+#       <unit>:
+#           <table>:
+#               ?
+#                   <key_fld_1>: <value>
+#                   <key_fld_2>: <value>
+#                   ...
+#                   <key_fld_n>: <value>
+#               :
+#                   <data_fld_1>: <value>
+#                   <data_fld_2>: <value>
+#                   ...
+#                   <data_fld_n>: <value>
+#
+
+---
+bcm_device:
+    0:
+        global:
+            pktio_mode: 1
+            vlan_flooding_l2mc_num_reserved: 0
+            ipv6_lpm_128b_enable: 1
+            shared_block_mask_section: uc_bc
+            skip_protocol_default_entries: 1
+            # LTSW uses value 1 for ALPM combined mode
+            l3_alpm_template: 1
+            l3_alpm_hit_skip: 1
+            sai_feat_tail_timestamp : 1
+            sai_field_group_auto_prioritize: 1
+            #l3_intf_vlan_split_egress for MTU at L3IF
+            l3_intf_vlan_split_egress : 1
+
+            # vxlan
+            l3_alpm_template: 1
+            riot_overlay_l3_egress_mem_size: 16384
+            riot_overlay_l3_intf_mem_size: 4096
+            l3_ecmp_member_first_lkup_mem_size: 12288
+            bcm_tunnel_term_compatible_mode: 1
+            shared_l2_tunnel: 1
+            sai_tunnel_support: 10
+            sai_tunnel_underlay_route_mode: 2
+            sai_tunnel_ecmp_sharing_mode: 0 # change to 2 if SAI_NEXT_HOP_GROUP_ATTR_LEVEL_1 used
+
+            # bfd
+            #bfd_enable: 1
+            #bfd_sha1_keys: 5
+            #bfd_num_sessions: 2048
+            #bfd_simple_password_keys: 5
+            #num_queues_pci: 47
+            #num_queues_uc0: 1
+            #bfd_feature_enable: 1
+            #bfd_use_endpoint_id_as_discriminator: 1
+            #bfd_tx_raw_ingress_enable: 1
+            #sai_eapp_config_file: "/usr/share/sonic/device/x86_64-broadcom_common/eapps/eapp_config.json"
+---
+device:
+    0:
+        PC_SERDES_CONFIG:
+            PKG_SWAP_BYPASS: 1
+
+        PC_PM_CORE:
+            ?
+                PC_PM_ID: 1
+                CORE_INDEX: 0
+            :
+                RX_LANE_MAP_AUTO: 0
+                TX_LANE_MAP_AUTO: 0
+                RX_POLARITY_FLIP_AUTO: 0
+                TX_POLARITY_FLIP_AUTO: 0
+                RX_LANE_MAP: 0x67235401
+                TX_LANE_MAP: 0x2731465
+                RX_POLARITY_FLIP: 0x00
+                TX_POLARITY_FLIP: 0x00
+            ?
+                PC_PM_ID: 2
+                CORE_INDEX: 0
+            :
+                RX_LANE_MAP_AUTO: 0
+                TX_LANE_MAP_AUTO: 0
+                RX_POLARITY_FLIP_AUTO: 0
+                TX_POLARITY_FLIP_AUTO: 0
+                RX_LANE_MAP: 0x31752064
+                TX_LANE_MAP: 0x76025314
+                RX_POLARITY_FLIP: 0xff
+                TX_POLARITY_FLIP: 0xff
+            ?
+                PC_PM_ID: 3
+                CORE_INDEX: 0
+            :
+                RX_LANE_MAP_AUTO: 0
+                TX_LANE_MAP_AUTO: 0
+                RX_POLARITY_FLIP_AUTO: 0
+                TX_POLARITY_FLIP_AUTO: 0
+                RX_LANE_MAP: 0x67241503
+                TX_LANE_MAP: 0x13650274
+                RX_POLARITY_FLIP: 0x00
+                TX_POLARITY_FLIP: 0x01
+            ?
+                PC_PM_ID: 4
+                CORE_INDEX: 0
+            :
+                RX_LANE_MAP_AUTO: 0
+                TX_LANE_MAP_AUTO: 0
+                RX_POLARITY_FLIP_AUTO: 0
+                TX_POLARITY_FLIP_AUTO: 0
+                RX_LANE_MAP: 0x46025713
+                TX_LANE_MAP: 0x31650274
+                RX_POLARITY_FLIP: 0x00
+                TX_POLARITY_FLIP: 0x00
+            ?
+                PC_PM_ID: 5
+                CORE_INDEX: 0
+            :
+                RX_LANE_MAP_AUTO: 0
+                TX_LANE_MAP_AUTO: 0
+                RX_POLARITY_FLIP_AUTO: 0
+                TX_POLARITY_FLIP_AUTO: 0
+                RX_LANE_MAP: 0x62713054
+                TX_LANE_MAP: 0x21703465
+                RX_POLARITY_FLIP: 0x00
+                TX_POLARITY_FLIP: 0xd8
+            ?
+                PC_PM_ID: 6
+                CORE_INDEX: 0
+            :
+                RX_LANE_MAP_AUTO: 0
+                TX_LANE_MAP_AUTO: 0
+                RX_POLARITY_FLIP_AUTO: 0
+                TX_POLARITY_FLIP_AUTO: 0
+                RX_LANE_MAP: 0x13460257
+                TX_LANE_MAP: 0x64137502
+                RX_POLARITY_FLIP: 0xff
+                TX_POLARITY_FLIP: 0xff
+            ?
+                PC_PM_ID: 7
+                CORE_INDEX: 0
+            :
+                RX_LANE_MAP_AUTO: 0
+                TX_LANE_MAP_AUTO: 0
+                RX_POLARITY_FLIP_AUTO: 0
+                TX_POLARITY_FLIP_AUTO: 0
+                RX_LANE_MAP: 0x43512670
+                TX_LANE_MAP: 0x2571364
+                RX_POLARITY_FLIP: 0x00
+                TX_POLARITY_FLIP: 0x00
+            ?
+                PC_PM_ID: 8
+                CORE_INDEX: 0
+            :
+                RX_LANE_MAP_AUTO: 0
+                TX_LANE_MAP_AUTO: 0
+                RX_POLARITY_FLIP_AUTO: 0
+                TX_POLARITY_FLIP_AUTO: 0
+                RX_LANE_MAP: 0x14270356
+                TX_LANE_MAP: 0x64237501
+                RX_POLARITY_FLIP: 0xfb
+                TX_POLARITY_FLIP: 0xff
+            ?
+                PC_PM_ID: 9
+                CORE_INDEX: 0
+            :
+                RX_LANE_MAP_AUTO: 0
+                TX_LANE_MAP_AUTO: 0
+                RX_POLARITY_FLIP_AUTO: 0
+                TX_POLARITY_FLIP_AUTO: 0
+                RX_LANE_MAP: 0x76140235
+                TX_LANE_MAP: 0x74036521
+                RX_POLARITY_FLIP: 0xc1
+                TX_POLARITY_FLIP: 0x00
+            ?
+                PC_PM_ID: 10
+                CORE_INDEX: 0
+            :
+                RX_LANE_MAP_AUTO: 0
+                TX_LANE_MAP_AUTO: 0
+                RX_POLARITY_FLIP_AUTO: 0
+                TX_POLARITY_FLIP_AUTO: 0
+                RX_LANE_MAP: 0x47125603
+                TX_LANE_MAP: 0x30451276
+                RX_POLARITY_FLIP: 0xff
+                TX_POLARITY_FLIP: 0xff
+            ?
+                PC_PM_ID: 11
+                CORE_INDEX: 0
+            :
+                RX_LANE_MAP_AUTO: 0
+                TX_LANE_MAP_AUTO: 0
+                RX_POLARITY_FLIP_AUTO: 0
+                TX_POLARITY_FLIP_AUTO: 0
+                RX_LANE_MAP: 0x76041235
+                TX_LANE_MAP: 0x74036512
+                RX_POLARITY_FLIP: 0x40
+                TX_POLARITY_FLIP: 0x00
+            ?
+                PC_PM_ID: 12
+                CORE_INDEX: 0
+            :
+                RX_LANE_MAP_AUTO: 0
+                TX_LANE_MAP_AUTO: 0
+                RX_POLARITY_FLIP_AUTO: 0
+                TX_POLARITY_FLIP_AUTO: 0
+                RX_LANE_MAP: 0x27145603
+                TX_LANE_MAP: 0x21450376
+                RX_POLARITY_FLIP: 0xff
+                TX_POLARITY_FLIP: 0xff
+            ?
+                PC_PM_ID: 13
+                CORE_INDEX: 0
+            :
+                RX_LANE_MAP_AUTO: 0
+                TX_LANE_MAP_AUTO: 0
+                RX_POLARITY_FLIP_AUTO: 0
+                TX_POLARITY_FLIP_AUTO: 0
+                RX_LANE_MAP: 0x2735146
+                TX_LANE_MAP: 0x3657421
+                RX_POLARITY_FLIP: 0x00
+                TX_POLARITY_FLIP: 0xc8
+            ?
+                PC_PM_ID: 14
+                CORE_INDEX: 0
+            :
+                RX_LANE_MAP_AUTO: 0
+                TX_LANE_MAP_AUTO: 0
+                RX_POLARITY_FLIP_AUTO: 0
+                TX_POLARITY_FLIP_AUTO: 0
+                RX_LANE_MAP: 0x47306521
+                TX_LANE_MAP: 0x12643075
+                RX_POLARITY_FLIP: 0xff
+                TX_POLARITY_FLIP: 0x33
+            ?
+                PC_PM_ID: 15
+                CORE_INDEX: 0
+            :
+                RX_LANE_MAP_AUTO: 0
+                TX_LANE_MAP_AUTO: 0
+                RX_POLARITY_FLIP_AUTO: 0
+                TX_POLARITY_FLIP_AUTO: 0
+                RX_LANE_MAP: 0x20157436
+                TX_LANE_MAP: 0x56237104
+                RX_POLARITY_FLIP: 0x08
+                TX_POLARITY_FLIP: 0x00
+            ?
+                PC_PM_ID: 16
+                CORE_INDEX: 0
+            :
+                RX_LANE_MAP_AUTO: 0
+                TX_LANE_MAP_AUTO: 0
+                RX_POLARITY_FLIP_AUTO: 0
+                TX_POLARITY_FLIP_AUTO: 0
+                RX_LANE_MAP: 0x14270356
+                TX_LANE_MAP: 0x76325014
+                RX_POLARITY_FLIP: 0xff
+                TX_POLARITY_FLIP: 0xff
+            ?
+                PC_PM_ID: 49
+                CORE_INDEX: 0
+            :
+                RX_LANE_MAP_AUTO: 0
+                TX_LANE_MAP_AUTO: 0
+                RX_POLARITY_FLIP_AUTO: 0
+                TX_POLARITY_FLIP_AUTO: 0
+                RX_LANE_MAP: 0x56704312
+                TX_LANE_MAP: 0x32641570
+                RX_POLARITY_FLIP: 0xff
+                TX_POLARITY_FLIP: 0xff
+            ?
+                PC_PM_ID: 50
+                CORE_INDEX: 0
+            :
+                RX_LANE_MAP_AUTO: 0
+                TX_LANE_MAP_AUTO: 0
+                RX_POLARITY_FLIP_AUTO: 0
+                TX_POLARITY_FLIP_AUTO: 0
+                RX_LANE_MAP: 0x21564073
+                TX_LANE_MAP: 0x50314762
+                RX_POLARITY_FLIP: 0x00
+                TX_POLARITY_FLIP: 0x00
+            ?
+                PC_PM_ID: 51
+                CORE_INDEX: 0
+            :
+                RX_LANE_MAP_AUTO: 0
+                TX_LANE_MAP_AUTO: 0
+                RX_POLARITY_FLIP_AUTO: 0
+                TX_POLARITY_FLIP_AUTO: 0
+                RX_LANE_MAP: 0x36715402
+                TX_LANE_MAP: 0x32641075
+                RX_POLARITY_FLIP: 0xff
+                TX_POLARITY_FLIP: 0xff
+            ?
+                PC_PM_ID: 52
+                CORE_INDEX: 0
+            :
+                RX_LANE_MAP_AUTO: 0
+                TX_LANE_MAP_AUTO: 0
+                RX_POLARITY_FLIP_AUTO: 0
+                TX_POLARITY_FLIP_AUTO: 0
+                RX_LANE_MAP: 0x51462073
+                TX_LANE_MAP: 0x5127634
+                RX_POLARITY_FLIP: 0x69
+                TX_POLARITY_FLIP: 0x08
+            ?
+                PC_PM_ID: 53
+                CORE_INDEX: 0
+            :
+                RX_LANE_MAP_AUTO: 0
+                TX_LANE_MAP_AUTO: 0
+                RX_POLARITY_FLIP_AUTO: 0
+                TX_POLARITY_FLIP_AUTO: 0
+                RX_LANE_MAP: 0x73204651
+                TX_LANE_MAP: 0x32640175
+                RX_POLARITY_FLIP: 0x69
+                TX_POLARITY_FLIP: 0xff
+            ?
+                PC_PM_ID: 54
+                CORE_INDEX: 0
+            :
+                RX_LANE_MAP_AUTO: 0
+                TX_LANE_MAP_AUTO: 0
+                RX_POLARITY_FLIP_AUTO: 0
+                TX_POLARITY_FLIP_AUTO: 0
+                RX_LANE_MAP: 0x5134627
+                TX_LANE_MAP: 0x60137254
+                RX_POLARITY_FLIP: 0x00
+                TX_POLARITY_FLIP: 0x00
+            ?
+                PC_PM_ID: 55
+                CORE_INDEX: 0
+            :
+                RX_LANE_MAP_AUTO: 0
+                TX_LANE_MAP_AUTO: 0
+                RX_POLARITY_FLIP_AUTO: 0
+                TX_POLARITY_FLIP_AUTO: 0
+                RX_LANE_MAP: 0x57420163
+                TX_LANE_MAP: 0x32651074
+                RX_POLARITY_FLIP: 0xff
+                TX_POLARITY_FLIP: 0xff
+            ?
+                PC_PM_ID: 56
+                CORE_INDEX: 0
+            :
+                RX_LANE_MAP_AUTO: 0
+                TX_LANE_MAP_AUTO: 0
+                RX_POLARITY_FLIP_AUTO: 0
+                TX_POLARITY_FLIP_AUTO: 0
+                RX_LANE_MAP: 0x5134627
+                TX_LANE_MAP: 0x10524376
+                RX_POLARITY_FLIP: 0x05
+                TX_POLARITY_FLIP: 0x00
+            ?
+                PC_PM_ID: 57
+                CORE_INDEX: 0
+            :
+                RX_LANE_MAP_AUTO: 0
+                TX_LANE_MAP_AUTO: 0
+                RX_POLARITY_FLIP_AUTO: 0
+                TX_POLARITY_FLIP_AUTO: 0
+                RX_LANE_MAP: 0x73520146
+                TX_LANE_MAP: 0x31650274
+                RX_POLARITY_FLIP: 0x3d
+                TX_POLARITY_FLIP: 0xff
+            ?
+                PC_PM_ID: 58
+                CORE_INDEX: 0
+            :
+                RX_LANE_MAP_AUTO: 0
+                TX_LANE_MAP_AUTO: 0
+                RX_POLARITY_FLIP_AUTO: 0
+                TX_POLARITY_FLIP_AUTO: 0
+                RX_LANE_MAP: 0x16072354
+                TX_LANE_MAP: 0x51634270
+                RX_POLARITY_FLIP: 0x01
+                TX_POLARITY_FLIP: 0x00
+            ?
+                PC_PM_ID: 59
+                CORE_INDEX: 0
+            :
+                RX_LANE_MAP_AUTO: 0
+                TX_LANE_MAP_AUTO: 0
+                RX_POLARITY_FLIP_AUTO: 0
+                TX_POLARITY_FLIP_AUTO: 0
+                RX_LANE_MAP: 0x72530164
+                TX_LANE_MAP: 0x32506147
+                RX_POLARITY_FLIP: 0xff
+                TX_POLARITY_FLIP: 0xff
+            ?
+                PC_PM_ID: 60
+                CORE_INDEX: 0
+            :
+                RX_LANE_MAP_AUTO: 0
+                TX_LANE_MAP_AUTO: 0
+                RX_POLARITY_FLIP_AUTO: 0
+                TX_POLARITY_FLIP_AUTO: 0
+                RX_LANE_MAP: 0x4371256
+                TX_LANE_MAP: 0x21673054
+                RX_POLARITY_FLIP: 0x00
+                TX_POLARITY_FLIP: 0xcc
+            ?
+                PC_PM_ID: 61
+                CORE_INDEX: 0
+            :
+                RX_LANE_MAP_AUTO: 0
+                TX_LANE_MAP_AUTO: 0
+                RX_POLARITY_FLIP_AUTO: 0
+                TX_POLARITY_FLIP_AUTO: 0
+                RX_LANE_MAP: 0x67241503
+                TX_LANE_MAP: 0x12730465
+                RX_POLARITY_FLIP: 0x20
+                TX_POLARITY_FLIP: 0x00
+            ?
+                PC_PM_ID: 62
+                CORE_INDEX: 0
+            :
+                RX_LANE_MAP_AUTO: 0
+                TX_LANE_MAP_AUTO: 0
+                RX_POLARITY_FLIP_AUTO: 0
+                TX_POLARITY_FLIP_AUTO: 0
+                RX_LANE_MAP: 0x73625140
+                TX_LANE_MAP: 0x12640573
+                RX_POLARITY_FLIP: 0x00
+                TX_POLARITY_FLIP: 0x00
+            ?
+                PC_PM_ID: 63
+                CORE_INDEX: 0
+            :
+                RX_LANE_MAP_AUTO: 0
+                TX_LANE_MAP_AUTO: 0
+                RX_POLARITY_FLIP_AUTO: 0
+                TX_POLARITY_FLIP_AUTO: 0
+                RX_LANE_MAP: 0x23674015
+                TX_LANE_MAP: 0x57206143
+                RX_POLARITY_FLIP: 0xff
+                TX_POLARITY_FLIP: 0xff
+            ?
+                PC_PM_ID: 64
+                CORE_INDEX: 0
+            :
+                RX_LANE_MAP_AUTO: 0
+                TX_LANE_MAP_AUTO: 0
+                RX_POLARITY_FLIP_AUTO: 0
+                TX_POLARITY_FLIP_AUTO: 0
+                RX_LANE_MAP: 0x57314260
+                TX_LANE_MAP: 0x1735264
+                RX_POLARITY_FLIP: 0x10
+                TX_POLARITY_FLIP: 0x00
+...
+---
+device:
+    0:
+        PC_PORT_PHYS_MAP:
+            ?
+               PORT_ID: 0
+            :
+               PC_PHYS_PORT_ID: 0
+            ?
+               PORT_ID: 1
+            :
+               PC_PHYS_PORT_ID: 1
+            ?
+               PORT_ID: 2
+            :
+               PC_PHYS_PORT_ID: 3
+            ?
+               PORT_ID: 5
+            :
+               PC_PHYS_PORT_ID: 5
+            ?
+               PORT_ID: 6
+            :
+               PC_PHYS_PORT_ID: 7
+            ?
+               PORT_ID: 9
+            :
+               PC_PHYS_PORT_ID: 9
+            ?
+               PORT_ID: 10
+            :
+               PC_PHYS_PORT_ID: 11
+            ?
+               PORT_ID: 13
+            :
+               PC_PHYS_PORT_ID: 13
+            ?
+               PORT_ID: 14
+            :
+               PC_PHYS_PORT_ID: 15
+            ?
+               PORT_ID: 17
+            :
+               PC_PHYS_PORT_ID: 17
+            ?
+               PORT_ID: 18
+            :
+               PC_PHYS_PORT_ID: 19
+            ?
+               PORT_ID: 21
+            :
+               PC_PHYS_PORT_ID: 21
+            ?
+               PORT_ID: 22
+            :
+               PC_PHYS_PORT_ID: 23
+            ?
+               PORT_ID: 25
+            :
+               PC_PHYS_PORT_ID: 25
+            ?
+               PORT_ID: 26
+            :
+               PC_PHYS_PORT_ID: 27
+            ?
+               PORT_ID: 29
+            :
+               PC_PHYS_PORT_ID: 29
+            ?
+               PORT_ID: 30
+            :
+               PC_PHYS_PORT_ID: 31
+            ?
+               PORT_ID: 33
+            :
+               PC_PHYS_PORT_ID: 259
+            ?
+               PORT_ID: 34
+            :
+               PC_PHYS_PORT_ID: 33
+            ?
+               PORT_ID: 35
+            :
+               PC_PHYS_PORT_ID: 35
+            ?
+               PORT_ID: 38
+            :
+               PC_PHYS_PORT_ID: 37
+            ?
+               PORT_ID: 39
+            :
+               PC_PHYS_PORT_ID: 39
+            ?
+               PORT_ID: 42
+            :
+               PC_PHYS_PORT_ID: 41
+            ?
+               PORT_ID: 43
+            :
+               PC_PHYS_PORT_ID: 43
+            ?
+               PORT_ID: 46
+            :
+               PC_PHYS_PORT_ID: 45
+            ?
+               PORT_ID: 47
+            :
+               PC_PHYS_PORT_ID: 47
+            ?
+               PORT_ID: 50
+            :
+               PC_PHYS_PORT_ID: 258
+            ?
+               PORT_ID: 51
+            :
+               PC_PHYS_PORT_ID: 49
+            ?
+               PORT_ID: 52
+            :
+               PC_PHYS_PORT_ID: 51
+            ?
+               PORT_ID: 55
+            :
+               PC_PHYS_PORT_ID: 53
+            ?
+               PORT_ID: 56
+            :
+               PC_PHYS_PORT_ID: 55
+            ?
+               PORT_ID: 59
+            :
+               PC_PHYS_PORT_ID: 57
+            ?
+               PORT_ID: 60
+            :
+               PC_PHYS_PORT_ID: 59
+            ?
+               PORT_ID: 63
+            :
+               PC_PHYS_PORT_ID: 61
+            ?
+               PORT_ID: 64
+            :
+               PC_PHYS_PORT_ID: 63
+            ?
+               PORT_ID: 67
+            :
+               PC_PHYS_PORT_ID: 260
+            ?
+               PORT_ID: 204
+            :
+               PC_PHYS_PORT_ID: 193
+            ?
+               PORT_ID: 205
+            :
+               PC_PHYS_PORT_ID: 195
+            ?
+               PORT_ID: 208
+            :
+               PC_PHYS_PORT_ID: 197
+            ?
+               PORT_ID: 209
+            :
+               PC_PHYS_PORT_ID: 199
+            ?
+               PORT_ID: 212
+            :
+               PC_PHYS_PORT_ID: 201
+            ?
+               PORT_ID: 213
+            :
+               PC_PHYS_PORT_ID: 203
+            ?
+               PORT_ID: 216
+            :
+               PC_PHYS_PORT_ID: 205
+            ?
+               PORT_ID: 217
+            :
+               PC_PHYS_PORT_ID: 207
+            ?
+               PORT_ID: 221
+            :
+               PC_PHYS_PORT_ID: 209
+            ?
+               PORT_ID: 222
+            :
+               PC_PHYS_PORT_ID: 211
+            ?
+               PORT_ID: 225
+            :
+               PC_PHYS_PORT_ID: 213
+            ?
+               PORT_ID: 226
+            :
+               PC_PHYS_PORT_ID: 215
+            ?
+               PORT_ID: 229
+            :
+               PC_PHYS_PORT_ID: 217
+            ?
+               PORT_ID: 230
+            :
+               PC_PHYS_PORT_ID: 219
+            ?
+               PORT_ID: 233
+            :
+               PC_PHYS_PORT_ID: 221
+            ?
+               PORT_ID: 234
+            :
+               PC_PHYS_PORT_ID: 223
+            ?
+               PORT_ID: 237
+            :
+               PC_PHYS_PORT_ID: 265
+            ?
+               PORT_ID: 238
+            :
+               PC_PHYS_PORT_ID: 225
+            ?
+               PORT_ID: 239
+            :
+               PC_PHYS_PORT_ID: 226
+            ?
+               PORT_ID: 240
+            :
+               PC_PHYS_PORT_ID: 227
+            ?
+               PORT_ID: 241
+            :
+               PC_PHYS_PORT_ID: 228
+            ?
+               PORT_ID: 242
+            :
+               PC_PHYS_PORT_ID: 229
+            ?
+               PORT_ID: 243
+            :
+               PC_PHYS_PORT_ID: 230
+            ?
+               PORT_ID: 244
+            :
+               PC_PHYS_PORT_ID: 231
+            ?
+               PORT_ID: 245
+            :
+               PC_PHYS_PORT_ID: 232
+            ?
+               PORT_ID: 246
+            :
+               PC_PHYS_PORT_ID: 233
+            ?
+               PORT_ID: 247
+            :
+               PC_PHYS_PORT_ID: 234
+            ?
+               PORT_ID: 248
+            :
+               PC_PHYS_PORT_ID: 235
+            ?
+               PORT_ID: 249
+            :
+               PC_PHYS_PORT_ID: 236
+            ?
+               PORT_ID: 250
+            :
+               PC_PHYS_PORT_ID: 237
+            ?
+               PORT_ID: 251
+            :
+               PC_PHYS_PORT_ID: 238
+            ?
+               PORT_ID: 252
+            :
+               PC_PHYS_PORT_ID: 239
+            ?
+               PORT_ID: 253
+            :
+               PC_PHYS_PORT_ID: 240
+            ?
+               PORT_ID: 255
+            :
+               PC_PHYS_PORT_ID: 241
+            ?
+               PORT_ID: 256
+            :
+               PC_PHYS_PORT_ID: 242
+            ?
+               PORT_ID: 257
+            :
+               PC_PHYS_PORT_ID: 243
+            ?
+               PORT_ID: 258
+            :
+               PC_PHYS_PORT_ID: 244
+            ?
+               PORT_ID: 259
+            :
+               PC_PHYS_PORT_ID: 245
+            ?
+               PORT_ID: 260
+            :
+               PC_PHYS_PORT_ID: 246
+            ?
+               PORT_ID: 261
+            :
+               PC_PHYS_PORT_ID: 247
+            ?
+               PORT_ID: 262
+            :
+               PC_PHYS_PORT_ID: 248
+            ?
+               PORT_ID: 263
+            :
+               PC_PHYS_PORT_ID: 249
+            ?
+               PORT_ID: 264
+            :
+               PC_PHYS_PORT_ID: 250
+            ?
+               PORT_ID: 265
+            :
+               PC_PHYS_PORT_ID: 251
+            ?
+               PORT_ID: 266
+            :
+               PC_PHYS_PORT_ID: 252
+            ?
+               PORT_ID: 267
+            :
+               PC_PHYS_PORT_ID: 253
+            ?
+               PORT_ID: 268
+            :
+               PC_PHYS_PORT_ID: 254
+            ?
+               PORT_ID: 269
+            :
+               PC_PHYS_PORT_ID: 255
+            ?
+               PORT_ID: 270
+            :
+               PC_PHYS_PORT_ID: 256
+
+...
+---
+device:
+    0:
+        PC_PORT:
+            ?
+                PORT_ID: 0
+            :
+                &port_mode_10g
+                ENABLE: 1
+                SPEED: 10000
+                NUM_LANES: 1
+            ?
+                PORT_ID: [[50, 50]]
+            :
+                ENABLE: 0
+                MAX_FRAME_SIZE: 9416
+                SPEED: 10000
+                NUM_LANES: 1
+            ?
+               PORT_ID: [[1, 2],
+                         [5, 6],
+                         [9, 10],
+                         [13, 14],
+                         [17, 18],
+                         [21, 22],
+                         [25, 26],
+                         [29, 30],
+                         [34, 35],
+                         [38, 39],
+                         [42, 43],
+                         [46, 47],
+                         [51, 52],
+                         [55, 56],
+                         [59, 60],
+                         [63, 64],
+                         [204, 205],
+                         [208, 209],
+                         [212, 213],
+                         [216, 217],
+                         [221, 222],
+                         [225, 226],
+                         [229, 230],
+                         [233, 234]]
+            :
+                ENABLE: 0
+                SPEED: 200000
+                NUM_LANES: 4
+                FEC_MODE: PC_FEC_RS544_2XN
+                MAX_FRAME_SIZE: 9416
+            ?
+               PORT_ID: [[238, 241],
+                         [242, 245],
+                         [246, 249],
+                         [250, 253],
+                         [255, 258],
+                         [259, 262],
+                         [263, 266],
+                         [267, 270]]
+            :
+                ENABLE: 0
+                SPEED: 100000
+                NUM_LANES: 2
+                FEC_MODE: PC_FEC_RS544
+                MAX_FRAME_SIZE: 9416
+...
+---
+device:
+    0:
+        # Per pipe flex counter configuration
+        CTR_EFLEX_CONFIG:
+            CTR_ING_EFLEX_OPERMODE_PIPEUNIQUE: 0
+            CTR_EGR_EFLEX_OPERMODE_PIPEUNIQUE: 0
+
+        # Per pipe flex state configuration
+        #FLEX_STATE_CONFIG:
+        #    FLEX_STATE_ING_OPERMODE_PIPEUNIQUE: 0
+        #    FLEX_STATE_EGR_OPERMODE_PIPEUNIQUE: 1
+
+        # Lossy vs Lossless mode
+        TM_THD_CONFIG:
+            THRESHOLD_MODE: LOSSLESS
+
+        # IFP mode
+        FP_CONFIG:
+            FP_ING_OPERMODE: GLOBAL_PIPE_AWARE
+...
--- a/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32-25Gx96-100Gx8-200Gx8/port_config.ini
+++ b/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32-25Gx96-100Gx8-200Gx8/port_config.ini
@ -0,0 +1,114 @@
+#name          lanes              alias        index  speed     fec
+Ethernet0      1                  Ethernet1/1  1      25000
+Ethernet1      5                  Ethernet1/2  1      25000
+Ethernet2      3                  Ethernet1/3  1      25000
+Ethernet3      7                  Ethernet1/4  1      25000
+Ethernet8      9                  Ethernet2/1  2      25000
+Ethernet9      13                 Ethernet2/2  2      25000
+Ethernet10     11                 Ethernet2/3  2      25000
+Ethernet11     15                 Ethernet2/4  2      25000
+Ethernet16     17                 Ethernet3/1  3      25000
+Ethernet17     21                 Ethernet3/2  3      25000
+Ethernet18     19                 Ethernet3/3  3      25000
+Ethernet19     23                 Ethernet3/4  3      25000
+Ethernet24     25                 Ethernet4/1  4      25000
+Ethernet25     29                 Ethernet4/2  4      25000
+Ethernet26     27                 Ethernet4/3  4      25000
+Ethernet27     31                 Ethernet4/4  4      25000
+Ethernet32     33                 Ethernet5/1  5      25000
+Ethernet33     37                 Ethernet5/2  5      25000
+Ethernet34     35                 Ethernet5/3  5      25000
+Ethernet35     39                 Ethernet5/4  5      25000
+Ethernet40     41                 Ethernet6/1  6      25000
+Ethernet41     45                 Ethernet6/2  6      25000
+Ethernet42     43                 Ethernet6/3  6      25000
+Ethernet43     47                 Ethernet6/4  6      25000
+Ethernet48     49                 Ethernet7/1  7      25000
+Ethernet49     53                 Ethernet7/2  7      25000
+Ethernet50     51                 Ethernet7/3  7      25000
+Ethernet51     55                 Ethernet7/4  7      25000
+Ethernet56     57                 Ethernet8/1  8      25000
+Ethernet57     61                 Ethernet8/2  8      25000
+Ethernet58     59                 Ethernet8/3  8      25000
+Ethernet59     63                 Ethernet8/4  8      25000
+Ethernet64     65                 Ethernet9/1  9      25000
+Ethernet65     69                 Ethernet9/2  9      25000
+Ethernet66     67                 Ethernet9/3  9      25000
+Ethernet67     71                 Ethernet9/4  9      25000
+Ethernet72     73                 Ethernet10/1 10     25000
+Ethernet73     77                 Ethernet10/2 10     25000
+Ethernet74     75                 Ethernet10/3 10     25000
+Ethernet75     79                 Ethernet10/4 10     25000
+Ethernet80     81                 Ethernet11/1 11     25000
+Ethernet81     85                 Ethernet11/2 11     25000
+Ethernet82     83                 Ethernet11/3 11     25000
+Ethernet83     87                 Ethernet11/4 11     25000
+Ethernet88     89                 Ethernet12/1 12     25000
+Ethernet89     93                 Ethernet12/2 12     25000
+Ethernet90     91                 Ethernet12/3 12     25000
+Ethernet91     95                 Ethernet12/4 12     25000
+Ethernet96     97                 Ethernet13/1 13     25000
+Ethernet97     101                Ethernet13/2 13     25000
+Ethernet98     99                 Ethernet13/3 13     25000
+Ethernet99     103                Ethernet13/4 13     25000
+Ethernet104    105                Ethernet14/1 14     25000
+Ethernet105    109                Ethernet14/2 14     25000
+Ethernet106    107                Ethernet14/3 14     25000
+Ethernet107    111                Ethernet14/4 14     25000
+Ethernet112    113                Ethernet15/1 15     25000
+Ethernet113    117                Ethernet15/2 15     25000
+Ethernet114    115                Ethernet15/3 15     25000
+Ethernet115    119                Ethernet15/4 15     25000
+Ethernet120    121                Ethernet16/1 16     25000
+Ethernet121    125                Ethernet16/2 16     25000
+Ethernet122    123                Ethernet16/3 16     25000
+Ethernet123    127                Ethernet16/4 16     25000
+Ethernet128    385                Ethernet17/1 17     25000
+Ethernet129    389                Ethernet17/2 17     25000
+Ethernet130    387                Ethernet17/3 17     25000
+Ethernet131    391                Ethernet17/4 17     25000
+Ethernet136    393                Ethernet18/1 18     25000
+Ethernet137    397                Ethernet18/2 18     25000
+Ethernet138    395                Ethernet18/3 18     25000
+Ethernet139    399                Ethernet18/4 18     25000
+Ethernet144    401                Ethernet19/1 19     25000
+Ethernet145    405                Ethernet19/2 19     25000
+Ethernet146    403                Ethernet19/3 19     25000
+Ethernet147    407                Ethernet19/4 19     25000
+Ethernet152    409                Ethernet20/1 20     25000
+Ethernet153    413                Ethernet20/2 20     25000
+Ethernet154    411                Ethernet20/3 20     25000
+Ethernet155    415                Ethernet20/4 20     25000
+Ethernet160    417                Ethernet21/1 21     25000
+Ethernet161    421                Ethernet21/2 21     25000
+Ethernet162    419                Ethernet21/3 21     25000
+Ethernet163    423                Ethernet21/4 21     25000
+Ethernet168    425                Ethernet22/1 22     25000
+Ethernet169    429                Ethernet22/2 22     25000
+Ethernet170    427                Ethernet22/3 22     25000
+Ethernet171    431                Ethernet22/4 22     25000
+Ethernet176    433                Ethernet23/1 23     25000
+Ethernet177    437                Ethernet23/2 23     25000
+Ethernet178    435                Ethernet23/3 23     25000
+Ethernet179    439                Ethernet23/4 23     25000
+Ethernet184    441                Ethernet24/1 24     25000
+Ethernet185    445                Ethernet24/2 24     25000
+Ethernet186    443                Ethernet24/3 24     25000
+Ethernet187    447                Ethernet24/4 24     25000
+Ethernet192    449,450,451,452    Ethernet25/1 25     100000    rs
+Ethernet196    453,454,455,456    Ethernet25/5 25     100000    rs
+Ethernet200    457,458,459,460    Ethernet26/1 26     100000    rs
+Ethernet204    461,462,463,464    Ethernet26/5 26     100000    rs
+Ethernet208    465,466,467,468    Ethernet27/1 27     100000    rs
+Ethernet212    469,470,471,472    Ethernet27/5 27     100000    rs
+Ethernet216    473,474,475,476    Ethernet28/1 28     100000    rs
+Ethernet220    477,478,479,480    Ethernet28/5 28     100000    rs
+Ethernet224    481,482,483,484    Ethernet29/1 29     200000    rs
+Ethernet228    485,486,487,488    Ethernet29/5 29     200000    rs
+Ethernet232    489,490,491,492    Ethernet30/1 30     200000    rs
+Ethernet236    493,494,495,496    Ethernet30/5 30     200000    rs
+Ethernet240    497,498,499,500    Ethernet31/1 31     200000    rs
+Ethernet244    501,502,503,504    Ethernet31/5 31     200000    rs
+Ethernet248    505,506,507,508    Ethernet32/1 32     200000    rs
+Ethernet252    509,510,511,512    Ethernet32/5 32     200000    rs
+Ethernet256    513                Ethernet33   33     10000     none
--- a/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32-25Gx96-100Gx8-200Gx8/sai.profile
+++ b/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32-25Gx96-100Gx8-200Gx8/sai.profile
@ -0,0 +1 @@
+SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th4-a7060dx5-32-25Gx96-100Gx8-200Gx8.config.bcm
--- a/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32-25Gx96-100Gx8-200Gx8/th4-a7060dx5-32-25Gx96-100Gx8-200Gx8.config.bcm
+++ b/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32-25Gx96-100Gx8-200Gx8/th4-a7060dx5-32-25Gx96-100Gx8-200Gx8.config.bcm
--- a/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/BALANCED
+++ b/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/BALANCED
@ -0,0 +1 @@
+../../../common/profiles/th4/gen/BALANCED
--- a/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/buffers.json.j2
+++ b/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/buffers.json.j2
@ -0,0 +1,2 @@
+{%- set default_topo = 't1' %}
+{%- include 'buffers_config.j2' %}
--- a/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/buffers_defaults_t0.j2
+++ b/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/buffers_defaults_t0.j2
@ -0,0 +1 @@
+BALANCED/buffers_defaults_t0.j2
--- a/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/buffers_defaults_t1.j2
+++ b/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/buffers_defaults_t1.j2
@ -0,0 +1 @@
+BALANCED/buffers_defaults_t1.j2
--- a/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/hwsku.json
+++ b/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/hwsku.json
@ -0,0 +1,104 @@
+{
+    "interfaces": {
+        "Ethernet0": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet8": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet16": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet24": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet32": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet40": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet48": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet56": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet64": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet72": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet80": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet88": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet96": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet104": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet112": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet120": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet128": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet136": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet144": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet152": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet160": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet168": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet176": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet184": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet192": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet200": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet208": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet216": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet224": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet232": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet240": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet248": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet256": {
+            "default_brkout_mode": "1x10G",
+            "fec": "none"
+        }
+    }
+}
--- a/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/pg_profile_lookup.ini
+++ b/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/pg_profile_lookup.ini
@ -0,0 +1 @@
+BALANCED/pg_profile_lookup.ini
--- a/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/port_config.ini
+++ b/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/port_config.ini
@ -0,0 +1,34 @@
+# name          lanes                           alias        index  speed     fec
+Ethernet0       1,2,3,4,5,6,7,8                 Ethernet1/1  1      400000    rs
+Ethernet8       9,10,11,12,13,14,15,16          Ethernet2/1  2      400000    rs
+Ethernet16      17,18,19,20,21,22,23,24         Ethernet3/1  3      400000    rs
+Ethernet24      25,26,27,28,29,30,31,32         Ethernet4/1  4      400000    rs
+Ethernet32      33,34,35,36,37,38,39,40         Ethernet5/1  5      400000    rs
+Ethernet40      41,42,43,44,45,46,47,48         Ethernet6/1  6      400000    rs
+Ethernet48      49,50,51,52,53,54,55,56         Ethernet7/1  7      400000    rs
+Ethernet56      57,58,59,60,61,62,63,64         Ethernet8/1  8      400000    rs
+Ethernet64      65,66,67,68,69,70,71,72         Ethernet9/1  9      400000    rs
+Ethernet72      73,74,75,76,77,78,79,80         Ethernet10/1 10     400000    rs
+Ethernet80      81,82,83,84,85,86,87,88         Ethernet11/1 11     400000    rs
+Ethernet88      89,90,91,92,93,94,95,96         Ethernet12/1 12     400000    rs
+Ethernet96      97,98,99,100,101,102,103,104    Ethernet13/1 13     400000    rs
+Ethernet104     105,106,107,108,109,110,111,112 Ethernet14/1 14     400000    rs
+Ethernet112     113,114,115,116,117,118,119,120 Ethernet15/1 15     400000    rs
+Ethernet120     121,122,123,124,125,126,127,128 Ethernet16/1 16     400000    rs
+Ethernet128     385,386,387,388,389,390,391,392 Ethernet17/1 17     400000    rs
+Ethernet136     393,394,395,396,397,398,399,400 Ethernet18/1 18     400000    rs
+Ethernet144     401,402,403,404,405,406,407,408 Ethernet19/1 19     400000    rs
+Ethernet152     409,410,411,412,413,414,415,416 Ethernet20/1 20     400000    rs
+Ethernet160     417,418,419,420,421,422,423,424 Ethernet21/1 21     400000    rs
+Ethernet168     425,426,427,428,429,430,431,432 Ethernet22/1 22     400000    rs
+Ethernet176     433,434,435,436,437,438,439,440 Ethernet23/1 23     400000    rs
+Ethernet184     441,442,443,444,445,446,447,448 Ethernet24/1 24     400000    rs
+Ethernet192     449,450,451,452,453,454,455,456 Ethernet25/1 25     400000    rs
+Ethernet200     457,458,459,460,461,462,463,464 Ethernet26/1 26     400000    rs
+Ethernet208     465,466,467,468,469,470,471,472 Ethernet27/1 27     400000    rs
+Ethernet216     473,474,475,476,477,478,479,480 Ethernet28/1 28     400000    rs
+Ethernet224     481,482,483,484,485,486,487,488 Ethernet29/1 29     400000    rs
+Ethernet232     489,490,491,492,493,494,495,496 Ethernet30/1 30     400000    rs
+Ethernet240     497,498,499,500,501,502,503,504 Ethernet31/1 31     400000    rs
+Ethernet248     505,506,507,508,509,510,511,512 Ethernet32/1 32     400000    rs
+Ethernet256     513                             Ethernet33   33     10000     none
--- a/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/qos.json.j2
+++ b/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/qos.json.j2
@ -0,0 +1 @@
+{%- include 'qos_config.j2' %}
--- a/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/sai.profile
+++ b/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/sai.profile
@ -0,0 +1 @@
+SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th4-a7060dx5-32.config.bcm
--- a/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/th4-a7060dx5-32.config.bcm
+++ b/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/th4-a7060dx5-32.config.bcm
--- a/device/arista/x86_64-arista_7060dx5_32/default_sku
+++ b/device/arista/x86_64-arista_7060dx5_32/default_sku
@ -0,0 +1 @@
+Arista-7060DX5-32 t1
--- a/device/arista/x86_64-arista_7060dx5_32/platform.json
+++ b/device/arista/x86_64-arista_7060dx5_32/platform.json
--- a/device/arista/x86_64-arista_7060dx5_32/platform_asic
+++ b/device/arista/x86_64-arista_7060dx5_32/platform_asic
@ -0,0 +1 @@
+broadcom
--- a/device/arista/x86_64-arista_7060dx5_32/platform_components.json
+++ b/device/arista/x86_64-arista_7060dx5_32/platform_components.json
@ -0,0 +1,12 @@
+{
+    "chassis": {
+        "DCS-7060DX5-32": {
+            "component": {
+                "Aboot()": {},
+                "Scd(addr=0000:00:18.7)": {},
+                "Scd(addr=0000:01:00.0)": {},
+                "LorikeetSysCpld(addr=13-0023)": {}
+            }
+        }
+    }
+}
--- a/device/arista/x86_64-arista_7060dx5_32/platform_env.conf
+++ b/device/arista/x86_64-arista_7060dx5_32/platform_env.conf
@ -0,0 +1,2 @@
+SYNCD_SHM_SIZE=512m
+is_ltsw_chip=1
--- a/device/arista/x86_64-arista_7060dx5_32/platform_reboot
+++ b/device/arista/x86_64-arista_7060dx5_32/platform_reboot
@ -0,0 +1 @@
+../x86_64-arista_common/platform_reboot
--- a/device/arista/x86_64-arista_7060dx5_32/plugins
+++ b/device/arista/x86_64-arista_7060dx5_32/plugins
@ -0,0 +1 @@
+../x86_64-arista_common/plugins/
--- a/device/arista/x86_64-arista_7060dx5_32/pmon_daemon_control.json
+++ b/device/arista/x86_64-arista_7060dx5_32/pmon_daemon_control.json
@ -0,0 +1 @@
+../x86_64-arista_common/pmon_daemon_control.json
--- a/device/arista/x86_64-arista_7060dx5_32/sensors.conf
+++ b/device/arista/x86_64-arista_7060dx5_32/sensors.conf
@ -0,0 +1,36 @@
+# libsensors configuration file for DCS-7060DX4-32
+# ------------------------------------------------#
+
+bus "i2c-9" "SCD 0000:00:18.7 SMBus master 0 bus 0"
+bus "i2c-29" "SCD 0000:01:00.0 SMBus master 1 bus 0"
+bus "i2c-32" "SCD 0000:01:00.0 SMBus master 1 bus 3"
+bus "i2c-33" "SCD 0000:01:00.0 SMBus master 1 bus 4"
+
+chip "max6658-i2c-9-4c"
+    label temp1 "CPU board temp sensor"
+    label temp2 "Back-panel temp sensor"
+
+chip "max6581-i2c-29-4d"
+    label temp1 "Center Rear"
+    label temp2 "Switch board right sensor"
+    label temp3 "Switch board left sensor"
+    label temp4 "Front-panel temp sensor"
+    label temp5 "Switch chip diode 1 sensor"
+    label temp6 "Switch chip diode 2 sensor"
+    ignore temp7
+    ignore temp8
+
+chip "pmbus-i2c-32-58"
+    label temp1 "Power supply 1 hotspot sensor"
+    label temp2 "Power supply 1 inlet temp sensor"
+    label temp3 "Power supply 1 exhaust temp sensor"
+    ignore fan2
+    ignore fan3
+
+chip "pmbus-i2c-33-58"
+    label temp1 "Power supply 2 hotspot sensor"
+    label temp2 "Power supply 2 inlet temp sensor"
+    label temp3 "Power supply 2 exhaust temp sensor"
+    ignore fan2
+    ignore fan3
+
--- a/device/arista/x86_64-arista_7060dx5_32/system_health_monitoring_config.json
+++ b/device/arista/x86_64-arista_7060dx5_32/system_health_monitoring_config.json
@ -0,0 +1 @@
+../x86_64-arista_common/system_health_monitoring_config.json
--- a/device/arista/x86_64-arista_7060dx5_32/thermal_policy.json
+++ b/device/arista/x86_64-arista_7060dx5_32/thermal_policy.json
@ -0,0 +1 @@
+../x86_64-arista_common/thermal_policy.json
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/config.bcm.j2
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/config.bcm.j2
@ -3,12 +3,16 @@
 {%- set IPinIP_sock = '' -%}
 {%- set map_prio = '' -%}
 {%- set pfcwd_sock = '' -%}
+{%- set hash_seed_offset_enable = '' -%}
 {%- if DEVICE_METADATA is defined and DEVICE_METADATA['localhost'] is defined -%}
 {%-     if DEVICE_METADATA['localhost']['type'] is defined -%}
 {%-         set switch_role = DEVICE_METADATA['localhost']['type'] -%}
 {%-         if 'torrouter' in switch_role.lower() or 'torswitch' in switch_role.lower() %}
 {%-             set mmu_sock = 'mmu_init_config="MSFT-TH2-Tier0"' -%}
 {%-         endif %}
+{%-         if 'leafrouter' in switch_role.lower() %}
+{%-             set hash_seed_offset_enable = 'sai_hash_seed_config_hash_offset_enable=1' -%}
+{%-         endif %}
 {%-     endif %}
 {%-     if DEVICE_METADATA['localhost']['subtype'] is defined -%}
 {%-         set switch_subtype = DEVICE_METADATA['localhost']['subtype'] -%}
@ -1051,3 +1055,4 @@ serdes_preemphasis_117=0x133c06
 {{ mmu_sock }}
 {{ IPinIP_sock }}
 phy_an_lt_msft=1
+{{ hash_seed_offset_enable }}
--- a/device/arista/x86_64-arista_7260cx3_64/pcie.yaml
+++ b/device/arista/x86_64-arista_7260cx3_64/pcie.yaml
@ -100,12 +100,6 @@
  id: 8c24
  name: 'Signal processing controller: Intel Corporation 8 Series Chipset Family Thermal
    Management Controller (rev 05)'
- bus: '01'
-  dev: '00'
-  fn: '0'
-  id: '1682'
-  name: 'Ethernet controller: Broadcom Limited NetXtreme BCM57762 Gigabit Ethernet
-    PCIe (rev 20)'
 - bus: '02'
  dev: '00'
  fn: '0'
--- a/device/arista/x86_64-arista_7280cr3_32p4/platform_env.conf
+++ b/device/arista/x86_64-arista_7280cr3_32p4/platform_env.conf
@ -1 +1,2 @@
+SYNCD_SHM_SIZE=1gb
 usemsi=1
--- a/device/arista/x86_64-arista_7800_sup/Arista-7804R3-FM/fabric_monitor_config.json
+++ b/device/arista/x86_64-arista_7800_sup/Arista-7804R3-FM/fabric_monitor_config.json
@ -0,0 +1,8 @@
+{
+   "FABRIC_MONITOR_DATA": {
+      "monErrThreshCrcCells": 1,
+      "monErrThreshRxCells": 61035156,
+      "monPollThreshRecovery": 8,
+      "monPollThreshIsolation": 1
+   }
+}
--- a/device/arista/x86_64-arista_7800_sup/Arista-7804R3-FM/fabric_port_config.ini
+++ b/device/arista/x86_64-arista_7800_sup/Arista-7804R3-FM/fabric_port_config.ini
@ -0,0 +1,193 @@
+# name              lanes     isolateStatus
+Fabric0             0         False
+Fabric1             1         False
+Fabric2             2         False
+Fabric3             3         False
+Fabric4             4         False
+Fabric5             5         False
+Fabric6             6         False
+Fabric7             7         False
+Fabric8             8         False
+Fabric9             9         False
+Fabric10            10        False
+Fabric11            11        False
+Fabric12            12        False
+Fabric13            13        False
+Fabric14            14        False
+Fabric15            15        False
+Fabric16            16        False
+Fabric17            17        False
+Fabric18            18        False
+Fabric19            19        False
+Fabric20            20        False
+Fabric21            21        False
+Fabric22            22        False
+Fabric23            23        False
+Fabric24            24        False
+Fabric25            25        False
+Fabric26            26        False
+Fabric27            27        False
+Fabric28            28        False
+Fabric29            29        False
+Fabric30            30        False
+Fabric31            31        False
+Fabric32            32        False
+Fabric33            33        False
+Fabric34            34        False
+Fabric35            35        False
+Fabric36            36        False
+Fabric37            37        False
+Fabric38            38        False
+Fabric39            39        False
+Fabric40            40        False
+Fabric41            41        False
+Fabric42            42        False
+Fabric43            43        False
+Fabric44            44        False
+Fabric45            45        False
+Fabric46            46        False
+Fabric47            47        False
+Fabric48            48        False
+Fabric49            49        False
+Fabric50            50        False
+Fabric51            51        False
+Fabric52            52        False
+Fabric53            53        False
+Fabric54            54        False
+Fabric55            55        False
+Fabric56            56        False
+Fabric57            57        False
+Fabric58            58        False
+Fabric59            59        False
+Fabric60            60        False
+Fabric61            61        False
+Fabric62            62        False
+Fabric63            63        False
+Fabric64            64        False
+Fabric65            65        False
+Fabric66            66        False
+Fabric67            67        False
+Fabric68            68        False
+Fabric69            69        False
+Fabric70            70        False
+Fabric71            71        False
+Fabric72            72        False
+Fabric73            73        False
+Fabric74            74        False
+Fabric75            75        False
+Fabric76            76        False
+Fabric77            77        False
+Fabric78            78        False
+Fabric79            79        False
+Fabric80            80        False
+Fabric81            81        False
+Fabric82            82        False
+Fabric83            83        False
+Fabric84            84        False
+Fabric85            85        False
+Fabric86            86        False
+Fabric87            87        False
+Fabric88            88        False
+Fabric89            89        False
+Fabric90            90        False
+Fabric91            91        False
+Fabric92            92        False
+Fabric93            93        False
+Fabric94            94        False
+Fabric95            95        False
+Fabric96            96        False
+Fabric97            97        False
+Fabric98            98        False
+Fabric99            99        False
+Fabric100           100       False
+Fabric101           101       False
+Fabric102           102       False
+Fabric103           103       False
+Fabric104           104       False
+Fabric105           105       False
+Fabric106           106       False
+Fabric107           107       False
+Fabric108           108       False
+Fabric109           109       False
+Fabric110           110       False
+Fabric111           111       False
+Fabric112           112       False
+Fabric113           113       False
+Fabric114           114       False
+Fabric115           115       False
+Fabric116           116       False
+Fabric117           117       False
+Fabric118           118       False
+Fabric119           119       False
+Fabric120           120       False
+Fabric121           121       False
+Fabric122           122       False
+Fabric123           123       False
+Fabric124           124       False
+Fabric125           125       False
+Fabric126           126       False
+Fabric127           127       False
+Fabric128           128       False
+Fabric129           129       False
+Fabric130           130       False
+Fabric131           131       False
+Fabric132           132       False
+Fabric133           133       False
+Fabric134           134       False
+Fabric135           135       False
+Fabric136           136       False
+Fabric137           137       False
+Fabric138           138       False
+Fabric139           139       False
+Fabric140           140       False
+Fabric141           141       False
+Fabric142           142       False
+Fabric143           143       False
+Fabric144           144       False
+Fabric145           145       False
+Fabric146           146       False
+Fabric147           147       False
+Fabric148           148       False
+Fabric149           149       False
+Fabric150           150       False
+Fabric151           151       False
+Fabric152           152       False
+Fabric153           153       False
+Fabric154           154       False
+Fabric155           155       False
+Fabric156           156       False
+Fabric157           157       False
+Fabric158           158       False
+Fabric159           159       False
+Fabric160           160       False
+Fabric161           161       False
+Fabric162           162       False
+Fabric163           163       False
+Fabric164           164       False
+Fabric165           165       False
+Fabric166           166       False
+Fabric167           167       False
+Fabric168           168       False
+Fabric169           169       False
+Fabric170           170       False
+Fabric171           171       False
+Fabric172           172       False
+Fabric173           173       False
+Fabric174           174       False
+Fabric175           175       False
+Fabric176           176       False
+Fabric177           177       False
+Fabric178           178       False
+Fabric179           179       False
+Fabric180           180       False
+Fabric181           181       False
+Fabric182           182       False
+Fabric183           183       False
+Fabric184           184       False
+Fabric185           185       False
+Fabric186           186       False
+Fabric187           187       False
+Fabric188           188       False
+Fabric189           189       False
+Fabric190           190       False
+Fabric191           191       False
--- a/device/arista/x86_64-arista_7800_sup/Arista-7808R3-FM/fabric_monitor_config.json
+++ b/device/arista/x86_64-arista_7800_sup/Arista-7808R3-FM/fabric_monitor_config.json
@ -0,0 +1,8 @@
+{
+   "FABRIC_MONITOR_DATA": {
+      "monErrThreshCrcCells": 1,
+      "monErrThreshRxCells": 61035156,
+      "monPollThreshRecovery": 8,
+      "monPollThreshIsolation": 1
+   }
+}
--- a/device/arista/x86_64-arista_7800_sup/Arista-7808R3-FM/fabric_port_config.ini
+++ b/device/arista/x86_64-arista_7800_sup/Arista-7808R3-FM/fabric_port_config.ini
@ -0,0 +1,193 @@
+# name              lanes     isolateStatus
+Fabric0             0         False
+Fabric1             1         False
+Fabric2             2         False
+Fabric3             3         False
+Fabric4             4         False
+Fabric5             5         False
+Fabric6             6         False
+Fabric7             7         False
+Fabric8             8         False
+Fabric9             9         False
+Fabric10            10        False
+Fabric11            11        False
+Fabric12            12        False
+Fabric13            13        False
+Fabric14            14        False
+Fabric15            15        False
+Fabric16            16        False
+Fabric17            17        False
+Fabric18            18        False
+Fabric19            19        False
+Fabric20            20        False
+Fabric21            21        False
+Fabric22            22        False
+Fabric23            23        False
+Fabric24            24        False
+Fabric25            25        False
+Fabric26            26        False
+Fabric27            27        False
+Fabric28            28        False
+Fabric29            29        False
+Fabric30            30        False
+Fabric31            31        False
+Fabric32            32        False
+Fabric33            33        False
+Fabric34            34        False
+Fabric35            35        False
+Fabric36            36        False
+Fabric37            37        False
+Fabric38            38        False
+Fabric39            39        False
+Fabric40            40        False
+Fabric41            41        False
+Fabric42            42        False
+Fabric43            43        False
+Fabric44            44        False
+Fabric45            45        False
+Fabric46            46        False
+Fabric47            47        False
+Fabric48            48        False
+Fabric49            49        False
+Fabric50            50        False
+Fabric51            51        False
+Fabric52            52        False
+Fabric53            53        False
+Fabric54            54        False
+Fabric55            55        False
+Fabric56            56        False
+Fabric57            57        False
+Fabric58            58        False
+Fabric59            59        False
+Fabric60            60        False
+Fabric61            61        False
+Fabric62            62        False
+Fabric63            63        False
+Fabric64            64        False
+Fabric65            65        False
+Fabric66            66        False
+Fabric67            67        False
+Fabric68            68        False
+Fabric69            69        False
+Fabric70            70        False
+Fabric71            71        False
+Fabric72            72        False
+Fabric73            73        False
+Fabric74            74        False
+Fabric75            75        False
+Fabric76            76        False
+Fabric77            77        False
+Fabric78            78        False
+Fabric79            79        False
+Fabric80            80        False
+Fabric81            81        False
+Fabric82            82        False
+Fabric83            83        False
+Fabric84            84        False
+Fabric85            85        False
+Fabric86            86        False
+Fabric87            87        False
+Fabric88            88        False
+Fabric89            89        False
+Fabric90            90        False
+Fabric91            91        False
+Fabric92            92        False
+Fabric93            93        False
+Fabric94            94        False
+Fabric95            95        False
+Fabric96            96        False
+Fabric97            97        False
+Fabric98            98        False
+Fabric99            99        False
+Fabric100           100       False
+Fabric101           101       False
+Fabric102           102       False
+Fabric103           103       False
+Fabric104           104       False
+Fabric105           105       False
+Fabric106           106       False
+Fabric107           107       False
+Fabric108           108       False
+Fabric109           109       False
+Fabric110           110       False
+Fabric111           111       False
+Fabric112           112       False
+Fabric113           113       False
+Fabric114           114       False
+Fabric115           115       False
+Fabric116           116       False
+Fabric117           117       False
+Fabric118           118       False
+Fabric119           119       False
+Fabric120           120       False
+Fabric121           121       False
+Fabric122           122       False
+Fabric123           123       False
+Fabric124           124       False
+Fabric125           125       False
+Fabric126           126       False
+Fabric127           127       False
+Fabric128           128       False
+Fabric129           129       False
+Fabric130           130       False
+Fabric131           131       False
+Fabric132           132       False
+Fabric133           133       False
+Fabric134           134       False
+Fabric135           135       False
+Fabric136           136       False
+Fabric137           137       False
+Fabric138           138       False
+Fabric139           139       False
+Fabric140           140       False
+Fabric141           141       False
+Fabric142           142       False
+Fabric143           143       False
+Fabric144           144       False
+Fabric145           145       False
+Fabric146           146       False
+Fabric147           147       False
+Fabric148           148       False
+Fabric149           149       False
+Fabric150           150       False
+Fabric151           151       False
+Fabric152           152       False
+Fabric153           153       False
+Fabric154           154       False
+Fabric155           155       False
+Fabric156           156       False
+Fabric157           157       False
+Fabric158           158       False
+Fabric159           159       False
+Fabric160           160       False
+Fabric161           161       False
+Fabric162           162       False
+Fabric163           163       False
+Fabric164           164       False
+Fabric165           165       False
+Fabric166           166       False
+Fabric167           167       False
+Fabric168           168       False
+Fabric169           169       False
+Fabric170           170       False
+Fabric171           171       False
+Fabric172           172       False
+Fabric173           173       False
+Fabric174           174       False
+Fabric175           175       False
+Fabric176           176       False
+Fabric177           177       False
+Fabric178           178       False
+Fabric179           179       False
+Fabric180           180       False
+Fabric181           181       False
+Fabric182           182       False
+Fabric183           183       False
+Fabric184           184       False
+Fabric185           185       False
+Fabric186           186       False
+Fabric187           187       False
+Fabric188           188       False
+Fabric189           189       False
+Fabric190           190       False
+Fabric191           191       False
--- a/device/arista/x86_64-arista_7800_sup/Arista-7808R3A-FM/fabric_monitor_config.json
+++ b/device/arista/x86_64-arista_7800_sup/Arista-7808R3A-FM/fabric_monitor_config.json
@ -0,0 +1,8 @@
+{
+   "FABRIC_MONITOR_DATA": {
+      "monErrThreshCrcCells": 1,
+      "monErrThreshRxCells": 61035156,
+      "monPollThreshRecovery": 8,
+      "monPollThreshIsolation": 1
+   }
+}
--- a/device/arista/x86_64-arista_7800_sup/Arista-7808R3A-FM/fabric_port_config.ini
+++ b/device/arista/x86_64-arista_7800_sup/Arista-7808R3A-FM/fabric_port_config.ini
@ -0,0 +1,193 @@
+# name              lanes     isolateStatus
+Fabric0             0         False
+Fabric1             1         False
+Fabric2             2         False
+Fabric3             3         False
+Fabric4             4         False
+Fabric5             5         False
+Fabric6             6         False
+Fabric7             7         False
+Fabric8             8         False
+Fabric9             9         False
+Fabric10            10        False
+Fabric11            11        False
+Fabric12            12        False
+Fabric13            13        False
+Fabric14            14        False
+Fabric15            15        False
+Fabric16            16        False
+Fabric17            17        False
+Fabric18            18        False
+Fabric19            19        False
+Fabric20            20        False
+Fabric21            21        False
+Fabric22            22        False
+Fabric23            23        False
+Fabric24            24        False
+Fabric25            25        False
+Fabric26            26        False
+Fabric27            27        False
+Fabric28            28        False
+Fabric29            29        False
+Fabric30            30        False
+Fabric31            31        False
+Fabric32            32        False
+Fabric33            33        False
+Fabric34            34        False
+Fabric35            35        False
+Fabric36            36        False
+Fabric37            37        False
+Fabric38            38        False
+Fabric39            39        False
+Fabric40            40        False
+Fabric41            41        False
+Fabric42            42        False
+Fabric43            43        False
+Fabric44            44        False
+Fabric45            45        False
+Fabric46            46        False
+Fabric47            47        False
+Fabric48            48        False
+Fabric49            49        False
+Fabric50            50        False
+Fabric51            51        False
+Fabric52            52        False
+Fabric53            53        False
+Fabric54            54        False
+Fabric55            55        False
+Fabric56            56        False
+Fabric57            57        False
+Fabric58            58        False
+Fabric59            59        False
+Fabric60            60        False
+Fabric61            61        False
+Fabric62            62        False
+Fabric63            63        False
+Fabric64            64        False
+Fabric65            65        False
+Fabric66            66        False
+Fabric67            67        False
+Fabric68            68        False
+Fabric69            69        False
+Fabric70            70        False
+Fabric71            71        False
+Fabric72            72        False
+Fabric73            73        False
+Fabric74            74        False
+Fabric75            75        False
+Fabric76            76        False
+Fabric77            77        False
+Fabric78            78        False
+Fabric79            79        False
+Fabric80            80        False
+Fabric81            81        False
+Fabric82            82        False
+Fabric83            83        False
+Fabric84            84        False
+Fabric85            85        False
+Fabric86            86        False
+Fabric87            87        False
+Fabric88            88        False
+Fabric89            89        False
+Fabric90            90        False
+Fabric91            91        False
+Fabric92            92        False
+Fabric93            93        False
+Fabric94            94        False
+Fabric95            95        False
+Fabric96            96        False
+Fabric97            97        False
+Fabric98            98        False
+Fabric99            99        False
+Fabric100           100       False
+Fabric101           101       False
+Fabric102           102       False
+Fabric103           103       False
+Fabric104           104       False
+Fabric105           105       False
+Fabric106           106       False
+Fabric107           107       False
+Fabric108           108       False
+Fabric109           109       False
+Fabric110           110       False
+Fabric111           111       False
+Fabric112           112       False
+Fabric113           113       False
+Fabric114           114       False
+Fabric115           115       False
+Fabric116           116       False
+Fabric117           117       False
+Fabric118           118       False
+Fabric119           119       False
+Fabric120           120       False
+Fabric121           121       False
+Fabric122           122       False
+Fabric123           123       False
+Fabric124           124       False
+Fabric125           125       False
+Fabric126           126       False
+Fabric127           127       False
+Fabric128           128       False
+Fabric129           129       False
+Fabric130           130       False
+Fabric131           131       False
+Fabric132           132       False
+Fabric133           133       False
+Fabric134           134       False
+Fabric135           135       False
+Fabric136           136       False
+Fabric137           137       False
+Fabric138           138       False
+Fabric139           139       False
+Fabric140           140       False
+Fabric141           141       False
+Fabric142           142       False
+Fabric143           143       False
+Fabric144           144       False
+Fabric145           145       False
+Fabric146           146       False
+Fabric147           147       False
+Fabric148           148       False
+Fabric149           149       False
+Fabric150           150       False
+Fabric151           151       False
+Fabric152           152       False
+Fabric153           153       False
+Fabric154           154       False
+Fabric155           155       False
+Fabric156           156       False
+Fabric157           157       False
+Fabric158           158       False
+Fabric159           159       False
+Fabric160           160       False
+Fabric161           161       False
+Fabric162           162       False
+Fabric163           163       False
+Fabric164           164       False
+Fabric165           165       False
+Fabric166           166       False
+Fabric167           167       False
+Fabric168           168       False
+Fabric169           169       False
+Fabric170           170       False
+Fabric171           171       False
+Fabric172           172       False
+Fabric173           173       False
+Fabric174           174       False
+Fabric175           175       False
+Fabric176           176       False
+Fabric177           177       False
+Fabric178           178       False
+Fabric179           179       False
+Fabric180           180       False
+Fabric181           181       False
+Fabric182           182       False
+Fabric183           183       False
+Fabric184           184       False
+Fabric185           185       False
+Fabric186           186       False
+Fabric187           187       False
+Fabric188           188       False
+Fabric189           189       False
+Fabric190           190       False
+Fabric191           191       False
--- a/device/arista/x86_64-arista_7800r3_48cq2_lc/Arista-7800R3-48CQ2-C48/fabric_monitor_config.json
+++ b/device/arista/x86_64-arista_7800r3_48cq2_lc/Arista-7800R3-48CQ2-C48/fabric_monitor_config.json
@ -0,0 +1,8 @@
+{
+   "FABRIC_MONITOR_DATA": {
+      "monErrThreshCrcCells": 1,
+      "monErrThreshRxCells": 61035156,
+      "monPollThreshRecovery": 8,
+      "monPollThreshIsolation": 1
+   }
+}
--- a/device/arista/x86_64-arista_7800r3_48cq2_lc/Arista-7800R3-48CQ2-C48/fabric_port_config.ini
+++ b/device/arista/x86_64-arista_7800r3_48cq2_lc/Arista-7800R3-48CQ2-C48/fabric_port_config.ini
@ -0,0 +1,113 @@
+# name              lanes     isolateStatus
+Fabric0             0         False
+Fabric1             1         False
+Fabric2             2         False
+Fabric3             3         False
+Fabric4             4         False
+Fabric5             5         False
+Fabric6             6         False
+Fabric7             7         False
+Fabric8             8         False
+Fabric9             9         False
+Fabric10            10        False
+Fabric11            11        False
+Fabric12            12        False
+Fabric13            13        False
+Fabric14            14        False
+Fabric15            15        False
+Fabric16            16        False
+Fabric17            17        False
+Fabric18            18        False
+Fabric19            19        False
+Fabric20            20        False
+Fabric21            21        False
+Fabric22            22        False
+Fabric23            23        False
+Fabric24            24        False
+Fabric25            25        False
+Fabric26            26        False
+Fabric27            27        False
+Fabric28            28        False
+Fabric29            29        False
+Fabric30            30        False
+Fabric31            31        False
+Fabric32            32        False
+Fabric33            33        False
+Fabric34            34        False
+Fabric35            35        False
+Fabric36            36        False
+Fabric37            37        False
+Fabric38            38        False
+Fabric39            39        False
+Fabric40            40        False
+Fabric41            41        False
+Fabric42            42        False
+Fabric43            43        False
+Fabric44            44        False
+Fabric45            45        False
+Fabric46            46        False
+Fabric47            47        False
+Fabric48            48        False
+Fabric49            49        False
+Fabric50            50        False
+Fabric51            51        False
+Fabric52            52        False
+Fabric53            53        False
+Fabric54            54        False
+Fabric55            55        False
+Fabric56            56        False
+Fabric57            57        False
+Fabric58            58        False
+Fabric59            59        False
+Fabric60            60        False
+Fabric61            61        False
+Fabric62            62        False
+Fabric63            63        False
+Fabric64            64        False
+Fabric65            65        False
+Fabric66            66        False
+Fabric67            67        False
+Fabric68            68        False
+Fabric69            69        False
+Fabric70            70        False
+Fabric71            71        False
+Fabric72            72        False
+Fabric73            73        False
+Fabric74            74        False
+Fabric75            75        False
+Fabric76            76        False
+Fabric77            77        False
+Fabric78            78        False
+Fabric79            79        False
+Fabric80            80        False
+Fabric81            81        False
+Fabric82            82        False
+Fabric83            83        False
+Fabric84            84        False
+Fabric85            85        False
+Fabric86            86        False
+Fabric87            87        False
+Fabric88            88        False
+Fabric89            89        False
+Fabric90            90        False
+Fabric91            91        False
+Fabric92            92        False
+Fabric93            93        False
+Fabric94            94        False
+Fabric95            95        False
+Fabric96            96        False
+Fabric97            97        False
+Fabric98            98        False
+Fabric99            99        False
+Fabric100           100       False
+Fabric101           101       False
+Fabric102           102       False
+Fabric103           103       False
+Fabric104           104       False
+Fabric105           105       False
+Fabric106           106       False
+Fabric107           107       False
+Fabric108           108       False
+Fabric109           109       False
+Fabric110           110       False
+Fabric111           111       False
--- a/device/arista/x86_64-arista_7800r3_48cq2_lc/Arista-7800R3-48CQ2-C48/jr2-a7280cr3-32d4-40x100G.config.bcm
+++ b/device/arista/x86_64-arista_7800r3_48cq2_lc/Arista-7800R3-48CQ2-C48/jr2-a7280cr3-32d4-40x100G.config.bcm
@ -859,4 +859,5 @@ dma_desc_aggregator_buff_size_kb.BCM8869X=100
 dma_desc_aggregator_timeout_usec.BCM8869X=1000
 dma_desc_aggregator_enable_specific_MDB_LPM.BCM8869X=1
 dma_desc_aggregator_enable_specific_MDB_FEC.BCM8869X=1
-sai_pfc_dlr_init_capability=0 
+sai_pfc_dlr_init_capability=0
+sai_disable_srcmacqedstmac_ctrl=1
--- a/device/arista/x86_64-arista_7800r3_48cq2_lc/fabric_monitor_config.json
+++ b/device/arista/x86_64-arista_7800r3_48cq2_lc/fabric_monitor_config.json
@ -0,0 +1,8 @@
+{
+   "FABRIC_MONITOR_DATA": {
+      "monErrThreshCrcCells": 1,
+      "monErrThreshRxCells": 61035156,
+      "monPollThreshRecovery": 8,
+      "monPollThreshIsolation": 1
+   }
+}
--- a/device/arista/x86_64-arista_7800r3_48cq2_lc/fabric_port_config.ini
+++ b/device/arista/x86_64-arista_7800r3_48cq2_lc/fabric_port_config.ini
@ -0,0 +1,113 @@
+# name              lanes     isolateStatus
+Fabric0             0         False
+Fabric1             1         False
+Fabric2             2         False
+Fabric3             3         False
+Fabric4             4         False
+Fabric5             5         False
+Fabric6             6         False
+Fabric7             7         False
+Fabric8             8         False
+Fabric9             9         False
+Fabric10            10        False
+Fabric11            11        False
+Fabric12            12        False
+Fabric13            13        False
+Fabric14            14        False
+Fabric15            15        False
+Fabric16            16        False
+Fabric17            17        False
+Fabric18            18        False
+Fabric19            19        False
+Fabric20            20        False
+Fabric21            21        False
+Fabric22            22        False
+Fabric23            23        False
+Fabric24            24        False
+Fabric25            25        False
+Fabric26            26        False
+Fabric27            27        False
+Fabric28            28        False
+Fabric29            29        False
+Fabric30            30        False
+Fabric31            31        False
+Fabric32            32        False
+Fabric33            33        False
+Fabric34            34        False
+Fabric35            35        False
+Fabric36            36        False
+Fabric37            37        False
+Fabric38            38        False
+Fabric39            39        False
+Fabric40            40        False
+Fabric41            41        False
+Fabric42            42        False
+Fabric43            43        False
+Fabric44            44        False
+Fabric45            45        False
+Fabric46            46        False
+Fabric47            47        False
+Fabric48            48        False
+Fabric49            49        False
+Fabric50            50        False
+Fabric51            51        False
+Fabric52            52        False
+Fabric53            53        False
+Fabric54            54        False
+Fabric55            55        False
+Fabric56            56        False
+Fabric57            57        False
+Fabric58            58        False
+Fabric59            59        False
+Fabric60            60        False
+Fabric61            61        False
+Fabric62            62        False
+Fabric63            63        False
+Fabric64            64        False
+Fabric65            65        False
+Fabric66            66        False
+Fabric67            67        False
+Fabric68            68        False
+Fabric69            69        False
+Fabric70            70        False
+Fabric71            71        False
+Fabric72            72        False
+Fabric73            73        False
+Fabric74            74        False
+Fabric75            75        False
+Fabric76            76        False
+Fabric77            77        False
+Fabric78            78        False
+Fabric79            79        False
+Fabric80            80        False
+Fabric81            81        False
+Fabric82            82        False
+Fabric83            83        False
+Fabric84            84        False
+Fabric85            85        False
+Fabric86            86        False
+Fabric87            87        False
+Fabric88            88        False
+Fabric89            89        False
+Fabric90            90        False
+Fabric91            91        False
+Fabric92            92        False
+Fabric93            93        False
+Fabric94            94        False
+Fabric95            95        False
+Fabric96            96        False
+Fabric97            97        False
+Fabric98            98        False
+Fabric99            99        False
+Fabric100           100       False
+Fabric101           101       False
+Fabric102           102       False
+Fabric103           103       False
+Fabric104           104       False
+Fabric105           105       False
+Fabric106           106       False
+Fabric107           107       False
+Fabric108           108       False
+Fabric109           109       False
+Fabric110           110       False
+Fabric111           111       False
--- a/device/arista/x86_64-arista_7800r3_48cq2_lc/platform_env.conf
+++ b/device/arista/x86_64-arista_7800r3_48cq2_lc/platform_env.conf
@ -1,2 +1,3 @@
+SYNCD_SHM_SIZE=1gb
 usemsi=1
 dmasize=512M
--- a/device/arista/x86_64-arista_7800r3_48cqm2_lc/Arista-7800R3-48CQM2-C48/fabric_monitor_config.json
+++ b/device/arista/x86_64-arista_7800r3_48cqm2_lc/Arista-7800R3-48CQM2-C48/fabric_monitor_config.json
@ -0,0 +1,8 @@
+{
+   "FABRIC_MONITOR_DATA": {
+      "monErrThreshCrcCells": 1,
+      "monErrThreshRxCells": 61035156,
+      "monPollThreshRecovery": 8,
+      "monPollThreshIsolation": 1
+   }
+}
--- a/device/arista/x86_64-arista_7800r3_48cqm2_lc/Arista-7800R3-48CQM2-C48/fabric_port_config.ini
+++ b/device/arista/x86_64-arista_7800r3_48cqm2_lc/Arista-7800R3-48CQM2-C48/fabric_port_config.ini
@ -0,0 +1,113 @@
+# name              lanes     isolateStatus
+Fabric0             0         False
+Fabric1             1         False
+Fabric2             2         False
+Fabric3             3         False
+Fabric4             4         False
+Fabric5             5         False
+Fabric6             6         False
+Fabric7             7         False
+Fabric8             8         False
+Fabric9             9         False
+Fabric10            10        False
+Fabric11            11        False
+Fabric12            12        False
+Fabric13            13        False
+Fabric14            14        False
+Fabric15            15        False
+Fabric16            16        False
+Fabric17            17        False
+Fabric18            18        False
+Fabric19            19        False
+Fabric20            20        False
+Fabric21            21        False
+Fabric22            22        False
+Fabric23            23        False
+Fabric24            24        False
+Fabric25            25        False
+Fabric26            26        False
+Fabric27            27        False
+Fabric28            28        False
+Fabric29            29        False
+Fabric30            30        False
+Fabric31            31        False
+Fabric32            32        False
+Fabric33            33        False
+Fabric34            34        False
+Fabric35            35        False
+Fabric36            36        False
+Fabric37            37        False
+Fabric38            38        False
+Fabric39            39        False
+Fabric40            40        False
+Fabric41            41        False
+Fabric42            42        False
+Fabric43            43        False
+Fabric44            44        False
+Fabric45            45        False
+Fabric46            46        False
+Fabric47            47        False
+Fabric48            48        False
+Fabric49            49        False
+Fabric50            50        False
+Fabric51            51        False
+Fabric52            52        False
+Fabric53            53        False
+Fabric54            54        False
+Fabric55            55        False
+Fabric56            56        False
+Fabric57            57        False
+Fabric58            58        False
+Fabric59            59        False
+Fabric60            60        False
+Fabric61            61        False
+Fabric62            62        False
+Fabric63            63        False
+Fabric64            64        False
+Fabric65            65        False
+Fabric66            66        False
+Fabric67            67        False
+Fabric68            68        False
+Fabric69            69        False
+Fabric70            70        False
+Fabric71            71        False
+Fabric72            72        False
+Fabric73            73        False
+Fabric74            74        False
+Fabric75            75        False
+Fabric76            76        False
+Fabric77            77        False
+Fabric78            78        False
+Fabric79            79        False
+Fabric80            80        False
+Fabric81            81        False
+Fabric82            82        False
+Fabric83            83        False
+Fabric84            84        False
+Fabric85            85        False
+Fabric86            86        False
+Fabric87            87        False
+Fabric88            88        False
+Fabric89            89        False
+Fabric90            90        False
+Fabric91            91        False
+Fabric92            92        False
+Fabric93            93        False
+Fabric94            94        False
+Fabric95            95        False
+Fabric96            96        False
+Fabric97            97        False
+Fabric98            98        False
+Fabric99            99        False
+Fabric100           100       False
+Fabric101           101       False
+Fabric102           102       False
+Fabric103           103       False
+Fabric104           104       False
+Fabric105           105       False
+Fabric106           106       False
+Fabric107           107       False
+Fabric108           108       False
+Fabric109           109       False
+Fabric110           110       False
+Fabric111           111       False
--- a/device/arista/x86_64-arista_7800r3_48cqm2_lc/fabric_monitor_config.json
+++ b/device/arista/x86_64-arista_7800r3_48cqm2_lc/fabric_monitor_config.json
@ -0,0 +1,8 @@
+{
+   "FABRIC_MONITOR_DATA": {
+      "monErrThreshCrcCells": 1,
+      "monErrThreshRxCells": 61035156,
+      "monPollThreshRecovery": 8,
+      "monPollThreshIsolation": 1
+   }
+}
--- a/device/arista/x86_64-arista_7800r3_48cqm2_lc/fabric_port_config.ini
+++ b/device/arista/x86_64-arista_7800r3_48cqm2_lc/fabric_port_config.ini
@ -0,0 +1,113 @@
+# name              lanes     isolateStatus
+Fabric0             0         False
+Fabric1             1         False
+Fabric2             2         False
+Fabric3             3         False
+Fabric4             4         False
+Fabric5             5         False
+Fabric6             6         False
+Fabric7             7         False
+Fabric8             8         False
+Fabric9             9         False
+Fabric10            10        False
+Fabric11            11        False
+Fabric12            12        False
+Fabric13            13        False
+Fabric14            14        False
+Fabric15            15        False
+Fabric16            16        False
+Fabric17            17        False
+Fabric18            18        False
+Fabric19            19        False
+Fabric20            20        False
+Fabric21            21        False
+Fabric22            22        False
+Fabric23            23        False
+Fabric24            24        False
+Fabric25            25        False
+Fabric26            26        False
+Fabric27            27        False
+Fabric28            28        False
+Fabric29            29        False
+Fabric30            30        False
+Fabric31            31        False
+Fabric32            32        False
+Fabric33            33        False
+Fabric34            34        False
+Fabric35            35        False
+Fabric36            36        False
+Fabric37            37        False
+Fabric38            38        False
+Fabric39            39        False
+Fabric40            40        False
+Fabric41            41        False
+Fabric42            42        False
+Fabric43            43        False
+Fabric44            44        False
+Fabric45            45        False
+Fabric46            46        False
+Fabric47            47        False
+Fabric48            48        False
+Fabric49            49        False
+Fabric50            50        False
+Fabric51            51        False
+Fabric52            52        False
+Fabric53            53        False
+Fabric54            54        False
+Fabric55            55        False
+Fabric56            56        False
+Fabric57            57        False
+Fabric58            58        False
+Fabric59            59        False
+Fabric60            60        False
+Fabric61            61        False
+Fabric62            62        False
+Fabric63            63        False
+Fabric64            64        False
+Fabric65            65        False
+Fabric66            66        False
+Fabric67            67        False
+Fabric68            68        False
+Fabric69            69        False
+Fabric70            70        False
+Fabric71            71        False
+Fabric72            72        False
+Fabric73            73        False
+Fabric74            74        False
+Fabric75            75        False
+Fabric76            76        False
+Fabric77            77        False
+Fabric78            78        False
+Fabric79            79        False
+Fabric80            80        False
+Fabric81            81        False
+Fabric82            82        False
+Fabric83            83        False
+Fabric84            84        False
+Fabric85            85        False
+Fabric86            86        False
+Fabric87            87        False
+Fabric88            88        False
+Fabric89            89        False
+Fabric90            90        False
+Fabric91            91        False
+Fabric92            92        False
+Fabric93            93        False
+Fabric94            94        False
+Fabric95            95        False
+Fabric96            96        False
+Fabric97            97        False
+Fabric98            98        False
+Fabric99            99        False
+Fabric100           100       False
+Fabric101           101       False
+Fabric102           102       False
+Fabric103           103       False
+Fabric104           104       False
+Fabric105           105       False
+Fabric106           106       False
+Fabric107           107       False
+Fabric108           108       False
+Fabric109           109       False
+Fabric110           110       False
+Fabric111           111       False
--- a/device/arista/x86_64-arista_7800r3_48cqm2_lc/platform_env.conf
+++ b/device/arista/x86_64-arista_7800r3_48cqm2_lc/platform_env.conf
@ -1,2 +1,3 @@
+SYNCD_SHM_SIZE=1gb
 usemsi=1
 dmasize=512M
--- a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/0/j2p-a7800r3a-36d-36x400G.config.bcm
+++ b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/0/j2p-a7800r3a-36d-36x400G.config.bcm
@ -1014,3 +1014,4 @@ appl_param_nof_ports_per_modid=64
 xflow_macsec_secure_chan_to_num_secure_assoc_encrypt=2
 xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=2
 sai_pfc_dlr_init_capability=0
+sai_disable_srcmacqedstmac_ctrl=1
--- a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/1/j2p-a7800r3a-36d-36x400G.config.bcm
+++ b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/1/j2p-a7800r3a-36d-36x400G.config.bcm
@ -1014,3 +1014,4 @@ appl_param_nof_ports_per_modid=64
 xflow_macsec_secure_chan_to_num_secure_assoc_encrypt=2
 xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=2
 sai_pfc_dlr_init_capability=0
+sai_disable_srcmacqedstmac_ctrl=1
--- a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/port_config.ini
+++ b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/port_config.ini
@ -1,41 +0,0 @@
-# name         lanes             alias        index  role       speed       asic_port_name     coreId      corePortId      numVoq
-Ethernet0      72,73,74,75       Ethernet1/1  1      Ext        100000      Eth0-ASIC0         1           1               8
-Ethernet8      80,81,82,83       Ethernet2/1  2      Ext        100000      Eth8-ASIC0         1           2               8
-Ethernet16     88,89,90,91       Ethernet3/1  3      Ext        100000      Eth16-ASIC0        1           3               8
-Ethernet24     96,97,98,99       Ethernet4/1  4      Ext        100000      Eth24-ASIC0        1           4               8
-Ethernet32     104,105,106,107   Ethernet5/1  5      Ext        100000      Eth32-ASIC0        1           5               8
-Ethernet40     112,113,114,115   Ethernet6/1  6      Ext        100000      Eth40-ASIC0        1           6               8
-Ethernet48     120,121,122,123   Ethernet7/1  7      Ext        100000      Eth48-ASIC0        1           7               8
-Ethernet56     128,129,130,131   Ethernet8/1  8      Ext        100000      Eth56-ASIC0        1           8               8
-Ethernet64     136,137,138,139   Ethernet9/1  9      Ext        100000      Eth64-ASIC0        1           9               8
-Ethernet72     64,65,66,67       Ethernet10/1 10     Ext        100000      Eth72-ASIC0        0           10              8
-Ethernet80     56,57,58,59       Ethernet11/1 11     Ext        100000      Eth80-ASIC0        0           11              8
-Ethernet88     48,49,50,51       Ethernet12/1 12     Ext        100000      Eth88-ASIC0        0           12              8
-Ethernet96     40,41,42,43       Ethernet13/1 13     Ext        100000      Eth96-ASIC0        0           13              8
-Ethernet104    32,33,34,35       Ethernet14/1 14     Ext        100000      Eth104-ASIC0       0           14              8
-Ethernet112    24,25,26,27       Ethernet15/1 15     Ext        100000      Eth112-ASIC0       0           15              8
-Ethernet120    16,17,18,19       Ethernet16/1 16     Ext        100000      Eth120-ASIC0       0           16              8
-Ethernet128    8,9,10,11         Ethernet17/1 17     Ext        100000      Eth128-ASIC0       0           17              8
-Ethernet136    0,1,2,3           Ethernet18/1 18     Ext        100000      Eth136-ASIC0       0           18              8
-Ethernet144    72,73,74,75       Ethernet19/1 19     Ext        100000      Eth0-ASIC1         1           1               8
-Ethernet152    80,81,82,83       Ethernet20/1 20     Ext        100000      Eth8-ASIC1         1           2               8
-Ethernet160    88,89,90,91       Ethernet21/1 21     Ext        100000      Eth16-ASIC1        1           3               8
-Ethernet168    96,97,98,99       Ethernet22/1 22     Ext        100000      Eth24-ASIC1        1           4               8
-Ethernet176    104,105,106,107   Ethernet23/1 23     Ext        100000      Eth32-ASIC1        1           5               8
-Ethernet184    112,113,114,115   Ethernet24/1 24     Ext        100000      Eth40-ASIC1        1           6               8
-Ethernet192    120,121,122,123   Ethernet25/1 25     Ext        100000      Eth48-ASIC1        1           7               8
-Ethernet200    128,129,130,131   Ethernet26/1 26     Ext        100000      Eth56-ASIC1        1           8               8
-Ethernet208    136,137,138,139   Ethernet27/1 27     Ext        100000      Eth64-ASIC1        1           9               8
-Ethernet216    64,65,66,67       Ethernet28/1 28     Ext        100000      Eth72-ASIC1        0           10              8
-Ethernet224    56,57,58,59       Ethernet29/1 29     Ext        100000      Eth80-ASIC1        0           11              8
-Ethernet232    48,49,50,51       Ethernet30/1 30     Ext        100000      Eth88-ASIC1        0           12              8
-Ethernet240    40,41,42,43       Ethernet31/1 31     Ext        100000      Eth96-ASIC1        0           13              8
-Ethernet248    32,33,34,35       Ethernet32/1 32     Ext        100000      Eth104-ASIC1       0           14              8
-Ethernet256    24,25,26,27       Ethernet33/1 33     Ext        100000      Eth112-ASIC1       0           15              8
-Ethernet264    16,17,18,19       Ethernet34/1 34     Ext        100000      Eth120-ASIC1       0           16              8
-Ethernet272    8,9,10,11         Ethernet35/1 35     Ext        100000      Eth128-ASIC1       0           17              8
-Ethernet280    0,1,2,3           Ethernet36/1 36     Ext        100000      Eth136-ASIC1       0           18              8
-Ethernet-Rec0  249               Recirc0/0    37     Rec        400000      Rcy0-ASIC0         0           49              8
-Ethernet-IB0   250               Recirc0/1    38     Inb        400000      Rcy1-ASIC0         1           50              8
-Ethernet-Rec1  249               Recirc0/0    39     Rec        400000      Rcy0-ASIC1         0           49              8
-Ethernet-IB1   250               Recirc0/1    40     Inb        400000      Rcy1-ASIC1         1           50              8
--- a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/0/j2p-a7800r3a-36d-36x400G.config.bcm
+++ b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/0/j2p-a7800r3a-36d-36x400G.config.bcm
@ -1031,3 +1031,4 @@ serdes_tx_taps_36=nrz:-8:89:-29:0:0:0
 xflow_macsec_secure_chan_to_num_secure_assoc_encrypt=2
 xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=4
 sai_pfc_dlr_init_capability=0
+sai_disable_srcmacqedstmac_ctrl=1
--- a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/1/j2p-a7800r3a-36d-36x400G.config.bcm
+++ b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/1/j2p-a7800r3a-36d-36x400G.config.bcm
@ -1031,3 +1031,4 @@ serdes_tx_taps_36=nrz:-7:85:-25:0:0:0
 xflow_macsec_secure_chan_to_num_secure_assoc_encrypt=2
 xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=4
 sai_pfc_dlr_init_capability=0
+sai_disable_srcmacqedstmac_ctrl=1
--- a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/fabric_monitor_config.json
+++ b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/fabric_monitor_config.json
@ -0,0 +1,8 @@
+{
+   "FABRIC_MONITOR_DATA": {
+      "monErrThreshCrcCells": 1,
+      "monErrThreshRxCells": 61035156,
+      "monPollThreshRecovery": 8,
+      "monPollThreshIsolation": 1
+   }
+}
--- a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/fabric_port_config.ini
+++ b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/fabric_port_config.ini
@ -0,0 +1,193 @@
+# name              lanes     isolateStatus
+Fabric0             0         False
+Fabric1             1         False
+Fabric2             2         False
+Fabric3             3         False
+Fabric4             4         False
+Fabric5             5         False
+Fabric6             6         False
+Fabric7             7         False
+Fabric8             8         False
+Fabric9             9         False
+Fabric10            10        False
+Fabric11            11        False
+Fabric12            12        False
+Fabric13            13        False
+Fabric14            14        False
+Fabric15            15        False
+Fabric16            16        False
+Fabric17            17        False
+Fabric18            18        False
+Fabric19            19        False
+Fabric20            20        False
+Fabric21            21        False
+Fabric22            22        False
+Fabric23            23        False
+Fabric24            24        False
+Fabric25            25        False
+Fabric26            26        False
+Fabric27            27        False
+Fabric28            28        False
+Fabric29            29        False
+Fabric30            30        False
+Fabric31            31        False
+Fabric32            32        False
+Fabric33            33        False
+Fabric34            34        False
+Fabric35            35        False
+Fabric36            36        False
+Fabric37            37        False
+Fabric38            38        False
+Fabric39            39        False
+Fabric40            40        False
+Fabric41            41        False
+Fabric42            42        False
+Fabric43            43        False
+Fabric44            44        False
+Fabric45            45        False
+Fabric46            46        False
+Fabric47            47        False
+Fabric48            48        False
+Fabric49            49        False
+Fabric50            50        False
+Fabric51            51        False
+Fabric52            52        False
+Fabric53            53        False
+Fabric54            54        False
+Fabric55            55        False
+Fabric56            56        False
+Fabric57            57        False
+Fabric58            58        False
+Fabric59            59        False
+Fabric60            60        False
+Fabric61            61        False
+Fabric62            62        False
+Fabric63            63        False
+Fabric64            64        False
+Fabric65            65        False
+Fabric66            66        False
+Fabric67            67        False
+Fabric68            68        False
+Fabric69            69        False
+Fabric70            70        False
+Fabric71            71        False
+Fabric72            72        False
+Fabric73            73        False
+Fabric74            74        False
+Fabric75            75        False
+Fabric76            76        False
+Fabric77            77        False
+Fabric78            78        False
+Fabric79            79        False
+Fabric80            80        False
+Fabric81            81        False
+Fabric82            82        False
+Fabric83            83        False
+Fabric84            84        False
+Fabric85            85        False
+Fabric86            86        False
+Fabric87            87        False
+Fabric88            88        False
+Fabric89            89        False
+Fabric90            90        False
+Fabric91            91        False
+Fabric92            92        False
+Fabric93            93        False
+Fabric94            94        False
+Fabric95            95        False
+Fabric96            96        False
+Fabric97            97        False
+Fabric98            98        False
+Fabric99            99        False
+Fabric100           100       False
+Fabric101           101       False
+Fabric102           102       False
+Fabric103           103       False
+Fabric104           104       False
+Fabric105           105       False
+Fabric106           106       False
+Fabric107           107       False
+Fabric108           108       False
+Fabric109           109       False
+Fabric110           110       False
+Fabric111           111       False
+Fabric112           112       False
+Fabric113           113       False
+Fabric114           114       False
+Fabric115           115       False
+Fabric116           116       False
+Fabric117           117       False
+Fabric118           118       False
+Fabric119           119       False
+Fabric120           120       False
+Fabric121           121       False
+Fabric122           122       False
+Fabric123           123       False
+Fabric124           124       False
+Fabric125           125       False
+Fabric126           126       False
+Fabric127           127       False
+Fabric128           128       False
+Fabric129           129       False
+Fabric130           130       False
+Fabric131           131       False
+Fabric132           132       False
+Fabric133           133       False
+Fabric134           134       False
+Fabric135           135       False
+Fabric136           136       False
+Fabric137           137       False
+Fabric138           138       False
+Fabric139           139       False
+Fabric140           140       False
+Fabric141           141       False
+Fabric142           142       False
+Fabric143           143       False
+Fabric144           144       False
+Fabric145           145       False
+Fabric146           146       False
+Fabric147           147       False
+Fabric148           148       False
+Fabric149           149       False
+Fabric150           150       False
+Fabric151           151       False
+Fabric152           152       False
+Fabric153           153       False
+Fabric154           154       False
+Fabric155           155       False
+Fabric156           156       False
+Fabric157           157       False
+Fabric158           158       False
+Fabric159           159       False
+Fabric160           160       False
+Fabric161           161       False
+Fabric162           162       False
+Fabric163           163       False
+Fabric164           164       False
+Fabric165           165       False
+Fabric166           166       False
+Fabric167           167       False
+Fabric168           168       False
+Fabric169           169       False
+Fabric170           170       False
+Fabric171           171       False
+Fabric172           172       False
+Fabric173           173       False
+Fabric174           174       False
+Fabric175           175       False
+Fabric176           176       False
+Fabric177           177       False
+Fabric178           178       False
+Fabric179           179       False
+Fabric180           180       False
+Fabric181           181       False
+Fabric182           182       False
+Fabric183           183       False
+Fabric184           184       False
+Fabric185           185       False
+Fabric186           186       False
+Fabric187           187       False
+Fabric188           188       False
+Fabric189           189       False
+Fabric190           190       False
+Fabric191           191       False
--- a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/port_config.ini
+++ b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/port_config.ini
@ -1,77 +0,0 @@
-# name         lanes             alias        index  role       speed      asic_port_name     coreId      corePortId      numVoq
-Ethernet0      72,73,74,75       Ethernet1/1  1      Ext        100000      Eth0-ASIC0         1           1               8
-Ethernet4      76,77,78,79       Ethernet1/5  1      Ext        100000      Eth4-ASIC0         1           2               8
-Ethernet8      80,81,82,83       Ethernet2/1  2      Ext        100000      Eth8-ASIC0         1           3               8
-Ethernet12     84,85,86,87       Ethernet2/5  2      Ext        100000      Eth12-ASIC0        1           4               8
-Ethernet16     88,89,90,91       Ethernet3/1  3      Ext        100000      Eth16-ASIC0        1           5               8
-Ethernet20     92,93,94,95       Ethernet3/5  3      Ext        100000      Eth20-ASIC0        1           6               8
-Ethernet24     96,97,98,99       Ethernet4/1  4      Ext        100000      Eth24-ASIC0        1           7               8
-Ethernet28     100,101,102,103   Ethernet4/5  4      Ext        100000      Eth28-ASIC0        1           8               8
-Ethernet32     104,105,106,107   Ethernet5/1  5      Ext        100000      Eth32-ASIC0        1           9               8
-Ethernet36     108,109,110,111   Ethernet5/5  5      Ext        100000      Eth36-ASIC0        1           10              8
-Ethernet40     112,113,114,115   Ethernet6/1  6      Ext        100000      Eth40-ASIC0        1           11              8
-Ethernet44     116,117,118,119   Ethernet6/5  6      Ext        100000      Eth44-ASIC0        1           12              8
-Ethernet48     120,121,122,123   Ethernet7/1  7      Ext        100000      Eth48-ASIC0        1           13              8
-Ethernet52     124,125,126,127   Ethernet7/5  7      Ext        100000      Eth52-ASIC0        1           14              8
-Ethernet56     128,129,130,131   Ethernet8/1  8      Ext        100000      Eth56-ASIC0        1           15              8
-Ethernet60     132,133,134,135   Ethernet8/5  8      Ext        100000      Eth60-ASIC0        1           16              8
-Ethernet64     136,137,138,139   Ethernet9/1  9      Ext        100000      Eth64-ASIC0        1           17              8
-Ethernet68     140,141,142,143   Ethernet9/5  9      Ext        100000      Eth68-ASIC0        1           18              8
-Ethernet72     64,65,66,67       Ethernet10/1 10     Ext        100000      Eth72-ASIC0        0           19              8
-Ethernet76     68,69,70,71       Ethernet10/5 10     Ext        100000      Eth76-ASIC0        0           20              8
-Ethernet80     56,57,58,59       Ethernet11/1 11     Ext        100000      Eth80-ASIC0        0           21              8
-Ethernet84     60,61,62,63       Ethernet11/5 11     Ext        100000      Eth84-ASIC0        0           22              8
-Ethernet88     48,49,50,51       Ethernet12/1 12     Ext        100000      Eth88-ASIC0        0           23              8
-Ethernet92     52,53,54,55       Ethernet12/5 12     Ext        100000      Eth92-ASIC0        0           24              8
-Ethernet96     40,41,42,43       Ethernet13/1 13     Ext        100000      Eth96-ASIC0        0           25              8
-Ethernet100    44,45,46,47       Ethernet13/5 13     Ext        100000      Eth100-ASIC0       0           26              8
-Ethernet104    32,33,34,35       Ethernet14/1 14     Ext        100000      Eth104-ASIC0       0           27              8
-Ethernet108    36,37,38,39       Ethernet14/5 14     Ext        100000      Eth108-ASIC0       0           28              8
-Ethernet112    24,25,26,27       Ethernet15/1 15     Ext        100000      Eth112-ASIC0       0           29              8
-Ethernet116    28,29,30,31       Ethernet15/5 15     Ext        100000      Eth116-ASIC0       0           30              8
-Ethernet120    16,17,18,19       Ethernet16/1 16     Ext        100000      Eth120-ASIC0       0           31              8
-Ethernet124    20,21,22,23       Ethernet16/5 16     Ext        100000      Eth124-ASIC0       0           32              8
-Ethernet128    8,9,10,11         Ethernet17/1 17     Ext        100000      Eth128-ASIC0       0           33              8
-Ethernet132    12,13,14,15       Ethernet17/5 17     Ext        100000      Eth132-ASIC0       0           34              8
-Ethernet136    0,1,2,3           Ethernet18/1 18     Ext        100000      Eth136-ASIC0       0           35              8
-Ethernet140    4,5,6,7           Ethernet18/5 18     Ext        100000      Eth140-ASIC0       0           36              8
-Ethernet144    72,73,74,75       Ethernet19/1 19     Ext        100000      Eth144-ASIC1       1           1               8
-Ethernet148    76,77,78,79       Ethernet19/5 19     Ext        100000      Eth148-ASIC1       1           2               8
-Ethernet152    80,81,82,83       Ethernet20/1 20     Ext        100000      Eth152-ASIC1       1           3               8
-Ethernet156    84,85,86,87       Ethernet20/5 20     Ext        100000      Eth156-ASIC1       1           4               8
-Ethernet160    88,89,90,91       Ethernet21/1 21     Ext        100000      Eth160-ASIC1       1           5               8
-Ethernet164    92,93,94,95       Ethernet21/5 21     Ext        100000      Eth164-ASIC1       1           6               8
-Ethernet168    96,97,98,99       Ethernet22/1 22     Ext        100000      Eth168-ASIC1       1           7               8
-Ethernet172    100,101,102,103   Ethernet22/5 22     Ext        100000      Eth172-ASIC1       1           8               8
-Ethernet176    104,105,106,107   Ethernet23/1 23     Ext        100000      Eth176-ASIC1       1           9               8
-Ethernet180    108,109,110,111   Ethernet23/5 23     Ext        100000      Eth180-ASIC1       1           10              8
-Ethernet184    112,113,114,115   Ethernet24/1 24     Ext        100000      Eth184-ASIC1       1           11              8
-Ethernet188    116,117,118,119   Ethernet24/5 24     Ext        100000      Eth188-ASIC1       1           12              8
-Ethernet192    120,121,122,123   Ethernet25/1 25     Ext        100000      Eth192-ASIC1       1           13              8
-Ethernet196    124,125,126,127   Ethernet25/5 25     Ext        100000      Eth196-ASIC1       1           14              8
-Ethernet200    128,129,130,131   Ethernet26/1 26     Ext        100000      Eth200-ASIC1       1           15              8
-Ethernet204    132,133,134,135   Ethernet26/5 26     Ext        100000      Eth204-ASIC1       1           16              8
-Ethernet208    136,137,138,139   Ethernet27/1 27     Ext        100000      Eth208-ASIC1       1           17              8
-Ethernet212    140,141,142,143   Ethernet27/5 27     Ext        100000      Eth212-ASIC1       1           18              8
-Ethernet216    64,65,66,67       Ethernet28/1 28     Ext        100000      Eth216-ASIC1       0           19              8
-Ethernet220    68,69,70,71       Ethernet28/5 28     Ext        100000      Eth220-ASIC1       0           20              8
-Ethernet224    56,57,58,59       Ethernet29/1 29     Ext        100000      Eth224-ASIC1       0           21              8
-Ethernet228    60,61,62,63       Ethernet29/5 29     Ext        100000      Eth228-ASIC1       0           22              8
-Ethernet232    48,49,50,51       Ethernet30/1 30     Ext        100000      Eth232-ASIC1       0           23              8
-Ethernet236    52,53,54,55       Ethernet30/5 30     Ext        100000      Eth236-ASIC1       0           24              8
-Ethernet240    40,41,42,43       Ethernet31/1 31     Ext        100000      Eth240-ASIC1       0           25              8
-Ethernet244    44,45,46,47       Ethernet31/5 31     Ext        100000      Eth244-ASIC1       0           26              8
-Ethernet248    32,33,34,35       Ethernet32/1 32     Ext        100000      Eth248-ASIC1       0           27              8
-Ethernet252    36,37,38,39       Ethernet32/5 32     Ext        100000      Eth252-ASIC1       0           28              8
-Ethernet256    24,25,26,27       Ethernet33/1 33     Ext        100000      Eth256-ASIC1       0           29              8
-Ethernet260    28,29,30,31       Ethernet33/5 33     Ext        100000      Eth260-ASIC1       0           30              8
-Ethernet264    16,17,18,19       Ethernet34/1 34     Ext        100000      Eth264-ASIC1       0           31              8
-Ethernet268    20,21,22,23       Ethernet34/5 34     Ext        100000      Eth268-ASIC1       0           32              8
-Ethernet272    8,9,10,11         Ethernet35/1 35     Ext        100000      Eth272-ASIC1       0           33              8
-Ethernet276    12,13,14,15       Ethernet35/5 35     Ext        100000      Eth276-ASIC1       0           34              8
-Ethernet280    0,1,2,3           Ethernet36/1 36     Ext        100000      Eth280-ASIC1       0           35              8
-Ethernet284    4,5,6,7           Ethernet36/5 36     Ext        100000      Eth284-ASIC1       0           36              8
-Ethernet-Rec0  221               Recirc0/0    37     Rec        400000      Rcy0-ASIC0         0           221             8
-Ethernet-IB0   222               Recirc0/1    38     Inb        400000      Rcy1-ASIC0         1           222             8
-Ethernet-Rec1  221               Recirc0/0    39     Rec        400000      Rcy0-ASIC1         0           221             8
-Ethernet-IB1   222               Recirc0/1    40     Inb        400000      Rcy1-ASIC1         1           222             8
--- a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/0/j2p-a7800r3a-36d-36x400G.config.bcm
+++ b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/0/j2p-a7800r3a-36d-36x400G.config.bcm
@ -1051,3 +1051,4 @@ appl_param_nof_ports_per_modid=64
 xflow_macsec_secure_chan_to_num_secure_assoc_encrypt=2
 xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=4
 sai_pfc_dlr_init_capability=0
+sai_disable_srcmacqedstmac_ctrl=1
--- a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/1/j2p-a7800r3a-36d-36x400G.config.bcm
+++ b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/1/j2p-a7800r3a-36d-36x400G.config.bcm
@ -1051,3 +1051,4 @@ appl_param_nof_ports_per_modid=64
 xflow_macsec_secure_chan_to_num_secure_assoc_encrypt=2
 xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=4
 sai_pfc_dlr_init_capability=0
+sai_disable_srcmacqedstmac_ctrl=1
--- a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/port_config.ini
+++ b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/port_config.ini
@ -1,41 +0,0 @@
-# name         lanes                             alias        index  role       speed       asic_port_name     coreId      corePortId      numVoq
-Ethernet0      72,73,74,75,76,77,78,79           Ethernet1/1  1      Ext        400000      Eth0-ASIC0         1           1               8
-Ethernet8      80,81,82,83,84,85,86,87           Ethernet2/1  2      Ext        400000      Eth8-ASIC0         1           2               8
-Ethernet16     88,89,90,91,92,93,94,95           Ethernet3/1  3      Ext        400000      Eth16-ASIC0        1           3               8
-Ethernet24     96,97,98,99,100,101,102,103       Ethernet4/1  4      Ext        400000      Eth24-ASIC0        1           4               8
-Ethernet32     104,105,106,107,108,109,110,111   Ethernet5/1  5      Ext        400000      Eth32-ASIC0        1           5               8
-Ethernet40     112,113,114,115,116,117,118,119   Ethernet6/1  6      Ext        400000      Eth40-ASIC0        1           6               8
-Ethernet48     120,121,122,123,124,125,126,127   Ethernet7/1  7      Ext        400000      Eth48-ASIC0        1           7               8
-Ethernet56     128,129,130,131,132,133,134,135   Ethernet8/1  8      Ext        400000      Eth56-ASIC0        1           8               8
-Ethernet64     136,137,138,139,140,141,142,143   Ethernet9/1  9      Ext        400000      Eth64-ASIC0        1           9               8
-Ethernet72     64,65,66,67,68,69,70,71           Ethernet10/1 10     Ext        400000      Eth72-ASIC0        0           10              8
-Ethernet80     56,57,58,59,60,61,62,63           Ethernet11/1 11     Ext        400000      Eth80-ASIC0        0           11              8
-Ethernet88     48,49,50,51,52,53,54,55           Ethernet12/1 12     Ext        400000      Eth88-ASIC0        0           12              8
-Ethernet96     40,41,42,43,44,45,46,47           Ethernet13/1 13     Ext        400000      Eth96-ASIC0        0           13              8
-Ethernet104    32,33,34,35,36,37,38,39           Ethernet14/1 14     Ext        400000      Eth104-ASIC0       0           14              8
-Ethernet112    24,25,26,27,28,29,30,31           Ethernet15/1 15     Ext        400000      Eth112-ASIC0       0           15              8
-Ethernet120    16,17,18,19,20,21,22,23           Ethernet16/1 16     Ext        400000      Eth120-ASIC0       0           16              8
-Ethernet128    8,9,10,11,12,13,14,15             Ethernet17/1 17     Ext        400000      Eth128-ASIC0       0           17              8
-Ethernet136    0,1,2,3,4,5,6,7                   Ethernet18/1 18     Ext        400000      Eth136-ASIC0       0           18              8
-Ethernet144    72,73,74,75,76,77,78,79           Ethernet19/1 19     Ext        400000      Eth0-ASIC1         1           1               8
-Ethernet152    80,81,82,83,84,85,86,87           Ethernet20/1 20     Ext        400000      Eth8-ASIC1         1           2               8
-Ethernet160    88,89,90,91,92,93,94,95           Ethernet21/1 21     Ext        400000      Eth16-ASIC1        1           3               8
-Ethernet168    96,97,98,99,100,101,102,103       Ethernet22/1 22     Ext        400000      Eth24-ASIC1        1           4               8
-Ethernet176    104,105,106,107,108,109,110,111   Ethernet23/1 23     Ext        400000      Eth32-ASIC1        1           5               8
-Ethernet184    112,113,114,115,116,117,118,119   Ethernet24/1 24     Ext        400000      Eth40-ASIC1        1           6               8
-Ethernet192    120,121,122,123,124,125,126,127   Ethernet25/1 25     Ext        400000      Eth48-ASIC1        1           7               8
-Ethernet200    128,129,130,131,132,133,134,135   Ethernet26/1 26     Ext        400000      Eth56-ASIC1        1           8               8
-Ethernet208    136,137,138,139,140,141,142,143   Ethernet27/1 27     Ext        400000      Eth64-ASIC1        1           9               8
-Ethernet216    64,65,66,67,68,69,70,71           Ethernet28/1 28     Ext        400000      Eth72-ASIC1        0           10              8
-Ethernet224    56,57,58,59,60,61,62,63           Ethernet29/1 29     Ext        400000      Eth80-ASIC1        0           11              8
-Ethernet232    48,49,50,51,52,53,54,55           Ethernet30/1 30     Ext        400000      Eth88-ASIC1        0           12              8
-Ethernet240    40,41,42,43,44,45,46,47           Ethernet31/1 31     Ext        400000      Eth96-ASIC1        0           13              8
-Ethernet248    32,33,34,35,36,37,38,39           Ethernet32/1 32     Ext        400000      Eth104-ASIC1       0           14              8
-Ethernet256    24,25,26,27,28,29,30,31           Ethernet33/1 33     Ext        400000      Eth112-ASIC1       0           15              8
-Ethernet264    16,17,18,19,20,21,22,23           Ethernet34/1 34     Ext        400000      Eth120-ASIC1       0           16              8
-Ethernet272    8,9,10,11,12,13,14,15             Ethernet35/1 35     Ext        400000      Eth128-ASIC1       0           17              8
-Ethernet280    0,1,2,3,4,5,6,7                   Ethernet36/1 36     Ext        400000      Eth136-ASIC1       0           18              8
-Ethernet-Rec0  249                               Recirc0/0    37     Rec        400000      Rcy0-ASIC0         0           49              8
-Ethernet-IB0   250                               Recirc0/1    38     Inb        400000      Rcy1-ASIC0         1           50              8
-Ethernet-Rec1  249                               Recirc0/0    39     Rec        400000      Rcy0-ASIC1         0           49              8
-Ethernet-IB1   250                               Recirc0/1    40     Inb        400000      Rcy1-ASIC1         1           50              8
--- a/device/arista/x86_64-arista_7800r3a_36d2_lc/platform_env.conf
+++ b/device/arista/x86_64-arista_7800r3a_36d2_lc/platform_env.conf
@ -1,3 +1,4 @@
+SYNCD_SHM_SIZE=1gb
 usemsi=1
 dmasize=64M
 macsec_enabled=1
--- a/device/celestica/x86_64-cel_e1031-r0/installer.conf
+++ b/device/celestica/x86_64-cel_e1031-r0/installer.conf
@ -1,4 +1,4 @@
 CONSOLE_PORT=0x2f8
 CONSOLE_DEV=1
 CONSOLE_SPEED=9600
-ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="module_blacklist=gpio_ich"
+ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="module_blacklist=gpio_ich processor.max_cstate=1 intel_idle.max_cstate=0 i2c-i801.disable_features=0x10"
--- a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/common.py
+++ b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/common.py
@ -24,7 +24,6 @@ class Common:

    SET_METHOD_IPMI = 'ipmitool'
    NULL_VAL = 'N/A'
-    HOST_CHK_CMD = ["docker"]
    REF_KEY = '$ref:'

    def __init__(self, conf=None):
@ -185,11 +184,12 @@ class Common:
        return True

    def is_host(self):
-        try:
-            subprocess.call(self.HOST_CHK_CMD, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
-        except FileNotFoundError:
-            return False
-        return True
+        """
+        Test whether current process is running on the host or an docker
+        return True for host and False for docker
+        """
+        docker_env_file = '/.dockerenv'
+        return os.path.exists(docker_env_file) is False

    def load_json_file(self, path):
        """
--- a/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/th-seastone-dx010-32x100G-t1.config.bcm
+++ b/device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/th-seastone-dx010-32x100G-t1.config.bcm
@ -1,6 +1,8 @@
 # Define default OS / SAL
 os=unix

+sai_hash_seed_config_hash_offset_enable=1
+
 # all XPORTs to XE ports
 #pbmp_xport_xe=0x1fffffffe
 pbmp_xport_xe=0x1fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe
--- a/device/celestica/x86_64-cel_seastone-r0/installer.conf
+++ b/device/celestica/x86_64-cel_seastone-r0/installer.conf
@ -1,3 +1,3 @@
 CONSOLE_PORT=0x3f8
 CONSOLE_DEV=0
-ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="module_blacklist=gpio_ich"
+ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="module_blacklist=gpio_ich i2c-i801.disable_features=0x10"
--- a/device/common/profiles/th4/gen/BALANCED/buffers_defaults_t0.j2
+++ b/device/common/profiles/th4/gen/BALANCED/buffers_defaults_t0.j2
@ -0,0 +1,46 @@
+{%- set default_cable = '5m' %}
+
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {%- for port_idx in range(0,256,8) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
+    {%- endfor %}
+{%- endmacro %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "size": "37333333",
+            "type": "ingress",
+            "mode": "dynamic",
+            "xoff": "24000000"
+        },
+        "egress_lossy_pool": {
+            "size": "34000000",
+            "type": "egress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "56000000",
+            "type": "egress",
+            "mode": "static"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_profile": {
+            "pool":"ingress_lossless_pool",
+            "size":"0",
+            "dynamic_th":"3"
+        },
+        "egress_lossless_profile": {
+            "pool":"egress_lossless_pool",
+            "size":"1518",
+            "static_th":"56000000"
+        },
+        "egress_lossy_profile": {
+            "pool":"egress_lossy_pool",
+            "size":"1518",
+            "dynamic_th":"3"
+        }
+    },
+{%- endmacro %}
--- a/device/common/profiles/th4/gen/BALANCED/buffers_defaults_t1.j2
+++ b/device/common/profiles/th4/gen/BALANCED/buffers_defaults_t1.j2
@ -0,0 +1,46 @@
+{%- set default_cable = '5m' %}
+
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {%- for port_idx in range(0,256,8) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
+    {%- endfor %}
+{%- endmacro %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "size": "37333333",
+            "type": "ingress",
+            "mode": "dynamic",
+            "xoff": "24000000"
+        },
+        "egress_lossy_pool": {
+            "size": "34000000",
+            "type": "egress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "56000000",
+            "type": "egress",
+            "mode": "static"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_profile": {
+            "pool":"ingress_lossless_pool",
+            "size":"0",
+            "dynamic_th":"3"
+        },
+        "egress_lossless_profile": {
+            "pool":"egress_lossless_pool",
+            "size":"1518",
+            "static_th":"56000000"
+        },
+        "egress_lossy_profile": {
+            "pool":"egress_lossy_pool",
+            "size":"1518",
+            "dynamic_th":"3"
+        }
+    },
+{%- endmacro %}
--- a/device/common/profiles/th4/gen/BALANCED/pg_profile_lookup.ini
+++ b/device/common/profiles/th4/gen/BALANCED/pg_profile_lookup.ini
@ -0,0 +1,17 @@
+# PG lossless profiles.
+# speed cable size    xon  xoff threshold xon_offset
+  10000  5m   1248    2288 35776   0        2288
+  25000  5m   1248    2288 53248   0        2288
+  40000  5m   1248    2288 66560   0        2288
+  50000  5m   1248    2288 90272   0        2288
+ 100000  5m   1248    2288 165568  0        2288
+  10000  40m  1248    2288 37024   0        2288
+  25000  40m  1248    2288 53248   0        2288
+  40000  40m  1248    2288 71552   0        2288
+  50000  40m  1248    2288 96096   0        2288
+ 100000  40m  1248    2288 177632  0        2288
+  10000  300m 1248    2288 46176   0        2288
+  25000  300m 1248    2288 79040   0        2288
+  40000  300m 1248    2288 108160  0        2288
+  50000  300m 1248    2288 141856  0        2288
+ 100000  300m 1248    2288 268736  0        2288
--- a/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/th-s6100-64x40G-t1.config.bcm
+++ b/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/th-s6100-64x40G-t1.config.bcm
@ -1,5 +1,7 @@
 #TH S6100 64x40

+sai_hash_seed_config_hash_offset_enable=1
+
 # disables bcmALPMDH (ALPM distributed hitbit) thread.  This thread is purely for debug purpose
 l3_alpm_hit_skip=1

--- a/device/dell/x86_64-dell_s6100_c2538-r0/installer.conf
+++ b/device/dell/x86_64-dell_s6100_c2538-r0/installer.conf
@ -1,3 +1,3 @@
 CONSOLE_PORT=0x2f8
 CONSOLE_DEV=1
-ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="module_blacklist=gpio_ich,wdat_wdt acpi_no_watchdog=1 nos-config-part=/dev/sda12"
+ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="module_blacklist=gpio_ich,wdat_wdt acpi_no_watchdog=1 nos-config-part=/dev/sda12 i2c-i801.disable_features=0x10"
--- a/device/dell/x86_64-dell_s6100_c2538-r0/platform.json
+++ b/device/dell/x86_64-dell_s6100_c2538-r0/platform.json
@ -469,7 +469,13 @@
            },
            {
                "name": "QSFP+ or later"
-            }
+            },
+            {
+                "name": "SFP/SFP+/SFP28"
+            },
+            {
+                "name": "SFP/SFP+/SFP28"
+	    }
        ]
    },
    "interfaces": {}
--- a/device/mellanox/x86_64-mlnx_msn2010-r0/ACS-MSN2010/create_only_config_db_buffers.json
+++ b/device/mellanox/x86_64-mlnx_msn2010-r0/ACS-MSN2010/create_only_config_db_buffers.json
@ -0,0 +1,7 @@
+{
+    "DEVICE_METADATA": {
+        "localhost": {
+            "create_only_config_db_buffers": "true"
+        }
+    }
+}
--- a/device/mellanox/x86_64-mlnx_msn2010-r0/ACS-MSN2010/sai_2010.xml
+++ b/device/mellanox/x86_64-mlnx_msn2010-r0/ACS-MSN2010/sai_2010.xml
@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  Copyright (c) 2018-2021 NVIDIA CORPORATION & AFFILIATES.
+  Copyright (c) 2018-2023 NVIDIA CORPORATION & AFFILIATES.
  Apache-2.0

  Licensed under the Apache License, Version 2.0 (the "License");
@ -16,177 +16,180 @@
  limitations under the License.
 -->
 <root>
-	<platform_info type="2010">
+    <platform_info type="2010">

-		<!-- Device MAC address  -->
-		<device-mac-address>00:02:03:04:05:00</device-mac-address>
+        <!-- Device MAC address  -->
+        <device-mac-address>00:02:03:04:05:00</device-mac-address>

-		<!-- ISSU enabled -->
-		<issu-enabled>1</issu-enabled>
+        <!-- ISSU enabled -->
+        <issu-enabled>1</issu-enabled>

-		<!-- Number of ports in the following port list -->
-		<number-of-physical-ports>22</number-of-physical-ports>
+        <!-- Number of ports in the following port list -->
+        <number-of-physical-ports>22</number-of-physical-ports>

-		<!-- List of ports in the device -->
-		<ports-list>
-			<port-info>
-				<local-port>1</local-port>
-				<width>1</width>
-				<module>14</module>
+        <!-- Global port late create -->
+        <late-create-all-ports>1</late-create-all-ports>

-				<!-- 0 none, 1=2, 2=4, 3=2,4 -->
-				<breakout-modes>0</breakout-modes>
+        <!-- List of ports in the device -->
+        <ports-list>
+            <port-info>
+                <local-port>1</local-port>
+                <width>1</width>
+                <module>14</module>

-				<!-- (BITMASK) 28700 - 10Gb , 939524096 - 25Gb , 98368 - 40Gb , 3221487616 - 50Gb , 11534336 - 100Gb-->
-				<port-speed>939524096</port-speed>
-			</port-info>
-			<port-info>
-				<local-port>2</local-port>
-				<width>1</width>
-				<module>15</module>
-				<breakout-modes>0</breakout-modes>
-				<port-speed>939524096</port-speed>
-			</port-info>
-			<port-info>
-				<local-port>3</local-port>
-				<width>1</width>
-				<module>16</module>
-				<breakout-modes>0</breakout-modes>
-				<port-speed>939524096</port-speed>
-			</port-info>
-			<port-info>
-				<local-port>4</local-port>
-				<width>1</width>
-				<module>17</module>
-				<breakout-modes>0</breakout-modes>
-				<port-speed>939524096</port-speed>
-			</port-info>
-			<port-info>
-				<local-port>5</local-port>
-				<width>4</width>
-				<module>19</module>
-				<breakout-modes>3</breakout-modes>
-				<port-speed>11534336</port-speed>
-			</port-info>
-			<port-info>
-				<local-port>9</local-port>
-				<width>4</width>
-				<module>18</module>
-				<breakout-modes>3</breakout-modes>
-				<port-speed>11534336</port-speed>
-			</port-info>
-			<port-info>
-				<local-port>13</local-port>
-				<width>4</width>
-				<module>21</module>
-				<breakout-modes>3</breakout-modes>
-				<port-speed>11534336</port-speed>
-			</port-info>
-			<port-info>
-				<local-port>17</local-port>
-				<width>4</width>
-				<module>20</module>
-				<breakout-modes>3</breakout-modes>
-				<port-speed>11534336</port-speed>
-			</port-info>
-			<port-info>
-				<local-port>33</local-port>
-				<width>1</width>
-				<module>10</module>
-				<breakout-modes>0</breakout-modes>
-				<port-speed>939524096</port-speed>
-			</port-info>
-			<port-info>
-				<local-port>34</local-port>
-				<width>1</width>
-				<module>11</module>
-				<breakout-modes>0</breakout-modes>
-				<port-speed>939524096</port-speed>
-			</port-info>
-			<port-info>
-				<local-port>35</local-port>
-				<width>1</width>
-				<module>12</module>
-				<breakout-modes>0</breakout-modes>
-				<port-speed>939524096</port-speed>
-			</port-info>
-			<port-info>
-				<local-port>36</local-port>
-				<width>1</width>
-				<module>13</module>
-				<breakout-modes>0</breakout-modes>
-				<port-speed>939524096</port-speed>
-			</port-info>
-			<port-info>
-				<local-port>37</local-port>
-				<width>1</width>
-				<module>6</module>
-				<breakout-modes>0</breakout-modes>
-				<port-speed>939524096</port-speed>
-			</port-info>
-			<port-info>
-				<local-port>38</local-port>
-				<width>1</width>
-				<module>7</module>
-				<breakout-modes>0</breakout-modes>
-				<port-speed>939524096</port-speed>
-			</port-info>
-			<port-info>
-				<local-port>39</local-port>
-				<width>1</width>
-				<module>8</module>
-				<breakout-modes>0</breakout-modes>
-				<port-speed>939524096</port-speed>
-			</port-info>
-			<port-info>
-				<local-port>40</local-port>
-				<width>1</width>
-				<module>9</module>
-				<breakout-modes>0</breakout-modes>
-				<port-speed>939524096</port-speed>
-			</port-info>
-			<port-info>
-				<local-port>41</local-port>
-				<width>1</width>
-				<module>2</module>
-				<breakout-modes>0</breakout-modes>
-				<port-speed>939524096</port-speed>
-			</port-info>
-			<port-info>
-				<local-port>42</local-port>
-				<width>1</width>
-				<module>3</module>
-				<breakout-modes>0</breakout-modes>
-				<port-speed>939524096</port-speed>
-			</port-info>
-			<port-info>
-				<local-port>43</local-port>
-				<width>1</width>
-				<module>4</module>
-				<breakout-modes>0</breakout-modes>
-				<port-speed>939524096</port-speed>
-			</port-info>
-			<port-info>
-				<local-port>44</local-port>
-				<width>1</width>
-				<module>5</module>
-				<breakout-modes>0</breakout-modes>
-				<port-speed>939524096</port-speed>
-			</port-info>
-			<port-info>
-				<local-port>45</local-port>
-				<width>1</width>
-				<module>0</module>
-				<breakout-modes>0</breakout-modes>
-				<port-speed>939524096</port-speed>
-			</port-info>
-			<port-info>
-				<local-port>46</local-port>
-				<width>1</width>
-				<module>1</module>
-				<breakout-modes>0</breakout-modes>
-				<port-speed>939524096</port-speed>
-			</port-info>
-		</ports-list>
-	</platform_info>
+                <!-- 0 none, 1=2, 2=4, 3=2,4 -->
+                <breakout-modes>0</breakout-modes>
+
+                <!-- (BITMASK) 28700 - 10Gb , 939524096 - 25Gb , 98368 - 40Gb , 3221487616 - 50Gb , 11534336 - 100Gb-->
+                <port-speed>939524096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>2</local-port>
+                <width>1</width>
+                <module>15</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>939524096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>3</local-port>
+                <width>1</width>
+                <module>16</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>939524096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>4</local-port>
+                <width>1</width>
+                <module>17</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>939524096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>5</local-port>
+                <width>4</width>
+                <module>19</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>11534336</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>9</local-port>
+                <width>4</width>
+                <module>18</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>11534336</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>13</local-port>
+                <width>4</width>
+                <module>21</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>11534336</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>17</local-port>
+                <width>4</width>
+                <module>20</module>
+                <breakout-modes>3</breakout-modes>
+                <port-speed>11534336</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>33</local-port>
+                <width>1</width>
+                <module>10</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>939524096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>34</local-port>
+                <width>1</width>
+                <module>11</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>939524096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>35</local-port>
+                <width>1</width>
+                <module>12</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>939524096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>36</local-port>
+                <width>1</width>
+                <module>13</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>939524096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>37</local-port>
+                <width>1</width>
+                <module>6</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>939524096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>38</local-port>
+                <width>1</width>
+                <module>7</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>939524096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>39</local-port>
+                <width>1</width>
+                <module>8</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>939524096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>40</local-port>
+                <width>1</width>
+                <module>9</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>939524096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>41</local-port>
+                <width>1</width>
+                <module>2</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>939524096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>42</local-port>
+                <width>1</width>
+                <module>3</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>939524096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>43</local-port>
+                <width>1</width>
+                <module>4</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>939524096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>44</local-port>
+                <width>1</width>
+                <module>5</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>939524096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>45</local-port>
+                <width>1</width>
+                <module>0</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>939524096</port-speed>
+            </port-info>
+            <port-info>
+                <local-port>46</local-port>
+                <width>1</width>
+                <module>1</module>
+                <breakout-modes>0</breakout-modes>
+                <port-speed>939524096</port-speed>
+            </port-info>
+        </ports-list>
+    </platform_info>
 </root>
--- a/device/mellanox/x86_64-mlnx_msn2010-r0/installer.conf
+++ b/device/mellanox/x86_64-mlnx_msn2010-r0/installer.conf
@ -1 +1 @@
-ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="acpi_enforce_resources=lax acpi=noirq"
+ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="acpi_enforce_resources=lax acpi=noirq libata.force=noncq"
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th4-a7060dx5-32-200Gx48-100Gx32.config.bcm`
				`@ -0,0 +1 @@`
				`../x86_64-arista_common/pmon_daemon_control.json`
				`@ -0,0 +1 @@`
				`../x86_64-arista_common/system_health_monitoring_config.json`