Revert "[baseimage]: Update openssh to 1:8.4p1-5+deb11u2 (#16826)"

This reverts commit 39cdee57e1.

.azure-pipelines/azure-pipelines-UpgrateVersion.yml

@@ -33,14 +33,13 @@ parameters:
   type: object
   default:
   - vs
+  - barefoot
   - broadcom
   - centec
   - centec-arm64
   - generic
   - marvell-armhf
-  - marvell-arm64
   - mellanox
-  - pensando
 
 stages:
 - stage: Prepare

.azure-pipelines/azure-pipelines-build-ubuntu-2004.yml

@@ -1,67 +0,0 @@
-# C/C++ with GCC
-# Build your C/C++ project with GCC using make.
-# Add steps that publish test results, save build artifacts, deploy, and more:
-# https://docs.microsoft.com/azure/devops/pipelines/apps/c-cpp/gcc
-pr: none
-
-trigger:
-  batch: true
-  branches:
-    include:
-    - master
-    - 202???
-
-schedules:
-- cron: "0 0 * * *"
-  displayName: Daily build
-  branches:
-    include:
-      - master
-      - 202???
-  always: true
-
-stages:
-- stage: Build
-
-  jobs:
-  - job:
-    displayName: "amd64/ubuntu-20.04"
-    pool:
-      vmImage: 'ubuntu-20.04'
-
-    steps:
-    - checkout: self
-      submodules: true
-    - script: |
-        sudo apt-get update
-        sudo apt-get install -y make wget libtool m4 autoconf dh-exec libdebhelper-perl=13.6ubuntu1~bpo20.04.1 debhelper=13.6ubuntu1~bpo20.04.1 \
-                         cmake pkg-config python3-pip python cmake libgtest-dev libgmock-dev libyang-dev \
-                         debhelper-compat dh-elpa dh-sequence-python3 python3-all \
-                         libpython3-all-dev python3-six xmlto unzip rake-compiler gem2deb pkg-php-tools \
-                         ant default-jdk maven-repo-helper libguava-java \
-                         libboost-all-dev libgtest-dev build-essential swig4.0 swig
-        sudo pip3 install pytest click
-        wget http://ftp.us.debian.org/debian/pool/main/libg/libgoogle-gson-java/libgoogle-gson-java_2.8.6-1+deb11u1_all.deb
-        sudo dpkg -i libgoogle-gson-java_2.8.6-1+deb11u1_all.deb
-        mkdir -p /tmp/artifacts
-      displayName: "Install dependencies"
-    - script: |
-        BLDENV=bullseye SONIC_CONFIG_MAKE_JOBS=$(nproc) CONFIGURED_ARCH=amd64 DEST=/tmp/artifacts make -f ../rules/protobuf.mk -f protobuf/Makefile
-      workingDirectory: src
-      displayName: "Build protobuf"
-    - script: |
-        sudo dpkg -i protobuf-compiler_3.21.12-3_amd64.deb libprotoc32_3.21.12-3_amd64.deb \
-                      libprotobuf32_3.21.12-3_amd64.deb libprotobuf-dev_3.21.12-3_amd64.deb \
-                      libprotobuf-lite32_3.21.12-3_amd64.deb
-      workingDirectory: /tmp/artifacts
-      displayName: "Install protobuf"
-    - script: |
-        dpkg-buildpackage -rfakeroot -b -us -uc
-      workingDirectory: src/sonic-dash-api
-      displayName: "Build sonic-dash-api"
-    - script: |
-        cp *.deb /tmp/artifacts
-      workingDirectory: src
-    - publish: /tmp/artifacts
-      artifact: sonic-buildimage.amd64.ubuntu20_04
-      displayName: "Archive sonic-buildimage debian packages for ubuntu20.04"

.azure-pipelines/azure-pipelines-build.yml

@@ -35,6 +35,7 @@ jobs:
       dbg_image: no
       asan_image: no
       swi_image: no
+      raw_image: no
       docker_syncd_rpc_image: no
       syncd_rpc_image: no
       platform_rpc: no
@@ -61,6 +62,7 @@ jobs:
           variables:
             dbg_image: yes
             swi_image: yes
+            raw_image: yes
             docker_syncd_rpc_image: yes
             platform_rpc: brcm
 
@@ -114,19 +116,12 @@ jobs:
             docker_syncd_rpc_image: yes
             platform_rpc: nephos
 
-        - name: pensando
-          pool: sonicbld-arm64
-          variables:
-            PLATFORM_ARCH: arm64
-
     buildSteps:
       - template: .azure-pipelines/template-skipvstest.yml@buildimage
       - template: .azure-pipelines/template-daemon.yml@buildimage
       - bash: |
           set -ex
-          if [ $(GROUP_NAME) == pensando ]; then
-            make $BUILD_OPTIONS target/sonic-pensando.tar
-          elif [ $(GROUP_NAME) == vs ]; then
+          if [ $(GROUP_NAME) == vs ]; then
             if [ $(dbg_image) == yes ]; then
               make $BUILD_OPTIONS INSTALL_DEBUG_TOOLS=y target/sonic-vs.img.gz
               mv target/sonic-vs.img.gz target/sonic-vs-dbg.img.gz
@@ -135,14 +130,6 @@ jobs:
               make $BUILD_OPTIONS ENABLE_ASAN=y target/docker-sonic-vs.gz
               mv target/docker-sonic-vs.gz target/docker-sonic-vs-asan.gz
             fi
-            if [ "$(K8S_MASTER_CHANGED)" == 'YES' ]; then
-              make $BUILD_OPTIONS INCLUDE_KUBERNETES_MASTER=y target/sonic-vs.img.gz
-              gzip -d target/sonic-vs.img.gz
-              SONIC_RUN_CMDS="qemu-img convert target/sonic-vs.img -O vhdx -o subformat=dynamic target/sonic-vs.vhdx" make $BUILD_OPTIONS sonic-slave-run
-              gzip target/sonic-vs.vhdx
-              mv target/sonic-vs.vhdx.gz target/sonic-vs-k8s.vhdx.gz
-              rm target/sonic-vs.img
-            fi
             make $BUILD_OPTIONS target/docker-sonic-vs.gz target/sonic-vs.img.gz target/docker-ptf.gz
             make $BUILD_OPTIONS target/docker-ptf-sai.gz
             if [ $(Build.Reason) != 'PullRequest' ];then
@@ -158,6 +145,9 @@ jobs:
             if [ $(swi_image) == yes ]; then
               make $BUILD_OPTIONS ENABLE_IMAGE_SIGNATURE=y target/sonic-aboot-$(GROUP_NAME).swi
             fi
+            if [ $(raw_image) == yes ]; then
+              make $BUILD_OPTIONS target/sonic-$(GROUP_NAME).raw
+            fi
             if [ $(docker_syncd_rpc_image) == yes ]; then
               # workaround for issue in rules/sairedis.dep, git ls-files will list un-exist files for cache
               make $BUILD_OPTIONS ENABLE_SYNCD_RPC=y target/docker-syncd-$(platform_rpc)-rpc.gz

.azure-pipelines/azure-pipelines-image-template.yml

@@ -30,7 +30,7 @@ jobs:
       - script: |
           [ -n "$OVERRIDE_BUILD_OPTIONS" ] && OVERRIDE_BUILD_OPTIONS=$(OVERRIDE_BUILD_OPTIONS)
           BUILD_OPTIONS="$(BUILD_OPTIONS) $OVERRIDE_BUILD_OPTIONS"
-          if [ -n "$(CACHE_MODE)" ] && echo $(PLATFORM_AZP) | grep -E -q "^(vs|broadcom|mellanox|marvell-armhf|marvell-arm64)$"; then
+          if [ -n "$(CACHE_MODE)" ] && echo $(PLATFORM_AZP) | grep -E -q "^(vs|broadcom|mellanox|marvell-armhf)$"; then
             CACHE_OPTIONS="SONIC_DPKG_CACHE_METHOD=$(CACHE_MODE) SONIC_DPKG_CACHE_SOURCE=/nfs/dpkg_cache/$(PLATFORM_AZP)"
             BUILD_OPTIONS="$BUILD_OPTIONS $CACHE_OPTIONS"
           fi

.azure-pipelines/build-template.yml

@@ -101,6 +101,9 @@ jobs:
         if [ ${{ parameters.swi_image }} == true ]; then
           make USERNAME=admin $CACHE_OPTIONS SONIC_BUILD_JOBS=$(nproc) ENABLE_IMAGE_SIGNATURE=y target/sonic-aboot-${{ parameters.platform }}.swi
         fi
+        if [ ${{ parameters.raw_image }} == true ]; then
+          make USERNAME=admin $CACHE_OPTIONS SONIC_BUILD_JOBS=$(nproc) target/sonic-${{ parameters.platform }}.raw
+        fi
         if [ ${{ parameters.sync_rpc_image }} == true ]; then
           make USERNAME=admin $CACHE_OPTIONS SONIC_BUILD_JOBS=$(nproc) ENABLE_SYNCD_RPC=y target/docker-syncd-${{ parameters.platform_short }}-rpc.gz
           # workaround for issue in rules/sairedis.dep,  git ls-files will list un-exist files for cache

.azure-pipelines/docker-sonic-mgmt-py3-only.yml

@@ -1,63 +0,0 @@
-# Starter pipeline
-# Start with a minimal pipeline that you can customize to build and deploy your code.
-# Add steps that build, run tests, deploy, and more:
-# https://aka.ms/yaml
-# Build and push sonic-mgmt image
-
-schedules:
-- cron: "0 8 * * *"
-  branches:
-    include:
-    - master
-  always: true
-
-trigger: none
-pr:
-  branches:
-    include:
-    - master
-  paths:
-    include:
-    - dockers/docker-sonic-mgmt
-
-parameters:
-- name: registry_url
-  type: string
-  default: sonicdev-microsoft.azurecr.io
-- name: registry_conn
-  type: string
-  default: sonicdev
-
-stages:
-- stage: Build
-  jobs:
-  - job: Build
-    pool: sonicbld
-    timeoutInMinutes: 360
-    steps:
-    - template: cleanup.yml
-    - checkout: self
-      clean: true
-    - bash: |
-        set -xe
-        git submodule update --init --recursive -- src/sonic-platform-daemons src/sonic-genl-packet src/sonic-sairedis src/ptf src/sonic-device-data
-
-        make SONIC_BUILD_JOBS=$(nproc) DEFAULT_CONTAINER_REGISTRY=publicmirror.azurecr.io ENABLE_DOCKER_BASE_PULL=y configure PLATFORM=generic
-        make -f Makefile.work BLDENV=bullseye SONIC_BUILD_JOBS=$(nproc) DEFAULT_CONTAINER_REGISTRY=publicmirror.azurecr.io ENABLE_DOCKER_BASE_PULL=y LEGACY_SONIC_MGMT_DOCKER=n target/docker-sonic-mgmt.gz
-        cp target -r $(Build.ArtifactStagingDirectory)/target
-        docker load -i target/docker-sonic-mgmt.gz
-        docker tag docker-sonic-mgmt $REGISTRY_SERVER/docker-sonic-mgmt:py3only
-      env:
-        REGISTRY_SERVER: ${{ parameters.registry_url }}
-      displayName: Build docker-sonic-mgmt.gz
-    - task: Docker@2
-      displayName: Upload image
-      inputs:
-        containerRegistry: ${{ parameters.registry_conn }}
-        repository: docker-sonic-mgmt
-        command: push
-        tags: py3only
-    - publish:  $(Build.ArtifactStagingDirectory)
-      artifact: 'docker-sonic-mgmt'
-      displayName: "Archive docker image sonic-mgmt"
-

.azure-pipelines/docker-sonic-mgmt.yml

@@ -43,7 +43,7 @@ stages:
         git submodule update --init --recursive -- src/sonic-platform-daemons src/sonic-genl-packet src/sonic-sairedis src/ptf src/sonic-device-data
 
         make SONIC_BUILD_JOBS=$(nproc) DEFAULT_CONTAINER_REGISTRY=publicmirror.azurecr.io ENABLE_DOCKER_BASE_PULL=y configure PLATFORM=generic
-        make -f Makefile.work BLDENV=bullseye SONIC_BUILD_JOBS=$(nproc) DEFAULT_CONTAINER_REGISTRY=publicmirror.azurecr.io ENABLE_DOCKER_BASE_PULL=y LEGACY_SONIC_MGMT_DOCKER=y target/docker-sonic-mgmt.gz
+        make SONIC_BUILD_JOBS=$(nproc) DEFAULT_CONTAINER_REGISTRY=publicmirror.azurecr.io ENABLE_DOCKER_BASE_PULL=y target/docker-sonic-mgmt.gz
         cp target -r $(Build.ArtifactStagingDirectory)/target
         docker load -i target/docker-sonic-mgmt.gz
         docker tag docker-sonic-mgmt $REGISTRY_SERVER/docker-sonic-mgmt:latest

.azure-pipelines/docker-sonic-slave-template.yml

@@ -16,7 +16,6 @@ parameters:
 - name: dist
   type: string
   values:
-  - bookworm
   - bullseye
   - buster
   - stretch

.azure-pipelines/docker-sonic-slave.yml

@@ -8,7 +8,7 @@ resources:
   - repository: buildimage
     type: github
     name: sonic-net/sonic-buildimage
-    ref: bookworm
+    ref: master
     endpoint: sonic-net
 
 schedules:
@@ -44,7 +44,6 @@ parameters:
 - name: 'dists'
   type: object
   default:
-  - bookworm
   - bullseye
   - buster
   - stretch

.azure-pipelines/dpkg-cache-cleanup.yml

@@ -15,34 +15,13 @@ trigger: none
 pr: none
 
 jobs:
-- job: Amd
+- job: Build
   pool: sonicbld
   timeoutInMinutes: 5
   steps:
   - checkout: none
   - script: |
-      df -h
+      set -xe
       sudo find /nfs/dpkg_cache/ -name *.tgz -mtime +30 -type f -delete
-      df -h
     displayName: clean dpkg cache
-- job: Armhf
-  pool: sonicbld-armhf
-  timeoutInMinutes: 5
-  steps:
-  - checkout: none
-  - script: |
-      df -h
-      sudo find /nfs/dpkg_cache/ -name *.tgz -mtime +30 -type f -delete
-      df -h
-    displayName: clean dpkg cache
-- job: Arm64
-  pool: sonicbld-arm64
-  timeoutInMinutes: 5
-  steps:
-  - checkout: none
-  - script: |
-      df -h
-      sudo find /nfs/dpkg_cache/ -name *.tgz -mtime +30 -type f -delete
-      df -h
-    displayName: clean dpkg cache
-
+    

.azure-pipelines/official-build-cache.yml

@@ -39,6 +39,7 @@ stages:
         - name: broadcom
           variables:
             swi_image: yes
+            raw_image: yes
             docker_syncd_rpc_image: yes
             platform_rpc: brcm
         - name: mellanox

.azure-pipelines/template-skipvstest.yml

@@ -2,18 +2,7 @@ steps:
 - ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
   - script: |
       set -ex
-      tar_branch=origin/$(System.PullRequest.TargetBranchName)
-      # Check if k8s master entrance script is changed
-      K8S_MASTER_CHANGED=NO
-      if git diff $tar_branch..HEAD --name-only | grep -F files/image_config/kubernetes/kubernetes_master_entrance.sh; then
-        K8S_MASTER_CHANGED=YES
-      fi
-      set +x
-      echo "##vso[task.setvariable variable=K8S_MASTER_CHANGED;]$K8S_MASTER_CHANGED"
-    displayName: "Check if k8s master image build is needed."
-  - script: |
-      set -ex
-      tar_branch=origin/$(System.PullRequest.TargetBranchName)
+      tar_branch=origin/$(System.PullRequest.TargetBranch)
       git diff $tar_branch..HEAD --name-only | grep -v -f .azure-pipelines/vstest-exclude && exit 0
       git diff $tar_branch..HEAD --name-only | grep -f .azure-pipelines/vstest-include && exit 0
       set +x

.github/pull_request_template.md

@@ -40,7 +40,6 @@ If PR needs to be backported, then the PR must be tested against the base branch
 - [ ] 202111
 - [ ] 202205
 - [ ] 202211
-- [ ] 202305
 
 #### Tested branch (Please provide the tested image version)
 

.github/workflows/automerge.yml

@@ -9,8 +9,7 @@ on:
 
 jobs:
   automerge:
-    # Disable workflow. Use automerge_scan instead to have the same behaviour.
-    if: github.event.check_suite.app.name == 'Azure Pipelines' &&  github.event.check_suite.conclusion == 'success' && false
+    if: github.event.check_suite.app.name == 'Azure Pipelines' &&  github.event.check_suite.conclusion == 'success'
     runs-on: ubuntu-latest
     steps:
     - name: automerge

.github/workflows/automerge_scan.yml

@@ -6,8 +6,7 @@ on:
 
 jobs:
   automerge_scan:
-    # Disable workflow, and use pipeline instead to have same logic with other automation
-    if: github.repository_owner == 'sonic-net' && false
+    if: github.repository_owner == 'sonic-net'
     runs-on: ubuntu-latest
     steps:
     - name: Debug
@@ -17,81 +16,58 @@ jobs:
         set -e
 
         echo ${TOKEN} | gh auth login --with-token
-        gh pr list -R sonic-net/sonic-buildimage -A mssonicbld -L 100 -S "label:automerge" --json url,body,title,createdAt,labels,statusCheckRollup > prs.log
+        gh pr list -R sonic-net/sonic-buildimage -A mssonicbld --json additions,assignees,author,baseRefName,body,changedFiles,closed,closedAt,comments,commits,createdAt,deletions,files,headRefName,headRepository,headRepositoryOwner,id,isCrossRepository,isDraft,labels,latestReviews,maintainerCanModify,mergeCommit,mergeStateStatus,mergeable,mergedAt,mergedBy,milestone,number,potentialMergeCommit,projectCards,reactionGroups,reviewDecision,reviewRequests,reviews,state,statusCheckRollup,title,updatedAt,url > prs.log
         cat prs.log | jq
     - name: Main
       run: |
         set -e
 
-        # PR merge run per 2 hours
-        # Other operation run per day.
-        # Cherry pick PR:
-        # more than 3 days, comment @author to check
-        # more than 10 days, stop comment.
-        # more than 28 days, comment @author PR will be closed
-        # more than 30 days, close PR
-        date_3d_ago=$(date --date "3 day ago" -u +"%FT%TZ")
-        date_10d_ago=$(date --date "10 day ago" -u +"%FT%TZ")
-        date_28d_ago=$(date --date "28 day ago" -u +"%FT%TZ")
-        date_30d_ago=$(date --date "30 day ago" -u +"%FT%TZ")
-        date_now=$(date -u +"%T")
-        operate=false
-        [[ "$date_now" < "02:00:00" ]] && operate=true
-
         count=$(cat prs.log | jq 'length')
         for ((i=0;i<$count;i++))
         do
           url=$(cat prs.log | jq -r ".[$i].url")
-          body=$(cat prs.log | jq -r ".[$i].body")
-          title=$(cat prs.log | jq -r ".[$i].title")
-          origin_pr_id=$(echo $title | grep -Eo "\[action\] \[PR:[0-9]*\]" | grep -Eo [0-9]* || true)
           created_at=$(cat prs.log | jq -r ".[$i].createdAt")
-          echo PR: $(($i+1))/$count, URL: $url, origin PR: $origin_pr_id, createdAt: $created_at, operate: $operate
+          echo PR: $(($i+1))/$count, URL: $url, createdAt: $created_at, now: $(date -u +"%FT%TZ")
           [[ "$url" == "" ]] && continue
           [[ $created_at > $(date --date "1 hour ago" -u +"%FT%TZ") ]] && continue
+          # only check automerge PR.
+          cat prs.log | jq -r ".[$i].labels[].name" | grep automerge || continue
 
           checks=$(cat prs.log | jq ".[$i].statusCheckRollup")
           checks_count=$(echo $checks | jq 'length')
-          pr_success=true
+          echo Checks count: $checks_count
           for ((j=0;j<$checks_count;j++))
           do
             check=$(echo $checks | jq ".[$j]")
-            status=$(echo $check | jq -r '.status')
+            state=$(echo $check | jq -r '.state')
             conclusion=$(echo $check | jq -r '.conclusion')
             name=$(echo $check | jq -r '.name')
 
             # EasyCLA success flag:  state=SUCCESS
             # Others success flag:   conclusion in SUCCESS,NEUTRAL
-            # only check Azure.sonic-buildimage currently
-            echo "$name" | grep -v "Azure.sonic-buildimage" > /dev/null && continue
-            [[ "$status" != "COMPLETED" ]] && echo "$name: $status" && continue 2
-
-            success=true
-            ( [[ "$conclusion" == "FAILURE" ]] || [[ "$conclusion" == "CANCELLED" ]] ) && success=false && pr_success=false
-            ! $success && echo "FAIL: $name"
+            # Ignore Azure.sonic-buildimage stage check result. It may be set continueOnError
+            echo "$name" | grep "Azure.sonic-buildimage (" && continue
+            # rerun Azure.sonic-buildimage per day
+            if [[ "$name" == "Azure.sonic-buildimage" ]] && [[ "$conclusion" == "FAILURE" ]];then
+              completedAt=$(echo $check | jq -r '.completedAt')
+              [[ "$completedAt" < $(date --date "2 hour ago" -u +"%FT%TZ") ]] && [[ $(date -u +"%T") < "02:00:00" ]] && gh pr comment $url --body "/azp run Azure.sonic-buildimage"
+            fi
+            # Ignore Semgrep, it has issues.
+            [[ "$name" == "Semgrep" ]] && continue
+            if [[ "$state" == "SUCCESS" ]];then
+              # check pass
+              continue
+            elif [[ "$conclusion" == "SUCCESS" ]] || [[ "$conclusion" == "NEUTRAL" ]];then
+              # check pass
+              continue
+            else
+              echo "$url Check failed!!!"
+              echo $check | jq
+              continue 2
+            fi
           done
-
-          # rerun Azure.sonic-buildimage per day
-          ! $pr_success && $operate && gh pr comment $url --body "/azp run Azure.sonic-buildimage"
-
-          # If auto cherry pick PRs failed, comment in original PR and close cherry pick PR
-          if [ -n "$origin_pr_id" ] && [[ $created_at < $date_3d_ago ]] && ! $pr_success;then
-            origin_pr_url=https://github.com/sonic-net/sonic-buildimage/pull/$origin_pr_id
-            author=$(gh pr view $origin_pr_url --json author | jq .author.login -r)
-            echo "Original author will check."
-            $operate && [[ $created_at > $date_10d_ago ]] && gh pr comment $origin_pr_url --body "@$author cherry pick PR didn't pass PR checker. Please check!!!<br>$url"
-            $operate && [[ $created_at < $date_28d_ago ]] && gh pr comment $origin_pr_url --body "@$author cherry pick PR didn't pass PR checker. Please check!!! Auto cherry pick PR will be closed in 2 days.<br>$url"
-            $operate && [[ $created_at < $date_30d_ago ]] && echo "$url Closed" && gh pr close $url
-          fi
-
-          ! $pr_success && continue
           # merge the PR
           echo ========Merging  PR========
