[lldp] Clean up service start logic owing to port init start optimization (#17133 )

As part of service start optimization done, we've removed timer units and used PORT_INIT_DONE as the checkpoint for starting delayed services. Thus this logic is redundant This fixes the following error log. Nov 3 14:16:54.281546 r-leopard-44 ERR systemctl[10553]: Failed to get unit file state for lldp.timer: No such file or d Signed-off-by: Vivek Reddy <vkarri@nvidia.com>
[mellanox] Update SAI to SAIBuild2311.25.0.36, SDK/FW to 4.6.2104/2012.2104 (#17131 )
2023-11-20 14:43:19 -08:00 · 2023-11-16 18:01:52 -08:00 · 2023-11-16 18:01:06 -08:00 · 2023-11-16 17:59:55 -08:00 · 2023-11-10 13:43:17 -08:00 · 2023-11-06 17:40:07 -08:00
1122 changed files with 9459 additions and 77141 deletions
--- a/.azure-pipelines/azure-pipelines-UpgrateVersion.yml
+++ b/.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
--- a/.azure-pipelines/azure-pipelines-build-ubuntu-2004.yml
+++ b/.azure-pipelines/azure-pipelines-build-ubuntu-2004.yml
@ -9,16 +9,6 @@ trigger:
  branches:
    include:
    - master
-    - 202???
-
-schedules:
- cron: "0 0 * * *"
-  displayName: Daily build
-  branches:
-    include:
-      - master
-      - 202???
-  always: true

 stages:
 - stage: Build
@ -38,15 +28,13 @@ stages:
                         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
+                         ant default-jdk maven-repo-helper libguava-java
        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
+        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: |
--- a/.azure-pipelines/azure-pipelines-build.yml
+++ b/.azure-pipelines/azure-pipelines-build.yml
@ -114,19 +114,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,13 +128,9 @@ 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
+            if [ "$(K8S_OPTIONS)" == 'INCLUDE_KUBERNETES_MASTER=y' ]; then
+              make $BUILD_OPTIONS $(K8S_OPTIONS) target/sonic-vs.img.gz
+              mv target/sonic-vs.img.gz target/sonic-vs-k8s.img.gz
            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
--- a/.azure-pipelines/azure-pipelines-image-template.yml
+++ b/.azure-pipelines/azure-pipelines-image-template.yml
@ -30,7 +30,7 @@ jobs:
      - script: |
          [ -n "$OVERRIDE_BUILD_OPTIONS" ] && OVERRIDE_BUILD_OPTIONS=$(OVERRIDE_BUILD_OPTIONS)
          BUILD_OPTIONS="$(BUILD_OPTIONS) $OVERRIDE_BUILD_OPTIONS"
-          if [ -n "$(CACHE_MODE)" ] && echo $(PLATFORM_AZP) | grep -E -q "^(vs|broadcom|mellanox|marvell-armhf|marvell-arm64)$"; then
+          if [ -n "$(CACHE_MODE)" ] && echo $(PLATFORM_AZP) | grep -E -q "^(vs|broadcom|mellanox|marvell-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
--- a/.azure-pipelines/docker-sonic-mgmt-py3-only.yml
+++ b/.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"
-
--- a/.azure-pipelines/docker-sonic-mgmt.yml
+++ b/.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
--- a/.azure-pipelines/template-skipvstest.yml
+++ b/.azure-pipelines/template-skipvstest.yml
@ -4,16 +4,11 @@ steps:
      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
+      if ! git diff $tar_branch..HEAD --name-only | grep -F files/image_config/kubernetes/kubernetes_master_entrance.sh; then
+        echo "##vso[task.setvariable variable=K8S_OPTIONS;]INCLUDE_KUBERNETES_MASTER=n"
+      else
+        echo "##vso[task.setvariable variable=K8S_OPTIONS;]INCLUDE_KUBERNETES_MASTER=y"
      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)
      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
--- a/.github/workflows/automerge.yml
+++ b/.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
--- a/.github/workflows/automerge_scan.yml
+++ b/.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
--- a/.github/workflows/build-broadcom.yml
+++ b/.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: |
-            * 
--- a/.github/workflows/pr_cherrypick_poststep.yml
+++ b/.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
--- a/.github/workflows/pr_cherrypick_prestep.yml
+++ b/.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
--- a/.gitignore
+++ b/.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

--- a/.gitmodules
+++ b/.gitmodules
@ -112,12 +112,9 @@
 [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
+[submodule "src/sonic-dash-api/sonic-dash-api"]
+	path = src/sonic-dash-api/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
--- a/Makefile.cache
+++ b/Makefile.cache
@ -295,11 +295,9 @@ 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
--- a/Makefile.work
+++ b/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)
@ -236,11 +235,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) \
@ -521,13 +518,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,8 +550,6 @@ 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) \
@ -562,7 +557,6 @@ SONIC_BUILD_INSTRUCTION :=  $(MAKE) \
                           SONIC_INCLUDE_MUX=$(INCLUDE_MUX) \
                           ENABLE_TRANSLIB_WRITE=$(ENABLE_TRANSLIB_WRITE) \
                           ENABLE_NATIVE_WRITE=$(ENABLE_NATIVE_WRITE) \
-			   ENABLE_DIALOUT=$(ENABLE_DIALOUT) \
                           EXTRA_DOCKER_TARGETS=$(EXTRA_DOCKER_TARGETS) \
                           BUILD_LOG_TIMESTAMP=$(BUILD_LOG_TIMESTAMP) \
                           SONIC_ENABLE_IMAGE_SIGNATURE=$(ENABLE_IMAGE_SIGNATURE) \
--- a/README.md
+++ b/README.md
@ -80,6 +80,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
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@ -17,6 +17,7 @@ pr:
    include:
      - master
      - 202???
+      - bookworm 
  paths:
    exclude:
      - .github
@ -43,11 +44,6 @@ variables:
  value: rcache
 - name: ENABLE_FIPS
  value: n
- name: BUILD_BRANCH
-  ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
-    value: $(System.PullRequest.TargetBranch)
-  ${{ else }}:
-    value: $(Build.SourceBranchName)

 stages:
 - stage: BuildVS
@ -55,7 +51,7 @@ 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

@ -70,7 +66,6 @@ stages:
      - name: broadcom
        variables:
          swi_image: yes
-          INCLUDE_RESTAPI: y
      - name: mellanox
        variables:
          dbg_image: yes
@ -85,7 +80,6 @@ stages:
        timeoutInMinutes: 1200
        variables:
          PLATFORM_ARCH: armhf
-          INCLUDE_RESTAPI: y

 - stage: Test
  dependsOn: BuildVS
@ -171,7 +165,7 @@ stages:
        TOPOLOGY: t0
        MIN_WORKER: $(T0_INSTANCE_NUM)
        MAX_WORKER: $(T0_INSTANCE_NUM)
-        MGMT_BRANCH: $(BUILD_BRANCH)
+        MGMT_BRANCH: "master"

  - job: t0_2vlans_elastictest
    pool: ubuntu-20.04
@ -185,7 +179,7 @@ stages:
        TEST_SET: t0-2vlans
        MIN_WORKER: $(T0_2VLANS_INSTANCE_NUM)
        MAX_WORKER: $(T0_2VLANS_INSTANCE_NUM)
-        MGMT_BRANCH: $(BUILD_BRANCH)
+        MGMT_BRANCH: "master"
        DEPLOY_MG_EXTRA_PARAMS: "-e vlan_config=two_vlan_a"

  - job: t1_lag_elastictest
@ -199,7 +193,7 @@ stages:
        TOPOLOGY: t1-lag
        MIN_WORKER: $(T1_LAG_INSTANCE_NUM)
        MAX_WORKER: $(T1_LAG_INSTANCE_NUM)
-        MGMT_BRANCH: $(BUILD_BRANCH)
+        MGMT_BRANCH: "master"

  - job: multi_asic_elastictest
    displayName: "kvmtest-multi-asic-t1-lag by Elastictest"
@ -214,7 +208,7 @@ stages:
          MIN_WORKER: $(MULTI_ASIC_INSTANCE_NUM)
          MAX_WORKER: $(MULTI_ASIC_INSTANCE_NUM)
          NUM_ASIC: 4
-          MGMT_BRANCH: $(BUILD_BRANCH)
+          MGMT_BRANCH: "master"

  - job: dualtor_elastictest
    pool: ubuntu-20.04
@ -227,7 +221,7 @@ stages:
          TOPOLOGY: dualtor
          MIN_WORKER: $(T0_DUALTOR_INSTANCE_NUM)
          MAX_WORKER: $(T0_DUALTOR_INSTANCE_NUM)
-          MGMT_BRANCH: $(BUILD_BRANCH)
+          MGMT_BRANCH: "master"
          COMMON_EXTRA_PARAMS: "--disable_loganalyzer "

  - job: sonic_t0_elastictest
@ -242,7 +236,7 @@ stages:
          MIN_WORKER: $(T0_SONIC_INSTANCE_NUM)
          MAX_WORKER: $(T0_SONIC_INSTANCE_NUM)
          TEST_SET: t0-sonic
-          MGMT_BRANCH: $(BUILD_BRANCH)
+          MGMT_BRANCH: "master"
          COMMON_EXTRA_PARAMS: "--neighbor_type=sonic "
          VM_TYPE: vsonic

@ -257,7 +251,8 @@ stages:
          TOPOLOGY: dpu
          MIN_WORKER: $(T0_SONIC_INSTANCE_NUM)
          MAX_WORKER: $(T0_SONIC_INSTANCE_NUM)
-          MGMT_BRANCH: $(BUILD_BRANCH)
+          KVM_IMAGE_BRANCH: "master"
+          MGMT_BRANCH: "master"


 #  - job: wan_elastictest
--- a/build_debian.sh
+++ b/build_debian.sh
@ -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" ] || {
@ -271,25 +271,16 @@ sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install docker-ce=${DOCKER_VERSIO

 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 +298,9 @@ 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 LANG=C chroot $FILESYSTEM_ROOT apt-get update
+    sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install hyperv-daemons gnupg xmlstarlet parted netcat
+    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
@ -384,6 +377,7 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
    mtr-tiny                \
    locales                 \
    cgroup-tools            \
+    ipmitool                \
    ndisc6                  \
    makedumpfile            \
    conntrack               \
@ -393,8 +387,8 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
    python-is-python3       \
    cron                    \
    libprotobuf32           \
+    libgrpc++1              \
    libgrpc29               \
-    libgrpc++1.51           \
    haveged                 \
    fdisk                   \
    gpg                     \
@ -467,10 +461,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 +480,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
@ -763,27 +749,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

@ -834,7 +807,7 @@ 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
@ -879,5 +852,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
--- a/build_image.sh
+++ b/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
@ -175,7 +175,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 +213,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
--- a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/hwsku.json
+++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/hwsku.json
@ -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+"
+        }
+    }
+}
--- a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/port_config.ini
+++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/port_config.ini
@ -1,36 +1,36 @@
-# name          lanes             alias         index    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
--- a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/th-a7060-cx32s-32x40G-t1.config.bcm
+++ b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/th-a7060-cx32s-32x40G-t1.config.bcm
@ -449,4 +449,3 @@ serdes_preemphasis_109=0x145c00

 mmu_init_config="MSFT-TH-Tier1"
 phy_an_lt_msft=1
-phy_unlos_msft=1
--- a/device/arista/x86_64-arista_7280cr3_32p4/platform_env.conf
+++ b/device/arista/x86_64-arista_7280cr3_32p4/platform_env.conf
@ -1,2 +1 @@
-SYNCD_SHM_SIZE=1gb
 usemsi=1
--- a/device/arista/x86_64-arista_7800r3_48cq2_lc/Arista-7800R3-48CQ2-C48/jr2-a7280cr3-32d4-40x100G.config.bcm
+++ b/device/arista/x86_64-arista_7800r3_48cq2_lc/Arista-7800R3-48CQ2-C48/jr2-a7280cr3-32d4-40x100G.config.bcm
@ -861,4 +861,3 @@ 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
--- a/device/arista/x86_64-arista_7800r3_48cq2_lc/platform_env.conf
+++ b/device/arista/x86_64-arista_7800r3_48cq2_lc/platform_env.conf
@ -1,3 +1,2 @@
-SYNCD_SHM_SIZE=1gb
 usemsi=1
 dmasize=512M
--- a/device/arista/x86_64-arista_7800r3_48cqm2_lc/platform_env.conf
+++ b/device/arista/x86_64-arista_7800r3_48cqm2_lc/platform_env.conf
@ -1,3 +1,2 @@
-SYNCD_SHM_SIZE=1gb
 usemsi=1
 dmasize=512M
--- a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/0/j2p-a7800r3a-36d-36x400G.config.bcm
+++ b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/0/j2p-a7800r3a-36d-36x400G.config.bcm
@ -1015,4 +1015,3 @@ 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
--- a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/1/j2p-a7800r3a-36d-36x400G.config.bcm
+++ b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/1/j2p-a7800r3a-36d-36x400G.config.bcm
@ -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

 #
@ -1015,4 +1015,3 @@ 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
--- a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/port_config.ini
+++ b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/port_config.ini
@ -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
--- a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/0/j2p-a7800r3a-36d-36x400G.config.bcm
+++ b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/0/j2p-a7800r3a-36d-36x400G.config.bcm
@ -1032,4 +1032,3 @@ 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
--- a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/1/j2p-a7800r3a-36d-36x400G.config.bcm
+++ b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/1/j2p-a7800r3a-36d-36x400G.config.bcm
@ -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

 #
@ -1032,4 +1032,3 @@ 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
--- a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/port_config.ini
+++ b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/port_config.ini
@ -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
--- a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/0/j2p-a7800r3a-36d-36x400G.config.bcm
+++ b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/0/j2p-a7800r3a-36d-36x400G.config.bcm
@ -1052,4 +1052,3 @@ 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
--- a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/1/j2p-a7800r3a-36d-36x400G.config.bcm
+++ b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/1/j2p-a7800r3a-36d-36x400G.config.bcm
@ -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

 #
@ -1052,4 +1052,3 @@ 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
--- a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/port_config.ini
+++ b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/port_config.ini
@ -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
--- a/device/arista/x86_64-arista_7800r3a_36d2_lc/platform_env.conf
+++ b/device/arista/x86_64-arista_7800r3a_36d2_lc/platform_env.conf
@ -1,4 +1,3 @@
-SYNCD_SHM_SIZE=1gb
 usemsi=1
 dmasize=64M
 macsec_enabled=1