-          if echo $title | grep "^\[submodule\]";then
-            gh pr merge --squash --admin -R sonic-net/sonic-buildimage $url -b "$body" || true
-          else
-            gh pr merge --rebase --admin -R sonic-net/sonic-buildimage $url || true
-          fi
+          gh pr merge --rebase --admin -R sonic-net/sonic-buildimage $url || true
           echo ========Finished PR========
         done
-

.github/workflows/build-broadcom.yml

@@ -1,26 +0,0 @@
-name: Build broadcom ONEIMAGE
-run-name: ${{ gitea.actor }} is building SONiC for broadcom
-on:
-  push:
-    branches: [master]
-
-
-jobs:
-  Configure-Build-Package-Action:
-    runs-on: ubuntu-latest
-    steps:
-      - run: echo "Triggered ${{ gitea.event_name }}"
-      - name: Checkout
-        uses: actions/checkout@v4
-      - run: pip install j2cli
-      - name: Init Package
-        run: make init
-      - name: Configure Package
-        run: make configure PLATFORM=broadcom
-      - name: Compile Image
-        run: make target/sonic-broadcom.bin
-      - name: Release
-        uses: softprops/action-gh-release@v1
-        with:
-          files: |
-            * 

.github/workflows/pr_cherrypick_poststep.yml

@@ -8,8 +8,7 @@ on:
 
 jobs:
   post_cherry_pick:
-    # Use azpw instead to have stable performance
-    if: false && github.event.pull_request.merged == true && contains(github.event.pull_request.labels.*.name, 'automerge') && github.event.pull_request.head.user.login == 'mssonicbld' && startsWith(github.event.pull_request.title, '[action]')
+    if: github.event.pull_request.merged == true && contains(github.event.pull_request.labels.*.name, 'automerge') && github.event.pull_request.head.user.login == 'mssonicbld' && startsWith(github.event.pull_request.title, '[action]')
     runs-on: ubuntu-latest
     steps:
     - name: Debug

.github/workflows/pr_cherrypick_prestep.yml

@@ -9,8 +9,7 @@ on:
 
 jobs:
   pre_cherry_pick:
-    # Use azpw instead of workflow to have stable performance.
-    if: false && github.repository_owner == 'sonic-net' && github.event.pull_request.merged == true && ( (github.event.action == 'closed' && contains(join(github.event.pull_request.labels.*.name, ','), 'Approved for 20')) || (github.event.action == 'labeled' && startsWith(github.event.label.name, 'Approved for 20')) )
+    if: github.repository_owner == 'sonic-net' && github.event.pull_request.merged == true && ( (github.event.action == 'closed' && contains(join(github.event.pull_request.labels.*.name, ','), 'Approved for 20')) || (github.event.action == 'labeled' && startsWith(github.event.label.name, 'Approved for 20')) )
     runs-on: ubuntu-latest
     steps:
     - name: Checkout

.gitignore

@@ -41,9 +41,6 @@ installer/x86_64/platforms/
 # Misc. files
 asic_config_checksum
 files/Aboot/boot0
-files/dsc/MANIFEST
-files/dsc/install_debian
-files/dsc/fs.zip
 files/initramfs-tools/arista-convertfs
 files/initramfs-tools/union-mount
 
@@ -108,6 +105,3 @@ htmlcov/
 # Debian mirror Sources
 sources.list.*
 !sources.list*.j2
-
-# Generated mirror configs
-apt-retries-count

.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,15 +35,18 @@
 [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
@@ -91,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
@@ -103,21 +111,14 @@
 [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 "src/sonic-dash-api"]
-	path = src/sonic-dash-api
-	url = https://github.com/sonic-net/sonic-dash-api.git
-[submodule "platform/marvell-arm64/mrvl-prestera"]
-	path = platform/marvell-arm64/mrvl-prestera
-	url = https://github.com/Marvell-switching/mrvl-prestera.git
-[submodule "platform/marvell-arm64/sonic-platform-marvell"]
-	path = platform/marvell-arm64/sonic-platform-marvell
-	url = https://github.com/Marvell-switching/sonic-platform-arm64.git

LICENSE

@@ -1,13 +1,15 @@
-Copyright (C) 2023  Microsoft
+Copyright (C) 2016  Microsoft
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
 
-    http://www.apache.org/licenses/LICENSE-2.0
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
 
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.

Makefile

@@ -4,7 +4,6 @@ NOJESSIE ?= 1
 NOSTRETCH ?= 1
 NOBUSTER ?= 0
 NOBULLSEYE ?= 0
-NOBOOKWORM ?= 0
 
 override Q := @
 ifeq ($(QUIET),n)
@@ -30,10 +29,6 @@ ifeq ($(NOBULLSEYE),0)
 BUILD_BULLSEYE=1
 endif
 
-ifeq ($(NOBOOKWORM),0)
-BUILD_BOOKWORM=1
-endif
-
 PLATFORM_PATH := platform/$(if $(PLATFORM),$(PLATFORM),$(CONFIGURED_PLATFORM))
 PLATFORM_CHECKOUT := platform/checkout
 PLATFORM_CHECKOUT_FILE := $(PLATFORM_CHECKOUT)/$(PLATFORM).ini
@@ -52,12 +47,9 @@ ifeq ($(NOBUSTER), 0)
 	$(MAKE_WITH_RETRY) EXTRA_DOCKER_TARGETS=$(notdir $@) BLDENV=buster -f Makefile.work buster
 endif
 ifeq ($(NOBULLSEYE), 0)
-	$(MAKE_WITH_RETRY) EXTRA_DOCKER_TARGETS=$(notdir $@) BLDENV=bullseye -f Makefile.work bullseye
+	$(MAKE_WITH_RETRY) BLDENV=bullseye -f Makefile.work $@
 endif
-ifeq ($(NOBOOKWORM), 0)
-	$(MAKE_WITH_RETRY) BLDENV=bookworm -f Makefile.work $@
-endif
-	BLDENV=bookworm $(MAKE) -f Makefile.work docker-cleanup
+	BLDENV=bullseye $(MAKE) -f Makefile.work docker-cleanup
 
 jessie:
 	@echo "+++ Making $@ +++"
@@ -77,12 +69,6 @@ ifeq ($(NOBUSTER), 0)
 	$(MAKE) -f Makefile.work buster
 endif
 
-bullseye:
-	@echo "+++ Making $@ +++"
-ifeq ($(NOBUSTER), 0)
-	$(MAKE) -f Makefile.work bullseye
-endif
-
 init:
 	@echo "+++ Making $@ +++"
 	$(MAKE) -f Makefile.work $@
@@ -96,7 +82,6 @@ define make_work
 	$(if $(BUILD_STRETCH),BLDENV=stretch $(MAKE) -f Makefile.work $@,)
 	$(if $(BUILD_BUSTER),BLDENV=buster $(MAKE) -f Makefile.work $@,)
 	$(if $(BUILD_BULLSEYE),BLDENV=bullseye $(MAKE) -f Makefile.work $@,)
-	$(if $(BUILD_BOOKWORM),BLDENV=bookworm $(MAKE) -f Makefile.work $@,)
 endef
 
 .PHONY: $(PLATFORM_PATH)

Makefile.cache

@@ -78,8 +78,7 @@ SONIC_COMMON_DPKG_LIST  :=  debian/control debian/changelog debian/rules \
 SONIC_COMMON_BASE_FILES_LIST  := sonic-slave-jessie/Dockerfile.j2 sonic-slave-jessie/Dockerfile.user.j2 \
                                  sonic-slave-stretch/Dockerfile.j2 sonic-slave-stretch/Dockerfile.user.j2 \
                                  sonic-slave-buster/Dockerfile.j2 sonic-slave-buster/Dockerfile.user.j2 \
-                                 sonic-slave-bullseye/Dockerfile.j2 sonic-slave-bullseye/Dockerfile.user.j2 \
-                                 sonic-slave-bookworm/Dockerfile.j2 sonic-slave-bookworm/Dockerfile.user.j2
+                                 sonic-slave-bullseye/Dockerfile.j2 sonic-slave-bullseye/Dockerfile.user.j2
 
 
 
@@ -295,12 +294,10 @@ define SAVE_INTO_CACHE
 		echo "Target $(1) dependencies are modifed - global save cache skipped" >> $($(1)_DST_PATH)/$(1).log
 		$(eval $(1)_CACHE_DIR := $(SONIC_DPKG_LOCAL_CACHE_DIR))
 	 )
-	cp $($(1)_DST_PATH)/$(1).log $($(1)_DST_PATH)/$(1).cached.log
-	$($(1)_CACHE_USER) tar -C $($(1)_BASE_PATH) -mczvf $($(1)_CACHE_DIR)/$(MOD_CACHE_FILE) $(2) $(addprefix $($(1)_DST_PATH)/,$($(1)_DERIVED_DEBS) $($(1)_EXTRA_DEBS) $(1).cached.log)  \
+	$($(1)_CACHE_USER) tar -C $($(1)_BASE_PATH) -mczvf $($(1)_CACHE_DIR)/$(MOD_CACHE_FILE) $(2) $(addprefix $($(1)_DST_PATH)/,$($(1)_DERIVED_DEBS) $($(1)_EXTRA_DEBS) )  \
 		1>>$($(1)_DST_PATH)/$(1).log
 	sudo chmod 777 $($(1)_CACHE_DIR)/$(MOD_CACHE_FILE)
-	rm -f $($(1)_DST_PATH)/$(1).cached.log
-	
+
 	echo "File $($(1)_CACHE_DIR)/$(MOD_CACHE_FILE) saved in cache " >> $($(1)_DST_PATH)/$(1).log
 	echo "[ CACHE::SAVED ] $($(1)_CACHE_DIR)/$(MOD_CACHE_FILE)" >> $($(1)_DST_PATH)/$(1).log
 
@@ -360,22 +357,6 @@ define SAVE_CACHE
 	$(if $(call CHECK_WCACHE_ENABLED,$(1)), $(call SAVE_INTO_CACHE,$(1),$(2)))
 endef
 
-RFS_DEP_FILES := $(wildcard \
-	$(addprefix scripts/, build_debian_base_system.sh prepare_debian_image_buildinfo.sh build_mirror_config.sh) \
-	$(addprefix $(IMAGE_DISTRO_DEBS_PATH)/,$(INITRAMFS_TOOLS) $(LINUX_KERNEL)) \
-	$(shell git ls-files files/initramfs-tools) \
-	$(shell git ls-files files/image_config) \
-	$(shell git ls-files files/apparmor) \
-	$(shell git ls-files files/apt) \
-	$(shell git ls-files files/sshd) \
-	$(shell git ls-files files/dhcp) \
-	src/sonic-build-hooks/buildinfo/trusted.gpg.d \
-	platform/$(CONFIGURED_PLATFORM)/modules  \
-	files/docker/docker.service.conf \
-	files/build_templates/default_users.json.j2 \
-	files/build_scripts/generate_asic_config_checksum.py \
-	files/scripts/core_cleanup.py \
-	build_debian.sh onie-image.conf)
 
 
 # Set the target path for each target.
@@ -403,17 +384,11 @@ $(foreach pkg, $(SONIC_INSTALL_PKGS), \
         $(eval $(pkg)_DST_PATH := $(if $($(pkg)_DST_PATH), $($(pkg)_DST_PATH), $(FSROOT_PATH))) \
 		$(eval $(FSROOT_PATH)/$(pkg)_TARGET := $(pkg)) )
 