--- a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/common.py
+++ b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/common.py
@ -24,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):
        """
--- a/device/marvell/arm64-marvell_rd98DX35xx-r0/default_sku
+++ b/device/marvell/arm64-marvell_rd98DX35xx-r0/default_sku
@ -1 +0,0 @@
-rd98DX35xx t1
--- a/device/marvell/arm64-marvell_rd98DX35xx-r0/installer.conf
+++ b/device/marvell/arm64-marvell_rd98DX35xx-r0/installer.conf
@ -1 +0,0 @@
-ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="default_hugepagesz=32M hugepages=4"
--- a/device/marvell/arm64-marvell_rd98DX35xx-r0/platform_asic
+++ b/device/marvell/arm64-marvell_rd98DX35xx-r0/platform_asic
@ -1 +0,0 @@
-marvell-arm64
--- a/device/marvell/arm64-marvell_rd98DX35xx-r0/plugins/eeprom.py
+++ b/device/marvell/arm64-marvell_rd98DX35xx-r0/plugins/eeprom.py
@ -1,13 +0,0 @@
-#!/usr/bin/env python
-
-try:
-    from sonic_eeprom import eeprom_tlvinfo
-except ImportError as e:
-    raise ImportError (str(e) + "- required module not found")
-
-
-class board(eeprom_tlvinfo.TlvInfoDecoder):
-
-    def __init__(self, name, path, cpld_root, ro):
-        self.eeprom_path = "/sys/bus/i2c/devices/0-0050/eeprom"
-        super(board, self).__init__(self.eeprom_path, 0, '', True)
--- a/device/marvell/arm64-marvell_rd98DX35xx-r0/pmon_daemon_control.json
+++ b/device/marvell/arm64-marvell_rd98DX35xx-r0/pmon_daemon_control.json
@ -1,8 +0,0 @@
-{
-    "skip_ledd": true,
-    "skip_pcied": true,
-    "skip_thermalctld": true,
-    "skip_psud": true,
-    "skip_xcvrd": true,
-    "skip_syseepromd": true
-}
--- a/device/marvell/arm64-marvell_rd98DX35xx-r0/rd98DX35xx/ASK-Board-ac5x-rd-32x1G-16x2_5G-6x25G.md5
+++ b/device/marvell/arm64-marvell_rd98DX35xx-r0/rd98DX35xx/ASK-Board-ac5x-rd-32x1G-16x2_5G-6x25G.md5
@ -1 +0,0 @@
-7a62aaeaed876bd57c22537911fa7a4e
--- a/device/marvell/arm64-marvell_rd98DX35xx-r0/rd98DX35xx/ASK-Board-ac5x-rd-32x1G-16x2_5G-6x25G.xml
+++ b/device/marvell/arm64-marvell_rd98DX35xx-r0/rd98DX35xx/ASK-Board-ac5x-rd-32x1G-16x2_5G-6x25G.xml
--- a/device/marvell/arm64-marvell_rd98DX35xx-r0/rd98DX35xx/ASK-L1-AC5X-RD-32x1G-16x2_5G-6x25G.md5
+++ b/device/marvell/arm64-marvell_rd98DX35xx-r0/rd98DX35xx/ASK-L1-AC5X-RD-32x1G-16x2_5G-6x25G.md5
@ -1 +0,0 @@
-2876aaa02a47b5842e152ce794c50110
--- a/device/marvell/arm64-marvell_rd98DX35xx-r0/rd98DX35xx/ASK-L1-AC5X-RD-32x1G-16x2_5G-6x25G.xml
+++ b/device/marvell/arm64-marvell_rd98DX35xx-r0/rd98DX35xx/ASK-L1-AC5X-RD-32x1G-16x2_5G-6x25G.xml
--- a/device/marvell/arm64-marvell_rd98DX35xx-r0/rd98DX35xx/ASK-PP-AC5X-RD.md5
+++ b/device/marvell/arm64-marvell_rd98DX35xx-r0/rd98DX35xx/ASK-PP-AC5X-RD.md5
@ -1 +0,0 @@
-b42f2a2be9da6c7752c0807f9dee48bf
--- a/device/marvell/arm64-marvell_rd98DX35xx-r0/rd98DX35xx/ASK-PP-AC5X-RD.xml
+++ b/device/marvell/arm64-marvell_rd98DX35xx-r0/rd98DX35xx/ASK-PP-AC5X-RD.xml
@ -1,871 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" version="2023-05-05-1.04" profile="Askpp" dsig="md5">
-  <askppplt:ASK-PP xmlns:askppplt="urn:marvell:askpp:yang">
-    <askppplt:typedefs>
-      <askppplt:typedef>
-        <askppplt:name>std-string</askppplt:name>
-        <askppplt:type>string</askppplt:type>
-        <askppplt:description>standard string.</askppplt:description>
-        <askppplt:min>1</askppplt:min>
-        <askppplt:max>100</askppplt:max>
-      </askppplt:typedef>
-      <askppplt:typedef>
-        <askppplt:name>queue-id-type</askppplt:name>
-        <askppplt:type>uint32</askppplt:type>
-        <askppplt:description>Queue id</askppplt:description>
-        <askppplt:min>0</askppplt:min>
-        <askppplt:max>7</askppplt:max>
-      </askppplt:typedef>
-      <askppplt:typedef>
-        <askppplt:name>precent-type</askppplt:name>
-        <askppplt:type>uint32</askppplt:type>
-        <askppplt:description>Precent</askppplt:description>
-        <askppplt:min>0</askppplt:min>
-        <askppplt:max>100</askppplt:max>
-      </askppplt:typedef>
-      <askppplt:typedef>
-        <askppplt:name>phaThreadId-type</askppplt:name>
-        <askppplt:type>uint32</askppplt:type>
-        <askppplt:description>Thread id</askppplt:description>
-        <askppplt:min>1</askppplt:min>
-        <askppplt:max>255</askppplt:max>
-      </askppplt:typedef>
-      <askppplt:typedef>
-        <askppplt:name>routing-mode-type</askppplt:name>
-        <askppplt:type>enumeration</askppplt:type>
-        <askppplt:description>Specifies routing mode.</askppplt:description>
-        <askppplt:enum>
-          <askppplt:name>POLICY_BASED_ROUTING_ONLY</askppplt:name>
-          <askppplt:description>PBR only</askppplt:description>
-          <askppplt:value>0</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>TCAM_ROUTER_BASED</askppplt:name>
-          <askppplt:description>Router engine or PBR</askppplt:description>
-          <askppplt:value>1</askppplt:value>
-        </askppplt:enum>
-      </askppplt:typedef>
-      <askppplt:typedef>
-        <askppplt:name>shared-table-mode-type</askppplt:name>
-        <askppplt:type>enumeration</askppplt:type>
-        <askppplt:description>Specifies table sharing modes for L3 (LPM), L2 (FDB), EM (Exact Match)</askppplt:description>
-        <askppplt:enum>
-          <askppplt:name>MID_L3_MID_L2_NO_EM</askppplt:name>
-          <askppplt:description>MID_L3_MID_L2_NO_EM</askppplt:description>
-          <askppplt:value>0</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>MID_L3_MID_L2_MIN_EM</askppplt:name>
-          <askppplt:description>MID_L3_MID_L2_MIN_EM</askppplt:description>
-          <askppplt:value>1</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>LOW_MAX_L3_MID_LOW_L2_NO_EM</askppplt:name>
-          <askppplt:description>LOW_MAX_L3_MID_LOW_L2_NO_EM</askppplt:description>
-          <askppplt:value>2</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>MAX_L3_MIN_L2_NO_EM</askppplt:name>
-          <askppplt:description>MAX_L3_MIN_L2_NO_EM</askppplt:description>
-          <askppplt:value>3</askppplt:value>
-        </askppplt:enum>
-      </askppplt:typedef>
-      <askppplt:typedef>
-        <askppplt:name>pha-firmware-image-id-type</askppplt:name>
-        <askppplt:type>enumeration</askppplt:type>
-        <askppplt:description>Specifies supported Pha image id</askppplt:description>
-        <askppplt:enum>
-          <askppplt:name>DEFAULT</askppplt:name>
-          <askppplt:description>Default PHA firmware image ID</askppplt:description>
-          <askppplt:value>0</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>01</askppplt:name>
-          <askppplt:description>01 firmware image ID</askppplt:description>
-          <askppplt:value>1</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>02</askppplt:name>
-          <askppplt:description>02 PHA firmware image ID</askppplt:description>
-          <askppplt:value>2</askppplt:value>
-        </askppplt:enum>
-      </askppplt:typedef>
-      <askppplt:typedef>
-        <askppplt:name>pha-firmware-thread-type</askppplt:name>
-        <askppplt:type>enumeration</askppplt:type>
-        <askppplt:description>Specifies supported Pha thread type</askppplt:description>
-        <askppplt:enum>
-          <askppplt:name>IOAM_INGRESS_SWITCH_IPV4</askppplt:name>
-          <askppplt:description>IOAM_INGRESS_SWITCH_IPV4</askppplt:description>
-          <askppplt:value>1</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>IOAM_INGRESS_SWITCH_IPV6</askppplt:name>
-          <askppplt:description>IOAM_INGRESS_SWITCH_IPV6</askppplt:description>
-          <askppplt:value>2</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>IOAM_TRANSIT_SWITCH_IPV4</askppplt:name>
-          <askppplt:description>IOAM_TRANSIT_SWITCH_IPV4</askppplt:description>
-          <askppplt:value>3</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>IOAM_TRANSIT_SWITCH_IPV6</askppplt:name>
-          <askppplt:description>IOAM_TRANSIT_SWITCH_IPV6</askppplt:description>
-          <askppplt:value>4</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>INT_IOAM_MIRRORING</askppplt:name>
-          <askppplt:description>INT_IOAM_MIRRORING</askppplt:description>
-          <askppplt:value>5</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>INT_IOAM_EGRESS_SWITCH</askppplt:name>
-          <askppplt:description>INT_IOAM_EGRESS_SWITCH</askppplt:description>
-          <askppplt:value>6</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>MPLS_SR_NO_EL</askppplt:name>
-          <askppplt:description>MPLS_SR_NO_EL</askppplt:description>
-          <askppplt:value>7</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>MPLS_SR_ONE_EL</askppplt:name>
-          <askppplt:description>MPLS_SR_ONE_EL</askppplt:description>
-          <askppplt:value>8</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>MPLS_SR_TWO_EL</askppplt:name>
-          <askppplt:description>MPLS_SR_TWO_EL</askppplt:description>
-          <askppplt:value>9</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>MPLS_SR_THREE_EL</askppplt:name>
-          <askppplt:description>MPLS_SR_THREE_EL</askppplt:description>
-          <askppplt:value>10</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>UNIFIED_SR</askppplt:name>
-          <askppplt:description>UNIFIED_SR</askppplt:description>
-          <askppplt:value>11</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>CLASSIFIER_NSH_OVER_ETHERNET</askppplt:name>
-          <askppplt:description>CLASSIFIER_NSH_OVER_ETHERNET</askppplt:description>
-          <askppplt:value>12</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>CLASSIFIER_NSH_OVER_VXLAN_GPE</askppplt:name>
-          <askppplt:description>CLASSIFIER_NSH_OVER_VXLAN_GPE</askppplt:description>
-          <askppplt:value>13</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>SFF_NSH_VXLAN_GPE_TO_ETHERNET</askppplt:name>
-          <askppplt:description>SFF_NSH_VXLAN_GPE_TO_ETHERNET</askppplt:description>
-          <askppplt:value>14</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>SFF_NSH_ETHERNET_TO_VXLAN_GPE</askppplt:name>
-          <askppplt:description>SFF_NSH_ETHERNET_TO_VXLAN_GPE</askppplt:description>
-          <askppplt:value>15</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>IOAM_EGRESS_SWITCH_IPV6</askppplt:name>
-          <askppplt:description>IOAM_EGRESS_SWITCH_IPV6</askppplt:description>
-          <askppplt:value>16</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>SRV6_END_NODE</askppplt:name>
-          <askppplt:description>SRV6_END_NODE</askppplt:description>
-          <askppplt:value>17</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>SRV6_PENULTIMATE_END_NODE</askppplt:name>
-          <askppplt:description>SRV6_PENULTIMATE_END_NODE</askppplt:description>
-          <askppplt:value>18</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>SRV6_SRC_NODE_1_SEGMENT</askppplt:name>
-          <askppplt:description>SRV6_SRC_NODE_1_SEGMENT</askppplt:description>
-          <askppplt:value>19</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>SRV6_SRC_NODE_FIRST_PASS_2_3_SEGMENTS</askppplt:name>
-          <askppplt:description>SRV6_SRC_NODE_FIRST_PASS_2_3_SEGMENTS</askppplt:description>
-          <askppplt:value>20</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>SRV6_SRC_NODE_SECOND_PASS_3_SEGMENTS</askppplt:name>
-          <askppplt:description>SRV6_SRC_NODE_SECOND_PASS_3_SEGMENTS</askppplt:description>
-          <askppplt:value>21</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>SRV6_SRC_NODE_SECOND_PASS_2_SEGMENTS</askppplt:name>
-          <askppplt:description>SRV6_SRC_NODE_SECOND_PASS_2_SEGMENTS</askppplt:description>
-          <askppplt:value>22</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>SGT_NETWORK_ADD_MSB</askppplt:name>
-          <askppplt:description>SGT_NETWORK_ADD_MSB</askppplt:description>
-          <askppplt:value>23</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>SGT_NETWORK_FIX</askppplt:name>
-          <askppplt:description>SGT_NETWORK_FIX</askppplt:description>
-          <askppplt:value>24</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>SGT_NETWORK_REMOVE</askppplt:name>
-          <askppplt:description>SGT_NETWORK_REMOVE</askppplt:description>
-          <askppplt:value>25</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>SGT_EDSA_FIX</askppplt:name>
-          <askppplt:description>SGT_EDSA_FIX</askppplt:description>
-          <askppplt:value>26</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>SGT_EDSA_REMOVE</askppplt:name>
-          <askppplt:description>SGT_EDSA_REMOVE</askppplt:description>
-          <askppplt:value>27</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>SGT_GBP_FIX_IPV4</askppplt:name>
-          <askppplt:description>SGT_GBP_FIX_IPV4</askppplt:description>
-          <askppplt:value>28</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>SGT_GBP_FIX_IPV6</askppplt:name>
-          <askppplt:description>SGT_GBP_FIX_IPV6</askppplt:description>
-          <askppplt:value>29</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>SGT_GBP_REMOVE_IPV4</askppplt:name>
-          <askppplt:description>SGT_GBP_REMOVE_IPV4</askppplt:description>
-          <askppplt:value>30</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>SGT_GBP_REMOVE_IPV6</askppplt:name>
-          <askppplt:description>SGT_GBP_REMOVE_IPV6</askppplt:description>
-          <askppplt:value>31</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>PTP_PHY_1_STEP</askppplt:name>
-          <askppplt:description>PTP_PHY_1_STEP</askppplt:description>
-          <askppplt:value>32</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>EGRESS_MIRRORING_METADATA</askppplt:name>
-          <askppplt:description>EGRESS_MIRRORING_METADATA</askppplt:description>
-          <askppplt:value>33</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>CC_ERSPAN_TYPE_II_TRG_DEV_LC_IPV4</askppplt:name>
-          <askppplt:description>CC_ERSPAN_TYPE_II_TRG_DEV_LC_IPV4</askppplt:description>
-          <askppplt:value>34</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>CC_ERSPAN_TYPE_II_TRG_DEV_LC_IPV6</askppplt:name>
-          <askppplt:description>CC_ERSPAN_TYPE_II_TRG_DEV_LC_IPV6</askppplt:description>
-          <askppplt:value>35</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>CC_ERSPAN_TYPE_II_TRG_DEV_DIRECT_IPV4</askppplt:name>
-          <askppplt:description>CC_ERSPAN_TYPE_II_TRG_DEV_DIRECT_IPV4</askppplt:description>
-          <askppplt:value>36</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>CC_ERSPAN_TYPE_II_TRG_DEV_DIRECT_IPV6</askppplt:name>
-          <askppplt:description>CC_ERSPAN_TYPE_II_TRG_DEV_DIRECT_IPV6</askppplt:description>
-          <askppplt:value>37</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>CC_ERSPAN_TYPE_II_SRC_DEV</askppplt:name>
-          <askppplt:description>CC_ERSPAN_TYPE_II_SRC_DEV</askppplt:description>
-          <askppplt:value>38</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>VXLAN_GBP_SOURCE_GROUP_POLICY_ID</askppplt:name>
-          <askppplt:description>VXLAN_GBP_SOURCE_GROUP_POLICY_ID</askppplt:description>
-          <askppplt:value>39</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>SRV6_BEST_EFFORT</askppplt:name>
-          <askppplt:description>SRV6_BEST_EFFORT</askppplt:description>
-          <askppplt:value>40</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>SRV6_SRC_NODE_1_CONTAINER</askppplt:name>
-          <askppplt:description>SRV6_SRC_NODE_1_CONTAINER</askppplt:description>
-          <askppplt:value>41</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>SRV6_SRC_NODE_FIRST_PASS_2_3_CONTAINERS</askppplt:name>
-          <askppplt:description>SRV6_SRC_NODE_FIRST_PASS_2_3_CONTAINERS</askppplt:description>
-          <askppplt:value>42</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>SRV6_SRC_NODE_SECOND_PASS_2_CONTAINERS</askppplt:name>
-          <askppplt:description>SRV6_SRC_NODE_SECOND_PASS_2_CONTAINERS</askppplt:description>
-          <askppplt:value>43</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>SRV6_SRC_NODE_SECOND_PASS_3_CONTAINERS</askppplt:name>
-          <askppplt:description>SRV6_SRC_NODE_SECOND_PASS_3_CONTAINERS</askppplt:description>
-          <askppplt:value>44</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>SRV6_END_NODE_COC32_GSID</askppplt:name>
-          <askppplt:description>SRV6_END_NODE_COC32_GSID</askppplt:description>
-          <askppplt:value>45</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>IPV4_TTL_INCREMENT</askppplt:name>
-          <askppplt:description>IPV4_TTL_INCREMENT</askppplt:description>
-          <askppplt:value>46</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>IPV6_HOP_LIMIT_INCREMENT</askppplt:name>
-          <askppplt:description>IPV6_HOP_LIMIT_INCREMENT</askppplt:description>
-          <askppplt:value>47</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>CLEAR_OUTGOING_MTAG_COMMAND</askppplt:name>
-          <askppplt:description>CLEAR_OUTGOING_MTAG_COMMAND</askppplt:description>
-          <askppplt:value>48</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>SFLOW_V5_IPV4</askppplt:name>
-          <askppplt:description>SFLOW_V5_IPV4</askppplt:description>
-          <askppplt:value>49</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>SFLOW_V5_IPV6</askppplt:name>
-          <askppplt:description>SFLOW_V5_IPV6</askppplt:description>
-          <askppplt:value>50</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>SLS</askppplt:name>
-          <askppplt:description>SLS</askppplt:description>
-          <askppplt:value>51</askppplt:value>
-        </askppplt:enum>
-      </askppplt:typedef>
-      <askppplt:typedef>
-        <askppplt:name>trunk-member-mode-type</askppplt:name>
-        <askppplt:type>enumeration</askppplt:type>
-        <askppplt:description>Specifies supported Pha image id</askppplt:description>
-        <askppplt:enum>
-          <askppplt:name>NATIVE</askppplt:name>
-          <askppplt:description>NATIVE
-   	 *  the trunk members are filled
-   	 *  according to the order given by application.
-   	 *  Regular trunk may hold max of 8 members.
-   	 *  Cascade trunk may hold :
-   	 *  max of 64 members</askppplt:description>
-          <askppplt:value>0</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>FLEX</askppplt:name>
-          <askppplt:description>FLEX
-   	 *  A mode to allows flexibility for
-   	 *  each Regular trunk to state it's max number of members (before starting to add members).
-   	 *  (this mode not effect 'cascade trunk' members)
-   	 *  Regular trunk may hold : max of 4K members. (each trunk set it's own limit)
-   	 *  Cascade trunk may hold : max of 64 members.</askppplt:description>
-          <askppplt:value>2</askppplt:value>
-        </askppplt:enum>
-      </askppplt:typedef>
-      <askppplt:typedef>
-        <askppplt:name>number-physical-port-type</askppplt:name>
-        <askppplt:type>enumeration</askppplt:type>
-        <askppplt:description>ac5x 128, falcon 64,128,256, 512, 1024</askppplt:description>
-        <askppplt:enum>
-          <askppplt:name>no-ports</askppplt:name>
-          <askppplt:description>no-ports</askppplt:description>
-          <askppplt:value>0</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>64-ports</askppplt:name>
-          <askppplt:description>64-ports</askppplt:description>
-          <askppplt:value>64</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>128-ports</askppplt:name>
-          <askppplt:description>128-ports</askppplt:description>
-          <askppplt:value>128</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>256-ports</askppplt:name>
-          <askppplt:description>256-ports</askppplt:description>
-          <askppplt:value>256</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>512-ports</askppplt:name>
-          <askppplt:description>512-ports</askppplt:description>
-          <askppplt:value>512</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>1024-ports</askppplt:name>
-          <askppplt:description>1024-ports</askppplt:description>
-          <askppplt:value>1024</askppplt:value>
-        </askppplt:enum>
-      </askppplt:typedef>
-      <askppplt:typedef>
-        <askppplt:name>serdes-ref-clock-type</askppplt:name>
-        <askppplt:type>enumeration</askppplt:type>
-        <askppplt:description>Specifies serdes refernce clock.</askppplt:description>
-        <askppplt:enum>
-          <askppplt:name>external_25_single_ended</askppplt:name>
-          <askppplt:description>EXTERNAL_25_SINGLE_ENDED</askppplt:description>
-          <askppplt:value>0</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>external_125_single_ended</askppplt:name>
-          <askppplt:description>EXTERNAL_125_SINGLE_ENDED</askppplt:description>
-          <askppplt:value>1</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>external_125_diff</askppplt:name>
-          <askppplt:description>EXTERNAL_125_DIFF</askppplt:description>
-          <askppplt:value>2</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>external_156_25_single_ended</askppplt:name>
-          <askppplt:description>EXTERNAL_156_25_SINGLE_ENDED</askppplt:description>
-          <askppplt:value>3</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>external_156_25_diff</askppplt:name>
-          <askppplt:description>EXTERNAL_156_25_DIFF</askppplt:description>
-          <askppplt:value>4</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>internal_125</askppplt:name>
-          <askppplt:description>INTERNAL_125</askppplt:description>
-          <askppplt:value>5</askppplt:value>
-        </askppplt:enum>
-      </askppplt:typedef>
-      <askppplt:typedef>
-        <askppplt:name>cpu-port-id-type</askppplt:name>
-        <askppplt:type>uint32</askppplt:type>
-        <askppplt:description>CPU port id</askppplt:description>
-        <askppplt:min>0</askppplt:min>
-        <askppplt:max>7</askppplt:max>
-      </askppplt:typedef>
-      <askppplt:typedef>
-        <askppplt:name>rx-buffer-size-type</askppplt:name>
-        <askppplt:type>uint32</askppplt:type>
-        <askppplt:description>Rx Buffer size</askppplt:description>
-        <askppplt:min>64</askppplt:min>
-        <askppplt:max>10240</askppplt:max>
-      </askppplt:typedef>
-      <askppplt:typedef>
-        <askppplt:name>tx-sdma-queue-mode-type</askppplt:name>
-        <askppplt:type>enumeration</askppplt:type>
-        <askppplt:description>Specifies TX queue mode.</askppplt:description>
-        <askppplt:enum>
-          <askppplt:name>Normal</askppplt:name>
-          <askppplt:description>Application</askppplt:description>
-          <askppplt:value>0</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>Packet_Generator</askppplt:name>
-          <askppplt:description>Traffic generator</askppplt:description>
-          <askppplt:value>1</askppplt:value>
-        </askppplt:enum>
-      </askppplt:typedef>
-      <askppplt:typedef>
-        <askppplt:name>alloc-method-type</askppplt:name>
-        <askppplt:type>enumeration</askppplt:type>
-        <askppplt:description>Specifies Buffers allocation method.</askppplt:description>
-        <askppplt:enum>
-          <askppplt:name>Dynamic_Alloc</askppplt:name>
-          <askppplt:description>Dynamic</askppplt:description>
-          <askppplt:value>0</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>Static_Alloc</askppplt:name>
-          <askppplt:description>Static</askppplt:description>
-          <askppplt:value>1</askppplt:value>
-        </askppplt:enum>
-      </askppplt:typedef>
-      <askppplt:typedef>
-        <askppplt:name>au_mesage_lenght-type</askppplt:name>
-        <askppplt:type>enumeration</askppplt:type>
-        <askppplt:description>Specifies Buffers allocation method.</askppplt:description>
-        <askppplt:enum>
-          <askppplt:name>4_words</askppplt:name>
-          <askppplt:description>4 Words</askppplt:description>
-          <askppplt:value>0</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>8_words</askppplt:name>
-          <askppplt:description>8 Words</askppplt:description>
-          <askppplt:value>1</askppplt:value>
-        </askppplt:enum>
-      </askppplt:typedef>
-      <askppplt:typedef>
-        <askppplt:name>boolean-type</askppplt:name>
-        <askppplt:type>enumeration</askppplt:type>
-        <askppplt:description>Boolean 32 bits , due to bing endian</askppplt:description>
-        <askppplt:enum>
-          <askppplt:name>false</askppplt:name>
-          <askppplt:description>False</askppplt:description>
-          <askppplt:value>0</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>true</askppplt:name>
-          <askppplt:description>True</askppplt:description>
-          <askppplt:value>1</askppplt:value>
-        </askppplt:enum>
-      </askppplt:typedef>
-    </askppplt:typedefs>
-    <askppplt:PPInit>
-      <askppplt:PP-name askppplt:type="std-string">AC5X-RD</askppplt:PP-name>
-      <askppplt:Phase1>
-        <askppplt:coreClock askppplt:type="uint32">4294967295</askppplt:coreClock>
-        <askppplt:serdesRefClock askppplt:type="serdes-ref-clock-type">external_25_single_ended</askppplt:serdesRefClock>
-        <askppplt:isrAddrCompletionRegionsBmp askppplt:type="uint32">2</askppplt:isrAddrCompletionRegionsBmp>
-        <askppplt:appAddrCompletionRegionsBmp askppplt:type="uint32">60</askppplt:appAddrCompletionRegionsBmp>
-        <askppplt:maxNumOfPhyPortsToUse askppplt:type="number-physical-port-type">128-ports</askppplt:maxNumOfPhyPortsToUse>
-        <askppplt:tcamParityCalcEnable askppplt:type="boolean-type">false</askppplt:tcamParityCalcEnable>
-        <askppplt:apEnable askppplt:type="boolean-type">false</askppplt:apEnable>
-        <askppplt:numOfDataIntegrityElements askppplt:type="uint32">0</askppplt:numOfDataIntegrityElements>
-      </askppplt:Phase1>
-      <askppplt:Phase2>
-        <askppplt:useMultiNetIfSdma askppplt:type="boolean-type">true</askppplt:useMultiNetIfSdma>
-        <askppplt:auqCfg>
-          <askppplt:auDescNum askppplt:type="uint32">4096</askppplt:auDescNum>
-        </askppplt:auqCfg>
-        <askppplt:fuqCfg>
-          <askppplt:fuDescNum askppplt:type="uint32">2048</askppplt:fuDescNum>
-        </askppplt:fuqCfg>
-        <askppplt:multiNetIfCfg>
-          <askppplt:rxSdmaQueuesConfig-list>
-            <askppplt:rx_sdma_cpu_port askppplt:type="cpu-port-id-type">0</askppplt:rx_sdma_cpu_port>
-            <askppplt:rx_sdma_cpu_queue askppplt:type="queue-id-type">0</askppplt:rx_sdma_cpu_queue>
-            <askppplt:buffAllocMethod askppplt:type="alloc-method-type">Static_Alloc</askppplt:buffAllocMethod>
-            <askppplt:numOfRxDesc askppplt:type="uint32">20</askppplt:numOfRxDesc>
-            <askppplt:numOfRxBuff askppplt:type="uint32">20</askppplt:numOfRxBuff>
-            <askppplt:buffSize askppplt:type="rx-buffer-size-type">2048</askppplt:buffSize>
-            <askppplt:buffHeaderOffset askppplt:type="uint32">0</askppplt:buffHeaderOffset>
-          </askppplt:rxSdmaQueuesConfig-list>
-          <askppplt:rxSdmaQueuesConfig-list>
-            <askppplt:rx_sdma_cpu_port askppplt:type="cpu-port-id-type">1</askppplt:rx_sdma_cpu_port>
-            <askppplt:rx_sdma_cpu_queue askppplt:type="queue-id-type">7</askppplt:rx_sdma_cpu_queue>
-            <askppplt:buffAllocMethod askppplt:type="alloc-method-type">Static_Alloc</askppplt:buffAllocMethod>
-            <askppplt:numOfRxDesc askppplt:type="uint32">20</askppplt:numOfRxDesc>
-            <askppplt:numOfRxBuff askppplt:type="uint32">20</askppplt:numOfRxBuff>
-            <askppplt:buffSize askppplt:type="rx-buffer-size-type">2048</askppplt:buffSize>
-            <askppplt:buffHeaderOffset askppplt:type="uint32">0</askppplt:buffHeaderOffset>
-          </askppplt:rxSdmaQueuesConfig-list>
-          <askppplt:rxSdmaQueuesConfig-list>
-            <askppplt:rx_sdma_cpu_port askppplt:type="cpu-port-id-type">1</askppplt:rx_sdma_cpu_port>
-            <askppplt:rx_sdma_cpu_queue askppplt:type="queue-id-type">6</askppplt:rx_sdma_cpu_queue>
-            <askppplt:buffAllocMethod askppplt:type="alloc-method-type">Static_Alloc</askppplt:buffAllocMethod>
-            <askppplt:numOfRxDesc askppplt:type="uint32">20</askppplt:numOfRxDesc>
-            <askppplt:numOfRxBuff askppplt:type="uint32">20</askppplt:numOfRxBuff>
-            <askppplt:buffSize askppplt:type="rx-buffer-size-type">2048</askppplt:buffSize>
-            <askppplt:buffHeaderOffset askppplt:type="uint32">0</askppplt:buffHeaderOffset>
-          </askppplt:rxSdmaQueuesConfig-list>
-          <askppplt:rxSdmaQueuesConfig-list>
-            <askppplt:rx_sdma_cpu_port askppplt:type="cpu-port-id-type">1</askppplt:rx_sdma_cpu_port>
-            <askppplt:rx_sdma_cpu_queue askppplt:type="queue-id-type">5</askppplt:rx_sdma_cpu_queue>
-            <askppplt:buffAllocMethod askppplt:type="alloc-method-type">Static_Alloc</askppplt:buffAllocMethod>
-            <askppplt:numOfRxDesc askppplt:type="uint32">20</askppplt:numOfRxDesc>
-            <askppplt:numOfRxBuff askppplt:type="uint32">20</askppplt:numOfRxBuff>
-            <askppplt:buffSize askppplt:type="rx-buffer-size-type">2048</askppplt:buffSize>
-            <askppplt:buffHeaderOffset askppplt:type="uint32">0</askppplt:buffHeaderOffset>
-          </askppplt:rxSdmaQueuesConfig-list>
-          <askppplt:rxSdmaQueuesConfig-list>
-            <askppplt:rx_sdma_cpu_port askppplt:type="cpu-port-id-type">1</askppplt:rx_sdma_cpu_port>
-            <askppplt:rx_sdma_cpu_queue askppplt:type="queue-id-type">4</askppplt:rx_sdma_cpu_queue>
-            <askppplt:buffAllocMethod askppplt:type="alloc-method-type">Static_Alloc</askppplt:buffAllocMethod>
-            <askppplt:numOfRxDesc askppplt:type="uint32">20</askppplt:numOfRxDesc>
-            <askppplt:numOfRxBuff askppplt:type="uint32">20</askppplt:numOfRxBuff>
-            <askppplt:buffSize askppplt:type="rx-buffer-size-type">2048</askppplt:buffSize>
-            <askppplt:buffHeaderOffset askppplt:type="uint32">0</askppplt:buffHeaderOffset>
-          </askppplt:rxSdmaQueuesConfig-list>
-          <askppplt:rxSdmaQueuesConfig-list>
-            <askppplt:rx_sdma_cpu_port askppplt:type="cpu-port-id-type">1</askppplt:rx_sdma_cpu_port>
-            <askppplt:rx_sdma_cpu_queue askppplt:type="queue-id-type">3</askppplt:rx_sdma_cpu_queue>
-            <askppplt:buffAllocMethod askppplt:type="alloc-method-type">Static_Alloc</askppplt:buffAllocMethod>
-            <askppplt:numOfRxDesc askppplt:type="uint32">20</askppplt:numOfRxDesc>
-            <askppplt:numOfRxBuff askppplt:type="uint32">20</askppplt:numOfRxBuff>
-            <askppplt:buffSize askppplt:type="rx-buffer-size-type">2048</askppplt:buffSize>
-            <askppplt:buffHeaderOffset askppplt:type="uint32">0</askppplt:buffHeaderOffset>
-          </askppplt:rxSdmaQueuesConfig-list>
-          <askppplt:rxSdmaQueuesConfig-list>
-            <askppplt:rx_sdma_cpu_port askppplt:type="cpu-port-id-type">1</askppplt:rx_sdma_cpu_port>
-            <askppplt:rx_sdma_cpu_queue askppplt:type="queue-id-type">2</askppplt:rx_sdma_cpu_queue>
-            <askppplt:buffAllocMethod askppplt:type="alloc-method-type">Static_Alloc</askppplt:buffAllocMethod>
-            <askppplt:numOfRxDesc askppplt:type="uint32">20</askppplt:numOfRxDesc>
-            <askppplt:numOfRxBuff askppplt:type="uint32">20</askppplt:numOfRxBuff>
-            <askppplt:buffSize askppplt:type="rx-buffer-size-type">2048</askppplt:buffSize>
-            <askppplt:buffHeaderOffset askppplt:type="uint32">0</askppplt:buffHeaderOffset>
-          </askppplt:rxSdmaQueuesConfig-list>
-          <askppplt:rxSdmaQueuesConfig-list>
-            <askppplt:rx_sdma_cpu_port askppplt:type="cpu-port-id-type">1</askppplt:rx_sdma_cpu_port>
-            <askppplt:rx_sdma_cpu_queue askppplt:type="queue-id-type">1</askppplt:rx_sdma_cpu_queue>
-            <askppplt:buffAllocMethod askppplt:type="alloc-method-type">Static_Alloc</askppplt:buffAllocMethod>
-            <askppplt:numOfRxDesc askppplt:type="uint32">20</askppplt:numOfRxDesc>
-            <askppplt:numOfRxBuff askppplt:type="uint32">20</askppplt:numOfRxBuff>
-            <askppplt:buffSize askppplt:type="rx-buffer-size-type">2048</askppplt:buffSize>
-            <askppplt:buffHeaderOffset askppplt:type="uint32">0</askppplt:buffHeaderOffset>
-          </askppplt:rxSdmaQueuesConfig-list>
-          <askppplt:rxSdmaQueuesConfig-list>
-            <askppplt:rx_sdma_cpu_port askppplt:type="cpu-port-id-type">1</askppplt:rx_sdma_cpu_port>
-            <askppplt:rx_sdma_cpu_queue askppplt:type="queue-id-type">0</askppplt:rx_sdma_cpu_queue>
-            <askppplt:buffAllocMethod askppplt:type="alloc-method-type">Static_Alloc</askppplt:buffAllocMethod>
-            <askppplt:numOfRxDesc askppplt:type="uint32">20</askppplt:numOfRxDesc>
-            <askppplt:numOfRxBuff askppplt:type="uint32">20</askppplt:numOfRxBuff>
-            <askppplt:buffSize askppplt:type="rx-buffer-size-type">2048</askppplt:buffSize>
-            <askppplt:buffHeaderOffset askppplt:type="uint32">0</askppplt:buffHeaderOffset>
-          </askppplt:rxSdmaQueuesConfig-list>
-          <askppplt:rxSdmaQueuesConfig-list>
-            <askppplt:rx_sdma_cpu_port askppplt:type="cpu-port-id-type">0</askppplt:rx_sdma_cpu_port>
-            <askppplt:rx_sdma_cpu_queue askppplt:type="queue-id-type">7</askppplt:rx_sdma_cpu_queue>
-            <askppplt:buffAllocMethod askppplt:type="alloc-method-type">Static_Alloc</askppplt:buffAllocMethod>
-            <askppplt:numOfRxDesc askppplt:type="uint32">20</askppplt:numOfRxDesc>
-            <askppplt:numOfRxBuff askppplt:type="uint32">20</askppplt:numOfRxBuff>
-            <askppplt:buffSize askppplt:type="rx-buffer-size-type">2048</askppplt:buffSize>
-            <askppplt:buffHeaderOffset askppplt:type="uint32">0</askppplt:buffHeaderOffset>
-          </askppplt:rxSdmaQueuesConfig-list>
-          <askppplt:rxSdmaQueuesConfig-list>
-            <askppplt:rx_sdma_cpu_port askppplt:type="cpu-port-id-type">0</askppplt:rx_sdma_cpu_port>
-            <askppplt:rx_sdma_cpu_queue askppplt:type="queue-id-type">6</askppplt:rx_sdma_cpu_queue>
-            <askppplt:buffAllocMethod askppplt:type="alloc-method-type">Static_Alloc</askppplt:buffAllocMethod>
-            <askppplt:numOfRxDesc askppplt:type="uint32">20</askppplt:numOfRxDesc>
-            <askppplt:numOfRxBuff askppplt:type="uint32">20</askppplt:numOfRxBuff>
-            <askppplt:buffSize askppplt:type="rx-buffer-size-type">2048</askppplt:buffSize>
-            <askppplt:buffHeaderOffset askppplt:type="uint32">0</askppplt:buffHeaderOffset>
-          </askppplt:rxSdmaQueuesConfig-list>
-          <askppplt:rxSdmaQueuesConfig-list>
-            <askppplt:rx_sdma_cpu_port askppplt:type="cpu-port-id-type">0</askppplt:rx_sdma_cpu_port>
-            <askppplt:rx_sdma_cpu_queue askppplt:type="queue-id-type">5</askppplt:rx_sdma_cpu_queue>
-            <askppplt:buffAllocMethod askppplt:type="alloc-method-type">Static_Alloc</askppplt:buffAllocMethod>
-            <askppplt:numOfRxDesc askppplt:type="uint32">20</askppplt:numOfRxDesc>
-            <askppplt:numOfRxBuff askppplt:type="uint32">20</askppplt:numOfRxBuff>
-            <askppplt:buffSize askppplt:type="rx-buffer-size-type">2048</askppplt:buffSize>
-            <askppplt:buffHeaderOffset askppplt:type="uint32">0</askppplt:buffHeaderOffset>
-          </askppplt:rxSdmaQueuesConfig-list>
-          <askppplt:rxSdmaQueuesConfig-list>
-            <askppplt:rx_sdma_cpu_port askppplt:type="cpu-port-id-type">0</askppplt:rx_sdma_cpu_port>
-            <askppplt:rx_sdma_cpu_queue askppplt:type="queue-id-type">4</askppplt:rx_sdma_cpu_queue>
-            <askppplt:buffAllocMethod askppplt:type="alloc-method-type">Static_Alloc</askppplt:buffAllocMethod>
-            <askppplt:numOfRxDesc askppplt:type="uint32">20</askppplt:numOfRxDesc>
-            <askppplt:numOfRxBuff askppplt:type="uint32">20</askppplt:numOfRxBuff>
-            <askppplt:buffSize askppplt:type="rx-buffer-size-type">2048</askppplt:buffSize>
-            <askppplt:buffHeaderOffset askppplt:type="uint32">0</askppplt:buffHeaderOffset>
-          </askppplt:rxSdmaQueuesConfig-list>
-          <askppplt:rxSdmaQueuesConfig-list>
-            <askppplt:rx_sdma_cpu_port askppplt:type="cpu-port-id-type">0</askppplt:rx_sdma_cpu_port>
-            <askppplt:rx_sdma_cpu_queue askppplt:type="queue-id-type">3</askppplt:rx_sdma_cpu_queue>
-            <askppplt:buffAllocMethod askppplt:type="alloc-method-type">Static_Alloc</askppplt:buffAllocMethod>
-            <askppplt:numOfRxDesc askppplt:type="uint32">20</askppplt:numOfRxDesc>
-            <askppplt:numOfRxBuff askppplt:type="uint32">20</askppplt:numOfRxBuff>
-            <askppplt:buffSize askppplt:type="rx-buffer-size-type">2048</askppplt:buffSize>
-            <askppplt:buffHeaderOffset askppplt:type="uint32">0</askppplt:buffHeaderOffset>
-          </askppplt:rxSdmaQueuesConfig-list>
-          <askppplt:rxSdmaQueuesConfig-list>
-            <askppplt:rx_sdma_cpu_port askppplt:type="cpu-port-id-type">0</askppplt:rx_sdma_cpu_port>
-            <askppplt:rx_sdma_cpu_queue askppplt:type="queue-id-type">2</askppplt:rx_sdma_cpu_queue>
-            <askppplt:buffAllocMethod askppplt:type="alloc-method-type">Static_Alloc</askppplt:buffAllocMethod>
-            <askppplt:numOfRxDesc askppplt:type="uint32">20</askppplt:numOfRxDesc>
-            <askppplt:numOfRxBuff askppplt:type="uint32">20</askppplt:numOfRxBuff>
-            <askppplt:buffSize askppplt:type="rx-buffer-size-type">2048</askppplt:buffSize>
-            <askppplt:buffHeaderOffset askppplt:type="uint32">0</askppplt:buffHeaderOffset>
-          </askppplt:rxSdmaQueuesConfig-list>
-          <askppplt:rxSdmaQueuesConfig-list>
-            <askppplt:rx_sdma_cpu_port askppplt:type="cpu-port-id-type">0</askppplt:rx_sdma_cpu_port>
-            <askppplt:rx_sdma_cpu_queue askppplt:type="queue-id-type">1</askppplt:rx_sdma_cpu_queue>
-            <askppplt:buffAllocMethod askppplt:type="alloc-method-type">Static_Alloc</askppplt:buffAllocMethod>
-            <askppplt:numOfRxDesc askppplt:type="uint32">20</askppplt:numOfRxDesc>
-            <askppplt:numOfRxBuff askppplt:type="uint32">20</askppplt:numOfRxBuff>
-            <askppplt:buffSize askppplt:type="rx-buffer-size-type">2048</askppplt:buffSize>
-            <askppplt:buffHeaderOffset askppplt:type="uint32">0</askppplt:buffHeaderOffset>
-          </askppplt:rxSdmaQueuesConfig-list>
-          <askppplt:txSdmaQueuesConfig-list>
-            <askppplt:tx_sdma_cpu_port askppplt:type="cpu-port-id-type">0</askppplt:tx_sdma_cpu_port>
-            <askppplt:tx_sdma_cpu_queue askppplt:type="queue-id-type">0</askppplt:tx_sdma_cpu_queue>
-            <askppplt:buffAndDescAllocMethod askppplt:type="alloc-method-type">Static_Alloc</askppplt:buffAndDescAllocMethod>
-            <askppplt:queueMode askppplt:type="tx-sdma-queue-mode-type">Normal</askppplt:queueMode>
-            <askppplt:numOfTxDesc askppplt:type="uint32">20</askppplt:numOfTxDesc>
-            <askppplt:numOfTxBuff askppplt:type="uint32">0</askppplt:numOfTxBuff>
-            <askppplt:TxBuffSize askppplt:type="rx-buffer-size-type">128</askppplt:TxBuffSize>
-          </askppplt:txSdmaQueuesConfig-list>
-          <askppplt:txSdmaQueuesConfig-list>
-            <askppplt:tx_sdma_cpu_port askppplt:type="cpu-port-id-type">0</askppplt:tx_sdma_cpu_port>
-            <askppplt:tx_sdma_cpu_queue askppplt:type="queue-id-type">1</askppplt:tx_sdma_cpu_queue>
-            <askppplt:buffAndDescAllocMethod askppplt:type="alloc-method-type">Static_Alloc</askppplt:buffAndDescAllocMethod>
-            <askppplt:queueMode askppplt:type="tx-sdma-queue-mode-type">Normal</askppplt:queueMode>
-            <askppplt:numOfTxDesc askppplt:type="uint32">20</askppplt:numOfTxDesc>
-            <askppplt:numOfTxBuff askppplt:type="uint32">0</askppplt:numOfTxBuff>
-            <askppplt:TxBuffSize askppplt:type="rx-buffer-size-type">128</askppplt:TxBuffSize>
-          </askppplt:txSdmaQueuesConfig-list>
-          <askppplt:txSdmaQueuesConfig-list>
-            <askppplt:tx_sdma_cpu_port askppplt:type="cpu-port-id-type">0</askppplt:tx_sdma_cpu_port>
-            <askppplt:tx_sdma_cpu_queue askppplt:type="queue-id-type">2</askppplt:tx_sdma_cpu_queue>
-            <askppplt:buffAndDescAllocMethod askppplt:type="alloc-method-type">Static_Alloc</askppplt:buffAndDescAllocMethod>
-            <askppplt:queueMode askppplt:type="tx-sdma-queue-mode-type">Normal</askppplt:queueMode>
-            <askppplt:numOfTxDesc askppplt:type="uint32">20</askppplt:numOfTxDesc>
-            <askppplt:numOfTxBuff askppplt:type="uint32">0</askppplt:numOfTxBuff>
-            <askppplt:TxBuffSize askppplt:type="rx-buffer-size-type">128</askppplt:TxBuffSize>
-          </askppplt:txSdmaQueuesConfig-list>
-          <askppplt:txSdmaQueuesConfig-list>
-            <askppplt:tx_sdma_cpu_port askppplt:type="cpu-port-id-type">0</askppplt:tx_sdma_cpu_port>
-            <askppplt:tx_sdma_cpu_queue askppplt:type="queue-id-type">3</askppplt:tx_sdma_cpu_queue>
-            <askppplt:buffAndDescAllocMethod askppplt:type="alloc-method-type">Static_Alloc</askppplt:buffAndDescAllocMethod>
-            <askppplt:queueMode askppplt:type="tx-sdma-queue-mode-type">Normal</askppplt:queueMode>
-            <askppplt:numOfTxDesc askppplt:type="uint32">20</askppplt:numOfTxDesc>
-            <askppplt:numOfTxBuff askppplt:type="uint32">0</askppplt:numOfTxBuff>
-            <askppplt:TxBuffSize askppplt:type="rx-buffer-size-type">128</askppplt:TxBuffSize>
-          </askppplt:txSdmaQueuesConfig-list>
-          <askppplt:txSdmaQueuesConfig-list>
-            <askppplt:tx_sdma_cpu_port askppplt:type="cpu-port-id-type">0</askppplt:tx_sdma_cpu_port>
-            <askppplt:tx_sdma_cpu_queue askppplt:type="queue-id-type">4</askppplt:tx_sdma_cpu_queue>
-            <askppplt:buffAndDescAllocMethod askppplt:type="alloc-method-type">Static_Alloc</askppplt:buffAndDescAllocMethod>
-            <askppplt:queueMode askppplt:type="tx-sdma-queue-mode-type">Normal</askppplt:queueMode>
-            <askppplt:numOfTxDesc askppplt:type="uint32">20</askppplt:numOfTxDesc>
-            <askppplt:numOfTxBuff askppplt:type="uint32">0</askppplt:numOfTxBuff>
-            <askppplt:TxBuffSize askppplt:type="rx-buffer-size-type">128</askppplt:TxBuffSize>
-          </askppplt:txSdmaQueuesConfig-list>
-          <askppplt:txSdmaQueuesConfig-list>
-            <askppplt:tx_sdma_cpu_port askppplt:type="cpu-port-id-type">0</askppplt:tx_sdma_cpu_port>
-            <askppplt:tx_sdma_cpu_queue askppplt:type="queue-id-type">5</askppplt:tx_sdma_cpu_queue>
-            <askppplt:buffAndDescAllocMethod askppplt:type="alloc-method-type">Static_Alloc</askppplt:buffAndDescAllocMethod>
-            <askppplt:queueMode askppplt:type="tx-sdma-queue-mode-type">Normal</askppplt:queueMode>
-            <askppplt:numOfTxDesc askppplt:type="uint32">20</askppplt:numOfTxDesc>
-            <askppplt:numOfTxBuff askppplt:type="uint32">0</askppplt:numOfTxBuff>
-            <askppplt:TxBuffSize askppplt:type="rx-buffer-size-type">128</askppplt:TxBuffSize>
-          </askppplt:txSdmaQueuesConfig-list>
-          <askppplt:txSdmaQueuesConfig-list>
-            <askppplt:tx_sdma_cpu_port askppplt:type="cpu-port-id-type">0</askppplt:tx_sdma_cpu_port>
-            <askppplt:tx_sdma_cpu_queue askppplt:type="queue-id-type">6</askppplt:tx_sdma_cpu_queue>
-            <askppplt:buffAndDescAllocMethod askppplt:type="alloc-method-type">Static_Alloc</askppplt:buffAndDescAllocMethod>
-            <askppplt:queueMode askppplt:type="tx-sdma-queue-mode-type">Normal</askppplt:queueMode>
-            <askppplt:numOfTxDesc askppplt:type="uint32">20</askppplt:numOfTxDesc>
-            <askppplt:numOfTxBuff askppplt:type="uint32">0</askppplt:numOfTxBuff>
-            <askppplt:TxBuffSize askppplt:type="rx-buffer-size-type">128</askppplt:TxBuffSize>
-          </askppplt:txSdmaQueuesConfig-list>
-          <askppplt:txSdmaQueuesConfig-list>
-            <askppplt:tx_sdma_cpu_port askppplt:type="cpu-port-id-type">0</askppplt:tx_sdma_cpu_port>
-            <askppplt:tx_sdma_cpu_queue askppplt:type="queue-id-type">7</askppplt:tx_sdma_cpu_queue>
-            <askppplt:buffAndDescAllocMethod askppplt:type="alloc-method-type">Static_Alloc</askppplt:buffAndDescAllocMethod>
-            <askppplt:queueMode askppplt:type="tx-sdma-queue-mode-type">Normal</askppplt:queueMode>
-            <askppplt:numOfTxDesc askppplt:type="uint32">20</askppplt:numOfTxDesc>
-            <askppplt:numOfTxBuff askppplt:type="uint32">0</askppplt:numOfTxBuff>
-            <askppplt:TxBuffSize askppplt:type="rx-buffer-size-type">128</askppplt:TxBuffSize>
-          </askppplt:txSdmaQueuesConfig-list>
-          <askppplt:txSdmaQueuesConfig-list>
-            <askppplt:tx_sdma_cpu_port askppplt:type="cpu-port-id-type">1</askppplt:tx_sdma_cpu_port>
-            <askppplt:tx_sdma_cpu_queue askppplt:type="queue-id-type">0</askppplt:tx_sdma_cpu_queue>
-            <askppplt:buffAndDescAllocMethod askppplt:type="alloc-method-type">Static_Alloc</askppplt:buffAndDescAllocMethod>
-            <askppplt:queueMode askppplt:type="tx-sdma-queue-mode-type">Normal</askppplt:queueMode>
-            <askppplt:numOfTxDesc askppplt:type="uint32">20</askppplt:numOfTxDesc>
-            <askppplt:numOfTxBuff askppplt:type="uint32">0</askppplt:numOfTxBuff>
-            <askppplt:TxBuffSize askppplt:type="rx-buffer-size-type">128</askppplt:TxBuffSize>
-          </askppplt:txSdmaQueuesConfig-list>
-          <askppplt:txSdmaQueuesConfig-list>
-            <askppplt:tx_sdma_cpu_port askppplt:type="cpu-port-id-type">1</askppplt:tx_sdma_cpu_port>
-            <askppplt:tx_sdma_cpu_queue askppplt:type="queue-id-type">1</askppplt:tx_sdma_cpu_queue>
-            <askppplt:buffAndDescAllocMethod askppplt:type="alloc-method-type">Static_Alloc</askppplt:buffAndDescAllocMethod>
-            <askppplt:queueMode askppplt:type="tx-sdma-queue-mode-type">Normal</askppplt:queueMode>
-            <askppplt:numOfTxDesc askppplt:type="uint32">20</askppplt:numOfTxDesc>
-            <askppplt:numOfTxBuff askppplt:type="uint32">0</askppplt:numOfTxBuff>
-            <askppplt:TxBuffSize askppplt:type="rx-buffer-size-type">128</askppplt:TxBuffSize>
-          </askppplt:txSdmaQueuesConfig-list>
-          <askppplt:txSdmaQueuesConfig-list>
-            <askppplt:tx_sdma_cpu_port askppplt:type="cpu-port-id-type">1</askppplt:tx_sdma_cpu_port>
-            <askppplt:tx_sdma_cpu_queue askppplt:type="queue-id-type">2</askppplt:tx_sdma_cpu_queue>
-            <askppplt:buffAndDescAllocMethod askppplt:type="alloc-method-type">Static_Alloc</askppplt:buffAndDescAllocMethod>
-            <askppplt:queueMode askppplt:type="tx-sdma-queue-mode-type">Normal</askppplt:queueMode>
-            <askppplt:numOfTxDesc askppplt:type="uint32">20</askppplt:numOfTxDesc>
-            <askppplt:numOfTxBuff askppplt:type="uint32">0</askppplt:numOfTxBuff>
-            <askppplt:TxBuffSize askppplt:type="rx-buffer-size-type">128</askppplt:TxBuffSize>
-          </askppplt:txSdmaQueuesConfig-list>
-          <askppplt:txSdmaQueuesConfig-list>
-            <askppplt:tx_sdma_cpu_port askppplt:type="cpu-port-id-type">1</askppplt:tx_sdma_cpu_port>
-            <askppplt:tx_sdma_cpu_queue askppplt:type="queue-id-type">3</askppplt:tx_sdma_cpu_queue>
-            <askppplt:buffAndDescAllocMethod askppplt:type="alloc-method-type">Static_Alloc</askppplt:buffAndDescAllocMethod>
-            <askppplt:queueMode askppplt:type="tx-sdma-queue-mode-type">Normal</askppplt:queueMode>
-            <askppplt:numOfTxDesc askppplt:type="uint32">20</askppplt:numOfTxDesc>
-            <askppplt:numOfTxBuff askppplt:type="uint32">0</askppplt:numOfTxBuff>
-            <askppplt:TxBuffSize askppplt:type="rx-buffer-size-type">128</askppplt:TxBuffSize>
-          </askppplt:txSdmaQueuesConfig-list>
-          <askppplt:txSdmaQueuesConfig-list>
-            <askppplt:tx_sdma_cpu_port askppplt:type="cpu-port-id-type">1</askppplt:tx_sdma_cpu_port>
-            <askppplt:tx_sdma_cpu_queue askppplt:type="queue-id-type">4</askppplt:tx_sdma_cpu_queue>
-            <askppplt:buffAndDescAllocMethod askppplt:type="alloc-method-type">Static_Alloc</askppplt:buffAndDescAllocMethod>
-            <askppplt:queueMode askppplt:type="tx-sdma-queue-mode-type">Normal</askppplt:queueMode>
-            <askppplt:numOfTxDesc askppplt:type="uint32">20</askppplt:numOfTxDesc>
-            <askppplt:numOfTxBuff askppplt:type="uint32">0</askppplt:numOfTxBuff>
-            <askppplt:TxBuffSize askppplt:type="rx-buffer-size-type">128</askppplt:TxBuffSize>
-          </askppplt:txSdmaQueuesConfig-list>
-          <askppplt:txSdmaQueuesConfig-list>
-            <askppplt:tx_sdma_cpu_port askppplt:type="cpu-port-id-type">1</askppplt:tx_sdma_cpu_port>
-            <askppplt:tx_sdma_cpu_queue askppplt:type="queue-id-type">5</askppplt:tx_sdma_cpu_queue>
-            <askppplt:buffAndDescAllocMethod askppplt:type="alloc-method-type">Static_Alloc</askppplt:buffAndDescAllocMethod>
-            <askppplt:queueMode askppplt:type="tx-sdma-queue-mode-type">Normal</askppplt:queueMode>
-            <askppplt:numOfTxDesc askppplt:type="uint32">20</askppplt:numOfTxDesc>
-            <askppplt:numOfTxBuff askppplt:type="uint32">0</askppplt:numOfTxBuff>
-            <askppplt:TxBuffSize askppplt:type="rx-buffer-size-type">128</askppplt:TxBuffSize>
-          </askppplt:txSdmaQueuesConfig-list>
-          <askppplt:txSdmaQueuesConfig-list>
-            <askppplt:tx_sdma_cpu_port askppplt:type="cpu-port-id-type">1</askppplt:tx_sdma_cpu_port>
-            <askppplt:tx_sdma_cpu_queue askppplt:type="queue-id-type">6</askppplt:tx_sdma_cpu_queue>
-            <askppplt:buffAndDescAllocMethod askppplt:type="alloc-method-type">Static_Alloc</askppplt:buffAndDescAllocMethod>
-            <askppplt:queueMode askppplt:type="tx-sdma-queue-mode-type">Normal</askppplt:queueMode>
-            <askppplt:numOfTxDesc askppplt:type="uint32">20</askppplt:numOfTxDesc>
-            <askppplt:numOfTxBuff askppplt:type="uint32">0</askppplt:numOfTxBuff>
-            <askppplt:TxBuffSize askppplt:type="rx-buffer-size-type">128</askppplt:TxBuffSize>
-          </askppplt:txSdmaQueuesConfig-list>
-          <askppplt:txSdmaQueuesConfig-list>
-            <askppplt:tx_sdma_cpu_port askppplt:type="cpu-port-id-type">1</askppplt:tx_sdma_cpu_port>
-            <askppplt:tx_sdma_cpu_queue askppplt:type="queue-id-type">7</askppplt:tx_sdma_cpu_queue>
-            <askppplt:buffAndDescAllocMethod askppplt:type="alloc-method-type">Static_Alloc</askppplt:buffAndDescAllocMethod>
-            <askppplt:queueMode askppplt:type="tx-sdma-queue-mode-type">Normal</askppplt:queueMode>
-            <askppplt:numOfTxDesc askppplt:type="uint32">20</askppplt:numOfTxDesc>
-            <askppplt:numOfTxBuff askppplt:type="uint32">0</askppplt:numOfTxBuff>
-            <askppplt:TxBuffSize askppplt:type="rx-buffer-size-type">128</askppplt:TxBuffSize>
-          </askppplt:txSdmaQueuesConfig-list>
-        </askppplt:multiNetIfCfg>
-        <askppplt:internal>
-          <askppplt:fuqUseSeparate askppplt:type="boolean-type">false</askppplt:fuqUseSeparate>
-          <askppplt:useSecondaryAuq askppplt:type="boolean-type">false</askppplt:useSecondaryAuq>
-          <askppplt:noTraffic2CPU askppplt:type="boolean-type">false</askppplt:noTraffic2CPU>
-          <askppplt:netifSdmaPortGroupId askppplt:type="uint32">0</askppplt:netifSdmaPortGroupId>
-          <askppplt:auMessageLength askppplt:type="au_mesage_lenght-type">8_words</askppplt:auMessageLength>
-          <askppplt:useDoubleAuq askppplt:type="boolean-type">false</askppplt:useDoubleAuq>
-        </askppplt:internal>
-      </askppplt:Phase2>
-      <askppplt:LogicalInit>
-        <askppplt:routingMode askppplt:type="routing-mode-type">TCAM_ROUTER_BASED</askppplt:routingMode>
-        <askppplt:maxNumOfPbrEntries askppplt:type="uint32">0</askppplt:maxNumOfPbrEntries>
-        <askppplt:sharedTableMode askppplt:type="shared-table-mode-type">MID_L3_MID_L2_NO_EM</askppplt:sharedTableMode>
-        <askppplt:ingressDropEnable askppplt:type="boolean-type">true</askppplt:ingressDropEnable>
-      </askppplt:LogicalInit>
-      <askppplt:LibInit>
-        <askppplt:initBridge askppplt:type="boolean-type">true</askppplt:initBridge>
-        <askppplt:initMirror askppplt:type="boolean-type">true</askppplt:initMirror>
-        <askppplt:initNetIf askppplt:type="boolean-type">true</askppplt:initNetIf>
-        <askppplt:initPhy askppplt:type="boolean-type">true</askppplt:initPhy>
-        <askppplt:initPort askppplt:type="boolean-type">true</askppplt:initPort>
-        <askppplt:initTrunk askppplt:type="boolean-type">true</askppplt:initTrunk>
-        <askppplt:Trunk-params>
-          <askppplt:maxNumberOfTrunks askppplt:type="uint32">511</askppplt:maxNumberOfTrunks>
-          <askppplt:trunkMembersMode askppplt:type="trunk-member-mode-type">FLEX</askppplt:trunkMembersMode>
-        </askppplt:Trunk-params>
-        <askppplt:initPcl askppplt:type="boolean-type">true</askppplt:initPcl>
-        <askppplt:initTcam askppplt:type="boolean-type">true</askppplt:initTcam>
-        <askppplt:initPolicer askppplt:type="boolean-type">true</askppplt:initPolicer>
-        <askppplt:initPha askppplt:type="boolean-type">true</askppplt:initPha>
-        <askppplt:Pha-params>
-          <askppplt:packetOrderChangeEnable askppplt:type="boolean-type">false</askppplt:packetOrderChangeEnable>
-          <askppplt:phaFwImageId askppplt:type="pha-firmware-image-id-type">01</askppplt:phaFwImageId>
-          <askppplt:phaFwImageIdVersion askppplt:type="uint32">0</askppplt:phaFwImageIdVersion>
-        </askppplt:Pha-params>
-      </askppplt:LibInit>
-    </askppplt:PPInit>
-  </askppplt:ASK-PP>
-</data>
--- a/device/marvell/arm64-marvell_rd98DX35xx-r0/rd98DX35xx/SAI-AC5X-RD-32x1G-16x2_5G-6x25G.md5
+++ b/device/marvell/arm64-marvell_rd98DX35xx-r0/rd98DX35xx/SAI-AC5X-RD-32x1G-16x2_5G-6x25G.md5
@ -1 +0,0 @@
-079a2fcdb8fe1d1f0cf39e3c40e6dd36
--- a/device/marvell/arm64-marvell_rd98DX35xx-r0/rd98DX35xx/SAI-AC5X-RD-32x1G-16x2_5G-6x25G.xml
+++ b/device/marvell/arm64-marvell_rd98DX35xx-r0/rd98DX35xx/SAI-AC5X-RD-32x1G-16x2_5G-6x25G.xml
@ -1,346 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" version="2023-05-05-1.04" profile="SAI" dsig="md5">
-  <SAIplt:SAI xmlns:SAIplt="urn:marvell:SAI:yang">
-    <SAIplt:typedefs>
-      <SAIplt:typedef>
-        <SAIplt:name>device-id-type</SAIplt:name>
-        <SAIplt:type>uint32</SAIplt:type>
-        <SAIplt:description>Device ID 0..1023</SAIplt:description>
-        <SAIplt:min>0</SAIplt:min>
-        <SAIplt:max>1023</SAIplt:max>
-      </SAIplt:typedef>
-      <SAIplt:typedef>
-        <SAIplt:name>port-id-type</SAIplt:name>
-        <SAIplt:type>uint32</SAIplt:type>
-        <SAIplt:description>Interface number</SAIplt:description>
-        <SAIplt:min>0</SAIplt:min>
-        <SAIplt:max>1023</SAIplt:max>
-      </SAIplt:typedef>
-      <SAIplt:typedef>
-        <SAIplt:name>logDest-type</SAIplt:name>
-        <SAIplt:type>enumeration</SAIplt:type>
-        <SAIplt:description>Logging Feature Options</SAIplt:description>
-        <SAIplt:enum>
-          <SAIplt:name>SAI_LOG_SYSLOG</SAIplt:name>
-          <SAIplt:description>SYSLOG               {Syslog service should be running to use this option}</SAIplt:description>
-          <SAIplt:value>0</SAIplt:value>
-        </SAIplt:enum>
-        <SAIplt:enum>
-          <SAIplt:name>SAI_LOG_CONSOLE</SAIplt:name>
-          <SAIplt:description>CONSOLE</SAIplt:description>
-          <SAIplt:value>1</SAIplt:value>
-        </SAIplt:enum>
-        <SAIplt:enum>
-          <SAIplt:name>SAI_LOG_FILE</SAIplt:name>
-          <SAIplt:description>FILE                       {Warning !!! Use with caution. Can cause disk full issues}</SAIplt:description>
-          <SAIplt:value>2</SAIplt:value>
-        </SAIplt:enum>
-      </SAIplt:typedef>
-      <SAIplt:typedef>
-        <SAIplt:name>log-dest-file-path-type</SAIplt:name>
-        <SAIplt:type>string</SAIplt:type>
-        <SAIplt:description>A string with path to file for logging feature</SAIplt:description>
-        <SAIplt:min>2</SAIplt:min>
-        <SAIplt:max>30</SAIplt:max>
-      </SAIplt:typedef>
-    </SAIplt:typedefs>
-    <SAIplt:ASK-BOARD-Profile-Name SAIplt:type="string">ASK-Board-ac5x-rd-32x1G-16x2_5G-6x25G.xml</SAIplt:ASK-BOARD-Profile-Name>
-    <SAIplt:Features>
-      <SAIplt:RoCE SAIplt:type="boolean">false</SAIplt:RoCE>
-    </SAIplt:Features>
-    <SAIplt:Ports>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">0</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">0</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">1</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">1</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">2</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">2</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">3</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">3</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">4</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">4</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">5</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">5</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">6</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">6</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">7</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">7</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">8</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">8</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">9</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">9</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">10</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">10</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">11</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">11</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">12</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">12</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">13</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">13</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">14</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">14</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">15</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">15</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">16</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">16</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">17</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">17</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">18</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">18</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">19</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">19</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">20</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">20</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">21</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">21</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">22</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">22</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">23</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">23</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">24</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">24</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">25</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">25</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">26</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">26</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">27</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">27</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">28</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">28</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">29</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">29</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">30</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">30</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">31</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">31</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">32</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">32</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">33</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">33</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">34</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">34</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">35</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">35</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">36</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">36</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">37</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">37</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">38</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">38</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">39</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">39</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">40</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">40</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">41</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">41</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">42</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">42</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">43</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">43</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">44</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">44</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">45</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">45</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">46</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">46</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">47</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">47</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">48</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">48</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">49</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">49</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">50</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">50</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">51</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">51</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">52</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">52</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">53</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">53</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-    </SAIplt:Ports>
-    <SAIplt:Scaling>
-      <SAIplt:max_lag_members SAIplt:type="uint32">8</SAIplt:max_lag_members>
-      <SAIplt:max_route_ipv4 SAIplt:type="uint32">0</SAIplt:max_route_ipv4>
-      <SAIplt:max_route_ipv6 SAIplt:type="uint32">0</SAIplt:max_route_ipv6>
-      <SAIplt:max_Nh_Ecmp_Mbr_Per_Grp SAIplt:type="uint32">64</SAIplt:max_Nh_Ecmp_Mbr_Per_Grp>
-      <SAIplt:max_ipv4_tunnel SAIplt:type="uint32">8</SAIplt:max_ipv4_tunnel>
-      <SAIplt:max_ipv6_tunnel SAIplt:type="uint32">8</SAIplt:max_ipv6_tunnel>
-      <SAIplt:max_tti SAIplt:type="uint32">1024</SAIplt:max_tti>
-      <SAIplt:wred_size SAIplt:type="uint32">0</SAIplt:wred_size>
-      <SAIplt:max_nat SAIplt:type="uint32">0</SAIplt:max_nat>
-    </SAIplt:Scaling>
-    <SAIplt:Counters>
-      <SAIplt:cnc-base-list>
-        <SAIplt:counter-base SAIplt:type="uint32">0</SAIplt:counter-base>
-      </SAIplt:cnc-base-list>
-      <SAIplt:cnc-base-list>
-        <SAIplt:counter-base SAIplt:type="uint32">2048</SAIplt:counter-base>
-      </SAIplt:cnc-base-list>
-    </SAIplt:Counters>
-    <SAIplt:Logging>
-      <SAIplt:log_dest SAIplt:type="logDest-type">SAI_LOG_SYSLOG</SAIplt:log_dest>
-    </SAIplt:Logging>
-  </SAIplt:SAI>
-</data>
--- a/device/marvell/arm64-marvell_rd98DX35xx-r0/rd98DX35xx/port_config.ini
+++ b/device/marvell/arm64-marvell_rd98DX35xx-r0/rd98DX35xx/port_config.ini
@ -1,55 +0,0 @@
-#  name        lanes  alias         speed   autoneg    fec     index
-Ethernet0      0      oneGigE0      1000     on        none    1
-Ethernet1      1      oneGigE1      1000     on        none    2
-Ethernet2      2      oneGigE2      1000     on        none    3
-Ethernet3      3      oneGigE3      1000     on        none    4
-Ethernet4      4      oneGigE4      1000     on        none    5
-Ethernet5      5      oneGigE5      1000     on        none    6
-Ethernet6      6      oneGigE6      1000     on        none    7
-Ethernet7      7      oneGigE7      1000     on        none    8
-Ethernet8      8      oneGigE8      1000     on        none    9
-Ethernet9      9      oneGigE9      1000     on        none    10
-Ethernet10     10     oneGigE10     1000     on        none    11
-Ethernet11     11     oneGigE11     1000     on        none    12
-Ethernet12     12     oneGigE12     1000     on        none    13
-Ethernet13     13     oneGigE13     1000     on        none    14
-Ethernet14     14     oneGigE14     1000     on        none    15
-Ethernet15     15     oneGigE15     1000     on        none    16
-Ethernet16     16     oneGigE16     1000     on        none    17
-Ethernet17     17     oneGigE17     1000     on        none    18
-Ethernet18     18     oneGigE18     1000     on        none    19
-Ethernet19     19     oneGigE19     1000     on        none    20
-Ethernet20     20     oneGigE20     1000     on        none    21
-Ethernet21     21     oneGigE21     1000     on        none    22
-Ethernet22     22     oneGigE22     1000     on        none    23
-Ethernet23     23     oneGigE23     1000     on        none    24
-Ethernet24     24     oneGigE24     1000     on        none    25
-Ethernet25     25     oneGigE25     1000     on        none    26
-Ethernet26     26     oneGigE26     1000     on        none    27
-Ethernet27     27     oneGigE27     1000     on        none    28
-Ethernet28     28     oneGigE28     1000     on        none    29
-Ethernet29     29     oneGigE29     1000     on        none    30
-Ethernet30     30     oneGigE30     1000     on        none    31
-Ethernet31     31     oneGigE31     1000     on        none    32
-Ethernet32     32     twod5GigE32   2500     on        rs      33
-Ethernet33     33     twod5GigE33   2500     on        rs      34
-Ethernet34     34     twod5GigE34   2500     on        rs      35
-Ethernet35     35     twod5GigE35   2500     on        rs      36
-Ethernet36     36     twod5GigE36   2500     on        rs      37
-Ethernet37     37     twod5GigE37   2500     on        rs      38
-Ethernet38     38     twod5GigE38   2500     on        rs      39
-Ethernet39     39     twod5GigE39   2500     on        rs      40
-Ethernet40     40     twod5GigE40   2500     on        rs      41
-Ethernet41     41     twod5GigE41   2500     on        rs      42
-Ethernet42     42     twod5GigE42   2500     on        rs      43
-Ethernet43     43     twod5GigE43   2500     on        rs      44
-Ethernet44     44     twod5GigE44   2500     on        rs      45
-Ethernet45     45     twod5GigE45   2500     on        rs      46
-Ethernet46     46     twod5GigE46   2500     on        rs      47
-Ethernet47     47     twod5GigE47   2500     on        rs      48
-Ethernet48     48     twenty5GigE48 25000    off       none    49
-Ethernet49     49     twenty5GigE49 25000    off       none    50
-Ethernet50     50     twenty5GigE50 25000    off       none    51
-Ethernet51     51     twenty5GigE51 25000    off       none    52
-Ethernet52     52     twenty5GigE52 25000    off       none    53
-Ethernet53     53     twenty5GigE53 25000    off       none    54
--- a/device/marvell/arm64-marvell_rd98DX35xx-r0/rd98DX35xx/profile.ini
+++ b/device/marvell/arm64-marvell_rd98DX35xx-r0/rd98DX35xx/profile.ini
@ -1 +0,0 @@
-switchMacAddress=00:01:02:03:04:05
--- a/device/marvell/arm64-marvell_rd98DX35xx-r0/rd98DX35xx/sai.profile
+++ b/device/marvell/arm64-marvell_rd98DX35xx-r0/rd98DX35xx/sai.profile
@ -1,4 +0,0 @@
-mode=1
-hwId=AC5XRD
-switchProfile=/usr/share/sonic/hwsku/SAI-AC5X-RD-32x1G-16x2_5G-6x25G.xml
-SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/profile.ini
--- a/device/marvell/arm64-marvell_rd98DX35xx-r0/system_health_monitoring_config.json
+++ b/device/marvell/arm64-marvell_rd98DX35xx-r0/system_health_monitoring_config.json
@ -1,10 +0,0 @@
-{
-    "services_to_ignore": [],
-    "devices_to_ignore": [
-        "asic",
-        "psu.temperature",
-        "fan",
-        "psu"
-    ],
-    "user_defined_checkers": []
-}
--- a/device/marvell/arm64-marvell_rd98DX35xx_cn9131-r0/default_sku
+++ b/device/marvell/arm64-marvell_rd98DX35xx_cn9131-r0/default_sku
@ -1 +0,0 @@
-rd98DX35xx_cn9131 t1
--- a/device/marvell/arm64-marvell_rd98DX35xx_cn9131-r0/installer.conf
+++ b/device/marvell/arm64-marvell_rd98DX35xx_cn9131-r0/installer.conf
@ -1 +0,0 @@
-ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="default_hugepagesz=32M hugepages=4 pci=noaer"
--- a/device/marvell/arm64-marvell_rd98DX35xx_cn9131-r0/platform_asic
+++ b/device/marvell/arm64-marvell_rd98DX35xx_cn9131-r0/platform_asic
@ -1 +0,0 @@
-marvell-arm64
--- a/device/marvell/arm64-marvell_rd98DX35xx_cn9131-r0/plugins/eeprom.py
+++ b/device/marvell/arm64-marvell_rd98DX35xx_cn9131-r0/plugins/eeprom.py
@ -1,13 +0,0 @@
-#!/usr/bin/env python
-
-try:
-    from sonic_eeprom import eeprom_tlvinfo
-except ImportError as e:
-    raise ImportError (str(e) + "- required module not found")
-
-
-class board(eeprom_tlvinfo.TlvInfoDecoder):
-
-    def __init__(self, name, path, cpld_root, ro):
-        self.eeprom_path = "/sys/bus/i2c/devices/0-0050/eeprom"
-        super(board, self).__init__(self.eeprom_path, 0, '', True)
--- a/device/marvell/arm64-marvell_rd98DX35xx_cn9131-r0/pmon_daemon_control.json
+++ b/device/marvell/arm64-marvell_rd98DX35xx_cn9131-r0/pmon_daemon_control.json
@ -1,8 +0,0 @@
-{
-    "skip_ledd": true,
-    "skip_pcied": true,
-    "skip_thermalctld": true,
-    "skip_psud": true,
-    "skip_xcvrd": true,
-    "skip_syseepromd": true
-}
--- a/device/marvell/arm64-marvell_rd98DX35xx_cn9131-r0/rd98DX35xx_cn9131/ASK-Board-ac5x-rd-32x1G-16x2_5G-6x25G.md5
+++ b/device/marvell/arm64-marvell_rd98DX35xx_cn9131-r0/rd98DX35xx_cn9131/ASK-Board-ac5x-rd-32x1G-16x2_5G-6x25G.md5
@ -1 +0,0 @@
-95f963f02f1cb808656fcb1f008aa36a
--- a/device/marvell/arm64-marvell_rd98DX35xx_cn9131-r0/rd98DX35xx_cn9131/ASK-Board-ac5x-rd-32x1G-16x2_5G-6x25G.xml
+++ b/device/marvell/arm64-marvell_rd98DX35xx_cn9131-r0/rd98DX35xx_cn9131/ASK-Board-ac5x-rd-32x1G-16x2_5G-6x25G.xml
--- a/device/marvell/arm64-marvell_rd98DX35xx_cn9131-r0/rd98DX35xx_cn9131/ASK-L1-AC5X-RD-32x1G-16x2_5G-6x25G.md5
+++ b/device/marvell/arm64-marvell_rd98DX35xx_cn9131-r0/rd98DX35xx_cn9131/ASK-L1-AC5X-RD-32x1G-16x2_5G-6x25G.md5
@ -1 +0,0 @@
-2876aaa02a47b5842e152ce794c50110
--- a/device/marvell/arm64-marvell_rd98DX35xx_cn9131-r0/rd98DX35xx_cn9131/ASK-L1-AC5X-RD-32x1G-16x2_5G-6x25G.xml
+++ b/device/marvell/arm64-marvell_rd98DX35xx_cn9131-r0/rd98DX35xx_cn9131/ASK-L1-AC5X-RD-32x1G-16x2_5G-6x25G.xml
--- a/device/marvell/arm64-marvell_rd98DX35xx_cn9131-r0/rd98DX35xx_cn9131/ASK-PP-AC5X-RD.md5
+++ b/device/marvell/arm64-marvell_rd98DX35xx_cn9131-r0/rd98DX35xx_cn9131/ASK-PP-AC5X-RD.md5
@ -1 +0,0 @@
-b42f2a2be9da6c7752c0807f9dee48bf
--- a/device/marvell/arm64-marvell_rd98DX35xx_cn9131-r0/rd98DX35xx_cn9131/ASK-PP-AC5X-RD.xml
+++ b/device/marvell/arm64-marvell_rd98DX35xx_cn9131-r0/rd98DX35xx_cn9131/ASK-PP-AC5X-RD.xml
@ -1,871 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" version="2023-05-05-1.04" profile="Askpp" dsig="md5">
-  <askppplt:ASK-PP xmlns:askppplt="urn:marvell:askpp:yang">
-    <askppplt:typedefs>
-      <askppplt:typedef>
-        <askppplt:name>std-string</askppplt:name>
-        <askppplt:type>string</askppplt:type>
-        <askppplt:description>standard string.</askppplt:description>
-        <askppplt:min>1</askppplt:min>
-        <askppplt:max>100</askppplt:max>
-      </askppplt:typedef>
-      <askppplt:typedef>
-        <askppplt:name>queue-id-type</askppplt:name>
-        <askppplt:type>uint32</askppplt:type>
-        <askppplt:description>Queue id</askppplt:description>
-        <askppplt:min>0</askppplt:min>
-        <askppplt:max>7</askppplt:max>
-      </askppplt:typedef>
-      <askppplt:typedef>
-        <askppplt:name>precent-type</askppplt:name>
-        <askppplt:type>uint32</askppplt:type>
-        <askppplt:description>Precent</askppplt:description>
-        <askppplt:min>0</askppplt:min>
-        <askppplt:max>100</askppplt:max>
-      </askppplt:typedef>
-      <askppplt:typedef>
-        <askppplt:name>phaThreadId-type</askppplt:name>
-        <askppplt:type>uint32</askppplt:type>
-        <askppplt:description>Thread id</askppplt:description>
-        <askppplt:min>1</askppplt:min>
-        <askppplt:max>255</askppplt:max>
-      </askppplt:typedef>
-      <askppplt:typedef>
-        <askppplt:name>routing-mode-type</askppplt:name>
-        <askppplt:type>enumeration</askppplt:type>
-        <askppplt:description>Specifies routing mode.</askppplt:description>
-        <askppplt:enum>
-          <askppplt:name>POLICY_BASED_ROUTING_ONLY</askppplt:name>
-          <askppplt:description>PBR only</askppplt:description>
-          <askppplt:value>0</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>TCAM_ROUTER_BASED</askppplt:name>
-          <askppplt:description>Router engine or PBR</askppplt:description>
-          <askppplt:value>1</askppplt:value>
-        </askppplt:enum>
-      </askppplt:typedef>
-      <askppplt:typedef>
-        <askppplt:name>shared-table-mode-type</askppplt:name>
-        <askppplt:type>enumeration</askppplt:type>
-        <askppplt:description>Specifies table sharing modes for L3 (LPM), L2 (FDB), EM (Exact Match)</askppplt:description>
-        <askppplt:enum>
-          <askppplt:name>MID_L3_MID_L2_NO_EM</askppplt:name>
-          <askppplt:description>MID_L3_MID_L2_NO_EM</askppplt:description>
-          <askppplt:value>0</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>MID_L3_MID_L2_MIN_EM</askppplt:name>
-          <askppplt:description>MID_L3_MID_L2_MIN_EM</askppplt:description>
-          <askppplt:value>1</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>LOW_MAX_L3_MID_LOW_L2_NO_EM</askppplt:name>
-          <askppplt:description>LOW_MAX_L3_MID_LOW_L2_NO_EM</askppplt:description>
-          <askppplt:value>2</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>MAX_L3_MIN_L2_NO_EM</askppplt:name>
-          <askppplt:description>MAX_L3_MIN_L2_NO_EM</askppplt:description>
-          <askppplt:value>3</askppplt:value>
-        </askppplt:enum>
-      </askppplt:typedef>
-      <askppplt:typedef>
-        <askppplt:name>pha-firmware-image-id-type</askppplt:name>
-        <askppplt:type>enumeration</askppplt:type>
-        <askppplt:description>Specifies supported Pha image id</askppplt:description>
-        <askppplt:enum>
-          <askppplt:name>DEFAULT</askppplt:name>
-          <askppplt:description>Default PHA firmware image ID</askppplt:description>
-          <askppplt:value>0</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>01</askppplt:name>
-          <askppplt:description>01 firmware image ID</askppplt:description>
-          <askppplt:value>1</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>02</askppplt:name>
-          <askppplt:description>02 PHA firmware image ID</askppplt:description>
-          <askppplt:value>2</askppplt:value>
-        </askppplt:enum>
-      </askppplt:typedef>
-      <askppplt:typedef>
-        <askppplt:name>pha-firmware-thread-type</askppplt:name>
-        <askppplt:type>enumeration</askppplt:type>
-        <askppplt:description>Specifies supported Pha thread type</askppplt:description>
-        <askppplt:enum>
-          <askppplt:name>IOAM_INGRESS_SWITCH_IPV4</askppplt:name>
-          <askppplt:description>IOAM_INGRESS_SWITCH_IPV4</askppplt:description>
-          <askppplt:value>1</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>IOAM_INGRESS_SWITCH_IPV6</askppplt:name>
-          <askppplt:description>IOAM_INGRESS_SWITCH_IPV6</askppplt:description>
-          <askppplt:value>2</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>IOAM_TRANSIT_SWITCH_IPV4</askppplt:name>
-          <askppplt:description>IOAM_TRANSIT_SWITCH_IPV4</askppplt:description>
-          <askppplt:value>3</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>IOAM_TRANSIT_SWITCH_IPV6</askppplt:name>
-          <askppplt:description>IOAM_TRANSIT_SWITCH_IPV6</askppplt:description>
-          <askppplt:value>4</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>INT_IOAM_MIRRORING</askppplt:name>
-          <askppplt:description>INT_IOAM_MIRRORING</askppplt:description>
-          <askppplt:value>5</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>INT_IOAM_EGRESS_SWITCH</askppplt:name>
-          <askppplt:description>INT_IOAM_EGRESS_SWITCH</askppplt:description>
-          <askppplt:value>6</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>MPLS_SR_NO_EL</askppplt:name>
-          <askppplt:description>MPLS_SR_NO_EL</askppplt:description>
-          <askppplt:value>7</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>MPLS_SR_ONE_EL</askppplt:name>
-          <askppplt:description>MPLS_SR_ONE_EL</askppplt:description>
-          <askppplt:value>8</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>MPLS_SR_TWO_EL</askppplt:name>
-          <askppplt:description>MPLS_SR_TWO_EL</askppplt:description>
-          <askppplt:value>9</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>MPLS_SR_THREE_EL</askppplt:name>
-          <askppplt:description>MPLS_SR_THREE_EL</askppplt:description>
-          <askppplt:value>10</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>UNIFIED_SR</askppplt:name>
-          <askppplt:description>UNIFIED_SR</askppplt:description>
-          <askppplt:value>11</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>CLASSIFIER_NSH_OVER_ETHERNET</askppplt:name>
-          <askppplt:description>CLASSIFIER_NSH_OVER_ETHERNET</askppplt:description>
-          <askppplt:value>12</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>CLASSIFIER_NSH_OVER_VXLAN_GPE</askppplt:name>
-          <askppplt:description>CLASSIFIER_NSH_OVER_VXLAN_GPE</askppplt:description>
-          <askppplt:value>13</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>SFF_NSH_VXLAN_GPE_TO_ETHERNET</askppplt:name>
-          <askppplt:description>SFF_NSH_VXLAN_GPE_TO_ETHERNET</askppplt:description>
-          <askppplt:value>14</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>SFF_NSH_ETHERNET_TO_VXLAN_GPE</askppplt:name>
-          <askppplt:description>SFF_NSH_ETHERNET_TO_VXLAN_GPE</askppplt:description>
-          <askppplt:value>15</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>IOAM_EGRESS_SWITCH_IPV6</askppplt:name>
-          <askppplt:description>IOAM_EGRESS_SWITCH_IPV6</askppplt:description>
-          <askppplt:value>16</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>SRV6_END_NODE</askppplt:name>
-          <askppplt:description>SRV6_END_NODE</askppplt:description>
-          <askppplt:value>17</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>SRV6_PENULTIMATE_END_NODE</askppplt:name>
-          <askppplt:description>SRV6_PENULTIMATE_END_NODE</askppplt:description>
-          <askppplt:value>18</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>SRV6_SRC_NODE_1_SEGMENT</askppplt:name>
-          <askppplt:description>SRV6_SRC_NODE_1_SEGMENT</askppplt:description>
-          <askppplt:value>19</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>SRV6_SRC_NODE_FIRST_PASS_2_3_SEGMENTS</askppplt:name>
-          <askppplt:description>SRV6_SRC_NODE_FIRST_PASS_2_3_SEGMENTS</askppplt:description>
-          <askppplt:value>20</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>SRV6_SRC_NODE_SECOND_PASS_3_SEGMENTS</askppplt:name>
-          <askppplt:description>SRV6_SRC_NODE_SECOND_PASS_3_SEGMENTS</askppplt:description>
-          <askppplt:value>21</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>SRV6_SRC_NODE_SECOND_PASS_2_SEGMENTS</askppplt:name>
-          <askppplt:description>SRV6_SRC_NODE_SECOND_PASS_2_SEGMENTS</askppplt:description>
-          <askppplt:value>22</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>SGT_NETWORK_ADD_MSB</askppplt:name>
-          <askppplt:description>SGT_NETWORK_ADD_MSB</askppplt:description>
-          <askppplt:value>23</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>SGT_NETWORK_FIX</askppplt:name>
-          <askppplt:description>SGT_NETWORK_FIX</askppplt:description>
-          <askppplt:value>24</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>SGT_NETWORK_REMOVE</askppplt:name>
-          <askppplt:description>SGT_NETWORK_REMOVE</askppplt:description>
-          <askppplt:value>25</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>SGT_EDSA_FIX</askppplt:name>
-          <askppplt:description>SGT_EDSA_FIX</askppplt:description>
-          <askppplt:value>26</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>SGT_EDSA_REMOVE</askppplt:name>
-          <askppplt:description>SGT_EDSA_REMOVE</askppplt:description>
-          <askppplt:value>27</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>SGT_GBP_FIX_IPV4</askppplt:name>
-          <askppplt:description>SGT_GBP_FIX_IPV4</askppplt:description>
-          <askppplt:value>28</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>SGT_GBP_FIX_IPV6</askppplt:name>
-          <askppplt:description>SGT_GBP_FIX_IPV6</askppplt:description>
-          <askppplt:value>29</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>SGT_GBP_REMOVE_IPV4</askppplt:name>
-          <askppplt:description>SGT_GBP_REMOVE_IPV4</askppplt:description>
-          <askppplt:value>30</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>SGT_GBP_REMOVE_IPV6</askppplt:name>
-          <askppplt:description>SGT_GBP_REMOVE_IPV6</askppplt:description>
-          <askppplt:value>31</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>PTP_PHY_1_STEP</askppplt:name>
-          <askppplt:description>PTP_PHY_1_STEP</askppplt:description>
-          <askppplt:value>32</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>EGRESS_MIRRORING_METADATA</askppplt:name>
-          <askppplt:description>EGRESS_MIRRORING_METADATA</askppplt:description>
-          <askppplt:value>33</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>CC_ERSPAN_TYPE_II_TRG_DEV_LC_IPV4</askppplt:name>
-          <askppplt:description>CC_ERSPAN_TYPE_II_TRG_DEV_LC_IPV4</askppplt:description>
-          <askppplt:value>34</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>CC_ERSPAN_TYPE_II_TRG_DEV_LC_IPV6</askppplt:name>
-          <askppplt:description>CC_ERSPAN_TYPE_II_TRG_DEV_LC_IPV6</askppplt:description>
-          <askppplt:value>35</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>CC_ERSPAN_TYPE_II_TRG_DEV_DIRECT_IPV4</askppplt:name>
-          <askppplt:description>CC_ERSPAN_TYPE_II_TRG_DEV_DIRECT_IPV4</askppplt:description>
-          <askppplt:value>36</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>CC_ERSPAN_TYPE_II_TRG_DEV_DIRECT_IPV6</askppplt:name>
-          <askppplt:description>CC_ERSPAN_TYPE_II_TRG_DEV_DIRECT_IPV6</askppplt:description>
-          <askppplt:value>37</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>CC_ERSPAN_TYPE_II_SRC_DEV</askppplt:name>
-          <askppplt:description>CC_ERSPAN_TYPE_II_SRC_DEV</askppplt:description>
-          <askppplt:value>38</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>VXLAN_GBP_SOURCE_GROUP_POLICY_ID</askppplt:name>
-          <askppplt:description>VXLAN_GBP_SOURCE_GROUP_POLICY_ID</askppplt:description>
-          <askppplt:value>39</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>SRV6_BEST_EFFORT</askppplt:name>
-          <askppplt:description>SRV6_BEST_EFFORT</askppplt:description>
-          <askppplt:value>40</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>SRV6_SRC_NODE_1_CONTAINER</askppplt:name>
-          <askppplt:description>SRV6_SRC_NODE_1_CONTAINER</askppplt:description>
-          <askppplt:value>41</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>SRV6_SRC_NODE_FIRST_PASS_2_3_CONTAINERS</askppplt:name>
-          <askppplt:description>SRV6_SRC_NODE_FIRST_PASS_2_3_CONTAINERS</askppplt:description>
-          <askppplt:value>42</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>SRV6_SRC_NODE_SECOND_PASS_2_CONTAINERS</askppplt:name>
-          <askppplt:description>SRV6_SRC_NODE_SECOND_PASS_2_CONTAINERS</askppplt:description>
-          <askppplt:value>43</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>SRV6_SRC_NODE_SECOND_PASS_3_CONTAINERS</askppplt:name>
-          <askppplt:description>SRV6_SRC_NODE_SECOND_PASS_3_CONTAINERS</askppplt:description>
-          <askppplt:value>44</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>SRV6_END_NODE_COC32_GSID</askppplt:name>
-          <askppplt:description>SRV6_END_NODE_COC32_GSID</askppplt:description>
-          <askppplt:value>45</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>IPV4_TTL_INCREMENT</askppplt:name>
-          <askppplt:description>IPV4_TTL_INCREMENT</askppplt:description>
-          <askppplt:value>46</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>IPV6_HOP_LIMIT_INCREMENT</askppplt:name>
-          <askppplt:description>IPV6_HOP_LIMIT_INCREMENT</askppplt:description>
-          <askppplt:value>47</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>CLEAR_OUTGOING_MTAG_COMMAND</askppplt:name>
-          <askppplt:description>CLEAR_OUTGOING_MTAG_COMMAND</askppplt:description>
-          <askppplt:value>48</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>SFLOW_V5_IPV4</askppplt:name>
-          <askppplt:description>SFLOW_V5_IPV4</askppplt:description>
-          <askppplt:value>49</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>SFLOW_V5_IPV6</askppplt:name>
-          <askppplt:description>SFLOW_V5_IPV6</askppplt:description>
-          <askppplt:value>50</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>SLS</askppplt:name>
-          <askppplt:description>SLS</askppplt:description>
-          <askppplt:value>51</askppplt:value>
-        </askppplt:enum>
-      </askppplt:typedef>
-      <askppplt:typedef>
-        <askppplt:name>trunk-member-mode-type</askppplt:name>
-        <askppplt:type>enumeration</askppplt:type>
-        <askppplt:description>Specifies supported Pha image id</askppplt:description>
-        <askppplt:enum>
-          <askppplt:name>NATIVE</askppplt:name>
-          <askppplt:description>NATIVE
-   	 *  the trunk members are filled
-   	 *  according to the order given by application.
-   	 *  Regular trunk may hold max of 8 members.
-   	 *  Cascade trunk may hold :
-   	 *  max of 64 members</askppplt:description>
-          <askppplt:value>0</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>FLEX</askppplt:name>
-          <askppplt:description>FLEX
-   	 *  A mode to allows flexibility for
-   	 *  each Regular trunk to state it's max number of members (before starting to add members).
-   	 *  (this mode not effect 'cascade trunk' members)
-   	 *  Regular trunk may hold : max of 4K members. (each trunk set it's own limit)
-   	 *  Cascade trunk may hold : max of 64 members.</askppplt:description>
-          <askppplt:value>2</askppplt:value>
-        </askppplt:enum>
-      </askppplt:typedef>
-      <askppplt:typedef>
-        <askppplt:name>number-physical-port-type</askppplt:name>
-        <askppplt:type>enumeration</askppplt:type>
-        <askppplt:description>ac5x 128, falcon 64,128,256, 512, 1024</askppplt:description>
-        <askppplt:enum>
-          <askppplt:name>no-ports</askppplt:name>
-          <askppplt:description>no-ports</askppplt:description>
-          <askppplt:value>0</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>64-ports</askppplt:name>
-          <askppplt:description>64-ports</askppplt:description>
-          <askppplt:value>64</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>128-ports</askppplt:name>
-          <askppplt:description>128-ports</askppplt:description>
-          <askppplt:value>128</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>256-ports</askppplt:name>
-          <askppplt:description>256-ports</askppplt:description>
-          <askppplt:value>256</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>512-ports</askppplt:name>
-          <askppplt:description>512-ports</askppplt:description>
-          <askppplt:value>512</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>1024-ports</askppplt:name>
-          <askppplt:description>1024-ports</askppplt:description>
-          <askppplt:value>1024</askppplt:value>
-        </askppplt:enum>
-      </askppplt:typedef>
-      <askppplt:typedef>
-        <askppplt:name>serdes-ref-clock-type</askppplt:name>
-        <askppplt:type>enumeration</askppplt:type>
-        <askppplt:description>Specifies serdes refernce clock.</askppplt:description>
-        <askppplt:enum>
-          <askppplt:name>external_25_single_ended</askppplt:name>
-          <askppplt:description>EXTERNAL_25_SINGLE_ENDED</askppplt:description>
-          <askppplt:value>0</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>external_125_single_ended</askppplt:name>
-          <askppplt:description>EXTERNAL_125_SINGLE_ENDED</askppplt:description>
-          <askppplt:value>1</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>external_125_diff</askppplt:name>
-          <askppplt:description>EXTERNAL_125_DIFF</askppplt:description>
-          <askppplt:value>2</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>external_156_25_single_ended</askppplt:name>
-          <askppplt:description>EXTERNAL_156_25_SINGLE_ENDED</askppplt:description>
-          <askppplt:value>3</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>external_156_25_diff</askppplt:name>
-          <askppplt:description>EXTERNAL_156_25_DIFF</askppplt:description>
-          <askppplt:value>4</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>internal_125</askppplt:name>
-          <askppplt:description>INTERNAL_125</askppplt:description>
-          <askppplt:value>5</askppplt:value>
-        </askppplt:enum>
-      </askppplt:typedef>
-      <askppplt:typedef>
-        <askppplt:name>cpu-port-id-type</askppplt:name>
-        <askppplt:type>uint32</askppplt:type>
-        <askppplt:description>CPU port id</askppplt:description>
-        <askppplt:min>0</askppplt:min>
-        <askppplt:max>7</askppplt:max>
-      </askppplt:typedef>
-      <askppplt:typedef>
-        <askppplt:name>rx-buffer-size-type</askppplt:name>
-        <askppplt:type>uint32</askppplt:type>
-        <askppplt:description>Rx Buffer size</askppplt:description>
-        <askppplt:min>64</askppplt:min>
-        <askppplt:max>10240</askppplt:max>
-      </askppplt:typedef>
-      <askppplt:typedef>
-        <askppplt:name>tx-sdma-queue-mode-type</askppplt:name>
-        <askppplt:type>enumeration</askppplt:type>
-        <askppplt:description>Specifies TX queue mode.</askppplt:description>
-        <askppplt:enum>
-          <askppplt:name>Normal</askppplt:name>
-          <askppplt:description>Application</askppplt:description>
-          <askppplt:value>0</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>Packet_Generator</askppplt:name>
-          <askppplt:description>Traffic generator</askppplt:description>
-          <askppplt:value>1</askppplt:value>
-        </askppplt:enum>
-      </askppplt:typedef>
-      <askppplt:typedef>
-        <askppplt:name>alloc-method-type</askppplt:name>
-        <askppplt:type>enumeration</askppplt:type>
-        <askppplt:description>Specifies Buffers allocation method.</askppplt:description>
-        <askppplt:enum>
-          <askppplt:name>Dynamic_Alloc</askppplt:name>
-          <askppplt:description>Dynamic</askppplt:description>
-          <askppplt:value>0</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>Static_Alloc</askppplt:name>
-          <askppplt:description>Static</askppplt:description>
-          <askppplt:value>1</askppplt:value>
-        </askppplt:enum>
-      </askppplt:typedef>
-      <askppplt:typedef>
-        <askppplt:name>au_mesage_lenght-type</askppplt:name>
-        <askppplt:type>enumeration</askppplt:type>
-        <askppplt:description>Specifies Buffers allocation method.</askppplt:description>
-        <askppplt:enum>
-          <askppplt:name>4_words</askppplt:name>
-          <askppplt:description>4 Words</askppplt:description>
-          <askppplt:value>0</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>8_words</askppplt:name>
-          <askppplt:description>8 Words</askppplt:description>
-          <askppplt:value>1</askppplt:value>
-        </askppplt:enum>
-      </askppplt:typedef>
-      <askppplt:typedef>
-        <askppplt:name>boolean-type</askppplt:name>
-        <askppplt:type>enumeration</askppplt:type>
-        <askppplt:description>Boolean 32 bits , due to bing endian</askppplt:description>
-        <askppplt:enum>
-          <askppplt:name>false</askppplt:name>
-          <askppplt:description>False</askppplt:description>
-          <askppplt:value>0</askppplt:value>
-        </askppplt:enum>
-        <askppplt:enum>
-          <askppplt:name>true</askppplt:name>
-          <askppplt:description>True</askppplt:description>
-          <askppplt:value>1</askppplt:value>
-        </askppplt:enum>
-      </askppplt:typedef>
-    </askppplt:typedefs>
-    <askppplt:PPInit>
-      <askppplt:PP-name askppplt:type="std-string">AC5X-RD</askppplt:PP-name>
-      <askppplt:Phase1>
-        <askppplt:coreClock askppplt:type="uint32">4294967295</askppplt:coreClock>
-        <askppplt:serdesRefClock askppplt:type="serdes-ref-clock-type">external_25_single_ended</askppplt:serdesRefClock>
-        <askppplt:isrAddrCompletionRegionsBmp askppplt:type="uint32">2</askppplt:isrAddrCompletionRegionsBmp>
-        <askppplt:appAddrCompletionRegionsBmp askppplt:type="uint32">60</askppplt:appAddrCompletionRegionsBmp>
-        <askppplt:maxNumOfPhyPortsToUse askppplt:type="number-physical-port-type">128-ports</askppplt:maxNumOfPhyPortsToUse>
-        <askppplt:tcamParityCalcEnable askppplt:type="boolean-type">false</askppplt:tcamParityCalcEnable>
-        <askppplt:apEnable askppplt:type="boolean-type">false</askppplt:apEnable>
-        <askppplt:numOfDataIntegrityElements askppplt:type="uint32">0</askppplt:numOfDataIntegrityElements>
-      </askppplt:Phase1>
-      <askppplt:Phase2>
-        <askppplt:useMultiNetIfSdma askppplt:type="boolean-type">true</askppplt:useMultiNetIfSdma>
-        <askppplt:auqCfg>
-          <askppplt:auDescNum askppplt:type="uint32">4096</askppplt:auDescNum>
-        </askppplt:auqCfg>
-        <askppplt:fuqCfg>
-          <askppplt:fuDescNum askppplt:type="uint32">2048</askppplt:fuDescNum>
-        </askppplt:fuqCfg>
-        <askppplt:multiNetIfCfg>
-          <askppplt:rxSdmaQueuesConfig-list>
-            <askppplt:rx_sdma_cpu_port askppplt:type="cpu-port-id-type">0</askppplt:rx_sdma_cpu_port>
-            <askppplt:rx_sdma_cpu_queue askppplt:type="queue-id-type">0</askppplt:rx_sdma_cpu_queue>
-            <askppplt:buffAllocMethod askppplt:type="alloc-method-type">Static_Alloc</askppplt:buffAllocMethod>
-            <askppplt:numOfRxDesc askppplt:type="uint32">20</askppplt:numOfRxDesc>
-            <askppplt:numOfRxBuff askppplt:type="uint32">20</askppplt:numOfRxBuff>
-            <askppplt:buffSize askppplt:type="rx-buffer-size-type">2048</askppplt:buffSize>
-            <askppplt:buffHeaderOffset askppplt:type="uint32">0</askppplt:buffHeaderOffset>
-          </askppplt:rxSdmaQueuesConfig-list>
-          <askppplt:rxSdmaQueuesConfig-list>
-            <askppplt:rx_sdma_cpu_port askppplt:type="cpu-port-id-type">1</askppplt:rx_sdma_cpu_port>
-            <askppplt:rx_sdma_cpu_queue askppplt:type="queue-id-type">7</askppplt:rx_sdma_cpu_queue>
-            <askppplt:buffAllocMethod askppplt:type="alloc-method-type">Static_Alloc</askppplt:buffAllocMethod>
-            <askppplt:numOfRxDesc askppplt:type="uint32">20</askppplt:numOfRxDesc>
-            <askppplt:numOfRxBuff askppplt:type="uint32">20</askppplt:numOfRxBuff>
-            <askppplt:buffSize askppplt:type="rx-buffer-size-type">2048</askppplt:buffSize>
-            <askppplt:buffHeaderOffset askppplt:type="uint32">0</askppplt:buffHeaderOffset>
-          </askppplt:rxSdmaQueuesConfig-list>
-          <askppplt:rxSdmaQueuesConfig-list>
-            <askppplt:rx_sdma_cpu_port askppplt:type="cpu-port-id-type">1</askppplt:rx_sdma_cpu_port>
-            <askppplt:rx_sdma_cpu_queue askppplt:type="queue-id-type">6</askppplt:rx_sdma_cpu_queue>
-            <askppplt:buffAllocMethod askppplt:type="alloc-method-type">Static_Alloc</askppplt:buffAllocMethod>
-            <askppplt:numOfRxDesc askppplt:type="uint32">20</askppplt:numOfRxDesc>
-            <askppplt:numOfRxBuff askppplt:type="uint32">20</askppplt:numOfRxBuff>
-            <askppplt:buffSize askppplt:type="rx-buffer-size-type">2048</askppplt:buffSize>
-            <askppplt:buffHeaderOffset askppplt:type="uint32">0</askppplt:buffHeaderOffset>
-          </askppplt:rxSdmaQueuesConfig-list>
-          <askppplt:rxSdmaQueuesConfig-list>
-            <askppplt:rx_sdma_cpu_port askppplt:type="cpu-port-id-type">1</askppplt:rx_sdma_cpu_port>
-            <askppplt:rx_sdma_cpu_queue askppplt:type="queue-id-type">5</askppplt:rx_sdma_cpu_queue>
-            <askppplt:buffAllocMethod askppplt:type="alloc-method-type">Static_Alloc</askppplt:buffAllocMethod>
-            <askppplt:numOfRxDesc askppplt:type="uint32">20</askppplt:numOfRxDesc>
-            <askppplt:numOfRxBuff askppplt:type="uint32">20</askppplt:numOfRxBuff>
-            <askppplt:buffSize askppplt:type="rx-buffer-size-type">2048</askppplt:buffSize>
-            <askppplt:buffHeaderOffset askppplt:type="uint32">0</askppplt:buffHeaderOffset>
-          </askppplt:rxSdmaQueuesConfig-list>
-          <askppplt:rxSdmaQueuesConfig-list>
-            <askppplt:rx_sdma_cpu_port askppplt:type="cpu-port-id-type">1</askppplt:rx_sdma_cpu_port>
-            <askppplt:rx_sdma_cpu_queue askppplt:type="queue-id-type">4</askppplt:rx_sdma_cpu_queue>
-            <askppplt:buffAllocMethod askppplt:type="alloc-method-type">Static_Alloc</askppplt:buffAllocMethod>
-            <askppplt:numOfRxDesc askppplt:type="uint32">20</askppplt:numOfRxDesc>
-            <askppplt:numOfRxBuff askppplt:type="uint32">20</askppplt:numOfRxBuff>
-            <askppplt:buffSize askppplt:type="rx-buffer-size-type">2048</askppplt:buffSize>
-            <askppplt:buffHeaderOffset askppplt:type="uint32">0</askppplt:buffHeaderOffset>
-          </askppplt:rxSdmaQueuesConfig-list>
-          <askppplt:rxSdmaQueuesConfig-list>
-            <askppplt:rx_sdma_cpu_port askppplt:type="cpu-port-id-type">1</askppplt:rx_sdma_cpu_port>
-            <askppplt:rx_sdma_cpu_queue askppplt:type="queue-id-type">3</askppplt:rx_sdma_cpu_queue>
-            <askppplt:buffAllocMethod askppplt:type="alloc-method-type">Static_Alloc</askppplt:buffAllocMethod>
-            <askppplt:numOfRxDesc askppplt:type="uint32">20</askppplt:numOfRxDesc>
-            <askppplt:numOfRxBuff askppplt:type="uint32">20</askppplt:numOfRxBuff>
-            <askppplt:buffSize askppplt:type="rx-buffer-size-type">2048</askppplt:buffSize>
-            <askppplt:buffHeaderOffset askppplt:type="uint32">0</askppplt:buffHeaderOffset>
-          </askppplt:rxSdmaQueuesConfig-list>
-          <askppplt:rxSdmaQueuesConfig-list>
-            <askppplt:rx_sdma_cpu_port askppplt:type="cpu-port-id-type">1</askppplt:rx_sdma_cpu_port>
-            <askppplt:rx_sdma_cpu_queue askppplt:type="queue-id-type">2</askppplt:rx_sdma_cpu_queue>
-            <askppplt:buffAllocMethod askppplt:type="alloc-method-type">Static_Alloc</askppplt:buffAllocMethod>
-            <askppplt:numOfRxDesc askppplt:type="uint32">20</askppplt:numOfRxDesc>
-            <askppplt:numOfRxBuff askppplt:type="uint32">20</askppplt:numOfRxBuff>
-            <askppplt:buffSize askppplt:type="rx-buffer-size-type">2048</askppplt:buffSize>
-            <askppplt:buffHeaderOffset askppplt:type="uint32">0</askppplt:buffHeaderOffset>
-          </askppplt:rxSdmaQueuesConfig-list>
-          <askppplt:rxSdmaQueuesConfig-list>
-            <askppplt:rx_sdma_cpu_port askppplt:type="cpu-port-id-type">1</askppplt:rx_sdma_cpu_port>
-            <askppplt:rx_sdma_cpu_queue askppplt:type="queue-id-type">1</askppplt:rx_sdma_cpu_queue>
-            <askppplt:buffAllocMethod askppplt:type="alloc-method-type">Static_Alloc</askppplt:buffAllocMethod>
-            <askppplt:numOfRxDesc askppplt:type="uint32">20</askppplt:numOfRxDesc>
-            <askppplt:numOfRxBuff askppplt:type="uint32">20</askppplt:numOfRxBuff>
-            <askppplt:buffSize askppplt:type="rx-buffer-size-type">2048</askppplt:buffSize>
-            <askppplt:buffHeaderOffset askppplt:type="uint32">0</askppplt:buffHeaderOffset>
-          </askppplt:rxSdmaQueuesConfig-list>
-          <askppplt:rxSdmaQueuesConfig-list>
-            <askppplt:rx_sdma_cpu_port askppplt:type="cpu-port-id-type">1</askppplt:rx_sdma_cpu_port>
-            <askppplt:rx_sdma_cpu_queue askppplt:type="queue-id-type">0</askppplt:rx_sdma_cpu_queue>
-            <askppplt:buffAllocMethod askppplt:type="alloc-method-type">Static_Alloc</askppplt:buffAllocMethod>
-            <askppplt:numOfRxDesc askppplt:type="uint32">20</askppplt:numOfRxDesc>
-            <askppplt:numOfRxBuff askppplt:type="uint32">20</askppplt:numOfRxBuff>
-            <askppplt:buffSize askppplt:type="rx-buffer-size-type">2048</askppplt:buffSize>
-            <askppplt:buffHeaderOffset askppplt:type="uint32">0</askppplt:buffHeaderOffset>
-          </askppplt:rxSdmaQueuesConfig-list>
-          <askppplt:rxSdmaQueuesConfig-list>
-            <askppplt:rx_sdma_cpu_port askppplt:type="cpu-port-id-type">0</askppplt:rx_sdma_cpu_port>
-            <askppplt:rx_sdma_cpu_queue askppplt:type="queue-id-type">7</askppplt:rx_sdma_cpu_queue>
-            <askppplt:buffAllocMethod askppplt:type="alloc-method-type">Static_Alloc</askppplt:buffAllocMethod>
-            <askppplt:numOfRxDesc askppplt:type="uint32">20</askppplt:numOfRxDesc>
-            <askppplt:numOfRxBuff askppplt:type="uint32">20</askppplt:numOfRxBuff>
-            <askppplt:buffSize askppplt:type="rx-buffer-size-type">2048</askppplt:buffSize>
-            <askppplt:buffHeaderOffset askppplt:type="uint32">0</askppplt:buffHeaderOffset>
-          </askppplt:rxSdmaQueuesConfig-list>
-          <askppplt:rxSdmaQueuesConfig-list>
-            <askppplt:rx_sdma_cpu_port askppplt:type="cpu-port-id-type">0</askppplt:rx_sdma_cpu_port>
-            <askppplt:rx_sdma_cpu_queue askppplt:type="queue-id-type">6</askppplt:rx_sdma_cpu_queue>
-            <askppplt:buffAllocMethod askppplt:type="alloc-method-type">Static_Alloc</askppplt:buffAllocMethod>
-            <askppplt:numOfRxDesc askppplt:type="uint32">20</askppplt:numOfRxDesc>
-            <askppplt:numOfRxBuff askppplt:type="uint32">20</askppplt:numOfRxBuff>
-            <askppplt:buffSize askppplt:type="rx-buffer-size-type">2048</askppplt:buffSize>
-            <askppplt:buffHeaderOffset askppplt:type="uint32">0</askppplt:buffHeaderOffset>
-          </askppplt:rxSdmaQueuesConfig-list>
-          <askppplt:rxSdmaQueuesConfig-list>
-            <askppplt:rx_sdma_cpu_port askppplt:type="cpu-port-id-type">0</askppplt:rx_sdma_cpu_port>
-            <askppplt:rx_sdma_cpu_queue askppplt:type="queue-id-type">5</askppplt:rx_sdma_cpu_queue>
-            <askppplt:buffAllocMethod askppplt:type="alloc-method-type">Static_Alloc</askppplt:buffAllocMethod>
-            <askppplt:numOfRxDesc askppplt:type="uint32">20</askppplt:numOfRxDesc>
-            <askppplt:numOfRxBuff askppplt:type="uint32">20</askppplt:numOfRxBuff>
-            <askppplt:buffSize askppplt:type="rx-buffer-size-type">2048</askppplt:buffSize>
-            <askppplt:buffHeaderOffset askppplt:type="uint32">0</askppplt:buffHeaderOffset>
-          </askppplt:rxSdmaQueuesConfig-list>
-          <askppplt:rxSdmaQueuesConfig-list>
-            <askppplt:rx_sdma_cpu_port askppplt:type="cpu-port-id-type">0</askppplt:rx_sdma_cpu_port>
-            <askppplt:rx_sdma_cpu_queue askppplt:type="queue-id-type">4</askppplt:rx_sdma_cpu_queue>
-            <askppplt:buffAllocMethod askppplt:type="alloc-method-type">Static_Alloc</askppplt:buffAllocMethod>
-            <askppplt:numOfRxDesc askppplt:type="uint32">20</askppplt:numOfRxDesc>
-            <askppplt:numOfRxBuff askppplt:type="uint32">20</askppplt:numOfRxBuff>
-            <askppplt:buffSize askppplt:type="rx-buffer-size-type">2048</askppplt:buffSize>
-            <askppplt:buffHeaderOffset askppplt:type="uint32">0</askppplt:buffHeaderOffset>
-          </askppplt:rxSdmaQueuesConfig-list>
-          <askppplt:rxSdmaQueuesConfig-list>
-            <askppplt:rx_sdma_cpu_port askppplt:type="cpu-port-id-type">0</askppplt:rx_sdma_cpu_port>
-            <askppplt:rx_sdma_cpu_queue askppplt:type="queue-id-type">3</askppplt:rx_sdma_cpu_queue>
-            <askppplt:buffAllocMethod askppplt:type="alloc-method-type">Static_Alloc</askppplt:buffAllocMethod>
-            <askppplt:numOfRxDesc askppplt:type="uint32">20</askppplt:numOfRxDesc>
-            <askppplt:numOfRxBuff askppplt:type="uint32">20</askppplt:numOfRxBuff>
-            <askppplt:buffSize askppplt:type="rx-buffer-size-type">2048</askppplt:buffSize>
-            <askppplt:buffHeaderOffset askppplt:type="uint32">0</askppplt:buffHeaderOffset>
-          </askppplt:rxSdmaQueuesConfig-list>
-          <askppplt:rxSdmaQueuesConfig-list>
-            <askppplt:rx_sdma_cpu_port askppplt:type="cpu-port-id-type">0</askppplt:rx_sdma_cpu_port>
-            <askppplt:rx_sdma_cpu_queue askppplt:type="queue-id-type">2</askppplt:rx_sdma_cpu_queue>
-            <askppplt:buffAllocMethod askppplt:type="alloc-method-type">Static_Alloc</askppplt:buffAllocMethod>
-            <askppplt:numOfRxDesc askppplt:type="uint32">20</askppplt:numOfRxDesc>
-            <askppplt:numOfRxBuff askppplt:type="uint32">20</askppplt:numOfRxBuff>
-            <askppplt:buffSize askppplt:type="rx-buffer-size-type">2048</askppplt:buffSize>
-            <askppplt:buffHeaderOffset askppplt:type="uint32">0</askppplt:buffHeaderOffset>
-          </askppplt:rxSdmaQueuesConfig-list>
-          <askppplt:rxSdmaQueuesConfig-list>
-            <askppplt:rx_sdma_cpu_port askppplt:type="cpu-port-id-type">0</askppplt:rx_sdma_cpu_port>
-            <askppplt:rx_sdma_cpu_queue askppplt:type="queue-id-type">1</askppplt:rx_sdma_cpu_queue>
-            <askppplt:buffAllocMethod askppplt:type="alloc-method-type">Static_Alloc</askppplt:buffAllocMethod>
-            <askppplt:numOfRxDesc askppplt:type="uint32">20</askppplt:numOfRxDesc>
-            <askppplt:numOfRxBuff askppplt:type="uint32">20</askppplt:numOfRxBuff>
-            <askppplt:buffSize askppplt:type="rx-buffer-size-type">2048</askppplt:buffSize>
-            <askppplt:buffHeaderOffset askppplt:type="uint32">0</askppplt:buffHeaderOffset>
-          </askppplt:rxSdmaQueuesConfig-list>
-          <askppplt:txSdmaQueuesConfig-list>
-            <askppplt:tx_sdma_cpu_port askppplt:type="cpu-port-id-type">0</askppplt:tx_sdma_cpu_port>
-            <askppplt:tx_sdma_cpu_queue askppplt:type="queue-id-type">0</askppplt:tx_sdma_cpu_queue>
-            <askppplt:buffAndDescAllocMethod askppplt:type="alloc-method-type">Static_Alloc</askppplt:buffAndDescAllocMethod>
-            <askppplt:queueMode askppplt:type="tx-sdma-queue-mode-type">Normal</askppplt:queueMode>
-            <askppplt:numOfTxDesc askppplt:type="uint32">20</askppplt:numOfTxDesc>
-            <askppplt:numOfTxBuff askppplt:type="uint32">0</askppplt:numOfTxBuff>
-            <askppplt:TxBuffSize askppplt:type="rx-buffer-size-type">128</askppplt:TxBuffSize>
-          </askppplt:txSdmaQueuesConfig-list>
-          <askppplt:txSdmaQueuesConfig-list>
-            <askppplt:tx_sdma_cpu_port askppplt:type="cpu-port-id-type">0</askppplt:tx_sdma_cpu_port>
-            <askppplt:tx_sdma_cpu_queue askppplt:type="queue-id-type">1</askppplt:tx_sdma_cpu_queue>
-            <askppplt:buffAndDescAllocMethod askppplt:type="alloc-method-type">Static_Alloc</askppplt:buffAndDescAllocMethod>
-            <askppplt:queueMode askppplt:type="tx-sdma-queue-mode-type">Normal</askppplt:queueMode>
-            <askppplt:numOfTxDesc askppplt:type="uint32">20</askppplt:numOfTxDesc>
-            <askppplt:numOfTxBuff askppplt:type="uint32">0</askppplt:numOfTxBuff>
-            <askppplt:TxBuffSize askppplt:type="rx-buffer-size-type">128</askppplt:TxBuffSize>
-          </askppplt:txSdmaQueuesConfig-list>
-          <askppplt:txSdmaQueuesConfig-list>
-            <askppplt:tx_sdma_cpu_port askppplt:type="cpu-port-id-type">0</askppplt:tx_sdma_cpu_port>
-            <askppplt:tx_sdma_cpu_queue askppplt:type="queue-id-type">2</askppplt:tx_sdma_cpu_queue>
-            <askppplt:buffAndDescAllocMethod askppplt:type="alloc-method-type">Static_Alloc</askppplt:buffAndDescAllocMethod>
-            <askppplt:queueMode askppplt:type="tx-sdma-queue-mode-type">Normal</askppplt:queueMode>
-            <askppplt:numOfTxDesc askppplt:type="uint32">20</askppplt:numOfTxDesc>
-            <askppplt:numOfTxBuff askppplt:type="uint32">0</askppplt:numOfTxBuff>
-            <askppplt:TxBuffSize askppplt:type="rx-buffer-size-type">128</askppplt:TxBuffSize>
-          </askppplt:txSdmaQueuesConfig-list>
-          <askppplt:txSdmaQueuesConfig-list>
-            <askppplt:tx_sdma_cpu_port askppplt:type="cpu-port-id-type">0</askppplt:tx_sdma_cpu_port>
-            <askppplt:tx_sdma_cpu_queue askppplt:type="queue-id-type">3</askppplt:tx_sdma_cpu_queue>
-            <askppplt:buffAndDescAllocMethod askppplt:type="alloc-method-type">Static_Alloc</askppplt:buffAndDescAllocMethod>
-            <askppplt:queueMode askppplt:type="tx-sdma-queue-mode-type">Normal</askppplt:queueMode>
-            <askppplt:numOfTxDesc askppplt:type="uint32">20</askppplt:numOfTxDesc>
-            <askppplt:numOfTxBuff askppplt:type="uint32">0</askppplt:numOfTxBuff>
-            <askppplt:TxBuffSize askppplt:type="rx-buffer-size-type">128</askppplt:TxBuffSize>
-          </askppplt:txSdmaQueuesConfig-list>
-          <askppplt:txSdmaQueuesConfig-list>
-            <askppplt:tx_sdma_cpu_port askppplt:type="cpu-port-id-type">0</askppplt:tx_sdma_cpu_port>
-            <askppplt:tx_sdma_cpu_queue askppplt:type="queue-id-type">4</askppplt:tx_sdma_cpu_queue>
-            <askppplt:buffAndDescAllocMethod askppplt:type="alloc-method-type">Static_Alloc</askppplt:buffAndDescAllocMethod>
-            <askppplt:queueMode askppplt:type="tx-sdma-queue-mode-type">Normal</askppplt:queueMode>
-            <askppplt:numOfTxDesc askppplt:type="uint32">20</askppplt:numOfTxDesc>
-            <askppplt:numOfTxBuff askppplt:type="uint32">0</askppplt:numOfTxBuff>
-            <askppplt:TxBuffSize askppplt:type="rx-buffer-size-type">128</askppplt:TxBuffSize>
-          </askppplt:txSdmaQueuesConfig-list>
-          <askppplt:txSdmaQueuesConfig-list>
-            <askppplt:tx_sdma_cpu_port askppplt:type="cpu-port-id-type">0</askppplt:tx_sdma_cpu_port>
-            <askppplt:tx_sdma_cpu_queue askppplt:type="queue-id-type">5</askppplt:tx_sdma_cpu_queue>
-            <askppplt:buffAndDescAllocMethod askppplt:type="alloc-method-type">Static_Alloc</askppplt:buffAndDescAllocMethod>
-            <askppplt:queueMode askppplt:type="tx-sdma-queue-mode-type">Normal</askppplt:queueMode>
-            <askppplt:numOfTxDesc askppplt:type="uint32">20</askppplt:numOfTxDesc>
-            <askppplt:numOfTxBuff askppplt:type="uint32">0</askppplt:numOfTxBuff>
-            <askppplt:TxBuffSize askppplt:type="rx-buffer-size-type">128</askppplt:TxBuffSize>
-          </askppplt:txSdmaQueuesConfig-list>
-          <askppplt:txSdmaQueuesConfig-list>
-            <askppplt:tx_sdma_cpu_port askppplt:type="cpu-port-id-type">0</askppplt:tx_sdma_cpu_port>
-            <askppplt:tx_sdma_cpu_queue askppplt:type="queue-id-type">6</askppplt:tx_sdma_cpu_queue>
-            <askppplt:buffAndDescAllocMethod askppplt:type="alloc-method-type">Static_Alloc</askppplt:buffAndDescAllocMethod>
-            <askppplt:queueMode askppplt:type="tx-sdma-queue-mode-type">Normal</askppplt:queueMode>
-            <askppplt:numOfTxDesc askppplt:type="uint32">20</askppplt:numOfTxDesc>
-            <askppplt:numOfTxBuff askppplt:type="uint32">0</askppplt:numOfTxBuff>
-            <askppplt:TxBuffSize askppplt:type="rx-buffer-size-type">128</askppplt:TxBuffSize>
-          </askppplt:txSdmaQueuesConfig-list>
-          <askppplt:txSdmaQueuesConfig-list>
-            <askppplt:tx_sdma_cpu_port askppplt:type="cpu-port-id-type">0</askppplt:tx_sdma_cpu_port>
-            <askppplt:tx_sdma_cpu_queue askppplt:type="queue-id-type">7</askppplt:tx_sdma_cpu_queue>
-            <askppplt:buffAndDescAllocMethod askppplt:type="alloc-method-type">Static_Alloc</askppplt:buffAndDescAllocMethod>
-            <askppplt:queueMode askppplt:type="tx-sdma-queue-mode-type">Normal</askppplt:queueMode>
-            <askppplt:numOfTxDesc askppplt:type="uint32">20</askppplt:numOfTxDesc>
-            <askppplt:numOfTxBuff askppplt:type="uint32">0</askppplt:numOfTxBuff>
-            <askppplt:TxBuffSize askppplt:type="rx-buffer-size-type">128</askppplt:TxBuffSize>
-          </askppplt:txSdmaQueuesConfig-list>
-          <askppplt:txSdmaQueuesConfig-list>
-            <askppplt:tx_sdma_cpu_port askppplt:type="cpu-port-id-type">1</askppplt:tx_sdma_cpu_port>
-            <askppplt:tx_sdma_cpu_queue askppplt:type="queue-id-type">0</askppplt:tx_sdma_cpu_queue>
-            <askppplt:buffAndDescAllocMethod askppplt:type="alloc-method-type">Static_Alloc</askppplt:buffAndDescAllocMethod>
-            <askppplt:queueMode askppplt:type="tx-sdma-queue-mode-type">Normal</askppplt:queueMode>
-            <askppplt:numOfTxDesc askppplt:type="uint32">20</askppplt:numOfTxDesc>
-            <askppplt:numOfTxBuff askppplt:type="uint32">0</askppplt:numOfTxBuff>
-            <askppplt:TxBuffSize askppplt:type="rx-buffer-size-type">128</askppplt:TxBuffSize>
-          </askppplt:txSdmaQueuesConfig-list>
-          <askppplt:txSdmaQueuesConfig-list>
-            <askppplt:tx_sdma_cpu_port askppplt:type="cpu-port-id-type">1</askppplt:tx_sdma_cpu_port>
-            <askppplt:tx_sdma_cpu_queue askppplt:type="queue-id-type">1</askppplt:tx_sdma_cpu_queue>
-            <askppplt:buffAndDescAllocMethod askppplt:type="alloc-method-type">Static_Alloc</askppplt:buffAndDescAllocMethod>
-            <askppplt:queueMode askppplt:type="tx-sdma-queue-mode-type">Normal</askppplt:queueMode>
-            <askppplt:numOfTxDesc askppplt:type="uint32">20</askppplt:numOfTxDesc>
-            <askppplt:numOfTxBuff askppplt:type="uint32">0</askppplt:numOfTxBuff>
-            <askppplt:TxBuffSize askppplt:type="rx-buffer-size-type">128</askppplt:TxBuffSize>
-          </askppplt:txSdmaQueuesConfig-list>
-          <askppplt:txSdmaQueuesConfig-list>
-            <askppplt:tx_sdma_cpu_port askppplt:type="cpu-port-id-type">1</askppplt:tx_sdma_cpu_port>
-            <askppplt:tx_sdma_cpu_queue askppplt:type="queue-id-type">2</askppplt:tx_sdma_cpu_queue>
-            <askppplt:buffAndDescAllocMethod askppplt:type="alloc-method-type">Static_Alloc</askppplt:buffAndDescAllocMethod>
-            <askppplt:queueMode askppplt:type="tx-sdma-queue-mode-type">Normal</askppplt:queueMode>
-            <askppplt:numOfTxDesc askppplt:type="uint32">20</askppplt:numOfTxDesc>
-            <askppplt:numOfTxBuff askppplt:type="uint32">0</askppplt:numOfTxBuff>
-            <askppplt:TxBuffSize askppplt:type="rx-buffer-size-type">128</askppplt:TxBuffSize>
-          </askppplt:txSdmaQueuesConfig-list>
-          <askppplt:txSdmaQueuesConfig-list>
-            <askppplt:tx_sdma_cpu_port askppplt:type="cpu-port-id-type">1</askppplt:tx_sdma_cpu_port>
-            <askppplt:tx_sdma_cpu_queue askppplt:type="queue-id-type">3</askppplt:tx_sdma_cpu_queue>
-            <askppplt:buffAndDescAllocMethod askppplt:type="alloc-method-type">Static_Alloc</askppplt:buffAndDescAllocMethod>
-            <askppplt:queueMode askppplt:type="tx-sdma-queue-mode-type">Normal</askppplt:queueMode>
-            <askppplt:numOfTxDesc askppplt:type="uint32">20</askppplt:numOfTxDesc>
-            <askppplt:numOfTxBuff askppplt:type="uint32">0</askppplt:numOfTxBuff>
-            <askppplt:TxBuffSize askppplt:type="rx-buffer-size-type">128</askppplt:TxBuffSize>
-          </askppplt:txSdmaQueuesConfig-list>
-          <askppplt:txSdmaQueuesConfig-list>
-            <askppplt:tx_sdma_cpu_port askppplt:type="cpu-port-id-type">1</askppplt:tx_sdma_cpu_port>
-            <askppplt:tx_sdma_cpu_queue askppplt:type="queue-id-type">4</askppplt:tx_sdma_cpu_queue>
-            <askppplt:buffAndDescAllocMethod askppplt:type="alloc-method-type">Static_Alloc</askppplt:buffAndDescAllocMethod>
-            <askppplt:queueMode askppplt:type="tx-sdma-queue-mode-type">Normal</askppplt:queueMode>
-            <askppplt:numOfTxDesc askppplt:type="uint32">20</askppplt:numOfTxDesc>
-            <askppplt:numOfTxBuff askppplt:type="uint32">0</askppplt:numOfTxBuff>
-            <askppplt:TxBuffSize askppplt:type="rx-buffer-size-type">128</askppplt:TxBuffSize>
-          </askppplt:txSdmaQueuesConfig-list>
-          <askppplt:txSdmaQueuesConfig-list>
-            <askppplt:tx_sdma_cpu_port askppplt:type="cpu-port-id-type">1</askppplt:tx_sdma_cpu_port>
-            <askppplt:tx_sdma_cpu_queue askppplt:type="queue-id-type">5</askppplt:tx_sdma_cpu_queue>
-            <askppplt:buffAndDescAllocMethod askppplt:type="alloc-method-type">Static_Alloc</askppplt:buffAndDescAllocMethod>
-            <askppplt:queueMode askppplt:type="tx-sdma-queue-mode-type">Normal</askppplt:queueMode>
-            <askppplt:numOfTxDesc askppplt:type="uint32">20</askppplt:numOfTxDesc>
-            <askppplt:numOfTxBuff askppplt:type="uint32">0</askppplt:numOfTxBuff>
-            <askppplt:TxBuffSize askppplt:type="rx-buffer-size-type">128</askppplt:TxBuffSize>
-          </askppplt:txSdmaQueuesConfig-list>
-          <askppplt:txSdmaQueuesConfig-list>
-            <askppplt:tx_sdma_cpu_port askppplt:type="cpu-port-id-type">1</askppplt:tx_sdma_cpu_port>
-            <askppplt:tx_sdma_cpu_queue askppplt:type="queue-id-type">6</askppplt:tx_sdma_cpu_queue>
-            <askppplt:buffAndDescAllocMethod askppplt:type="alloc-method-type">Static_Alloc</askppplt:buffAndDescAllocMethod>
-            <askppplt:queueMode askppplt:type="tx-sdma-queue-mode-type">Normal</askppplt:queueMode>
-            <askppplt:numOfTxDesc askppplt:type="uint32">20</askppplt:numOfTxDesc>
-            <askppplt:numOfTxBuff askppplt:type="uint32">0</askppplt:numOfTxBuff>
-            <askppplt:TxBuffSize askppplt:type="rx-buffer-size-type">128</askppplt:TxBuffSize>
-          </askppplt:txSdmaQueuesConfig-list>
-          <askppplt:txSdmaQueuesConfig-list>
-            <askppplt:tx_sdma_cpu_port askppplt:type="cpu-port-id-type">1</askppplt:tx_sdma_cpu_port>
-            <askppplt:tx_sdma_cpu_queue askppplt:type="queue-id-type">7</askppplt:tx_sdma_cpu_queue>
-            <askppplt:buffAndDescAllocMethod askppplt:type="alloc-method-type">Static_Alloc</askppplt:buffAndDescAllocMethod>
-            <askppplt:queueMode askppplt:type="tx-sdma-queue-mode-type">Normal</askppplt:queueMode>
-            <askppplt:numOfTxDesc askppplt:type="uint32">20</askppplt:numOfTxDesc>
-            <askppplt:numOfTxBuff askppplt:type="uint32">0</askppplt:numOfTxBuff>
-            <askppplt:TxBuffSize askppplt:type="rx-buffer-size-type">128</askppplt:TxBuffSize>
-          </askppplt:txSdmaQueuesConfig-list>
-        </askppplt:multiNetIfCfg>
-        <askppplt:internal>
-          <askppplt:fuqUseSeparate askppplt:type="boolean-type">false</askppplt:fuqUseSeparate>
-          <askppplt:useSecondaryAuq askppplt:type="boolean-type">false</askppplt:useSecondaryAuq>
-          <askppplt:noTraffic2CPU askppplt:type="boolean-type">false</askppplt:noTraffic2CPU>
-          <askppplt:netifSdmaPortGroupId askppplt:type="uint32">0</askppplt:netifSdmaPortGroupId>
-          <askppplt:auMessageLength askppplt:type="au_mesage_lenght-type">8_words</askppplt:auMessageLength>
-          <askppplt:useDoubleAuq askppplt:type="boolean-type">false</askppplt:useDoubleAuq>
-        </askppplt:internal>
-      </askppplt:Phase2>
-      <askppplt:LogicalInit>
-        <askppplt:routingMode askppplt:type="routing-mode-type">TCAM_ROUTER_BASED</askppplt:routingMode>
-        <askppplt:maxNumOfPbrEntries askppplt:type="uint32">0</askppplt:maxNumOfPbrEntries>
-        <askppplt:sharedTableMode askppplt:type="shared-table-mode-type">MID_L3_MID_L2_NO_EM</askppplt:sharedTableMode>
-        <askppplt:ingressDropEnable askppplt:type="boolean-type">true</askppplt:ingressDropEnable>
-      </askppplt:LogicalInit>
-      <askppplt:LibInit>
-        <askppplt:initBridge askppplt:type="boolean-type">true</askppplt:initBridge>
-        <askppplt:initMirror askppplt:type="boolean-type">true</askppplt:initMirror>
-        <askppplt:initNetIf askppplt:type="boolean-type">true</askppplt:initNetIf>
-        <askppplt:initPhy askppplt:type="boolean-type">true</askppplt:initPhy>
-        <askppplt:initPort askppplt:type="boolean-type">true</askppplt:initPort>
-        <askppplt:initTrunk askppplt:type="boolean-type">true</askppplt:initTrunk>
-        <askppplt:Trunk-params>
-          <askppplt:maxNumberOfTrunks askppplt:type="uint32">511</askppplt:maxNumberOfTrunks>
-          <askppplt:trunkMembersMode askppplt:type="trunk-member-mode-type">FLEX</askppplt:trunkMembersMode>
-        </askppplt:Trunk-params>
-        <askppplt:initPcl askppplt:type="boolean-type">true</askppplt:initPcl>
-        <askppplt:initTcam askppplt:type="boolean-type">true</askppplt:initTcam>
-        <askppplt:initPolicer askppplt:type="boolean-type">true</askppplt:initPolicer>
-        <askppplt:initPha askppplt:type="boolean-type">true</askppplt:initPha>
-        <askppplt:Pha-params>
-          <askppplt:packetOrderChangeEnable askppplt:type="boolean-type">false</askppplt:packetOrderChangeEnable>
-          <askppplt:phaFwImageId askppplt:type="pha-firmware-image-id-type">01</askppplt:phaFwImageId>
-          <askppplt:phaFwImageIdVersion askppplt:type="uint32">0</askppplt:phaFwImageIdVersion>
-        </askppplt:Pha-params>
-      </askppplt:LibInit>
-    </askppplt:PPInit>
-  </askppplt:ASK-PP>
-</data>
--- a/device/marvell/arm64-marvell_rd98DX35xx_cn9131-r0/rd98DX35xx_cn9131/SAI-AC5X-RD-32x1G-16x2_5G-6x25G.md5
+++ b/device/marvell/arm64-marvell_rd98DX35xx_cn9131-r0/rd98DX35xx_cn9131/SAI-AC5X-RD-32x1G-16x2_5G-6x25G.md5
@ -1 +0,0 @@
-079a2fcdb8fe1d1f0cf39e3c40e6dd36
--- a/device/marvell/arm64-marvell_rd98DX35xx_cn9131-r0/rd98DX35xx_cn9131/SAI-AC5X-RD-32x1G-16x2_5G-6x25G.xml
+++ b/device/marvell/arm64-marvell_rd98DX35xx_cn9131-r0/rd98DX35xx_cn9131/SAI-AC5X-RD-32x1G-16x2_5G-6x25G.xml
@ -1,346 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" version="2023-05-05-1.04" profile="SAI" dsig="md5">
-  <SAIplt:SAI xmlns:SAIplt="urn:marvell:SAI:yang">
-    <SAIplt:typedefs>
-      <SAIplt:typedef>
-        <SAIplt:name>device-id-type</SAIplt:name>
-        <SAIplt:type>uint32</SAIplt:type>
-        <SAIplt:description>Device ID 0..1023</SAIplt:description>
-        <SAIplt:min>0</SAIplt:min>
-        <SAIplt:max>1023</SAIplt:max>
-      </SAIplt:typedef>
-      <SAIplt:typedef>
-        <SAIplt:name>port-id-type</SAIplt:name>
-        <SAIplt:type>uint32</SAIplt:type>
-        <SAIplt:description>Interface number</SAIplt:description>
-        <SAIplt:min>0</SAIplt:min>
-        <SAIplt:max>1023</SAIplt:max>
-      </SAIplt:typedef>
-      <SAIplt:typedef>
-        <SAIplt:name>logDest-type</SAIplt:name>
-        <SAIplt:type>enumeration</SAIplt:type>
-        <SAIplt:description>Logging Feature Options</SAIplt:description>
-        <SAIplt:enum>
-          <SAIplt:name>SAI_LOG_SYSLOG</SAIplt:name>
-          <SAIplt:description>SYSLOG               {Syslog service should be running to use this option}</SAIplt:description>
-          <SAIplt:value>0</SAIplt:value>
-        </SAIplt:enum>
-        <SAIplt:enum>
-          <SAIplt:name>SAI_LOG_CONSOLE</SAIplt:name>
-          <SAIplt:description>CONSOLE</SAIplt:description>
-          <SAIplt:value>1</SAIplt:value>
-        </SAIplt:enum>
-        <SAIplt:enum>
-          <SAIplt:name>SAI_LOG_FILE</SAIplt:name>
-          <SAIplt:description>FILE                       {Warning !!! Use with caution. Can cause disk full issues}</SAIplt:description>
-          <SAIplt:value>2</SAIplt:value>
-        </SAIplt:enum>
-      </SAIplt:typedef>
-      <SAIplt:typedef>
-        <SAIplt:name>log-dest-file-path-type</SAIplt:name>
-        <SAIplt:type>string</SAIplt:type>
-        <SAIplt:description>A string with path to file for logging feature</SAIplt:description>
-        <SAIplt:min>2</SAIplt:min>
-        <SAIplt:max>30</SAIplt:max>
-      </SAIplt:typedef>
-    </SAIplt:typedefs>
-    <SAIplt:ASK-BOARD-Profile-Name SAIplt:type="string">ASK-Board-ac5x-rd-32x1G-16x2_5G-6x25G.xml</SAIplt:ASK-BOARD-Profile-Name>
-    <SAIplt:Features>
-      <SAIplt:RoCE SAIplt:type="boolean">false</SAIplt:RoCE>
-    </SAIplt:Features>
-    <SAIplt:Ports>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">0</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">0</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">1</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">1</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">2</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">2</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">3</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">3</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">4</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">4</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">5</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">5</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">6</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">6</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">7</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">7</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">8</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">8</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">9</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">9</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">10</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">10</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">11</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">11</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">12</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">12</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">13</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">13</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">14</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">14</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">15</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">15</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">16</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">16</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">17</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">17</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">18</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">18</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">19</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">19</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">20</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">20</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">21</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">21</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">22</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">22</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">23</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">23</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">24</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">24</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">25</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">25</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">26</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">26</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">27</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">27</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">28</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">28</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">29</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">29</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">30</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">30</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">31</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">31</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">32</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">32</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">33</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">33</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">34</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">34</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">35</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">35</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">36</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">36</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">37</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">37</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">38</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">38</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">39</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">39</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">40</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">40</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">41</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">41</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">42</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">42</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">43</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">43</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">44</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">44</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">45</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">45</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">46</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">46</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">47</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">47</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">48</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">48</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">49</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">49</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">50</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">50</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">51</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">51</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">52</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">52</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-      <SAIplt:port-list>
-        <SAIplt:sai_port_id SAIplt:type="port-id-type">53</SAIplt:sai_port_id>
-        <SAIplt:sdk_device_id SAIplt:type="device-id-type">0</SAIplt:sdk_device_id>
-        <SAIplt:sdk_port_id SAIplt:type="port-id-type">53</SAIplt:sdk_port_id>
-      </SAIplt:port-list>
-    </SAIplt:Ports>
-    <SAIplt:Scaling>
-      <SAIplt:max_lag_members SAIplt:type="uint32">8</SAIplt:max_lag_members>
-      <SAIplt:max_route_ipv4 SAIplt:type="uint32">0</SAIplt:max_route_ipv4>
-      <SAIplt:max_route_ipv6 SAIplt:type="uint32">0</SAIplt:max_route_ipv6>
-      <SAIplt:max_Nh_Ecmp_Mbr_Per_Grp SAIplt:type="uint32">64</SAIplt:max_Nh_Ecmp_Mbr_Per_Grp>
-      <SAIplt:max_ipv4_tunnel SAIplt:type="uint32">8</SAIplt:max_ipv4_tunnel>
-      <SAIplt:max_ipv6_tunnel SAIplt:type="uint32">8</SAIplt:max_ipv6_tunnel>
-      <SAIplt:max_tti SAIplt:type="uint32">1024</SAIplt:max_tti>
-      <SAIplt:wred_size SAIplt:type="uint32">0</SAIplt:wred_size>
-      <SAIplt:max_nat SAIplt:type="uint32">0</SAIplt:max_nat>
-    </SAIplt:Scaling>
-    <SAIplt:Counters>
-      <SAIplt:cnc-base-list>
-        <SAIplt:counter-base SAIplt:type="uint32">0</SAIplt:counter-base>
-      </SAIplt:cnc-base-list>
-      <SAIplt:cnc-base-list>
-        <SAIplt:counter-base SAIplt:type="uint32">2048</SAIplt:counter-base>
-      </SAIplt:cnc-base-list>
-    </SAIplt:Counters>
-    <SAIplt:Logging>
-      <SAIplt:log_dest SAIplt:type="logDest-type">SAI_LOG_SYSLOG</SAIplt:log_dest>
-    </SAIplt:Logging>
-  </SAIplt:SAI>
-</data>
--- a/device/marvell/arm64-marvell_rd98DX35xx_cn9131-r0/rd98DX35xx_cn9131/port_config.ini
+++ b/device/marvell/arm64-marvell_rd98DX35xx_cn9131-r0/rd98DX35xx_cn9131/port_config.ini
@ -1,55 +0,0 @@
-#  name        lanes  alias         speed   autoneg    fec     index
-Ethernet0      0      oneGigE0      1000     on        none    1
-Ethernet1      1      oneGigE1      1000     on        none    2
-Ethernet2      2      oneGigE2      1000     on        none    3
-Ethernet3      3      oneGigE3      1000     on        none    4
-Ethernet4      4      oneGigE4      1000     on        none    5
-Ethernet5      5      oneGigE5      1000     on        none    6
-Ethernet6      6      oneGigE6      1000     on        none    7
-Ethernet7      7      oneGigE7      1000     on        none    8
-Ethernet8      8      oneGigE8      1000     on        none    9
-Ethernet9      9      oneGigE9      1000     on        none    10
-Ethernet10     10     oneGigE10     1000     on        none    11
-Ethernet11     11     oneGigE11     1000     on        none    12
-Ethernet12     12     oneGigE12     1000     on        none    13
-Ethernet13     13     oneGigE13     1000     on        none    14
-Ethernet14     14     oneGigE14     1000     on        none    15
-Ethernet15     15     oneGigE15     1000     on        none    16
-Ethernet16     16     oneGigE16     1000     on        none    17
-Ethernet17     17     oneGigE17     1000     on        none    18
-Ethernet18     18     oneGigE18     1000     on        none    19
-Ethernet19     19     oneGigE19     1000     on        none    20
-Ethernet20     20     oneGigE20     1000     on        none    21
-Ethernet21     21     oneGigE21     1000     on        none    22
-Ethernet22     22     oneGigE22     1000     on        none    23
-Ethernet23     23     oneGigE23     1000     on        none    24
-Ethernet24     24     oneGigE24     1000     on        none    25
-Ethernet25     25     oneGigE25     1000     on        none    26
-Ethernet26     26     oneGigE26     1000     on        none    27
-Ethernet27     27     oneGigE27     1000     on        none    28
-Ethernet28     28     oneGigE28     1000     on        none    29
-Ethernet29     29     oneGigE29     1000     on        none    30
-Ethernet30     30     oneGigE30     1000     on        none    31
-Ethernet31     31     oneGigE31     1000     on        none    32
-Ethernet32     32     twod5GigE32   2500     on        rs      33
-Ethernet33     33     twod5GigE33   2500     on        rs      34
-Ethernet34     34     twod5GigE34   2500     on        rs      35
-Ethernet35     35     twod5GigE35   2500     on        rs      36
-Ethernet36     36     twod5GigE36   2500     on        rs      37
-Ethernet37     37     twod5GigE37   2500     on        rs      38
-Ethernet38     38     twod5GigE38   2500     on        rs      39
-Ethernet39     39     twod5GigE39   2500     on        rs      40
-Ethernet40     40     twod5GigE40   2500     on        rs      41
-Ethernet41     41     twod5GigE41   2500     on        rs      42
-Ethernet42     42     twod5GigE42   2500     on        rs      43
-Ethernet43     43     twod5GigE43   2500     on        rs      44
-Ethernet44     44     twod5GigE44   2500     on        rs      45
-Ethernet45     45     twod5GigE45   2500     on        rs      46
-Ethernet46     46     twod5GigE46   2500     on        rs      47
-Ethernet47     47     twod5GigE47   2500     on        rs      48
-Ethernet48     48     twenty5GigE48 25000    off       none    49
-Ethernet49     49     twenty5GigE49 25000    off       none    50
-Ethernet50     50     twenty5GigE50 25000    off       none    51
-Ethernet51     51     twenty5GigE51 25000    off       none    52
-Ethernet52     52     twenty5GigE52 25000    off       none    53
-Ethernet53     53     twenty5GigE53 25000    off       none    54
--- a/device/marvell/arm64-marvell_rd98DX35xx_cn9131-r0/rd98DX35xx_cn9131/profile.ini
+++ b/device/marvell/arm64-marvell_rd98DX35xx_cn9131-r0/rd98DX35xx_cn9131/profile.ini
@ -1 +0,0 @@
-switchMacAddress=00:01:02:03:04:05
--- a/device/marvell/arm64-marvell_rd98DX35xx_cn9131-r0/rd98DX35xx_cn9131/sai.profile
+++ b/device/marvell/arm64-marvell_rd98DX35xx_cn9131-r0/rd98DX35xx_cn9131/sai.profile
@ -1,4 +0,0 @@
-mode=1
-hwId=AC5XRD
-switchProfile=/usr/share/sonic/hwsku/SAI-AC5X-RD-32x1G-16x2_5G-6x25G.xml
-SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/profile.ini
--- a/device/marvell/arm64-marvell_rd98DX35xx_cn9131-r0/system_health_monitoring_config.json
+++ b/device/marvell/arm64-marvell_rd98DX35xx_cn9131-r0/system_health_monitoring_config.json
@ -1,10 +0,0 @@
-{
-    "services_to_ignore": [],
-    "devices_to_ignore": [
-        "asic",
-        "psu.temperature",
-        "fan",
-        "psu"
-    ],
-    "user_defined_checkers": []
-}
--- a/device/mellanox/x86_64-mlnx_lssn2700-r0/platform_reboot
+++ b/device/mellanox/x86_64-mlnx_lssn2700-r0/platform_reboot
@ -0,0 +1 @@
+../x86_64-mlnx_msn2700-r0/platform_reboot
--- a/device/mellanox/x86_64-mlnx_lssn2700-r0/pre_reboot_hook
+++ b/device/mellanox/x86_64-mlnx_lssn2700-r0/pre_reboot_hook
@ -1 +0,0 @@
-../x86_64-mlnx_msn2700-r0/pre_reboot_hook
--- a/device/mellanox/x86_64-mlnx_msn2010-r0/ACS-MSN2010/sai.profile
+++ b/device/mellanox/x86_64-mlnx_msn2010-r0/ACS-MSN2010/sai.profile
@ -1 +1,3 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_2010.xml
+SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
+SAI_DUMP_STORE_AMOUNT=10
--- a/device/mellanox/x86_64-mlnx_msn2010-r0/installer.conf
+++ b/device/mellanox/x86_64-mlnx_msn2010-r0/installer.conf
@ -1 +1 @@
-ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="acpi_enforce_resources=lax acpi=noirq libata.force=noncq"
+ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="acpi_enforce_resources=lax acpi=noirq"
--- a/device/mellanox/x86_64-mlnx_msn2010-r0/platform_reboot
+++ b/device/mellanox/x86_64-mlnx_msn2010-r0/platform_reboot
@ -0,0 +1 @@
+../x86_64-mlnx_msn2700-r0/platform_reboot
--- a/device/mellanox/x86_64-mlnx_msn2010-r0/pre_reboot_hook
+++ b/device/mellanox/x86_64-mlnx_msn2010-r0/pre_reboot_hook
@ -1 +0,0 @@
-../x86_64-mlnx_msn2700-r0/pre_reboot_hook
--- a/device/mellanox/x86_64-mlnx_msn2010-r0/sensors.conf
+++ b/device/mellanox/x86_64-mlnx_msn2010-r0/sensors.conf
@ -47,25 +47,3 @@ bus "i2c-2" "i2c-1-mux (chan_id 1)"
        label fan2 "Chassis Fan 2"
        label fan3 "Chassis Fan 3"
        label fan4 "Chassis Fan 4"
-        ignore temp2
-        ignore temp3
-        ignore temp4
-        ignore temp5
-        ignore temp6
-        ignore temp7
-        ignore temp8
-        ignore temp9
-        ignore temp10
-        ignore temp11
-        ignore temp12
-        ignore temp13
-        ignore temp14
-        ignore temp15
-        ignore temp16
-        ignore temp17
-        ignore temp18
-        ignore temp19
-        ignore temp20
-        ignore temp21
-        ignore temp22
-        ignore temp23
--- a/device/mellanox/x86_64-mlnx_msn2100-r0/ACS-MSN2100/sai.profile
+++ b/device/mellanox/x86_64-mlnx_msn2100-r0/ACS-MSN2100/sai.profile
@ -1 +1,3 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_2100.xml
+SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
+SAI_DUMP_STORE_AMOUNT=10
--- a/device/mellanox/x86_64-mlnx_msn2100-r0/platform_reboot
+++ b/device/mellanox/x86_64-mlnx_msn2100-r0/platform_reboot
@ -0,0 +1 @@
+../x86_64-mlnx_msn2700-r0/platform_reboot
--- a/device/mellanox/x86_64-mlnx_msn2100-r0/pre_reboot_hook
+++ b/device/mellanox/x86_64-mlnx_msn2100-r0/pre_reboot_hook
@ -1 +0,0 @@
-../x86_64-mlnx_msn2700-r0/pre_reboot_hook
--- a/device/mellanox/x86_64-mlnx_msn2100-r0/sensors.conf
+++ b/device/mellanox/x86_64-mlnx_msn2100-r0/sensors.conf
@ -49,19 +49,3 @@ bus "i2c-2" "i2c-1-mux (chan_id 1)"
        label fan2 "Chassis Fan 2"
        label fan3 "Chassis Fan 3"
        label fan4 "Chassis Fan 4"
-        ignore temp2
-        ignore temp3
-        ignore temp4
-        ignore temp5
-        ignore temp6
-        ignore temp7
-        ignore temp8
-        ignore temp9
-        ignore temp10
-        ignore temp11
-        ignore temp12
-        ignore temp13
-        ignore temp14
-        ignore temp15
-        ignore temp16
-        ignore temp17
--- a/device/mellanox/x86_64-mlnx_msn2410-r0/ACS-MSN2410/sai.profile
+++ b/device/mellanox/x86_64-mlnx_msn2410-r0/ACS-MSN2410/sai.profile
@ -1 +1,3 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_2410.xml
+SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
+SAI_DUMP_STORE_AMOUNT=10
--- a/device/mellanox/x86_64-mlnx_msn2410-r0/platform_reboot
+++ b/device/mellanox/x86_64-mlnx_msn2410-r0/platform_reboot
@ -0,0 +1 @@
+../x86_64-mlnx_msn2700-r0/platform_reboot
--- a/device/mellanox/x86_64-mlnx_msn2410-r0/pre_reboot_hook
+++ b/device/mellanox/x86_64-mlnx_msn2410-r0/pre_reboot_hook
@ -1 +0,0 @@
-../x86_64-mlnx_msn2700-r0/pre_reboot_hook
--- a/device/mellanox/x86_64-mlnx_msn2410-r0/sensors.conf
+++ b/device/mellanox/x86_64-mlnx_msn2410-r0/sensors.conf
@ -79,59 +79,3 @@ bus "i2c-2" "i2c-1-mux (chan_id 1)"
        label fan6 "Chassis Drawer-3 Fan-2"
        label fan7 "Chassis Drawer-4 Fan-1"
        label fan8 "Chassis Drawer-4 Fan-2"
-        ignore temp2
-        ignore temp3
-        ignore temp4
-        ignore temp5
-        ignore temp6
-        ignore temp7
-        ignore temp8
-        ignore temp9
-        ignore temp10
-        ignore temp11
-        ignore temp12
-        ignore temp13
-        ignore temp14
-        ignore temp15
-        ignore temp16
-        ignore temp17
-        ignore temp18
-        ignore temp19
-        ignore temp20
-        ignore temp21
-        ignore temp22
-        ignore temp23
-        ignore temp24
-        ignore temp25
-        ignore temp26
-        ignore temp27
-        ignore temp28
-        ignore temp29
-        ignore temp30
-        ignore temp31
-        ignore temp32
-        ignore temp33
-        ignore temp34
-        ignore temp35
-        ignore temp36
-        ignore temp37
-        ignore temp38
-        ignore temp39
-        ignore temp40
-        ignore temp41
-        ignore temp42
-        ignore temp43
-        ignore temp44
-        ignore temp45
-        ignore temp46
-        ignore temp47
-        ignore temp48
-        ignore temp49
-        ignore temp50
-        ignore temp51
-        ignore temp52
-        ignore temp53
-        ignore temp54
-        ignore temp55
-        ignore temp56
-        ignore temp57
--- a/device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/sai.profile
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/sai.profile
@ -1 +1,3 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_2700.xml
+SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
+SAI_DUMP_STORE_AMOUNT=10
--- a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-C28D8/sai.profile
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-C28D8/sai.profile
@ -1,2 +1,4 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_2700_8x50g_28x100g.xml
+SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
+SAI_DUMP_STORE_AMOUNT=10
 SAI_DEFAULT_SWITCHING_MODE_STORE_FORWARD=1
--- a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D40C8S8/sai.profile
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D40C8S8/sai.profile
@ -1,2 +1,4 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_2700_8x100g_40x50g_8x10g.xml
+SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
+SAI_DUMP_STORE_AMOUNT=10
 SAI_DEFAULT_SWITCHING_MODE_STORE_FORWARD=1
--- a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D44C10/sai.profile
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D44C10/sai.profile
@ -1,2 +1,4 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_2700_44x50g_10x100g.xml
+SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
+SAI_DUMP_STORE_AMOUNT=10
 SAI_DEFAULT_SWITCHING_MODE_STORE_FORWARD=1
--- a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/sai.profile
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/sai.profile
@ -1,2 +1,4 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_2700_48x50g_8x100g.xml
+SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
+SAI_DUMP_STORE_AMOUNT=10
 SAI_DEFAULT_SWITCHING_MODE_STORE_FORWARD=1
--- a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700/sai.profile
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700/sai.profile
@ -1,2 +1,4 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_2700.xml
+SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
+SAI_DUMP_STORE_AMOUNT=10
 SAI_DEFAULT_SWITCHING_MODE_STORE_FORWARD=1
--- a/device/mellanox/x86_64-mlnx_msn2700-r0/installer.conf
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/installer.conf
@ -1 +1 @@
-ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="acpi_enforce_resources=lax acpi=noirq libata.force=noncq"
+ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="acpi_enforce_resources=lax acpi=noirq"
--- a/device/mellanox/x86_64-mlnx_msn2700-r0/platform_reboot
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/platform_reboot
@ -0,0 +1,55 @@
+#!/bin/bash
+
+declare -r EXIT_SUCCESS="0"
+declare -r EXIT_ERROR="1"
+
+declare -r PENDING_COMPONENT_FW="/usr/bin/install-pending-fw.py"
+declare -r FW_UPGRADE_SCRIPT="/usr/bin/mlnx-fw-upgrade.sh"
+declare -r SYSFS_PWR_CYCLE="/var/run/hw-management/system/pwr_cycle"
+
+FORCE_REBOOT="no"
+
+function ParseArguments() {
+    while [ $# -ge 1 ]; do
+        case "$1" in
+            -f|--force)
+                FORCE_REBOOT="yes"
+            ;;
+        esac
+        shift
+    done
+}
+
+function SafePwrCycle() {
+    sync; sync
+    umount -fa > /dev/null 2>&1
+    echo 1 > $SYSFS_PWR_CYCLE
+}
+
+ParseArguments "$@"
+
+# Reboot immediately if the kdump capture kernel is running
+VMCORE_FILE=/proc/vmcore
+if [ -s $VMCORE_FILE ]; then
+    sync; sync
+    umount -fa > /dev/null 2>&1
+
+    # Run Debian reboot because the platform reboot isn't available
+    /sbin/reboot
+fi
+
+
+${FW_UPGRADE_SCRIPT} --upgrade --verbose
+EXIT_CODE="$?"
+if [[ "${EXIT_CODE}" != "${EXIT_SUCCESS}" ]]; then
+    echo "Failed to burn MLNX FW: errno=${EXIT_CODE}"
+
+    if [[ "${FORCE_REBOOT}" != "yes" ]]; then
+        echo "Reboot is interrupted: use -f|--force to override"
+        exit "${EXIT_ERROR}"
+    fi
+fi
+
+${PENDING_COMPONENT_FW}
+
+SafePwrCycle
--- a/device/mellanox/x86_64-mlnx_msn2700-r0/platform_wait
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/platform_wait
@ -1,32 +1,68 @@
-#!/usr/bin/python3
+#!/bin/bash

-#
-# Copyright (c) 2023 NVIDIA CORPORATION & AFFILIATES.
-# Apache-2.0
-#
-# 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
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# 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.
-#
+declare -r SYSLOG_LOGGER="/usr/bin/logger"
+declare -r SYSLOG_IDENTIFIER="platform_wait"
+declare -r SYSLOG_ERROR="error"
+declare -r SYSLOG_NOTICE="notice"
+declare -r SYSLOG_INFO="info"

-import sys
-from sonic_platform.device_data import DeviceDataManager
-from sonic_py_common.logger import Logger
+declare -r HW_MGMT_CONFIG="/var/run/hw-management/config"

+declare -r ASIC_INIT_DONE="${HW_MGMT_CONFIG}/asics_init_done"
+declare -r NUM_ASICS="${HW_MGMT_CONFIG}/asic_num"
+declare -r ASIC_CHIPUP_COMPLETED="${HW_MGMT_CONFIG}/asic_chipup_completed"

-logger = Logger(log_identifier='platform_wait')
-logger.log_notice('Nvidia: Wait for PMON dependencies to be ready')
-if DeviceDataManager.wait_platform_ready():
-    logger.log_notice('Nvidia: PMON dependencies are ready')
-    sys.exit(0)
-else:
-    logger.log_error('Nvidia: PMON dependencies are not ready: timeout')
-    sys.exit(-1)
+declare -r EXIT_SUCCESS="0"
+declare -r EXIT_TIMEOUT="1"
+
+function log_error() {
+    eval "${SYSLOG_LOGGER} -t ${SYSLOG_IDENTIFIER} -p ${SYSLOG_ERROR} $@"
+}
+
+function log_notice() {
+    eval "${SYSLOG_LOGGER} -t ${SYSLOG_IDENTIFIER} -p ${SYSLOG_NOTICE} $@"
+}
+
+function log_info() {
+    eval "${SYSLOG_LOGGER} -t ${SYSLOG_IDENTIFIER} -p ${SYSLOG_INFO} $@"
+}
+
+function wait_for_asic_chipup() {
+
+    local _ASIC_INIT="0"
+    local _ASIC_COUNT="0"
+    local _ASICS_CHIPUP="0"
+
+    local -i _WDOG_CNT="1"
+    local -ir _WDOG_MAX="300"
+
+    local -r _TIMEOUT="1s"
+
+    while [[ "${_WDOG_CNT}" -le "${_WDOG_MAX}" ]]; do
+        _ASIC_INIT="$(cat ${ASIC_INIT_DONE} 2>&1)"
+        _ASIC_COUNT="$(cat ${NUM_ASICS} 2>&1)"
+        _ASICS_CHIPUP="$(cat ${ASIC_CHIPUP_COMPLETED} 2>&1)"
+
+        if [[ "${_ASIC_INIT}" -eq 1 && "${_ASIC_COUNT}" -eq "${_ASICS_CHIPUP}" ]]; then
+            return "${EXIT_SUCCESS}"
+        fi
+
+        let "_WDOG_CNT++"
+        sleep "${_TIMEOUT}"
+    done
+
+    log_error "Mellanox ASIC is not ready: INIT: ${_ASIC_INIT}, NUM_ASIC: ${_ASIC_COUNT}, CHIPUP: ${_ASICS_CHIPUP} timeout...."
+    return "${EXIT_TIMEOUT}"
+}
+
+log_info "Wait for Mellanox ASIC to be ready"
+
+wait_for_asic_chipup
+EXIT_CODE="$?"
+if [[ "${EXIT_CODE}" != "${EXIT_SUCCESS}" ]]; then
+    exit "${EXIT_CODE}"
+fi
+
+log_notice "Mellanox ASIC is ready"
+
+exit "${EXIT_SUCCESS}"
--- a/device/mellanox/x86_64-mlnx_msn2700-r0/pre_reboot_hook
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/pre_reboot_hook
@ -1,34 +0,0 @@
-#!/bin/bash
-
-# Copyright (c) 2020-2023 NVIDIA CORPORATION & AFFILIATES.
-# Apache-2.0
-#
-# 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
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# 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.
-
-declare -r EXIT_SUCCESS=0
-declare -r EXIT_ERROR=1
-
-declare -r PENDING_COMPONENT_FW="/usr/bin/install-pending-fw.py"
-declare -r FW_UPGRADE_SCRIPT="/usr/bin/mlnx-fw-upgrade.sh"
-
-
-${FW_UPGRADE_SCRIPT} --upgrade --verbose
-EXIT_CODE=$?
-if [[ ${EXIT_CODE} != ${EXIT_SUCCESS} ]]; then
-    echo "Failed to burn MLNX FW: errno=${EXIT_CODE}"
-    exit ${EXIT_ERROR}
-fi
-
-${PENDING_COMPONENT_FW}
-
-exit ${EXIT_SUCCESS}
--- a/device/mellanox/x86_64-mlnx_msn2700-r0/sensors.conf
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/sensors.conf
@ -79,35 +79,3 @@ bus "i2c-2" "i2c-1-mux (chan_id 2)"
        label fan6 "Chassis Drawer-3 Fan-2"
        label fan7 "Chassis Drawer-4 Fan-1"
        label fan8 "Chassis Drawer-4 Fan-2"
-        ignore temp2
-        ignore temp3
-        ignore temp4
-        ignore temp5
-        ignore temp6
-        ignore temp7
-        ignore temp8
-        ignore temp9
-        ignore temp10
-        ignore temp11
-        ignore temp12
-        ignore temp13
-        ignore temp14
-        ignore temp15
-        ignore temp16
-        ignore temp17
-        ignore temp18
-        ignore temp19
-        ignore temp20
-        ignore temp21
-        ignore temp22
-        ignore temp23
-        ignore temp24
-        ignore temp25
-        ignore temp26
-        ignore temp27
-        ignore temp28
-        ignore temp29
-        ignore temp30
-        ignore temp31
-        ignore temp32
-        ignore temp33
--- a/device/mellanox/x86_64-mlnx_msn2700a1-r0/installer.conf
+++ b/device/mellanox/x86_64-mlnx_msn2700a1-r0/installer.conf
@ -1 +1 @@
-ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="libata.force=noncq"
+ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="logs_inram=on"
--- a/device/mellanox/x86_64-mlnx_msn2700a1-r0/platform.json
+++ b/device/mellanox/x86_64-mlnx_msn2700a1-r0/platform.json
@ -1,6 +1,6 @@
 {
    "chassis": {
-        "name": "MSN2700-A1",
+        "name": "MSN2700",
        "components": [
            {
                "name": "ONIE"
--- a/Show More
+++ b/Show More
				`@ -1 +0,0 @@`
				`ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="default_hugepagesz=32M hugepages=4"`