-$(foreach pkg, $(SONIC_RFS_TARGETS), \
-        $(eval $(pkg)_DST_PATH := $(if $($(pkg)_DST_PATH), $($(pkg)_DST_PATH), $(TARGET_PATH))) \
-        $(eval $(pkg)_CACHE_MODE := GIT_CONTENT_SHA) \
-        $(eval $(pkg)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)) \
-        $(eval $(pkg)_DEP_FILES := $(SONIC_COMMON_BASE_FILES_LIST) $(RFS_DEP_FILES)) \
-        $(eval $(TARGET_PATH)/$(pkg)_TARGET := $(pkg)) )
 
 # define the DEP files(.dep and .smdep) and SHA files (.sha and smsha) for each target
 $(foreach pkg, $(SONIC_MAKE_DEBS) $(SONIC_DPKG_DEBS) $(SONIC_ONLINE_DEBS) $(SONIC_COPY_DEBS) \
         $(SONIC_MAKE_FILES) $(SONIC_PYTHON_STDEB_DEBS) $(SONIC_PYTHON_WHEELS) \
-        $(SONIC_DOCKER_IMAGES) $(SONIC_DOCKER_DBG_IMAGES) $(SONIC_INSTALL_PKGS) $(SONIC_RFS_TARGETS), \
+        $(SONIC_DOCKER_IMAGES) $(SONIC_DOCKER_DBG_IMAGES) $(SONIC_INSTALL_PKGS), \
         $(eval $(pkg)_MOD_SRC_PATH:=$(if $($(pkg)_SRC_PATH),$($(pkg)_SRC_PATH),$($(pkg)_PATH))) \
         $(eval $(pkg)_BASE_PATH:=$(if $($(pkg)_BASE_PATH),$($(pkg)_BASE_PATH),$(CURDIR))) \
         $(eval $(pkg)_DEP_FLAGS_FILE:=$($(pkg)_DST_PATH)/$(pkg).flags) \
@@ -514,7 +489,6 @@ $(eval $(call FLAGS_DEP_RULES, $(SONIC_PYTHON_STDEB_DEBS), $(PYTHON_DEBS_PATH),f
 $(eval $(call FLAGS_DEP_RULES, $(SONIC_PYTHON_WHEELS), $(PYTHON_WHEELS_PATH),flags))
 $(eval $(call FLAGS_DEP_RULES, $(SONIC_DOCKER_IMAGES) $(SONIC_DOCKER_DBG_IMAGES), $(TARGET_PATH),flags))
 $(eval $(call FLAGS_DEP_RULES, $(SONIC_INSTALL_PKGS), $(FSROOT_PATH),flags))
-$(eval $(call FLAGS_DEP_RULES, $(SONIC_RFS_TARGETS), $(TARGET_PATH),flags))
 
 
 
@@ -590,12 +564,10 @@ ALL_DEP_FILES_LIST += $(foreach pkg,$(2), $($(filter none,$($(1)_CACHE_MODE)), \
                       $(addsuffix .$(3).sha,$(addprefix $(pkg)/, $(1)))))
 $(foreach docker, $(filter $(SONIC_DOCKER_IMAGES), $(1)), \
 	$(eval $(docker)_DEP_FILES+=$(wildcard files/build/versions/default/*) \
-	$(wildcard files/build/versions/dockers/$(basename $(docker))/*) \
-	$(foreach docker_file, $($(docker)_FILES), $(addprefix $(if $($(docker_file)_PATH), $($(docker_file)_PATH), $(FILES_PATH))/, $(docker_file))) ))
+	$(wildcard files/build/versions/dockers/$(basename $(docker))/*)))
 $(foreach docker, $(filter $(SONIC_DOCKER_DBG_IMAGES), $(1)), \
 	$(eval $(docker)_DEP_FILES+=$(wildcard files/build/versions/default/*) \
-	$(wildcard files/build/versions/dockers/$(patsubst %-$(DBG_IMAGE_MARK).gz,%,$(docker))/*) \
-	$(foreach docker_file, $($(docker)_FILES), $(addprefix $(if $($(docker_file)_PATH), $($(docker_file)_PATH), $(FILES_PATH))/, $(docker_file))) ))
+	$(wildcard files/build/versions/dockers/$(patsubst %-$(DBG_IMAGE_MARK).gz,%,$(docker))/*)))
 $(addsuffix .$(3),$(addprefix $(2)/, $(1))) : $(2)/%.$(3) : \
 	$(2)/%.flags $$$$($$$$*_DEP_FILES) $$$$(if $$$$($$$$*_SMDEP_FILES), $(2)/%.smdep)
 	@$$(eval $$*_DEP_FILES_MODIFIED := $$? )
@@ -611,7 +583,6 @@ $(eval $(call SHA_DEP_RULES, $(SONIC_PYTHON_STDEB_DEBS), $(PYTHON_DEBS_PATH),dep
 $(eval $(call SHA_DEP_RULES, $(SONIC_PYTHON_WHEELS), $(PYTHON_WHEELS_PATH),dep))
 $(eval $(call SHA_DEP_RULES, $(SONIC_DOCKER_IMAGES) $(SONIC_DOCKER_DBG_IMAGES), $(TARGET_PATH),dep))
 $(eval $(call SHA_DEP_RULES, $(SONIC_INSTALL_PKGS), $(FSROOT_PATH),dep))
-$(eval $(call SHA_DEP_RULES, $(SONIC_RFS_TARGETS), $(TARGET_PATH),dep))
 
 
 
@@ -645,7 +616,6 @@ SONIC_CACHE_CLEAN_TARGETS = $(addsuffix -clean,$(addprefix $(TARGET_PATH)/, \
                $(SONIC_DOCKER_IMAGES) \
                $(SONIC_DOCKER_DBG_IMAGES) \
                $(SONIC_SIMPLE_DOCKER_IMAGES) \
-               $(SONIC_RFS_TARGETS) \
                $(SONIC_INSTALLERS)))
 $(SONIC_CACHE_CLEAN_TARGETS) :: $(TARGET_PATH)/%-clean : .platform
 	@rm -f $($*_DEP_FLAGS_FILE) $($*_MOD_HASH_FILE) $($*_SMOD_HASH_FILE) \

Makefile.work

@@ -5,6 +5,8 @@
 #
 #  * PLATFORM: Specific platform we wish to build images for.
 #  * BUILD_NUMBER: Desired version-number to pass to the building-system.
+#  * ENABLE_DHCP_GRAPH_SERVICE: Enables get-graph service to fetch minigraph files
+#    through http.
 #  * ENABLE_ZTP: Enables zero touch provisioning.
 #  * SHUTDOWN_BGP_ON_START: Sets admin-down state for all bgp peerings after restart.
 #  * INCLUDE_KUBERNETES: Allows including Kubernetes
@@ -38,9 +40,6 @@
 #  * 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)
@@ -70,7 +69,6 @@ USER := $(shell id -un)
 PWD := $(shell pwd)
 USER_LC := $(shell echo $(USER) | tr A-Z a-z)
 DOCKER_MACHINE := $(shell docker run --rm debian:buster uname -m)
-HOST_DOCKERD_GID := $(shell getent group docker | cut -d : -f3)
 
 comma := ,
 
@@ -123,9 +121,7 @@ else
 TARGET_BOOTLOADER = uboot
 endif
 
-ifeq ($(BLDENV), bookworm)
-SLAVE_DIR = sonic-slave-bookworm
-else ifeq ($(BLDENV), bullseye)
+ifeq ($(BLDENV), bullseye)
 SLAVE_DIR = sonic-slave-bullseye
 else ifeq ($(BLDENV), buster)
 SLAVE_DIR = sonic-slave-buster
@@ -151,10 +147,6 @@ ifeq ($(ENABLE_DOCKER_BASE_PULL),)
 	override ENABLE_DOCKER_BASE_PULL = n
 endif
 
-ifeq ($(LEGACY_SONIC_MGMT_DOCKER),)
-	override LEGACY_SONIC_MGMT_DOCKER = y
-endif
-
 ifneq ($(GZ_COMPRESS_PROGRAM), pigz)
 override GZ_COMPRESS_PROGRAM = gzip
 endif
@@ -184,19 +176,13 @@ DOCKER_ROOT = $(PWD)/fsroot.docker.$(BLDENV)
 
 # Support FIPS feature, armhf not supported yet
 ifeq ($(PLATFORM_ARCH),armhf)
-INCLUDE_FIPS := n
+ENABLE_FIPS_FEATURE := n
 ENABLE_FIPS := n
 endif
 
-# FIPS not yet available on Bookworm
-ifeq ($(BLDENV),bookworm)
-$(warning FIPS support not yet available on Bookworm)
-INCLUDE_FIPS := n
-endif
-
-ifeq ($(INCLUDE_FIPS), n)
+ifeq ($(ENABLE_FIPS_FEATURE), n)
 ifeq ($(ENABLE_FIPS), y)
-    $(error Cannot set fips config ENABLE_FIPS=y when INCLUDE_FIPS=n)
+    $(error Cannot set fips config ENABLE_FIPS=y when ENABLE_FIPS_FEATURE=n)
 endif
 endif
 
@@ -217,14 +203,13 @@ $(shell \
 	SONIC_VERSION_CACHE_SOURCE=$(SONIC_VERSION_CACHE_SOURCE) \
 	DBGOPT='$(DBGOPT)' \
 	MIRROR_SNAPSHOT=$(MIRROR_SNAPSHOT) \
-	PIP_HTTP_TIMEOUT=$(PIP_HTTP_TIMEOUT) \
 	scripts/generate_buildinfo_config.sh)
 
 # Generate the slave Dockerfile, and prepare build info for it
 $(shell CONFIGURED_ARCH=$(CONFIGURED_ARCH) \
 	MULTIARCH_QEMU_ENVIRON=$(MULTIARCH_QEMU_ENVIRON) \
 	CROSS_BUILD_ENVIRON=$(CROSS_BUILD_ENVIRON) \
-	INCLUDE_FIPS=$(INCLUDE_FIPS) \
+	ENABLE_FIPS_FEATURE=$(ENABLE_FIPS_FEATURE) \
 	DOCKER_EXTRA_OPTS=$(DOCKER_EXTRA_OPTS) \
 	DEFAULT_CONTAINER_REGISTRY=$(DEFAULT_CONTAINER_REGISTRY) \
 	GZ_COMPRESS_PROGRAM=$(GZ_COMPRESS_PROGRAM) \
@@ -236,11 +221,9 @@ $(shell CONFIGURED_ARCH=$(CONFIGURED_ARCH) \
 	j2 $(SLAVE_DIR)/Dockerfile.user.j2 > $(SLAVE_DIR)/Dockerfile.user)
 
 ifeq ($(CROSS_BUILD_ENVIRON), y)
-$(shell SONIC_VERSION_CONTROL_COMPONENTS=$(SONIC_VERSION_CONTROL_COMPONENTS) \
-	MIRROR_SNAPSHOT=$(MIRROR_SNAPSHOT) scripts/build_mirror_config.sh $(SLAVE_DIR) amd64 $(BLDENV))
+$(shell MIRROR_SNAPSHOT=$(MIRROR_SNAPSHOT) scripts/build_mirror_config.sh $(SLAVE_DIR) amd64 $(BLDENV))
 endif
-$(shell SONIC_VERSION_CONTROL_COMPONENTS=$(SONIC_VERSION_CONTROL_COMPONENTS) \
-	MIRROR_SNAPSHOT=$(MIRROR_SNAPSHOT) scripts/build_mirror_config.sh $(SLAVE_DIR) $(CONFIGURED_ARCH) $(BLDENV))
+$(shell MIRROR_SNAPSHOT=$(MIRROR_SNAPSHOT) scripts/build_mirror_config.sh $(SLAVE_DIR) $(CONFIGURED_ARCH) $(BLDENV))
 
 PREPARE_DOCKER=BUILD_SLAVE=y \
 	DEFAULT_CONTAINER_REGISTRY=$(DEFAULT_CONTAINER_REGISTRY) \
@@ -391,7 +374,7 @@ endif
 
 ifeq ($(SONIC_CONFIG_USE_NATIVE_DOCKERD_FOR_BUILD), y)
 ifneq ($(MULTIARCH_QEMU_ENVIRON), y)
-    DOCKER_RUN += -v /var/run/docker.sock:/var/run/docker.sock --group-add $(HOST_DOCKERD_GID)
+    DOCKER_RUN += -v /var/run/docker.sock:/var/run/docker.sock
 endif
 endif
 
@@ -521,13 +504,13 @@ SONIC_BUILD_INSTRUCTION :=  $(MAKE) \
                            BUILD_TIMESTAMP=$(BUILD_TIMESTAMP) \
                            SONIC_IMAGE_VERSION=$(SONIC_IMAGE_VERSION) \
                            SLAVE_TAG=$(SLAVE_TAG) \
+                           ENABLE_DHCP_GRAPH_SERVICE=$(ENABLE_DHCP_GRAPH_SERVICE) \
                            ENABLE_ZTP=$(ENABLE_ZTP) \
                            INCLUDE_PDE=$(INCLUDE_PDE) \
                            SHUTDOWN_BGP_ON_START=$(SHUTDOWN_BGP_ON_START) \
                            INCLUDE_KUBERNETES=$(INCLUDE_KUBERNETES) \
                            KUBERNETES_VERSION=$(KUBERNETES_VERSION) \
                            KUBERNETES_CNI_VERSION=$(KUBERNETES_CNI_VERSION) \
-                           KUBERNETES_CRI_TOOLS_VERSION=$(KUBERNETES_CRI_TOOLS_VERSION) \
                            K8s_GCR_IO_PAUSE_VERSION=$(K8s_GCR_IO_PAUSE_VERSION) \
                            INCLUDE_KUBERNETES_MASTER=$(INCLUDE_KUBERNETES_MASTER) \
                            SONIC_ENABLE_PFCWD_ON_START=$(ENABLE_PFCWD_ON_START) \
@@ -553,16 +536,12 @@ 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_GNMI=$(INCLUDE_SYSTEM_GNMI) \
-                           SONIC_INCLUDE_SYSTEM_EVENTD=$(INCLUDE_SYSTEM_EVENTD) \
                            INCLUDE_DHCP_RELAY=$(INCLUDE_DHCP_RELAY) \
-                           INCLUDE_DHCP_SERVER=$(INCLUDE_DHCP_SERVER) \
                            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) \
@@ -580,7 +559,7 @@ SONIC_BUILD_INSTRUCTION :=  $(MAKE) \
                            ENABLE_ASAN=$(ENABLE_ASAN) \
                            SONIC_INCLUDE_BOOTCHART=$(INCLUDE_BOOTCHART) \
                            SONIC_ENABLE_BOOTCHART=$(ENABLE_BOOTCHART) \
-                           INCLUDE_FIPS=$(INCLUDE_FIPS) \
+                           ENABLE_FIPS_FEATURE=$(ENABLE_FIPS_FEATURE) \
                            ENABLE_FIPS=$(ENABLE_FIPS) \
                            SONIC_SLAVE_DOCKER_DRIVER=$(SONIC_SLAVE_DOCKER_DRIVER) \
                            MIRROR_URLS=$(MIRROR_URLS) \
@@ -588,10 +567,7 @@ SONIC_BUILD_INSTRUCTION :=  $(MAKE) \
                            GZ_COMPRESS_PROGRAM=$(GZ_COMPRESS_PROGRAM) \
                            MIRROR_SNAPSHOT=$(MIRROR_SNAPSHOT) \
                            SONIC_VERSION_CONTROL_COMPONENTS=$(SONIC_VERSION_CONTROL_COMPONENTS) \
-                           ONIE_IMAGE_PART_SIZE=$(ONIE_IMAGE_PART_SIZE) \
                            SONIC_OS_VERSION=$(SONIC_OS_VERSION) \
-                           PIP_HTTP_TIMEOUT=$(PIP_HTTP_TIMEOUT) \
-                           LEGACY_SONIC_MGMT_DOCKER=$(LEGACY_SONIC_MGMT_DOCKER) \
                            $(SONIC_OVERRIDE_BUILD_VARS)
 
 .PHONY: sonic-slave-build sonic-slave-bash init reset
@@ -614,7 +590,6 @@ export MIRROR_URLS
 export MIRROR_SECURITY_URLS
 export MIRROR_SNAPSHOT
 export SONIC_VERSION_CONTROL_COMPONENTS
-export PIP_HTTP_TIMEOUT
 
 %:: | sonic-build-hooks
 ifneq ($(filter y, $(MULTIARCH_QEMU_ENVIRON) $(CROSS_BUILD_ENVIRON)),)

README.md

@@ -7,34 +7,9 @@
 [![Innovium](https://dev.azure.com/mssonic/build/_apis/build/status/innovium/Azure.sonic-buildimage.official.innovium?branchName=master&label=Innovium)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=148&branchName=master)
 [![Mellanox](https://dev.azure.com/mssonic/build/_apis/build/status/mellanox/Azure.sonic-buildimage.official.mellanox?branchName=master&label=Mellanox)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=139&branchName=master)
 [![Marvell(armhf)](https://dev.azure.com/mssonic/build/_apis/build/status/marvell/Azure.sonic-buildimage.official.marvell-armhf?branchName=master&label=Marvell-armhf)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=141&branchName=master)
-[![Marvell(arm64)](https://dev.azure.com/mssonic/build/_apis/build/status/marvell/Azure.sonic-buildimage.official.marvell-arm64?branchName=master&label=Marvell-arm64)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=999&branchName=master)
 [![Nephos](https://dev.azure.com/mssonic/build/_apis/build/status/nephos/Azure.sonic-buildimage.official.nephos?branchName=master&label=Nephos)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=149&branchName=master)
 [![VS](https://dev.azure.com/mssonic/build/_apis/build/status/vs/Azure.sonic-buildimage.official.vs?branchName=master&label=VS)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=142&branchName=master)
 
-*202305 builds*:
-
-[![Barefoot](https://dev.azure.com/mssonic/build/_apis/build/status/barefoot/Azure.sonic-buildimage.official.barefoot?branchName=202205&label=Barefoot)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=146&branchName=202305)
-[![Broadcom](https://dev.azure.com/mssonic/build/_apis/build/status/broadcom/Azure.sonic-buildimage.official.broadcom?branchName=202305&label=Broadcom)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=138&branchName=202305)
-[![Centec](https://dev.azure.com/mssonic/build/_apis/build/status/centec/Azure.sonic-buildimage.official.centec?branchName=202305&label=Centec)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=143&branchName=202305)
-[![Centec(arm64)](https://dev.azure.com/mssonic/build/_apis/build/status/centec/Azure.sonic-buildimage.official.centec-arm64?branchName=202305&label=Centec-arm64)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=140&branchName=202305)
-[![Innovium](https://dev.azure.com/mssonic/build/_apis/build/status/innovium/Azure.sonic-buildimage.official.innovium?branchName=202305&label=Innovium)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=148&branchName=202305)
-[![Mellanox](https://dev.azure.com/mssonic/build/_apis/build/status/mellanox/Azure.sonic-buildimage.official.mellanox?branchName=202305&label=Mellanox)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=139&branchName=202305)
-[![Marvell(armhf)](https://dev.azure.com/mssonic/build/_apis/build/status/marvell/Azure.sonic-buildimage.official.marvell-armhf?branchName=202305&label=Marvell-armhf)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=141&branchName=202305)
-[![Nephos](https://dev.azure.com/mssonic/build/_apis/build/status/nephos/Azure.sonic-buildimage.official.nephos?branchName=202305&label=Nephos)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=149&branchName=202305)
-[![VS](https://dev.azure.com/mssonic/build/_apis/build/status/vs/Azure.sonic-buildimage.official.vs?branchName=202305&label=VS)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=142&branchName=202305)
-
-*202211 builds*:
-
-[![Barefoot](https://dev.azure.com/mssonic/build/_apis/build/status/barefoot/Azure.sonic-buildimage.official.barefoot?branchName=202205&label=Barefoot)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=146&branchName=202211)
-[![Broadcom](https://dev.azure.com/mssonic/build/_apis/build/status/broadcom/Azure.sonic-buildimage.official.broadcom?branchName=202211&label=Broadcom)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=138&branchName=202211)
-[![Centec](https://dev.azure.com/mssonic/build/_apis/build/status/centec/Azure.sonic-buildimage.official.centec?branchName=202211&label=Centec)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=143&branchName=202211)
-[![Centec(arm64)](https://dev.azure.com/mssonic/build/_apis/build/status/centec/Azure.sonic-buildimage.official.centec-arm64?branchName=202211&label=Centec-arm64)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=140&branchName=202211)
-[![Innovium](https://dev.azure.com/mssonic/build/_apis/build/status/innovium/Azure.sonic-buildimage.official.innovium?branchName=202211&label=Innovium)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=148&branchName=202211)
-[![Mellanox](https://dev.azure.com/mssonic/build/_apis/build/status/mellanox/Azure.sonic-buildimage.official.mellanox?branchName=202211&label=Mellanox)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=139&branchName=202211)
-[![Marvell(armhf)](https://dev.azure.com/mssonic/build/_apis/build/status/marvell/Azure.sonic-buildimage.official.marvell-armhf?branchName=202211&label=Marvell-armhf)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=141&branchName=202211)
-[![Nephos](https://dev.azure.com/mssonic/build/_apis/build/status/nephos/Azure.sonic-buildimage.official.nephos?branchName=202211&label=Nephos)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=149&branchName=202211)
-[![VS](https://dev.azure.com/mssonic/build/_apis/build/status/vs/Azure.sonic-buildimage.official.vs?branchName=202211&label=VS)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=142&branchName=202211)
-
 *202205 builds*:
 
 [![Barefoot](https://dev.azure.com/mssonic/build/_apis/build/status/barefoot/Azure.sonic-buildimage.official.barefoot?branchName=202205&label=Barefoot)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=146&branchName=202205)
@@ -80,6 +55,14 @@
 [![Nephos](https://dev.azure.com/mssonic/build/_apis/build/status/nephos/Azure.sonic-buildimage.official.nephos?branchName=201911&label=Nephos)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=149&branchName=201911)
 [![VS](https://dev.azure.com/mssonic/build/_apis/build/status/vs/Azure.sonic-buildimage.official.vs?branchName=201911&label=VS)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=142&branchName=201911)
 
+*201811 builds*:
+
+[![Broadcom](https://dev.azure.com/mssonic/build/_apis/build/status/broadcom/Azure.sonic-buildimage.official.broadcom?branchName=201811&label=Broadcom)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=138&branchName=201811)
+[![Mellanox](https://dev.azure.com/mssonic/build/_apis/build/status/mellanox/Azure.sonic-buildimage.official.mellanox?branchName=201811&label=Mellanox)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=139&branchName=201811)
+[![Innovium](https://dev.azure.com/mssonic/build/_apis/build/status/innovium/Azure.sonic-buildimage.official.innovium?branchName=201811&label=Innovium)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=148&branchName=201811)
+[![Nephos](https://dev.azure.com/mssonic/build/_apis/build/status/nephos/Azure.sonic-buildimage.official.nephos?branchName=201811&label=Nephos)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=149&branchName=201811)
+[![VS](https://dev.azure.com/mssonic/build/_apis/build/status/vs/Azure.sonic-buildimage.official.vs?branchName=201811&label=VS)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=142&branchName=201811)
+
 # sonic-buildimage
 
 ## Build SONiC Switch Images
@@ -123,7 +106,6 @@ pip3 install --user j2cli
   system to allow running the 'docker' command without 'sudo':
   * Add current user to the docker group: `sudo gpasswd -a ${USER} docker`
   * Log out and log back in so that your group membership is re-evaluated
-  * If you are using Linux kernel 5.3 or newer, then you must use Docker 20.10.10 or newer. This is because older Docker versions did not allow the `clone3` syscall, which is now used in Bookworm.
 
 > Note: If a previous installation of Docker using snap was present on the
 > system, remove it and also remove docker from snap before reinstallating docker.
@@ -180,6 +162,9 @@ The supported ASIC vendors are:
 
 ## Usage for ARM Architecture
 
+ARM build has dependency in docker version 18.
+If docker version is 19, downgrade to 18 with:
+
 ```shell
 sudo apt-get install --allow-downgrades -y docker-ce=5:18.09.0~3-0~ubuntu-xenial
 sudo apt-get install --allow-downgrades -y docker-ce-cli=5:18.09.0~3-0~ubuntu-xenial
@@ -343,10 +328,6 @@ on the SAI version for each SONiC release.
     [managing, configuring and monitoring SONiC](https://github.com/sonic-net/sonic-mgmt)
     (gzip tar archive)
 
-## SONiC Image Azure Pipelines
-
-All SONiC project build pipeline could be found at [Download Portal for SONiC Images](https://sonic-build.azurewebsites.net)
-
 ## Contribution Guide
 
 All contributors must sign a contribution license agreement before contributions

azure-pipelines.yml

@@ -42,12 +42,7 @@ variables:
 - name: CACHE_MODE
   value: rcache
 - name: ENABLE_FIPS
-  value: n
-- name: BUILD_BRANCH
-  ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
-    value: $(System.PullRequest.TargetBranch)
-  ${{ else }}:
-    value: $(Build.SourceBranchName)
+  value: y
 
 stages:
 - stage: BuildVS
@@ -55,12 +50,14 @@ stages:
   jobs:
   - template: .azure-pipelines/azure-pipelines-build.yml
     parameters:
-      buildOptions: 'USERNAME=admin SONIC_BUILD_JOBS=$(nproc) BUILD_MULTIASIC_KVM=y INCLUDE_DHCP_SERVER=y ${{ variables.VERSION_CONTROL_OPTIONS }}'
+      buildOptions: 'USERNAME=admin SONIC_BUILD_JOBS=$(nproc) BUILD_MULTIASIC_KVM=y ${{ variables.VERSION_CONTROL_OPTIONS }}'
       jobGroups:
       - name: vs
 
 - stage: Build
   pool: sonicbld
+  variables:
+    INSTALL_DEBUG_TOOLS: y
   dependsOn: []
   jobs:
   - template: .azure-pipelines/azure-pipelines-build.yml
@@ -70,12 +67,7 @@ stages:
       - name: broadcom
         variables:
           swi_image: yes
-          INCLUDE_RESTAPI: y
       - name: mellanox
-        variables:
-          dbg_image: yes
-          docker_syncd_rpc_image: yes
-          platform_rpc: mlnx
       - name: marvell-arm64
         pool: sonicbld-arm64
         variables:
@@ -85,7 +77,6 @@ stages:
         timeoutInMinutes: 1200
         variables:
           PLATFORM_ARCH: armhf
-          INCLUDE_RESTAPI: y
 
 - stage: Test
   dependsOn: BuildVS
@@ -118,30 +109,27 @@ stages:
         sudo rm -rf ../*.deb
       displayName: "Cleanup"
 
+    - task: DownloadPipelineArtifact@2
+      inputs:
+        source: specific
+        project: build
+        pipeline: 9
+        artifact: sonic-swss-common.amd64.ubuntu20_04
+        runVersion: 'latestFromBranch'
+        runBranch: 'refs/heads/master'
+      displayName: "Download sonic swss common deb packages"
+
     - task: DownloadPipelineArtifact@2
       inputs:
         artifact: sonic-buildimage.vs
       displayName: "Download sonic-buildimage.vs artifact"
 
     - script: |
-        sudo src/sonic-swss-common/.azure-pipelines/build_and_install_module.sh
-      displayName: "Install kernel modules"
-
-    - script: |
+        set -x
         sudo apt-get update
-        sudo apt-get install -y make libtool m4 autoconf dh-exec debhelper cmake pkg-config \
-                         libhiredis-dev libnl-3-dev libnl-genl-3-dev libnl-route-3-dev libnl-nf-3-dev swig \
-                         libpython2.7-dev libboost-dev libboost-serialization-dev uuid-dev libzmq5 libzmq3-dev  python3-pip \
-                         cmake libgtest-dev libgmock-dev libyang-dev nlohmann-json3-dev
-        sudo pip3 install pytest
-        cd src/sonic-swss-common
-        ./autogen.sh
-        dpkg-buildpackage -rfakeroot -us -uc -b -j$(nproc)
-        sudo dpkg -i --force-confask,confnew ../libswsscommon_*.deb
-        sudo dpkg -i ../python3-swsscommon_*.deb
-      displayName: "Compile sonic swss common"
-
-    - script: |
+        sudo apt-get install libyang0.16 -y
+        sudo dpkg -i --force-confask,confnew ../libswsscommon_1.0.0_amd64.deb
+        sudo dpkg -i ../python3-swsscommon_1.0.0_amd64.deb
         sudo docker load -i ../target/docker-sonic-vs.gz
         docker tag docker-sonic-vs:latest docker-sonic-vs:$(Build.BuildNumber)
         username=$(id -un)
@@ -171,7 +159,7 @@ stages:
         TOPOLOGY: t0
         MIN_WORKER: $(T0_INSTANCE_NUM)
         MAX_WORKER: $(T0_INSTANCE_NUM)
-        MGMT_BRANCH: $(BUILD_BRANCH)
+        MGMT_BRANCH: "202305"
 
   - job: t0_2vlans_elastictest
     pool: ubuntu-20.04
@@ -185,7 +173,7 @@ stages:
         TEST_SET: t0-2vlans
         MIN_WORKER: $(T0_2VLANS_INSTANCE_NUM)
         MAX_WORKER: $(T0_2VLANS_INSTANCE_NUM)
-        MGMT_BRANCH: $(BUILD_BRANCH)
+        MGMT_BRANCH: "202305"
         DEPLOY_MG_EXTRA_PARAMS: "-e vlan_config=two_vlan_a"
 
   - job: t1_lag_elastictest
@@ -199,7 +187,7 @@ stages:
         TOPOLOGY: t1-lag
         MIN_WORKER: $(T1_LAG_INSTANCE_NUM)
         MAX_WORKER: $(T1_LAG_INSTANCE_NUM)
-        MGMT_BRANCH: $(BUILD_BRANCH)
+        MGMT_BRANCH: "202305"
 
   - job: multi_asic_elastictest
     displayName: "kvmtest-multi-asic-t1-lag by Elastictest"
@@ -214,7 +202,7 @@ stages:
           MIN_WORKER: $(MULTI_ASIC_INSTANCE_NUM)
           MAX_WORKER: $(MULTI_ASIC_INSTANCE_NUM)
           NUM_ASIC: 4
-          MGMT_BRANCH: $(BUILD_BRANCH)
+          MGMT_BRANCH: "202305"
 
   - job: dualtor_elastictest
     pool: ubuntu-20.04
@@ -227,7 +215,7 @@ stages:
           TOPOLOGY: dualtor
           MIN_WORKER: $(T0_DUALTOR_INSTANCE_NUM)
           MAX_WORKER: $(T0_DUALTOR_INSTANCE_NUM)
-          MGMT_BRANCH: $(BUILD_BRANCH)
+          MGMT_BRANCH: "202305"
           COMMON_EXTRA_PARAMS: "--disable_loganalyzer "
 
   - job: sonic_t0_elastictest
@@ -242,24 +230,10 @@ stages:
           MIN_WORKER: $(T0_SONIC_INSTANCE_NUM)
           MAX_WORKER: $(T0_SONIC_INSTANCE_NUM)
           TEST_SET: t0-sonic
-          MGMT_BRANCH: $(BUILD_BRANCH)
+          MGMT_BRANCH: "202305"
           COMMON_EXTRA_PARAMS: "--neighbor_type=sonic "
           VM_TYPE: vsonic
 
-  - job: dpu_elastictest
-    displayName: "kvmtest-dpu by Elastictest"
-    timeoutInMinutes: 240
-    continueOnError: false
-    pool: ubuntu-20.04
-    steps:
-      - template: .azure-pipelines/run-test-elastictest-template.yml@sonic-mgmt
-        parameters:
-          TOPOLOGY: dpu
-          MIN_WORKER: $(T0_SONIC_INSTANCE_NUM)
-          MAX_WORKER: $(T0_SONIC_INSTANCE_NUM)
-          MGMT_BRANCH: $(BUILD_BRANCH)
-
-
 #  - job: wan_elastictest
 #    displayName: "kvmtest-wan by Elastictest"
 #    pool: ubuntu-20.04

build_debian.sh

@@ -31,9 +31,9 @@ set -x -e
 CONFIGURED_ARCH=$([ -f .arch ] && cat .arch || echo amd64)
 
 ## docker engine version (with platform)
-DOCKER_VERSION=5:24.0.2-1~debian.12~$IMAGE_DISTRO
-CONTAINERD_IO_VERSION=1.6.21-1
-LINUX_KERNEL_VERSION=6.1.0-11-2
+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
 
 ## Working directory to prepare the file system
 FILESYSTEM_ROOT=./fsroot
@@ -50,8 +50,8 @@ TRUSTED_GPG_DIR=$BUILD_TOOL_PATH/trusted.gpg.d
     echo "Error: Invalid ONIE_IMAGE_PART_SIZE in onie image config file"
     exit 1
 }
-[ -n "$INSTALLER_PAYLOAD" ] || {
-    echo "Error: Invalid INSTALLER_PAYLOAD in onie image config file"
+[ -n "$ONIE_INSTALLER_PAYLOAD" ] || {
+    echo "Error: Invalid ONIE_INSTALLER_PAYLOAD in onie image config file"
     exit 1
 }
 [ -n "$FILESYSTEM_SQUASHFS" ] || {
@@ -59,30 +59,23 @@ TRUSTED_GPG_DIR=$BUILD_TOOL_PATH/trusted.gpg.d
     exit 1
 }
 
-if [ "$IMAGE_TYPE" = "aboot" ]; then
-    TARGET_BOOTLOADER="aboot"
-fi
-
-## Check if not a last stage of RFS build
-if [[ $RFS_SPLIT_LAST_STAGE != y ]]; then
-
 ## 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
 
+## make / as a mountpoint in chroot env, needed by dockerd
+pushd $FILESYSTEM_ROOT
+sudo mount --bind . .
+popd
+
 ## Build the host debian base system
 echo '[INFO] Build host debian base system...'
 TARGET_PATH=$TARGET_PATH scripts/build_debian_base_system.sh $CONFIGURED_ARCH $IMAGE_DISTRO $FILESYSTEM_ROOT
@@ -120,8 +113,7 @@ sudo LANG=C chroot $FILESYSTEM_ROOT mount
 ## 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
 sudo cp files/apt/sources.list.$CONFIGURED_ARCH $FILESYSTEM_ROOT/etc/apt/sources.list
-sudo cp files/apt/apt-retries-count $FILESYSTEM_ROOT/etc/apt/apt.conf.d/
-sudo cp files/apt/apt.conf.d/{81norecommends,apt-{clean,gzip-indexes,no-languages},no-check-valid-until} $FILESYSTEM_ROOT/etc/apt/apt.conf.d/
+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/
 
 ## Note: set lang to prevent locale warnings in your chroot
 sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y update
@@ -256,40 +248,36 @@ sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install apparmor
 sudo cp files/image_config/ntp/ntp-apparmor $FILESYSTEM_ROOT/etc/apparmor.d/local/usr.sbin.ntpd
 sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install apt-transport-https \
                                                        ca-certificates \
-                                                       curl
+                                                       curl \
+                                                       gnupg2 \
+                                                       software-properties-common
 if [[ $CONFIGURED_ARCH == armhf ]]; then
     # update ssl ca certificates for secure pem
     sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT c_rehash
 fi
 sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT curl -o /tmp/docker.asc -fsSL https://download.docker.com/linux/debian/gpg
 sudo LANG=C chroot $FILESYSTEM_ROOT mv /tmp/docker.asc /etc/apt/trusted.gpg.d/
-sudo tee $FILESYSTEM_ROOT/etc/apt/sources.list.d/docker.list >/dev/null <<EOF
-deb [arch=$CONFIGURED_ARCH] https://download.docker.com/linux/debian $IMAGE_DISTRO stable
-EOF
+sudo LANG=C chroot $FILESYSTEM_ROOT add-apt-repository \
+                                    "deb [arch=$CONFIGURED_ARCH] https://download.docker.com/linux/debian $IMAGE_DISTRO stable"
 sudo LANG=C chroot $FILESYSTEM_ROOT apt-get update
 sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install docker-ce=${DOCKER_VERSION} docker-ce-cli=${DOCKER_VERSION} containerd.io=${CONTAINERD_IO_VERSION}
 
+# Uninstall 'python3-gi' installed as part of 'software-properties-common' to remove debian version of 'PyGObject'
+# pip version of 'PyGObject' will be installed during installation of 'sonic-host-services'
+sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y remove software-properties-common gnupg2 python3-gi
+
 install_kubernetes () {
     local ver="$1"
-    ## Install k8s package from storage
-    local storage_prefix="https://sonicstorage.blob.core.windows.net/public/kubernetes"
-    sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT curl -o /tmp/cri-tools.deb -fsSL \
-        ${storage_prefix}/cri-tools_${KUBERNETES_CRI_TOOLS_VERSION}_${CONFIGURED_ARCH}.deb
-    sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT curl -o /tmp/kubernetes-cni.deb -fsSL \
-        ${storage_prefix}/kubernetes-cni_${KUBERNETES_CNI_VERSION}_${CONFIGURED_ARCH}.deb
-    sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT curl -o /tmp/kubelet.deb -fsSL \
-        ${storage_prefix}/kubelet_${ver}_${CONFIGURED_ARCH}.deb
-    sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT curl -o /tmp/kubectl.deb -fsSL \
-        ${storage_prefix}/kubectl_${ver}_${CONFIGURED_ARCH}.deb
-    sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT curl -o /tmp/kubeadm.deb -fsSL \
-        ${storage_prefix}/kubeadm_${ver}_${CONFIGURED_ARCH}.deb
-
-    sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install -f /tmp/cri-tools.deb
-    sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install -f /tmp/kubernetes-cni.deb
-    sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install -f /tmp/kubelet.deb
-    sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install -f /tmp/kubectl.deb
-    sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install -f /tmp/kubeadm.deb
-    sudo LANG=C chroot $FILESYSTEM_ROOT rm -f /tmp/{cri-tools,kubernetes-cni,kubelet,kubeadm,kubectl}.deb
+    sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT curl -fsSL \
+        https://packages.cloud.google.com/apt/doc/apt-key.gpg | \
+        sudo LANG=C chroot $FILESYSTEM_ROOT apt-key add -
+    ## Check out the sources list update matches current Debian version
+    sudo cp files/image_config/kubernetes/kubernetes.list $FILESYSTEM_ROOT/etc/apt/sources.list.d/
+    sudo LANG=C chroot $FILESYSTEM_ROOT apt-get update
+    sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install kubernetes-cni=${KUBERNETES_CNI_VERSION}
+    sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install kubelet=${ver}
+    sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install kubectl=${ver}
+    sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install kubeadm=${ver}
 }
 
 if [ "$INCLUDE_KUBERNETES" == "y" ]
@@ -307,7 +295,18 @@ then
     echo '[INFO] Install kubernetes master'
     install_kubernetes ${MASTER_KUBERNETES_VERSION}
 
-    sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install hyperv-daemons xmlstarlet parted netcat-openbsd
+    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 -
+    sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT curl -fsSL \
+        https://packages.microsoft.com/keys/msopentech.asc | \
+        sudo LANG=C chroot $FILESYSTEM_ROOT apt-key add -
+    echo "deb [arch=amd64] https://packages.microsoft.com/repos/azurecore-debian $IMAGE_DISTRO main" | \
+        sudo tee $FILESYSTEM_ROOT/etc/apt/sources.list.d/azure.list
+    sudo LANG=C chroot $FILESYSTEM_ROOT apt-get update
+    sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install hyperv-daemons gnupg xmlstarlet
+    sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install metricsext2
+    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
@@ -376,14 +375,14 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
     gdisk                   \
     sysfsutils              \
     squashfs-tools          \
-    $bootloader_packages    \
-    rsyslog                 \
+    grub2-common            \
     screen                  \
     hping3                  \
     tcptraceroute           \
     mtr-tiny                \
     locales                 \
     cgroup-tools            \
+    ipmitool                \
     ndisc6                  \
     makedumpfile            \
     conntrack               \
@@ -392,20 +391,21 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
     python3-pip             \
     python-is-python3       \
     cron                    \
-    libprotobuf32           \
-    libgrpc29               \
-    libgrpc++1.51           \
+    libprotobuf23           \
+    libgrpc++1              \
+    libgrpc10               \
     haveged                 \
     fdisk                   \
     gpg                     \
     jq                      \
     auditd                  \
     linux-perf              \
-    resolvconf              \
 	lsof                    \
-	sysstat                 \
-	xxd                     \
-	zstd
+	sysstat
+
+# default rsyslog version is 8.2110.0 which has a bug on log rate limit,
+# use backport version
+sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -t bullseye-backports -y install rsyslog
 
 # Have systemd create the auditd log directory
 sudo mkdir -p ${FILESYSTEM_ROOT}/etc/systemd/system/auditd.service.d
@@ -415,10 +415,6 @@ 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      \
@@ -451,6 +447,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
@@ -467,10 +471,6 @@ fi
 ## Disable kexec supported reboot which was installed by default
 sudo sed -i 's/LOAD_KEXEC=true/LOAD_KEXEC=false/' $FILESYSTEM_ROOT/etc/default/kexec
 
-# Ensure that 'logrotate-config.service' is set as a dependency to start before 'logrotate.service'.
-sudo mkdir $FILESYSTEM_ROOT/etc/systemd/system/logrotate.service.d
-sudo cp files/image_config/logrotate/logrotateOverride.conf $FILESYSTEM_ROOT/etc/systemd/system/logrotate.service.d/logrotateOverride.conf
-
 ## Remove sshd host keys, and will regenerate on first sshd start
 sudo rm -f $FILESYSTEM_ROOT/etc/ssh/ssh_host_*_key*
 sudo cp files/sshd/host-ssh-keygen.sh $FILESYSTEM_ROOT/usr/local/bin/
@@ -490,14 +490,10 @@ rm /files/etc/ssh/sshd_config/ClientAliveInterval
 rm /files/etc/ssh/sshd_config/ClientAliveCountMax
 touch /files/etc/ssh/sshd_config/EmptyLineHack
 rename /files/etc/ssh/sshd_config/EmptyLineHack ""
-set /files/etc/ssh/sshd_config/ClientAliveInterval 300
+set /files/etc/ssh/sshd_config/ClientAliveInterval 900
 set /files/etc/ssh/sshd_config/ClientAliveCountMax 0
 ins #comment before /files/etc/ssh/sshd_config/ClientAliveInterval
-set /files/etc/ssh/sshd_config/#comment[following-sibling::*[1][self::ClientAliveInterval]] "Close inactive client sessions after 5 minutes"
-rm /files/etc/ssh/sshd_config/MaxAuthTries
-set /files/etc/ssh/sshd_config/MaxAuthTries 3
-rm /files/etc/ssh/sshd_config/Banner
-set /files/etc/ssh/sshd_config/Banner /etc/issue
+set /files/etc/ssh/sshd_config/#comment[following-sibling::*[1][self::ClientAliveInterval]] "Close inactive client sessions after 15 minutes"
 rm /files/etc/ssh/sshd_config/LogLevel
 set /files/etc/ssh/sshd_config/LogLevel VERBOSE
 save
@@ -535,11 +531,13 @@ done < files/image_config/sysctl/sysctl-net.conf
 
 sudo augtool --autosave "$sysctl_net_cmd_string" -r $FILESYSTEM_ROOT
 
-# Specify that we want to explicitly install Python packages into the system environment, and risk breakages
-sudo cp files/image_config/pip/pip.conf $FILESYSTEM_ROOT/etc/pip.conf
+# Upgrade pip via PyPI and uninstall the Debian version
+sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install --upgrade pip
+sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get purge -y python3-pip
 
 # For building Python packages
-sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install python3-setuptools python3-wheel
+sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install 'setuptools==49.6.00'
+sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install 'wheel==0.35.1'
 
 # docker Python API package is needed by Ansible docker module as well as some SONiC applications
 sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install 'docker==6.1.1'
@@ -572,80 +570,20 @@ sudo cp files/dhcp/sethostname6 $FILESYSTEM_ROOT/etc/dhcp/dhclient-exit-hooks.d/
 sudo cp files/dhcp/graphserviceurl $FILESYSTEM_ROOT/etc/dhcp/dhclient-exit-hooks.d/
 sudo cp files/dhcp/snmpcommunity $FILESYSTEM_ROOT/etc/dhcp/dhclient-exit-hooks.d/
 sudo cp files/dhcp/vrf $FILESYSTEM_ROOT/etc/dhcp/dhclient-exit-hooks.d/
-if [ -f files/image_config/ntp/ntpsec ]; then
-    sudo cp ./files/image_config/ntp/ntpsec $FILESYSTEM_ROOT/etc/init.d/
+if [ -f files/image_config/ntp/ntp ]; then
+    sudo cp ./files/image_config/ntp/ntp $FILESYSTEM_ROOT/etc/init.d/
 fi
 
 if [ -f files/image_config/ntp/ntp-systemd-wrapper ]; then
-    sudo cp ./files/image_config/ntp/ntp-systemd-wrapper $FILESYSTEM_ROOT/usr/libexec/ntpsec/
+    sudo mkdir -p $FILESYSTEM_ROOT/usr/lib/ntp/
+    sudo cp ./files/image_config/ntp/ntp-systemd-wrapper $FILESYSTEM_ROOT/usr/lib/ntp/
 fi
 
-## Version file part 1
+## Version file
 sudo mkdir -p $FILESYSTEM_ROOT/etc/sonic
 if [ -f files/image_config/sonic_release ]; then
     sudo cp files/image_config/sonic_release $FILESYSTEM_ROOT/etc/sonic/
 fi
-
-# Default users info
-export password_expire="$( [[ "$CHANGE_DEFAULT_PASSWORD" == "y" ]] && echo true || echo false )"
-export username="${USERNAME}"
-export password="$(sudo grep ^${USERNAME} $FILESYSTEM_ROOT/etc/shadow | cut -d: -f2)"
-j2 files/build_templates/default_users.json.j2 | sudo tee $FILESYSTEM_ROOT/etc/sonic/default_users.json
-sudo LANG=c chroot $FILESYSTEM_ROOT chmod 600 /etc/sonic/default_users.json
-sudo LANG=c chroot $FILESYSTEM_ROOT chown root:shadow /etc/sonic/default_users.json
-
-## Copy over clean-up script
-sudo cp ./files/scripts/core_cleanup.py $FILESYSTEM_ROOT/usr/bin/core_cleanup.py
-
-## Copy ASIC config checksum
-sudo chmod 755 files/build_scripts/generate_asic_config_checksum.py
-./files/build_scripts/generate_asic_config_checksum.py
-if [[ ! -f './asic_config_checksum' ]]; then
-    echo 'asic_config_checksum not found'
-    exit 1
-fi
-sudo cp ./asic_config_checksum $FILESYSTEM_ROOT/etc/sonic/asic_config_checksum
-
-## Check if not a last stage of RFS build
-fi
-
-if [[ $RFS_SPLIT_FIRST_STAGE == y ]]; then
-    echo '[INFO] Finished with RFS first stage'
-    echo '[INFO] Umount all'
-
-    ## Display all process details access /proc
-    sudo LANG=C chroot $FILESYSTEM_ROOT fuser -vm /proc
-    ## Kill the processes
-    sudo LANG=C chroot $FILESYSTEM_ROOT fuser -km /proc || true
-    ## Wait fuser fully kill the processes
-    sudo timeout 15s bash -c 'until LANG=C chroot $0 umount /proc; do sleep 1; done' $FILESYSTEM_ROOT || true
-
-    sudo rm -f $TARGET_PATH/$RFS_SQUASHFS_NAME
-    sudo mksquashfs $FILESYSTEM_ROOT $TARGET_PATH/$RFS_SQUASHFS_NAME -Xcompression-level 1
-
-    exit 0
-fi
-
-if [[ $RFS_SPLIT_LAST_STAGE == y ]]; then
-    echo '[INFO] RFS build: second stage'
-
-    ## ensure proc is mounted
-    sudo mount proc /proc -t proc || true
-
-    sudo fuser -vm $FILESYSTEM_ROOT || true
-    sudo rm -rf $FILESYSTEM_ROOT
-    sudo unsquashfs -d $FILESYSTEM_ROOT $TARGET_PATH/$RFS_SQUASHFS_NAME
-
-    ## make / as a mountpoint in chroot env, needed by dockerd
-    pushd $FILESYSTEM_ROOT
-    sudo mount --bind . .
-    popd
-
-    trap_push 'sudo LANG=C chroot $FILESYSTEM_ROOT umount /proc || true'
-    sudo LANG=C chroot $FILESYSTEM_ROOT mount proc /proc -t proc
-fi
-
-## Version file part 2
 export build_version="${SONIC_IMAGE_VERSION}"
 export debian_version="$(cat $FILESYSTEM_ROOT/etc/debian_version)"
 export kernel_version="${kversion}"
@@ -660,6 +598,18 @@ export built_by="$USER@$BUILD_HOSTNAME"
 export sonic_os_version="${SONIC_OS_VERSION}"
 j2 files/build_templates/sonic_version.yml.j2 | sudo tee $FILESYSTEM_ROOT/etc/sonic/sonic_version.yml
 
+## Copy over clean-up script
+sudo cp ./files/scripts/core_cleanup.py $FILESYSTEM_ROOT/usr/bin/core_cleanup.py
+
+## Copy ASIC config checksum
+sudo chmod 755 files/build_scripts/generate_asic_config_checksum.py
+./files/build_scripts/generate_asic_config_checksum.py
+if [[ ! -f './asic_config_checksum' ]]; then
+    echo 'asic_config_checksum not found'
+    exit 1
+fi
+sudo cp ./asic_config_checksum $FILESYSTEM_ROOT/etc/sonic/asic_config_checksum
+
 if [ -f sonic_debian_extension.sh ]; then
     ./sonic_debian_extension.sh $FILESYSTEM_ROOT $PLATFORM_DIR $IMAGE_DISTRO
 fi
@@ -763,27 +713,14 @@ sudo chroot $FILESYSTEM_ROOT update-initramfs -u
 ## Convert initrd image to u-boot format
 if [[ $TARGET_BOOTLOADER == uboot ]]; then
     INITRD_FILE=initrd.img-${LINUX_KERNEL_VERSION}-${CONFIGURED_ARCH}
-    KERNEL_FILE=vmlinuz-${LINUX_KERNEL_VERSION}-${CONFIGURED_ARCH}
     if [[ $CONFIGURED_ARCH == armhf ]]; then
         INITRD_FILE=initrd.img-${LINUX_KERNEL_VERSION}-armmp
         sudo LANG=C chroot $FILESYSTEM_ROOT mkimage -A arm -O linux -T ramdisk -C gzip -d /boot/$INITRD_FILE /boot/u${INITRD_FILE}
         ## Overwriting the initrd image with uInitrd
         sudo LANG=C chroot $FILESYSTEM_ROOT mv /boot/u${INITRD_FILE} /boot/$INITRD_FILE
     elif [[ $CONFIGURED_ARCH == arm64 ]]; then
-        if [[ $CONFIGURED_PLATFORM == pensando ]]; then
-            ## copy device tree file into boot (XXX: need to compile dtb from dts)
-            sudo cp -v $PLATFORM_DIR/pensando/elba-asic-psci.dtb $FILESYSTEM_ROOT/boot/
-            ## make kernel as gzip file
-            sudo LANG=C chroot $FILESYSTEM_ROOT gzip /boot/${KERNEL_FILE}
-            sudo LANG=C chroot $FILESYSTEM_ROOT mv /boot/${KERNEL_FILE}.gz /boot/${KERNEL_FILE}
-            ## Convert initrd image to u-boot format
-            sudo LANG=C chroot $FILESYSTEM_ROOT mkimage -A arm64 -O linux -T ramdisk -C gzip -d /boot/$INITRD_FILE /boot/u${INITRD_FILE}
-            ## Overwriting the initrd image with uInitrd
-            sudo LANG=C chroot $FILESYSTEM_ROOT mv /boot/u${INITRD_FILE} /boot/$INITRD_FILE
-        else
-            sudo cp -v $PLATFORM_DIR/${sonic_asic_platform}-${CONFIGURED_ARCH}/sonic_fit.its $FILESYSTEM_ROOT/boot/
-            sudo LANG=C chroot $FILESYSTEM_ROOT mkimage -f /boot/sonic_fit.its /boot/sonic_${CONFIGURED_ARCH}.fit
-        fi
+        sudo cp -v $PLATFORM_DIR/${sonic_asic_platform}-${CONFIGURED_ARCH}/sonic_fit.its $FILESYSTEM_ROOT/boot/
+        sudo LANG=C chroot $FILESYSTEM_ROOT mkimage -f /boot/sonic_fit.its /boot/sonic_${CONFIGURED_ARCH}.fit
     fi
 fi
 
@@ -818,7 +755,8 @@ sudo LANG=C chroot $FILESYSTEM_ROOT fuser -vm /proc
 ## Kill the processes
 sudo LANG=C chroot $FILESYSTEM_ROOT fuser -km /proc || true
 ## Wait fuser fully kill the processes
-sudo timeout 15s bash -c 'until LANG=C chroot $0 umount /proc; do sleep 1; done' $FILESYSTEM_ROOT || true
+sleep 15
+sudo LANG=C chroot $FILESYSTEM_ROOT umount /proc || true
 
 ## Prepare empty directory to trigger mount move in initramfs-tools/mount_loop_root, implemented by patching
 sudo mkdir $FILESYSTEM_ROOT/host
@@ -834,32 +772,14 @@ if [[ "$CHANGE_DEFAULT_PASSWORD" == "y" ]]; then
 fi
 
 ## Compress most file system into squashfs file
-sudo rm -f $INSTALLER_PAYLOAD $FILESYSTEM_SQUASHFS
+sudo rm -f $ONIE_INSTALLER_PAYLOAD $FILESYSTEM_SQUASHFS
 ## Output the file system total size for diag purpose
 ## Note: -x to skip directories on different file systems, such as /proc
 sudo du -hsx $FILESYSTEM_ROOT
 sudo mkdir -p $FILESYSTEM_ROOT/var/lib/docker
-
-## Clear DNS configuration inherited from the build server
-sudo rm -f $FILESYSTEM_ROOT/etc/resolvconf/resolv.conf.d/original
-sudo cp files/image_config/resolv-config/resolv.conf.head $FILESYSTEM_ROOT/etc/resolvconf/resolv.conf.d/head
-
-## 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 cp files/image_config/resolv-config/resolv.conf $FILESYSTEM_ROOT/etc/resolv.conf
 sudo mksquashfs $FILESYSTEM_ROOT $FILESYSTEM_SQUASHFS -comp zstd -b 1M -e boot -e var/lib/docker -e $PLATFORM_DIR
 
-## Reduce /boot permission
-sudo chmod -R go-wx $FILESYSTEM_ROOT/boot
-
 # Ensure admin gid is 1000
 gid_user=$(sudo LANG=C chroot $FILESYSTEM_ROOT id -g $USERNAME) || gid_user="none"
 if [ "${gid_user}" != "1000" ]; then
@@ -879,5 +799,5 @@ fi
 pushd $FILESYSTEM_ROOT && sudo tar -I $GZ_COMPRESS_PROGRAM -cf $OLDPWD/$FILESYSTEM_DOCKERFS -C ${DOCKERFS_PATH}var/lib/docker .; popd
 
 ## Compress together with /boot, /var/lib/docker and $PLATFORM_DIR as an installer payload zip file
-pushd $FILESYSTEM_ROOT && sudo tar -I $GZ_COMPRESS_PROGRAM -cf platform.tar.gz -C $PLATFORM_DIR . && sudo zip -n .gz $OLDPWD/$INSTALLER_PAYLOAD -r boot/ platform.tar.gz; popd
-sudo zip -g -n .squashfs:.gz $INSTALLER_PAYLOAD $FILESYSTEM_SQUASHFS $FILESYSTEM_DOCKERFS
+pushd $FILESYSTEM_ROOT && sudo tar -I $GZ_COMPRESS_PROGRAM -cf platform.tar.gz -C $PLATFORM_DIR . && sudo zip -n .gz $OLDPWD/$ONIE_INSTALLER_PAYLOAD -r boot/ platform.tar.gz; popd
+sudo zip -g -n .squashfs:.gz $ONIE_INSTALLER_PAYLOAD $FILESYSTEM_SQUASHFS $FILESYSTEM_DOCKERFS

build_image.sh

@@ -18,8 +18,8 @@ fi
     echo "Error: Invalid ONIE_IMAGE_PART_SIZE in onie image config file"
     exit 1
 }
-[ -n "$INSTALLER_PAYLOAD" ] || {
-    echo "Error: Invalid INSTALLER_PAYLOAD in onie image config file"
+[ -n "$ONIE_INSTALLER_PAYLOAD" ] || {
+    echo "Error: Invalid ONIE_INSTALLER_PAYLOAD in onie image config file"
     exit 1
 }
 
@@ -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 \
-          $INSTALLER_PAYLOAD $SECURE_UPGRADE_SIGNING_CERT $SECURE_UPGRADE_DEV_SIGNING_KEY
+          $ONIE_INSTALLER_PAYLOAD $SECURE_UPGRADE_SIGNING_CERT $SECURE_UPGRADE_DEV_SIGNING_KEY
 }
 
 # Generate asic-specific device list
@@ -139,11 +139,7 @@ elif [ "$IMAGE_TYPE" = "raw" ]; then
     ## Run the installer
     ## The 'build' install mode of the installer is used to generate this dump.
     sudo chmod a+x $tmp_output_onie_image
-    sudo ./$tmp_output_onie_image || {
-        ## Failure during 'build' install mode of the installer results in an incomplete raw image.
-        ## Delete the incomplete raw image.
-        sudo rm -f $OUTPUT_RAW_IMAGE
-    }
+    sudo ./$tmp_output_onie_image
     rm $tmp_output_onie_image
 
     [ -r $OUTPUT_RAW_IMAGE ] || {
@@ -151,7 +147,15 @@ elif [ "$IMAGE_TYPE" = "raw" ]; then
         exit 1
     }
 
-    echo "The raw image is in $OUTPUT_RAW_IMAGE"
+    $GZ_COMPRESS_PROGRAM $OUTPUT_RAW_IMAGE
+
+    [ -r $OUTPUT_RAW_IMAGE.gz ] || {
+        echo "Error : $GZ_COMPRESS_PROGRAM $OUTPUT_RAW_IMAGE failed!"
+        exit 1
+    }
+
+    mv $OUTPUT_RAW_IMAGE.gz $OUTPUT_RAW_IMAGE
+    echo "The compressed raw image is in $OUTPUT_RAW_IMAGE"
 
 elif [ "$IMAGE_TYPE" = "kvm" ]; then
 
@@ -175,7 +179,7 @@ elif [ "$IMAGE_TYPE" = "aboot" ]; then
     sudo rm -f $OUTPUT_ABOOT_IMAGE
     sudo rm -f $ABOOT_BOOT_IMAGE
     ## Add main payload
-    cp $INSTALLER_PAYLOAD $OUTPUT_ABOOT_IMAGE
+    cp $ONIE_INSTALLER_PAYLOAD $OUTPUT_ABOOT_IMAGE
     ## Add Aboot boot0 file
     j2 -f env files/Aboot/boot0.j2 ./onie-image.conf > files/Aboot/boot0
     sed -i -e "s/%%IMAGE_VERSION%%/$IMAGE_VERSION/g" files/Aboot/boot0
@@ -213,38 +217,6 @@ elif [ "$IMAGE_TYPE" = "aboot" ]; then
         [ -f "$CA_CERT" ] && cp "$CA_CERT" "$TARGET_CA_CERT"
         ./scripts/sign_image.sh -i "$OUTPUT_ABOOT_IMAGE" -k "$SIGNING_KEY" -c "$SIGNING_CERT" -a "$TARGET_CA_CERT"
     fi
-
-elif [ "$IMAGE_TYPE" = "dsc" ]; then
-    echo "Build DSC installer"
-
-    dsc_installer_dir=files/dsc
-    dsc_installer=$dsc_installer_dir/install_debian
-    dsc_installer_manifest=$dsc_installer_dir/MANIFEST
-
-    mkdir -p `dirname $OUTPUT_DSC_IMAGE`
-    sudo rm -f $OUTPUT_DSC_IMAGE
-
-    source ./onie-image.conf
-
-    j2 $dsc_installer.j2 > $dsc_installer
-    export installer_sha=$(sha512sum "$dsc_installer" | awk '{print $1}')
-
-    export build_date=$(date -u)
-    export build_user=$(id -un)
-    export installer_payload_sha=$(sha512sum "$INSTALLER_PAYLOAD" | awk '{print $1}')
-    j2 $dsc_installer_manifest.j2 > $dsc_installer_manifest
-
-    cp $INSTALLER_PAYLOAD $dsc_installer_dir
-    tar cf $OUTPUT_DSC_IMAGE -C files/dsc $(basename $dsc_installer_manifest) $INSTALLER_PAYLOAD $(basename $dsc_installer)
-
-    echo "Build ONIE installer"
-    mkdir -p `dirname $OUTPUT_ONIE_IMAGE`
-    sudo rm -f $OUTPUT_ONIE_IMAGE
-
-    generate_device_list "./installer/platforms_asic"
-
-    generate_onie_installer_image
-
 else
     echo "Error: Non supported image type $IMAGE_TYPE"
     exit 1

device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/hwsku.json

@@ -0,0 +1,132 @@
+{
+    "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+"
+        }
+    }
+}

device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/port_config.ini

@@ -1,36 +1,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
+# 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

device/arista/x86_64-arista_7050dx4_32s/pcie.yaml

@@ -152,6 +152,11 @@
   id: '1466'
   name: 'Host bridge: Advanced Micro Devices, Inc. [AMD] Family 17h (Models 00h-0fh)
     Data Fabric: Device 18h; Function 6'
+- bus: '00'
+  dev: '18'
+  fn: '7'
+  id: '0001'
+  name: 'Host bridge: Arastra Inc. Device 0001'
 - bus: '01'
   dev: '00'
   fn: '0'

device/arista/x86_64-arista_7050px4_32s/pcie.yaml

@@ -152,6 +152,11 @@
   id: '1466'
   name: 'Host bridge: Advanced Micro Devices, Inc. [AMD] Family 17h (Models 00h-0fh)
     Data Fabric: Device 18h; Function 6'
+- bus: '00'
+  dev: '18'
+  fn: '7'
+  id: '0001'
+  name: 'Host bridge: Arastra Inc. Device 0001'
 - bus: '01'
   dev: '00'
   fn: '0'

device/arista/x86_64-arista_7050sx3_48c8/pcie.yaml

@@ -64,6 +64,11 @@
   id: '1578'
   name: 'Encryption controller: Advanced Micro Devices, Inc. [AMD] Carrizo Platform
     Security Processor'
+- bus: '00'
+  dev: 09
+  fn: '0'
+  id: '0001'
+  name: 'Host bridge: Arastra Inc. Device 0001'
 - bus: '00'
   dev: 09
   fn: '2'

device/arista/x86_64-arista_7050sx3_48yc8/pcie.yaml

@@ -64,6 +64,11 @@
   id: '1578'
   name: 'Encryption controller: Advanced Micro Devices, Inc. [AMD] Carrizo Platform
     Security Processor'
+- bus: '00'
+  dev: 09
+  fn: '0'
+  id: '0001'
+  name: 'Host bridge: Arastra Inc. Device 0001'
 - bus: '00'
   dev: 09
   fn: '2'

device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/th-a7060-cx32s-32x40G-t1.config.bcm

@@ -449,4 +449,3 @@ serdes_preemphasis_109=0x145c00
 
 mmu_init_config="MSFT-TH-Tier1"
 phy_an_lt_msft=1
-phy_unlos_msft=1

device/arista/x86_64-arista_7060dx4_32/Arista-7060DX4-C32/th3-a7060dx4-c32-32x400G.config.bcm

@@ -16,8 +16,6 @@ miim_intr_enable.0=0
 module_64ports.0=1
 multicast_l2_range.0=511
 oversubscribe_mode=1
-sai_tunnel_global_sip_mask_enable=1
-bcm_tunnel_term_compatible_mode=1
 parity_correction=1
 parity_enable=1
 pbmp_xport_xe.0=0x3ffffffffffffffffffffffffffffffffffffffe

device/arista/x86_64-arista_7060dx4_32/pcie.yaml

@@ -186,6 +186,11 @@
   id: 6f37
   name: 'Performance counters: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D R3 QPI Link 0/1 (rev 03)'
+- bus: ff
+  dev: 0b
+  fn: '3'
+  id: '0001'
+  name: 'System peripheral: Arastra Inc. Device 0001 (rev 03)'
 - bus: ff
   dev: 0c
   fn: '0'

device/arista/x86_64-arista_7060dx4_32/th3-a7060dx4-32-flex.config.bcm

@@ -16,8 +16,6 @@ miim_intr_enable.0=0
 module_64ports.0=1
 multicast_l2_range.0=511
 oversubscribe_mode=1
-sai_tunnel_global_sip_mask_enable=1
-bcm_tunnel_term_compatible_mode=1
 parity_correction=1
 parity_enable=1
 pbmp_xport_xe.0=0x3ffffffffffffffffffffffffffffffffffffffe

device/arista/x86_64-arista_7060dx5_32/pcie.yaml

@@ -1 +0,0 @@
-../x86_64-arista_common/pcie.yaml

device/arista/x86_64-arista_7060dx5_64s/Arista-7060DX5-64S/hwsku.json

@@ -255,14 +255,6 @@
         "Ethernet504": {
             "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]",
             "fec": "rs"
-        },
-        "Ethernet512": {
-            "default_brkout_mode": "1x10G",
-            "fec": "none"
-        },
-        "Ethernet513": {
-            "default_brkout_mode": "1x10G",
-            "fec": "none"
         }
     }
 }

device/arista/x86_64-arista_7060dx5_64s/Arista-7060DX5-64S/port_config.ini

@@ -63,5 +63,3 @@ Ethernet480     237,238,239,240,241,242,243,244 Ethernet61/1 61     400000    rs
 Ethernet488     229,230,231,232,233,234,235,236 Ethernet62/1 62     400000    rs
 Ethernet496     249,250,251,252,253,254,255,256 Ethernet63/1 63     400000    rs
 Ethernet504     245,246,247,248,249,250,251,252 Ethernet64/1 64     400000    rs
-Ethernet512     258                             Ethernet65   65     10000     none
-Ethernet513     257                             Ethernet66   66     10000     none

device/arista/x86_64-arista_7060dx5_64s/Arista-7060DX5-64S/th4-a7060dx5-64s.config.bcm

@@ -34,7 +34,7 @@ bcm_device:
             sai_field_group_auto_prioritize: 1
             #l3_intf_vlan_split_egress for MTU at L3IF
             l3_intf_vlan_split_egress : 1
-            bcm_tunnel_term_compatible_mode: 1
+
 ---
 device:
     0:
@@ -1073,14 +1073,6 @@ device:
                 PORT_ID: 258
             :
                 PC_PHYS_PORT_ID: 253
-            ?
-                PORT_ID: 152
-            :
-                PC_PHYS_PORT_ID: 257
-            ?
-                PORT_ID: 50
-            :
-                PC_PHYS_PORT_ID: 258
 ...
 ---
 device:
@@ -1093,13 +1085,6 @@ device:
                 ENABLE: 1
                 SPEED: 10000
                 NUM_LANES: 1
-            ?
-                PORT_ID: [[50, 50], [152, 152]]
-            :
-                ENABLE: 1
-                MAX_FRAME_SIZE: 9416
-                SPEED: 10000
-                NUM_LANES: 1
             ?
                 PORT_ID: [[1, 4],
                           [17, 20],
@@ -1118,7 +1103,7 @@ device:
                           [238, 241],
                           [255, 258]]
             :
-                ENABLE: 0
+                ENABLE: 1
                 SPEED: 400000
                 NUM_LANES: 8
                 FEC_MODE: PC_FEC_RS544_2XN

device/arista/x86_64-arista_7060dx5_64s/pcie.yaml

@@ -1 +0,0 @@
-../x86_64-arista_common/pcie.yaml

device/arista/x86_64-arista_7060dx5_64s/platform.json

@@ -49,52 +49,52 @@
         ],
         "thermals": [
             {
-                "name": "Board sensor",
-                "controllable": false
+                "name": "Cpu temp sensor"
             },
             {
-                "name": "TH4 exhaust temp sensor",
-                "controllable": false
+                "name": "CPU board temp sensor"
             },
             {
-                "name": "Inlet temp sensor",
-                "controllable": false
+                "name": "Back-panel temp sensor"
             },
             {
-                "name": "CPU board temp sensor",
-                "controllable": false
+                "name": "Board sensor"
             },
             {
-                "name": "Back panel temp sensor",
-                "controllable": false
+                "name": "Switch board middle sensor"
             },
             {
-                "name": "Front panel temp sensor",
-                "controllable": false
+                "name": "Switch board left sensor"
             },
             {
-                "name": "Power supply 1 hotspot sensor",
-                "controllable": false
+                "name": "Front-panel temp sensor"
             },
             {
-                "name": "Power supply 1 inlet temp sensor",
-                "controllable": false
+                "name": "Switch chip diode 1 sensor"
             },
             {
-                "name": "Power supply 1 exhaust temp sensor",
-                "controllable": false
+                "name": "Switch chip diode 2 sensor"
             },
             {
-                "name": "Power supply 2 hotspot sensor",
-                "controllable": false
+                "name": "Front-panel temp sensor"
             },
             {
-                "name": "Power supply 2 inlet temp sensor",
-                "controllable": false
+                "name": "Power supply 1 inlet temp sensor"
             },
             {
-                "name": "Power supply 2 exhaust temp sensor",
-                "controllable": false
+                "name": "Power supply 1 secondary hotspot sensor"
+            },
+            {
+                "name": "Power supply 1 primary hotspot sensor"
+            },
+            {
+                "name": "Power supply 2 inlet temp sensor"
+            },
+            {
+                "name": "Power supply 2 secondary hotspot sensor"
+            },
+            {
+                "name": "Power supply 2 primary hotspot sensor"
             }
         ],
         "sfps": [
@@ -2154,24 +2154,6 @@
                     "Ethernet64/8"
                 ]
             }
-        },
-        "Ethernet512": {
-            "index": "65",
-            "lanes": "258",
-            "breakout_modes": {
-                "1x10G": [
-                    "Ethernet65"
-                ]
-            }
-        },
-        "Ethernet513": {
-            "index": "66",
-            "lanes": "257",
-            "breakout_modes": {
-                "1x10G": [
-                    "Ethernet66"
-                ]
-            }
         }
     }
 }

device/arista/x86_64-arista_7060px4_32/Arista-7060PX4-C64/th3-a7060px4-32-64x100G.config.bcm

@@ -20,8 +20,6 @@ miim_intr_enable.0=0
 module_64ports.0=1
 multicast_l2_range.0=511
 oversubscribe_mode=1
-sai_tunnel_global_sip_mask_enable=1
-bcm_tunnel_term_compatible_mode=1
 parity_correction=1
 parity_enable=1
 pbmp_xport_xe.0=0x3ffffffffffffffffffffffffffffffffffffffe

device/arista/x86_64-arista_7060px4_32/Arista-7060PX4-O32/th3-a7060px4-o32-32x400G.config.bcm

@@ -20,8 +20,6 @@ miim_intr_enable.0=0
 module_64ports.0=1
 multicast_l2_range.0=511
 oversubscribe_mode=1
-sai_tunnel_global_sip_mask_enable=1
-bcm_tunnel_term_compatible_mode=1
 parity_correction=1
 parity_enable=1
 pbmp_xport_xe.0=0x3ffffffffffffffffffffffffffffffffffffffe

device/arista/x86_64-arista_7060px4_32/pcie.yaml

@@ -186,6 +186,11 @@
   id: 6f37
   name: 'Performance counters: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D R3 QPI Link 0/1 (rev 03)'
+- bus: ff
+  dev: 0b
+  fn: '3'
+  id: '0001'
+  name: 'System peripheral: Arastra Inc. Device 0001 (rev 03)'
 - bus: ff
   dev: 0c
   fn: '0'

device/arista/x86_64-arista_7060px4_32/th3-a7060px4-32-flex.config.bcm

@@ -16,8 +16,6 @@ miim_intr_enable.0=0
 module_64ports.0=1
 multicast_l2_range.0=511
 oversubscribe_mode=1
-sai_tunnel_global_sip_mask_enable=1
-bcm_tunnel_term_compatible_mode=1
 parity_correction=1
 parity_enable=1
 pbmp_xport_xe.0=0x3ffffffffffffffffffffffffffffffffffffffe

device/arista/x86_64-arista_7060px5_64s/Arista-7060PX5-64S/blackhawk.xml

@@ -4,6 +4,12 @@
   <phy_addr>0</phy_addr>
   <mode>retimer</mode>
   <topology>1</topology>
+  <tx-taps>
+      <PAM4>2,-8,17,0,0</PAM4>
+      <NRZ>0,-8,17,0,0</NRZ>
+   </tx-taps>
+   <tx-taps-scale>0,0,1,0,0</tx-taps-scale>
+
   <lane id="0" tx-polarity="0" rx-polarity="0" />
   <lane id="1" tx-polarity="0" rx-polarity="0" />
   <lane id="2" tx-polarity="0" rx-polarity="0" />
@@ -20,23 +26,4 @@
   <lane id="13" tx-polarity="0" rx-polarity="0" />
   <lane id="14" tx-polarity="0" rx-polarity="0" />
   <lane id="15" tx-polarity="0" rx-polarity="0" />
-
-  <PAM4>
-    <lane id="0" tx-taps="0,0,-8,117,-2,0,0"/>
-    <lane id="1" tx-taps="0,0,-8,117,-2,0,0"/>
-    <lane id="2" tx-taps="0,0,-8,117,-2,0,0"/>
-    <lane id="3" tx-taps="0,0,-8,117,-2,0,0"/>
-    <lane id="4" tx-taps="0,0,-8,117,-2,0,0"/>
-    <lane id="5" tx-taps="0,0,-8,117,-2,0,0"/>
-    <lane id="6" tx-taps="0,0,-8,117,-2,0,0"/>
-    <lane id="7" tx-taps="0,0,-8,117,-2,0,0"/>
-    <lane id="8" tx-taps="0,10,-22,93,-2,0,0"/>
-    <lane id="9" tx-taps="0,10,-22,93,-2,0,0"/>
-    <lane id="10" tx-taps="0,10,-22,93,-2,0,0"/>
-    <lane id="11" tx-taps="0,10,-22,93,-2,0,0"/>
-    <lane id="12" tx-taps="0,10,-22,93,-2,0,0"/>
-    <lane id="13" tx-taps="0,10,-22,93,-2,0,0"/>
-    <lane id="14" tx-taps="0,10,-22,93,-2,0,0"/>
-    <lane id="15" tx-taps="0,10,-22,93,-2,0,0"/>
-  </PAM4>
 </root>

device/arista/x86_64-arista_7060px5_64s/pcie.yaml

@@ -1 +0,0 @@
-../x86_64-arista_common/pcie.yaml

device/arista/x86_64-arista_7060px5_64s/sensors.conf

@@ -7,15 +7,20 @@ bus "i2c-23" "SCD 0000:01:00.0 SMBus master 1 bus 4"
 bus "i2c-24" "SCD 0000:01:00.0 SMBus master 1 bus 5"
 bus "i2c-107" "SCD 0000:00:18.7 SMBus master 0 bus 0"
 
-chip "tmp464-i2c-19-48"
+chip "max6581-i2c-19-4d"
     label temp1 "Board sensor"
     label temp2 "TH4 exhaust temp sensor"
-    label temp3 "Inlet temp sensor"
+    label temp3 "Left edge PCB rear temp sensor"
+    label temp4 "Inlet temp sensor"
+    ignore temp5
+    ignore temp6
+    label temp7 "Diode temp sensor 1"
+    label temp8 "Diode temp sensor 2"
 
 chip "dps800-i2c-22-58"
     label temp1 "Power supply 1 hotspot sensor"
     label temp2 "Power supply 1 inlet temp sensor"
-    ignore temp3 "Power supply 1 exhaust temp sensor"
+    label temp3 "Power supply 1 exhaust temp sensor"
 
 chip "dps800-i2c-23-58"
     label temp1 "Power supply 2 hotspot sensor"

device/arista/x86_64-arista_7170_32cd/pcie.yaml

@@ -186,6 +186,11 @@
   id: 6f37
   name: 'Performance counters: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D R3 QPI Link 0/1 (rev 03)'
+- bus: ff
+  dev: 0b
+  fn: '3'
+  id: '0001'
+  name: 'System peripheral: Arastra Inc. Device 0001 (rev 03)'
 - bus: ff
   dev: 0c
   fn: '0'

device/arista/x86_64-arista_7170_64c/pcie.yaml

@@ -174,6 +174,11 @@
   id: 6f37
   name: 'Performance counters: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D R3 QPI Link 0/1 (rev 03)'
+- bus: ff
+  dev: 0b
+  fn: '3'
+  id: '0001'
+  name: 'System peripheral: Arastra Inc. Device 0001 (rev 03)'
 - bus: ff
   dev: 0c
   fn: '0'

device/arista/x86_64-arista_720dt_48s/pcie.yaml

@@ -90,6 +90,11 @@
   id: 15ee
   name: 'Host bridge: Advanced Micro Devices, Inc. [AMD] Raven/Raven2 Device 24: Function
     6'
+- bus: '00'
+  dev: '18'
+  fn: '7'
+  id: '0001'
+  name: 'Host bridge: Arista Networks, Inc. Device 0001'
 - bus: '01'
   dev: '00'
   fn: '0'

device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/config.bcm.j2

@@ -14,7 +14,8 @@
 {%-         set switch_subtype = DEVICE_METADATA['localhost']['subtype'] -%}
 {%-         if 'dualtor' in switch_subtype.lower() %}
 {%-             set IPinIP_sock =
-'sai_tunnel_underlay_route_mode=1
+'sai_tunnel_support=1
+sai_tunnel_underlay_route_mode=1
 host_as_route_disable=1
 l3_ecmp_levels=2' -%}
 {%-             set map_prio = 'sai_remap_prio_on_tnl_egress=1' -%}
@@ -1048,6 +1049,5 @@ serdes_preemphasis_116=0x103706
 serdes_preemphasis_117=0x133c06
 
 {{ mmu_sock }}
-sai_tunnel_support=1
 {{ IPinIP_sock }}
 phy_an_lt_msft=1

device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C10/config.bcm.j2

@@ -6,7 +6,8 @@
 {%-     set switch_subtype = DEVICE_METADATA['localhost']['subtype'] -%}
 {%-     if 'dualtor' in switch_subtype.lower() %}
 {%-         set IPinIP_sock =
-'sai_tunnel_underlay_route_mode=1
+'sai_tunnel_support=1
+sai_tunnel_underlay_route_mode=1
 host_as_route_disable=1
 l3_ecmp_levels=2' -%}
 {%-         set map_prio = 'sai_remap_prio_on_tnl_egress=1' -%}
@@ -955,6 +956,5 @@ serdes_preemphasis_130=0x580c
 serdes_preemphasis_131=0x580c
 
 mmu_init_config="MSFT-TH2-Tier0"
-sai_tunnel_support=1
 {{ IPinIP_sock }}
 phy_an_lt_msft=1

device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/config.bcm.j2

@@ -6,7 +6,8 @@
 {%-     set switch_subtype = DEVICE_METADATA['localhost']['subtype'] -%}
 {%-     if 'dualtor' in switch_subtype.lower() %}
 {%-         set IPinIP_sock =
-'sai_tunnel_underlay_route_mode=1
+'sai_tunnel_support=1
+sai_tunnel_underlay_route_mode=1
 host_as_route_disable=1
 l3_ecmp_levels=2' -%}
 {%-         set map_prio = 'sai_remap_prio_on_tnl_egress=1' -%}
@@ -959,6 +960,5 @@ serdes_preemphasis_130=0x580c
 serdes_preemphasis_131=0x580c
 
 mmu_init_config="MSFT-TH2-Tier0"
-sai_tunnel_support=1
 {{ IPinIP_sock }}
 phy_an_lt_msft=1

device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/config.bcm.j2

@@ -14,7 +14,8 @@
 {%-         set switch_subtype = DEVICE_METADATA['localhost']['subtype'] -%}
 {%-         if 'dualtor' in switch_subtype.lower() %}
 {%-             set IPinIP_sock =
-'sai_tunnel_underlay_route_mode=1
+'sai_tunnel_support=1
+sai_tunnel_underlay_route_mode=1
 host_as_route_disable=1
 l3_ecmp_levels=2' -%}
 {%-             set map_prio = 'sai_remap_prio_on_tnl_egress=1' -%}
@@ -1047,6 +1048,5 @@ serdes_preemphasis_116=0x105004
 serdes_preemphasis_117=0x105004
 
 {{ mmu_sock }}
-sai_tunnel_support=1
 {{ IPinIP_sock }}
 phy_an_lt_msft=1

device/arista/x86_64-arista_7260cx3_64/pcie.yaml

@@ -173,6 +173,11 @@
   id: 6f37
   name: 'Performance counters: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D R3 QPI Link 0/1 (rev 03)'
+- bus: ff
+  dev: 0b
+  fn: '3'
+  id: '0001'
+  name: 'System peripheral: Arastra Inc. Device 0001 (rev 03)'
 - bus: ff
   dev: 0c
   fn: '0'

device/arista/x86_64-arista_7280cr3_32p4/pcie.yaml

@@ -64,6 +64,11 @@
   id: '1578'
   name: 'Encryption controller: Advanced Micro Devices, Inc. [AMD] Carrizo Platform
     Security Processor'
+- bus: '00'
+  dev: 09
+  fn: '0'
+  id: '0001'
+  name: 'Host bridge: Arista Networks, Inc. Device 0001'
 - bus: '00'
   dev: 09
   fn: '2'

device/arista/x86_64-arista_7280cr3_32p4/platform_env.conf

@@ -1,2 +1 @@
-SYNCD_SHM_SIZE=1gb
 usemsi=1

device/arista/x86_64-arista_7800_sup/pcie.yaml

@@ -1 +0,0 @@
-../x86_64-arista_common/pcie.yaml

device/arista/x86_64-arista_7800r3_48cq2_lc/Arista-7800R3-48CQ2-C48/jr2-a7280cr3-32d4-40x100G.config.bcm

@@ -860,5 +860,3 @@ 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_default_cpu_tx_tc=7
-sai_disable_srcmacqedstmac_ctrl=1

device/arista/x86_64-arista_7800r3_48cq2_lc/pcie.yaml

@@ -152,6 +152,11 @@
   id: '1466'
   name: 'Host bridge: Advanced Micro Devices, Inc. [AMD] Family 17h (Models 00h-0fh)
     Data Fabric: Device 18h; Function 6'
+- bus: '00'
+  dev: '18'
+  fn: '7'
+  id: '0001'
+  name: 'Host bridge: Arista Networks, Inc. Device 0001'
 - bus: '04'
   dev: '00'
   fn: '0'

device/arista/x86_64-arista_7800r3_48cq2_lc/platform_env.conf

@@ -1,3 +1,2 @@
-SYNCD_SHM_SIZE=1gb
 usemsi=1
 dmasize=512M

device/arista/x86_64-arista_7800r3_48cqm2_lc/pcie.yaml

@@ -152,6 +152,11 @@
   id: '1466'
   name: 'Host bridge: Advanced Micro Devices, Inc. [AMD] Family 17h (Models 00h-0fh)
     Data Fabric: Device 18h; Function 6'
+- bus: '00'
+  dev: '18'
+  fn: '7'
+  id: '0001'
+  name: 'Host bridge: Arista Networks, Inc. Device 0001'
 - bus: '04'
   dev: '00'
   fn: '0'

device/arista/x86_64-arista_7800r3_48cqm2_lc/platform_env.conf

@@ -1,3 +1,2 @@
-SYNCD_SHM_SIZE=1gb
 usemsi=1
 dmasize=512M

device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/0/j2p-a7800r3a-36d-36x400G.config.bcm

@@ -1014,5 +1014,3 @@ 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_default_cpu_tx_tc=7
-sai_disable_srcmacqedstmac_ctrl=1

device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/1/j2p-a7800r3a-36d-36x400G.config.bcm

@@ -453,17 +453,17 @@ fabric_connect_mode=FE
 fabric_logical_port_base=512
 
 # Fabric lane mapping
-lane_to_serdes_map_fabric_lane0=rx0:tx3
+lane_to_serdes_map_fabric_lane0=rx0:tx0
 lane_to_serdes_map_fabric_lane1=rx1:tx1
 lane_to_serdes_map_fabric_lane2=rx2:tx2
-lane_to_serdes_map_fabric_lane3=rx3:tx0
+lane_to_serdes_map_fabric_lane3=rx3:tx3
 lane_to_serdes_map_fabric_lane4=rx4:tx4
 lane_to_serdes_map_fabric_lane5=rx5:tx5
 lane_to_serdes_map_fabric_lane6=rx6:tx6
 lane_to_serdes_map_fabric_lane7=rx7:tx7
-lane_to_serdes_map_fabric_lane8=rx8:tx9
+lane_to_serdes_map_fabric_lane8=rx8:tx10
 lane_to_serdes_map_fabric_lane9=rx9:tx11
-lane_to_serdes_map_fabric_lane10=rx10:tx10
+lane_to_serdes_map_fabric_lane10=rx10:tx9
 lane_to_serdes_map_fabric_lane11=rx11:tx8
 lane_to_serdes_map_fabric_lane12=rx12:tx12
 lane_to_serdes_map_fabric_lane13=rx13:tx15
@@ -475,15 +475,15 @@ lane_to_serdes_map_fabric_lane18=rx18:tx16
 lane_to_serdes_map_fabric_lane19=rx19:tx19
 lane_to_serdes_map_fabric_lane20=rx20:tx21
 lane_to_serdes_map_fabric_lane21=rx21:tx23
-lane_to_serdes_map_fabric_lane22=rx22:tx22
-lane_to_serdes_map_fabric_lane23=rx23:tx20
-lane_to_serdes_map_fabric_lane24=rx24:tx25
+lane_to_serdes_map_fabric_lane22=rx22:tx20
+lane_to_serdes_map_fabric_lane23=rx23:tx22
+lane_to_serdes_map_fabric_lane24=rx24:tx26
 lane_to_serdes_map_fabric_lane25=rx25:tx24
-lane_to_serdes_map_fabric_lane26=rx26:tx27
-lane_to_serdes_map_fabric_lane27=rx27:tx26
+lane_to_serdes_map_fabric_lane26=rx26:tx25
+lane_to_serdes_map_fabric_lane27=rx27:tx27
 lane_to_serdes_map_fabric_lane28=rx28:tx31
-lane_to_serdes_map_fabric_lane29=rx29:tx29
-lane_to_serdes_map_fabric_lane30=rx30:tx30
+lane_to_serdes_map_fabric_lane29=rx29:tx30
+lane_to_serdes_map_fabric_lane30=rx30:tx29
 lane_to_serdes_map_fabric_lane31=rx31:tx28
 lane_to_serdes_map_fabric_lane32=rx32:tx32
 lane_to_serdes_map_fabric_lane33=rx33:tx33
@@ -522,17 +522,17 @@ lane_to_serdes_map_fabric_lane65=rx65:tx65
 lane_to_serdes_map_fabric_lane66=rx66:tx66
 lane_to_serdes_map_fabric_lane67=rx67:tx67
 lane_to_serdes_map_fabric_lane68=rx68:tx68
-lane_to_serdes_map_fabric_lane69=rx69:tx70
-lane_to_serdes_map_fabric_lane70=rx70:tx71
-lane_to_serdes_map_fabric_lane71=rx71:tx69
+lane_to_serdes_map_fabric_lane69=rx69:tx69
+lane_to_serdes_map_fabric_lane70=rx70:tx70
+lane_to_serdes_map_fabric_lane71=rx71:tx71
 lane_to_serdes_map_fabric_lane72=rx72:tx75
 lane_to_serdes_map_fabric_lane73=rx73:tx74
 lane_to_serdes_map_fabric_lane74=rx74:tx73
 lane_to_serdes_map_fabric_lane75=rx75:tx72
-lane_to_serdes_map_fabric_lane76=rx76:tx76
+lane_to_serdes_map_fabric_lane76=rx76:tx79
 lane_to_serdes_map_fabric_lane77=rx77:tx78
 lane_to_serdes_map_fabric_lane78=rx78:tx77
-lane_to_serdes_map_fabric_lane79=rx79:tx79
+lane_to_serdes_map_fabric_lane79=rx79:tx76
 lane_to_serdes_map_fabric_lane80=rx80:tx80
 lane_to_serdes_map_fabric_lane81=rx81:tx81
 lane_to_serdes_map_fabric_lane82=rx82:tx83
@@ -543,11 +543,11 @@ lane_to_serdes_map_fabric_lane86=rx86:tx84
 lane_to_serdes_map_fabric_lane87=rx87:tx87
 lane_to_serdes_map_fabric_lane88=rx88:tx90
 lane_to_serdes_map_fabric_lane89=rx89:tx88
-lane_to_serdes_map_fabric_lane90=rx90:tx89
-lane_to_serdes_map_fabric_lane91=rx91:tx91
+lane_to_serdes_map_fabric_lane90=rx90:tx91
+lane_to_serdes_map_fabric_lane91=rx91:tx89
 lane_to_serdes_map_fabric_lane92=rx92:tx93
-lane_to_serdes_map_fabric_lane93=rx93:tx94
-lane_to_serdes_map_fabric_lane94=rx94:tx92
+lane_to_serdes_map_fabric_lane93=rx93:tx92
+lane_to_serdes_map_fabric_lane94=rx94:tx94
 lane_to_serdes_map_fabric_lane95=rx95:tx95
 lane_to_serdes_map_fabric_lane96=rx96:tx96
 lane_to_serdes_map_fabric_lane97=rx97:tx97
@@ -557,30 +557,30 @@ lane_to_serdes_map_fabric_lane100=rx100:tx100
 lane_to_serdes_map_fabric_lane101=rx101:tx101
 lane_to_serdes_map_fabric_lane102=rx102:tx102
 lane_to_serdes_map_fabric_lane103=rx103:tx103
-lane_to_serdes_map_fabric_lane104=rx104:tx104
-lane_to_serdes_map_fabric_lane105=rx105:tx107
-lane_to_serdes_map_fabric_lane106=rx106:tx106
-lane_to_serdes_map_fabric_lane107=rx107:tx105
-lane_to_serdes_map_fabric_lane108=rx108:tx108
+lane_to_serdes_map_fabric_lane104=rx104:tx105
+lane_to_serdes_map_fabric_lane105=rx105:tx106
+lane_to_serdes_map_fabric_lane106=rx106:tx107
+lane_to_serdes_map_fabric_lane107=rx107:tx104
+lane_to_serdes_map_fabric_lane108=rx108:tx111
 lane_to_serdes_map_fabric_lane109=rx109:tx109
 lane_to_serdes_map_fabric_lane110=rx110:tx110
-lane_to_serdes_map_fabric_lane111=rx111:tx111
-lane_to_serdes_map_fabric_lane112=rx112:tx115
-lane_to_serdes_map_fabric_lane113=rx113:tx114
+lane_to_serdes_map_fabric_lane111=rx111:tx108
+lane_to_serdes_map_fabric_lane112=rx112:tx114
+lane_to_serdes_map_fabric_lane113=rx113:tx113
 lane_to_serdes_map_fabric_lane114=rx114:tx112
-lane_to_serdes_map_fabric_lane115=rx115:tx113
-lane_to_serdes_map_fabric_lane116=rx116:tx118
-lane_to_serdes_map_fabric_lane117=rx117:tx119
-lane_to_serdes_map_fabric_lane118=rx118:tx116
-lane_to_serdes_map_fabric_lane119=rx119:tx117
-lane_to_serdes_map_fabric_lane120=rx120:tx121
-lane_to_serdes_map_fabric_lane121=rx121:tx122
-lane_to_serdes_map_fabric_lane122=rx122:tx120
-lane_to_serdes_map_fabric_lane123=rx123:tx123
-lane_to_serdes_map_fabric_lane124=rx124:tx124
-lane_to_serdes_map_fabric_lane125=rx125:tx127
-lane_to_serdes_map_fabric_lane126=rx126:tx126
-lane_to_serdes_map_fabric_lane127=rx127:tx125
+lane_to_serdes_map_fabric_lane115=rx115:tx115
+lane_to_serdes_map_fabric_lane116=rx116:tx117
+lane_to_serdes_map_fabric_lane117=rx117:tx116
+lane_to_serdes_map_fabric_lane118=rx118:tx119
+lane_to_serdes_map_fabric_lane119=rx119:tx118
+lane_to_serdes_map_fabric_lane120=rx120:tx123
+lane_to_serdes_map_fabric_lane121=rx121:tx120
+lane_to_serdes_map_fabric_lane122=rx122:tx122
+lane_to_serdes_map_fabric_lane123=rx123:tx121
+lane_to_serdes_map_fabric_lane124=rx124:tx127
+lane_to_serdes_map_fabric_lane125=rx125:tx125
+lane_to_serdes_map_fabric_lane126=rx126:tx124
+lane_to_serdes_map_fabric_lane127=rx127:tx126
 lane_to_serdes_map_fabric_lane128=rx128:tx128
 lane_to_serdes_map_fabric_lane129=rx129:tx129
 lane_to_serdes_map_fabric_lane130=rx130:tx130
@@ -593,12 +593,12 @@ lane_to_serdes_map_fabric_lane136=rx136:tx139
 lane_to_serdes_map_fabric_lane137=rx137:tx138
 lane_to_serdes_map_fabric_lane138=rx138:tx137
 lane_to_serdes_map_fabric_lane139=rx139:tx136
-lane_to_serdes_map_fabric_lane140=rx140:tx143
+lane_to_serdes_map_fabric_lane140=rx140:tx140
 lane_to_serdes_map_fabric_lane141=rx141:tx142
 lane_to_serdes_map_fabric_lane142=rx142:tx141
-lane_to_serdes_map_fabric_lane143=rx143:tx140
-lane_to_serdes_map_fabric_lane144=rx144:tx145
-lane_to_serdes_map_fabric_lane145=rx145:tx144
+lane_to_serdes_map_fabric_lane143=rx143:tx143
+lane_to_serdes_map_fabric_lane144=rx144:tx144
+lane_to_serdes_map_fabric_lane145=rx145:tx145
 lane_to_serdes_map_fabric_lane146=rx146:tx146
 lane_to_serdes_map_fabric_lane147=rx147:tx147
 lane_to_serdes_map_fabric_lane148=rx148:tx148
@@ -614,8 +614,8 @@ lane_to_serdes_map_fabric_lane157=rx157:tx158
 lane_to_serdes_map_fabric_lane158=rx158:tx157
 lane_to_serdes_map_fabric_lane159=rx159:tx156
 lane_to_serdes_map_fabric_lane160=rx160:tx160
-lane_to_serdes_map_fabric_lane161=rx161:tx162
-lane_to_serdes_map_fabric_lane162=rx162:tx161
+lane_to_serdes_map_fabric_lane161=rx161:tx161
+lane_to_serdes_map_fabric_lane162=rx162:tx162
 lane_to_serdes_map_fabric_lane163=rx163:tx163
 lane_to_serdes_map_fabric_lane164=rx164:tx164
 lane_to_serdes_map_fabric_lane165=rx165:tx165
@@ -639,11 +639,11 @@ lane_to_serdes_map_fabric_lane182=rx182:tx180
 lane_to_serdes_map_fabric_lane183=rx183:tx183
 lane_to_serdes_map_fabric_lane184=rx184:tx186
 lane_to_serdes_map_fabric_lane185=rx185:tx184
-lane_to_serdes_map_fabric_lane186=rx186:tx187
-lane_to_serdes_map_fabric_lane187=rx187:tx185
-lane_to_serdes_map_fabric_lane188=rx188:tx190
+lane_to_serdes_map_fabric_lane186=rx186:tx185
+lane_to_serdes_map_fabric_lane187=rx187:tx187
+lane_to_serdes_map_fabric_lane188=rx188:tx188
 lane_to_serdes_map_fabric_lane189=rx189:tx189
-lane_to_serdes_map_fabric_lane190=rx190:tx188
+lane_to_serdes_map_fabric_lane190=rx190:tx190
 lane_to_serdes_map_fabric_lane191=rx191:tx191
 
 #
@@ -1014,5 +1014,3 @@ 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_default_cpu_tx_tc=7
-sai_disable_srcmacqedstmac_ctrl=1

device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/port_config.ini

@@ -0,0 +1,41 @@
+# 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

device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/0/j2p-a7800r3a-36d-36x400G.config.bcm

@@ -1031,5 +1031,3 @@ 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_default_cpu_tx_tc=7
-sai_disable_srcmacqedstmac_ctrl=1

device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/1/j2p-a7800r3a-36d-36x400G.config.bcm

@@ -471,17 +471,17 @@ fabric_connect_mode=FE
 fabric_logical_port_base=512
 
 # Fabric lane mapping
-lane_to_serdes_map_fabric_lane0=rx0:tx3
+lane_to_serdes_map_fabric_lane0=rx0:tx0
 lane_to_serdes_map_fabric_lane1=rx1:tx1
 lane_to_serdes_map_fabric_lane2=rx2:tx2
-lane_to_serdes_map_fabric_lane3=rx3:tx0
+lane_to_serdes_map_fabric_lane3=rx3:tx3
 lane_to_serdes_map_fabric_lane4=rx4:tx4
 lane_to_serdes_map_fabric_lane5=rx5:tx5
 lane_to_serdes_map_fabric_lane6=rx6:tx6
 lane_to_serdes_map_fabric_lane7=rx7:tx7
-lane_to_serdes_map_fabric_lane8=rx8:tx9
+lane_to_serdes_map_fabric_lane8=rx8:tx10
 lane_to_serdes_map_fabric_lane9=rx9:tx11
-lane_to_serdes_map_fabric_lane10=rx10:tx10
+lane_to_serdes_map_fabric_lane10=rx10:tx9
 lane_to_serdes_map_fabric_lane11=rx11:tx8
 lane_to_serdes_map_fabric_lane12=rx12:tx12
 lane_to_serdes_map_fabric_lane13=rx13:tx15
@@ -493,15 +493,15 @@ lane_to_serdes_map_fabric_lane18=rx18:tx16
 lane_to_serdes_map_fabric_lane19=rx19:tx19
 lane_to_serdes_map_fabric_lane20=rx20:tx21
 lane_to_serdes_map_fabric_lane21=rx21:tx23
-lane_to_serdes_map_fabric_lane22=rx22:tx22
-lane_to_serdes_map_fabric_lane23=rx23:tx20
-lane_to_serdes_map_fabric_lane24=rx24:tx25
+lane_to_serdes_map_fabric_lane22=rx22:tx20
+lane_to_serdes_map_fabric_lane23=rx23:tx22
+lane_to_serdes_map_fabric_lane24=rx24:tx26
 lane_to_serdes_map_fabric_lane25=rx25:tx24
-lane_to_serdes_map_fabric_lane26=rx26:tx27
-lane_to_serdes_map_fabric_lane27=rx27:tx26
+lane_to_serdes_map_fabric_lane26=rx26:tx25
+lane_to_serdes_map_fabric_lane27=rx27:tx27
 lane_to_serdes_map_fabric_lane28=rx28:tx31
-lane_to_serdes_map_fabric_lane29=rx29:tx29
-lane_to_serdes_map_fabric_lane30=rx30:tx30
+lane_to_serdes_map_fabric_lane29=rx29:tx30
+lane_to_serdes_map_fabric_lane30=rx30:tx29
 lane_to_serdes_map_fabric_lane31=rx31:tx28
 lane_to_serdes_map_fabric_lane32=rx32:tx32
 lane_to_serdes_map_fabric_lane33=rx33:tx33
@@ -540,17 +540,17 @@ lane_to_serdes_map_fabric_lane65=rx65:tx65
 lane_to_serdes_map_fabric_lane66=rx66:tx66
 lane_to_serdes_map_fabric_lane67=rx67:tx67
 lane_to_serdes_map_fabric_lane68=rx68:tx68
-lane_to_serdes_map_fabric_lane69=rx69:tx70
-lane_to_serdes_map_fabric_lane70=rx70:tx71
-lane_to_serdes_map_fabric_lane71=rx71:tx69
+lane_to_serdes_map_fabric_lane69=rx69:tx69
+lane_to_serdes_map_fabric_lane70=rx70:tx70
+lane_to_serdes_map_fabric_lane71=rx71:tx71
 lane_to_serdes_map_fabric_lane72=rx72:tx75
 lane_to_serdes_map_fabric_lane73=rx73:tx74
 lane_to_serdes_map_fabric_lane74=rx74:tx73
 lane_to_serdes_map_fabric_lane75=rx75:tx72
-lane_to_serdes_map_fabric_lane76=rx76:tx76
+lane_to_serdes_map_fabric_lane76=rx76:tx79
 lane_to_serdes_map_fabric_lane77=rx77:tx78
 lane_to_serdes_map_fabric_lane78=rx78:tx77
-lane_to_serdes_map_fabric_lane79=rx79:tx79
+lane_to_serdes_map_fabric_lane79=rx79:tx76
 lane_to_serdes_map_fabric_lane80=rx80:tx80
 lane_to_serdes_map_fabric_lane81=rx81:tx81
 lane_to_serdes_map_fabric_lane82=rx82:tx83
@@ -561,11 +561,11 @@ lane_to_serdes_map_fabric_lane86=rx86:tx84
 lane_to_serdes_map_fabric_lane87=rx87:tx87
 lane_to_serdes_map_fabric_lane88=rx88:tx90
 lane_to_serdes_map_fabric_lane89=rx89:tx88
-lane_to_serdes_map_fabric_lane90=rx90:tx89
-lane_to_serdes_map_fabric_lane91=rx91:tx91
+lane_to_serdes_map_fabric_lane90=rx90:tx91
+lane_to_serdes_map_fabric_lane91=rx91:tx89
 lane_to_serdes_map_fabric_lane92=rx92:tx93
-lane_to_serdes_map_fabric_lane93=rx93:tx94
-lane_to_serdes_map_fabric_lane94=rx94:tx92
+lane_to_serdes_map_fabric_lane93=rx93:tx92
+lane_to_serdes_map_fabric_lane94=rx94:tx94
 lane_to_serdes_map_fabric_lane95=rx95:tx95
 lane_to_serdes_map_fabric_lane96=rx96:tx96
 lane_to_serdes_map_fabric_lane97=rx97:tx97
@@ -575,30 +575,30 @@ lane_to_serdes_map_fabric_lane100=rx100:tx100
 lane_to_serdes_map_fabric_lane101=rx101:tx101
 lane_to_serdes_map_fabric_lane102=rx102:tx102
 lane_to_serdes_map_fabric_lane103=rx103:tx103
-lane_to_serdes_map_fabric_lane104=rx104:tx104
-lane_to_serdes_map_fabric_lane105=rx105:tx107
-lane_to_serdes_map_fabric_lane106=rx106:tx106
-lane_to_serdes_map_fabric_lane107=rx107:tx105
-lane_to_serdes_map_fabric_lane108=rx108:tx108
+lane_to_serdes_map_fabric_lane104=rx104:tx105
+lane_to_serdes_map_fabric_lane105=rx105:tx106
+lane_to_serdes_map_fabric_lane106=rx106:tx107
+lane_to_serdes_map_fabric_lane107=rx107:tx104
+lane_to_serdes_map_fabric_lane108=rx108:tx111
 lane_to_serdes_map_fabric_lane109=rx109:tx109
 lane_to_serdes_map_fabric_lane110=rx110:tx110
-lane_to_serdes_map_fabric_lane111=rx111:tx111
-lane_to_serdes_map_fabric_lane112=rx112:tx115
-lane_to_serdes_map_fabric_lane113=rx113:tx114
+lane_to_serdes_map_fabric_lane111=rx111:tx108
+lane_to_serdes_map_fabric_lane112=rx112:tx114
+lane_to_serdes_map_fabric_lane113=rx113:tx113
 lane_to_serdes_map_fabric_lane114=rx114:tx112
-lane_to_serdes_map_fabric_lane115=rx115:tx113
-lane_to_serdes_map_fabric_lane116=rx116:tx118
-lane_to_serdes_map_fabric_lane117=rx117:tx119
-lane_to_serdes_map_fabric_lane118=rx118:tx116
-lane_to_serdes_map_fabric_lane119=rx119:tx117
-lane_to_serdes_map_fabric_lane120=rx120:tx121
-lane_to_serdes_map_fabric_lane121=rx121:tx122
-lane_to_serdes_map_fabric_lane122=rx122:tx120
-lane_to_serdes_map_fabric_lane123=rx123:tx123
-lane_to_serdes_map_fabric_lane124=rx124:tx124
-lane_to_serdes_map_fabric_lane125=rx125:tx127
-lane_to_serdes_map_fabric_lane126=rx126:tx126
-lane_to_serdes_map_fabric_lane127=rx127:tx125
+lane_to_serdes_map_fabric_lane115=rx115:tx115
+lane_to_serdes_map_fabric_lane116=rx116:tx117
+lane_to_serdes_map_fabric_lane117=rx117:tx116
+lane_to_serdes_map_fabric_lane118=rx118:tx119
+lane_to_serdes_map_fabric_lane119=rx119:tx118
+lane_to_serdes_map_fabric_lane120=rx120:tx123
+lane_to_serdes_map_fabric_lane121=rx121:tx120
+lane_to_serdes_map_fabric_lane122=rx122:tx122
+lane_to_serdes_map_fabric_lane123=rx123:tx121
+lane_to_serdes_map_fabric_lane124=rx124:tx127
+lane_to_serdes_map_fabric_lane125=rx125:tx125
+lane_to_serdes_map_fabric_lane126=rx126:tx124
+lane_to_serdes_map_fabric_lane127=rx127:tx126
 lane_to_serdes_map_fabric_lane128=rx128:tx128
 lane_to_serdes_map_fabric_lane129=rx129:tx129
 lane_to_serdes_map_fabric_lane130=rx130:tx130
@@ -611,12 +611,12 @@ lane_to_serdes_map_fabric_lane136=rx136:tx139
 lane_to_serdes_map_fabric_lane137=rx137:tx138
 lane_to_serdes_map_fabric_lane138=rx138:tx137
 lane_to_serdes_map_fabric_lane139=rx139:tx136
-lane_to_serdes_map_fabric_lane140=rx140:tx143
+lane_to_serdes_map_fabric_lane140=rx140:tx140
 lane_to_serdes_map_fabric_lane141=rx141:tx142
 lane_to_serdes_map_fabric_lane142=rx142:tx141
-lane_to_serdes_map_fabric_lane143=rx143:tx140
-lane_to_serdes_map_fabric_lane144=rx144:tx145
-lane_to_serdes_map_fabric_lane145=rx145:tx144
+lane_to_serdes_map_fabric_lane143=rx143:tx143
+lane_to_serdes_map_fabric_lane144=rx144:tx144
+lane_to_serdes_map_fabric_lane145=rx145:tx145
 lane_to_serdes_map_fabric_lane146=rx146:tx146
 lane_to_serdes_map_fabric_lane147=rx147:tx147
 lane_to_serdes_map_fabric_lane148=rx148:tx148
@@ -632,8 +632,8 @@ lane_to_serdes_map_fabric_lane157=rx157:tx158
 lane_to_serdes_map_fabric_lane158=rx158:tx157
 lane_to_serdes_map_fabric_lane159=rx159:tx156
 lane_to_serdes_map_fabric_lane160=rx160:tx160
-lane_to_serdes_map_fabric_lane161=rx161:tx162
-lane_to_serdes_map_fabric_lane162=rx162:tx161
+lane_to_serdes_map_fabric_lane161=rx161:tx161
+lane_to_serdes_map_fabric_lane162=rx162:tx162
 lane_to_serdes_map_fabric_lane163=rx163:tx163
 lane_to_serdes_map_fabric_lane164=rx164:tx164
 lane_to_serdes_map_fabric_lane165=rx165:tx165
@@ -657,11 +657,11 @@ lane_to_serdes_map_fabric_lane182=rx182:tx180
 lane_to_serdes_map_fabric_lane183=rx183:tx183
 lane_to_serdes_map_fabric_lane184=rx184:tx186
 lane_to_serdes_map_fabric_lane185=rx185:tx184
-lane_to_serdes_map_fabric_lane186=rx186:tx187
-lane_to_serdes_map_fabric_lane187=rx187:tx185
-lane_to_serdes_map_fabric_lane188=rx188:tx190
+lane_to_serdes_map_fabric_lane186=rx186:tx185
+lane_to_serdes_map_fabric_lane187=rx187:tx187
+lane_to_serdes_map_fabric_lane188=rx188:tx188
 lane_to_serdes_map_fabric_lane189=rx189:tx189
-lane_to_serdes_map_fabric_lane190=rx190:tx188
+lane_to_serdes_map_fabric_lane190=rx190:tx190
 lane_to_serdes_map_fabric_lane191=rx191:tx191
 
 #
@@ -1031,5 +1031,3 @@ 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_default_cpu_tx_tc=7
-sai_disable_srcmacqedstmac_ctrl=1

device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/port_config.ini

@@ -0,0 +1,77 @@
+# 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

device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/0/j2p-a7800r3a-36d-36x400G.config.bcm

@@ -1051,5 +1051,3 @@ 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_default_cpu_tx_tc=7
-sai_disable_srcmacqedstmac_ctrl=1

device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/1/j2p-a7800r3a-36d-36x400G.config.bcm

@@ -453,17 +453,17 @@ fabric_connect_mode=FE
 fabric_logical_port_base=512
 
 # Fabric lane mapping
-lane_to_serdes_map_fabric_lane0=rx0:tx3
+lane_to_serdes_map_fabric_lane0=rx0:tx0
 lane_to_serdes_map_fabric_lane1=rx1:tx1
 lane_to_serdes_map_fabric_lane2=rx2:tx2
-lane_to_serdes_map_fabric_lane3=rx3:tx0
+lane_to_serdes_map_fabric_lane3=rx3:tx3
 lane_to_serdes_map_fabric_lane4=rx4:tx4
 lane_to_serdes_map_fabric_lane5=rx5:tx5
 lane_to_serdes_map_fabric_lane6=rx6:tx6
 lane_to_serdes_map_fabric_lane7=rx7:tx7
-lane_to_serdes_map_fabric_lane8=rx8:tx9
+lane_to_serdes_map_fabric_lane8=rx8:tx10
 lane_to_serdes_map_fabric_lane9=rx9:tx11
-lane_to_serdes_map_fabric_lane10=rx10:tx10
+lane_to_serdes_map_fabric_lane10=rx10:tx9
 lane_to_serdes_map_fabric_lane11=rx11:tx8
 lane_to_serdes_map_fabric_lane12=rx12:tx12
 lane_to_serdes_map_fabric_lane13=rx13:tx15
@@ -475,15 +475,15 @@ lane_to_serdes_map_fabric_lane18=rx18:tx16
 lane_to_serdes_map_fabric_lane19=rx19:tx19
 lane_to_serdes_map_fabric_lane20=rx20:tx21
 lane_to_serdes_map_fabric_lane21=rx21:tx23
-lane_to_serdes_map_fabric_lane22=rx22:tx22
-lane_to_serdes_map_fabric_lane23=rx23:tx20
-lane_to_serdes_map_fabric_lane24=rx24:tx25
+lane_to_serdes_map_fabric_lane22=rx22:tx20
+lane_to_serdes_map_fabric_lane23=rx23:tx22
+lane_to_serdes_map_fabric_lane24=rx24:tx26
 lane_to_serdes_map_fabric_lane25=rx25:tx24
-lane_to_serdes_map_fabric_lane26=rx26:tx27
-lane_to_serdes_map_fabric_lane27=rx27:tx26
+lane_to_serdes_map_fabric_lane26=rx26:tx25
+lane_to_serdes_map_fabric_lane27=rx27:tx27
 lane_to_serdes_map_fabric_lane28=rx28:tx31
-lane_to_serdes_map_fabric_lane29=rx29:tx29
-lane_to_serdes_map_fabric_lane30=rx30:tx30
+lane_to_serdes_map_fabric_lane29=rx29:tx30
+lane_to_serdes_map_fabric_lane30=rx30:tx29
 lane_to_serdes_map_fabric_lane31=rx31:tx28
 lane_to_serdes_map_fabric_lane32=rx32:tx32
 lane_to_serdes_map_fabric_lane33=rx33:tx33
@@ -522,17 +522,17 @@ lane_to_serdes_map_fabric_lane65=rx65:tx65
 lane_to_serdes_map_fabric_lane66=rx66:tx66
 lane_to_serdes_map_fabric_lane67=rx67:tx67
 lane_to_serdes_map_fabric_lane68=rx68:tx68
-lane_to_serdes_map_fabric_lane69=rx69:tx70
-lane_to_serdes_map_fabric_lane70=rx70:tx71
-lane_to_serdes_map_fabric_lane71=rx71:tx69
+lane_to_serdes_map_fabric_lane69=rx69:tx69
+lane_to_serdes_map_fabric_lane70=rx70:tx70
+lane_to_serdes_map_fabric_lane71=rx71:tx71
 lane_to_serdes_map_fabric_lane72=rx72:tx75
 lane_to_serdes_map_fabric_lane73=rx73:tx74
 lane_to_serdes_map_fabric_lane74=rx74:tx73
 lane_to_serdes_map_fabric_lane75=rx75:tx72
-lane_to_serdes_map_fabric_lane76=rx76:tx76
+lane_to_serdes_map_fabric_lane76=rx76:tx79
 lane_to_serdes_map_fabric_lane77=rx77:tx78
 lane_to_serdes_map_fabric_lane78=rx78:tx77
-lane_to_serdes_map_fabric_lane79=rx79:tx79
+lane_to_serdes_map_fabric_lane79=rx79:tx76
 lane_to_serdes_map_fabric_lane80=rx80:tx80
 lane_to_serdes_map_fabric_lane81=rx81:tx81
 lane_to_serdes_map_fabric_lane82=rx82:tx83
@@ -543,11 +543,11 @@ lane_to_serdes_map_fabric_lane86=rx86:tx84
 lane_to_serdes_map_fabric_lane87=rx87:tx87
 lane_to_serdes_map_fabric_lane88=rx88:tx90
 lane_to_serdes_map_fabric_lane89=rx89:tx88
-lane_to_serdes_map_fabric_lane90=rx90:tx89
-lane_to_serdes_map_fabric_lane91=rx91:tx91
+lane_to_serdes_map_fabric_lane90=rx90:tx91
+lane_to_serdes_map_fabric_lane91=rx91:tx89
 lane_to_serdes_map_fabric_lane92=rx92:tx93
-lane_to_serdes_map_fabric_lane93=rx93:tx94
-lane_to_serdes_map_fabric_lane94=rx94:tx92
+lane_to_serdes_map_fabric_lane93=rx93:tx92
+lane_to_serdes_map_fabric_lane94=rx94:tx94
 lane_to_serdes_map_fabric_lane95=rx95:tx95
 lane_to_serdes_map_fabric_lane96=rx96:tx96
 lane_to_serdes_map_fabric_lane97=rx97:tx97
@@ -557,30 +557,30 @@ lane_to_serdes_map_fabric_lane100=rx100:tx100
 lane_to_serdes_map_fabric_lane101=rx101:tx101
 lane_to_serdes_map_fabric_lane102=rx102:tx102
 lane_to_serdes_map_fabric_lane103=rx103:tx103
-lane_to_serdes_map_fabric_lane104=rx104:tx104
-lane_to_serdes_map_fabric_lane105=rx105:tx107
-lane_to_serdes_map_fabric_lane106=rx106:tx106
-lane_to_serdes_map_fabric_lane107=rx107:tx105
-lane_to_serdes_map_fabric_lane108=rx108:tx108
+lane_to_serdes_map_fabric_lane104=rx104:tx105
+lane_to_serdes_map_fabric_lane105=rx105:tx106
+lane_to_serdes_map_fabric_lane106=rx106:tx107
+lane_to_serdes_map_fabric_lane107=rx107:tx104
+lane_to_serdes_map_fabric_lane108=rx108:tx111
 lane_to_serdes_map_fabric_lane109=rx109:tx109
 lane_to_serdes_map_fabric_lane110=rx110:tx110
-lane_to_serdes_map_fabric_lane111=rx111:tx111
-lane_to_serdes_map_fabric_lane112=rx112:tx115
-lane_to_serdes_map_fabric_lane113=rx113:tx114
+lane_to_serdes_map_fabric_lane111=rx111:tx108
+lane_to_serdes_map_fabric_lane112=rx112:tx114
+lane_to_serdes_map_fabric_lane113=rx113:tx113
 lane_to_serdes_map_fabric_lane114=rx114:tx112
-lane_to_serdes_map_fabric_lane115=rx115:tx113
-lane_to_serdes_map_fabric_lane116=rx116:tx118
-lane_to_serdes_map_fabric_lane117=rx117:tx119
-lane_to_serdes_map_fabric_lane118=rx118:tx116
-lane_to_serdes_map_fabric_lane119=rx119:tx117
-lane_to_serdes_map_fabric_lane120=rx120:tx121
-lane_to_serdes_map_fabric_lane121=rx121:tx122
-lane_to_serdes_map_fabric_lane122=rx122:tx120
-lane_to_serdes_map_fabric_lane123=rx123:tx123
-lane_to_serdes_map_fabric_lane124=rx124:tx124
-lane_to_serdes_map_fabric_lane125=rx125:tx127
-lane_to_serdes_map_fabric_lane126=rx126:tx126
-lane_to_serdes_map_fabric_lane127=rx127:tx125
+lane_to_serdes_map_fabric_lane115=rx115:tx115
+lane_to_serdes_map_fabric_lane116=rx116:tx117
+lane_to_serdes_map_fabric_lane117=rx117:tx116
+lane_to_serdes_map_fabric_lane118=rx118:tx119
+lane_to_serdes_map_fabric_lane119=rx119:tx118
+lane_to_serdes_map_fabric_lane120=rx120:tx123
+lane_to_serdes_map_fabric_lane121=rx121:tx120
+lane_to_serdes_map_fabric_lane122=rx122:tx122
+lane_to_serdes_map_fabric_lane123=rx123:tx121
+lane_to_serdes_map_fabric_lane124=rx124:tx127
+lane_to_serdes_map_fabric_lane125=rx125:tx125
+lane_to_serdes_map_fabric_lane126=rx126:tx124
+lane_to_serdes_map_fabric_lane127=rx127:tx126
 lane_to_serdes_map_fabric_lane128=rx128:tx128
 lane_to_serdes_map_fabric_lane129=rx129:tx129
 lane_to_serdes_map_fabric_lane130=rx130:tx130
@@ -593,12 +593,12 @@ lane_to_serdes_map_fabric_lane136=rx136:tx139
 lane_to_serdes_map_fabric_lane137=rx137:tx138
 lane_to_serdes_map_fabric_lane138=rx138:tx137
 lane_to_serdes_map_fabric_lane139=rx139:tx136
-lane_to_serdes_map_fabric_lane140=rx140:tx143
+lane_to_serdes_map_fabric_lane140=rx140:tx140
 lane_to_serdes_map_fabric_lane141=rx141:tx142
 lane_to_serdes_map_fabric_lane142=rx142:tx141
-lane_to_serdes_map_fabric_lane143=rx143:tx140
-lane_to_serdes_map_fabric_lane144=rx144:tx145
-lane_to_serdes_map_fabric_lane145=rx145:tx144
+lane_to_serdes_map_fabric_lane143=rx143:tx143
+lane_to_serdes_map_fabric_lane144=rx144:tx144
+lane_to_serdes_map_fabric_lane145=rx145:tx145
 lane_to_serdes_map_fabric_lane146=rx146:tx146
 lane_to_serdes_map_fabric_lane147=rx147:tx147
 lane_to_serdes_map_fabric_lane148=rx148:tx148
@@ -614,8 +614,8 @@ lane_to_serdes_map_fabric_lane157=rx157:tx158
 lane_to_serdes_map_fabric_lane158=rx158:tx157
 lane_to_serdes_map_fabric_lane159=rx159:tx156
 lane_to_serdes_map_fabric_lane160=rx160:tx160
-lane_to_serdes_map_fabric_lane161=rx161:tx162
-lane_to_serdes_map_fabric_lane162=rx162:tx161
+lane_to_serdes_map_fabric_lane161=rx161:tx161
+lane_to_serdes_map_fabric_lane162=rx162:tx162
 lane_to_serdes_map_fabric_lane163=rx163:tx163
 lane_to_serdes_map_fabric_lane164=rx164:tx164
 lane_to_serdes_map_fabric_lane165=rx165:tx165
@@ -639,11 +639,11 @@ lane_to_serdes_map_fabric_lane182=rx182:tx180
 lane_to_serdes_map_fabric_lane183=rx183:tx183
 lane_to_serdes_map_fabric_lane184=rx184:tx186
 lane_to_serdes_map_fabric_lane185=rx185:tx184
-lane_to_serdes_map_fabric_lane186=rx186:tx187
-lane_to_serdes_map_fabric_lane187=rx187:tx185
-lane_to_serdes_map_fabric_lane188=rx188:tx190
+lane_to_serdes_map_fabric_lane186=rx186:tx185
+lane_to_serdes_map_fabric_lane187=rx187:tx187
+lane_to_serdes_map_fabric_lane188=rx188:tx188
 lane_to_serdes_map_fabric_lane189=rx189:tx189
-lane_to_serdes_map_fabric_lane190=rx190:tx188
+lane_to_serdes_map_fabric_lane190=rx190:tx190
 lane_to_serdes_map_fabric_lane191=rx191:tx191
 
 #
@@ -1051,5 +1051,3 @@ 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_default_cpu_tx_tc=7
-sai_disable_srcmacqedstmac_ctrl=1

device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/port_config.ini

@@ -0,0 +1,41 @@
+# 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

device/arista/x86_64-arista_7800r3a_36d2_lc/pcie.yaml

@@ -152,6 +152,11 @@
   id: '1466'
   name: 'Host bridge: Advanced Micro Devices, Inc. [AMD] Family 17h (Models 00h-0fh)
     Data Fabric: Device 18h; Function 6'
+- bus: '00'
+  dev: '18'
+  fn: '7'
+  id: '0001'
+  name: 'Host bridge: Arista Networks, Inc. Device 0001'
 - bus: '04'
   dev: '00'
   fn: '0'

device/arista/x86_64-arista_7800r3a_36d2_lc/platform_env.conf

@@ -1,4 +1,3 @@
-SYNCD_SHM_SIZE=1gb
 usemsi=1
 dmasize=64M
 macsec_enabled=1

device/arista/x86_64-arista_common/pcie.yaml

@@ -1 +0,0 @@
-[]

device/celestica/x86_64-cel_e1031-r0/platform_reboot

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-declare -r CPLD_SETREG_PATH="/sys/bus/platform/devices/e1031.smc/setreg"
-
-sync ; sync
-umount -fa > /dev/null 2&>1
-
-# Board level power cycle
-echo "0x0113 0xAA" > ${CPLD_SETREG_PATH}

device/celestica/x86_64-cel_e1031-r0/platform_update_reboot_cause

@@ -1,8 +0,0 @@
-#!/bin/bash
-
-REBOOT_USER=$(logname)
-REBOOT_TIME=$(date)
-declare -r REBOOT_CAUSE_FILE="/host/reboot-cause/reboot-cause.txt"
-
-echo "User issued 'reboot' with platform-specific command [User: ${REBOOT_USER}, Time: ${REBOOT_TIME}]" > ${REBOOT_CAUSE_FILE}
-sync

device/celestica/x86_64-cel_e1031-r0/sonic_platform/common.py

@@ -24,6 +24,7 @@ class Common:
 
     SET_METHOD_IPMI = 'ipmitool'
     NULL_VAL = 'N/A'
+    HOST_CHK_CMD = ["docker"]
     REF_KEY = '$ref:'
 
     def __init__(self, conf=None):
@@ -184,12 +185,11 @@ class Common:
         return True
 
     def is_host(self):
-        """
-        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
+        try:
+            subprocess.call(self.HOST_CHK_CMD, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+        except FileNotFoundError:
+            return False
+        return True
 
     def load_json_file(self, path):
         """

device/dell/x86_64-dell_e3224f-r0/Dell-E3224F/buffers.json.j2

@@ -1,2 +0,0 @@
-{%- set default_topo = 't0' %}
-{%- include 'buffers_config.j2' %}

device/dell/x86_64-dell_e3224f-r0/Dell-E3224F/buffers_defaults_t0.j2

@@ -1,41 +0,0 @@
-{%- set default_cable = '5m' %}
-
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {% for port_idx in range(0,24) %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
-    {% endfor %}
-{%- endmacro %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "8192000",
-            "type": "ingress",
-            "mode": "dynamic",
-            "xoff": "196608"
-        },
-        "egress_lossless_pool": {
-            "size": "8388608",
-            "type": "egress",
-            "mode": "static"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "static_th":"8388608"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"1518",
-            "dynamic_th":"3"
-        }
-    },
-{%- endmacro %}

device/dell/x86_64-dell_e3224f-r0/Dell-E3224F/buffers_defaults_t1.j2

@@ -1,41 +0,0 @@
-{%- set default_cable = '300m' %}
-
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {% for port_idx in range(0,24) %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
-    {% endfor %}
-{%- endmacro %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "8192000",
-            "type": "ingress",
-            "mode": "dynamic",
-            "xoff": "196608"
-        },
-        "egress_lossless_pool": {
-            "size": "8388608",
-            "type": "egress",
-            "mode": "static"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "static_th":"8388608"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"1518",
-            "dynamic_th":"3"
-        }
-    },
-{%- endmacro %}

device/dell/x86_64-dell_e3224f-r0/Dell-E3224F/copp_capabilities_config.j2

@@ -1,3 +0,0 @@
-{
-    "copp_rx_rate":15000
-}

device/dell/x86_64-dell_e3224f-r0/Dell-E3224F/copp_platform_config.j2

@@ -1,145 +0,0 @@
-{
-    "COPP_GROUP": {
-        "copp-system-lacp": {
-            "cir":"250",
-            "cbs":"250"
-        },
-        "copp-system-udld": {
-            "cir":"250",
-            "cbs":"250"
-        },
-        "copp-system-stp": {
-            "cir":"8000",
-            "cbs":"8000"
-        },
-        "copp-system-bfd": {
-            "cir":"750",
-            "cbs":"750"
-        },
-        "copp-system-lldp": {
-            "cir":"250",
-            "cbs":"250"
-        },
-        "copp-system-vrrp": {
-            "cir":"250",
-            "cbs":"250"
-        },
-        "copp-system-iccp": {
-            "cir":"2500",
-            "cbs":"2500"
-        },
-        "copp-system-ospf": {
-            "cir":"2500",
-            "cbs":"2500"
-        },
-        "copp-system-bgp": {
-            "cir":"5000",
-            "cbs":"5000"
-        },
-        "copp-system-pim": {
-            "cir":"2500",
-            "cbs":"2500"
-        },
-        "copp-system-igmp": {
-            "cir":"1000",
-            "cbs":"1000"
-        },
-        "copp-system-suppress": {
-            "cir":"1500",
-            "cbs":"1500"
-        },
-        "copp-system-arp": {
-            "cir":"1500",
-            "cbs":"1500"
-        },
-        "copp-system-dhcp": {
-            "cir":"150",
-            "cbs":"150"
-        },
-        "copp-system-icmp": {
-            "cir":"500",
-            "cbs":"500"
-        },
-        "copp-system-ip2me": {
-            "cir":"3000",
-            "cbs":"3000"
-        },
-        "copp-system-subnet": {
-            "cir":"1000",
-            "cbs":"1000"
-        },
-        "copp-system-mtu": {
-            "cir":"250",
-            "cbs":"250"
-        },
-        "copp-system-sflow": {
-            "cir":"4000",
-            "cbs":"4000"
-        }
-    },
-    "SCHEDULER": {
-        "copp-scheduler-policy@23": {
-            "pir": "250"
-        },
-        "copp-scheduler-policy@22": {
-            "pir": "250"
-        },
-        "copp-scheduler-policy@21": {
-            "pir": "8000"
-        },
-        "copp-scheduler-policy@20": {
-            "pir": "750"
-        },
-        "copp-scheduler-policy@19": {
-            "pir": "2500"
-        },
-        "copp-scheduler-policy@18": {
-            "pir": "250"
-        },
-        "copp-scheduler-policy@17": {
-            "pir": "250"
-        },
-        "copp-scheduler-policy@16": {
-            "pir": "2500"
-        },
-        "copp-scheduler-policy@15": {
-            "pir": "2500"
-        },
-        "copp-scheduler-policy@14": {
-            "pir": "5000"
-        },
-        "copp-scheduler-policy@13": {
-            "pir": "2500"
-        },
-        "copp-scheduler-policy@12": {
-            "pir": "1000"
-        },
-        "copp-scheduler-policy@11": {
-            "pir": "1500"
-        },
-        "copp-scheduler-policy@10": {
-            "pir": "1500"
-        },
-        "copp-scheduler-policy@9": {
-            "pir": "150"
-        },
-        "copp-scheduler-policy@8": {
-            "pir": "500"
-        },
-        "copp-scheduler-policy@7": {
-            "pir": "3000"
-        },
-        "copp-scheduler-policy@6": {
-            "pir": "1000"
-        },
-        "copp-scheduler-policy@4": {
-            "pir": "250"
-        },
-        "copp-scheduler-policy@3": {
-            "pir": "4000"
-        },
-        "copp-scheduler-policy@1": {
-            "pir": "100"
-        }
-    }
-}

device/dell/x86_64-dell_e3224f-r0/Dell-E3224F/hx5-e3224f-24x1G+4x10G.config.bcm

@@ -1,157 +0,0 @@
-bcm_num_cos=8
-bcm_stat_interval=2000000
-bcm_tunnel_term_compatible_mode=1
-cdma_timeout_usec=3000000
-flow_init_mode=0
-ifa_enable=0
-ifp_inports_support_enable=1
-ipv6_lpm_128b_enable=0x1
-l2xmsg_mode=1
-
-#Default L3 profile
-
-l2_mem_entries=32768
-l3_alpm_enable=2
-l3_alpm_ipv6_128b_bkt_rsvd=1
-l3_max_ecmp_mode=1
-l3_mem_entries=16348
-lpm_scaling_enable=0
-memlist_enable=1
-reglist_enable=1
-scache_filename=/tmp/brcm_bcm_scache
-schan_intr_enable=0
-stable_size=0x5500000
-tdma_timeout_usec=3000000
-
-pfc_deadlock_seq_control=1
-
-#Port and PHY configs
-
-core_clock_frequency=668
-pbmp_xport_xe=0x1ffffffe
-port_gmii_mode_33=1
-port_gmii_mode_17=1
-port_gmii_mode_1=1
-portmap_1=1:1
-portmap_2=2:1
-portmap_3=3:1
-portmap_4=4:1
-portmap_5=5:1
-portmap_6=6:1
-portmap_7=7:1
-portmap_8=8:1
-portmap_9=9:1
-portmap_10=10:1
-portmap_11=11:1
-portmap_12=12:1
-portmap_13=13:1
-portmap_14=14:1
-portmap_15=15:1
-portmap_16=16:1
-portmap_17=17:1
-portmap_18=18:1
-portmap_19=19:1
-portmap_20=20:1
-portmap_21=21:1
-portmap_22=22:1
-portmap_23=23:1
-portmap_24=24:1
-portmap_25=64:10
-portmap_26=63:10
-portmap_27=62:10
-portmap_28=61:10
-portmap_29=69:100
-portmap_33=73:100
-phy_chain_tx_lane_map_physical{33.0}=0x2301
-phy_chain_rx_lane_map_physical{33.0}=0x2301
-phy_port_primary_and_offset_1=0x0100
-phy_port_primary_and_offset_2=0x0101
-phy_port_primary_and_offset_3=0x0102
-phy_port_primary_and_offset_4=0x0103
-phy_port_primary_and_offset_5=0x0104
-phy_port_primary_and_offset_6=0x0105
-phy_port_primary_and_offset_7=0x0106
-phy_port_primary_and_offset_8=0x0107
-phy_port_primary_and_offset_9=0x0900
-phy_port_primary_and_offset_10=0x0901
-phy_port_primary_and_offset_11=0x0902
-phy_port_primary_and_offset_12=0x0903
-phy_port_primary_and_offset_13=0x0904
-phy_port_primary_and_offset_14=0x0905
-phy_port_primary_and_offset_15=0x0906
-phy_port_primary_and_offset_16=0x0907
-phy_port_primary_and_offset_17=0x1200
-phy_port_primary_and_offset_18=0x1201
-phy_port_primary_and_offset_19=0x1202
-phy_port_primary_and_offset_20=0x1203
-phy_port_primary_and_offset_21=0x1204
-phy_port_primary_and_offset_22=0x1205
-phy_port_primary_and_offset_23=0x1206
-phy_port_primary_and_offset_24=0x1207
-port_phy_addr_1=0x0
-port_phy_addr_2=0x1
-port_phy_addr_3=0x2
-port_phy_addr_4=0x3
-port_phy_addr_5=0x4
-port_phy_addr_6=0x5
-port_phy_addr_7=0x6
-port_phy_addr_8=0x7
-port_phy_addr_9=0x9
-port_phy_addr_10=0xa
-port_phy_addr_11=0xb
-port_phy_addr_12=0xc
-port_phy_addr_13=0xd
-port_phy_addr_14=0xe
-port_phy_addr_15=0xf
-port_phy_addr_16=0x10
-port_phy_addr_17=0x12
-port_phy_addr_18=0x13
-port_phy_addr_19=0x14
-port_phy_addr_20=0x15
-port_phy_addr_21=0x16
-port_phy_addr_22=0x17
-port_phy_addr_23=0x18
-port_phy_addr_24=0x19
-port_phy_addr_25=0x20
-port_phy_addr_26=0x21
-port_phy_addr_27=0x22
-port_phy_addr_28=0x23
-phy_force_firmware_load_26=0x01
-phy_force_firmware_load_27=0x01
-phy_force_firmware_load_28=0x01
-phy_pcs_repeater_25=0x01
-phy_pcs_repeater_26=0x01
-phy_pcs_repeater_27=0x01
-phy_pcs_repeater_28=0x01
-phy_fiber_pref_ge=1
-phy_automedium_ge=0
-dport_map_port_1=8
-dport_map_port_2=7
-dport_map_port_3=6
-dport_map_port_4=5
-dport_map_port_5=4
-dport_map_port_6=3
-dport_map_port_7=2
-dport_map_port_8=1
-dport_map_port_9=16
-dport_map_port_10=15
-dport_map_port_11=14
-dport_map_port_12=13
-dport_map_port_13=12
-dport_map_port_14=11
-dport_map_port_15=10
-dport_map_port_16=9
-dport_map_port_17=24
-dport_map_port_18=23
-dport_map_port_19=22
-dport_map_port_20=21
-dport_map_port_21=20
-dport_map_port_22=19
-dport_map_port_23=18
-dport_map_port_24=17
-dport_map_port_25=25
-dport_map_port_26=26
-dport_map_port_27=27
-dport_map_port_28=28
-
-sai_preinit_cmd_file=/usr/share/sonic/hwsku/sai_preinit_cmd.soc

device/dell/x86_64-dell_e3224f-r0/Dell-E3224F/pg_profile_lookup.ini

@@ -1,17 +0,0 @@
-# PG lossless profiles.
-# speed cable size      xon     xoff   threshold xon_offset
-  10000  5m   9427       0     50176    1        3584
-  25000  5m   9427       0     50176    1        3584
-  40000  5m   9427       0     50176    1        3584
-  50000  5m   9427       0     50176    1        3584
- 100000  5m   9427       0     50176    1        3584
-  10000  40m  9427       0     50176    1        3584
-  25000  40m  9427       0     50176    1        3584
-  40000  40m  9427       0     50176    1        3584
-  50000  40m  9427       0     50176    1        3584
- 100000  40m  9427       0     50176    1        3584
-  10000  300m 9427       0     50176    1        3584
-  25000  300m 9427       0     50176    1        3584
-  40000  300m 9427       0     50176    1        3584
-  50000  300m 9427       0     50176    1        3584
- 100000  300m 9427       0     50176    1        3584

device/dell/x86_64-dell_e3224f-r0/Dell-E3224F/port_config.ini

@@ -1,31 +0,0 @@
-# name        lanes                   alias                    index     speed   autoneg
-Ethernet0       8     oneGigE1/1           1     1000     1
-Ethernet1       7     oneGigE1/2           2     1000     1
-Ethernet2       6     oneGigE1/3           3     1000     1
-Ethernet3       5     oneGigE1/4           4     1000     1
-Ethernet4       4     oneGigE1/5           5     1000     1
-Ethernet5       3     oneGigE1/6           6     1000     1
-Ethernet6       2     oneGigE1/7           7     1000     1
-Ethernet7       1     oneGigE1/8           8     1000     1
-Ethernet8       16    oneGigE1/9           9     1000     1
-Ethernet9       15    oneGigE1/10          10    1000     1
-Ethernet10      14    oneGigE1/11          11    1000     1
-Ethernet11      13    oneGigE1/12          12    1000     1
-Ethernet12      12    oneGigE1/13          13    1000     1
-Ethernet13      11    oneGigE1/14          14    1000     1
-Ethernet14      10    oneGigE1/15          15    1000     1
-Ethernet15      9     oneGigE1/16          16    1000     1
-Ethernet16      24    oneGigE1/17          17    1000     1
-Ethernet17      23    oneGigE1/18          18    1000     1
-Ethernet18      22    oneGigE1/19          19    1000     1
-Ethernet19      21    oneGigE1/20          20    1000     1
-Ethernet20      20    oneGigE1/21          21    1000     1
-Ethernet21      19    oneGigE1/22          22    1000     1
-Ethernet22      18    oneGigE1/23          23    1000     1
-Ethernet23      17    oneGigE1/24          24    1000     1
-Ethernet24      64    tenGigE1/25          25    10000    0
-Ethernet25      63    tenGigE1/26          26    10000    0
-Ethernet26      62    tenGigE1/27          27    10000    0
-Ethernet27      61    tenGigE1/28          28    10000    0
-Ethernet28      69,70,71,72           hundredGigE1/29     29      100000           0
-Ethernet32      73,74,75,76           hundredGigE1/30     30      100000           0

device/dell/x86_64-dell_e3224f-r0/Dell-E3224F/qos.json.j2

@@ -1 +0,0 @@
-{%- include 'qos_config_t1.j2' %}

device/dell/x86_64-dell_e3224f-r0/Dell-E3224F/qos_config_t1.j2

@@ -1,175 +0,0 @@
-{%- set PORT_ALL = [] %}
-{%- for port in PORT %}
-    {%- if PORT_ALL.append(port) %}{% endif %}
-{%- endfor %}
-{%- if PORT_ALL | sort_by_port_index %}{% endif %}
-
-{%- set port_names_list_all = [] %}
-{%- for port in PORT_ALL %}
-    {%- if port_names_list_all.append(port) %}{% endif %}
-{%- endfor %}
-{%- set port_names_all = port_names_list_all | join(',') -%}
-
-
-{%- set PORT_ACTIVE = [] %}
-{%- if DEVICE_NEIGHBOR is not defined %}
-    {%- set PORT_ACTIVE = PORT_ALL %}
-{%- else %}
-    {%- for port in DEVICE_NEIGHBOR.keys() %}
-        {%- if PORT_ACTIVE.append(port) %}{%- endif %}
-    {%- endfor %}
-{%- endif %}
-{%- if PORT_ACTIVE | sort_by_port_index %}{% endif %}
-
-{%- set port_names_list_active = [] %}
-{%- for port in PORT_ACTIVE %}
-    {%- if port_names_list_active.append(port) %}{%- endif %}
-{%- endfor %}
-{%- set port_names_active = port_names_list_active | join(',') -%}
-
-
-{%- set pfc_to_pg_map_supported_asics = ['mellanox', 'barefoot', 'marvell'] -%}
-
-
-{
-{% if generate_tc_to_pg_map is defined %}
-    {{- generate_tc_to_pg_map() }}
-{% else %}
-    "TC_TO_PRIORITY_GROUP_MAP": {
-        "AZURE": {
-            "0": "0",
-            "1": "0",
-            "2": "0",
-            "3": "3",
-            "4": "4",
-            "5": "0",
-            "6": "0",
-            "7": "7"
-        }
-    },
-{% endif %}
-    "MAP_PFC_PRIORITY_TO_QUEUE": {
-        "AZURE": {
-            "0": "0",
-            "1": "1",
-            "2": "2",
-            "3": "3",
-            "4": "4",
-            "5": "5",
-            "6": "6",
-            "7": "7"
-        }
-    },
-    "TC_TO_QUEUE_MAP": {
-        "AZURE": {
-            "0": "0",
-            "1": "1",
-            "2": "2",
-            "3": "3",
-            "4": "4",
-            "5": "5",
-            "6": "6",
-            "7": "7"
-        }
-    },
-    "DSCP_TO_TC_MAP": {
-        "AZURE": {
-            "0" : "1",
-            "1" : "1",
-            "2" : "1",
-            "3" : "3",
-            "4" : "4",
-            "5" : "2",
-            "6" : "1",
-            "7" : "1",
-            "8" : "0",
-            "9" : "1",
-            "10": "1",
-            "11": "1",
-            "12": "1",
-            "13": "1",
-            "14": "1",
-            "15": "1",
-            "16": "1",
-            "17": "1",
-            "18": "1",
-            "19": "1",
-            "20": "1",
-            "21": "1",
-            "22": "1",
-            "23": "1",
-            "24": "1",
-            "25": "1",
-            "26": "1",
-            "27": "1",
-            "28": "1",
-            "29": "1",
-            "30": "1",
-            "31": "1",
-            "32": "1",
-            "33": "1",
-            "34": "1",
-            "35": "1",
-            "36": "1",
-            "37": "1",
-            "38": "1",
-            "39": "1",
-            "40": "1",
-            "41": "1",
-            "42": "1",
-            "43": "1",
-            "44": "1",
-            "45": "1",
-            "46": "5",
-            "47": "1",
-            "48": "6",
-            "49": "1",
-            "50": "1",
-            "51": "1",
-            "52": "1",
-            "53": "1",
-            "54": "1",
-            "55": "1",
-            "56": "1",
-            "57": "1",
-            "58": "1",
-            "59": "1",
-            "60": "1",
-            "61": "1",
-            "62": "1",
-            "63": "1"
-        }
-    },
-    "SCHEDULER": {
-        "scheduler.0": {
-            "type"  : "DWRR",
-            "weight": "14"
-        },
-        "scheduler.1": {
-            "type"  : "DWRR",
-            "weight": "15"
-        }
-    },
-{% if asic_type in pfc_to_pg_map_supported_asics  %}
-    "PFC_PRIORITY_TO_PRIORITY_GROUP_MAP": {
-        "AZURE": {
-            "3": "3",
-            "4": "4"
-        }
-    },
-{% endif %}
-    "PORT_QOS_MAP": {
-{% for port in PORT_ACTIVE %}
-        "{{ port }}": {
-            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
-            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
-            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
-            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-{% if asic_type in pfc_to_pg_map_supported_asics %}
-            "pfc_to_pg_map"   : "[PFC_PRIORITY_TO_PRIORITY_GROUP_MAP|AZURE]",
-{% endif %}
-            "pfc_enable"      : "3,4"
-        }{% if not loop.last %},{% endif %}
-{% endfor %}
-    }
-}

device/dell/x86_64-dell_e3224f-r0/Dell-E3224F/sai.profile

@@ -1 +0,0 @@
-SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/hx5-e3224f-24x1G+4x10G.config.bcm

device/dell/x86_64-dell_e3224f-r0/Dell-E3224F/sai_preinit_cmd.soc

@@ -1,2 +0,0 @@
-m0 load 0 0x0 /usr/share/sonic/hwsku/linkscan_led_fw.bin
-m0 load 0 0x3800 /usr/share/sonic/hwsku/custom_led.bin

device/dell/x86_64-dell_e3224f-r0/default_sku

@@ -1 +0,0 @@
-Dell-E3224F t1

device/dell/x86_64-dell_e3224f-r0/init_cfg.json

@@ -1,13 +0,0 @@
-{
-  "FEATURE": {
-    "tam": {
-        "state": "disabled"
-    },
-    "telemetry": {
-        "state": "disabled"
-    },
-    "nat": {
-        "state": "disabled"
-    }
-  }
-}

device/dell/x86_64-dell_e3224f-r0/installer.conf

@@ -1,4 +0,0 @@
-CONSOLE_PORT=0x3f8
-CONSOLE_DEV=0
-VAR_LOG_SIZE=512
-ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="intel_iommu=off irqfixup"

device/dell/x86_64-dell_e3224f-r0/led_proc_init.soc

@@ -1,7 +0,0 @@
-# LED microprocessor initialization for Dell E3224F
-#
-#
-#Led0
-#led auto on
-m0 load 0 0x3800 /usr/share/sonic/hwsku/custom_led.bin
-led start