diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/2/buffers.json.j2 b/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/2/buffers.json.j2
deleted file mode 100644
index b67cf577ab75..000000000000
--- a/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/2/buffers.json.j2
+++ /dev/null
@@ -1,3 +0,0 @@
-{%- set default_topo = 't1' %}
-{%- include 'buffers_config.j2' %}
-
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/2/buffers_defaults_def.j2 b/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/2/buffers_defaults_def.j2
deleted file mode 100644
index 38e34eb571e8..000000000000
--- a/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/2/buffers_defaults_def.j2
+++ /dev/null
@@ -1,45 +0,0 @@
-{%- set default_cable = '300m' %}
-
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {% for port_idx in range(0,32) %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
-    {% endfor %}
-{%- endmacro %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "12766208",
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "12766208",
-            "type": "egress",
-            "mode": "static"
-        },
-        "egress_lossy_pool": {
-            "size": "7326924",
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "static_th":"12766208"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"1518",
-            "dynamic_th":"3"
-        }
-    },
-{%- endmacro %}
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/2/buffers_defaults_t0.j2 b/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/2/buffers_defaults_t0.j2
deleted file mode 100644
index 38e34eb571e8..000000000000
--- a/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/2/buffers_defaults_t0.j2
+++ /dev/null
@@ -1,45 +0,0 @@
-{%- set default_cable = '300m' %}
-
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {% for port_idx in range(0,32) %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
-    {% endfor %}
-{%- endmacro %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "12766208",
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "12766208",
-            "type": "egress",
-            "mode": "static"
-        },
-        "egress_lossy_pool": {
-            "size": "7326924",
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "static_th":"12766208"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"1518",
-            "dynamic_th":"3"
-        }
-    },
-{%- endmacro %}
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/2/buffers_defaults_t1.j2 b/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/2/buffers_defaults_t1.j2
deleted file mode 100644
index 38e34eb571e8..000000000000
--- a/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/2/buffers_defaults_t1.j2
+++ /dev/null
@@ -1,45 +0,0 @@
-{%- set default_cable = '300m' %}
-
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {% for port_idx in range(0,32) %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
-    {% endfor %}
-{%- endmacro %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "12766208",
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "12766208",
-            "type": "egress",
-            "mode": "static"
-        },
-        "egress_lossy_pool": {
-            "size": "7326924",
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "static_th":"12766208"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"1518",
-            "dynamic_th":"3"
-        }
-    },
-{%- endmacro %}
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/2/lanemap.ini b/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/2/lanemap.ini
deleted file mode 100644
index d2b9e31ecadb..000000000000
--- a/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/2/lanemap.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-eth1:1,2,3,4
-eth2:5,6,7,8
-eth3:9,10,11,12
-eth4:13,14,15,16
-eth5:17,18,19,20
-eth6:21,22,23,24
-eth7:25,26,27,28
-eth8:29,30,31,32
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/2/pg_profile_lookup.ini b/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/2/pg_profile_lookup.ini
deleted file mode 100644
index 9f2eacb6fc42..000000000000
--- a/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/2/pg_profile_lookup.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-# PG lossless profiles.
-# speed cable size      xon     xoff   threshold xon_offset
-  10000  5m   56368     18432   55120  -3        2496
-  25000  5m   56368     18432   55120  -3        2496
-  40000  5m   56368     18432   55120  -3        2496
-  50000  5m   56368     18432   55120  -3        2496
- 100000  5m   56368     18432   55120  -3        2496
-  10000  40m  56368     18432   55120  -3        2496
-  25000  40m  56368     18432   55120  -3        2496
-  40000  40m  56368     18432   55120  -3        2496
-  50000  40m  56368     18432   55120  -3        2496
- 100000  40m  56368     18432   55120  -3        2496
-  10000  300m 56368     18432   55120  -3        2496
-  25000  300m 56368     18432   55120  -3        2496
-  40000  300m 56368     18432   55120  -3        2496
-  50000  300m 56368     18432   55120  -3        2496
- 100000  300m 56368     18432   55120  -3        2496
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/2/qos.json.j2 b/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/2/qos.json.j2
deleted file mode 100644
index 3e548325ea30..000000000000
--- a/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/2/qos.json.j2
+++ /dev/null
@@ -1 +0,0 @@
-{%- include 'qos_config.j2' %}
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/2/sai.profile b/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/2/sai.profile
deleted file mode 100644
index 0a2df177f1c5..000000000000
--- a/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/2/sai.profile
+++ /dev/null
@@ -1,3 +0,0 @@
-SAI_VS_SWITCH_TYPE=SAI_VS_SWITCH_TYPE_BCM56850
-SAI_VS_HOSTIF_USE_TAP_DEVICE=true
-SAI_VS_INTERFACE_LANE_MAP_FILE=/usr/share/sonic/hwsku/lanemap.ini
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/2/td2-s6000-32x40G.config.bcm b/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/2/td2-s6000-32x40G.config.bcm
deleted file mode 100644
index 0e25b4d4232d..000000000000
--- a/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/2/td2-s6000-32x40G.config.bcm
+++ /dev/null
@@ -1,646 +0,0 @@
-# Old LPM only configuration
-# l2_mem_entries=163840
-# l3_mem_entries=90112
-# l3_alpm_enable=0
-# ipv6_lpm_128b_enable=0
-#
-# ALPM enable
-l3_alpm_enable=2
-ipv6_lpm_128b_enable=1
-l2_mem_entries=32768
-l3_mem_entries=16384
-
-# From old config file
-os=unix
-higig2_hdr_mode=1
-
-# Parity
-parity_correction=1
-parity_enable=1
-stat_if_parity_enable=0
-
-#
-bcm_num_cos=10
-bcm_stat_interval=2000000
-l2xmsg_hostbuf_size=8192
-l2xmsg_mode=1
-lls_num_l2uc=12
-max_vp_lags=0
-miim_intr_enable=0
-mmu_lossless=0
-module_64ports=0
-schan_intr_enable=0
-stable_size=0x2000000
-tdma_timeout_usec=5000000
-
-pbmp_oversubscribe=0x000007fffffffffffffffffffffffffe
-pbmp_xport_xe=0x000007fffffffffffffffffffffffffe
-
-# Ports configuration
-# xe0 (40G)
-portmap_1=25:40
-xgxs_rx_lane_map_1=0x213
-xgxs_tx_lane_map_1=0x2031
-phy_xaui_rx_polarity_flip_1=0xe
-phy_xaui_tx_polarity_flip_1=0x2
-serdes_driver_current_lane0_xe0=0x5
-serdes_driver_current_lane1_xe0=0x5
-serdes_driver_current_lane2_xe0=0x5
-serdes_driver_current_lane3_xe0=0x5
-serdes_pre_driver_current_lane0_xe0=0x5
-serdes_pre_driver_current_lane1_xe0=0x5
-serdes_pre_driver_current_lane2_xe0=0x5
-serdes_pre_driver_current_lane3_xe0=0x5
-serdes_preemphasis_lane0_xe0=0xcad0
-serdes_preemphasis_lane1_xe0=0xc6e0
-serdes_preemphasis_lane2_xe0=0xc6e0
-serdes_preemphasis_lane3_xe0=0xd2b0
-
-# xe1 (40G)
-portmap_2=29:40
-xgxs_rx_lane_map_2=0x213
-xgxs_tx_lane_map_2=0x213
-phy_xaui_rx_polarity_flip_2=0xc
-phy_xaui_tx_polarity_flip_2=0x9
-serdes_driver_current_lane0_xe1=0x6
-serdes_driver_current_lane1_xe1=0x7
-serdes_driver_current_lane2_xe1=0x6
-serdes_driver_current_lane3_xe1=0x6
-serdes_pre_driver_current_lane0_xe1=0x6
-serdes_pre_driver_current_lane1_xe1=0x7
-serdes_pre_driver_current_lane2_xe1=0x6
-serdes_pre_driver_current_lane3_xe1=0x6
-serdes_preemphasis_lane0_xe1=0xc2f0
-serdes_preemphasis_lane1_xe1=0xd2b0
-serdes_preemphasis_lane2_xe1=0xc6e0
-serdes_preemphasis_lane3_xe1=0xc2f0
-
-# xe2 (40G)
-portmap_3=33:40
-xgxs_rx_lane_map_3=0x213
-xgxs_tx_lane_map_3=0x132
-phy_xaui_rx_polarity_flip_3=0xe
-phy_xaui_tx_polarity_flip_3=0x2
-serdes_driver_current_lane0_xe2=0x4
-serdes_driver_current_lane1_xe2=0x4
-serdes_driver_current_lane2_xe2=0x4
-serdes_driver_current_lane3_xe2=0x4
-serdes_pre_driver_current_lane0_xe2=0x4
-serdes_pre_driver_current_lane1_xe2=0x4
-serdes_pre_driver_current_lane2_xe2=0x4
-serdes_pre_driver_current_lane3_xe2=0x4
-serdes_preemphasis_lane0_xe2=0xc6e0
-serdes_preemphasis_lane1_xe2=0xc6e0
-serdes_preemphasis_lane2_xe2=0xc6e0
-serdes_preemphasis_lane3_xe2=0xc6e0
-
-# xe3 (40G)
-portmap_4=37:40
-xgxs_rx_lane_map_4=0x213
-xgxs_tx_lane_map_4=0x1203
-phy_xaui_rx_polarity_flip_4=0x3
-phy_xaui_tx_polarity_flip_4=0xe
-serdes_driver_current_lane0_xe3=0x4
-serdes_driver_current_lane1_xe3=0x4
-serdes_driver_current_lane2_xe3=0x4
-serdes_driver_current_lane3_xe3=0x4
-serdes_pre_driver_current_lane0_xe3=0x4
-serdes_pre_driver_current_lane1_xe3=0x4
-serdes_pre_driver_current_lane2_xe3=0x4
-serdes_pre_driver_current_lane3_xe3=0x4
-serdes_preemphasis_lane0_xe3=0xcad0
-serdes_preemphasis_lane1_xe3=0xcad0
-serdes_preemphasis_lane2_xe3=0xc2f0
-serdes_preemphasis_lane3_xe3=0xc2f0
-
-# xe4 (40G)
-portmap_5=45:40
-xgxs_rx_lane_map_5=0x213
-xgxs_tx_lane_map_5=0x213
-phy_xaui_rx_polarity_flip_5=0xe
-phy_xaui_tx_polarity_flip_5=0x8
-serdes_driver_current_lane0_xe4=0x4
-serdes_driver_current_lane1_xe4=0x4
-serdes_driver_current_lane2_xe4=0x4
-serdes_driver_current_lane3_xe4=0x4
-serdes_pre_driver_current_lane0_xe4=0x4
-serdes_pre_driver_current_lane1_xe4=0x4
-serdes_pre_driver_current_lane2_xe4=0x4
-serdes_pre_driver_current_lane3_xe4=0x4
-serdes_preemphasis_lane0_xe4=0xc2f0
-serdes_preemphasis_lane1_xe4=0xc2f0
-serdes_preemphasis_lane2_xe4=0xc2f0
-serdes_preemphasis_lane3_xe4=0xc2f0
-
-# xe5 (40G)
-portmap_6=41:40
-xgxs_rx_lane_map_6=0x213
-xgxs_tx_lane_map_6=0x3021
-phy_xaui_rx_polarity_flip_6=0x3
-phy_xaui_tx_polarity_flip_6=0xb
-serdes_driver_current_lane0_xe5=0x4
-serdes_driver_current_lane1_xe5=0x4
-serdes_driver_current_lane2_xe5=0x4
-serdes_driver_current_lane3_xe5=0x4
-serdes_pre_driver_current_lane0_xe5=0x4
-serdes_pre_driver_current_lane1_xe5=0x4
-serdes_pre_driver_current_lane2_xe5=0x4
-serdes_pre_driver_current_lane3_xe5=0x4
-serdes_preemphasis_lane0_xe5=0xc6e0
-serdes_preemphasis_lane1_xe5=0xc2f0
-serdes_preemphasis_lane2_xe5=0xc2f0
-serdes_preemphasis_lane3_xe5=0xcad0
-
-# xe6 (40G)
-portmap_7=1:40
-xgxs_rx_lane_map_7=0x213
-xgxs_tx_lane_map_7=0x2031
-phy_xaui_rx_polarity_flip_7=0xe
-phy_xaui_tx_polarity_flip_7=0xd
-serdes_driver_current_lane0_xe6=0x5
-serdes_driver_current_lane1_xe6=0x5
-serdes_driver_current_lane2_xe6=0x5
-serdes_driver_current_lane3_xe6=0x5
-serdes_pre_driver_current_lane0_xe6=0x5
-serdes_pre_driver_current_lane1_xe6=0x5
-serdes_pre_driver_current_lane2_xe6=0x5
-serdes_pre_driver_current_lane3_xe6=0x5
-serdes_preemphasis_lane0_xe6=0xc6e0
-serdes_preemphasis_lane1_xe6=0xcad0
-serdes_preemphasis_lane2_xe6=0xc6e0
-serdes_preemphasis_lane3_xe6=0xcad0
-
-# xe7 (40G)
-portmap_8=5:40
-xgxs_rx_lane_map_8=0x213
-xgxs_tx_lane_map_8=0x1203
-phy_xaui_rx_polarity_flip_8=0xc
-phy_xaui_tx_polarity_flip_8=0x1
-serdes_driver_current_lane0_xe7=0x4
-serdes_driver_current_lane1_xe7=0x4
-serdes_driver_current_lane2_xe7=0x4
-serdes_driver_current_lane3_xe7=0x4
-serdes_pre_driver_current_lane0_xe7=0x4
-serdes_pre_driver_current_lane1_xe7=0x4
-serdes_pre_driver_current_lane2_xe7=0x4
-serdes_pre_driver_current_lane3_xe7=0x4
-serdes_preemphasis_lane0_xe7=0xc6e0
-serdes_preemphasis_lane1_xe7=0xc6e0
-serdes_preemphasis_lane2_xe7=0xc6e0
-serdes_preemphasis_lane3_xe7=0xc6e0
-
-# xe8 (40G)
-portmap_9=13:40
-xgxs_rx_lane_map_9=0x213
-xgxs_tx_lane_map_9=0x132
-phy_xaui_rx_polarity_flip_9=0xe
-phy_xaui_tx_polarity_flip_9=0x0
-serdes_driver_current_lane0_xe8=0x2
-serdes_driver_current_lane1_xe8=0x3
-serdes_driver_current_lane2_xe8=0x2
-serdes_driver_current_lane3_xe8=0x2
-serdes_pre_driver_current_lane0_xe8=0x2
-serdes_pre_driver_current_lane1_xe8=0x3
-serdes_pre_driver_current_lane2_xe8=0x2
-serdes_pre_driver_current_lane3_xe8=0x2
-serdes_preemphasis_lane0_xe8=0xb270
-serdes_preemphasis_lane1_xe8=0xbb10
-serdes_preemphasis_lane2_xe8=0xb720
-serdes_preemphasis_lane3_xe8=0xb720
-
-# xe9 (40G)
-portmap_10=9:40
-xgxs_rx_lane_map_10=0x3120
-xgxs_tx_lane_map_10=0x3021
-phy_xaui_rx_polarity_flip_10=0x0
-phy_xaui_tx_polarity_flip_10=0x4
-serdes_driver_current_lane0_xe9=0x3
-serdes_driver_current_lane1_xe9=0x3
-serdes_driver_current_lane2_xe9=0x3
-serdes_driver_current_lane3_xe9=0x3
-serdes_pre_driver_current_lane0_xe9=0x3
-serdes_pre_driver_current_lane1_xe9=0x3
-serdes_pre_driver_current_lane2_xe9=0x3
-serdes_pre_driver_current_lane3_xe9=0x3
-serdes_preemphasis_lane0_xe9=0xc2f0
-serdes_preemphasis_lane1_xe9=0xc6e0
-serdes_preemphasis_lane2_xe9=0xbf00
-serdes_preemphasis_lane3_xe9=0xc2f0
-
-# xe10 (40G)
-portmap_11=17:40
-xgxs_rx_lane_map_11=0x213
-xgxs_tx_lane_map_11=0x132
-phy_xaui_rx_polarity_flip_11=0xe
-phy_xaui_tx_polarity_flip_11=0x0
-serdes_driver_current_lane0_xe10=0x2
-serdes_driver_current_lane1_xe10=0x2
-serdes_driver_current_lane2_xe10=0x2
-serdes_driver_current_lane3_xe10=0x2
-serdes_pre_driver_current_lane0_xe10=0x2
-serdes_pre_driver_current_lane1_xe10=0x2
-serdes_pre_driver_current_lane2_xe10=0x2
-serdes_pre_driver_current_lane3_xe10=0x2
-serdes_preemphasis_lane0_xe10=0xb330
-serdes_preemphasis_lane1_xe10=0xbb10
-serdes_preemphasis_lane2_xe10=0xbb10
-serdes_preemphasis_lane3_xe10=0xbb10
-
-# xe11 (40G)
-portmap_12=21:40
-xgxs_rx_lane_map_12=0x123
-xgxs_tx_lane_map_12=0x1203
-phy_xaui_rx_polarity_flip_12=0xc
-phy_xaui_tx_polarity_flip_12=0xe
-serdes_driver_current_lane0_xe11=0x2
-serdes_driver_current_lane1_xe11=0x2
-serdes_driver_current_lane2_xe11=0x2
-serdes_driver_current_lane3_xe11=0x2
-serdes_pre_driver_current_lane0_xe11=0x2
-serdes_pre_driver_current_lane1_xe11=0x2
-serdes_pre_driver_current_lane2_xe11=0x2
-serdes_pre_driver_current_lane3_xe11=0x2
-serdes_preemphasis_lane0_xe11=0xb330
-serdes_preemphasis_lane1_xe11=0xb330
-serdes_preemphasis_lane2_xe11=0xb330
-serdes_preemphasis_lane3_xe11=0xb330
-
-# xe12 (40G)
-portmap_13=53:40
-xgxs_rx_lane_map_13=0x213
-xgxs_tx_lane_map_13=0x231
-phy_xaui_rx_polarity_flip_13=0x1
-phy_xaui_tx_polarity_flip_13=0x0
-serdes_driver_current_lane0_xe12=0x2
-serdes_driver_current_lane1_xe12=0x2
-serdes_driver_current_lane2_xe12=0x2
-serdes_driver_current_lane3_xe12=0x2
-serdes_pre_driver_current_lane0_xe12=0x2
-serdes_pre_driver_current_lane1_xe12=0x2
-serdes_pre_driver_current_lane2_xe12=0x2
-serdes_pre_driver_current_lane3_xe12=0x2
-serdes_preemphasis_lane0_xe12=0xaf40
-serdes_preemphasis_lane1_xe12=0xaf40
-serdes_preemphasis_lane2_xe12=0xaf40
-serdes_preemphasis_lane3_xe12=0xaf40
-
-# xe13 (40G)
-portmap_14=49:40
-xgxs_rx_lane_map_14=0x1302
-xgxs_tx_lane_map_14=0x2031
-phy_xaui_rx_polarity_flip_14=0xb
-phy_xaui_tx_polarity_flip_14=0x3
-serdes_driver_current_lane0_xe13=0x2
-serdes_driver_current_lane1_xe13=0x2
-serdes_driver_current_lane2_xe13=0x2
-serdes_driver_current_lane3_xe13=0x2
-serdes_pre_driver_current_lane0_xe13=0x2
-serdes_pre_driver_current_lane1_xe13=0x2
-serdes_pre_driver_current_lane2_xe13=0x2
-serdes_pre_driver_current_lane3_xe13=0x2
-serdes_preemphasis_lane0_xe13=0xa760
-serdes_preemphasis_lane1_xe13=0xa760
-serdes_preemphasis_lane2_xe13=0xa760
-serdes_preemphasis_lane3_xe13=0xa760
-
-# xe14 (40G)
-portmap_15=57:40
-xgxs_rx_lane_map_15=0x213
-xgxs_tx_lane_map_15=0x2031
-phy_xaui_rx_polarity_flip_15=0x1
-phy_xaui_tx_polarity_flip_15=0x0
-serdes_driver_current_lane0_xe14=0x1
-serdes_driver_current_lane1_xe14=0x1
-serdes_driver_current_lane2_xe14=0x1
-serdes_driver_current_lane3_xe14=0x1
-serdes_pre_driver_current_lane0_xe14=0x1
-serdes_pre_driver_current_lane1_xe14=0x1
-serdes_pre_driver_current_lane2_xe14=0x1
-serdes_pre_driver_current_lane3_xe14=0x1
-serdes_preemphasis_lane0_xe14=0xa760
-serdes_preemphasis_lane1_xe14=0xa760
-serdes_preemphasis_lane2_xe14=0xa760
-serdes_preemphasis_lane3_xe14=0xa760
-
-# xe15 (40G)
-portmap_16=61:40
-xgxs_rx_lane_map_16=0x132
-xgxs_tx_lane_map_16=0x213
-phy_xaui_rx_polarity_flip_16=0x0
-phy_xaui_tx_polarity_flip_16=0x0
-serdes_driver_current_lane0_xe15=0x2
-serdes_driver_current_lane1_xe15=0x2
-serdes_driver_current_lane2_xe15=0x2
-serdes_driver_current_lane3_xe15=0x2
-serdes_pre_driver_current_lane0_xe15=0x2
-serdes_pre_driver_current_lane1_xe15=0x2
-serdes_pre_driver_current_lane2_xe15=0x2
-serdes_pre_driver_current_lane3_xe15=0x2
-serdes_preemphasis_lane0_xe15=0xa760
-serdes_preemphasis_lane1_xe15=0xa760
-serdes_preemphasis_lane2_xe15=0xa760
-serdes_preemphasis_lane3_xe15=0xa760
-
-# xe16 (40G)
-portmap_17=69:40
-xgxs_rx_lane_map_17=0x213
-xgxs_tx_lane_map_17=0x2130
-phy_xaui_rx_polarity_flip_17=0x1
-phy_xaui_tx_polarity_flip_17=0xf
-serdes_driver_current_lane0_xe16=0x1
-serdes_driver_current_lane1_xe16=0x1
-serdes_driver_current_lane2_xe16=0x1
-serdes_driver_current_lane3_xe16=0x1
-serdes_pre_driver_current_lane0_xe16=0x1
-serdes_pre_driver_current_lane1_xe16=0x1
-serdes_pre_driver_current_lane2_xe16=0x1
-serdes_pre_driver_current_lane3_xe16=0x1
-serdes_preemphasis_lane0_xe16=0xa760
-serdes_preemphasis_lane1_xe16=0xa760
-serdes_preemphasis_lane2_xe16=0xa760
-serdes_preemphasis_lane3_xe16=0xa760
-
-# xe17 (40G)
-portmap_18=65:40
-xgxs_rx_lane_map_18=0x132
-xgxs_tx_lane_map_18=0x2031
-phy_xaui_rx_polarity_flip_18=0x3
-phy_xaui_tx_polarity_flip_18=0x9
-serdes_driver_current_lane0_xe17=0x1
-serdes_driver_current_lane1_xe17=0x1
-serdes_driver_current_lane2_xe17=0x1
-serdes_driver_current_lane3_xe17=0x1
-serdes_pre_driver_current_lane0_xe17=0x1
-serdes_pre_driver_current_lane1_xe17=0x1
-serdes_pre_driver_current_lane2_xe17=0x1
-serdes_pre_driver_current_lane3_xe17=0x1
-serdes_preemphasis_lane0_xe17=0xa370
-serdes_preemphasis_lane1_xe17=0xa370
-serdes_preemphasis_lane2_xe17=0xa370
-serdes_preemphasis_lane3_xe17=0xa370
-
-# xe18 (40G)
-portmap_19=73:40
-xgxs_rx_lane_map_19=0x213
-xgxs_tx_lane_map_19=0x2031
-phy_xaui_rx_polarity_flip_19=0x1
-phy_xaui_tx_polarity_flip_19=0x0
-serdes_driver_current_lane0_xe18=0x2
-serdes_driver_current_lane1_xe18=0x2
-serdes_driver_current_lane2_xe18=0x2
-serdes_driver_current_lane3_xe18=0x2
-serdes_pre_driver_current_lane0_xe18=0x2
-serdes_pre_driver_current_lane1_xe18=0x2
-serdes_pre_driver_current_lane2_xe18=0x2
-serdes_pre_driver_current_lane3_xe18=0x2
-serdes_preemphasis_lane0_xe18=0xa760
-serdes_preemphasis_lane1_xe18=0xa760
-serdes_preemphasis_lane2_xe18=0xa760
-serdes_preemphasis_lane3_xe18=0xa760
-
-# xe19 (40G)
-portmap_20=77:40
-xgxs_rx_lane_map_20=0x123
-xgxs_tx_lane_map_20=0x1203
-phy_xaui_rx_polarity_flip_20=0x3
-phy_xaui_tx_polarity_flip_20=0xe
-serdes_driver_current_lane0_xe19=0x2
-serdes_driver_current_lane1_xe19=0x2
-serdes_driver_current_lane2_xe19=0x2
-serdes_driver_current_lane3_xe19=0x2
-serdes_pre_driver_current_lane0_xe19=0x2
-serdes_pre_driver_current_lane1_xe19=0x2
-serdes_pre_driver_current_lane2_xe19=0x2
-serdes_pre_driver_current_lane3_xe19=0x2
-serdes_preemphasis_lane0_xe19=0xaf40
-serdes_preemphasis_lane1_xe19=0xaf40
-serdes_preemphasis_lane2_xe19=0xaf40
-serdes_preemphasis_lane3_xe19=0xaf40
-
-# xe20 (40G)
-portmap_21=109:40
-xgxs_rx_lane_map_21=0x132
-xgxs_tx_lane_map_21=0x132
-phy_xaui_rx_polarity_flip_21=0x8
-phy_xaui_tx_polarity_flip_21=0x0
-serdes_driver_current_lane0_xe20=0x1
-serdes_driver_current_lane1_xe20=0x1
-serdes_driver_current_lane2_xe20=0x1
-serdes_driver_current_lane3_xe20=0x2
-serdes_pre_driver_current_lane0_xe20=0x1
-serdes_pre_driver_current_lane1_xe20=0x1
-serdes_pre_driver_current_lane2_xe20=0x1
-serdes_pre_driver_current_lane3_xe20=0x2
-serdes_preemphasis_lane0_xe20=0xb330
-serdes_preemphasis_lane1_xe20=0xb330
-serdes_preemphasis_lane2_xe20=0xb330
-serdes_preemphasis_lane3_xe20=0xbff0
-
-# xe21 (40G)
-portmap_22=105:40
-xgxs_rx_lane_map_22=0x1320
-xgxs_tx_lane_map_22=0x3021
-phy_xaui_rx_polarity_flip_22=0xd
-phy_xaui_tx_polarity_flip_22=0xb
-serdes_driver_current_lane0_xe21=0x1
-serdes_driver_current_lane1_xe21=0x1
-serdes_driver_current_lane2_xe21=0x1
-serdes_driver_current_lane3_xe21=0x1
-serdes_pre_driver_current_lane0_xe21=0x1
-serdes_pre_driver_current_lane1_xe21=0x1
-serdes_pre_driver_current_lane2_xe21=0x1
-serdes_pre_driver_current_lane3_xe21=0x1
-serdes_preemphasis_lane0_xe21=0xb330
-serdes_preemphasis_lane1_xe21=0xb330
-serdes_preemphasis_lane2_xe21=0xb330
-serdes_preemphasis_lane3_xe21=0xb330
-
-# xe22 (40G)
-portmap_23=113:40
-xgxs_rx_lane_map_23=0x132
-xgxs_tx_lane_map_23=0x132
-phy_xaui_rx_polarity_flip_23=0x8
-phy_xaui_tx_polarity_flip_23=0x0
-serdes_driver_current_lane0_xe22=0x1
-serdes_driver_current_lane1_xe22=0x1
-serdes_driver_current_lane2_xe22=0x1
-serdes_driver_current_lane3_xe22=0x1
-serdes_pre_driver_current_lane0_xe22=0x1
-serdes_pre_driver_current_lane1_xe22=0x1
-serdes_pre_driver_current_lane2_xe22=0x1
-serdes_pre_driver_current_lane3_xe22=0x1
-serdes_preemphasis_lane0_xe22=0xbb10
-serdes_preemphasis_lane1_xe22=0xbb10
-serdes_preemphasis_lane2_xe22=0xbb10
-serdes_preemphasis_lane3_xe22=0xc2f0
-
-# xe23 (40G)
-portmap_24=117:40
-xgxs_rx_lane_map_24=0x231
-xgxs_tx_lane_map_24=0x1203
-phy_xaui_rx_polarity_flip_24=0x3
-phy_xaui_tx_polarity_flip_24=0xe
-serdes_driver_current_lane0_xe23=0x3
-serdes_driver_current_lane1_xe23=0x5
-serdes_driver_current_lane2_xe23=0x3
-serdes_driver_current_lane3_xe23=0x3
-serdes_pre_driver_current_lane0_xe23=0x3
-serdes_pre_driver_current_lane1_xe23=0x5
-serdes_pre_driver_current_lane2_xe23=0x3
-serdes_pre_driver_current_lane3_xe23=0x3
-serdes_preemphasis_lane0_xe23=0xc6e0
-serdes_preemphasis_lane1_xe23=0xc6e0
-serdes_preemphasis_lane2_xe23=0xc6e0
-serdes_preemphasis_lane3_xe23=0xc6e0
-
-# xe24 (40G)
-portmap_25=125:40
-xgxs_rx_lane_map_25=0x132
-xgxs_tx_lane_map_25=0x132
-phy_xaui_rx_polarity_flip_25=0x8
-phy_xaui_tx_polarity_flip_25=0x0
-serdes_driver_current_lane0_xe24=0x4
-serdes_driver_current_lane1_xe24=0x4
-serdes_driver_current_lane2_xe24=0x4
-serdes_driver_current_lane3_xe24=0x4
-serdes_pre_driver_current_lane0_xe24=0x4
-serdes_pre_driver_current_lane1_xe24=0x4
-serdes_pre_driver_current_lane2_xe24=0x4
-serdes_pre_driver_current_lane3_xe24=0x4
-serdes_preemphasis_lane0_xe24=0xc6e0
-serdes_preemphasis_lane1_xe24=0xc6e0
-serdes_preemphasis_lane2_xe24=0xc6e0
-serdes_preemphasis_lane3_xe24=0xcec0
-
-# xe25 (40G)
-portmap_26=121:40
-xgxs_rx_lane_map_26=0x1320
-xgxs_tx_lane_map_26=0x3021
-phy_xaui_rx_polarity_flip_26=0xd
-phy_xaui_tx_polarity_flip_26=0xb
-serdes_driver_current_lane0_xe25=0x4
-serdes_driver_current_lane1_xe25=0x4
-serdes_driver_current_lane2_xe25=0x4
-serdes_driver_current_lane3_xe25=0x4
-serdes_pre_driver_current_lane0_xe25=0x4
-serdes_pre_driver_current_lane1_xe25=0x4
-serdes_pre_driver_current_lane2_xe25=0x4
-serdes_pre_driver_current_lane3_xe25=0x4
-serdes_preemphasis_lane0_xe25=0xc6e0
-serdes_preemphasis_lane1_xe25=0xc6e0
-serdes_preemphasis_lane2_xe25=0xc6e0
-serdes_preemphasis_lane3_xe25=0xc6e0
-
-# xe26 (40G)
-portmap_27=81:40
-xgxs_rx_lane_map_27=0x1320
-xgxs_tx_lane_map_27=0x2031
-phy_xaui_rx_polarity_flip_27=0x1
-phy_xaui_tx_polarity_flip_27=0x2
-serdes_driver_current_lane0_xe26=0x2
-serdes_driver_current_lane1_xe26=0x2
-serdes_driver_current_lane2_xe26=0x2
-serdes_driver_current_lane3_xe26=0x2
-serdes_pre_driver_current_lane0_xe26=0x2
-serdes_pre_driver_current_lane1_xe26=0x2
-serdes_pre_driver_current_lane2_xe26=0x2
-serdes_pre_driver_current_lane3_xe26=0x2
-serdes_preemphasis_lane0_xe26=0xbb10
-serdes_preemphasis_lane1_xe26=0xbb10
-serdes_preemphasis_lane2_xe26=0xbf00
-serdes_preemphasis_lane3_xe26=0xbb10
-
-# xe27 (40G)
-portmap_28=85:40
-xgxs_rx_lane_map_28=0x213
-xgxs_tx_lane_map_28=0x1203
-phy_xaui_rx_polarity_flip_28=0xc
-phy_xaui_tx_polarity_flip_28=0xe
-serdes_driver_current_lane0_xe27=0x4
-serdes_driver_current_lane1_xe27=0x5
-serdes_driver_current_lane2_xe27=0x4
-serdes_driver_current_lane3_xe27=0x5
-serdes_pre_driver_current_lane0_xe27=0x4
-serdes_pre_driver_current_lane1_xe27=0x5
-serdes_pre_driver_current_lane2_xe27=0x4
-serdes_pre_driver_current_lane3_xe27=0x5
-serdes_preemphasis_lane0_xe27=0xc2f0
-serdes_preemphasis_lane1_xe27=0xc6e0
-serdes_preemphasis_lane2_xe27=0xc6e0
-serdes_preemphasis_lane3_xe27=0xc6e0
-
-# xe28 (40G)
-portmap_29=93:40
-xgxs_rx_lane_map_29=0x1320
-xgxs_tx_lane_map_29=0x2031
-phy_xaui_rx_polarity_flip_29=0x1
-phy_xaui_tx_polarity_flip_29=0x2
-serdes_driver_current_lane0_xe28=0x4
-serdes_driver_current_lane1_xe28=0x4
-serdes_driver_current_lane2_xe28=0x4
-serdes_driver_current_lane3_xe28=0x4
-serdes_pre_driver_current_lane0_xe28=0x4
-serdes_pre_driver_current_lane1_xe28=0x4
-serdes_pre_driver_current_lane2_xe28=0x4
-serdes_pre_driver_current_lane3_xe28=0x4
-serdes_preemphasis_lane0_xe28=0xc2f0
-serdes_preemphasis_lane1_xe28=0xc2f0
-serdes_preemphasis_lane2_xe28=0xc2f0
-serdes_preemphasis_lane3_xe28=0xc2f0
-
-# xe29 (40G)
-portmap_30=89:40
-xgxs_rx_lane_map_30=0x1320
-xgxs_tx_lane_map_30=0x3021
-phy_xaui_rx_polarity_flip_30=0x2
-phy_xaui_tx_polarity_flip_30=0xb
-serdes_driver_current_lane0_xe29=0x4
-serdes_driver_current_lane1_xe29=0x4
-serdes_driver_current_lane2_xe29=0x4
-serdes_driver_current_lane3_xe29=0x4
-serdes_pre_driver_current_lane0_xe29=0x4
-serdes_pre_driver_current_lane1_xe29=0x4
-serdes_pre_driver_current_lane2_xe29=0x4
-serdes_pre_driver_current_lane3_xe29=0x4
-serdes_preemphasis_lane0_xe29=0xcad0
-serdes_preemphasis_lane1_xe29=0xc6e0
-serdes_preemphasis_lane2_xe29=0xc6e0
-serdes_preemphasis_lane3_xe29=0xc6e0
-
-# xe30 (40G)
-portmap_31=101:40
-xgxs_rx_lane_map_31=0x1320
-xgxs_tx_lane_map_31=0x1203
-phy_xaui_rx_polarity_flip_31=0x1
-phy_xaui_tx_polarity_flip_31=0x6
-serdes_driver_current_lane0_xe30=0x6
-serdes_driver_current_lane1_xe30=0x6
-serdes_driver_current_lane2_xe30=0x6
-serdes_driver_current_lane3_xe30=0x7
-serdes_pre_driver_current_lane0_xe30=0x6
-serdes_pre_driver_current_lane1_xe30=0x6
-serdes_pre_driver_current_lane2_xe30=0x6
-serdes_pre_driver_current_lane3_xe30=0x7
-serdes_preemphasis_lane0_xe30=0xcec0
-serdes_preemphasis_lane1_xe30=0xcec0
-serdes_preemphasis_lane2_xe30=0xcad0
-serdes_preemphasis_lane3_xe30=0xc6e0
-
-# xe31 (40G)
-portmap_32=97:40
-xgxs_rx_lane_map_32=0x213
-xgxs_tx_lane_map_32=0x2031
-phy_xaui_rx_polarity_flip_32=0xc
-phy_xaui_tx_polarity_flip_32=0x3
-serdes_driver_current_lane0_xe31=0x5
-serdes_driver_current_lane1_xe31=0x5
-serdes_driver_current_lane2_xe31=0x5
-serdes_driver_current_lane3_xe31=0x5
-serdes_pre_driver_current_lane0_xe31=0x5
-serdes_pre_driver_current_lane1_xe31=0x5
-serdes_pre_driver_current_lane2_xe31=0x5
-serdes_pre_driver_current_lane3_xe31=0x5
-serdes_preemphasis_lane0_xe31=0xcad0
-serdes_preemphasis_lane1_xe31=0xcad0
-serdes_preemphasis_lane2_xe31=0xcad0
-serdes_preemphasis_lane3_xe31=0xcad0
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/3/buffers.json.j2 b/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/3/buffers.json.j2
deleted file mode 100644
index b67cf577ab75..000000000000
--- a/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/3/buffers.json.j2
+++ /dev/null
@@ -1,3 +0,0 @@
-{%- set default_topo = 't1' %}
-{%- include 'buffers_config.j2' %}
-
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/3/buffers_defaults_def.j2 b/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/3/buffers_defaults_def.j2
deleted file mode 100644
index 38e34eb571e8..000000000000
--- a/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/3/buffers_defaults_def.j2
+++ /dev/null
@@ -1,45 +0,0 @@
-{%- set default_cable = '300m' %}
-
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {% for port_idx in range(0,32) %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
-    {% endfor %}
-{%- endmacro %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "12766208",
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "12766208",
-            "type": "egress",
-            "mode": "static"
-        },
-        "egress_lossy_pool": {
-            "size": "7326924",
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "static_th":"12766208"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"1518",
-            "dynamic_th":"3"
-        }
-    },
-{%- endmacro %}
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/3/buffers_defaults_t0.j2 b/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/3/buffers_defaults_t0.j2
deleted file mode 100644
index 38e34eb571e8..000000000000
--- a/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/3/buffers_defaults_t0.j2
+++ /dev/null
@@ -1,45 +0,0 @@
-{%- set default_cable = '300m' %}
-
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {% for port_idx in range(0,32) %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
-    {% endfor %}
-{%- endmacro %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "12766208",
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "12766208",
-            "type": "egress",
-            "mode": "static"
-        },
-        "egress_lossy_pool": {
-            "size": "7326924",
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "static_th":"12766208"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"1518",
-            "dynamic_th":"3"
-        }
-    },
-{%- endmacro %}
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/3/buffers_defaults_t1.j2 b/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/3/buffers_defaults_t1.j2
deleted file mode 100644
index 38e34eb571e8..000000000000
--- a/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/3/buffers_defaults_t1.j2
+++ /dev/null
@@ -1,45 +0,0 @@
-{%- set default_cable = '300m' %}
-
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {% for port_idx in range(0,32) %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
-    {% endfor %}
-{%- endmacro %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "12766208",
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "12766208",
-            "type": "egress",
-            "mode": "static"
-        },
-        "egress_lossy_pool": {
-            "size": "7326924",
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "static_th":"12766208"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"1518",
-            "dynamic_th":"3"
-        }
-    },
-{%- endmacro %}
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/3/lanemap.ini b/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/3/lanemap.ini
deleted file mode 100644
index d2b9e31ecadb..000000000000
--- a/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/3/lanemap.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-eth1:1,2,3,4
-eth2:5,6,7,8
-eth3:9,10,11,12
-eth4:13,14,15,16
-eth5:17,18,19,20
-eth6:21,22,23,24
-eth7:25,26,27,28
-eth8:29,30,31,32
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/3/pg_profile_lookup.ini b/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/3/pg_profile_lookup.ini
deleted file mode 100644
index 9f2eacb6fc42..000000000000
--- a/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/3/pg_profile_lookup.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-# PG lossless profiles.
-# speed cable size      xon     xoff   threshold xon_offset
-  10000  5m   56368     18432   55120  -3        2496
-  25000  5m   56368     18432   55120  -3        2496
-  40000  5m   56368     18432   55120  -3        2496
-  50000  5m   56368     18432   55120  -3        2496
- 100000  5m   56368     18432   55120  -3        2496
-  10000  40m  56368     18432   55120  -3        2496
-  25000  40m  56368     18432   55120  -3        2496
-  40000  40m  56368     18432   55120  -3        2496
-  50000  40m  56368     18432   55120  -3        2496
- 100000  40m  56368     18432   55120  -3        2496
-  10000  300m 56368     18432   55120  -3        2496
-  25000  300m 56368     18432   55120  -3        2496
-  40000  300m 56368     18432   55120  -3        2496
-  50000  300m 56368     18432   55120  -3        2496
- 100000  300m 56368     18432   55120  -3        2496
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/3/qos.json.j2 b/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/3/qos.json.j2
deleted file mode 100644
index 3e548325ea30..000000000000
--- a/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/3/qos.json.j2
+++ /dev/null
@@ -1 +0,0 @@
-{%- include 'qos_config.j2' %}
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/3/sai.profile b/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/3/sai.profile
deleted file mode 100644
index 0a2df177f1c5..000000000000
--- a/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/3/sai.profile
+++ /dev/null
@@ -1,3 +0,0 @@
-SAI_VS_SWITCH_TYPE=SAI_VS_SWITCH_TYPE_BCM56850
-SAI_VS_HOSTIF_USE_TAP_DEVICE=true
-SAI_VS_INTERFACE_LANE_MAP_FILE=/usr/share/sonic/hwsku/lanemap.ini
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/3/td2-s6000-32x40G.config.bcm b/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/3/td2-s6000-32x40G.config.bcm
deleted file mode 100644
index 0e25b4d4232d..000000000000
--- a/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/3/td2-s6000-32x40G.config.bcm
+++ /dev/null
@@ -1,646 +0,0 @@
-# Old LPM only configuration
-# l2_mem_entries=163840
-# l3_mem_entries=90112
-# l3_alpm_enable=0
-# ipv6_lpm_128b_enable=0
-#
-# ALPM enable
-l3_alpm_enable=2
-ipv6_lpm_128b_enable=1
-l2_mem_entries=32768
-l3_mem_entries=16384
-
-# From old config file
-os=unix
-higig2_hdr_mode=1
-
-# Parity
-parity_correction=1
-parity_enable=1
-stat_if_parity_enable=0
-
-#
-bcm_num_cos=10
-bcm_stat_interval=2000000
-l2xmsg_hostbuf_size=8192
-l2xmsg_mode=1
-lls_num_l2uc=12
-max_vp_lags=0
-miim_intr_enable=0
-mmu_lossless=0
-module_64ports=0
-schan_intr_enable=0
-stable_size=0x2000000
-tdma_timeout_usec=5000000
-
-pbmp_oversubscribe=0x000007fffffffffffffffffffffffffe
-pbmp_xport_xe=0x000007fffffffffffffffffffffffffe
-
-# Ports configuration
-# xe0 (40G)
-portmap_1=25:40
-xgxs_rx_lane_map_1=0x213
-xgxs_tx_lane_map_1=0x2031
-phy_xaui_rx_polarity_flip_1=0xe
-phy_xaui_tx_polarity_flip_1=0x2
-serdes_driver_current_lane0_xe0=0x5
-serdes_driver_current_lane1_xe0=0x5
-serdes_driver_current_lane2_xe0=0x5
-serdes_driver_current_lane3_xe0=0x5
-serdes_pre_driver_current_lane0_xe0=0x5
-serdes_pre_driver_current_lane1_xe0=0x5
-serdes_pre_driver_current_lane2_xe0=0x5
-serdes_pre_driver_current_lane3_xe0=0x5
-serdes_preemphasis_lane0_xe0=0xcad0
-serdes_preemphasis_lane1_xe0=0xc6e0
-serdes_preemphasis_lane2_xe0=0xc6e0
-serdes_preemphasis_lane3_xe0=0xd2b0
-
-# xe1 (40G)
-portmap_2=29:40
-xgxs_rx_lane_map_2=0x213
-xgxs_tx_lane_map_2=0x213
-phy_xaui_rx_polarity_flip_2=0xc
-phy_xaui_tx_polarity_flip_2=0x9
-serdes_driver_current_lane0_xe1=0x6
-serdes_driver_current_lane1_xe1=0x7
-serdes_driver_current_lane2_xe1=0x6
-serdes_driver_current_lane3_xe1=0x6
-serdes_pre_driver_current_lane0_xe1=0x6
-serdes_pre_driver_current_lane1_xe1=0x7
-serdes_pre_driver_current_lane2_xe1=0x6
-serdes_pre_driver_current_lane3_xe1=0x6
-serdes_preemphasis_lane0_xe1=0xc2f0
-serdes_preemphasis_lane1_xe1=0xd2b0
-serdes_preemphasis_lane2_xe1=0xc6e0
-serdes_preemphasis_lane3_xe1=0xc2f0
-
-# xe2 (40G)
-portmap_3=33:40
-xgxs_rx_lane_map_3=0x213
-xgxs_tx_lane_map_3=0x132
-phy_xaui_rx_polarity_flip_3=0xe
-phy_xaui_tx_polarity_flip_3=0x2
-serdes_driver_current_lane0_xe2=0x4
-serdes_driver_current_lane1_xe2=0x4
-serdes_driver_current_lane2_xe2=0x4
-serdes_driver_current_lane3_xe2=0x4
-serdes_pre_driver_current_lane0_xe2=0x4
-serdes_pre_driver_current_lane1_xe2=0x4
-serdes_pre_driver_current_lane2_xe2=0x4
-serdes_pre_driver_current_lane3_xe2=0x4
-serdes_preemphasis_lane0_xe2=0xc6e0
-serdes_preemphasis_lane1_xe2=0xc6e0
-serdes_preemphasis_lane2_xe2=0xc6e0
-serdes_preemphasis_lane3_xe2=0xc6e0
-
-# xe3 (40G)
-portmap_4=37:40
-xgxs_rx_lane_map_4=0x213
-xgxs_tx_lane_map_4=0x1203
-phy_xaui_rx_polarity_flip_4=0x3
-phy_xaui_tx_polarity_flip_4=0xe
-serdes_driver_current_lane0_xe3=0x4
-serdes_driver_current_lane1_xe3=0x4
-serdes_driver_current_lane2_xe3=0x4
-serdes_driver_current_lane3_xe3=0x4
-serdes_pre_driver_current_lane0_xe3=0x4
-serdes_pre_driver_current_lane1_xe3=0x4
-serdes_pre_driver_current_lane2_xe3=0x4
-serdes_pre_driver_current_lane3_xe3=0x4
-serdes_preemphasis_lane0_xe3=0xcad0
-serdes_preemphasis_lane1_xe3=0xcad0
-serdes_preemphasis_lane2_xe3=0xc2f0
-serdes_preemphasis_lane3_xe3=0xc2f0
-
-# xe4 (40G)
-portmap_5=45:40
-xgxs_rx_lane_map_5=0x213
-xgxs_tx_lane_map_5=0x213
-phy_xaui_rx_polarity_flip_5=0xe
-phy_xaui_tx_polarity_flip_5=0x8
-serdes_driver_current_lane0_xe4=0x4
-serdes_driver_current_lane1_xe4=0x4
-serdes_driver_current_lane2_xe4=0x4
-serdes_driver_current_lane3_xe4=0x4
-serdes_pre_driver_current_lane0_xe4=0x4
-serdes_pre_driver_current_lane1_xe4=0x4
-serdes_pre_driver_current_lane2_xe4=0x4
-serdes_pre_driver_current_lane3_xe4=0x4
-serdes_preemphasis_lane0_xe4=0xc2f0
-serdes_preemphasis_lane1_xe4=0xc2f0
-serdes_preemphasis_lane2_xe4=0xc2f0
-serdes_preemphasis_lane3_xe4=0xc2f0
-
-# xe5 (40G)
-portmap_6=41:40
-xgxs_rx_lane_map_6=0x213
-xgxs_tx_lane_map_6=0x3021
-phy_xaui_rx_polarity_flip_6=0x3
-phy_xaui_tx_polarity_flip_6=0xb
-serdes_driver_current_lane0_xe5=0x4
-serdes_driver_current_lane1_xe5=0x4
-serdes_driver_current_lane2_xe5=0x4
-serdes_driver_current_lane3_xe5=0x4
-serdes_pre_driver_current_lane0_xe5=0x4
-serdes_pre_driver_current_lane1_xe5=0x4
-serdes_pre_driver_current_lane2_xe5=0x4
-serdes_pre_driver_current_lane3_xe5=0x4
-serdes_preemphasis_lane0_xe5=0xc6e0
-serdes_preemphasis_lane1_xe5=0xc2f0
-serdes_preemphasis_lane2_xe5=0xc2f0
-serdes_preemphasis_lane3_xe5=0xcad0
-
-# xe6 (40G)
-portmap_7=1:40
-xgxs_rx_lane_map_7=0x213
-xgxs_tx_lane_map_7=0x2031
-phy_xaui_rx_polarity_flip_7=0xe
-phy_xaui_tx_polarity_flip_7=0xd
-serdes_driver_current_lane0_xe6=0x5
-serdes_driver_current_lane1_xe6=0x5
-serdes_driver_current_lane2_xe6=0x5
-serdes_driver_current_lane3_xe6=0x5
-serdes_pre_driver_current_lane0_xe6=0x5
-serdes_pre_driver_current_lane1_xe6=0x5
-serdes_pre_driver_current_lane2_xe6=0x5
-serdes_pre_driver_current_lane3_xe6=0x5
-serdes_preemphasis_lane0_xe6=0xc6e0
-serdes_preemphasis_lane1_xe6=0xcad0
-serdes_preemphasis_lane2_xe6=0xc6e0
-serdes_preemphasis_lane3_xe6=0xcad0
-
-# xe7 (40G)
-portmap_8=5:40
-xgxs_rx_lane_map_8=0x213
-xgxs_tx_lane_map_8=0x1203
-phy_xaui_rx_polarity_flip_8=0xc
-phy_xaui_tx_polarity_flip_8=0x1
-serdes_driver_current_lane0_xe7=0x4
-serdes_driver_current_lane1_xe7=0x4
-serdes_driver_current_lane2_xe7=0x4
-serdes_driver_current_lane3_xe7=0x4
-serdes_pre_driver_current_lane0_xe7=0x4
-serdes_pre_driver_current_lane1_xe7=0x4
-serdes_pre_driver_current_lane2_xe7=0x4
-serdes_pre_driver_current_lane3_xe7=0x4
-serdes_preemphasis_lane0_xe7=0xc6e0
-serdes_preemphasis_lane1_xe7=0xc6e0
-serdes_preemphasis_lane2_xe7=0xc6e0
-serdes_preemphasis_lane3_xe7=0xc6e0
-
-# xe8 (40G)
-portmap_9=13:40
-xgxs_rx_lane_map_9=0x213
-xgxs_tx_lane_map_9=0x132
-phy_xaui_rx_polarity_flip_9=0xe
-phy_xaui_tx_polarity_flip_9=0x0
-serdes_driver_current_lane0_xe8=0x2
-serdes_driver_current_lane1_xe8=0x3
-serdes_driver_current_lane2_xe8=0x2
-serdes_driver_current_lane3_xe8=0x2
-serdes_pre_driver_current_lane0_xe8=0x2
-serdes_pre_driver_current_lane1_xe8=0x3
-serdes_pre_driver_current_lane2_xe8=0x2
-serdes_pre_driver_current_lane3_xe8=0x2
-serdes_preemphasis_lane0_xe8=0xb270
-serdes_preemphasis_lane1_xe8=0xbb10
-serdes_preemphasis_lane2_xe8=0xb720
-serdes_preemphasis_lane3_xe8=0xb720
-
-# xe9 (40G)
-portmap_10=9:40
-xgxs_rx_lane_map_10=0x3120
-xgxs_tx_lane_map_10=0x3021
-phy_xaui_rx_polarity_flip_10=0x0
-phy_xaui_tx_polarity_flip_10=0x4
-serdes_driver_current_lane0_xe9=0x3
-serdes_driver_current_lane1_xe9=0x3
-serdes_driver_current_lane2_xe9=0x3
-serdes_driver_current_lane3_xe9=0x3
-serdes_pre_driver_current_lane0_xe9=0x3
-serdes_pre_driver_current_lane1_xe9=0x3
-serdes_pre_driver_current_lane2_xe9=0x3
-serdes_pre_driver_current_lane3_xe9=0x3
-serdes_preemphasis_lane0_xe9=0xc2f0
-serdes_preemphasis_lane1_xe9=0xc6e0
-serdes_preemphasis_lane2_xe9=0xbf00
-serdes_preemphasis_lane3_xe9=0xc2f0
-
-# xe10 (40G)
-portmap_11=17:40
-xgxs_rx_lane_map_11=0x213
-xgxs_tx_lane_map_11=0x132
-phy_xaui_rx_polarity_flip_11=0xe
-phy_xaui_tx_polarity_flip_11=0x0
-serdes_driver_current_lane0_xe10=0x2
-serdes_driver_current_lane1_xe10=0x2
-serdes_driver_current_lane2_xe10=0x2
-serdes_driver_current_lane3_xe10=0x2
-serdes_pre_driver_current_lane0_xe10=0x2
-serdes_pre_driver_current_lane1_xe10=0x2
-serdes_pre_driver_current_lane2_xe10=0x2
-serdes_pre_driver_current_lane3_xe10=0x2
-serdes_preemphasis_lane0_xe10=0xb330
-serdes_preemphasis_lane1_xe10=0xbb10
-serdes_preemphasis_lane2_xe10=0xbb10
-serdes_preemphasis_lane3_xe10=0xbb10
-
-# xe11 (40G)
-portmap_12=21:40
-xgxs_rx_lane_map_12=0x123
-xgxs_tx_lane_map_12=0x1203
-phy_xaui_rx_polarity_flip_12=0xc
-phy_xaui_tx_polarity_flip_12=0xe
-serdes_driver_current_lane0_xe11=0x2
-serdes_driver_current_lane1_xe11=0x2
-serdes_driver_current_lane2_xe11=0x2
-serdes_driver_current_lane3_xe11=0x2
-serdes_pre_driver_current_lane0_xe11=0x2
-serdes_pre_driver_current_lane1_xe11=0x2
-serdes_pre_driver_current_lane2_xe11=0x2
-serdes_pre_driver_current_lane3_xe11=0x2
-serdes_preemphasis_lane0_xe11=0xb330
-serdes_preemphasis_lane1_xe11=0xb330
-serdes_preemphasis_lane2_xe11=0xb330
-serdes_preemphasis_lane3_xe11=0xb330
-
-# xe12 (40G)
-portmap_13=53:40
-xgxs_rx_lane_map_13=0x213
-xgxs_tx_lane_map_13=0x231
-phy_xaui_rx_polarity_flip_13=0x1
-phy_xaui_tx_polarity_flip_13=0x0
-serdes_driver_current_lane0_xe12=0x2
-serdes_driver_current_lane1_xe12=0x2
-serdes_driver_current_lane2_xe12=0x2
-serdes_driver_current_lane3_xe12=0x2
-serdes_pre_driver_current_lane0_xe12=0x2
-serdes_pre_driver_current_lane1_xe12=0x2
-serdes_pre_driver_current_lane2_xe12=0x2
-serdes_pre_driver_current_lane3_xe12=0x2
-serdes_preemphasis_lane0_xe12=0xaf40
-serdes_preemphasis_lane1_xe12=0xaf40
-serdes_preemphasis_lane2_xe12=0xaf40
-serdes_preemphasis_lane3_xe12=0xaf40
-
-# xe13 (40G)
-portmap_14=49:40
-xgxs_rx_lane_map_14=0x1302
-xgxs_tx_lane_map_14=0x2031
-phy_xaui_rx_polarity_flip_14=0xb
-phy_xaui_tx_polarity_flip_14=0x3
-serdes_driver_current_lane0_xe13=0x2
-serdes_driver_current_lane1_xe13=0x2
-serdes_driver_current_lane2_xe13=0x2
-serdes_driver_current_lane3_xe13=0x2
-serdes_pre_driver_current_lane0_xe13=0x2
-serdes_pre_driver_current_lane1_xe13=0x2
-serdes_pre_driver_current_lane2_xe13=0x2
-serdes_pre_driver_current_lane3_xe13=0x2
-serdes_preemphasis_lane0_xe13=0xa760
-serdes_preemphasis_lane1_xe13=0xa760
-serdes_preemphasis_lane2_xe13=0xa760
-serdes_preemphasis_lane3_xe13=0xa760
-
-# xe14 (40G)
-portmap_15=57:40
-xgxs_rx_lane_map_15=0x213
-xgxs_tx_lane_map_15=0x2031
-phy_xaui_rx_polarity_flip_15=0x1
-phy_xaui_tx_polarity_flip_15=0x0
-serdes_driver_current_lane0_xe14=0x1
-serdes_driver_current_lane1_xe14=0x1
-serdes_driver_current_lane2_xe14=0x1
-serdes_driver_current_lane3_xe14=0x1
-serdes_pre_driver_current_lane0_xe14=0x1
-serdes_pre_driver_current_lane1_xe14=0x1
-serdes_pre_driver_current_lane2_xe14=0x1
-serdes_pre_driver_current_lane3_xe14=0x1
-serdes_preemphasis_lane0_xe14=0xa760
-serdes_preemphasis_lane1_xe14=0xa760
-serdes_preemphasis_lane2_xe14=0xa760
-serdes_preemphasis_lane3_xe14=0xa760
-
-# xe15 (40G)
-portmap_16=61:40
-xgxs_rx_lane_map_16=0x132
-xgxs_tx_lane_map_16=0x213
-phy_xaui_rx_polarity_flip_16=0x0
-phy_xaui_tx_polarity_flip_16=0x0
-serdes_driver_current_lane0_xe15=0x2
-serdes_driver_current_lane1_xe15=0x2
-serdes_driver_current_lane2_xe15=0x2
-serdes_driver_current_lane3_xe15=0x2
-serdes_pre_driver_current_lane0_xe15=0x2
-serdes_pre_driver_current_lane1_xe15=0x2
-serdes_pre_driver_current_lane2_xe15=0x2
-serdes_pre_driver_current_lane3_xe15=0x2
-serdes_preemphasis_lane0_xe15=0xa760
-serdes_preemphasis_lane1_xe15=0xa760
-serdes_preemphasis_lane2_xe15=0xa760
-serdes_preemphasis_lane3_xe15=0xa760
-
-# xe16 (40G)
-portmap_17=69:40
-xgxs_rx_lane_map_17=0x213
-xgxs_tx_lane_map_17=0x2130
-phy_xaui_rx_polarity_flip_17=0x1
-phy_xaui_tx_polarity_flip_17=0xf
-serdes_driver_current_lane0_xe16=0x1
-serdes_driver_current_lane1_xe16=0x1
-serdes_driver_current_lane2_xe16=0x1
-serdes_driver_current_lane3_xe16=0x1
-serdes_pre_driver_current_lane0_xe16=0x1
-serdes_pre_driver_current_lane1_xe16=0x1
-serdes_pre_driver_current_lane2_xe16=0x1
-serdes_pre_driver_current_lane3_xe16=0x1
-serdes_preemphasis_lane0_xe16=0xa760
-serdes_preemphasis_lane1_xe16=0xa760
-serdes_preemphasis_lane2_xe16=0xa760
-serdes_preemphasis_lane3_xe16=0xa760
-
-# xe17 (40G)
-portmap_18=65:40
-xgxs_rx_lane_map_18=0x132
-xgxs_tx_lane_map_18=0x2031
-phy_xaui_rx_polarity_flip_18=0x3
-phy_xaui_tx_polarity_flip_18=0x9
-serdes_driver_current_lane0_xe17=0x1
-serdes_driver_current_lane1_xe17=0x1
-serdes_driver_current_lane2_xe17=0x1
-serdes_driver_current_lane3_xe17=0x1
-serdes_pre_driver_current_lane0_xe17=0x1
-serdes_pre_driver_current_lane1_xe17=0x1
-serdes_pre_driver_current_lane2_xe17=0x1
-serdes_pre_driver_current_lane3_xe17=0x1
-serdes_preemphasis_lane0_xe17=0xa370
-serdes_preemphasis_lane1_xe17=0xa370
-serdes_preemphasis_lane2_xe17=0xa370
-serdes_preemphasis_lane3_xe17=0xa370
-
-# xe18 (40G)
-portmap_19=73:40
-xgxs_rx_lane_map_19=0x213
-xgxs_tx_lane_map_19=0x2031
-phy_xaui_rx_polarity_flip_19=0x1
-phy_xaui_tx_polarity_flip_19=0x0
-serdes_driver_current_lane0_xe18=0x2
-serdes_driver_current_lane1_xe18=0x2
-serdes_driver_current_lane2_xe18=0x2
-serdes_driver_current_lane3_xe18=0x2
-serdes_pre_driver_current_lane0_xe18=0x2
-serdes_pre_driver_current_lane1_xe18=0x2
-serdes_pre_driver_current_lane2_xe18=0x2
-serdes_pre_driver_current_lane3_xe18=0x2
-serdes_preemphasis_lane0_xe18=0xa760
-serdes_preemphasis_lane1_xe18=0xa760
-serdes_preemphasis_lane2_xe18=0xa760
-serdes_preemphasis_lane3_xe18=0xa760
-
-# xe19 (40G)
-portmap_20=77:40
-xgxs_rx_lane_map_20=0x123
-xgxs_tx_lane_map_20=0x1203
-phy_xaui_rx_polarity_flip_20=0x3
-phy_xaui_tx_polarity_flip_20=0xe
-serdes_driver_current_lane0_xe19=0x2
-serdes_driver_current_lane1_xe19=0x2
-serdes_driver_current_lane2_xe19=0x2
-serdes_driver_current_lane3_xe19=0x2
-serdes_pre_driver_current_lane0_xe19=0x2
-serdes_pre_driver_current_lane1_xe19=0x2
-serdes_pre_driver_current_lane2_xe19=0x2
-serdes_pre_driver_current_lane3_xe19=0x2
-serdes_preemphasis_lane0_xe19=0xaf40
-serdes_preemphasis_lane1_xe19=0xaf40
-serdes_preemphasis_lane2_xe19=0xaf40
-serdes_preemphasis_lane3_xe19=0xaf40
-
-# xe20 (40G)
-portmap_21=109:40
-xgxs_rx_lane_map_21=0x132
-xgxs_tx_lane_map_21=0x132
-phy_xaui_rx_polarity_flip_21=0x8
-phy_xaui_tx_polarity_flip_21=0x0
-serdes_driver_current_lane0_xe20=0x1
-serdes_driver_current_lane1_xe20=0x1
-serdes_driver_current_lane2_xe20=0x1
-serdes_driver_current_lane3_xe20=0x2
-serdes_pre_driver_current_lane0_xe20=0x1
-serdes_pre_driver_current_lane1_xe20=0x1
-serdes_pre_driver_current_lane2_xe20=0x1
-serdes_pre_driver_current_lane3_xe20=0x2
-serdes_preemphasis_lane0_xe20=0xb330
-serdes_preemphasis_lane1_xe20=0xb330
-serdes_preemphasis_lane2_xe20=0xb330
-serdes_preemphasis_lane3_xe20=0xbff0
-
-# xe21 (40G)
-portmap_22=105:40
-xgxs_rx_lane_map_22=0x1320
-xgxs_tx_lane_map_22=0x3021
-phy_xaui_rx_polarity_flip_22=0xd
-phy_xaui_tx_polarity_flip_22=0xb
-serdes_driver_current_lane0_xe21=0x1
-serdes_driver_current_lane1_xe21=0x1
-serdes_driver_current_lane2_xe21=0x1
-serdes_driver_current_lane3_xe21=0x1
-serdes_pre_driver_current_lane0_xe21=0x1
-serdes_pre_driver_current_lane1_xe21=0x1
-serdes_pre_driver_current_lane2_xe21=0x1
-serdes_pre_driver_current_lane3_xe21=0x1
-serdes_preemphasis_lane0_xe21=0xb330
-serdes_preemphasis_lane1_xe21=0xb330
-serdes_preemphasis_lane2_xe21=0xb330
-serdes_preemphasis_lane3_xe21=0xb330
-
-# xe22 (40G)
-portmap_23=113:40
-xgxs_rx_lane_map_23=0x132
-xgxs_tx_lane_map_23=0x132
-phy_xaui_rx_polarity_flip_23=0x8
-phy_xaui_tx_polarity_flip_23=0x0
-serdes_driver_current_lane0_xe22=0x1
-serdes_driver_current_lane1_xe22=0x1
-serdes_driver_current_lane2_xe22=0x1
-serdes_driver_current_lane3_xe22=0x1
-serdes_pre_driver_current_lane0_xe22=0x1
-serdes_pre_driver_current_lane1_xe22=0x1
-serdes_pre_driver_current_lane2_xe22=0x1
-serdes_pre_driver_current_lane3_xe22=0x1
-serdes_preemphasis_lane0_xe22=0xbb10
-serdes_preemphasis_lane1_xe22=0xbb10
-serdes_preemphasis_lane2_xe22=0xbb10
-serdes_preemphasis_lane3_xe22=0xc2f0
-
-# xe23 (40G)
-portmap_24=117:40
-xgxs_rx_lane_map_24=0x231
-xgxs_tx_lane_map_24=0x1203
-phy_xaui_rx_polarity_flip_24=0x3
-phy_xaui_tx_polarity_flip_24=0xe
-serdes_driver_current_lane0_xe23=0x3
-serdes_driver_current_lane1_xe23=0x5
-serdes_driver_current_lane2_xe23=0x3
-serdes_driver_current_lane3_xe23=0x3
-serdes_pre_driver_current_lane0_xe23=0x3
-serdes_pre_driver_current_lane1_xe23=0x5
-serdes_pre_driver_current_lane2_xe23=0x3
-serdes_pre_driver_current_lane3_xe23=0x3
-serdes_preemphasis_lane0_xe23=0xc6e0
-serdes_preemphasis_lane1_xe23=0xc6e0
-serdes_preemphasis_lane2_xe23=0xc6e0
-serdes_preemphasis_lane3_xe23=0xc6e0
-
-# xe24 (40G)
-portmap_25=125:40
-xgxs_rx_lane_map_25=0x132
-xgxs_tx_lane_map_25=0x132
-phy_xaui_rx_polarity_flip_25=0x8
-phy_xaui_tx_polarity_flip_25=0x0
-serdes_driver_current_lane0_xe24=0x4
-serdes_driver_current_lane1_xe24=0x4
-serdes_driver_current_lane2_xe24=0x4
-serdes_driver_current_lane3_xe24=0x4
-serdes_pre_driver_current_lane0_xe24=0x4
-serdes_pre_driver_current_lane1_xe24=0x4
-serdes_pre_driver_current_lane2_xe24=0x4
-serdes_pre_driver_current_lane3_xe24=0x4
-serdes_preemphasis_lane0_xe24=0xc6e0
-serdes_preemphasis_lane1_xe24=0xc6e0
-serdes_preemphasis_lane2_xe24=0xc6e0
-serdes_preemphasis_lane3_xe24=0xcec0
-
-# xe25 (40G)
-portmap_26=121:40
-xgxs_rx_lane_map_26=0x1320
-xgxs_tx_lane_map_26=0x3021
-phy_xaui_rx_polarity_flip_26=0xd
-phy_xaui_tx_polarity_flip_26=0xb
-serdes_driver_current_lane0_xe25=0x4
-serdes_driver_current_lane1_xe25=0x4
-serdes_driver_current_lane2_xe25=0x4
-serdes_driver_current_lane3_xe25=0x4
-serdes_pre_driver_current_lane0_xe25=0x4
-serdes_pre_driver_current_lane1_xe25=0x4
-serdes_pre_driver_current_lane2_xe25=0x4
-serdes_pre_driver_current_lane3_xe25=0x4
-serdes_preemphasis_lane0_xe25=0xc6e0
-serdes_preemphasis_lane1_xe25=0xc6e0
-serdes_preemphasis_lane2_xe25=0xc6e0
-serdes_preemphasis_lane3_xe25=0xc6e0
-
-# xe26 (40G)
-portmap_27=81:40
-xgxs_rx_lane_map_27=0x1320
-xgxs_tx_lane_map_27=0x2031
-phy_xaui_rx_polarity_flip_27=0x1
-phy_xaui_tx_polarity_flip_27=0x2
-serdes_driver_current_lane0_xe26=0x2
-serdes_driver_current_lane1_xe26=0x2
-serdes_driver_current_lane2_xe26=0x2
-serdes_driver_current_lane3_xe26=0x2
-serdes_pre_driver_current_lane0_xe26=0x2
-serdes_pre_driver_current_lane1_xe26=0x2
-serdes_pre_driver_current_lane2_xe26=0x2
-serdes_pre_driver_current_lane3_xe26=0x2
-serdes_preemphasis_lane0_xe26=0xbb10
-serdes_preemphasis_lane1_xe26=0xbb10
-serdes_preemphasis_lane2_xe26=0xbf00
-serdes_preemphasis_lane3_xe26=0xbb10
-
-# xe27 (40G)
-portmap_28=85:40
-xgxs_rx_lane_map_28=0x213
-xgxs_tx_lane_map_28=0x1203
-phy_xaui_rx_polarity_flip_28=0xc
-phy_xaui_tx_polarity_flip_28=0xe
-serdes_driver_current_lane0_xe27=0x4
-serdes_driver_current_lane1_xe27=0x5
-serdes_driver_current_lane2_xe27=0x4
-serdes_driver_current_lane3_xe27=0x5
-serdes_pre_driver_current_lane0_xe27=0x4
-serdes_pre_driver_current_lane1_xe27=0x5
-serdes_pre_driver_current_lane2_xe27=0x4
-serdes_pre_driver_current_lane3_xe27=0x5
-serdes_preemphasis_lane0_xe27=0xc2f0
-serdes_preemphasis_lane1_xe27=0xc6e0
-serdes_preemphasis_lane2_xe27=0xc6e0
-serdes_preemphasis_lane3_xe27=0xc6e0
-
-# xe28 (40G)
-portmap_29=93:40
-xgxs_rx_lane_map_29=0x1320
-xgxs_tx_lane_map_29=0x2031
-phy_xaui_rx_polarity_flip_29=0x1
-phy_xaui_tx_polarity_flip_29=0x2
-serdes_driver_current_lane0_xe28=0x4
-serdes_driver_current_lane1_xe28=0x4
-serdes_driver_current_lane2_xe28=0x4
-serdes_driver_current_lane3_xe28=0x4
-serdes_pre_driver_current_lane0_xe28=0x4
-serdes_pre_driver_current_lane1_xe28=0x4
-serdes_pre_driver_current_lane2_xe28=0x4
-serdes_pre_driver_current_lane3_xe28=0x4
-serdes_preemphasis_lane0_xe28=0xc2f0
-serdes_preemphasis_lane1_xe28=0xc2f0
-serdes_preemphasis_lane2_xe28=0xc2f0
-serdes_preemphasis_lane3_xe28=0xc2f0
-
-# xe29 (40G)
-portmap_30=89:40
-xgxs_rx_lane_map_30=0x1320
-xgxs_tx_lane_map_30=0x3021
-phy_xaui_rx_polarity_flip_30=0x2
-phy_xaui_tx_polarity_flip_30=0xb
-serdes_driver_current_lane0_xe29=0x4
-serdes_driver_current_lane1_xe29=0x4
-serdes_driver_current_lane2_xe29=0x4
-serdes_driver_current_lane3_xe29=0x4
-serdes_pre_driver_current_lane0_xe29=0x4
-serdes_pre_driver_current_lane1_xe29=0x4
-serdes_pre_driver_current_lane2_xe29=0x4
-serdes_pre_driver_current_lane3_xe29=0x4
-serdes_preemphasis_lane0_xe29=0xcad0
-serdes_preemphasis_lane1_xe29=0xc6e0
-serdes_preemphasis_lane2_xe29=0xc6e0
-serdes_preemphasis_lane3_xe29=0xc6e0
-
-# xe30 (40G)
-portmap_31=101:40
-xgxs_rx_lane_map_31=0x1320
-xgxs_tx_lane_map_31=0x1203
-phy_xaui_rx_polarity_flip_31=0x1
-phy_xaui_tx_polarity_flip_31=0x6
-serdes_driver_current_lane0_xe30=0x6
-serdes_driver_current_lane1_xe30=0x6
-serdes_driver_current_lane2_xe30=0x6
-serdes_driver_current_lane3_xe30=0x7
-serdes_pre_driver_current_lane0_xe30=0x6
-serdes_pre_driver_current_lane1_xe30=0x6
-serdes_pre_driver_current_lane2_xe30=0x6
-serdes_pre_driver_current_lane3_xe30=0x7
-serdes_preemphasis_lane0_xe30=0xcec0
-serdes_preemphasis_lane1_xe30=0xcec0
-serdes_preemphasis_lane2_xe30=0xcad0
-serdes_preemphasis_lane3_xe30=0xc6e0
-
-# xe31 (40G)
-portmap_32=97:40
-xgxs_rx_lane_map_32=0x213
-xgxs_tx_lane_map_32=0x2031
-phy_xaui_rx_polarity_flip_32=0xc
-phy_xaui_tx_polarity_flip_32=0x3
-serdes_driver_current_lane0_xe31=0x5
-serdes_driver_current_lane1_xe31=0x5
-serdes_driver_current_lane2_xe31=0x5
-serdes_driver_current_lane3_xe31=0x5
-serdes_pre_driver_current_lane0_xe31=0x5
-serdes_pre_driver_current_lane1_xe31=0x5
-serdes_pre_driver_current_lane2_xe31=0x5
-serdes_pre_driver_current_lane3_xe31=0x5
-serdes_preemphasis_lane0_xe31=0xcad0
-serdes_preemphasis_lane1_xe31=0xcad0
-serdes_preemphasis_lane2_xe31=0xcad0
-serdes_preemphasis_lane3_xe31=0xcad0
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/0/buffers.json.j2 b/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/0/buffers.json.j2
deleted file mode 100644
index b67cf577ab75..000000000000
--- a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/0/buffers.json.j2
+++ /dev/null
@@ -1,3 +0,0 @@
-{%- set default_topo = 't1' %}
-{%- include 'buffers_config.j2' %}
-
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/0/buffers_defaults_def.j2 b/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/0/buffers_defaults_def.j2
deleted file mode 100644
index 38e34eb571e8..000000000000
--- a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/0/buffers_defaults_def.j2
+++ /dev/null
@@ -1,45 +0,0 @@
-{%- set default_cable = '300m' %}
-
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {% for port_idx in range(0,32) %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
-    {% endfor %}
-{%- endmacro %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "12766208",
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "12766208",
-            "type": "egress",
-            "mode": "static"
-        },
-        "egress_lossy_pool": {
-            "size": "7326924",
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "static_th":"12766208"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"1518",
-            "dynamic_th":"3"
-        }
-    },
-{%- endmacro %}
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/0/buffers_defaults_t0.j2 b/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/0/buffers_defaults_t0.j2
deleted file mode 100644
index 38e34eb571e8..000000000000
--- a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/0/buffers_defaults_t0.j2
+++ /dev/null
@@ -1,45 +0,0 @@
-{%- set default_cable = '300m' %}
-
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {% for port_idx in range(0,32) %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
-    {% endfor %}
-{%- endmacro %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "12766208",
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "12766208",
-            "type": "egress",
-            "mode": "static"
-        },
-        "egress_lossy_pool": {
-            "size": "7326924",
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "static_th":"12766208"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"1518",
-            "dynamic_th":"3"
-        }
-    },
-{%- endmacro %}
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/0/buffers_defaults_t1.j2 b/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/0/buffers_defaults_t1.j2
deleted file mode 100644
index 38e34eb571e8..000000000000
--- a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/0/buffers_defaults_t1.j2
+++ /dev/null
@@ -1,45 +0,0 @@
-{%- set default_cable = '300m' %}
-
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {% for port_idx in range(0,32) %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
-    {% endfor %}
-{%- endmacro %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "12766208",
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "12766208",
-            "type": "egress",
-            "mode": "static"
-        },
-        "egress_lossy_pool": {
-            "size": "7326924",
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "static_th":"12766208"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"1518",
-            "dynamic_th":"3"
-        }
-    },
-{%- endmacro %}
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/0/pg_profile_lookup.ini b/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/0/pg_profile_lookup.ini
deleted file mode 100644
index 9f2eacb6fc42..000000000000
--- a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/0/pg_profile_lookup.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-# PG lossless profiles.
-# speed cable size      xon     xoff   threshold xon_offset
-  10000  5m   56368     18432   55120  -3        2496
-  25000  5m   56368     18432   55120  -3        2496
-  40000  5m   56368     18432   55120  -3        2496
-  50000  5m   56368     18432   55120  -3        2496
- 100000  5m   56368     18432   55120  -3        2496
-  10000  40m  56368     18432   55120  -3        2496
-  25000  40m  56368     18432   55120  -3        2496
-  40000  40m  56368     18432   55120  -3        2496
-  50000  40m  56368     18432   55120  -3        2496
- 100000  40m  56368     18432   55120  -3        2496
-  10000  300m 56368     18432   55120  -3        2496
-  25000  300m 56368     18432   55120  -3        2496
-  40000  300m 56368     18432   55120  -3        2496
-  50000  300m 56368     18432   55120  -3        2496
- 100000  300m 56368     18432   55120  -3        2496
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/0/qos.json.j2 b/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/0/qos.json.j2
deleted file mode 100644
index 3e548325ea30..000000000000
--- a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/0/qos.json.j2
+++ /dev/null
@@ -1 +0,0 @@
-{%- include 'qos_config.j2' %}
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/0/sai.profile b/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/0/sai.profile
deleted file mode 100644
index 0a2df177f1c5..000000000000
--- a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/0/sai.profile
+++ /dev/null
@@ -1,3 +0,0 @@
-SAI_VS_SWITCH_TYPE=SAI_VS_SWITCH_TYPE_BCM56850
-SAI_VS_HOSTIF_USE_TAP_DEVICE=true
-SAI_VS_INTERFACE_LANE_MAP_FILE=/usr/share/sonic/hwsku/lanemap.ini
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/0/td2-s6000-32x40G.config.bcm b/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/0/td2-s6000-32x40G.config.bcm
deleted file mode 100644
index 0e25b4d4232d..000000000000
--- a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/0/td2-s6000-32x40G.config.bcm
+++ /dev/null
@@ -1,646 +0,0 @@
-# Old LPM only configuration
-# l2_mem_entries=163840
-# l3_mem_entries=90112
-# l3_alpm_enable=0
-# ipv6_lpm_128b_enable=0
-#
-# ALPM enable
-l3_alpm_enable=2
-ipv6_lpm_128b_enable=1
-l2_mem_entries=32768
-l3_mem_entries=16384
-
-# From old config file
-os=unix
-higig2_hdr_mode=1
-
-# Parity
-parity_correction=1
-parity_enable=1
-stat_if_parity_enable=0
-
-#
-bcm_num_cos=10
-bcm_stat_interval=2000000
-l2xmsg_hostbuf_size=8192
-l2xmsg_mode=1
-lls_num_l2uc=12
-max_vp_lags=0
-miim_intr_enable=0
-mmu_lossless=0
-module_64ports=0
-schan_intr_enable=0
-stable_size=0x2000000
-tdma_timeout_usec=5000000
-
-pbmp_oversubscribe=0x000007fffffffffffffffffffffffffe
-pbmp_xport_xe=0x000007fffffffffffffffffffffffffe
-
-# Ports configuration
-# xe0 (40G)
-portmap_1=25:40
-xgxs_rx_lane_map_1=0x213
-xgxs_tx_lane_map_1=0x2031
-phy_xaui_rx_polarity_flip_1=0xe
-phy_xaui_tx_polarity_flip_1=0x2
-serdes_driver_current_lane0_xe0=0x5
-serdes_driver_current_lane1_xe0=0x5
-serdes_driver_current_lane2_xe0=0x5
-serdes_driver_current_lane3_xe0=0x5
-serdes_pre_driver_current_lane0_xe0=0x5
-serdes_pre_driver_current_lane1_xe0=0x5
-serdes_pre_driver_current_lane2_xe0=0x5
-serdes_pre_driver_current_lane3_xe0=0x5
-serdes_preemphasis_lane0_xe0=0xcad0
-serdes_preemphasis_lane1_xe0=0xc6e0
-serdes_preemphasis_lane2_xe0=0xc6e0
-serdes_preemphasis_lane3_xe0=0xd2b0
-
-# xe1 (40G)
-portmap_2=29:40
-xgxs_rx_lane_map_2=0x213
-xgxs_tx_lane_map_2=0x213
-phy_xaui_rx_polarity_flip_2=0xc
-phy_xaui_tx_polarity_flip_2=0x9
-serdes_driver_current_lane0_xe1=0x6
-serdes_driver_current_lane1_xe1=0x7
-serdes_driver_current_lane2_xe1=0x6
-serdes_driver_current_lane3_xe1=0x6
-serdes_pre_driver_current_lane0_xe1=0x6
-serdes_pre_driver_current_lane1_xe1=0x7
-serdes_pre_driver_current_lane2_xe1=0x6
-serdes_pre_driver_current_lane3_xe1=0x6
-serdes_preemphasis_lane0_xe1=0xc2f0
-serdes_preemphasis_lane1_xe1=0xd2b0
-serdes_preemphasis_lane2_xe1=0xc6e0
-serdes_preemphasis_lane3_xe1=0xc2f0
-
-# xe2 (40G)
-portmap_3=33:40
-xgxs_rx_lane_map_3=0x213
-xgxs_tx_lane_map_3=0x132
-phy_xaui_rx_polarity_flip_3=0xe
-phy_xaui_tx_polarity_flip_3=0x2
-serdes_driver_current_lane0_xe2=0x4
-serdes_driver_current_lane1_xe2=0x4
-serdes_driver_current_lane2_xe2=0x4
-serdes_driver_current_lane3_xe2=0x4
-serdes_pre_driver_current_lane0_xe2=0x4
-serdes_pre_driver_current_lane1_xe2=0x4
-serdes_pre_driver_current_lane2_xe2=0x4
-serdes_pre_driver_current_lane3_xe2=0x4
-serdes_preemphasis_lane0_xe2=0xc6e0
-serdes_preemphasis_lane1_xe2=0xc6e0
-serdes_preemphasis_lane2_xe2=0xc6e0
-serdes_preemphasis_lane3_xe2=0xc6e0
-
-# xe3 (40G)
-portmap_4=37:40
-xgxs_rx_lane_map_4=0x213
-xgxs_tx_lane_map_4=0x1203
-phy_xaui_rx_polarity_flip_4=0x3
-phy_xaui_tx_polarity_flip_4=0xe
-serdes_driver_current_lane0_xe3=0x4
-serdes_driver_current_lane1_xe3=0x4
-serdes_driver_current_lane2_xe3=0x4
-serdes_driver_current_lane3_xe3=0x4
-serdes_pre_driver_current_lane0_xe3=0x4
-serdes_pre_driver_current_lane1_xe3=0x4
-serdes_pre_driver_current_lane2_xe3=0x4
-serdes_pre_driver_current_lane3_xe3=0x4
-serdes_preemphasis_lane0_xe3=0xcad0
-serdes_preemphasis_lane1_xe3=0xcad0
-serdes_preemphasis_lane2_xe3=0xc2f0
-serdes_preemphasis_lane3_xe3=0xc2f0
-
-# xe4 (40G)
-portmap_5=45:40
-xgxs_rx_lane_map_5=0x213
-xgxs_tx_lane_map_5=0x213
-phy_xaui_rx_polarity_flip_5=0xe
-phy_xaui_tx_polarity_flip_5=0x8
-serdes_driver_current_lane0_xe4=0x4
-serdes_driver_current_lane1_xe4=0x4
-serdes_driver_current_lane2_xe4=0x4
-serdes_driver_current_lane3_xe4=0x4
-serdes_pre_driver_current_lane0_xe4=0x4
-serdes_pre_driver_current_lane1_xe4=0x4
-serdes_pre_driver_current_lane2_xe4=0x4
-serdes_pre_driver_current_lane3_xe4=0x4
-serdes_preemphasis_lane0_xe4=0xc2f0
-serdes_preemphasis_lane1_xe4=0xc2f0
-serdes_preemphasis_lane2_xe4=0xc2f0
-serdes_preemphasis_lane3_xe4=0xc2f0
-
-# xe5 (40G)
-portmap_6=41:40
-xgxs_rx_lane_map_6=0x213
-xgxs_tx_lane_map_6=0x3021
-phy_xaui_rx_polarity_flip_6=0x3
-phy_xaui_tx_polarity_flip_6=0xb
-serdes_driver_current_lane0_xe5=0x4
-serdes_driver_current_lane1_xe5=0x4
-serdes_driver_current_lane2_xe5=0x4
-serdes_driver_current_lane3_xe5=0x4
-serdes_pre_driver_current_lane0_xe5=0x4
-serdes_pre_driver_current_lane1_xe5=0x4
-serdes_pre_driver_current_lane2_xe5=0x4
-serdes_pre_driver_current_lane3_xe5=0x4
-serdes_preemphasis_lane0_xe5=0xc6e0
-serdes_preemphasis_lane1_xe5=0xc2f0
-serdes_preemphasis_lane2_xe5=0xc2f0
-serdes_preemphasis_lane3_xe5=0xcad0
-
-# xe6 (40G)
-portmap_7=1:40
-xgxs_rx_lane_map_7=0x213
-xgxs_tx_lane_map_7=0x2031
-phy_xaui_rx_polarity_flip_7=0xe
-phy_xaui_tx_polarity_flip_7=0xd
-serdes_driver_current_lane0_xe6=0x5
-serdes_driver_current_lane1_xe6=0x5
-serdes_driver_current_lane2_xe6=0x5
-serdes_driver_current_lane3_xe6=0x5
-serdes_pre_driver_current_lane0_xe6=0x5
-serdes_pre_driver_current_lane1_xe6=0x5
-serdes_pre_driver_current_lane2_xe6=0x5
-serdes_pre_driver_current_lane3_xe6=0x5
-serdes_preemphasis_lane0_xe6=0xc6e0
-serdes_preemphasis_lane1_xe6=0xcad0
-serdes_preemphasis_lane2_xe6=0xc6e0
-serdes_preemphasis_lane3_xe6=0xcad0
-
-# xe7 (40G)
-portmap_8=5:40
-xgxs_rx_lane_map_8=0x213
-xgxs_tx_lane_map_8=0x1203
-phy_xaui_rx_polarity_flip_8=0xc
-phy_xaui_tx_polarity_flip_8=0x1
-serdes_driver_current_lane0_xe7=0x4
-serdes_driver_current_lane1_xe7=0x4
-serdes_driver_current_lane2_xe7=0x4
-serdes_driver_current_lane3_xe7=0x4
-serdes_pre_driver_current_lane0_xe7=0x4
-serdes_pre_driver_current_lane1_xe7=0x4
-serdes_pre_driver_current_lane2_xe7=0x4
-serdes_pre_driver_current_lane3_xe7=0x4
-serdes_preemphasis_lane0_xe7=0xc6e0
-serdes_preemphasis_lane1_xe7=0xc6e0
-serdes_preemphasis_lane2_xe7=0xc6e0
-serdes_preemphasis_lane3_xe7=0xc6e0
-
-# xe8 (40G)
-portmap_9=13:40
-xgxs_rx_lane_map_9=0x213
-xgxs_tx_lane_map_9=0x132
-phy_xaui_rx_polarity_flip_9=0xe
-phy_xaui_tx_polarity_flip_9=0x0
-serdes_driver_current_lane0_xe8=0x2
-serdes_driver_current_lane1_xe8=0x3
-serdes_driver_current_lane2_xe8=0x2
-serdes_driver_current_lane3_xe8=0x2
-serdes_pre_driver_current_lane0_xe8=0x2
-serdes_pre_driver_current_lane1_xe8=0x3
-serdes_pre_driver_current_lane2_xe8=0x2
-serdes_pre_driver_current_lane3_xe8=0x2
-serdes_preemphasis_lane0_xe8=0xb270
-serdes_preemphasis_lane1_xe8=0xbb10
-serdes_preemphasis_lane2_xe8=0xb720
-serdes_preemphasis_lane3_xe8=0xb720
-
-# xe9 (40G)
-portmap_10=9:40
-xgxs_rx_lane_map_10=0x3120
-xgxs_tx_lane_map_10=0x3021
-phy_xaui_rx_polarity_flip_10=0x0
-phy_xaui_tx_polarity_flip_10=0x4
-serdes_driver_current_lane0_xe9=0x3
-serdes_driver_current_lane1_xe9=0x3
-serdes_driver_current_lane2_xe9=0x3
-serdes_driver_current_lane3_xe9=0x3
-serdes_pre_driver_current_lane0_xe9=0x3
-serdes_pre_driver_current_lane1_xe9=0x3
-serdes_pre_driver_current_lane2_xe9=0x3
-serdes_pre_driver_current_lane3_xe9=0x3
-serdes_preemphasis_lane0_xe9=0xc2f0
-serdes_preemphasis_lane1_xe9=0xc6e0
-serdes_preemphasis_lane2_xe9=0xbf00
-serdes_preemphasis_lane3_xe9=0xc2f0
-
-# xe10 (40G)
-portmap_11=17:40
-xgxs_rx_lane_map_11=0x213
-xgxs_tx_lane_map_11=0x132
-phy_xaui_rx_polarity_flip_11=0xe
-phy_xaui_tx_polarity_flip_11=0x0
-serdes_driver_current_lane0_xe10=0x2
-serdes_driver_current_lane1_xe10=0x2
-serdes_driver_current_lane2_xe10=0x2
-serdes_driver_current_lane3_xe10=0x2
-serdes_pre_driver_current_lane0_xe10=0x2
-serdes_pre_driver_current_lane1_xe10=0x2
-serdes_pre_driver_current_lane2_xe10=0x2
-serdes_pre_driver_current_lane3_xe10=0x2
-serdes_preemphasis_lane0_xe10=0xb330
-serdes_preemphasis_lane1_xe10=0xbb10
-serdes_preemphasis_lane2_xe10=0xbb10
-serdes_preemphasis_lane3_xe10=0xbb10
-
-# xe11 (40G)
-portmap_12=21:40
-xgxs_rx_lane_map_12=0x123
-xgxs_tx_lane_map_12=0x1203
-phy_xaui_rx_polarity_flip_12=0xc
-phy_xaui_tx_polarity_flip_12=0xe
-serdes_driver_current_lane0_xe11=0x2
-serdes_driver_current_lane1_xe11=0x2
-serdes_driver_current_lane2_xe11=0x2
-serdes_driver_current_lane3_xe11=0x2
-serdes_pre_driver_current_lane0_xe11=0x2
-serdes_pre_driver_current_lane1_xe11=0x2
-serdes_pre_driver_current_lane2_xe11=0x2
-serdes_pre_driver_current_lane3_xe11=0x2
-serdes_preemphasis_lane0_xe11=0xb330
-serdes_preemphasis_lane1_xe11=0xb330
-serdes_preemphasis_lane2_xe11=0xb330
-serdes_preemphasis_lane3_xe11=0xb330
-
-# xe12 (40G)
-portmap_13=53:40
-xgxs_rx_lane_map_13=0x213
-xgxs_tx_lane_map_13=0x231
-phy_xaui_rx_polarity_flip_13=0x1
-phy_xaui_tx_polarity_flip_13=0x0
-serdes_driver_current_lane0_xe12=0x2
-serdes_driver_current_lane1_xe12=0x2
-serdes_driver_current_lane2_xe12=0x2
-serdes_driver_current_lane3_xe12=0x2
-serdes_pre_driver_current_lane0_xe12=0x2
-serdes_pre_driver_current_lane1_xe12=0x2
-serdes_pre_driver_current_lane2_xe12=0x2
-serdes_pre_driver_current_lane3_xe12=0x2
-serdes_preemphasis_lane0_xe12=0xaf40
-serdes_preemphasis_lane1_xe12=0xaf40
-serdes_preemphasis_lane2_xe12=0xaf40
-serdes_preemphasis_lane3_xe12=0xaf40
-
-# xe13 (40G)
-portmap_14=49:40
-xgxs_rx_lane_map_14=0x1302
-xgxs_tx_lane_map_14=0x2031
-phy_xaui_rx_polarity_flip_14=0xb
-phy_xaui_tx_polarity_flip_14=0x3
-serdes_driver_current_lane0_xe13=0x2
-serdes_driver_current_lane1_xe13=0x2
-serdes_driver_current_lane2_xe13=0x2
-serdes_driver_current_lane3_xe13=0x2
-serdes_pre_driver_current_lane0_xe13=0x2
-serdes_pre_driver_current_lane1_xe13=0x2
-serdes_pre_driver_current_lane2_xe13=0x2
-serdes_pre_driver_current_lane3_xe13=0x2
-serdes_preemphasis_lane0_xe13=0xa760
-serdes_preemphasis_lane1_xe13=0xa760
-serdes_preemphasis_lane2_xe13=0xa760
-serdes_preemphasis_lane3_xe13=0xa760
-
-# xe14 (40G)
-portmap_15=57:40
-xgxs_rx_lane_map_15=0x213
-xgxs_tx_lane_map_15=0x2031
-phy_xaui_rx_polarity_flip_15=0x1
-phy_xaui_tx_polarity_flip_15=0x0
-serdes_driver_current_lane0_xe14=0x1
-serdes_driver_current_lane1_xe14=0x1
-serdes_driver_current_lane2_xe14=0x1
-serdes_driver_current_lane3_xe14=0x1
-serdes_pre_driver_current_lane0_xe14=0x1
-serdes_pre_driver_current_lane1_xe14=0x1
-serdes_pre_driver_current_lane2_xe14=0x1
-serdes_pre_driver_current_lane3_xe14=0x1
-serdes_preemphasis_lane0_xe14=0xa760
-serdes_preemphasis_lane1_xe14=0xa760
-serdes_preemphasis_lane2_xe14=0xa760
-serdes_preemphasis_lane3_xe14=0xa760
-
-# xe15 (40G)
-portmap_16=61:40
-xgxs_rx_lane_map_16=0x132
-xgxs_tx_lane_map_16=0x213
-phy_xaui_rx_polarity_flip_16=0x0
-phy_xaui_tx_polarity_flip_16=0x0
-serdes_driver_current_lane0_xe15=0x2
-serdes_driver_current_lane1_xe15=0x2
-serdes_driver_current_lane2_xe15=0x2
-serdes_driver_current_lane3_xe15=0x2
-serdes_pre_driver_current_lane0_xe15=0x2
-serdes_pre_driver_current_lane1_xe15=0x2
-serdes_pre_driver_current_lane2_xe15=0x2
-serdes_pre_driver_current_lane3_xe15=0x2
-serdes_preemphasis_lane0_xe15=0xa760
-serdes_preemphasis_lane1_xe15=0xa760
-serdes_preemphasis_lane2_xe15=0xa760
-serdes_preemphasis_lane3_xe15=0xa760
-
-# xe16 (40G)
-portmap_17=69:40
-xgxs_rx_lane_map_17=0x213
-xgxs_tx_lane_map_17=0x2130
-phy_xaui_rx_polarity_flip_17=0x1
-phy_xaui_tx_polarity_flip_17=0xf
-serdes_driver_current_lane0_xe16=0x1
-serdes_driver_current_lane1_xe16=0x1
-serdes_driver_current_lane2_xe16=0x1
-serdes_driver_current_lane3_xe16=0x1
-serdes_pre_driver_current_lane0_xe16=0x1
-serdes_pre_driver_current_lane1_xe16=0x1
-serdes_pre_driver_current_lane2_xe16=0x1
-serdes_pre_driver_current_lane3_xe16=0x1
-serdes_preemphasis_lane0_xe16=0xa760
-serdes_preemphasis_lane1_xe16=0xa760
-serdes_preemphasis_lane2_xe16=0xa760
-serdes_preemphasis_lane3_xe16=0xa760
-
-# xe17 (40G)
-portmap_18=65:40
-xgxs_rx_lane_map_18=0x132
-xgxs_tx_lane_map_18=0x2031
-phy_xaui_rx_polarity_flip_18=0x3
-phy_xaui_tx_polarity_flip_18=0x9
-serdes_driver_current_lane0_xe17=0x1
-serdes_driver_current_lane1_xe17=0x1
-serdes_driver_current_lane2_xe17=0x1
-serdes_driver_current_lane3_xe17=0x1
-serdes_pre_driver_current_lane0_xe17=0x1
-serdes_pre_driver_current_lane1_xe17=0x1
-serdes_pre_driver_current_lane2_xe17=0x1
-serdes_pre_driver_current_lane3_xe17=0x1
-serdes_preemphasis_lane0_xe17=0xa370
-serdes_preemphasis_lane1_xe17=0xa370
-serdes_preemphasis_lane2_xe17=0xa370
-serdes_preemphasis_lane3_xe17=0xa370
-
-# xe18 (40G)
-portmap_19=73:40
-xgxs_rx_lane_map_19=0x213
-xgxs_tx_lane_map_19=0x2031
-phy_xaui_rx_polarity_flip_19=0x1
-phy_xaui_tx_polarity_flip_19=0x0
-serdes_driver_current_lane0_xe18=0x2
-serdes_driver_current_lane1_xe18=0x2
-serdes_driver_current_lane2_xe18=0x2
-serdes_driver_current_lane3_xe18=0x2
-serdes_pre_driver_current_lane0_xe18=0x2
-serdes_pre_driver_current_lane1_xe18=0x2
-serdes_pre_driver_current_lane2_xe18=0x2
-serdes_pre_driver_current_lane3_xe18=0x2
-serdes_preemphasis_lane0_xe18=0xa760
-serdes_preemphasis_lane1_xe18=0xa760
-serdes_preemphasis_lane2_xe18=0xa760
-serdes_preemphasis_lane3_xe18=0xa760
-
-# xe19 (40G)
-portmap_20=77:40
-xgxs_rx_lane_map_20=0x123
-xgxs_tx_lane_map_20=0x1203
-phy_xaui_rx_polarity_flip_20=0x3
-phy_xaui_tx_polarity_flip_20=0xe
-serdes_driver_current_lane0_xe19=0x2
-serdes_driver_current_lane1_xe19=0x2
-serdes_driver_current_lane2_xe19=0x2
-serdes_driver_current_lane3_xe19=0x2
-serdes_pre_driver_current_lane0_xe19=0x2
-serdes_pre_driver_current_lane1_xe19=0x2
-serdes_pre_driver_current_lane2_xe19=0x2
-serdes_pre_driver_current_lane3_xe19=0x2
-serdes_preemphasis_lane0_xe19=0xaf40
-serdes_preemphasis_lane1_xe19=0xaf40
-serdes_preemphasis_lane2_xe19=0xaf40
-serdes_preemphasis_lane3_xe19=0xaf40
-
-# xe20 (40G)
-portmap_21=109:40
-xgxs_rx_lane_map_21=0x132
-xgxs_tx_lane_map_21=0x132
-phy_xaui_rx_polarity_flip_21=0x8
-phy_xaui_tx_polarity_flip_21=0x0
-serdes_driver_current_lane0_xe20=0x1
-serdes_driver_current_lane1_xe20=0x1
-serdes_driver_current_lane2_xe20=0x1
-serdes_driver_current_lane3_xe20=0x2
-serdes_pre_driver_current_lane0_xe20=0x1
-serdes_pre_driver_current_lane1_xe20=0x1
-serdes_pre_driver_current_lane2_xe20=0x1
-serdes_pre_driver_current_lane3_xe20=0x2
-serdes_preemphasis_lane0_xe20=0xb330
-serdes_preemphasis_lane1_xe20=0xb330
-serdes_preemphasis_lane2_xe20=0xb330
-serdes_preemphasis_lane3_xe20=0xbff0
-
-# xe21 (40G)
-portmap_22=105:40
-xgxs_rx_lane_map_22=0x1320
-xgxs_tx_lane_map_22=0x3021
-phy_xaui_rx_polarity_flip_22=0xd
-phy_xaui_tx_polarity_flip_22=0xb
-serdes_driver_current_lane0_xe21=0x1
-serdes_driver_current_lane1_xe21=0x1
-serdes_driver_current_lane2_xe21=0x1
-serdes_driver_current_lane3_xe21=0x1
-serdes_pre_driver_current_lane0_xe21=0x1
-serdes_pre_driver_current_lane1_xe21=0x1
-serdes_pre_driver_current_lane2_xe21=0x1
-serdes_pre_driver_current_lane3_xe21=0x1
-serdes_preemphasis_lane0_xe21=0xb330
-serdes_preemphasis_lane1_xe21=0xb330
-serdes_preemphasis_lane2_xe21=0xb330
-serdes_preemphasis_lane3_xe21=0xb330
-
-# xe22 (40G)
-portmap_23=113:40
-xgxs_rx_lane_map_23=0x132
-xgxs_tx_lane_map_23=0x132
-phy_xaui_rx_polarity_flip_23=0x8
-phy_xaui_tx_polarity_flip_23=0x0
-serdes_driver_current_lane0_xe22=0x1
-serdes_driver_current_lane1_xe22=0x1
-serdes_driver_current_lane2_xe22=0x1
-serdes_driver_current_lane3_xe22=0x1
-serdes_pre_driver_current_lane0_xe22=0x1
-serdes_pre_driver_current_lane1_xe22=0x1
-serdes_pre_driver_current_lane2_xe22=0x1
-serdes_pre_driver_current_lane3_xe22=0x1
-serdes_preemphasis_lane0_xe22=0xbb10
-serdes_preemphasis_lane1_xe22=0xbb10
-serdes_preemphasis_lane2_xe22=0xbb10
-serdes_preemphasis_lane3_xe22=0xc2f0
-
-# xe23 (40G)
-portmap_24=117:40
-xgxs_rx_lane_map_24=0x231
-xgxs_tx_lane_map_24=0x1203
-phy_xaui_rx_polarity_flip_24=0x3
-phy_xaui_tx_polarity_flip_24=0xe
-serdes_driver_current_lane0_xe23=0x3
-serdes_driver_current_lane1_xe23=0x5
-serdes_driver_current_lane2_xe23=0x3
-serdes_driver_current_lane3_xe23=0x3
-serdes_pre_driver_current_lane0_xe23=0x3
-serdes_pre_driver_current_lane1_xe23=0x5
-serdes_pre_driver_current_lane2_xe23=0x3
-serdes_pre_driver_current_lane3_xe23=0x3
-serdes_preemphasis_lane0_xe23=0xc6e0
-serdes_preemphasis_lane1_xe23=0xc6e0
-serdes_preemphasis_lane2_xe23=0xc6e0
-serdes_preemphasis_lane3_xe23=0xc6e0
-
-# xe24 (40G)
-portmap_25=125:40
-xgxs_rx_lane_map_25=0x132
-xgxs_tx_lane_map_25=0x132
-phy_xaui_rx_polarity_flip_25=0x8
-phy_xaui_tx_polarity_flip_25=0x0
-serdes_driver_current_lane0_xe24=0x4
-serdes_driver_current_lane1_xe24=0x4
-serdes_driver_current_lane2_xe24=0x4
-serdes_driver_current_lane3_xe24=0x4
-serdes_pre_driver_current_lane0_xe24=0x4
-serdes_pre_driver_current_lane1_xe24=0x4
-serdes_pre_driver_current_lane2_xe24=0x4
-serdes_pre_driver_current_lane3_xe24=0x4
-serdes_preemphasis_lane0_xe24=0xc6e0
-serdes_preemphasis_lane1_xe24=0xc6e0
-serdes_preemphasis_lane2_xe24=0xc6e0
-serdes_preemphasis_lane3_xe24=0xcec0
-
-# xe25 (40G)
-portmap_26=121:40
-xgxs_rx_lane_map_26=0x1320
-xgxs_tx_lane_map_26=0x3021
-phy_xaui_rx_polarity_flip_26=0xd
-phy_xaui_tx_polarity_flip_26=0xb
-serdes_driver_current_lane0_xe25=0x4
-serdes_driver_current_lane1_xe25=0x4
-serdes_driver_current_lane2_xe25=0x4
-serdes_driver_current_lane3_xe25=0x4
-serdes_pre_driver_current_lane0_xe25=0x4
-serdes_pre_driver_current_lane1_xe25=0x4
-serdes_pre_driver_current_lane2_xe25=0x4
-serdes_pre_driver_current_lane3_xe25=0x4
-serdes_preemphasis_lane0_xe25=0xc6e0
-serdes_preemphasis_lane1_xe25=0xc6e0
-serdes_preemphasis_lane2_xe25=0xc6e0
-serdes_preemphasis_lane3_xe25=0xc6e0
-
-# xe26 (40G)
-portmap_27=81:40
-xgxs_rx_lane_map_27=0x1320
-xgxs_tx_lane_map_27=0x2031
-phy_xaui_rx_polarity_flip_27=0x1
-phy_xaui_tx_polarity_flip_27=0x2
-serdes_driver_current_lane0_xe26=0x2
-serdes_driver_current_lane1_xe26=0x2
-serdes_driver_current_lane2_xe26=0x2
-serdes_driver_current_lane3_xe26=0x2
-serdes_pre_driver_current_lane0_xe26=0x2
-serdes_pre_driver_current_lane1_xe26=0x2
-serdes_pre_driver_current_lane2_xe26=0x2
-serdes_pre_driver_current_lane3_xe26=0x2
-serdes_preemphasis_lane0_xe26=0xbb10
-serdes_preemphasis_lane1_xe26=0xbb10
-serdes_preemphasis_lane2_xe26=0xbf00
-serdes_preemphasis_lane3_xe26=0xbb10
-
-# xe27 (40G)
-portmap_28=85:40
-xgxs_rx_lane_map_28=0x213
-xgxs_tx_lane_map_28=0x1203
-phy_xaui_rx_polarity_flip_28=0xc
-phy_xaui_tx_polarity_flip_28=0xe
-serdes_driver_current_lane0_xe27=0x4
-serdes_driver_current_lane1_xe27=0x5
-serdes_driver_current_lane2_xe27=0x4
-serdes_driver_current_lane3_xe27=0x5
-serdes_pre_driver_current_lane0_xe27=0x4
-serdes_pre_driver_current_lane1_xe27=0x5
-serdes_pre_driver_current_lane2_xe27=0x4
-serdes_pre_driver_current_lane3_xe27=0x5
-serdes_preemphasis_lane0_xe27=0xc2f0
-serdes_preemphasis_lane1_xe27=0xc6e0
-serdes_preemphasis_lane2_xe27=0xc6e0
-serdes_preemphasis_lane3_xe27=0xc6e0
-
-# xe28 (40G)
-portmap_29=93:40
-xgxs_rx_lane_map_29=0x1320
-xgxs_tx_lane_map_29=0x2031
-phy_xaui_rx_polarity_flip_29=0x1
-phy_xaui_tx_polarity_flip_29=0x2
-serdes_driver_current_lane0_xe28=0x4
-serdes_driver_current_lane1_xe28=0x4
-serdes_driver_current_lane2_xe28=0x4
-serdes_driver_current_lane3_xe28=0x4
-serdes_pre_driver_current_lane0_xe28=0x4
-serdes_pre_driver_current_lane1_xe28=0x4
-serdes_pre_driver_current_lane2_xe28=0x4
-serdes_pre_driver_current_lane3_xe28=0x4
-serdes_preemphasis_lane0_xe28=0xc2f0
-serdes_preemphasis_lane1_xe28=0xc2f0
-serdes_preemphasis_lane2_xe28=0xc2f0
-serdes_preemphasis_lane3_xe28=0xc2f0
-
-# xe29 (40G)
-portmap_30=89:40
-xgxs_rx_lane_map_30=0x1320
-xgxs_tx_lane_map_30=0x3021
-phy_xaui_rx_polarity_flip_30=0x2
-phy_xaui_tx_polarity_flip_30=0xb
-serdes_driver_current_lane0_xe29=0x4
-serdes_driver_current_lane1_xe29=0x4
-serdes_driver_current_lane2_xe29=0x4
-serdes_driver_current_lane3_xe29=0x4
-serdes_pre_driver_current_lane0_xe29=0x4
-serdes_pre_driver_current_lane1_xe29=0x4
-serdes_pre_driver_current_lane2_xe29=0x4
-serdes_pre_driver_current_lane3_xe29=0x4
-serdes_preemphasis_lane0_xe29=0xcad0
-serdes_preemphasis_lane1_xe29=0xc6e0
-serdes_preemphasis_lane2_xe29=0xc6e0
-serdes_preemphasis_lane3_xe29=0xc6e0
-
-# xe30 (40G)
-portmap_31=101:40
-xgxs_rx_lane_map_31=0x1320
-xgxs_tx_lane_map_31=0x1203
-phy_xaui_rx_polarity_flip_31=0x1
-phy_xaui_tx_polarity_flip_31=0x6
-serdes_driver_current_lane0_xe30=0x6
-serdes_driver_current_lane1_xe30=0x6
-serdes_driver_current_lane2_xe30=0x6
-serdes_driver_current_lane3_xe30=0x7
-serdes_pre_driver_current_lane0_xe30=0x6
-serdes_pre_driver_current_lane1_xe30=0x6
-serdes_pre_driver_current_lane2_xe30=0x6
-serdes_pre_driver_current_lane3_xe30=0x7
-serdes_preemphasis_lane0_xe30=0xcec0
-serdes_preemphasis_lane1_xe30=0xcec0
-serdes_preemphasis_lane2_xe30=0xcad0
-serdes_preemphasis_lane3_xe30=0xc6e0
-
-# xe31 (40G)
-portmap_32=97:40
-xgxs_rx_lane_map_32=0x213
-xgxs_tx_lane_map_32=0x2031
-phy_xaui_rx_polarity_flip_32=0xc
-phy_xaui_tx_polarity_flip_32=0x3
-serdes_driver_current_lane0_xe31=0x5
-serdes_driver_current_lane1_xe31=0x5
-serdes_driver_current_lane2_xe31=0x5
-serdes_driver_current_lane3_xe31=0x5
-serdes_pre_driver_current_lane0_xe31=0x5
-serdes_pre_driver_current_lane1_xe31=0x5
-serdes_pre_driver_current_lane2_xe31=0x5
-serdes_pre_driver_current_lane3_xe31=0x5
-serdes_preemphasis_lane0_xe31=0xcad0
-serdes_preemphasis_lane1_xe31=0xcad0
-serdes_preemphasis_lane2_xe31=0xcad0
-serdes_preemphasis_lane3_xe31=0xcad0
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/1/buffers.json.j2 b/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/1/buffers.json.j2
deleted file mode 100644
index b67cf577ab75..000000000000
--- a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/1/buffers.json.j2
+++ /dev/null
@@ -1,3 +0,0 @@
-{%- set default_topo = 't1' %}
-{%- include 'buffers_config.j2' %}
-
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/1/buffers_defaults_def.j2 b/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/1/buffers_defaults_def.j2
deleted file mode 100644
index 38e34eb571e8..000000000000
--- a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/1/buffers_defaults_def.j2
+++ /dev/null
@@ -1,45 +0,0 @@
-{%- set default_cable = '300m' %}
-
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {% for port_idx in range(0,32) %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
-    {% endfor %}
-{%- endmacro %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "12766208",
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "12766208",
-            "type": "egress",
-            "mode": "static"
-        },
-        "egress_lossy_pool": {
-            "size": "7326924",
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "static_th":"12766208"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"1518",
-            "dynamic_th":"3"
-        }
-    },
-{%- endmacro %}
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/1/buffers_defaults_t0.j2 b/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/1/buffers_defaults_t0.j2
deleted file mode 100644
index 38e34eb571e8..000000000000
--- a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/1/buffers_defaults_t0.j2
+++ /dev/null
@@ -1,45 +0,0 @@
-{%- set default_cable = '300m' %}
-
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {% for port_idx in range(0,32) %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
-    {% endfor %}
-{%- endmacro %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "12766208",
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "12766208",
-            "type": "egress",
-            "mode": "static"
-        },
-        "egress_lossy_pool": {
-            "size": "7326924",
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "static_th":"12766208"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"1518",
-            "dynamic_th":"3"
-        }
-    },
-{%- endmacro %}
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/1/buffers_defaults_t1.j2 b/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/1/buffers_defaults_t1.j2
deleted file mode 100644
index 38e34eb571e8..000000000000
--- a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/1/buffers_defaults_t1.j2
+++ /dev/null
@@ -1,45 +0,0 @@
-{%- set default_cable = '300m' %}
-
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {% for port_idx in range(0,32) %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
-    {% endfor %}
-{%- endmacro %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "12766208",
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "12766208",
-            "type": "egress",
-            "mode": "static"
-        },
-        "egress_lossy_pool": {
-            "size": "7326924",
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "static_th":"12766208"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"1518",
-            "dynamic_th":"3"
-        }
-    },
-{%- endmacro %}
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/1/pg_profile_lookup.ini b/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/1/pg_profile_lookup.ini
deleted file mode 100644
index 9f2eacb6fc42..000000000000
--- a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/1/pg_profile_lookup.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-# PG lossless profiles.
-# speed cable size      xon     xoff   threshold xon_offset
-  10000  5m   56368     18432   55120  -3        2496
-  25000  5m   56368     18432   55120  -3        2496
-  40000  5m   56368     18432   55120  -3        2496
-  50000  5m   56368     18432   55120  -3        2496
- 100000  5m   56368     18432   55120  -3        2496
-  10000  40m  56368     18432   55120  -3        2496
-  25000  40m  56368     18432   55120  -3        2496
-  40000  40m  56368     18432   55120  -3        2496
-  50000  40m  56368     18432   55120  -3        2496
- 100000  40m  56368     18432   55120  -3        2496
-  10000  300m 56368     18432   55120  -3        2496
-  25000  300m 56368     18432   55120  -3        2496
-  40000  300m 56368     18432   55120  -3        2496
-  50000  300m 56368     18432   55120  -3        2496
- 100000  300m 56368     18432   55120  -3        2496
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/1/qos.json.j2 b/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/1/qos.json.j2
deleted file mode 100644
index 3e548325ea30..000000000000
--- a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/1/qos.json.j2
+++ /dev/null
@@ -1 +0,0 @@
-{%- include 'qos_config.j2' %}
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/1/sai.profile b/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/1/sai.profile
deleted file mode 100644
index 0a2df177f1c5..000000000000
--- a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/1/sai.profile
+++ /dev/null
@@ -1,3 +0,0 @@
-SAI_VS_SWITCH_TYPE=SAI_VS_SWITCH_TYPE_BCM56850
-SAI_VS_HOSTIF_USE_TAP_DEVICE=true
-SAI_VS_INTERFACE_LANE_MAP_FILE=/usr/share/sonic/hwsku/lanemap.ini
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/1/td2-s6000-32x40G.config.bcm b/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/1/td2-s6000-32x40G.config.bcm
deleted file mode 100644
index 0e25b4d4232d..000000000000
--- a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/1/td2-s6000-32x40G.config.bcm
+++ /dev/null
@@ -1,646 +0,0 @@
-# Old LPM only configuration
-# l2_mem_entries=163840
-# l3_mem_entries=90112
-# l3_alpm_enable=0
-# ipv6_lpm_128b_enable=0
-#
-# ALPM enable
-l3_alpm_enable=2
-ipv6_lpm_128b_enable=1
-l2_mem_entries=32768
-l3_mem_entries=16384
-
-# From old config file
-os=unix
-higig2_hdr_mode=1
-
-# Parity
-parity_correction=1
-parity_enable=1
-stat_if_parity_enable=0
-
-#
-bcm_num_cos=10
-bcm_stat_interval=2000000
-l2xmsg_hostbuf_size=8192
-l2xmsg_mode=1
-lls_num_l2uc=12
-max_vp_lags=0
-miim_intr_enable=0
-mmu_lossless=0
-module_64ports=0
-schan_intr_enable=0
-stable_size=0x2000000
-tdma_timeout_usec=5000000
-
-pbmp_oversubscribe=0x000007fffffffffffffffffffffffffe
-pbmp_xport_xe=0x000007fffffffffffffffffffffffffe
-
-# Ports configuration
-# xe0 (40G)
-portmap_1=25:40
-xgxs_rx_lane_map_1=0x213
-xgxs_tx_lane_map_1=0x2031
-phy_xaui_rx_polarity_flip_1=0xe
-phy_xaui_tx_polarity_flip_1=0x2
-serdes_driver_current_lane0_xe0=0x5
-serdes_driver_current_lane1_xe0=0x5
-serdes_driver_current_lane2_xe0=0x5
-serdes_driver_current_lane3_xe0=0x5
-serdes_pre_driver_current_lane0_xe0=0x5
-serdes_pre_driver_current_lane1_xe0=0x5
-serdes_pre_driver_current_lane2_xe0=0x5
-serdes_pre_driver_current_lane3_xe0=0x5
-serdes_preemphasis_lane0_xe0=0xcad0
-serdes_preemphasis_lane1_xe0=0xc6e0
-serdes_preemphasis_lane2_xe0=0xc6e0
-serdes_preemphasis_lane3_xe0=0xd2b0
-
-# xe1 (40G)
-portmap_2=29:40
-xgxs_rx_lane_map_2=0x213
-xgxs_tx_lane_map_2=0x213
-phy_xaui_rx_polarity_flip_2=0xc
-phy_xaui_tx_polarity_flip_2=0x9
-serdes_driver_current_lane0_xe1=0x6
-serdes_driver_current_lane1_xe1=0x7
-serdes_driver_current_lane2_xe1=0x6
-serdes_driver_current_lane3_xe1=0x6
-serdes_pre_driver_current_lane0_xe1=0x6
-serdes_pre_driver_current_lane1_xe1=0x7
-serdes_pre_driver_current_lane2_xe1=0x6
-serdes_pre_driver_current_lane3_xe1=0x6
-serdes_preemphasis_lane0_xe1=0xc2f0
-serdes_preemphasis_lane1_xe1=0xd2b0
-serdes_preemphasis_lane2_xe1=0xc6e0
-serdes_preemphasis_lane3_xe1=0xc2f0
-
-# xe2 (40G)
-portmap_3=33:40
-xgxs_rx_lane_map_3=0x213
-xgxs_tx_lane_map_3=0x132
-phy_xaui_rx_polarity_flip_3=0xe
-phy_xaui_tx_polarity_flip_3=0x2
-serdes_driver_current_lane0_xe2=0x4
-serdes_driver_current_lane1_xe2=0x4
-serdes_driver_current_lane2_xe2=0x4
-serdes_driver_current_lane3_xe2=0x4
-serdes_pre_driver_current_lane0_xe2=0x4
-serdes_pre_driver_current_lane1_xe2=0x4
-serdes_pre_driver_current_lane2_xe2=0x4
-serdes_pre_driver_current_lane3_xe2=0x4
-serdes_preemphasis_lane0_xe2=0xc6e0
-serdes_preemphasis_lane1_xe2=0xc6e0
-serdes_preemphasis_lane2_xe2=0xc6e0
-serdes_preemphasis_lane3_xe2=0xc6e0
-
-# xe3 (40G)
-portmap_4=37:40
-xgxs_rx_lane_map_4=0x213
-xgxs_tx_lane_map_4=0x1203
-phy_xaui_rx_polarity_flip_4=0x3
-phy_xaui_tx_polarity_flip_4=0xe
-serdes_driver_current_lane0_xe3=0x4
-serdes_driver_current_lane1_xe3=0x4
-serdes_driver_current_lane2_xe3=0x4
-serdes_driver_current_lane3_xe3=0x4
-serdes_pre_driver_current_lane0_xe3=0x4
-serdes_pre_driver_current_lane1_xe3=0x4
-serdes_pre_driver_current_lane2_xe3=0x4
-serdes_pre_driver_current_lane3_xe3=0x4
-serdes_preemphasis_lane0_xe3=0xcad0
-serdes_preemphasis_lane1_xe3=0xcad0
-serdes_preemphasis_lane2_xe3=0xc2f0
-serdes_preemphasis_lane3_xe3=0xc2f0
-
-# xe4 (40G)
-portmap_5=45:40
-xgxs_rx_lane_map_5=0x213
-xgxs_tx_lane_map_5=0x213
-phy_xaui_rx_polarity_flip_5=0xe
-phy_xaui_tx_polarity_flip_5=0x8
-serdes_driver_current_lane0_xe4=0x4
-serdes_driver_current_lane1_xe4=0x4
-serdes_driver_current_lane2_xe4=0x4
-serdes_driver_current_lane3_xe4=0x4
-serdes_pre_driver_current_lane0_xe4=0x4
-serdes_pre_driver_current_lane1_xe4=0x4
-serdes_pre_driver_current_lane2_xe4=0x4
-serdes_pre_driver_current_lane3_xe4=0x4
-serdes_preemphasis_lane0_xe4=0xc2f0
-serdes_preemphasis_lane1_xe4=0xc2f0
-serdes_preemphasis_lane2_xe4=0xc2f0
-serdes_preemphasis_lane3_xe4=0xc2f0
-
-# xe5 (40G)
-portmap_6=41:40
-xgxs_rx_lane_map_6=0x213
-xgxs_tx_lane_map_6=0x3021
-phy_xaui_rx_polarity_flip_6=0x3
-phy_xaui_tx_polarity_flip_6=0xb
-serdes_driver_current_lane0_xe5=0x4
-serdes_driver_current_lane1_xe5=0x4
-serdes_driver_current_lane2_xe5=0x4
-serdes_driver_current_lane3_xe5=0x4
-serdes_pre_driver_current_lane0_xe5=0x4
-serdes_pre_driver_current_lane1_xe5=0x4
-serdes_pre_driver_current_lane2_xe5=0x4
-serdes_pre_driver_current_lane3_xe5=0x4
-serdes_preemphasis_lane0_xe5=0xc6e0
-serdes_preemphasis_lane1_xe5=0xc2f0
-serdes_preemphasis_lane2_xe5=0xc2f0
-serdes_preemphasis_lane3_xe5=0xcad0
-
-# xe6 (40G)
-portmap_7=1:40
-xgxs_rx_lane_map_7=0x213
-xgxs_tx_lane_map_7=0x2031
-phy_xaui_rx_polarity_flip_7=0xe
-phy_xaui_tx_polarity_flip_7=0xd
-serdes_driver_current_lane0_xe6=0x5
-serdes_driver_current_lane1_xe6=0x5
-serdes_driver_current_lane2_xe6=0x5
-serdes_driver_current_lane3_xe6=0x5
-serdes_pre_driver_current_lane0_xe6=0x5
-serdes_pre_driver_current_lane1_xe6=0x5
-serdes_pre_driver_current_lane2_xe6=0x5
-serdes_pre_driver_current_lane3_xe6=0x5
-serdes_preemphasis_lane0_xe6=0xc6e0
-serdes_preemphasis_lane1_xe6=0xcad0
-serdes_preemphasis_lane2_xe6=0xc6e0
-serdes_preemphasis_lane3_xe6=0xcad0
-
-# xe7 (40G)
-portmap_8=5:40
-xgxs_rx_lane_map_8=0x213
-xgxs_tx_lane_map_8=0x1203
-phy_xaui_rx_polarity_flip_8=0xc
-phy_xaui_tx_polarity_flip_8=0x1
-serdes_driver_current_lane0_xe7=0x4
-serdes_driver_current_lane1_xe7=0x4
-serdes_driver_current_lane2_xe7=0x4
-serdes_driver_current_lane3_xe7=0x4
-serdes_pre_driver_current_lane0_xe7=0x4
-serdes_pre_driver_current_lane1_xe7=0x4
-serdes_pre_driver_current_lane2_xe7=0x4
-serdes_pre_driver_current_lane3_xe7=0x4
-serdes_preemphasis_lane0_xe7=0xc6e0
-serdes_preemphasis_lane1_xe7=0xc6e0
-serdes_preemphasis_lane2_xe7=0xc6e0
-serdes_preemphasis_lane3_xe7=0xc6e0
-
-# xe8 (40G)
-portmap_9=13:40
-xgxs_rx_lane_map_9=0x213
-xgxs_tx_lane_map_9=0x132
-phy_xaui_rx_polarity_flip_9=0xe
-phy_xaui_tx_polarity_flip_9=0x0
-serdes_driver_current_lane0_xe8=0x2
-serdes_driver_current_lane1_xe8=0x3
-serdes_driver_current_lane2_xe8=0x2
-serdes_driver_current_lane3_xe8=0x2
-serdes_pre_driver_current_lane0_xe8=0x2
-serdes_pre_driver_current_lane1_xe8=0x3
-serdes_pre_driver_current_lane2_xe8=0x2
-serdes_pre_driver_current_lane3_xe8=0x2
-serdes_preemphasis_lane0_xe8=0xb270
-serdes_preemphasis_lane1_xe8=0xbb10
-serdes_preemphasis_lane2_xe8=0xb720
-serdes_preemphasis_lane3_xe8=0xb720
-
-# xe9 (40G)
-portmap_10=9:40
-xgxs_rx_lane_map_10=0x3120
-xgxs_tx_lane_map_10=0x3021
-phy_xaui_rx_polarity_flip_10=0x0
-phy_xaui_tx_polarity_flip_10=0x4
-serdes_driver_current_lane0_xe9=0x3
-serdes_driver_current_lane1_xe9=0x3
-serdes_driver_current_lane2_xe9=0x3
-serdes_driver_current_lane3_xe9=0x3
-serdes_pre_driver_current_lane0_xe9=0x3
-serdes_pre_driver_current_lane1_xe9=0x3
-serdes_pre_driver_current_lane2_xe9=0x3
-serdes_pre_driver_current_lane3_xe9=0x3
-serdes_preemphasis_lane0_xe9=0xc2f0
-serdes_preemphasis_lane1_xe9=0xc6e0
-serdes_preemphasis_lane2_xe9=0xbf00
-serdes_preemphasis_lane3_xe9=0xc2f0
-
-# xe10 (40G)
-portmap_11=17:40
-xgxs_rx_lane_map_11=0x213
-xgxs_tx_lane_map_11=0x132
-phy_xaui_rx_polarity_flip_11=0xe
-phy_xaui_tx_polarity_flip_11=0x0
-serdes_driver_current_lane0_xe10=0x2
-serdes_driver_current_lane1_xe10=0x2
-serdes_driver_current_lane2_xe10=0x2
-serdes_driver_current_lane3_xe10=0x2
-serdes_pre_driver_current_lane0_xe10=0x2
-serdes_pre_driver_current_lane1_xe10=0x2
-serdes_pre_driver_current_lane2_xe10=0x2
-serdes_pre_driver_current_lane3_xe10=0x2
-serdes_preemphasis_lane0_xe10=0xb330
-serdes_preemphasis_lane1_xe10=0xbb10
-serdes_preemphasis_lane2_xe10=0xbb10
-serdes_preemphasis_lane3_xe10=0xbb10
-
-# xe11 (40G)
-portmap_12=21:40
-xgxs_rx_lane_map_12=0x123
-xgxs_tx_lane_map_12=0x1203
-phy_xaui_rx_polarity_flip_12=0xc
-phy_xaui_tx_polarity_flip_12=0xe
-serdes_driver_current_lane0_xe11=0x2
-serdes_driver_current_lane1_xe11=0x2
-serdes_driver_current_lane2_xe11=0x2
-serdes_driver_current_lane3_xe11=0x2
-serdes_pre_driver_current_lane0_xe11=0x2
-serdes_pre_driver_current_lane1_xe11=0x2
-serdes_pre_driver_current_lane2_xe11=0x2
-serdes_pre_driver_current_lane3_xe11=0x2
-serdes_preemphasis_lane0_xe11=0xb330
-serdes_preemphasis_lane1_xe11=0xb330
-serdes_preemphasis_lane2_xe11=0xb330
-serdes_preemphasis_lane3_xe11=0xb330
-
-# xe12 (40G)
-portmap_13=53:40
-xgxs_rx_lane_map_13=0x213
-xgxs_tx_lane_map_13=0x231
-phy_xaui_rx_polarity_flip_13=0x1
-phy_xaui_tx_polarity_flip_13=0x0
-serdes_driver_current_lane0_xe12=0x2
-serdes_driver_current_lane1_xe12=0x2
-serdes_driver_current_lane2_xe12=0x2
-serdes_driver_current_lane3_xe12=0x2
-serdes_pre_driver_current_lane0_xe12=0x2
-serdes_pre_driver_current_lane1_xe12=0x2
-serdes_pre_driver_current_lane2_xe12=0x2
-serdes_pre_driver_current_lane3_xe12=0x2
-serdes_preemphasis_lane0_xe12=0xaf40
-serdes_preemphasis_lane1_xe12=0xaf40
-serdes_preemphasis_lane2_xe12=0xaf40
-serdes_preemphasis_lane3_xe12=0xaf40
-
-# xe13 (40G)
-portmap_14=49:40
-xgxs_rx_lane_map_14=0x1302
-xgxs_tx_lane_map_14=0x2031
-phy_xaui_rx_polarity_flip_14=0xb
-phy_xaui_tx_polarity_flip_14=0x3
-serdes_driver_current_lane0_xe13=0x2
-serdes_driver_current_lane1_xe13=0x2
-serdes_driver_current_lane2_xe13=0x2
-serdes_driver_current_lane3_xe13=0x2
-serdes_pre_driver_current_lane0_xe13=0x2
-serdes_pre_driver_current_lane1_xe13=0x2
-serdes_pre_driver_current_lane2_xe13=0x2
-serdes_pre_driver_current_lane3_xe13=0x2
-serdes_preemphasis_lane0_xe13=0xa760
-serdes_preemphasis_lane1_xe13=0xa760
-serdes_preemphasis_lane2_xe13=0xa760
-serdes_preemphasis_lane3_xe13=0xa760
-
-# xe14 (40G)
-portmap_15=57:40
-xgxs_rx_lane_map_15=0x213
-xgxs_tx_lane_map_15=0x2031
-phy_xaui_rx_polarity_flip_15=0x1
-phy_xaui_tx_polarity_flip_15=0x0
-serdes_driver_current_lane0_xe14=0x1
-serdes_driver_current_lane1_xe14=0x1
-serdes_driver_current_lane2_xe14=0x1
-serdes_driver_current_lane3_xe14=0x1
-serdes_pre_driver_current_lane0_xe14=0x1
-serdes_pre_driver_current_lane1_xe14=0x1
-serdes_pre_driver_current_lane2_xe14=0x1
-serdes_pre_driver_current_lane3_xe14=0x1
-serdes_preemphasis_lane0_xe14=0xa760
-serdes_preemphasis_lane1_xe14=0xa760
-serdes_preemphasis_lane2_xe14=0xa760
-serdes_preemphasis_lane3_xe14=0xa760
-
-# xe15 (40G)
-portmap_16=61:40
-xgxs_rx_lane_map_16=0x132
-xgxs_tx_lane_map_16=0x213
-phy_xaui_rx_polarity_flip_16=0x0
-phy_xaui_tx_polarity_flip_16=0x0
-serdes_driver_current_lane0_xe15=0x2
-serdes_driver_current_lane1_xe15=0x2
-serdes_driver_current_lane2_xe15=0x2
-serdes_driver_current_lane3_xe15=0x2
-serdes_pre_driver_current_lane0_xe15=0x2
-serdes_pre_driver_current_lane1_xe15=0x2
-serdes_pre_driver_current_lane2_xe15=0x2
-serdes_pre_driver_current_lane3_xe15=0x2
-serdes_preemphasis_lane0_xe15=0xa760
-serdes_preemphasis_lane1_xe15=0xa760
-serdes_preemphasis_lane2_xe15=0xa760
-serdes_preemphasis_lane3_xe15=0xa760
-
-# xe16 (40G)
-portmap_17=69:40
-xgxs_rx_lane_map_17=0x213
-xgxs_tx_lane_map_17=0x2130
-phy_xaui_rx_polarity_flip_17=0x1
-phy_xaui_tx_polarity_flip_17=0xf
-serdes_driver_current_lane0_xe16=0x1
-serdes_driver_current_lane1_xe16=0x1
-serdes_driver_current_lane2_xe16=0x1
-serdes_driver_current_lane3_xe16=0x1
-serdes_pre_driver_current_lane0_xe16=0x1
-serdes_pre_driver_current_lane1_xe16=0x1
-serdes_pre_driver_current_lane2_xe16=0x1
-serdes_pre_driver_current_lane3_xe16=0x1
-serdes_preemphasis_lane0_xe16=0xa760
-serdes_preemphasis_lane1_xe16=0xa760
-serdes_preemphasis_lane2_xe16=0xa760
-serdes_preemphasis_lane3_xe16=0xa760
-
-# xe17 (40G)
-portmap_18=65:40
-xgxs_rx_lane_map_18=0x132
-xgxs_tx_lane_map_18=0x2031
-phy_xaui_rx_polarity_flip_18=0x3
-phy_xaui_tx_polarity_flip_18=0x9
-serdes_driver_current_lane0_xe17=0x1
-serdes_driver_current_lane1_xe17=0x1
-serdes_driver_current_lane2_xe17=0x1
-serdes_driver_current_lane3_xe17=0x1
-serdes_pre_driver_current_lane0_xe17=0x1
-serdes_pre_driver_current_lane1_xe17=0x1
-serdes_pre_driver_current_lane2_xe17=0x1
-serdes_pre_driver_current_lane3_xe17=0x1
-serdes_preemphasis_lane0_xe17=0xa370
-serdes_preemphasis_lane1_xe17=0xa370
-serdes_preemphasis_lane2_xe17=0xa370
-serdes_preemphasis_lane3_xe17=0xa370
-
-# xe18 (40G)
-portmap_19=73:40
-xgxs_rx_lane_map_19=0x213
-xgxs_tx_lane_map_19=0x2031
-phy_xaui_rx_polarity_flip_19=0x1
-phy_xaui_tx_polarity_flip_19=0x0
-serdes_driver_current_lane0_xe18=0x2
-serdes_driver_current_lane1_xe18=0x2
-serdes_driver_current_lane2_xe18=0x2
-serdes_driver_current_lane3_xe18=0x2
-serdes_pre_driver_current_lane0_xe18=0x2
-serdes_pre_driver_current_lane1_xe18=0x2
-serdes_pre_driver_current_lane2_xe18=0x2
-serdes_pre_driver_current_lane3_xe18=0x2
-serdes_preemphasis_lane0_xe18=0xa760
-serdes_preemphasis_lane1_xe18=0xa760
-serdes_preemphasis_lane2_xe18=0xa760
-serdes_preemphasis_lane3_xe18=0xa760
-
-# xe19 (40G)
-portmap_20=77:40
-xgxs_rx_lane_map_20=0x123
-xgxs_tx_lane_map_20=0x1203
-phy_xaui_rx_polarity_flip_20=0x3
-phy_xaui_tx_polarity_flip_20=0xe
-serdes_driver_current_lane0_xe19=0x2
-serdes_driver_current_lane1_xe19=0x2
-serdes_driver_current_lane2_xe19=0x2
-serdes_driver_current_lane3_xe19=0x2
-serdes_pre_driver_current_lane0_xe19=0x2
-serdes_pre_driver_current_lane1_xe19=0x2
-serdes_pre_driver_current_lane2_xe19=0x2
-serdes_pre_driver_current_lane3_xe19=0x2
-serdes_preemphasis_lane0_xe19=0xaf40
-serdes_preemphasis_lane1_xe19=0xaf40
-serdes_preemphasis_lane2_xe19=0xaf40
-serdes_preemphasis_lane3_xe19=0xaf40
-
-# xe20 (40G)
-portmap_21=109:40
-xgxs_rx_lane_map_21=0x132
-xgxs_tx_lane_map_21=0x132
-phy_xaui_rx_polarity_flip_21=0x8
-phy_xaui_tx_polarity_flip_21=0x0
-serdes_driver_current_lane0_xe20=0x1
-serdes_driver_current_lane1_xe20=0x1
-serdes_driver_current_lane2_xe20=0x1
-serdes_driver_current_lane3_xe20=0x2
-serdes_pre_driver_current_lane0_xe20=0x1
-serdes_pre_driver_current_lane1_xe20=0x1
-serdes_pre_driver_current_lane2_xe20=0x1
-serdes_pre_driver_current_lane3_xe20=0x2
-serdes_preemphasis_lane0_xe20=0xb330
-serdes_preemphasis_lane1_xe20=0xb330
-serdes_preemphasis_lane2_xe20=0xb330
-serdes_preemphasis_lane3_xe20=0xbff0
-
-# xe21 (40G)
-portmap_22=105:40
-xgxs_rx_lane_map_22=0x1320
-xgxs_tx_lane_map_22=0x3021
-phy_xaui_rx_polarity_flip_22=0xd
-phy_xaui_tx_polarity_flip_22=0xb
-serdes_driver_current_lane0_xe21=0x1
-serdes_driver_current_lane1_xe21=0x1
-serdes_driver_current_lane2_xe21=0x1
-serdes_driver_current_lane3_xe21=0x1
-serdes_pre_driver_current_lane0_xe21=0x1
-serdes_pre_driver_current_lane1_xe21=0x1
-serdes_pre_driver_current_lane2_xe21=0x1
-serdes_pre_driver_current_lane3_xe21=0x1
-serdes_preemphasis_lane0_xe21=0xb330
-serdes_preemphasis_lane1_xe21=0xb330
-serdes_preemphasis_lane2_xe21=0xb330
-serdes_preemphasis_lane3_xe21=0xb330
-
-# xe22 (40G)
-portmap_23=113:40
-xgxs_rx_lane_map_23=0x132
-xgxs_tx_lane_map_23=0x132
-phy_xaui_rx_polarity_flip_23=0x8
-phy_xaui_tx_polarity_flip_23=0x0
-serdes_driver_current_lane0_xe22=0x1
-serdes_driver_current_lane1_xe22=0x1
-serdes_driver_current_lane2_xe22=0x1
-serdes_driver_current_lane3_xe22=0x1
-serdes_pre_driver_current_lane0_xe22=0x1
-serdes_pre_driver_current_lane1_xe22=0x1
-serdes_pre_driver_current_lane2_xe22=0x1
-serdes_pre_driver_current_lane3_xe22=0x1
-serdes_preemphasis_lane0_xe22=0xbb10
-serdes_preemphasis_lane1_xe22=0xbb10
-serdes_preemphasis_lane2_xe22=0xbb10
-serdes_preemphasis_lane3_xe22=0xc2f0
-
-# xe23 (40G)
-portmap_24=117:40
-xgxs_rx_lane_map_24=0x231
-xgxs_tx_lane_map_24=0x1203
-phy_xaui_rx_polarity_flip_24=0x3
-phy_xaui_tx_polarity_flip_24=0xe
-serdes_driver_current_lane0_xe23=0x3
-serdes_driver_current_lane1_xe23=0x5
-serdes_driver_current_lane2_xe23=0x3
-serdes_driver_current_lane3_xe23=0x3
-serdes_pre_driver_current_lane0_xe23=0x3
-serdes_pre_driver_current_lane1_xe23=0x5
-serdes_pre_driver_current_lane2_xe23=0x3
-serdes_pre_driver_current_lane3_xe23=0x3
-serdes_preemphasis_lane0_xe23=0xc6e0
-serdes_preemphasis_lane1_xe23=0xc6e0
-serdes_preemphasis_lane2_xe23=0xc6e0
-serdes_preemphasis_lane3_xe23=0xc6e0
-
-# xe24 (40G)
-portmap_25=125:40
-xgxs_rx_lane_map_25=0x132
-xgxs_tx_lane_map_25=0x132
-phy_xaui_rx_polarity_flip_25=0x8
-phy_xaui_tx_polarity_flip_25=0x0
-serdes_driver_current_lane0_xe24=0x4
-serdes_driver_current_lane1_xe24=0x4
-serdes_driver_current_lane2_xe24=0x4
-serdes_driver_current_lane3_xe24=0x4
-serdes_pre_driver_current_lane0_xe24=0x4
-serdes_pre_driver_current_lane1_xe24=0x4
-serdes_pre_driver_current_lane2_xe24=0x4
-serdes_pre_driver_current_lane3_xe24=0x4
-serdes_preemphasis_lane0_xe24=0xc6e0
-serdes_preemphasis_lane1_xe24=0xc6e0
-serdes_preemphasis_lane2_xe24=0xc6e0
-serdes_preemphasis_lane3_xe24=0xcec0
-
-# xe25 (40G)
-portmap_26=121:40
-xgxs_rx_lane_map_26=0x1320
-xgxs_tx_lane_map_26=0x3021
-phy_xaui_rx_polarity_flip_26=0xd
-phy_xaui_tx_polarity_flip_26=0xb
-serdes_driver_current_lane0_xe25=0x4
-serdes_driver_current_lane1_xe25=0x4
-serdes_driver_current_lane2_xe25=0x4
-serdes_driver_current_lane3_xe25=0x4
-serdes_pre_driver_current_lane0_xe25=0x4
-serdes_pre_driver_current_lane1_xe25=0x4
-serdes_pre_driver_current_lane2_xe25=0x4
-serdes_pre_driver_current_lane3_xe25=0x4
-serdes_preemphasis_lane0_xe25=0xc6e0
-serdes_preemphasis_lane1_xe25=0xc6e0
-serdes_preemphasis_lane2_xe25=0xc6e0
-serdes_preemphasis_lane3_xe25=0xc6e0
-
-# xe26 (40G)
-portmap_27=81:40
-xgxs_rx_lane_map_27=0x1320
-xgxs_tx_lane_map_27=0x2031
-phy_xaui_rx_polarity_flip_27=0x1
-phy_xaui_tx_polarity_flip_27=0x2
-serdes_driver_current_lane0_xe26=0x2
-serdes_driver_current_lane1_xe26=0x2
-serdes_driver_current_lane2_xe26=0x2
-serdes_driver_current_lane3_xe26=0x2
-serdes_pre_driver_current_lane0_xe26=0x2
-serdes_pre_driver_current_lane1_xe26=0x2
-serdes_pre_driver_current_lane2_xe26=0x2
-serdes_pre_driver_current_lane3_xe26=0x2
-serdes_preemphasis_lane0_xe26=0xbb10
-serdes_preemphasis_lane1_xe26=0xbb10
-serdes_preemphasis_lane2_xe26=0xbf00
-serdes_preemphasis_lane3_xe26=0xbb10
-
-# xe27 (40G)
-portmap_28=85:40
-xgxs_rx_lane_map_28=0x213
-xgxs_tx_lane_map_28=0x1203
-phy_xaui_rx_polarity_flip_28=0xc
-phy_xaui_tx_polarity_flip_28=0xe
-serdes_driver_current_lane0_xe27=0x4
-serdes_driver_current_lane1_xe27=0x5
-serdes_driver_current_lane2_xe27=0x4
-serdes_driver_current_lane3_xe27=0x5
-serdes_pre_driver_current_lane0_xe27=0x4
-serdes_pre_driver_current_lane1_xe27=0x5
-serdes_pre_driver_current_lane2_xe27=0x4
-serdes_pre_driver_current_lane3_xe27=0x5
-serdes_preemphasis_lane0_xe27=0xc2f0
-serdes_preemphasis_lane1_xe27=0xc6e0
-serdes_preemphasis_lane2_xe27=0xc6e0
-serdes_preemphasis_lane3_xe27=0xc6e0
-
-# xe28 (40G)
-portmap_29=93:40
-xgxs_rx_lane_map_29=0x1320
-xgxs_tx_lane_map_29=0x2031
-phy_xaui_rx_polarity_flip_29=0x1
-phy_xaui_tx_polarity_flip_29=0x2
-serdes_driver_current_lane0_xe28=0x4
-serdes_driver_current_lane1_xe28=0x4
-serdes_driver_current_lane2_xe28=0x4
-serdes_driver_current_lane3_xe28=0x4
-serdes_pre_driver_current_lane0_xe28=0x4
-serdes_pre_driver_current_lane1_xe28=0x4
-serdes_pre_driver_current_lane2_xe28=0x4
-serdes_pre_driver_current_lane3_xe28=0x4
-serdes_preemphasis_lane0_xe28=0xc2f0
-serdes_preemphasis_lane1_xe28=0xc2f0
-serdes_preemphasis_lane2_xe28=0xc2f0
-serdes_preemphasis_lane3_xe28=0xc2f0
-
-# xe29 (40G)
-portmap_30=89:40
-xgxs_rx_lane_map_30=0x1320
-xgxs_tx_lane_map_30=0x3021
-phy_xaui_rx_polarity_flip_30=0x2
-phy_xaui_tx_polarity_flip_30=0xb
-serdes_driver_current_lane0_xe29=0x4
-serdes_driver_current_lane1_xe29=0x4
-serdes_driver_current_lane2_xe29=0x4
-serdes_driver_current_lane3_xe29=0x4
-serdes_pre_driver_current_lane0_xe29=0x4
-serdes_pre_driver_current_lane1_xe29=0x4
-serdes_pre_driver_current_lane2_xe29=0x4
-serdes_pre_driver_current_lane3_xe29=0x4
-serdes_preemphasis_lane0_xe29=0xcad0
-serdes_preemphasis_lane1_xe29=0xc6e0
-serdes_preemphasis_lane2_xe29=0xc6e0
-serdes_preemphasis_lane3_xe29=0xc6e0
-
-# xe30 (40G)
-portmap_31=101:40
-xgxs_rx_lane_map_31=0x1320
-xgxs_tx_lane_map_31=0x1203
-phy_xaui_rx_polarity_flip_31=0x1
-phy_xaui_tx_polarity_flip_31=0x6
-serdes_driver_current_lane0_xe30=0x6
-serdes_driver_current_lane1_xe30=0x6
-serdes_driver_current_lane2_xe30=0x6
-serdes_driver_current_lane3_xe30=0x7
-serdes_pre_driver_current_lane0_xe30=0x6
-serdes_pre_driver_current_lane1_xe30=0x6
-serdes_pre_driver_current_lane2_xe30=0x6
-serdes_pre_driver_current_lane3_xe30=0x7
-serdes_preemphasis_lane0_xe30=0xcec0
-serdes_preemphasis_lane1_xe30=0xcec0
-serdes_preemphasis_lane2_xe30=0xcad0
-serdes_preemphasis_lane3_xe30=0xc6e0
-
-# xe31 (40G)
-portmap_32=97:40
-xgxs_rx_lane_map_32=0x213
-xgxs_tx_lane_map_32=0x2031
-phy_xaui_rx_polarity_flip_32=0xc
-phy_xaui_tx_polarity_flip_32=0x3
-serdes_driver_current_lane0_xe31=0x5
-serdes_driver_current_lane1_xe31=0x5
-serdes_driver_current_lane2_xe31=0x5
-serdes_driver_current_lane3_xe31=0x5
-serdes_pre_driver_current_lane0_xe31=0x5
-serdes_pre_driver_current_lane1_xe31=0x5
-serdes_pre_driver_current_lane2_xe31=0x5
-serdes_pre_driver_current_lane3_xe31=0x5
-serdes_preemphasis_lane0_xe31=0xcad0
-serdes_preemphasis_lane1_xe31=0xcad0
-serdes_preemphasis_lane2_xe31=0xcad0
-serdes_preemphasis_lane3_xe31=0xcad0
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/2/buffers.json.j2 b/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/2/buffers.json.j2
deleted file mode 100644
index b67cf577ab75..000000000000
--- a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/2/buffers.json.j2
+++ /dev/null
@@ -1,3 +0,0 @@
-{%- set default_topo = 't1' %}
-{%- include 'buffers_config.j2' %}
-
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/2/buffers_defaults_def.j2 b/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/2/buffers_defaults_def.j2
deleted file mode 100644
index 38e34eb571e8..000000000000
--- a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/2/buffers_defaults_def.j2
+++ /dev/null
@@ -1,45 +0,0 @@
-{%- set default_cable = '300m' %}
-
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {% for port_idx in range(0,32) %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
-    {% endfor %}
-{%- endmacro %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "12766208",
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "12766208",
-            "type": "egress",
-            "mode": "static"
-        },
-        "egress_lossy_pool": {
-            "size": "7326924",
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "static_th":"12766208"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"1518",
-            "dynamic_th":"3"
-        }
-    },
-{%- endmacro %}
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/2/buffers_defaults_t0.j2 b/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/2/buffers_defaults_t0.j2
deleted file mode 100644
index 38e34eb571e8..000000000000
--- a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/2/buffers_defaults_t0.j2
+++ /dev/null
@@ -1,45 +0,0 @@
-{%- set default_cable = '300m' %}
-
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {% for port_idx in range(0,32) %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
-    {% endfor %}
-{%- endmacro %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "12766208",
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "12766208",
-            "type": "egress",
-            "mode": "static"
-        },
-        "egress_lossy_pool": {
-            "size": "7326924",
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "static_th":"12766208"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"1518",
-            "dynamic_th":"3"
-        }
-    },
-{%- endmacro %}
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/2/buffers_defaults_t1.j2 b/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/2/buffers_defaults_t1.j2
deleted file mode 100644
index 38e34eb571e8..000000000000
--- a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/2/buffers_defaults_t1.j2
+++ /dev/null
@@ -1,45 +0,0 @@
-{%- set default_cable = '300m' %}
-
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {% for port_idx in range(0,32) %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
-    {% endfor %}
-{%- endmacro %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "12766208",
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "12766208",
-            "type": "egress",
-            "mode": "static"
-        },
-        "egress_lossy_pool": {
-            "size": "7326924",
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "static_th":"12766208"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"1518",
-            "dynamic_th":"3"
-        }
-    },
-{%- endmacro %}
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/2/pg_profile_lookup.ini b/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/2/pg_profile_lookup.ini
deleted file mode 100644
index 9f2eacb6fc42..000000000000
--- a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/2/pg_profile_lookup.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-# PG lossless profiles.
-# speed cable size      xon     xoff   threshold xon_offset
-  10000  5m   56368     18432   55120  -3        2496
-  25000  5m   56368     18432   55120  -3        2496
-  40000  5m   56368     18432   55120  -3        2496
-  50000  5m   56368     18432   55120  -3        2496
- 100000  5m   56368     18432   55120  -3        2496
-  10000  40m  56368     18432   55120  -3        2496
-  25000  40m  56368     18432   55120  -3        2496
-  40000  40m  56368     18432   55120  -3        2496
-  50000  40m  56368     18432   55120  -3        2496
- 100000  40m  56368     18432   55120  -3        2496
-  10000  300m 56368     18432   55120  -3        2496
-  25000  300m 56368     18432   55120  -3        2496
-  40000  300m 56368     18432   55120  -3        2496
-  50000  300m 56368     18432   55120  -3        2496
- 100000  300m 56368     18432   55120  -3        2496
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/2/qos.json.j2 b/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/2/qos.json.j2
deleted file mode 100644
index 3e548325ea30..000000000000
--- a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/2/qos.json.j2
+++ /dev/null
@@ -1 +0,0 @@
-{%- include 'qos_config.j2' %}
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/2/sai.profile b/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/2/sai.profile
deleted file mode 100644
index 0a2df177f1c5..000000000000
--- a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/2/sai.profile
+++ /dev/null
@@ -1,3 +0,0 @@
-SAI_VS_SWITCH_TYPE=SAI_VS_SWITCH_TYPE_BCM56850
-SAI_VS_HOSTIF_USE_TAP_DEVICE=true
-SAI_VS_INTERFACE_LANE_MAP_FILE=/usr/share/sonic/hwsku/lanemap.ini
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/2/td2-s6000-32x40G.config.bcm b/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/2/td2-s6000-32x40G.config.bcm
deleted file mode 100644
index 0e25b4d4232d..000000000000
--- a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/2/td2-s6000-32x40G.config.bcm
+++ /dev/null
@@ -1,646 +0,0 @@
-# Old LPM only configuration
-# l2_mem_entries=163840
-# l3_mem_entries=90112
-# l3_alpm_enable=0
-# ipv6_lpm_128b_enable=0
-#
-# ALPM enable
-l3_alpm_enable=2
-ipv6_lpm_128b_enable=1
-l2_mem_entries=32768
-l3_mem_entries=16384
-
-# From old config file
-os=unix
-higig2_hdr_mode=1
-
-# Parity
-parity_correction=1
-parity_enable=1
-stat_if_parity_enable=0
-
-#
-bcm_num_cos=10
-bcm_stat_interval=2000000
-l2xmsg_hostbuf_size=8192
-l2xmsg_mode=1
-lls_num_l2uc=12
-max_vp_lags=0
-miim_intr_enable=0
-mmu_lossless=0
-module_64ports=0
-schan_intr_enable=0
-stable_size=0x2000000
-tdma_timeout_usec=5000000
-
-pbmp_oversubscribe=0x000007fffffffffffffffffffffffffe
-pbmp_xport_xe=0x000007fffffffffffffffffffffffffe
-
-# Ports configuration
-# xe0 (40G)
-portmap_1=25:40
-xgxs_rx_lane_map_1=0x213
-xgxs_tx_lane_map_1=0x2031
-phy_xaui_rx_polarity_flip_1=0xe
-phy_xaui_tx_polarity_flip_1=0x2
-serdes_driver_current_lane0_xe0=0x5
-serdes_driver_current_lane1_xe0=0x5
-serdes_driver_current_lane2_xe0=0x5
-serdes_driver_current_lane3_xe0=0x5
-serdes_pre_driver_current_lane0_xe0=0x5
-serdes_pre_driver_current_lane1_xe0=0x5
-serdes_pre_driver_current_lane2_xe0=0x5
-serdes_pre_driver_current_lane3_xe0=0x5
-serdes_preemphasis_lane0_xe0=0xcad0
-serdes_preemphasis_lane1_xe0=0xc6e0
-serdes_preemphasis_lane2_xe0=0xc6e0
-serdes_preemphasis_lane3_xe0=0xd2b0
-
-# xe1 (40G)
-portmap_2=29:40
-xgxs_rx_lane_map_2=0x213
-xgxs_tx_lane_map_2=0x213
-phy_xaui_rx_polarity_flip_2=0xc
-phy_xaui_tx_polarity_flip_2=0x9
-serdes_driver_current_lane0_xe1=0x6
-serdes_driver_current_lane1_xe1=0x7
-serdes_driver_current_lane2_xe1=0x6
-serdes_driver_current_lane3_xe1=0x6
-serdes_pre_driver_current_lane0_xe1=0x6
-serdes_pre_driver_current_lane1_xe1=0x7
-serdes_pre_driver_current_lane2_xe1=0x6
-serdes_pre_driver_current_lane3_xe1=0x6
-serdes_preemphasis_lane0_xe1=0xc2f0
-serdes_preemphasis_lane1_xe1=0xd2b0
-serdes_preemphasis_lane2_xe1=0xc6e0
-serdes_preemphasis_lane3_xe1=0xc2f0
-
-# xe2 (40G)
-portmap_3=33:40
-xgxs_rx_lane_map_3=0x213
-xgxs_tx_lane_map_3=0x132
-phy_xaui_rx_polarity_flip_3=0xe
-phy_xaui_tx_polarity_flip_3=0x2
-serdes_driver_current_lane0_xe2=0x4
-serdes_driver_current_lane1_xe2=0x4
-serdes_driver_current_lane2_xe2=0x4
-serdes_driver_current_lane3_xe2=0x4
-serdes_pre_driver_current_lane0_xe2=0x4
-serdes_pre_driver_current_lane1_xe2=0x4
-serdes_pre_driver_current_lane2_xe2=0x4
-serdes_pre_driver_current_lane3_xe2=0x4
-serdes_preemphasis_lane0_xe2=0xc6e0
-serdes_preemphasis_lane1_xe2=0xc6e0
-serdes_preemphasis_lane2_xe2=0xc6e0
-serdes_preemphasis_lane3_xe2=0xc6e0
-
-# xe3 (40G)
-portmap_4=37:40
-xgxs_rx_lane_map_4=0x213
-xgxs_tx_lane_map_4=0x1203
-phy_xaui_rx_polarity_flip_4=0x3
-phy_xaui_tx_polarity_flip_4=0xe
-serdes_driver_current_lane0_xe3=0x4
-serdes_driver_current_lane1_xe3=0x4
-serdes_driver_current_lane2_xe3=0x4
-serdes_driver_current_lane3_xe3=0x4
-serdes_pre_driver_current_lane0_xe3=0x4
-serdes_pre_driver_current_lane1_xe3=0x4
-serdes_pre_driver_current_lane2_xe3=0x4
-serdes_pre_driver_current_lane3_xe3=0x4
-serdes_preemphasis_lane0_xe3=0xcad0
-serdes_preemphasis_lane1_xe3=0xcad0
-serdes_preemphasis_lane2_xe3=0xc2f0
-serdes_preemphasis_lane3_xe3=0xc2f0
-
-# xe4 (40G)
-portmap_5=45:40
-xgxs_rx_lane_map_5=0x213
-xgxs_tx_lane_map_5=0x213
-phy_xaui_rx_polarity_flip_5=0xe
-phy_xaui_tx_polarity_flip_5=0x8
-serdes_driver_current_lane0_xe4=0x4
-serdes_driver_current_lane1_xe4=0x4
-serdes_driver_current_lane2_xe4=0x4
-serdes_driver_current_lane3_xe4=0x4
-serdes_pre_driver_current_lane0_xe4=0x4
-serdes_pre_driver_current_lane1_xe4=0x4
-serdes_pre_driver_current_lane2_xe4=0x4
-serdes_pre_driver_current_lane3_xe4=0x4
-serdes_preemphasis_lane0_xe4=0xc2f0
-serdes_preemphasis_lane1_xe4=0xc2f0
-serdes_preemphasis_lane2_xe4=0xc2f0
-serdes_preemphasis_lane3_xe4=0xc2f0
-
-# xe5 (40G)
-portmap_6=41:40
-xgxs_rx_lane_map_6=0x213
-xgxs_tx_lane_map_6=0x3021
-phy_xaui_rx_polarity_flip_6=0x3
-phy_xaui_tx_polarity_flip_6=0xb
-serdes_driver_current_lane0_xe5=0x4
-serdes_driver_current_lane1_xe5=0x4
-serdes_driver_current_lane2_xe5=0x4
-serdes_driver_current_lane3_xe5=0x4
-serdes_pre_driver_current_lane0_xe5=0x4
-serdes_pre_driver_current_lane1_xe5=0x4
-serdes_pre_driver_current_lane2_xe5=0x4
-serdes_pre_driver_current_lane3_xe5=0x4
-serdes_preemphasis_lane0_xe5=0xc6e0
-serdes_preemphasis_lane1_xe5=0xc2f0
-serdes_preemphasis_lane2_xe5=0xc2f0
-serdes_preemphasis_lane3_xe5=0xcad0
-
-# xe6 (40G)
-portmap_7=1:40
-xgxs_rx_lane_map_7=0x213
-xgxs_tx_lane_map_7=0x2031
-phy_xaui_rx_polarity_flip_7=0xe
-phy_xaui_tx_polarity_flip_7=0xd
-serdes_driver_current_lane0_xe6=0x5
-serdes_driver_current_lane1_xe6=0x5
-serdes_driver_current_lane2_xe6=0x5
-serdes_driver_current_lane3_xe6=0x5
-serdes_pre_driver_current_lane0_xe6=0x5
-serdes_pre_driver_current_lane1_xe6=0x5
-serdes_pre_driver_current_lane2_xe6=0x5
-serdes_pre_driver_current_lane3_xe6=0x5
-serdes_preemphasis_lane0_xe6=0xc6e0
-serdes_preemphasis_lane1_xe6=0xcad0
-serdes_preemphasis_lane2_xe6=0xc6e0
-serdes_preemphasis_lane3_xe6=0xcad0
-
-# xe7 (40G)
-portmap_8=5:40
-xgxs_rx_lane_map_8=0x213
-xgxs_tx_lane_map_8=0x1203
-phy_xaui_rx_polarity_flip_8=0xc
-phy_xaui_tx_polarity_flip_8=0x1
-serdes_driver_current_lane0_xe7=0x4
-serdes_driver_current_lane1_xe7=0x4
-serdes_driver_current_lane2_xe7=0x4
-serdes_driver_current_lane3_xe7=0x4
-serdes_pre_driver_current_lane0_xe7=0x4
-serdes_pre_driver_current_lane1_xe7=0x4
-serdes_pre_driver_current_lane2_xe7=0x4
-serdes_pre_driver_current_lane3_xe7=0x4
-serdes_preemphasis_lane0_xe7=0xc6e0
-serdes_preemphasis_lane1_xe7=0xc6e0
-serdes_preemphasis_lane2_xe7=0xc6e0
-serdes_preemphasis_lane3_xe7=0xc6e0
-
-# xe8 (40G)
-portmap_9=13:40
-xgxs_rx_lane_map_9=0x213
-xgxs_tx_lane_map_9=0x132
-phy_xaui_rx_polarity_flip_9=0xe
-phy_xaui_tx_polarity_flip_9=0x0
-serdes_driver_current_lane0_xe8=0x2
-serdes_driver_current_lane1_xe8=0x3
-serdes_driver_current_lane2_xe8=0x2
-serdes_driver_current_lane3_xe8=0x2
-serdes_pre_driver_current_lane0_xe8=0x2
-serdes_pre_driver_current_lane1_xe8=0x3
-serdes_pre_driver_current_lane2_xe8=0x2
-serdes_pre_driver_current_lane3_xe8=0x2
-serdes_preemphasis_lane0_xe8=0xb270
-serdes_preemphasis_lane1_xe8=0xbb10
-serdes_preemphasis_lane2_xe8=0xb720
-serdes_preemphasis_lane3_xe8=0xb720
-
-# xe9 (40G)
-portmap_10=9:40
-xgxs_rx_lane_map_10=0x3120
-xgxs_tx_lane_map_10=0x3021
-phy_xaui_rx_polarity_flip_10=0x0
-phy_xaui_tx_polarity_flip_10=0x4
-serdes_driver_current_lane0_xe9=0x3
-serdes_driver_current_lane1_xe9=0x3
-serdes_driver_current_lane2_xe9=0x3
-serdes_driver_current_lane3_xe9=0x3
-serdes_pre_driver_current_lane0_xe9=0x3
-serdes_pre_driver_current_lane1_xe9=0x3
-serdes_pre_driver_current_lane2_xe9=0x3
-serdes_pre_driver_current_lane3_xe9=0x3
-serdes_preemphasis_lane0_xe9=0xc2f0
-serdes_preemphasis_lane1_xe9=0xc6e0
-serdes_preemphasis_lane2_xe9=0xbf00
-serdes_preemphasis_lane3_xe9=0xc2f0
-
-# xe10 (40G)
-portmap_11=17:40
-xgxs_rx_lane_map_11=0x213
-xgxs_tx_lane_map_11=0x132
-phy_xaui_rx_polarity_flip_11=0xe
-phy_xaui_tx_polarity_flip_11=0x0
-serdes_driver_current_lane0_xe10=0x2
-serdes_driver_current_lane1_xe10=0x2
-serdes_driver_current_lane2_xe10=0x2
-serdes_driver_current_lane3_xe10=0x2
-serdes_pre_driver_current_lane0_xe10=0x2
-serdes_pre_driver_current_lane1_xe10=0x2
-serdes_pre_driver_current_lane2_xe10=0x2
-serdes_pre_driver_current_lane3_xe10=0x2
-serdes_preemphasis_lane0_xe10=0xb330
-serdes_preemphasis_lane1_xe10=0xbb10
-serdes_preemphasis_lane2_xe10=0xbb10
-serdes_preemphasis_lane3_xe10=0xbb10
-
-# xe11 (40G)
-portmap_12=21:40
-xgxs_rx_lane_map_12=0x123
-xgxs_tx_lane_map_12=0x1203
-phy_xaui_rx_polarity_flip_12=0xc
-phy_xaui_tx_polarity_flip_12=0xe
-serdes_driver_current_lane0_xe11=0x2
-serdes_driver_current_lane1_xe11=0x2
-serdes_driver_current_lane2_xe11=0x2
-serdes_driver_current_lane3_xe11=0x2
-serdes_pre_driver_current_lane0_xe11=0x2
-serdes_pre_driver_current_lane1_xe11=0x2
-serdes_pre_driver_current_lane2_xe11=0x2
-serdes_pre_driver_current_lane3_xe11=0x2
-serdes_preemphasis_lane0_xe11=0xb330
-serdes_preemphasis_lane1_xe11=0xb330
-serdes_preemphasis_lane2_xe11=0xb330
-serdes_preemphasis_lane3_xe11=0xb330
-
-# xe12 (40G)
-portmap_13=53:40
-xgxs_rx_lane_map_13=0x213
-xgxs_tx_lane_map_13=0x231
-phy_xaui_rx_polarity_flip_13=0x1
-phy_xaui_tx_polarity_flip_13=0x0
-serdes_driver_current_lane0_xe12=0x2
-serdes_driver_current_lane1_xe12=0x2
-serdes_driver_current_lane2_xe12=0x2
-serdes_driver_current_lane3_xe12=0x2
-serdes_pre_driver_current_lane0_xe12=0x2
-serdes_pre_driver_current_lane1_xe12=0x2
-serdes_pre_driver_current_lane2_xe12=0x2
-serdes_pre_driver_current_lane3_xe12=0x2
-serdes_preemphasis_lane0_xe12=0xaf40
-serdes_preemphasis_lane1_xe12=0xaf40
-serdes_preemphasis_lane2_xe12=0xaf40
-serdes_preemphasis_lane3_xe12=0xaf40
-
-# xe13 (40G)
-portmap_14=49:40
-xgxs_rx_lane_map_14=0x1302
-xgxs_tx_lane_map_14=0x2031
-phy_xaui_rx_polarity_flip_14=0xb
-phy_xaui_tx_polarity_flip_14=0x3
-serdes_driver_current_lane0_xe13=0x2
-serdes_driver_current_lane1_xe13=0x2
-serdes_driver_current_lane2_xe13=0x2
-serdes_driver_current_lane3_xe13=0x2
-serdes_pre_driver_current_lane0_xe13=0x2
-serdes_pre_driver_current_lane1_xe13=0x2
-serdes_pre_driver_current_lane2_xe13=0x2
-serdes_pre_driver_current_lane3_xe13=0x2
-serdes_preemphasis_lane0_xe13=0xa760
-serdes_preemphasis_lane1_xe13=0xa760
-serdes_preemphasis_lane2_xe13=0xa760
-serdes_preemphasis_lane3_xe13=0xa760
-
-# xe14 (40G)
-portmap_15=57:40
-xgxs_rx_lane_map_15=0x213
-xgxs_tx_lane_map_15=0x2031
-phy_xaui_rx_polarity_flip_15=0x1
-phy_xaui_tx_polarity_flip_15=0x0
-serdes_driver_current_lane0_xe14=0x1
-serdes_driver_current_lane1_xe14=0x1
-serdes_driver_current_lane2_xe14=0x1
-serdes_driver_current_lane3_xe14=0x1
-serdes_pre_driver_current_lane0_xe14=0x1
-serdes_pre_driver_current_lane1_xe14=0x1
-serdes_pre_driver_current_lane2_xe14=0x1
-serdes_pre_driver_current_lane3_xe14=0x1
-serdes_preemphasis_lane0_xe14=0xa760
-serdes_preemphasis_lane1_xe14=0xa760
-serdes_preemphasis_lane2_xe14=0xa760
-serdes_preemphasis_lane3_xe14=0xa760
-
-# xe15 (40G)
-portmap_16=61:40
-xgxs_rx_lane_map_16=0x132
-xgxs_tx_lane_map_16=0x213
-phy_xaui_rx_polarity_flip_16=0x0
-phy_xaui_tx_polarity_flip_16=0x0
-serdes_driver_current_lane0_xe15=0x2
-serdes_driver_current_lane1_xe15=0x2
-serdes_driver_current_lane2_xe15=0x2
-serdes_driver_current_lane3_xe15=0x2
-serdes_pre_driver_current_lane0_xe15=0x2
-serdes_pre_driver_current_lane1_xe15=0x2
-serdes_pre_driver_current_lane2_xe15=0x2
-serdes_pre_driver_current_lane3_xe15=0x2
-serdes_preemphasis_lane0_xe15=0xa760
-serdes_preemphasis_lane1_xe15=0xa760
-serdes_preemphasis_lane2_xe15=0xa760
-serdes_preemphasis_lane3_xe15=0xa760
-
-# xe16 (40G)
-portmap_17=69:40
-xgxs_rx_lane_map_17=0x213
-xgxs_tx_lane_map_17=0x2130
-phy_xaui_rx_polarity_flip_17=0x1
-phy_xaui_tx_polarity_flip_17=0xf
-serdes_driver_current_lane0_xe16=0x1
-serdes_driver_current_lane1_xe16=0x1
-serdes_driver_current_lane2_xe16=0x1
-serdes_driver_current_lane3_xe16=0x1
-serdes_pre_driver_current_lane0_xe16=0x1
-serdes_pre_driver_current_lane1_xe16=0x1
-serdes_pre_driver_current_lane2_xe16=0x1
-serdes_pre_driver_current_lane3_xe16=0x1
-serdes_preemphasis_lane0_xe16=0xa760
-serdes_preemphasis_lane1_xe16=0xa760
-serdes_preemphasis_lane2_xe16=0xa760
-serdes_preemphasis_lane3_xe16=0xa760
-
-# xe17 (40G)
-portmap_18=65:40
-xgxs_rx_lane_map_18=0x132
-xgxs_tx_lane_map_18=0x2031
-phy_xaui_rx_polarity_flip_18=0x3
-phy_xaui_tx_polarity_flip_18=0x9
-serdes_driver_current_lane0_xe17=0x1
-serdes_driver_current_lane1_xe17=0x1
-serdes_driver_current_lane2_xe17=0x1
-serdes_driver_current_lane3_xe17=0x1
-serdes_pre_driver_current_lane0_xe17=0x1
-serdes_pre_driver_current_lane1_xe17=0x1
-serdes_pre_driver_current_lane2_xe17=0x1
-serdes_pre_driver_current_lane3_xe17=0x1
-serdes_preemphasis_lane0_xe17=0xa370
-serdes_preemphasis_lane1_xe17=0xa370
-serdes_preemphasis_lane2_xe17=0xa370
-serdes_preemphasis_lane3_xe17=0xa370
-
-# xe18 (40G)
-portmap_19=73:40
-xgxs_rx_lane_map_19=0x213
-xgxs_tx_lane_map_19=0x2031
-phy_xaui_rx_polarity_flip_19=0x1
-phy_xaui_tx_polarity_flip_19=0x0
-serdes_driver_current_lane0_xe18=0x2
-serdes_driver_current_lane1_xe18=0x2
-serdes_driver_current_lane2_xe18=0x2
-serdes_driver_current_lane3_xe18=0x2
-serdes_pre_driver_current_lane0_xe18=0x2
-serdes_pre_driver_current_lane1_xe18=0x2
-serdes_pre_driver_current_lane2_xe18=0x2
-serdes_pre_driver_current_lane3_xe18=0x2
-serdes_preemphasis_lane0_xe18=0xa760
-serdes_preemphasis_lane1_xe18=0xa760
-serdes_preemphasis_lane2_xe18=0xa760
-serdes_preemphasis_lane3_xe18=0xa760
-
-# xe19 (40G)
-portmap_20=77:40
-xgxs_rx_lane_map_20=0x123
-xgxs_tx_lane_map_20=0x1203
-phy_xaui_rx_polarity_flip_20=0x3
-phy_xaui_tx_polarity_flip_20=0xe
-serdes_driver_current_lane0_xe19=0x2
-serdes_driver_current_lane1_xe19=0x2
-serdes_driver_current_lane2_xe19=0x2
-serdes_driver_current_lane3_xe19=0x2
-serdes_pre_driver_current_lane0_xe19=0x2
-serdes_pre_driver_current_lane1_xe19=0x2
-serdes_pre_driver_current_lane2_xe19=0x2
-serdes_pre_driver_current_lane3_xe19=0x2
-serdes_preemphasis_lane0_xe19=0xaf40
-serdes_preemphasis_lane1_xe19=0xaf40
-serdes_preemphasis_lane2_xe19=0xaf40
-serdes_preemphasis_lane3_xe19=0xaf40
-
-# xe20 (40G)
-portmap_21=109:40
-xgxs_rx_lane_map_21=0x132
-xgxs_tx_lane_map_21=0x132
-phy_xaui_rx_polarity_flip_21=0x8
-phy_xaui_tx_polarity_flip_21=0x0
-serdes_driver_current_lane0_xe20=0x1
-serdes_driver_current_lane1_xe20=0x1
-serdes_driver_current_lane2_xe20=0x1
-serdes_driver_current_lane3_xe20=0x2
-serdes_pre_driver_current_lane0_xe20=0x1
-serdes_pre_driver_current_lane1_xe20=0x1
-serdes_pre_driver_current_lane2_xe20=0x1
-serdes_pre_driver_current_lane3_xe20=0x2
-serdes_preemphasis_lane0_xe20=0xb330
-serdes_preemphasis_lane1_xe20=0xb330
-serdes_preemphasis_lane2_xe20=0xb330
-serdes_preemphasis_lane3_xe20=0xbff0
-
-# xe21 (40G)
-portmap_22=105:40
-xgxs_rx_lane_map_22=0x1320
-xgxs_tx_lane_map_22=0x3021
-phy_xaui_rx_polarity_flip_22=0xd
-phy_xaui_tx_polarity_flip_22=0xb
-serdes_driver_current_lane0_xe21=0x1
-serdes_driver_current_lane1_xe21=0x1
-serdes_driver_current_lane2_xe21=0x1
-serdes_driver_current_lane3_xe21=0x1
-serdes_pre_driver_current_lane0_xe21=0x1
-serdes_pre_driver_current_lane1_xe21=0x1
-serdes_pre_driver_current_lane2_xe21=0x1
-serdes_pre_driver_current_lane3_xe21=0x1
-serdes_preemphasis_lane0_xe21=0xb330
-serdes_preemphasis_lane1_xe21=0xb330
-serdes_preemphasis_lane2_xe21=0xb330
-serdes_preemphasis_lane3_xe21=0xb330
-
-# xe22 (40G)
-portmap_23=113:40
-xgxs_rx_lane_map_23=0x132
-xgxs_tx_lane_map_23=0x132
-phy_xaui_rx_polarity_flip_23=0x8
-phy_xaui_tx_polarity_flip_23=0x0
-serdes_driver_current_lane0_xe22=0x1
-serdes_driver_current_lane1_xe22=0x1
-serdes_driver_current_lane2_xe22=0x1
-serdes_driver_current_lane3_xe22=0x1
-serdes_pre_driver_current_lane0_xe22=0x1
-serdes_pre_driver_current_lane1_xe22=0x1
-serdes_pre_driver_current_lane2_xe22=0x1
-serdes_pre_driver_current_lane3_xe22=0x1
-serdes_preemphasis_lane0_xe22=0xbb10
-serdes_preemphasis_lane1_xe22=0xbb10
-serdes_preemphasis_lane2_xe22=0xbb10
-serdes_preemphasis_lane3_xe22=0xc2f0
-
-# xe23 (40G)
-portmap_24=117:40
-xgxs_rx_lane_map_24=0x231
-xgxs_tx_lane_map_24=0x1203
-phy_xaui_rx_polarity_flip_24=0x3
-phy_xaui_tx_polarity_flip_24=0xe
-serdes_driver_current_lane0_xe23=0x3
-serdes_driver_current_lane1_xe23=0x5
-serdes_driver_current_lane2_xe23=0x3
-serdes_driver_current_lane3_xe23=0x3
-serdes_pre_driver_current_lane0_xe23=0x3
-serdes_pre_driver_current_lane1_xe23=0x5
-serdes_pre_driver_current_lane2_xe23=0x3
-serdes_pre_driver_current_lane3_xe23=0x3
-serdes_preemphasis_lane0_xe23=0xc6e0
-serdes_preemphasis_lane1_xe23=0xc6e0
-serdes_preemphasis_lane2_xe23=0xc6e0
-serdes_preemphasis_lane3_xe23=0xc6e0
-
-# xe24 (40G)
-portmap_25=125:40
-xgxs_rx_lane_map_25=0x132
-xgxs_tx_lane_map_25=0x132
-phy_xaui_rx_polarity_flip_25=0x8
-phy_xaui_tx_polarity_flip_25=0x0
-serdes_driver_current_lane0_xe24=0x4
-serdes_driver_current_lane1_xe24=0x4
-serdes_driver_current_lane2_xe24=0x4
-serdes_driver_current_lane3_xe24=0x4
-serdes_pre_driver_current_lane0_xe24=0x4
-serdes_pre_driver_current_lane1_xe24=0x4
-serdes_pre_driver_current_lane2_xe24=0x4
-serdes_pre_driver_current_lane3_xe24=0x4
-serdes_preemphasis_lane0_xe24=0xc6e0
-serdes_preemphasis_lane1_xe24=0xc6e0
-serdes_preemphasis_lane2_xe24=0xc6e0
-serdes_preemphasis_lane3_xe24=0xcec0
-
-# xe25 (40G)
-portmap_26=121:40
-xgxs_rx_lane_map_26=0x1320
-xgxs_tx_lane_map_26=0x3021
-phy_xaui_rx_polarity_flip_26=0xd
-phy_xaui_tx_polarity_flip_26=0xb
-serdes_driver_current_lane0_xe25=0x4
-serdes_driver_current_lane1_xe25=0x4
-serdes_driver_current_lane2_xe25=0x4
-serdes_driver_current_lane3_xe25=0x4
-serdes_pre_driver_current_lane0_xe25=0x4
-serdes_pre_driver_current_lane1_xe25=0x4
-serdes_pre_driver_current_lane2_xe25=0x4
-serdes_pre_driver_current_lane3_xe25=0x4
-serdes_preemphasis_lane0_xe25=0xc6e0
-serdes_preemphasis_lane1_xe25=0xc6e0
-serdes_preemphasis_lane2_xe25=0xc6e0
-serdes_preemphasis_lane3_xe25=0xc6e0
-
-# xe26 (40G)
-portmap_27=81:40
-xgxs_rx_lane_map_27=0x1320
-xgxs_tx_lane_map_27=0x2031
-phy_xaui_rx_polarity_flip_27=0x1
-phy_xaui_tx_polarity_flip_27=0x2
-serdes_driver_current_lane0_xe26=0x2
-serdes_driver_current_lane1_xe26=0x2
-serdes_driver_current_lane2_xe26=0x2
-serdes_driver_current_lane3_xe26=0x2
-serdes_pre_driver_current_lane0_xe26=0x2
-serdes_pre_driver_current_lane1_xe26=0x2
-serdes_pre_driver_current_lane2_xe26=0x2
-serdes_pre_driver_current_lane3_xe26=0x2
-serdes_preemphasis_lane0_xe26=0xbb10
-serdes_preemphasis_lane1_xe26=0xbb10
-serdes_preemphasis_lane2_xe26=0xbf00
-serdes_preemphasis_lane3_xe26=0xbb10
-
-# xe27 (40G)
-portmap_28=85:40
-xgxs_rx_lane_map_28=0x213
-xgxs_tx_lane_map_28=0x1203
-phy_xaui_rx_polarity_flip_28=0xc
-phy_xaui_tx_polarity_flip_28=0xe
-serdes_driver_current_lane0_xe27=0x4
-serdes_driver_current_lane1_xe27=0x5
-serdes_driver_current_lane2_xe27=0x4
-serdes_driver_current_lane3_xe27=0x5
-serdes_pre_driver_current_lane0_xe27=0x4
-serdes_pre_driver_current_lane1_xe27=0x5
-serdes_pre_driver_current_lane2_xe27=0x4
-serdes_pre_driver_current_lane3_xe27=0x5
-serdes_preemphasis_lane0_xe27=0xc2f0
-serdes_preemphasis_lane1_xe27=0xc6e0
-serdes_preemphasis_lane2_xe27=0xc6e0
-serdes_preemphasis_lane3_xe27=0xc6e0
-
-# xe28 (40G)
-portmap_29=93:40
-xgxs_rx_lane_map_29=0x1320
-xgxs_tx_lane_map_29=0x2031
-phy_xaui_rx_polarity_flip_29=0x1
-phy_xaui_tx_polarity_flip_29=0x2
-serdes_driver_current_lane0_xe28=0x4
-serdes_driver_current_lane1_xe28=0x4
-serdes_driver_current_lane2_xe28=0x4
-serdes_driver_current_lane3_xe28=0x4
-serdes_pre_driver_current_lane0_xe28=0x4
-serdes_pre_driver_current_lane1_xe28=0x4
-serdes_pre_driver_current_lane2_xe28=0x4
-serdes_pre_driver_current_lane3_xe28=0x4
-serdes_preemphasis_lane0_xe28=0xc2f0
-serdes_preemphasis_lane1_xe28=0xc2f0
-serdes_preemphasis_lane2_xe28=0xc2f0
-serdes_preemphasis_lane3_xe28=0xc2f0
-
-# xe29 (40G)
-portmap_30=89:40
-xgxs_rx_lane_map_30=0x1320
-xgxs_tx_lane_map_30=0x3021
-phy_xaui_rx_polarity_flip_30=0x2
-phy_xaui_tx_polarity_flip_30=0xb
-serdes_driver_current_lane0_xe29=0x4
-serdes_driver_current_lane1_xe29=0x4
-serdes_driver_current_lane2_xe29=0x4
-serdes_driver_current_lane3_xe29=0x4
-serdes_pre_driver_current_lane0_xe29=0x4
-serdes_pre_driver_current_lane1_xe29=0x4
-serdes_pre_driver_current_lane2_xe29=0x4
-serdes_pre_driver_current_lane3_xe29=0x4
-serdes_preemphasis_lane0_xe29=0xcad0
-serdes_preemphasis_lane1_xe29=0xc6e0
-serdes_preemphasis_lane2_xe29=0xc6e0
-serdes_preemphasis_lane3_xe29=0xc6e0
-
-# xe30 (40G)
-portmap_31=101:40
-xgxs_rx_lane_map_31=0x1320
-xgxs_tx_lane_map_31=0x1203
-phy_xaui_rx_polarity_flip_31=0x1
-phy_xaui_tx_polarity_flip_31=0x6
-serdes_driver_current_lane0_xe30=0x6
-serdes_driver_current_lane1_xe30=0x6
-serdes_driver_current_lane2_xe30=0x6
-serdes_driver_current_lane3_xe30=0x7
-serdes_pre_driver_current_lane0_xe30=0x6
-serdes_pre_driver_current_lane1_xe30=0x6
-serdes_pre_driver_current_lane2_xe30=0x6
-serdes_pre_driver_current_lane3_xe30=0x7
-serdes_preemphasis_lane0_xe30=0xcec0
-serdes_preemphasis_lane1_xe30=0xcec0
-serdes_preemphasis_lane2_xe30=0xcad0
-serdes_preemphasis_lane3_xe30=0xc6e0
-
-# xe31 (40G)
-portmap_32=97:40
-xgxs_rx_lane_map_32=0x213
-xgxs_tx_lane_map_32=0x2031
-phy_xaui_rx_polarity_flip_32=0xc
-phy_xaui_tx_polarity_flip_32=0x3
-serdes_driver_current_lane0_xe31=0x5
-serdes_driver_current_lane1_xe31=0x5
-serdes_driver_current_lane2_xe31=0x5
-serdes_driver_current_lane3_xe31=0x5
-serdes_pre_driver_current_lane0_xe31=0x5
-serdes_pre_driver_current_lane1_xe31=0x5
-serdes_pre_driver_current_lane2_xe31=0x5
-serdes_pre_driver_current_lane3_xe31=0x5
-serdes_preemphasis_lane0_xe31=0xcad0
-serdes_preemphasis_lane1_xe31=0xcad0
-serdes_preemphasis_lane2_xe31=0xcad0
-serdes_preemphasis_lane3_xe31=0xcad0
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/3/buffers.json.j2 b/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/3/buffers.json.j2
deleted file mode 100644
index b67cf577ab75..000000000000
--- a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/3/buffers.json.j2
+++ /dev/null
@@ -1,3 +0,0 @@
-{%- set default_topo = 't1' %}
-{%- include 'buffers_config.j2' %}
-
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/3/buffers_defaults_def.j2 b/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/3/buffers_defaults_def.j2
deleted file mode 100644
index 38e34eb571e8..000000000000
--- a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/3/buffers_defaults_def.j2
+++ /dev/null
@@ -1,45 +0,0 @@
-{%- set default_cable = '300m' %}
-
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {% for port_idx in range(0,32) %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
-    {% endfor %}
-{%- endmacro %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "12766208",
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "12766208",
-            "type": "egress",
-            "mode": "static"
-        },
-        "egress_lossy_pool": {
-            "size": "7326924",
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "static_th":"12766208"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"1518",
-            "dynamic_th":"3"
-        }
-    },
-{%- endmacro %}
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/3/buffers_defaults_t0.j2 b/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/3/buffers_defaults_t0.j2
deleted file mode 100644
index 38e34eb571e8..000000000000
--- a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/3/buffers_defaults_t0.j2
+++ /dev/null
@@ -1,45 +0,0 @@
-{%- set default_cable = '300m' %}
-
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {% for port_idx in range(0,32) %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
-    {% endfor %}
-{%- endmacro %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "12766208",
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "12766208",
-            "type": "egress",
-            "mode": "static"
-        },
-        "egress_lossy_pool": {
-            "size": "7326924",
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "static_th":"12766208"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"1518",
-            "dynamic_th":"3"
-        }
-    },
-{%- endmacro %}
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/3/buffers_defaults_t1.j2 b/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/3/buffers_defaults_t1.j2
deleted file mode 100644
index 38e34eb571e8..000000000000
--- a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/3/buffers_defaults_t1.j2
+++ /dev/null
@@ -1,45 +0,0 @@
-{%- set default_cable = '300m' %}
-
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {% for port_idx in range(0,32) %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
-    {% endfor %}
-{%- endmacro %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "12766208",
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "12766208",
-            "type": "egress",
-            "mode": "static"
-        },
-        "egress_lossy_pool": {
-            "size": "7326924",
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "static_th":"12766208"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"1518",
-            "dynamic_th":"3"
-        }
-    },
-{%- endmacro %}
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/3/pg_profile_lookup.ini b/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/3/pg_profile_lookup.ini
deleted file mode 100644
index 9f2eacb6fc42..000000000000
--- a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/3/pg_profile_lookup.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-# PG lossless profiles.
-# speed cable size      xon     xoff   threshold xon_offset
-  10000  5m   56368     18432   55120  -3        2496
-  25000  5m   56368     18432   55120  -3        2496
-  40000  5m   56368     18432   55120  -3        2496
-  50000  5m   56368     18432   55120  -3        2496
- 100000  5m   56368     18432   55120  -3        2496
-  10000  40m  56368     18432   55120  -3        2496
-  25000  40m  56368     18432   55120  -3        2496
-  40000  40m  56368     18432   55120  -3        2496
-  50000  40m  56368     18432   55120  -3        2496
- 100000  40m  56368     18432   55120  -3        2496
-  10000  300m 56368     18432   55120  -3        2496
-  25000  300m 56368     18432   55120  -3        2496
-  40000  300m 56368     18432   55120  -3        2496
-  50000  300m 56368     18432   55120  -3        2496
- 100000  300m 56368     18432   55120  -3        2496
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/3/qos.json.j2 b/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/3/qos.json.j2
deleted file mode 100644
index 3e548325ea30..000000000000
--- a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/3/qos.json.j2
+++ /dev/null
@@ -1 +0,0 @@
-{%- include 'qos_config.j2' %}
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/3/sai.profile b/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/3/sai.profile
deleted file mode 100644
index 0a2df177f1c5..000000000000
--- a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/3/sai.profile
+++ /dev/null
@@ -1,3 +0,0 @@
-SAI_VS_SWITCH_TYPE=SAI_VS_SWITCH_TYPE_BCM56850
-SAI_VS_HOSTIF_USE_TAP_DEVICE=true
-SAI_VS_INTERFACE_LANE_MAP_FILE=/usr/share/sonic/hwsku/lanemap.ini
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/3/td2-s6000-32x40G.config.bcm b/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/3/td2-s6000-32x40G.config.bcm
deleted file mode 100644
index 0e25b4d4232d..000000000000
--- a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/3/td2-s6000-32x40G.config.bcm
+++ /dev/null
@@ -1,646 +0,0 @@
-# Old LPM only configuration
-# l2_mem_entries=163840
-# l3_mem_entries=90112
-# l3_alpm_enable=0
-# ipv6_lpm_128b_enable=0
-#
-# ALPM enable
-l3_alpm_enable=2
-ipv6_lpm_128b_enable=1
-l2_mem_entries=32768
-l3_mem_entries=16384
-
-# From old config file
-os=unix
-higig2_hdr_mode=1
-
-# Parity
-parity_correction=1
-parity_enable=1
-stat_if_parity_enable=0
-
-#
-bcm_num_cos=10
-bcm_stat_interval=2000000
-l2xmsg_hostbuf_size=8192
-l2xmsg_mode=1
-lls_num_l2uc=12
-max_vp_lags=0
-miim_intr_enable=0
-mmu_lossless=0
-module_64ports=0
-schan_intr_enable=0
-stable_size=0x2000000
-tdma_timeout_usec=5000000
-
-pbmp_oversubscribe=0x000007fffffffffffffffffffffffffe
-pbmp_xport_xe=0x000007fffffffffffffffffffffffffe
-
-# Ports configuration
-# xe0 (40G)
-portmap_1=25:40
-xgxs_rx_lane_map_1=0x213
-xgxs_tx_lane_map_1=0x2031
-phy_xaui_rx_polarity_flip_1=0xe
-phy_xaui_tx_polarity_flip_1=0x2
-serdes_driver_current_lane0_xe0=0x5
-serdes_driver_current_lane1_xe0=0x5
-serdes_driver_current_lane2_xe0=0x5
-serdes_driver_current_lane3_xe0=0x5
-serdes_pre_driver_current_lane0_xe0=0x5
-serdes_pre_driver_current_lane1_xe0=0x5
-serdes_pre_driver_current_lane2_xe0=0x5
-serdes_pre_driver_current_lane3_xe0=0x5
-serdes_preemphasis_lane0_xe0=0xcad0
-serdes_preemphasis_lane1_xe0=0xc6e0
-serdes_preemphasis_lane2_xe0=0xc6e0
-serdes_preemphasis_lane3_xe0=0xd2b0
-
-# xe1 (40G)
-portmap_2=29:40
-xgxs_rx_lane_map_2=0x213
-xgxs_tx_lane_map_2=0x213
-phy_xaui_rx_polarity_flip_2=0xc
-phy_xaui_tx_polarity_flip_2=0x9
-serdes_driver_current_lane0_xe1=0x6
-serdes_driver_current_lane1_xe1=0x7
-serdes_driver_current_lane2_xe1=0x6
-serdes_driver_current_lane3_xe1=0x6
-serdes_pre_driver_current_lane0_xe1=0x6
-serdes_pre_driver_current_lane1_xe1=0x7
-serdes_pre_driver_current_lane2_xe1=0x6
-serdes_pre_driver_current_lane3_xe1=0x6
-serdes_preemphasis_lane0_xe1=0xc2f0
-serdes_preemphasis_lane1_xe1=0xd2b0
-serdes_preemphasis_lane2_xe1=0xc6e0
-serdes_preemphasis_lane3_xe1=0xc2f0
-
-# xe2 (40G)
-portmap_3=33:40
-xgxs_rx_lane_map_3=0x213
-xgxs_tx_lane_map_3=0x132
-phy_xaui_rx_polarity_flip_3=0xe
-phy_xaui_tx_polarity_flip_3=0x2
-serdes_driver_current_lane0_xe2=0x4
-serdes_driver_current_lane1_xe2=0x4
-serdes_driver_current_lane2_xe2=0x4
-serdes_driver_current_lane3_xe2=0x4
-serdes_pre_driver_current_lane0_xe2=0x4
-serdes_pre_driver_current_lane1_xe2=0x4
-serdes_pre_driver_current_lane2_xe2=0x4
-serdes_pre_driver_current_lane3_xe2=0x4
-serdes_preemphasis_lane0_xe2=0xc6e0
-serdes_preemphasis_lane1_xe2=0xc6e0
-serdes_preemphasis_lane2_xe2=0xc6e0
-serdes_preemphasis_lane3_xe2=0xc6e0
-
-# xe3 (40G)
-portmap_4=37:40
-xgxs_rx_lane_map_4=0x213
-xgxs_tx_lane_map_4=0x1203
-phy_xaui_rx_polarity_flip_4=0x3
-phy_xaui_tx_polarity_flip_4=0xe
-serdes_driver_current_lane0_xe3=0x4
-serdes_driver_current_lane1_xe3=0x4
-serdes_driver_current_lane2_xe3=0x4
-serdes_driver_current_lane3_xe3=0x4
-serdes_pre_driver_current_lane0_xe3=0x4
-serdes_pre_driver_current_lane1_xe3=0x4
-serdes_pre_driver_current_lane2_xe3=0x4
-serdes_pre_driver_current_lane3_xe3=0x4
-serdes_preemphasis_lane0_xe3=0xcad0
-serdes_preemphasis_lane1_xe3=0xcad0
-serdes_preemphasis_lane2_xe3=0xc2f0
-serdes_preemphasis_lane3_xe3=0xc2f0
-
-# xe4 (40G)
-portmap_5=45:40
-xgxs_rx_lane_map_5=0x213
-xgxs_tx_lane_map_5=0x213
-phy_xaui_rx_polarity_flip_5=0xe
-phy_xaui_tx_polarity_flip_5=0x8
-serdes_driver_current_lane0_xe4=0x4
-serdes_driver_current_lane1_xe4=0x4
-serdes_driver_current_lane2_xe4=0x4
-serdes_driver_current_lane3_xe4=0x4
-serdes_pre_driver_current_lane0_xe4=0x4
-serdes_pre_driver_current_lane1_xe4=0x4
-serdes_pre_driver_current_lane2_xe4=0x4
-serdes_pre_driver_current_lane3_xe4=0x4
-serdes_preemphasis_lane0_xe4=0xc2f0
-serdes_preemphasis_lane1_xe4=0xc2f0
-serdes_preemphasis_lane2_xe4=0xc2f0
-serdes_preemphasis_lane3_xe4=0xc2f0
-
-# xe5 (40G)
-portmap_6=41:40
-xgxs_rx_lane_map_6=0x213
-xgxs_tx_lane_map_6=0x3021
-phy_xaui_rx_polarity_flip_6=0x3
-phy_xaui_tx_polarity_flip_6=0xb
-serdes_driver_current_lane0_xe5=0x4
-serdes_driver_current_lane1_xe5=0x4
-serdes_driver_current_lane2_xe5=0x4
-serdes_driver_current_lane3_xe5=0x4
-serdes_pre_driver_current_lane0_xe5=0x4
-serdes_pre_driver_current_lane1_xe5=0x4
-serdes_pre_driver_current_lane2_xe5=0x4
-serdes_pre_driver_current_lane3_xe5=0x4
-serdes_preemphasis_lane0_xe5=0xc6e0
-serdes_preemphasis_lane1_xe5=0xc2f0
-serdes_preemphasis_lane2_xe5=0xc2f0
-serdes_preemphasis_lane3_xe5=0xcad0
-
-# xe6 (40G)
-portmap_7=1:40
-xgxs_rx_lane_map_7=0x213
-xgxs_tx_lane_map_7=0x2031
-phy_xaui_rx_polarity_flip_7=0xe
-phy_xaui_tx_polarity_flip_7=0xd
-serdes_driver_current_lane0_xe6=0x5
-serdes_driver_current_lane1_xe6=0x5
-serdes_driver_current_lane2_xe6=0x5
-serdes_driver_current_lane3_xe6=0x5
-serdes_pre_driver_current_lane0_xe6=0x5
-serdes_pre_driver_current_lane1_xe6=0x5
-serdes_pre_driver_current_lane2_xe6=0x5
-serdes_pre_driver_current_lane3_xe6=0x5
-serdes_preemphasis_lane0_xe6=0xc6e0
-serdes_preemphasis_lane1_xe6=0xcad0
-serdes_preemphasis_lane2_xe6=0xc6e0
-serdes_preemphasis_lane3_xe6=0xcad0
-
-# xe7 (40G)
-portmap_8=5:40
-xgxs_rx_lane_map_8=0x213
-xgxs_tx_lane_map_8=0x1203
-phy_xaui_rx_polarity_flip_8=0xc
-phy_xaui_tx_polarity_flip_8=0x1
-serdes_driver_current_lane0_xe7=0x4
-serdes_driver_current_lane1_xe7=0x4
-serdes_driver_current_lane2_xe7=0x4
-serdes_driver_current_lane3_xe7=0x4
-serdes_pre_driver_current_lane0_xe7=0x4
-serdes_pre_driver_current_lane1_xe7=0x4
-serdes_pre_driver_current_lane2_xe7=0x4
-serdes_pre_driver_current_lane3_xe7=0x4
-serdes_preemphasis_lane0_xe7=0xc6e0
-serdes_preemphasis_lane1_xe7=0xc6e0
-serdes_preemphasis_lane2_xe7=0xc6e0
-serdes_preemphasis_lane3_xe7=0xc6e0
-
-# xe8 (40G)
-portmap_9=13:40
-xgxs_rx_lane_map_9=0x213
-xgxs_tx_lane_map_9=0x132
-phy_xaui_rx_polarity_flip_9=0xe
-phy_xaui_tx_polarity_flip_9=0x0
-serdes_driver_current_lane0_xe8=0x2
-serdes_driver_current_lane1_xe8=0x3
-serdes_driver_current_lane2_xe8=0x2
-serdes_driver_current_lane3_xe8=0x2
-serdes_pre_driver_current_lane0_xe8=0x2
-serdes_pre_driver_current_lane1_xe8=0x3
-serdes_pre_driver_current_lane2_xe8=0x2
-serdes_pre_driver_current_lane3_xe8=0x2
-serdes_preemphasis_lane0_xe8=0xb270
-serdes_preemphasis_lane1_xe8=0xbb10
-serdes_preemphasis_lane2_xe8=0xb720
-serdes_preemphasis_lane3_xe8=0xb720
-
-# xe9 (40G)
-portmap_10=9:40
-xgxs_rx_lane_map_10=0x3120
-xgxs_tx_lane_map_10=0x3021
-phy_xaui_rx_polarity_flip_10=0x0
-phy_xaui_tx_polarity_flip_10=0x4
-serdes_driver_current_lane0_xe9=0x3
-serdes_driver_current_lane1_xe9=0x3
-serdes_driver_current_lane2_xe9=0x3
-serdes_driver_current_lane3_xe9=0x3
-serdes_pre_driver_current_lane0_xe9=0x3
-serdes_pre_driver_current_lane1_xe9=0x3
-serdes_pre_driver_current_lane2_xe9=0x3
-serdes_pre_driver_current_lane3_xe9=0x3
-serdes_preemphasis_lane0_xe9=0xc2f0
-serdes_preemphasis_lane1_xe9=0xc6e0
-serdes_preemphasis_lane2_xe9=0xbf00
-serdes_preemphasis_lane3_xe9=0xc2f0
-
-# xe10 (40G)
-portmap_11=17:40
-xgxs_rx_lane_map_11=0x213
-xgxs_tx_lane_map_11=0x132
-phy_xaui_rx_polarity_flip_11=0xe
-phy_xaui_tx_polarity_flip_11=0x0
-serdes_driver_current_lane0_xe10=0x2
-serdes_driver_current_lane1_xe10=0x2
-serdes_driver_current_lane2_xe10=0x2
-serdes_driver_current_lane3_xe10=0x2
-serdes_pre_driver_current_lane0_xe10=0x2
-serdes_pre_driver_current_lane1_xe10=0x2
-serdes_pre_driver_current_lane2_xe10=0x2
-serdes_pre_driver_current_lane3_xe10=0x2
-serdes_preemphasis_lane0_xe10=0xb330
-serdes_preemphasis_lane1_xe10=0xbb10
-serdes_preemphasis_lane2_xe10=0xbb10
-serdes_preemphasis_lane3_xe10=0xbb10
-
-# xe11 (40G)
-portmap_12=21:40
-xgxs_rx_lane_map_12=0x123
-xgxs_tx_lane_map_12=0x1203
-phy_xaui_rx_polarity_flip_12=0xc
-phy_xaui_tx_polarity_flip_12=0xe
-serdes_driver_current_lane0_xe11=0x2
-serdes_driver_current_lane1_xe11=0x2
-serdes_driver_current_lane2_xe11=0x2
-serdes_driver_current_lane3_xe11=0x2
-serdes_pre_driver_current_lane0_xe11=0x2
-serdes_pre_driver_current_lane1_xe11=0x2
-serdes_pre_driver_current_lane2_xe11=0x2
-serdes_pre_driver_current_lane3_xe11=0x2
-serdes_preemphasis_lane0_xe11=0xb330
-serdes_preemphasis_lane1_xe11=0xb330
-serdes_preemphasis_lane2_xe11=0xb330
-serdes_preemphasis_lane3_xe11=0xb330
-
-# xe12 (40G)
-portmap_13=53:40
-xgxs_rx_lane_map_13=0x213
-xgxs_tx_lane_map_13=0x231
-phy_xaui_rx_polarity_flip_13=0x1
-phy_xaui_tx_polarity_flip_13=0x0
-serdes_driver_current_lane0_xe12=0x2
-serdes_driver_current_lane1_xe12=0x2
-serdes_driver_current_lane2_xe12=0x2
-serdes_driver_current_lane3_xe12=0x2
-serdes_pre_driver_current_lane0_xe12=0x2
-serdes_pre_driver_current_lane1_xe12=0x2
-serdes_pre_driver_current_lane2_xe12=0x2
-serdes_pre_driver_current_lane3_xe12=0x2
-serdes_preemphasis_lane0_xe12=0xaf40
-serdes_preemphasis_lane1_xe12=0xaf40
-serdes_preemphasis_lane2_xe12=0xaf40
-serdes_preemphasis_lane3_xe12=0xaf40
-
-# xe13 (40G)
-portmap_14=49:40
-xgxs_rx_lane_map_14=0x1302
-xgxs_tx_lane_map_14=0x2031
-phy_xaui_rx_polarity_flip_14=0xb
-phy_xaui_tx_polarity_flip_14=0x3
-serdes_driver_current_lane0_xe13=0x2
-serdes_driver_current_lane1_xe13=0x2
-serdes_driver_current_lane2_xe13=0x2
-serdes_driver_current_lane3_xe13=0x2
-serdes_pre_driver_current_lane0_xe13=0x2
-serdes_pre_driver_current_lane1_xe13=0x2
-serdes_pre_driver_current_lane2_xe13=0x2
-serdes_pre_driver_current_lane3_xe13=0x2
-serdes_preemphasis_lane0_xe13=0xa760
-serdes_preemphasis_lane1_xe13=0xa760
-serdes_preemphasis_lane2_xe13=0xa760
-serdes_preemphasis_lane3_xe13=0xa760
-
-# xe14 (40G)
-portmap_15=57:40
-xgxs_rx_lane_map_15=0x213
-xgxs_tx_lane_map_15=0x2031
-phy_xaui_rx_polarity_flip_15=0x1
-phy_xaui_tx_polarity_flip_15=0x0
-serdes_driver_current_lane0_xe14=0x1
-serdes_driver_current_lane1_xe14=0x1
-serdes_driver_current_lane2_xe14=0x1
-serdes_driver_current_lane3_xe14=0x1
-serdes_pre_driver_current_lane0_xe14=0x1
-serdes_pre_driver_current_lane1_xe14=0x1
-serdes_pre_driver_current_lane2_xe14=0x1
-serdes_pre_driver_current_lane3_xe14=0x1
-serdes_preemphasis_lane0_xe14=0xa760
-serdes_preemphasis_lane1_xe14=0xa760
-serdes_preemphasis_lane2_xe14=0xa760
-serdes_preemphasis_lane3_xe14=0xa760
-
-# xe15 (40G)
-portmap_16=61:40
-xgxs_rx_lane_map_16=0x132
-xgxs_tx_lane_map_16=0x213
-phy_xaui_rx_polarity_flip_16=0x0
-phy_xaui_tx_polarity_flip_16=0x0
-serdes_driver_current_lane0_xe15=0x2
-serdes_driver_current_lane1_xe15=0x2
-serdes_driver_current_lane2_xe15=0x2
-serdes_driver_current_lane3_xe15=0x2
-serdes_pre_driver_current_lane0_xe15=0x2
-serdes_pre_driver_current_lane1_xe15=0x2
-serdes_pre_driver_current_lane2_xe15=0x2
-serdes_pre_driver_current_lane3_xe15=0x2
-serdes_preemphasis_lane0_xe15=0xa760
-serdes_preemphasis_lane1_xe15=0xa760
-serdes_preemphasis_lane2_xe15=0xa760
-serdes_preemphasis_lane3_xe15=0xa760
-
-# xe16 (40G)
-portmap_17=69:40
-xgxs_rx_lane_map_17=0x213
-xgxs_tx_lane_map_17=0x2130
-phy_xaui_rx_polarity_flip_17=0x1
-phy_xaui_tx_polarity_flip_17=0xf
-serdes_driver_current_lane0_xe16=0x1
-serdes_driver_current_lane1_xe16=0x1
-serdes_driver_current_lane2_xe16=0x1
-serdes_driver_current_lane3_xe16=0x1
-serdes_pre_driver_current_lane0_xe16=0x1
-serdes_pre_driver_current_lane1_xe16=0x1
-serdes_pre_driver_current_lane2_xe16=0x1
-serdes_pre_driver_current_lane3_xe16=0x1
-serdes_preemphasis_lane0_xe16=0xa760
-serdes_preemphasis_lane1_xe16=0xa760
-serdes_preemphasis_lane2_xe16=0xa760
-serdes_preemphasis_lane3_xe16=0xa760
-
-# xe17 (40G)
-portmap_18=65:40
-xgxs_rx_lane_map_18=0x132
-xgxs_tx_lane_map_18=0x2031
-phy_xaui_rx_polarity_flip_18=0x3
-phy_xaui_tx_polarity_flip_18=0x9
-serdes_driver_current_lane0_xe17=0x1
-serdes_driver_current_lane1_xe17=0x1
-serdes_driver_current_lane2_xe17=0x1
-serdes_driver_current_lane3_xe17=0x1
-serdes_pre_driver_current_lane0_xe17=0x1
-serdes_pre_driver_current_lane1_xe17=0x1
-serdes_pre_driver_current_lane2_xe17=0x1
-serdes_pre_driver_current_lane3_xe17=0x1
-serdes_preemphasis_lane0_xe17=0xa370
-serdes_preemphasis_lane1_xe17=0xa370
-serdes_preemphasis_lane2_xe17=0xa370
-serdes_preemphasis_lane3_xe17=0xa370
-
-# xe18 (40G)
-portmap_19=73:40
-xgxs_rx_lane_map_19=0x213
-xgxs_tx_lane_map_19=0x2031
-phy_xaui_rx_polarity_flip_19=0x1
-phy_xaui_tx_polarity_flip_19=0x0
-serdes_driver_current_lane0_xe18=0x2
-serdes_driver_current_lane1_xe18=0x2
-serdes_driver_current_lane2_xe18=0x2
-serdes_driver_current_lane3_xe18=0x2
-serdes_pre_driver_current_lane0_xe18=0x2
-serdes_pre_driver_current_lane1_xe18=0x2
-serdes_pre_driver_current_lane2_xe18=0x2
-serdes_pre_driver_current_lane3_xe18=0x2
-serdes_preemphasis_lane0_xe18=0xa760
-serdes_preemphasis_lane1_xe18=0xa760
-serdes_preemphasis_lane2_xe18=0xa760
-serdes_preemphasis_lane3_xe18=0xa760
-
-# xe19 (40G)
-portmap_20=77:40
-xgxs_rx_lane_map_20=0x123
-xgxs_tx_lane_map_20=0x1203
-phy_xaui_rx_polarity_flip_20=0x3
-phy_xaui_tx_polarity_flip_20=0xe
-serdes_driver_current_lane0_xe19=0x2
-serdes_driver_current_lane1_xe19=0x2
-serdes_driver_current_lane2_xe19=0x2
-serdes_driver_current_lane3_xe19=0x2
-serdes_pre_driver_current_lane0_xe19=0x2
-serdes_pre_driver_current_lane1_xe19=0x2
-serdes_pre_driver_current_lane2_xe19=0x2
-serdes_pre_driver_current_lane3_xe19=0x2
-serdes_preemphasis_lane0_xe19=0xaf40
-serdes_preemphasis_lane1_xe19=0xaf40
-serdes_preemphasis_lane2_xe19=0xaf40
-serdes_preemphasis_lane3_xe19=0xaf40
-
-# xe20 (40G)
-portmap_21=109:40
-xgxs_rx_lane_map_21=0x132
-xgxs_tx_lane_map_21=0x132
-phy_xaui_rx_polarity_flip_21=0x8
-phy_xaui_tx_polarity_flip_21=0x0
-serdes_driver_current_lane0_xe20=0x1
-serdes_driver_current_lane1_xe20=0x1
-serdes_driver_current_lane2_xe20=0x1
-serdes_driver_current_lane3_xe20=0x2
-serdes_pre_driver_current_lane0_xe20=0x1
-serdes_pre_driver_current_lane1_xe20=0x1
-serdes_pre_driver_current_lane2_xe20=0x1
-serdes_pre_driver_current_lane3_xe20=0x2
-serdes_preemphasis_lane0_xe20=0xb330
-serdes_preemphasis_lane1_xe20=0xb330
-serdes_preemphasis_lane2_xe20=0xb330
-serdes_preemphasis_lane3_xe20=0xbff0
-
-# xe21 (40G)
-portmap_22=105:40
-xgxs_rx_lane_map_22=0x1320
-xgxs_tx_lane_map_22=0x3021
-phy_xaui_rx_polarity_flip_22=0xd
-phy_xaui_tx_polarity_flip_22=0xb
-serdes_driver_current_lane0_xe21=0x1
-serdes_driver_current_lane1_xe21=0x1
-serdes_driver_current_lane2_xe21=0x1
-serdes_driver_current_lane3_xe21=0x1
-serdes_pre_driver_current_lane0_xe21=0x1
-serdes_pre_driver_current_lane1_xe21=0x1
-serdes_pre_driver_current_lane2_xe21=0x1
-serdes_pre_driver_current_lane3_xe21=0x1
-serdes_preemphasis_lane0_xe21=0xb330
-serdes_preemphasis_lane1_xe21=0xb330
-serdes_preemphasis_lane2_xe21=0xb330
-serdes_preemphasis_lane3_xe21=0xb330
-
-# xe22 (40G)
-portmap_23=113:40
-xgxs_rx_lane_map_23=0x132
-xgxs_tx_lane_map_23=0x132
-phy_xaui_rx_polarity_flip_23=0x8
-phy_xaui_tx_polarity_flip_23=0x0
-serdes_driver_current_lane0_xe22=0x1
-serdes_driver_current_lane1_xe22=0x1
-serdes_driver_current_lane2_xe22=0x1
-serdes_driver_current_lane3_xe22=0x1
-serdes_pre_driver_current_lane0_xe22=0x1
-serdes_pre_driver_current_lane1_xe22=0x1
-serdes_pre_driver_current_lane2_xe22=0x1
-serdes_pre_driver_current_lane3_xe22=0x1
-serdes_preemphasis_lane0_xe22=0xbb10
-serdes_preemphasis_lane1_xe22=0xbb10
-serdes_preemphasis_lane2_xe22=0xbb10
-serdes_preemphasis_lane3_xe22=0xc2f0
-
-# xe23 (40G)
-portmap_24=117:40
-xgxs_rx_lane_map_24=0x231
-xgxs_tx_lane_map_24=0x1203
-phy_xaui_rx_polarity_flip_24=0x3
-phy_xaui_tx_polarity_flip_24=0xe
-serdes_driver_current_lane0_xe23=0x3
-serdes_driver_current_lane1_xe23=0x5
-serdes_driver_current_lane2_xe23=0x3
-serdes_driver_current_lane3_xe23=0x3
-serdes_pre_driver_current_lane0_xe23=0x3
-serdes_pre_driver_current_lane1_xe23=0x5
-serdes_pre_driver_current_lane2_xe23=0x3
-serdes_pre_driver_current_lane3_xe23=0x3
-serdes_preemphasis_lane0_xe23=0xc6e0
-serdes_preemphasis_lane1_xe23=0xc6e0
-serdes_preemphasis_lane2_xe23=0xc6e0
-serdes_preemphasis_lane3_xe23=0xc6e0
-
-# xe24 (40G)
-portmap_25=125:40
-xgxs_rx_lane_map_25=0x132
-xgxs_tx_lane_map_25=0x132
-phy_xaui_rx_polarity_flip_25=0x8
-phy_xaui_tx_polarity_flip_25=0x0
-serdes_driver_current_lane0_xe24=0x4
-serdes_driver_current_lane1_xe24=0x4
-serdes_driver_current_lane2_xe24=0x4
-serdes_driver_current_lane3_xe24=0x4
-serdes_pre_driver_current_lane0_xe24=0x4
-serdes_pre_driver_current_lane1_xe24=0x4
-serdes_pre_driver_current_lane2_xe24=0x4
-serdes_pre_driver_current_lane3_xe24=0x4
-serdes_preemphasis_lane0_xe24=0xc6e0
-serdes_preemphasis_lane1_xe24=0xc6e0
-serdes_preemphasis_lane2_xe24=0xc6e0
-serdes_preemphasis_lane3_xe24=0xcec0
-
-# xe25 (40G)
-portmap_26=121:40
-xgxs_rx_lane_map_26=0x1320
-xgxs_tx_lane_map_26=0x3021
-phy_xaui_rx_polarity_flip_26=0xd
-phy_xaui_tx_polarity_flip_26=0xb
-serdes_driver_current_lane0_xe25=0x4
-serdes_driver_current_lane1_xe25=0x4
-serdes_driver_current_lane2_xe25=0x4
-serdes_driver_current_lane3_xe25=0x4
-serdes_pre_driver_current_lane0_xe25=0x4
-serdes_pre_driver_current_lane1_xe25=0x4
-serdes_pre_driver_current_lane2_xe25=0x4
-serdes_pre_driver_current_lane3_xe25=0x4
-serdes_preemphasis_lane0_xe25=0xc6e0
-serdes_preemphasis_lane1_xe25=0xc6e0
-serdes_preemphasis_lane2_xe25=0xc6e0
-serdes_preemphasis_lane3_xe25=0xc6e0
-
-# xe26 (40G)
-portmap_27=81:40
-xgxs_rx_lane_map_27=0x1320
-xgxs_tx_lane_map_27=0x2031
-phy_xaui_rx_polarity_flip_27=0x1
-phy_xaui_tx_polarity_flip_27=0x2
-serdes_driver_current_lane0_xe26=0x2
-serdes_driver_current_lane1_xe26=0x2
-serdes_driver_current_lane2_xe26=0x2
-serdes_driver_current_lane3_xe26=0x2
-serdes_pre_driver_current_lane0_xe26=0x2
-serdes_pre_driver_current_lane1_xe26=0x2
-serdes_pre_driver_current_lane2_xe26=0x2
-serdes_pre_driver_current_lane3_xe26=0x2
-serdes_preemphasis_lane0_xe26=0xbb10
-serdes_preemphasis_lane1_xe26=0xbb10
-serdes_preemphasis_lane2_xe26=0xbf00
-serdes_preemphasis_lane3_xe26=0xbb10
-
-# xe27 (40G)
-portmap_28=85:40
-xgxs_rx_lane_map_28=0x213
-xgxs_tx_lane_map_28=0x1203
-phy_xaui_rx_polarity_flip_28=0xc
-phy_xaui_tx_polarity_flip_28=0xe
-serdes_driver_current_lane0_xe27=0x4
-serdes_driver_current_lane1_xe27=0x5
-serdes_driver_current_lane2_xe27=0x4
-serdes_driver_current_lane3_xe27=0x5
-serdes_pre_driver_current_lane0_xe27=0x4
-serdes_pre_driver_current_lane1_xe27=0x5
-serdes_pre_driver_current_lane2_xe27=0x4
-serdes_pre_driver_current_lane3_xe27=0x5
-serdes_preemphasis_lane0_xe27=0xc2f0
-serdes_preemphasis_lane1_xe27=0xc6e0
-serdes_preemphasis_lane2_xe27=0xc6e0
-serdes_preemphasis_lane3_xe27=0xc6e0
-
-# xe28 (40G)
-portmap_29=93:40
-xgxs_rx_lane_map_29=0x1320
-xgxs_tx_lane_map_29=0x2031
-phy_xaui_rx_polarity_flip_29=0x1
-phy_xaui_tx_polarity_flip_29=0x2
-serdes_driver_current_lane0_xe28=0x4
-serdes_driver_current_lane1_xe28=0x4
-serdes_driver_current_lane2_xe28=0x4
-serdes_driver_current_lane3_xe28=0x4
-serdes_pre_driver_current_lane0_xe28=0x4
-serdes_pre_driver_current_lane1_xe28=0x4
-serdes_pre_driver_current_lane2_xe28=0x4
-serdes_pre_driver_current_lane3_xe28=0x4
-serdes_preemphasis_lane0_xe28=0xc2f0
-serdes_preemphasis_lane1_xe28=0xc2f0
-serdes_preemphasis_lane2_xe28=0xc2f0
-serdes_preemphasis_lane3_xe28=0xc2f0
-
-# xe29 (40G)
-portmap_30=89:40
-xgxs_rx_lane_map_30=0x1320
-xgxs_tx_lane_map_30=0x3021
-phy_xaui_rx_polarity_flip_30=0x2
-phy_xaui_tx_polarity_flip_30=0xb
-serdes_driver_current_lane0_xe29=0x4
-serdes_driver_current_lane1_xe29=0x4
-serdes_driver_current_lane2_xe29=0x4
-serdes_driver_current_lane3_xe29=0x4
-serdes_pre_driver_current_lane0_xe29=0x4
-serdes_pre_driver_current_lane1_xe29=0x4
-serdes_pre_driver_current_lane2_xe29=0x4
-serdes_pre_driver_current_lane3_xe29=0x4
-serdes_preemphasis_lane0_xe29=0xcad0
-serdes_preemphasis_lane1_xe29=0xc6e0
-serdes_preemphasis_lane2_xe29=0xc6e0
-serdes_preemphasis_lane3_xe29=0xc6e0
-
-# xe30 (40G)
-portmap_31=101:40
-xgxs_rx_lane_map_31=0x1320
-xgxs_tx_lane_map_31=0x1203
-phy_xaui_rx_polarity_flip_31=0x1
-phy_xaui_tx_polarity_flip_31=0x6
-serdes_driver_current_lane0_xe30=0x6
-serdes_driver_current_lane1_xe30=0x6
-serdes_driver_current_lane2_xe30=0x6
-serdes_driver_current_lane3_xe30=0x7
-serdes_pre_driver_current_lane0_xe30=0x6
-serdes_pre_driver_current_lane1_xe30=0x6
-serdes_pre_driver_current_lane2_xe30=0x6
-serdes_pre_driver_current_lane3_xe30=0x7
-serdes_preemphasis_lane0_xe30=0xcec0
-serdes_preemphasis_lane1_xe30=0xcec0
-serdes_preemphasis_lane2_xe30=0xcad0
-serdes_preemphasis_lane3_xe30=0xc6e0
-
-# xe31 (40G)
-portmap_32=97:40
-xgxs_rx_lane_map_32=0x213
-xgxs_tx_lane_map_32=0x2031
-phy_xaui_rx_polarity_flip_32=0xc
-phy_xaui_tx_polarity_flip_32=0x3
-serdes_driver_current_lane0_xe31=0x5
-serdes_driver_current_lane1_xe31=0x5
-serdes_driver_current_lane2_xe31=0x5
-serdes_driver_current_lane3_xe31=0x5
-serdes_pre_driver_current_lane0_xe31=0x5
-serdes_pre_driver_current_lane1_xe31=0x5
-serdes_pre_driver_current_lane2_xe31=0x5
-serdes_pre_driver_current_lane3_xe31=0x5
-serdes_preemphasis_lane0_xe31=0xcad0
-serdes_preemphasis_lane1_xe31=0xcad0
-serdes_preemphasis_lane2_xe31=0xcad0
-serdes_preemphasis_lane3_xe31=0xcad0
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/4/buffers.json.j2 b/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/4/buffers.json.j2
deleted file mode 100644
index b67cf577ab75..000000000000
--- a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/4/buffers.json.j2
+++ /dev/null
@@ -1,3 +0,0 @@
-{%- set default_topo = 't1' %}
-{%- include 'buffers_config.j2' %}
-
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/4/buffers_defaults_def.j2 b/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/4/buffers_defaults_def.j2
deleted file mode 100644
index 38e34eb571e8..000000000000
--- a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/4/buffers_defaults_def.j2
+++ /dev/null
@@ -1,45 +0,0 @@
-{%- set default_cable = '300m' %}
-
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {% for port_idx in range(0,32) %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
-    {% endfor %}
-{%- endmacro %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "12766208",
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "12766208",
-            "type": "egress",
-            "mode": "static"
-        },
-        "egress_lossy_pool": {
-            "size": "7326924",
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "static_th":"12766208"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"1518",
-            "dynamic_th":"3"
-        }
-    },
-{%- endmacro %}
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/4/buffers_defaults_t0.j2 b/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/4/buffers_defaults_t0.j2
deleted file mode 100644
index 38e34eb571e8..000000000000
--- a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/4/buffers_defaults_t0.j2
+++ /dev/null
@@ -1,45 +0,0 @@
-{%- set default_cable = '300m' %}
-
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {% for port_idx in range(0,32) %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
-    {% endfor %}
-{%- endmacro %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "12766208",
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "12766208",
-            "type": "egress",
-            "mode": "static"
-        },
-        "egress_lossy_pool": {
-            "size": "7326924",
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "static_th":"12766208"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"1518",
-            "dynamic_th":"3"
-        }
-    },
-{%- endmacro %}
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/4/buffers_defaults_t1.j2 b/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/4/buffers_defaults_t1.j2
deleted file mode 100644
index 38e34eb571e8..000000000000
--- a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/4/buffers_defaults_t1.j2
+++ /dev/null
@@ -1,45 +0,0 @@
-{%- set default_cable = '300m' %}
-
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {% for port_idx in range(0,32) %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
-    {% endfor %}
-{%- endmacro %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "12766208",
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "12766208",
-            "type": "egress",
-            "mode": "static"
-        },
-        "egress_lossy_pool": {
-            "size": "7326924",
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "static_th":"12766208"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"1518",
-            "dynamic_th":"3"
-        }
-    },
-{%- endmacro %}
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/4/pg_profile_lookup.ini b/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/4/pg_profile_lookup.ini
deleted file mode 100644
index 9f2eacb6fc42..000000000000
--- a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/4/pg_profile_lookup.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-# PG lossless profiles.
-# speed cable size      xon     xoff   threshold xon_offset
-  10000  5m   56368     18432   55120  -3        2496
-  25000  5m   56368     18432   55120  -3        2496
-  40000  5m   56368     18432   55120  -3        2496
-  50000  5m   56368     18432   55120  -3        2496
- 100000  5m   56368     18432   55120  -3        2496
-  10000  40m  56368     18432   55120  -3        2496
-  25000  40m  56368     18432   55120  -3        2496
-  40000  40m  56368     18432   55120  -3        2496
-  50000  40m  56368     18432   55120  -3        2496
- 100000  40m  56368     18432   55120  -3        2496
-  10000  300m 56368     18432   55120  -3        2496
-  25000  300m 56368     18432   55120  -3        2496
-  40000  300m 56368     18432   55120  -3        2496
-  50000  300m 56368     18432   55120  -3        2496
- 100000  300m 56368     18432   55120  -3        2496
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/4/qos.json.j2 b/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/4/qos.json.j2
deleted file mode 100644
index 3e548325ea30..000000000000
--- a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/4/qos.json.j2
+++ /dev/null
@@ -1 +0,0 @@
-{%- include 'qos_config.j2' %}
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/4/sai.profile b/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/4/sai.profile
deleted file mode 100644
index 0a2df177f1c5..000000000000
--- a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/4/sai.profile
+++ /dev/null
@@ -1,3 +0,0 @@
-SAI_VS_SWITCH_TYPE=SAI_VS_SWITCH_TYPE_BCM56850
-SAI_VS_HOSTIF_USE_TAP_DEVICE=true
-SAI_VS_INTERFACE_LANE_MAP_FILE=/usr/share/sonic/hwsku/lanemap.ini
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/4/td2-s6000-32x40G.config.bcm b/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/4/td2-s6000-32x40G.config.bcm
deleted file mode 100644
index 0e25b4d4232d..000000000000
--- a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/4/td2-s6000-32x40G.config.bcm
+++ /dev/null
@@ -1,646 +0,0 @@
-# Old LPM only configuration
-# l2_mem_entries=163840
-# l3_mem_entries=90112
-# l3_alpm_enable=0
-# ipv6_lpm_128b_enable=0
-#
-# ALPM enable
-l3_alpm_enable=2
-ipv6_lpm_128b_enable=1
-l2_mem_entries=32768
-l3_mem_entries=16384
-
-# From old config file
-os=unix
-higig2_hdr_mode=1
-
-# Parity
-parity_correction=1
-parity_enable=1
-stat_if_parity_enable=0
-
-#
-bcm_num_cos=10
-bcm_stat_interval=2000000
-l2xmsg_hostbuf_size=8192
-l2xmsg_mode=1
-lls_num_l2uc=12
-max_vp_lags=0
-miim_intr_enable=0
-mmu_lossless=0
-module_64ports=0
-schan_intr_enable=0
-stable_size=0x2000000
-tdma_timeout_usec=5000000
-
-pbmp_oversubscribe=0x000007fffffffffffffffffffffffffe
-pbmp_xport_xe=0x000007fffffffffffffffffffffffffe
-
-# Ports configuration
-# xe0 (40G)
-portmap_1=25:40
-xgxs_rx_lane_map_1=0x213
-xgxs_tx_lane_map_1=0x2031
-phy_xaui_rx_polarity_flip_1=0xe
-phy_xaui_tx_polarity_flip_1=0x2
-serdes_driver_current_lane0_xe0=0x5
-serdes_driver_current_lane1_xe0=0x5
-serdes_driver_current_lane2_xe0=0x5
-serdes_driver_current_lane3_xe0=0x5
-serdes_pre_driver_current_lane0_xe0=0x5
-serdes_pre_driver_current_lane1_xe0=0x5
-serdes_pre_driver_current_lane2_xe0=0x5
-serdes_pre_driver_current_lane3_xe0=0x5
-serdes_preemphasis_lane0_xe0=0xcad0
-serdes_preemphasis_lane1_xe0=0xc6e0
-serdes_preemphasis_lane2_xe0=0xc6e0
-serdes_preemphasis_lane3_xe0=0xd2b0
-
-# xe1 (40G)
-portmap_2=29:40
-xgxs_rx_lane_map_2=0x213
-xgxs_tx_lane_map_2=0x213
-phy_xaui_rx_polarity_flip_2=0xc
-phy_xaui_tx_polarity_flip_2=0x9
-serdes_driver_current_lane0_xe1=0x6
-serdes_driver_current_lane1_xe1=0x7
-serdes_driver_current_lane2_xe1=0x6
-serdes_driver_current_lane3_xe1=0x6
-serdes_pre_driver_current_lane0_xe1=0x6
-serdes_pre_driver_current_lane1_xe1=0x7
-serdes_pre_driver_current_lane2_xe1=0x6
-serdes_pre_driver_current_lane3_xe1=0x6
-serdes_preemphasis_lane0_xe1=0xc2f0
-serdes_preemphasis_lane1_xe1=0xd2b0
-serdes_preemphasis_lane2_xe1=0xc6e0
-serdes_preemphasis_lane3_xe1=0xc2f0
-
-# xe2 (40G)
-portmap_3=33:40
-xgxs_rx_lane_map_3=0x213
-xgxs_tx_lane_map_3=0x132
-phy_xaui_rx_polarity_flip_3=0xe
-phy_xaui_tx_polarity_flip_3=0x2
-serdes_driver_current_lane0_xe2=0x4
-serdes_driver_current_lane1_xe2=0x4
-serdes_driver_current_lane2_xe2=0x4
-serdes_driver_current_lane3_xe2=0x4
-serdes_pre_driver_current_lane0_xe2=0x4
-serdes_pre_driver_current_lane1_xe2=0x4
-serdes_pre_driver_current_lane2_xe2=0x4
-serdes_pre_driver_current_lane3_xe2=0x4
-serdes_preemphasis_lane0_xe2=0xc6e0
-serdes_preemphasis_lane1_xe2=0xc6e0
-serdes_preemphasis_lane2_xe2=0xc6e0
-serdes_preemphasis_lane3_xe2=0xc6e0
-
-# xe3 (40G)
-portmap_4=37:40
-xgxs_rx_lane_map_4=0x213
-xgxs_tx_lane_map_4=0x1203
-phy_xaui_rx_polarity_flip_4=0x3
-phy_xaui_tx_polarity_flip_4=0xe
-serdes_driver_current_lane0_xe3=0x4
-serdes_driver_current_lane1_xe3=0x4
-serdes_driver_current_lane2_xe3=0x4
-serdes_driver_current_lane3_xe3=0x4
-serdes_pre_driver_current_lane0_xe3=0x4
-serdes_pre_driver_current_lane1_xe3=0x4
-serdes_pre_driver_current_lane2_xe3=0x4
-serdes_pre_driver_current_lane3_xe3=0x4
-serdes_preemphasis_lane0_xe3=0xcad0
-serdes_preemphasis_lane1_xe3=0xcad0
-serdes_preemphasis_lane2_xe3=0xc2f0
-serdes_preemphasis_lane3_xe3=0xc2f0
-
-# xe4 (40G)
-portmap_5=45:40
-xgxs_rx_lane_map_5=0x213
-xgxs_tx_lane_map_5=0x213
-phy_xaui_rx_polarity_flip_5=0xe
-phy_xaui_tx_polarity_flip_5=0x8
-serdes_driver_current_lane0_xe4=0x4
-serdes_driver_current_lane1_xe4=0x4
-serdes_driver_current_lane2_xe4=0x4
-serdes_driver_current_lane3_xe4=0x4
-serdes_pre_driver_current_lane0_xe4=0x4
-serdes_pre_driver_current_lane1_xe4=0x4
-serdes_pre_driver_current_lane2_xe4=0x4
-serdes_pre_driver_current_lane3_xe4=0x4
-serdes_preemphasis_lane0_xe4=0xc2f0
-serdes_preemphasis_lane1_xe4=0xc2f0
-serdes_preemphasis_lane2_xe4=0xc2f0
-serdes_preemphasis_lane3_xe4=0xc2f0
-
-# xe5 (40G)
-portmap_6=41:40
-xgxs_rx_lane_map_6=0x213
-xgxs_tx_lane_map_6=0x3021
-phy_xaui_rx_polarity_flip_6=0x3
-phy_xaui_tx_polarity_flip_6=0xb
-serdes_driver_current_lane0_xe5=0x4
-serdes_driver_current_lane1_xe5=0x4
-serdes_driver_current_lane2_xe5=0x4
-serdes_driver_current_lane3_xe5=0x4
-serdes_pre_driver_current_lane0_xe5=0x4
-serdes_pre_driver_current_lane1_xe5=0x4
-serdes_pre_driver_current_lane2_xe5=0x4
-serdes_pre_driver_current_lane3_xe5=0x4
-serdes_preemphasis_lane0_xe5=0xc6e0
-serdes_preemphasis_lane1_xe5=0xc2f0
-serdes_preemphasis_lane2_xe5=0xc2f0
-serdes_preemphasis_lane3_xe5=0xcad0
-
-# xe6 (40G)
-portmap_7=1:40
-xgxs_rx_lane_map_7=0x213
-xgxs_tx_lane_map_7=0x2031
-phy_xaui_rx_polarity_flip_7=0xe
-phy_xaui_tx_polarity_flip_7=0xd
-serdes_driver_current_lane0_xe6=0x5
-serdes_driver_current_lane1_xe6=0x5
-serdes_driver_current_lane2_xe6=0x5
-serdes_driver_current_lane3_xe6=0x5
-serdes_pre_driver_current_lane0_xe6=0x5
-serdes_pre_driver_current_lane1_xe6=0x5
-serdes_pre_driver_current_lane2_xe6=0x5
-serdes_pre_driver_current_lane3_xe6=0x5
-serdes_preemphasis_lane0_xe6=0xc6e0
-serdes_preemphasis_lane1_xe6=0xcad0
-serdes_preemphasis_lane2_xe6=0xc6e0
-serdes_preemphasis_lane3_xe6=0xcad0
-
-# xe7 (40G)
-portmap_8=5:40
-xgxs_rx_lane_map_8=0x213
-xgxs_tx_lane_map_8=0x1203
-phy_xaui_rx_polarity_flip_8=0xc
-phy_xaui_tx_polarity_flip_8=0x1
-serdes_driver_current_lane0_xe7=0x4
-serdes_driver_current_lane1_xe7=0x4
-serdes_driver_current_lane2_xe7=0x4
-serdes_driver_current_lane3_xe7=0x4
-serdes_pre_driver_current_lane0_xe7=0x4
-serdes_pre_driver_current_lane1_xe7=0x4
-serdes_pre_driver_current_lane2_xe7=0x4
-serdes_pre_driver_current_lane3_xe7=0x4
-serdes_preemphasis_lane0_xe7=0xc6e0
-serdes_preemphasis_lane1_xe7=0xc6e0
-serdes_preemphasis_lane2_xe7=0xc6e0
-serdes_preemphasis_lane3_xe7=0xc6e0
-
-# xe8 (40G)
-portmap_9=13:40
-xgxs_rx_lane_map_9=0x213
-xgxs_tx_lane_map_9=0x132
-phy_xaui_rx_polarity_flip_9=0xe
-phy_xaui_tx_polarity_flip_9=0x0
-serdes_driver_current_lane0_xe8=0x2
-serdes_driver_current_lane1_xe8=0x3
-serdes_driver_current_lane2_xe8=0x2
-serdes_driver_current_lane3_xe8=0x2
-serdes_pre_driver_current_lane0_xe8=0x2
-serdes_pre_driver_current_lane1_xe8=0x3
-serdes_pre_driver_current_lane2_xe8=0x2
-serdes_pre_driver_current_lane3_xe8=0x2
-serdes_preemphasis_lane0_xe8=0xb270
-serdes_preemphasis_lane1_xe8=0xbb10
-serdes_preemphasis_lane2_xe8=0xb720
-serdes_preemphasis_lane3_xe8=0xb720
-
-# xe9 (40G)
-portmap_10=9:40
-xgxs_rx_lane_map_10=0x3120
-xgxs_tx_lane_map_10=0x3021
-phy_xaui_rx_polarity_flip_10=0x0
-phy_xaui_tx_polarity_flip_10=0x4
-serdes_driver_current_lane0_xe9=0x3
-serdes_driver_current_lane1_xe9=0x3
-serdes_driver_current_lane2_xe9=0x3
-serdes_driver_current_lane3_xe9=0x3
-serdes_pre_driver_current_lane0_xe9=0x3
-serdes_pre_driver_current_lane1_xe9=0x3
-serdes_pre_driver_current_lane2_xe9=0x3
-serdes_pre_driver_current_lane3_xe9=0x3
-serdes_preemphasis_lane0_xe9=0xc2f0
-serdes_preemphasis_lane1_xe9=0xc6e0
-serdes_preemphasis_lane2_xe9=0xbf00
-serdes_preemphasis_lane3_xe9=0xc2f0
-
-# xe10 (40G)
-portmap_11=17:40
-xgxs_rx_lane_map_11=0x213
-xgxs_tx_lane_map_11=0x132
-phy_xaui_rx_polarity_flip_11=0xe
-phy_xaui_tx_polarity_flip_11=0x0
-serdes_driver_current_lane0_xe10=0x2
-serdes_driver_current_lane1_xe10=0x2
-serdes_driver_current_lane2_xe10=0x2
-serdes_driver_current_lane3_xe10=0x2
-serdes_pre_driver_current_lane0_xe10=0x2
-serdes_pre_driver_current_lane1_xe10=0x2
-serdes_pre_driver_current_lane2_xe10=0x2
-serdes_pre_driver_current_lane3_xe10=0x2
-serdes_preemphasis_lane0_xe10=0xb330
-serdes_preemphasis_lane1_xe10=0xbb10
-serdes_preemphasis_lane2_xe10=0xbb10
-serdes_preemphasis_lane3_xe10=0xbb10
-
-# xe11 (40G)
-portmap_12=21:40
-xgxs_rx_lane_map_12=0x123
-xgxs_tx_lane_map_12=0x1203
-phy_xaui_rx_polarity_flip_12=0xc
-phy_xaui_tx_polarity_flip_12=0xe
-serdes_driver_current_lane0_xe11=0x2
-serdes_driver_current_lane1_xe11=0x2
-serdes_driver_current_lane2_xe11=0x2
-serdes_driver_current_lane3_xe11=0x2
-serdes_pre_driver_current_lane0_xe11=0x2
-serdes_pre_driver_current_lane1_xe11=0x2
-serdes_pre_driver_current_lane2_xe11=0x2
-serdes_pre_driver_current_lane3_xe11=0x2
-serdes_preemphasis_lane0_xe11=0xb330
-serdes_preemphasis_lane1_xe11=0xb330
-serdes_preemphasis_lane2_xe11=0xb330
-serdes_preemphasis_lane3_xe11=0xb330
-
-# xe12 (40G)
-portmap_13=53:40
-xgxs_rx_lane_map_13=0x213
-xgxs_tx_lane_map_13=0x231
-phy_xaui_rx_polarity_flip_13=0x1
-phy_xaui_tx_polarity_flip_13=0x0
-serdes_driver_current_lane0_xe12=0x2
-serdes_driver_current_lane1_xe12=0x2
-serdes_driver_current_lane2_xe12=0x2
-serdes_driver_current_lane3_xe12=0x2
-serdes_pre_driver_current_lane0_xe12=0x2
-serdes_pre_driver_current_lane1_xe12=0x2
-serdes_pre_driver_current_lane2_xe12=0x2
-serdes_pre_driver_current_lane3_xe12=0x2
-serdes_preemphasis_lane0_xe12=0xaf40
-serdes_preemphasis_lane1_xe12=0xaf40
-serdes_preemphasis_lane2_xe12=0xaf40
-serdes_preemphasis_lane3_xe12=0xaf40
-
-# xe13 (40G)
-portmap_14=49:40
-xgxs_rx_lane_map_14=0x1302
-xgxs_tx_lane_map_14=0x2031
-phy_xaui_rx_polarity_flip_14=0xb
-phy_xaui_tx_polarity_flip_14=0x3
-serdes_driver_current_lane0_xe13=0x2
-serdes_driver_current_lane1_xe13=0x2
-serdes_driver_current_lane2_xe13=0x2
-serdes_driver_current_lane3_xe13=0x2
-serdes_pre_driver_current_lane0_xe13=0x2
-serdes_pre_driver_current_lane1_xe13=0x2
-serdes_pre_driver_current_lane2_xe13=0x2
-serdes_pre_driver_current_lane3_xe13=0x2
-serdes_preemphasis_lane0_xe13=0xa760
-serdes_preemphasis_lane1_xe13=0xa760
-serdes_preemphasis_lane2_xe13=0xa760
-serdes_preemphasis_lane3_xe13=0xa760
-
-# xe14 (40G)
-portmap_15=57:40
-xgxs_rx_lane_map_15=0x213
-xgxs_tx_lane_map_15=0x2031
-phy_xaui_rx_polarity_flip_15=0x1
-phy_xaui_tx_polarity_flip_15=0x0
-serdes_driver_current_lane0_xe14=0x1
-serdes_driver_current_lane1_xe14=0x1
-serdes_driver_current_lane2_xe14=0x1
-serdes_driver_current_lane3_xe14=0x1
-serdes_pre_driver_current_lane0_xe14=0x1
-serdes_pre_driver_current_lane1_xe14=0x1
-serdes_pre_driver_current_lane2_xe14=0x1
-serdes_pre_driver_current_lane3_xe14=0x1
-serdes_preemphasis_lane0_xe14=0xa760
-serdes_preemphasis_lane1_xe14=0xa760
-serdes_preemphasis_lane2_xe14=0xa760
-serdes_preemphasis_lane3_xe14=0xa760
-
-# xe15 (40G)
-portmap_16=61:40
-xgxs_rx_lane_map_16=0x132
-xgxs_tx_lane_map_16=0x213
-phy_xaui_rx_polarity_flip_16=0x0
-phy_xaui_tx_polarity_flip_16=0x0
-serdes_driver_current_lane0_xe15=0x2
-serdes_driver_current_lane1_xe15=0x2
-serdes_driver_current_lane2_xe15=0x2
-serdes_driver_current_lane3_xe15=0x2
-serdes_pre_driver_current_lane0_xe15=0x2
-serdes_pre_driver_current_lane1_xe15=0x2
-serdes_pre_driver_current_lane2_xe15=0x2
-serdes_pre_driver_current_lane3_xe15=0x2
-serdes_preemphasis_lane0_xe15=0xa760
-serdes_preemphasis_lane1_xe15=0xa760
-serdes_preemphasis_lane2_xe15=0xa760
-serdes_preemphasis_lane3_xe15=0xa760
-
-# xe16 (40G)
-portmap_17=69:40
-xgxs_rx_lane_map_17=0x213
-xgxs_tx_lane_map_17=0x2130
-phy_xaui_rx_polarity_flip_17=0x1
-phy_xaui_tx_polarity_flip_17=0xf
-serdes_driver_current_lane0_xe16=0x1
-serdes_driver_current_lane1_xe16=0x1
-serdes_driver_current_lane2_xe16=0x1
-serdes_driver_current_lane3_xe16=0x1
-serdes_pre_driver_current_lane0_xe16=0x1
-serdes_pre_driver_current_lane1_xe16=0x1
-serdes_pre_driver_current_lane2_xe16=0x1
-serdes_pre_driver_current_lane3_xe16=0x1
-serdes_preemphasis_lane0_xe16=0xa760
-serdes_preemphasis_lane1_xe16=0xa760
-serdes_preemphasis_lane2_xe16=0xa760
-serdes_preemphasis_lane3_xe16=0xa760
-
-# xe17 (40G)
-portmap_18=65:40
-xgxs_rx_lane_map_18=0x132
-xgxs_tx_lane_map_18=0x2031
-phy_xaui_rx_polarity_flip_18=0x3
-phy_xaui_tx_polarity_flip_18=0x9
-serdes_driver_current_lane0_xe17=0x1
-serdes_driver_current_lane1_xe17=0x1
-serdes_driver_current_lane2_xe17=0x1
-serdes_driver_current_lane3_xe17=0x1
-serdes_pre_driver_current_lane0_xe17=0x1
-serdes_pre_driver_current_lane1_xe17=0x1
-serdes_pre_driver_current_lane2_xe17=0x1
-serdes_pre_driver_current_lane3_xe17=0x1
-serdes_preemphasis_lane0_xe17=0xa370
-serdes_preemphasis_lane1_xe17=0xa370
-serdes_preemphasis_lane2_xe17=0xa370
-serdes_preemphasis_lane3_xe17=0xa370
-
-# xe18 (40G)
-portmap_19=73:40
-xgxs_rx_lane_map_19=0x213
-xgxs_tx_lane_map_19=0x2031
-phy_xaui_rx_polarity_flip_19=0x1
-phy_xaui_tx_polarity_flip_19=0x0
-serdes_driver_current_lane0_xe18=0x2
-serdes_driver_current_lane1_xe18=0x2
-serdes_driver_current_lane2_xe18=0x2
-serdes_driver_current_lane3_xe18=0x2
-serdes_pre_driver_current_lane0_xe18=0x2
-serdes_pre_driver_current_lane1_xe18=0x2
-serdes_pre_driver_current_lane2_xe18=0x2
-serdes_pre_driver_current_lane3_xe18=0x2
-serdes_preemphasis_lane0_xe18=0xa760
-serdes_preemphasis_lane1_xe18=0xa760
-serdes_preemphasis_lane2_xe18=0xa760
-serdes_preemphasis_lane3_xe18=0xa760
-
-# xe19 (40G)
-portmap_20=77:40
-xgxs_rx_lane_map_20=0x123
-xgxs_tx_lane_map_20=0x1203
-phy_xaui_rx_polarity_flip_20=0x3
-phy_xaui_tx_polarity_flip_20=0xe
-serdes_driver_current_lane0_xe19=0x2
-serdes_driver_current_lane1_xe19=0x2
-serdes_driver_current_lane2_xe19=0x2
-serdes_driver_current_lane3_xe19=0x2
-serdes_pre_driver_current_lane0_xe19=0x2
-serdes_pre_driver_current_lane1_xe19=0x2
-serdes_pre_driver_current_lane2_xe19=0x2
-serdes_pre_driver_current_lane3_xe19=0x2
-serdes_preemphasis_lane0_xe19=0xaf40
-serdes_preemphasis_lane1_xe19=0xaf40
-serdes_preemphasis_lane2_xe19=0xaf40
-serdes_preemphasis_lane3_xe19=0xaf40
-
-# xe20 (40G)
-portmap_21=109:40
-xgxs_rx_lane_map_21=0x132
-xgxs_tx_lane_map_21=0x132
-phy_xaui_rx_polarity_flip_21=0x8
-phy_xaui_tx_polarity_flip_21=0x0
-serdes_driver_current_lane0_xe20=0x1
-serdes_driver_current_lane1_xe20=0x1
-serdes_driver_current_lane2_xe20=0x1
-serdes_driver_current_lane3_xe20=0x2
-serdes_pre_driver_current_lane0_xe20=0x1
-serdes_pre_driver_current_lane1_xe20=0x1
-serdes_pre_driver_current_lane2_xe20=0x1
-serdes_pre_driver_current_lane3_xe20=0x2
-serdes_preemphasis_lane0_xe20=0xb330
-serdes_preemphasis_lane1_xe20=0xb330
-serdes_preemphasis_lane2_xe20=0xb330
-serdes_preemphasis_lane3_xe20=0xbff0
-
-# xe21 (40G)
-portmap_22=105:40
-xgxs_rx_lane_map_22=0x1320
-xgxs_tx_lane_map_22=0x3021
-phy_xaui_rx_polarity_flip_22=0xd
-phy_xaui_tx_polarity_flip_22=0xb
-serdes_driver_current_lane0_xe21=0x1
-serdes_driver_current_lane1_xe21=0x1
-serdes_driver_current_lane2_xe21=0x1
-serdes_driver_current_lane3_xe21=0x1
-serdes_pre_driver_current_lane0_xe21=0x1
-serdes_pre_driver_current_lane1_xe21=0x1
-serdes_pre_driver_current_lane2_xe21=0x1
-serdes_pre_driver_current_lane3_xe21=0x1
-serdes_preemphasis_lane0_xe21=0xb330
-serdes_preemphasis_lane1_xe21=0xb330
-serdes_preemphasis_lane2_xe21=0xb330
-serdes_preemphasis_lane3_xe21=0xb330
-
-# xe22 (40G)
-portmap_23=113:40
-xgxs_rx_lane_map_23=0x132
-xgxs_tx_lane_map_23=0x132
-phy_xaui_rx_polarity_flip_23=0x8
-phy_xaui_tx_polarity_flip_23=0x0
-serdes_driver_current_lane0_xe22=0x1
-serdes_driver_current_lane1_xe22=0x1
-serdes_driver_current_lane2_xe22=0x1
-serdes_driver_current_lane3_xe22=0x1
-serdes_pre_driver_current_lane0_xe22=0x1
-serdes_pre_driver_current_lane1_xe22=0x1
-serdes_pre_driver_current_lane2_xe22=0x1
-serdes_pre_driver_current_lane3_xe22=0x1
-serdes_preemphasis_lane0_xe22=0xbb10
-serdes_preemphasis_lane1_xe22=0xbb10
-serdes_preemphasis_lane2_xe22=0xbb10
-serdes_preemphasis_lane3_xe22=0xc2f0
-
-# xe23 (40G)
-portmap_24=117:40
-xgxs_rx_lane_map_24=0x231
-xgxs_tx_lane_map_24=0x1203
-phy_xaui_rx_polarity_flip_24=0x3
-phy_xaui_tx_polarity_flip_24=0xe
-serdes_driver_current_lane0_xe23=0x3
-serdes_driver_current_lane1_xe23=0x5
-serdes_driver_current_lane2_xe23=0x3
-serdes_driver_current_lane3_xe23=0x3
-serdes_pre_driver_current_lane0_xe23=0x3
-serdes_pre_driver_current_lane1_xe23=0x5
-serdes_pre_driver_current_lane2_xe23=0x3
-serdes_pre_driver_current_lane3_xe23=0x3
-serdes_preemphasis_lane0_xe23=0xc6e0
-serdes_preemphasis_lane1_xe23=0xc6e0
-serdes_preemphasis_lane2_xe23=0xc6e0
-serdes_preemphasis_lane3_xe23=0xc6e0
-
-# xe24 (40G)
-portmap_25=125:40
-xgxs_rx_lane_map_25=0x132
-xgxs_tx_lane_map_25=0x132
-phy_xaui_rx_polarity_flip_25=0x8
-phy_xaui_tx_polarity_flip_25=0x0
-serdes_driver_current_lane0_xe24=0x4
-serdes_driver_current_lane1_xe24=0x4
-serdes_driver_current_lane2_xe24=0x4
-serdes_driver_current_lane3_xe24=0x4
-serdes_pre_driver_current_lane0_xe24=0x4
-serdes_pre_driver_current_lane1_xe24=0x4
-serdes_pre_driver_current_lane2_xe24=0x4
-serdes_pre_driver_current_lane3_xe24=0x4
-serdes_preemphasis_lane0_xe24=0xc6e0
-serdes_preemphasis_lane1_xe24=0xc6e0
-serdes_preemphasis_lane2_xe24=0xc6e0
-serdes_preemphasis_lane3_xe24=0xcec0
-
-# xe25 (40G)
-portmap_26=121:40
-xgxs_rx_lane_map_26=0x1320
-xgxs_tx_lane_map_26=0x3021
-phy_xaui_rx_polarity_flip_26=0xd
-phy_xaui_tx_polarity_flip_26=0xb
-serdes_driver_current_lane0_xe25=0x4
-serdes_driver_current_lane1_xe25=0x4
-serdes_driver_current_lane2_xe25=0x4
-serdes_driver_current_lane3_xe25=0x4
-serdes_pre_driver_current_lane0_xe25=0x4
-serdes_pre_driver_current_lane1_xe25=0x4
-serdes_pre_driver_current_lane2_xe25=0x4
-serdes_pre_driver_current_lane3_xe25=0x4
-serdes_preemphasis_lane0_xe25=0xc6e0
-serdes_preemphasis_lane1_xe25=0xc6e0
-serdes_preemphasis_lane2_xe25=0xc6e0
-serdes_preemphasis_lane3_xe25=0xc6e0
-
-# xe26 (40G)
-portmap_27=81:40
-xgxs_rx_lane_map_27=0x1320
-xgxs_tx_lane_map_27=0x2031
-phy_xaui_rx_polarity_flip_27=0x1
-phy_xaui_tx_polarity_flip_27=0x2
-serdes_driver_current_lane0_xe26=0x2
-serdes_driver_current_lane1_xe26=0x2
-serdes_driver_current_lane2_xe26=0x2
-serdes_driver_current_lane3_xe26=0x2
-serdes_pre_driver_current_lane0_xe26=0x2
-serdes_pre_driver_current_lane1_xe26=0x2
-serdes_pre_driver_current_lane2_xe26=0x2
-serdes_pre_driver_current_lane3_xe26=0x2
-serdes_preemphasis_lane0_xe26=0xbb10
-serdes_preemphasis_lane1_xe26=0xbb10
-serdes_preemphasis_lane2_xe26=0xbf00
-serdes_preemphasis_lane3_xe26=0xbb10
-
-# xe27 (40G)
-portmap_28=85:40
-xgxs_rx_lane_map_28=0x213
-xgxs_tx_lane_map_28=0x1203
-phy_xaui_rx_polarity_flip_28=0xc
-phy_xaui_tx_polarity_flip_28=0xe
-serdes_driver_current_lane0_xe27=0x4
-serdes_driver_current_lane1_xe27=0x5
-serdes_driver_current_lane2_xe27=0x4
-serdes_driver_current_lane3_xe27=0x5
-serdes_pre_driver_current_lane0_xe27=0x4
-serdes_pre_driver_current_lane1_xe27=0x5
-serdes_pre_driver_current_lane2_xe27=0x4
-serdes_pre_driver_current_lane3_xe27=0x5
-serdes_preemphasis_lane0_xe27=0xc2f0
-serdes_preemphasis_lane1_xe27=0xc6e0
-serdes_preemphasis_lane2_xe27=0xc6e0
-serdes_preemphasis_lane3_xe27=0xc6e0
-
-# xe28 (40G)
-portmap_29=93:40
-xgxs_rx_lane_map_29=0x1320
-xgxs_tx_lane_map_29=0x2031
-phy_xaui_rx_polarity_flip_29=0x1
-phy_xaui_tx_polarity_flip_29=0x2
-serdes_driver_current_lane0_xe28=0x4
-serdes_driver_current_lane1_xe28=0x4
-serdes_driver_current_lane2_xe28=0x4
-serdes_driver_current_lane3_xe28=0x4
-serdes_pre_driver_current_lane0_xe28=0x4
-serdes_pre_driver_current_lane1_xe28=0x4
-serdes_pre_driver_current_lane2_xe28=0x4
-serdes_pre_driver_current_lane3_xe28=0x4
-serdes_preemphasis_lane0_xe28=0xc2f0
-serdes_preemphasis_lane1_xe28=0xc2f0
-serdes_preemphasis_lane2_xe28=0xc2f0
-serdes_preemphasis_lane3_xe28=0xc2f0
-
-# xe29 (40G)
-portmap_30=89:40
-xgxs_rx_lane_map_30=0x1320
-xgxs_tx_lane_map_30=0x3021
-phy_xaui_rx_polarity_flip_30=0x2
-phy_xaui_tx_polarity_flip_30=0xb
-serdes_driver_current_lane0_xe29=0x4
-serdes_driver_current_lane1_xe29=0x4
-serdes_driver_current_lane2_xe29=0x4
-serdes_driver_current_lane3_xe29=0x4
-serdes_pre_driver_current_lane0_xe29=0x4
-serdes_pre_driver_current_lane1_xe29=0x4
-serdes_pre_driver_current_lane2_xe29=0x4
-serdes_pre_driver_current_lane3_xe29=0x4
-serdes_preemphasis_lane0_xe29=0xcad0
-serdes_preemphasis_lane1_xe29=0xc6e0
-serdes_preemphasis_lane2_xe29=0xc6e0
-serdes_preemphasis_lane3_xe29=0xc6e0
-
-# xe30 (40G)
-portmap_31=101:40
-xgxs_rx_lane_map_31=0x1320
-xgxs_tx_lane_map_31=0x1203
-phy_xaui_rx_polarity_flip_31=0x1
-phy_xaui_tx_polarity_flip_31=0x6
-serdes_driver_current_lane0_xe30=0x6
-serdes_driver_current_lane1_xe30=0x6
-serdes_driver_current_lane2_xe30=0x6
-serdes_driver_current_lane3_xe30=0x7
-serdes_pre_driver_current_lane0_xe30=0x6
-serdes_pre_driver_current_lane1_xe30=0x6
-serdes_pre_driver_current_lane2_xe30=0x6
-serdes_pre_driver_current_lane3_xe30=0x7
-serdes_preemphasis_lane0_xe30=0xcec0
-serdes_preemphasis_lane1_xe30=0xcec0
-serdes_preemphasis_lane2_xe30=0xcad0
-serdes_preemphasis_lane3_xe30=0xc6e0
-
-# xe31 (40G)
-portmap_32=97:40
-xgxs_rx_lane_map_32=0x213
-xgxs_tx_lane_map_32=0x2031
-phy_xaui_rx_polarity_flip_32=0xc
-phy_xaui_tx_polarity_flip_32=0x3
-serdes_driver_current_lane0_xe31=0x5
-serdes_driver_current_lane1_xe31=0x5
-serdes_driver_current_lane2_xe31=0x5
-serdes_driver_current_lane3_xe31=0x5
-serdes_pre_driver_current_lane0_xe31=0x5
-serdes_pre_driver_current_lane1_xe31=0x5
-serdes_pre_driver_current_lane2_xe31=0x5
-serdes_pre_driver_current_lane3_xe31=0x5
-serdes_preemphasis_lane0_xe31=0xcad0
-serdes_preemphasis_lane1_xe31=0xcad0
-serdes_preemphasis_lane2_xe31=0xcad0
-serdes_preemphasis_lane3_xe31=0xcad0
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/5/buffers.json.j2 b/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/5/buffers.json.j2
deleted file mode 100644
index b67cf577ab75..000000000000
--- a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/5/buffers.json.j2
+++ /dev/null
@@ -1,3 +0,0 @@
-{%- set default_topo = 't1' %}
-{%- include 'buffers_config.j2' %}
-
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/5/buffers_defaults_def.j2 b/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/5/buffers_defaults_def.j2
deleted file mode 100644
index 38e34eb571e8..000000000000
--- a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/5/buffers_defaults_def.j2
+++ /dev/null
@@ -1,45 +0,0 @@
-{%- set default_cable = '300m' %}
-
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {% for port_idx in range(0,32) %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
-    {% endfor %}
-{%- endmacro %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "12766208",
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "12766208",
-            "type": "egress",
-            "mode": "static"
-        },
-        "egress_lossy_pool": {
-            "size": "7326924",
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "static_th":"12766208"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"1518",
-            "dynamic_th":"3"
-        }
-    },
-{%- endmacro %}
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/5/buffers_defaults_t0.j2 b/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/5/buffers_defaults_t0.j2
deleted file mode 100644
index 38e34eb571e8..000000000000
--- a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/5/buffers_defaults_t0.j2
+++ /dev/null
@@ -1,45 +0,0 @@
-{%- set default_cable = '300m' %}
-
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {% for port_idx in range(0,32) %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
-    {% endfor %}
-{%- endmacro %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "12766208",
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "12766208",
-            "type": "egress",
-            "mode": "static"
-        },
-        "egress_lossy_pool": {
-            "size": "7326924",
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "static_th":"12766208"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"1518",
-            "dynamic_th":"3"
-        }
-    },
-{%- endmacro %}
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/5/buffers_defaults_t1.j2 b/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/5/buffers_defaults_t1.j2
deleted file mode 100644
index 38e34eb571e8..000000000000
--- a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/5/buffers_defaults_t1.j2
+++ /dev/null
@@ -1,45 +0,0 @@
-{%- set default_cable = '300m' %}
-
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {% for port_idx in range(0,32) %}
-        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
-    {% endfor %}
-{%- endmacro %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "12766208",
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "12766208",
-            "type": "egress",
-            "mode": "static"
-        },
-        "egress_lossy_pool": {
-            "size": "7326924",
-            "type": "egress",
-            "mode": "dynamic"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "static_th":"12766208"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"1518",
-            "dynamic_th":"3"
-        }
-    },
-{%- endmacro %}
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/5/pg_profile_lookup.ini b/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/5/pg_profile_lookup.ini
deleted file mode 100644
index 9f2eacb6fc42..000000000000
--- a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/5/pg_profile_lookup.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-# PG lossless profiles.
-# speed cable size      xon     xoff   threshold xon_offset
-  10000  5m   56368     18432   55120  -3        2496
-  25000  5m   56368     18432   55120  -3        2496
-  40000  5m   56368     18432   55120  -3        2496
-  50000  5m   56368     18432   55120  -3        2496
- 100000  5m   56368     18432   55120  -3        2496
-  10000  40m  56368     18432   55120  -3        2496
-  25000  40m  56368     18432   55120  -3        2496
-  40000  40m  56368     18432   55120  -3        2496
-  50000  40m  56368     18432   55120  -3        2496
- 100000  40m  56368     18432   55120  -3        2496
-  10000  300m 56368     18432   55120  -3        2496
-  25000  300m 56368     18432   55120  -3        2496
-  40000  300m 56368     18432   55120  -3        2496
-  50000  300m 56368     18432   55120  -3        2496
- 100000  300m 56368     18432   55120  -3        2496
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/5/qos.json.j2 b/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/5/qos.json.j2
deleted file mode 100644
index 3e548325ea30..000000000000
--- a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/5/qos.json.j2
+++ /dev/null
@@ -1 +0,0 @@
-{%- include 'qos_config.j2' %}
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/5/sai.profile b/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/5/sai.profile
deleted file mode 100644
index 0a2df177f1c5..000000000000
--- a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/5/sai.profile
+++ /dev/null
@@ -1,3 +0,0 @@
-SAI_VS_SWITCH_TYPE=SAI_VS_SWITCH_TYPE_BCM56850
-SAI_VS_HOSTIF_USE_TAP_DEVICE=true
-SAI_VS_INTERFACE_LANE_MAP_FILE=/usr/share/sonic/hwsku/lanemap.ini
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/5/td2-s6000-32x40G.config.bcm b/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/5/td2-s6000-32x40G.config.bcm
deleted file mode 100644
index 0e25b4d4232d..000000000000
--- a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/5/td2-s6000-32x40G.config.bcm
+++ /dev/null
@@ -1,646 +0,0 @@
-# Old LPM only configuration
-# l2_mem_entries=163840
-# l3_mem_entries=90112
-# l3_alpm_enable=0
-# ipv6_lpm_128b_enable=0
-#
-# ALPM enable
-l3_alpm_enable=2
-ipv6_lpm_128b_enable=1
-l2_mem_entries=32768
-l3_mem_entries=16384
-
-# From old config file
-os=unix
-higig2_hdr_mode=1
-
-# Parity
-parity_correction=1
-parity_enable=1
-stat_if_parity_enable=0
-
-#
-bcm_num_cos=10
-bcm_stat_interval=2000000
-l2xmsg_hostbuf_size=8192
-l2xmsg_mode=1
-lls_num_l2uc=12
-max_vp_lags=0
-miim_intr_enable=0
-mmu_lossless=0
-module_64ports=0
-schan_intr_enable=0
-stable_size=0x2000000
-tdma_timeout_usec=5000000
-
-pbmp_oversubscribe=0x000007fffffffffffffffffffffffffe
-pbmp_xport_xe=0x000007fffffffffffffffffffffffffe
-
-# Ports configuration
-# xe0 (40G)
-portmap_1=25:40
-xgxs_rx_lane_map_1=0x213
-xgxs_tx_lane_map_1=0x2031
-phy_xaui_rx_polarity_flip_1=0xe
-phy_xaui_tx_polarity_flip_1=0x2
-serdes_driver_current_lane0_xe0=0x5
-serdes_driver_current_lane1_xe0=0x5
-serdes_driver_current_lane2_xe0=0x5
-serdes_driver_current_lane3_xe0=0x5
-serdes_pre_driver_current_lane0_xe0=0x5
-serdes_pre_driver_current_lane1_xe0=0x5
-serdes_pre_driver_current_lane2_xe0=0x5
-serdes_pre_driver_current_lane3_xe0=0x5
-serdes_preemphasis_lane0_xe0=0xcad0
-serdes_preemphasis_lane1_xe0=0xc6e0
-serdes_preemphasis_lane2_xe0=0xc6e0
-serdes_preemphasis_lane3_xe0=0xd2b0
-
-# xe1 (40G)
-portmap_2=29:40
-xgxs_rx_lane_map_2=0x213
-xgxs_tx_lane_map_2=0x213
-phy_xaui_rx_polarity_flip_2=0xc
-phy_xaui_tx_polarity_flip_2=0x9
-serdes_driver_current_lane0_xe1=0x6
-serdes_driver_current_lane1_xe1=0x7
-serdes_driver_current_lane2_xe1=0x6
-serdes_driver_current_lane3_xe1=0x6
-serdes_pre_driver_current_lane0_xe1=0x6
-serdes_pre_driver_current_lane1_xe1=0x7
-serdes_pre_driver_current_lane2_xe1=0x6
-serdes_pre_driver_current_lane3_xe1=0x6
-serdes_preemphasis_lane0_xe1=0xc2f0
-serdes_preemphasis_lane1_xe1=0xd2b0
-serdes_preemphasis_lane2_xe1=0xc6e0
-serdes_preemphasis_lane3_xe1=0xc2f0
-
-# xe2 (40G)
-portmap_3=33:40
-xgxs_rx_lane_map_3=0x213
-xgxs_tx_lane_map_3=0x132
-phy_xaui_rx_polarity_flip_3=0xe
-phy_xaui_tx_polarity_flip_3=0x2
-serdes_driver_current_lane0_xe2=0x4
-serdes_driver_current_lane1_xe2=0x4
-serdes_driver_current_lane2_xe2=0x4
-serdes_driver_current_lane3_xe2=0x4
-serdes_pre_driver_current_lane0_xe2=0x4
-serdes_pre_driver_current_lane1_xe2=0x4
-serdes_pre_driver_current_lane2_xe2=0x4
-serdes_pre_driver_current_lane3_xe2=0x4
-serdes_preemphasis_lane0_xe2=0xc6e0
-serdes_preemphasis_lane1_xe2=0xc6e0
-serdes_preemphasis_lane2_xe2=0xc6e0
-serdes_preemphasis_lane3_xe2=0xc6e0
-
-# xe3 (40G)
-portmap_4=37:40
-xgxs_rx_lane_map_4=0x213
-xgxs_tx_lane_map_4=0x1203
-phy_xaui_rx_polarity_flip_4=0x3
-phy_xaui_tx_polarity_flip_4=0xe
-serdes_driver_current_lane0_xe3=0x4
-serdes_driver_current_lane1_xe3=0x4
-serdes_driver_current_lane2_xe3=0x4
-serdes_driver_current_lane3_xe3=0x4
-serdes_pre_driver_current_lane0_xe3=0x4
-serdes_pre_driver_current_lane1_xe3=0x4
-serdes_pre_driver_current_lane2_xe3=0x4
-serdes_pre_driver_current_lane3_xe3=0x4
-serdes_preemphasis_lane0_xe3=0xcad0
-serdes_preemphasis_lane1_xe3=0xcad0
-serdes_preemphasis_lane2_xe3=0xc2f0
-serdes_preemphasis_lane3_xe3=0xc2f0
-
-# xe4 (40G)
-portmap_5=45:40
-xgxs_rx_lane_map_5=0x213
-xgxs_tx_lane_map_5=0x213
-phy_xaui_rx_polarity_flip_5=0xe
-phy_xaui_tx_polarity_flip_5=0x8
-serdes_driver_current_lane0_xe4=0x4
-serdes_driver_current_lane1_xe4=0x4
-serdes_driver_current_lane2_xe4=0x4
-serdes_driver_current_lane3_xe4=0x4
-serdes_pre_driver_current_lane0_xe4=0x4
-serdes_pre_driver_current_lane1_xe4=0x4
-serdes_pre_driver_current_lane2_xe4=0x4
-serdes_pre_driver_current_lane3_xe4=0x4
-serdes_preemphasis_lane0_xe4=0xc2f0
-serdes_preemphasis_lane1_xe4=0xc2f0
-serdes_preemphasis_lane2_xe4=0xc2f0
-serdes_preemphasis_lane3_xe4=0xc2f0
-
-# xe5 (40G)
-portmap_6=41:40
-xgxs_rx_lane_map_6=0x213
-xgxs_tx_lane_map_6=0x3021
-phy_xaui_rx_polarity_flip_6=0x3
-phy_xaui_tx_polarity_flip_6=0xb
-serdes_driver_current_lane0_xe5=0x4
-serdes_driver_current_lane1_xe5=0x4
-serdes_driver_current_lane2_xe5=0x4
-serdes_driver_current_lane3_xe5=0x4
-serdes_pre_driver_current_lane0_xe5=0x4
-serdes_pre_driver_current_lane1_xe5=0x4
-serdes_pre_driver_current_lane2_xe5=0x4
-serdes_pre_driver_current_lane3_xe5=0x4
-serdes_preemphasis_lane0_xe5=0xc6e0
-serdes_preemphasis_lane1_xe5=0xc2f0
-serdes_preemphasis_lane2_xe5=0xc2f0
-serdes_preemphasis_lane3_xe5=0xcad0
-
-# xe6 (40G)
-portmap_7=1:40
-xgxs_rx_lane_map_7=0x213
-xgxs_tx_lane_map_7=0x2031
-phy_xaui_rx_polarity_flip_7=0xe
-phy_xaui_tx_polarity_flip_7=0xd
-serdes_driver_current_lane0_xe6=0x5
-serdes_driver_current_lane1_xe6=0x5
-serdes_driver_current_lane2_xe6=0x5
-serdes_driver_current_lane3_xe6=0x5
-serdes_pre_driver_current_lane0_xe6=0x5
-serdes_pre_driver_current_lane1_xe6=0x5
-serdes_pre_driver_current_lane2_xe6=0x5
-serdes_pre_driver_current_lane3_xe6=0x5
-serdes_preemphasis_lane0_xe6=0xc6e0
-serdes_preemphasis_lane1_xe6=0xcad0
-serdes_preemphasis_lane2_xe6=0xc6e0
-serdes_preemphasis_lane3_xe6=0xcad0
-
-# xe7 (40G)
-portmap_8=5:40
-xgxs_rx_lane_map_8=0x213
-xgxs_tx_lane_map_8=0x1203
-phy_xaui_rx_polarity_flip_8=0xc
-phy_xaui_tx_polarity_flip_8=0x1
-serdes_driver_current_lane0_xe7=0x4
-serdes_driver_current_lane1_xe7=0x4
-serdes_driver_current_lane2_xe7=0x4
-serdes_driver_current_lane3_xe7=0x4
-serdes_pre_driver_current_lane0_xe7=0x4
-serdes_pre_driver_current_lane1_xe7=0x4
-serdes_pre_driver_current_lane2_xe7=0x4
-serdes_pre_driver_current_lane3_xe7=0x4
-serdes_preemphasis_lane0_xe7=0xc6e0
-serdes_preemphasis_lane1_xe7=0xc6e0
-serdes_preemphasis_lane2_xe7=0xc6e0
-serdes_preemphasis_lane3_xe7=0xc6e0
-
-# xe8 (40G)
-portmap_9=13:40
-xgxs_rx_lane_map_9=0x213
-xgxs_tx_lane_map_9=0x132
-phy_xaui_rx_polarity_flip_9=0xe
-phy_xaui_tx_polarity_flip_9=0x0
-serdes_driver_current_lane0_xe8=0x2
-serdes_driver_current_lane1_xe8=0x3
-serdes_driver_current_lane2_xe8=0x2
-serdes_driver_current_lane3_xe8=0x2
-serdes_pre_driver_current_lane0_xe8=0x2
-serdes_pre_driver_current_lane1_xe8=0x3
-serdes_pre_driver_current_lane2_xe8=0x2
-serdes_pre_driver_current_lane3_xe8=0x2
-serdes_preemphasis_lane0_xe8=0xb270
-serdes_preemphasis_lane1_xe8=0xbb10
-serdes_preemphasis_lane2_xe8=0xb720
-serdes_preemphasis_lane3_xe8=0xb720
-
-# xe9 (40G)
-portmap_10=9:40
-xgxs_rx_lane_map_10=0x3120
-xgxs_tx_lane_map_10=0x3021
-phy_xaui_rx_polarity_flip_10=0x0
-phy_xaui_tx_polarity_flip_10=0x4
-serdes_driver_current_lane0_xe9=0x3
-serdes_driver_current_lane1_xe9=0x3
-serdes_driver_current_lane2_xe9=0x3
-serdes_driver_current_lane3_xe9=0x3
-serdes_pre_driver_current_lane0_xe9=0x3
-serdes_pre_driver_current_lane1_xe9=0x3
-serdes_pre_driver_current_lane2_xe9=0x3
-serdes_pre_driver_current_lane3_xe9=0x3
-serdes_preemphasis_lane0_xe9=0xc2f0
-serdes_preemphasis_lane1_xe9=0xc6e0
-serdes_preemphasis_lane2_xe9=0xbf00
-serdes_preemphasis_lane3_xe9=0xc2f0
-
-# xe10 (40G)
-portmap_11=17:40
-xgxs_rx_lane_map_11=0x213
-xgxs_tx_lane_map_11=0x132
-phy_xaui_rx_polarity_flip_11=0xe
-phy_xaui_tx_polarity_flip_11=0x0
-serdes_driver_current_lane0_xe10=0x2
-serdes_driver_current_lane1_xe10=0x2
-serdes_driver_current_lane2_xe10=0x2
-serdes_driver_current_lane3_xe10=0x2
-serdes_pre_driver_current_lane0_xe10=0x2
-serdes_pre_driver_current_lane1_xe10=0x2
-serdes_pre_driver_current_lane2_xe10=0x2
-serdes_pre_driver_current_lane3_xe10=0x2
-serdes_preemphasis_lane0_xe10=0xb330
-serdes_preemphasis_lane1_xe10=0xbb10
-serdes_preemphasis_lane2_xe10=0xbb10
-serdes_preemphasis_lane3_xe10=0xbb10
-
-# xe11 (40G)
-portmap_12=21:40
-xgxs_rx_lane_map_12=0x123
-xgxs_tx_lane_map_12=0x1203
-phy_xaui_rx_polarity_flip_12=0xc
-phy_xaui_tx_polarity_flip_12=0xe
-serdes_driver_current_lane0_xe11=0x2
-serdes_driver_current_lane1_xe11=0x2
-serdes_driver_current_lane2_xe11=0x2
-serdes_driver_current_lane3_xe11=0x2
-serdes_pre_driver_current_lane0_xe11=0x2
-serdes_pre_driver_current_lane1_xe11=0x2
-serdes_pre_driver_current_lane2_xe11=0x2
-serdes_pre_driver_current_lane3_xe11=0x2
-serdes_preemphasis_lane0_xe11=0xb330
-serdes_preemphasis_lane1_xe11=0xb330
-serdes_preemphasis_lane2_xe11=0xb330
-serdes_preemphasis_lane3_xe11=0xb330
-
-# xe12 (40G)
-portmap_13=53:40
-xgxs_rx_lane_map_13=0x213
-xgxs_tx_lane_map_13=0x231
-phy_xaui_rx_polarity_flip_13=0x1
-phy_xaui_tx_polarity_flip_13=0x0
-serdes_driver_current_lane0_xe12=0x2
-serdes_driver_current_lane1_xe12=0x2
-serdes_driver_current_lane2_xe12=0x2
-serdes_driver_current_lane3_xe12=0x2
-serdes_pre_driver_current_lane0_xe12=0x2
-serdes_pre_driver_current_lane1_xe12=0x2
-serdes_pre_driver_current_lane2_xe12=0x2
-serdes_pre_driver_current_lane3_xe12=0x2
-serdes_preemphasis_lane0_xe12=0xaf40
-serdes_preemphasis_lane1_xe12=0xaf40
-serdes_preemphasis_lane2_xe12=0xaf40
-serdes_preemphasis_lane3_xe12=0xaf40
-
-# xe13 (40G)
-portmap_14=49:40
-xgxs_rx_lane_map_14=0x1302
-xgxs_tx_lane_map_14=0x2031
-phy_xaui_rx_polarity_flip_14=0xb
-phy_xaui_tx_polarity_flip_14=0x3
-serdes_driver_current_lane0_xe13=0x2
-serdes_driver_current_lane1_xe13=0x2
-serdes_driver_current_lane2_xe13=0x2
-serdes_driver_current_lane3_xe13=0x2
-serdes_pre_driver_current_lane0_xe13=0x2
-serdes_pre_driver_current_lane1_xe13=0x2
-serdes_pre_driver_current_lane2_xe13=0x2
-serdes_pre_driver_current_lane3_xe13=0x2
-serdes_preemphasis_lane0_xe13=0xa760
-serdes_preemphasis_lane1_xe13=0xa760
-serdes_preemphasis_lane2_xe13=0xa760
-serdes_preemphasis_lane3_xe13=0xa760
-
-# xe14 (40G)
-portmap_15=57:40
-xgxs_rx_lane_map_15=0x213
-xgxs_tx_lane_map_15=0x2031
-phy_xaui_rx_polarity_flip_15=0x1
-phy_xaui_tx_polarity_flip_15=0x0
-serdes_driver_current_lane0_xe14=0x1
-serdes_driver_current_lane1_xe14=0x1
-serdes_driver_current_lane2_xe14=0x1
-serdes_driver_current_lane3_xe14=0x1
-serdes_pre_driver_current_lane0_xe14=0x1
-serdes_pre_driver_current_lane1_xe14=0x1
-serdes_pre_driver_current_lane2_xe14=0x1
-serdes_pre_driver_current_lane3_xe14=0x1
-serdes_preemphasis_lane0_xe14=0xa760
-serdes_preemphasis_lane1_xe14=0xa760
-serdes_preemphasis_lane2_xe14=0xa760
-serdes_preemphasis_lane3_xe14=0xa760
-
-# xe15 (40G)
-portmap_16=61:40
-xgxs_rx_lane_map_16=0x132
-xgxs_tx_lane_map_16=0x213
-phy_xaui_rx_polarity_flip_16=0x0
-phy_xaui_tx_polarity_flip_16=0x0
-serdes_driver_current_lane0_xe15=0x2
-serdes_driver_current_lane1_xe15=0x2
-serdes_driver_current_lane2_xe15=0x2
-serdes_driver_current_lane3_xe15=0x2
-serdes_pre_driver_current_lane0_xe15=0x2
-serdes_pre_driver_current_lane1_xe15=0x2
-serdes_pre_driver_current_lane2_xe15=0x2
-serdes_pre_driver_current_lane3_xe15=0x2
-serdes_preemphasis_lane0_xe15=0xa760
-serdes_preemphasis_lane1_xe15=0xa760
-serdes_preemphasis_lane2_xe15=0xa760
-serdes_preemphasis_lane3_xe15=0xa760
-
-# xe16 (40G)
-portmap_17=69:40
-xgxs_rx_lane_map_17=0x213
-xgxs_tx_lane_map_17=0x2130
-phy_xaui_rx_polarity_flip_17=0x1
-phy_xaui_tx_polarity_flip_17=0xf
-serdes_driver_current_lane0_xe16=0x1
-serdes_driver_current_lane1_xe16=0x1
-serdes_driver_current_lane2_xe16=0x1
-serdes_driver_current_lane3_xe16=0x1
-serdes_pre_driver_current_lane0_xe16=0x1
-serdes_pre_driver_current_lane1_xe16=0x1
-serdes_pre_driver_current_lane2_xe16=0x1
-serdes_pre_driver_current_lane3_xe16=0x1
-serdes_preemphasis_lane0_xe16=0xa760
-serdes_preemphasis_lane1_xe16=0xa760
-serdes_preemphasis_lane2_xe16=0xa760
-serdes_preemphasis_lane3_xe16=0xa760
-
-# xe17 (40G)
-portmap_18=65:40
-xgxs_rx_lane_map_18=0x132
-xgxs_tx_lane_map_18=0x2031
-phy_xaui_rx_polarity_flip_18=0x3
-phy_xaui_tx_polarity_flip_18=0x9
-serdes_driver_current_lane0_xe17=0x1
-serdes_driver_current_lane1_xe17=0x1
-serdes_driver_current_lane2_xe17=0x1
-serdes_driver_current_lane3_xe17=0x1
-serdes_pre_driver_current_lane0_xe17=0x1
-serdes_pre_driver_current_lane1_xe17=0x1
-serdes_pre_driver_current_lane2_xe17=0x1
-serdes_pre_driver_current_lane3_xe17=0x1
-serdes_preemphasis_lane0_xe17=0xa370
-serdes_preemphasis_lane1_xe17=0xa370
-serdes_preemphasis_lane2_xe17=0xa370
-serdes_preemphasis_lane3_xe17=0xa370
-
-# xe18 (40G)
-portmap_19=73:40
-xgxs_rx_lane_map_19=0x213
-xgxs_tx_lane_map_19=0x2031
-phy_xaui_rx_polarity_flip_19=0x1
-phy_xaui_tx_polarity_flip_19=0x0
-serdes_driver_current_lane0_xe18=0x2
-serdes_driver_current_lane1_xe18=0x2
-serdes_driver_current_lane2_xe18=0x2
-serdes_driver_current_lane3_xe18=0x2
-serdes_pre_driver_current_lane0_xe18=0x2
-serdes_pre_driver_current_lane1_xe18=0x2
-serdes_pre_driver_current_lane2_xe18=0x2
-serdes_pre_driver_current_lane3_xe18=0x2
-serdes_preemphasis_lane0_xe18=0xa760
-serdes_preemphasis_lane1_xe18=0xa760
-serdes_preemphasis_lane2_xe18=0xa760
-serdes_preemphasis_lane3_xe18=0xa760
-
-# xe19 (40G)
-portmap_20=77:40
-xgxs_rx_lane_map_20=0x123
-xgxs_tx_lane_map_20=0x1203
-phy_xaui_rx_polarity_flip_20=0x3
-phy_xaui_tx_polarity_flip_20=0xe
-serdes_driver_current_lane0_xe19=0x2
-serdes_driver_current_lane1_xe19=0x2
-serdes_driver_current_lane2_xe19=0x2
-serdes_driver_current_lane3_xe19=0x2
-serdes_pre_driver_current_lane0_xe19=0x2
-serdes_pre_driver_current_lane1_xe19=0x2
-serdes_pre_driver_current_lane2_xe19=0x2
-serdes_pre_driver_current_lane3_xe19=0x2
-serdes_preemphasis_lane0_xe19=0xaf40
-serdes_preemphasis_lane1_xe19=0xaf40
-serdes_preemphasis_lane2_xe19=0xaf40
-serdes_preemphasis_lane3_xe19=0xaf40
-
-# xe20 (40G)
-portmap_21=109:40
-xgxs_rx_lane_map_21=0x132
-xgxs_tx_lane_map_21=0x132
-phy_xaui_rx_polarity_flip_21=0x8
-phy_xaui_tx_polarity_flip_21=0x0
-serdes_driver_current_lane0_xe20=0x1
-serdes_driver_current_lane1_xe20=0x1
-serdes_driver_current_lane2_xe20=0x1
-serdes_driver_current_lane3_xe20=0x2
-serdes_pre_driver_current_lane0_xe20=0x1
-serdes_pre_driver_current_lane1_xe20=0x1
-serdes_pre_driver_current_lane2_xe20=0x1
-serdes_pre_driver_current_lane3_xe20=0x2
-serdes_preemphasis_lane0_xe20=0xb330
-serdes_preemphasis_lane1_xe20=0xb330
-serdes_preemphasis_lane2_xe20=0xb330
-serdes_preemphasis_lane3_xe20=0xbff0
-
-# xe21 (40G)
-portmap_22=105:40
-xgxs_rx_lane_map_22=0x1320
-xgxs_tx_lane_map_22=0x3021
-phy_xaui_rx_polarity_flip_22=0xd
-phy_xaui_tx_polarity_flip_22=0xb
-serdes_driver_current_lane0_xe21=0x1
-serdes_driver_current_lane1_xe21=0x1
-serdes_driver_current_lane2_xe21=0x1
-serdes_driver_current_lane3_xe21=0x1
-serdes_pre_driver_current_lane0_xe21=0x1
-serdes_pre_driver_current_lane1_xe21=0x1
-serdes_pre_driver_current_lane2_xe21=0x1
-serdes_pre_driver_current_lane3_xe21=0x1
-serdes_preemphasis_lane0_xe21=0xb330
-serdes_preemphasis_lane1_xe21=0xb330
-serdes_preemphasis_lane2_xe21=0xb330
-serdes_preemphasis_lane3_xe21=0xb330
-
-# xe22 (40G)
-portmap_23=113:40
-xgxs_rx_lane_map_23=0x132
-xgxs_tx_lane_map_23=0x132
-phy_xaui_rx_polarity_flip_23=0x8
-phy_xaui_tx_polarity_flip_23=0x0
-serdes_driver_current_lane0_xe22=0x1
-serdes_driver_current_lane1_xe22=0x1
-serdes_driver_current_lane2_xe22=0x1
-serdes_driver_current_lane3_xe22=0x1
-serdes_pre_driver_current_lane0_xe22=0x1
-serdes_pre_driver_current_lane1_xe22=0x1
-serdes_pre_driver_current_lane2_xe22=0x1
-serdes_pre_driver_current_lane3_xe22=0x1
-serdes_preemphasis_lane0_xe22=0xbb10
-serdes_preemphasis_lane1_xe22=0xbb10
-serdes_preemphasis_lane2_xe22=0xbb10
-serdes_preemphasis_lane3_xe22=0xc2f0
-
-# xe23 (40G)
-portmap_24=117:40
-xgxs_rx_lane_map_24=0x231
-xgxs_tx_lane_map_24=0x1203
-phy_xaui_rx_polarity_flip_24=0x3
-phy_xaui_tx_polarity_flip_24=0xe
-serdes_driver_current_lane0_xe23=0x3
-serdes_driver_current_lane1_xe23=0x5
-serdes_driver_current_lane2_xe23=0x3
-serdes_driver_current_lane3_xe23=0x3
-serdes_pre_driver_current_lane0_xe23=0x3
-serdes_pre_driver_current_lane1_xe23=0x5
-serdes_pre_driver_current_lane2_xe23=0x3
-serdes_pre_driver_current_lane3_xe23=0x3
-serdes_preemphasis_lane0_xe23=0xc6e0
-serdes_preemphasis_lane1_xe23=0xc6e0
-serdes_preemphasis_lane2_xe23=0xc6e0
-serdes_preemphasis_lane3_xe23=0xc6e0
-
-# xe24 (40G)
-portmap_25=125:40
-xgxs_rx_lane_map_25=0x132
-xgxs_tx_lane_map_25=0x132
-phy_xaui_rx_polarity_flip_25=0x8
-phy_xaui_tx_polarity_flip_25=0x0
-serdes_driver_current_lane0_xe24=0x4
-serdes_driver_current_lane1_xe24=0x4
-serdes_driver_current_lane2_xe24=0x4
-serdes_driver_current_lane3_xe24=0x4
-serdes_pre_driver_current_lane0_xe24=0x4
-serdes_pre_driver_current_lane1_xe24=0x4
-serdes_pre_driver_current_lane2_xe24=0x4
-serdes_pre_driver_current_lane3_xe24=0x4
-serdes_preemphasis_lane0_xe24=0xc6e0
-serdes_preemphasis_lane1_xe24=0xc6e0
-serdes_preemphasis_lane2_xe24=0xc6e0
-serdes_preemphasis_lane3_xe24=0xcec0
-
-# xe25 (40G)
-portmap_26=121:40
-xgxs_rx_lane_map_26=0x1320
-xgxs_tx_lane_map_26=0x3021
-phy_xaui_rx_polarity_flip_26=0xd
-phy_xaui_tx_polarity_flip_26=0xb
-serdes_driver_current_lane0_xe25=0x4
-serdes_driver_current_lane1_xe25=0x4
-serdes_driver_current_lane2_xe25=0x4
-serdes_driver_current_lane3_xe25=0x4
-serdes_pre_driver_current_lane0_xe25=0x4
-serdes_pre_driver_current_lane1_xe25=0x4
-serdes_pre_driver_current_lane2_xe25=0x4
-serdes_pre_driver_current_lane3_xe25=0x4
-serdes_preemphasis_lane0_xe25=0xc6e0
-serdes_preemphasis_lane1_xe25=0xc6e0
-serdes_preemphasis_lane2_xe25=0xc6e0
-serdes_preemphasis_lane3_xe25=0xc6e0
-
-# xe26 (40G)
-portmap_27=81:40
-xgxs_rx_lane_map_27=0x1320
-xgxs_tx_lane_map_27=0x2031
-phy_xaui_rx_polarity_flip_27=0x1
-phy_xaui_tx_polarity_flip_27=0x2
-serdes_driver_current_lane0_xe26=0x2
-serdes_driver_current_lane1_xe26=0x2
-serdes_driver_current_lane2_xe26=0x2
-serdes_driver_current_lane3_xe26=0x2
-serdes_pre_driver_current_lane0_xe26=0x2
-serdes_pre_driver_current_lane1_xe26=0x2
-serdes_pre_driver_current_lane2_xe26=0x2
-serdes_pre_driver_current_lane3_xe26=0x2
-serdes_preemphasis_lane0_xe26=0xbb10
-serdes_preemphasis_lane1_xe26=0xbb10
-serdes_preemphasis_lane2_xe26=0xbf00
-serdes_preemphasis_lane3_xe26=0xbb10
-
-# xe27 (40G)
-portmap_28=85:40
-xgxs_rx_lane_map_28=0x213
-xgxs_tx_lane_map_28=0x1203
-phy_xaui_rx_polarity_flip_28=0xc
-phy_xaui_tx_polarity_flip_28=0xe
-serdes_driver_current_lane0_xe27=0x4
-serdes_driver_current_lane1_xe27=0x5
-serdes_driver_current_lane2_xe27=0x4
-serdes_driver_current_lane3_xe27=0x5
-serdes_pre_driver_current_lane0_xe27=0x4
-serdes_pre_driver_current_lane1_xe27=0x5
-serdes_pre_driver_current_lane2_xe27=0x4
-serdes_pre_driver_current_lane3_xe27=0x5
-serdes_preemphasis_lane0_xe27=0xc2f0
-serdes_preemphasis_lane1_xe27=0xc6e0
-serdes_preemphasis_lane2_xe27=0xc6e0
-serdes_preemphasis_lane3_xe27=0xc6e0
-
-# xe28 (40G)
-portmap_29=93:40
-xgxs_rx_lane_map_29=0x1320
-xgxs_tx_lane_map_29=0x2031
-phy_xaui_rx_polarity_flip_29=0x1
-phy_xaui_tx_polarity_flip_29=0x2
-serdes_driver_current_lane0_xe28=0x4
-serdes_driver_current_lane1_xe28=0x4
-serdes_driver_current_lane2_xe28=0x4
-serdes_driver_current_lane3_xe28=0x4
-serdes_pre_driver_current_lane0_xe28=0x4
-serdes_pre_driver_current_lane1_xe28=0x4
-serdes_pre_driver_current_lane2_xe28=0x4
-serdes_pre_driver_current_lane3_xe28=0x4
-serdes_preemphasis_lane0_xe28=0xc2f0
-serdes_preemphasis_lane1_xe28=0xc2f0
-serdes_preemphasis_lane2_xe28=0xc2f0
-serdes_preemphasis_lane3_xe28=0xc2f0
-
-# xe29 (40G)
-portmap_30=89:40
-xgxs_rx_lane_map_30=0x1320
-xgxs_tx_lane_map_30=0x3021
-phy_xaui_rx_polarity_flip_30=0x2
-phy_xaui_tx_polarity_flip_30=0xb
-serdes_driver_current_lane0_xe29=0x4
-serdes_driver_current_lane1_xe29=0x4
-serdes_driver_current_lane2_xe29=0x4
-serdes_driver_current_lane3_xe29=0x4
-serdes_pre_driver_current_lane0_xe29=0x4
-serdes_pre_driver_current_lane1_xe29=0x4
-serdes_pre_driver_current_lane2_xe29=0x4
-serdes_pre_driver_current_lane3_xe29=0x4
-serdes_preemphasis_lane0_xe29=0xcad0
-serdes_preemphasis_lane1_xe29=0xc6e0
-serdes_preemphasis_lane2_xe29=0xc6e0
-serdes_preemphasis_lane3_xe29=0xc6e0
-
-# xe30 (40G)
-portmap_31=101:40
-xgxs_rx_lane_map_31=0x1320
-xgxs_tx_lane_map_31=0x1203
-phy_xaui_rx_polarity_flip_31=0x1
-phy_xaui_tx_polarity_flip_31=0x6
-serdes_driver_current_lane0_xe30=0x6
-serdes_driver_current_lane1_xe30=0x6
-serdes_driver_current_lane2_xe30=0x6
-serdes_driver_current_lane3_xe30=0x7
-serdes_pre_driver_current_lane0_xe30=0x6
-serdes_pre_driver_current_lane1_xe30=0x6
-serdes_pre_driver_current_lane2_xe30=0x6
-serdes_pre_driver_current_lane3_xe30=0x7
-serdes_preemphasis_lane0_xe30=0xcec0
-serdes_preemphasis_lane1_xe30=0xcec0
-serdes_preemphasis_lane2_xe30=0xcad0
-serdes_preemphasis_lane3_xe30=0xc6e0
-
-# xe31 (40G)
-portmap_32=97:40
-xgxs_rx_lane_map_32=0x213
-xgxs_tx_lane_map_32=0x2031
-phy_xaui_rx_polarity_flip_32=0xc
-phy_xaui_tx_polarity_flip_32=0x3
-serdes_driver_current_lane0_xe31=0x5
-serdes_driver_current_lane1_xe31=0x5
-serdes_driver_current_lane2_xe31=0x5
-serdes_driver_current_lane3_xe31=0x5
-serdes_pre_driver_current_lane0_xe31=0x5
-serdes_pre_driver_current_lane1_xe31=0x5
-serdes_pre_driver_current_lane2_xe31=0x5
-serdes_pre_driver_current_lane3_xe31=0x5
-serdes_preemphasis_lane0_xe31=0xcad0
-serdes_preemphasis_lane1_xe31=0xcad0
-serdes_preemphasis_lane2_xe31=0xcad0
-serdes_preemphasis_lane3_xe31=0xcad0
diff --git a/device/virtual/x86_64-kvm_x86_64_4_asic-r0/asic.conf b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/asic.conf
new file mode 100644
index 000000000000..3e0fdee25c25
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/asic.conf
@@ -0,0 +1 @@
+NUM_ASIC=4
diff --git a/device/virtual/x86_64-kvm_x86_64_4_asic-r0/default_sku b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/default_sku
new file mode 100644
index 000000000000..c6e0315d7d45
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/default_sku
@@ -0,0 +1 @@
+msft_four_asic_vs
diff --git a/device/virtual/x86_64-kvm_x86_64_4_asic-r0/installer.conf b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/installer.conf
new file mode 120000
index 000000000000..dd822dfbf819
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/installer.conf
@@ -0,0 +1 @@
+../x86_64-kvm_x86_64-r0/installer.conf
\ No newline at end of file
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/0/buffers.json.j2 b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/0/buffers.json.j2
similarity index 100%
rename from device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/0/buffers.json.j2
rename to device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/0/buffers.json.j2
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/0/buffers_defaults_def.j2 b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/0/buffers_defaults_def.j2
similarity index 100%
rename from device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/0/buffers_defaults_def.j2
rename to device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/0/buffers_defaults_def.j2
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/0/buffers_defaults_t0.j2 b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/0/buffers_defaults_t0.j2
similarity index 100%
rename from device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/0/buffers_defaults_t0.j2
rename to device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/0/buffers_defaults_t0.j2
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/0/buffers_defaults_t1.j2 b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/0/buffers_defaults_t1.j2
similarity index 100%
rename from device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/0/buffers_defaults_t1.j2
rename to device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/0/buffers_defaults_t1.j2
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/0/lanemap.ini b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/0/lanemap.ini
similarity index 100%
rename from device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/0/lanemap.ini
rename to device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/0/lanemap.ini
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/0/pg_profile_lookup.ini b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/0/pg_profile_lookup.ini
similarity index 100%
rename from device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/0/pg_profile_lookup.ini
rename to device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/0/pg_profile_lookup.ini
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/0/port_config.ini b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/0/port_config.ini
similarity index 100%
rename from device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/0/port_config.ini
rename to device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/0/port_config.ini
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/0/qos.json.j2 b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/0/qos.json.j2
similarity index 100%
rename from device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/0/qos.json.j2
rename to device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/0/qos.json.j2
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/0/sai.profile b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/0/sai.profile
similarity index 100%
rename from device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/0/sai.profile
rename to device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/0/sai.profile
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/0/td2-s6000-32x40G.config.bcm b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/0/td2-s6000-32x40G.config.bcm
similarity index 100%
rename from device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/0/td2-s6000-32x40G.config.bcm
rename to device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/0/td2-s6000-32x40G.config.bcm
diff --git a/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/1/buffers.json.j2 b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/1/buffers.json.j2
new file mode 120000
index 000000000000..a1d8e80782f5
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/1/buffers.json.j2
@@ -0,0 +1 @@
+../0/buffers.json.j2
\ No newline at end of file
diff --git a/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/1/buffers_defaults_def.j2 b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/1/buffers_defaults_def.j2
new file mode 120000
index 000000000000..5194e16870af
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/1/buffers_defaults_def.j2
@@ -0,0 +1 @@
+../0/buffers_defaults_def.j2
\ No newline at end of file
diff --git a/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/1/buffers_defaults_t0.j2 b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/1/buffers_defaults_t0.j2
new file mode 120000
index 000000000000..12f4d6638a13
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/1/buffers_defaults_t0.j2
@@ -0,0 +1 @@
+../0/buffers_defaults_t0.j2
\ No newline at end of file
diff --git a/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/1/buffers_defaults_t1.j2 b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/1/buffers_defaults_t1.j2
new file mode 120000
index 000000000000..1dfd55a5dda5
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/1/buffers_defaults_t1.j2
@@ -0,0 +1 @@
+../0/buffers_defaults_t1.j2
\ No newline at end of file
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/1/lanemap.ini b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/1/lanemap.ini
similarity index 100%
rename from device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/1/lanemap.ini
rename to device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/1/lanemap.ini
diff --git a/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/1/pg_profile_lookup.ini b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/1/pg_profile_lookup.ini
new file mode 120000
index 000000000000..61f0da8b31c3
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/1/pg_profile_lookup.ini
@@ -0,0 +1 @@
+../0/pg_profile_lookup.ini
\ No newline at end of file
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/1/port_config.ini b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/1/port_config.ini
similarity index 100%
rename from device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/1/port_config.ini
rename to device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/1/port_config.ini
diff --git a/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/1/qos.json.j2 b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/1/qos.json.j2
new file mode 120000
index 000000000000..f84452fa4e97
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/1/qos.json.j2
@@ -0,0 +1 @@
+../0/qos.json.j2
\ No newline at end of file
diff --git a/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/1/sai.profile b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/1/sai.profile
new file mode 120000
index 000000000000..1e172f3e0765
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/1/sai.profile
@@ -0,0 +1 @@
+../0/sai.profile
\ No newline at end of file
diff --git a/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/1/td2-s6000-32x40G.config.bcm b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/1/td2-s6000-32x40G.config.bcm
new file mode 120000
index 000000000000..27d295e2b748
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/1/td2-s6000-32x40G.config.bcm
@@ -0,0 +1 @@
+../0/td2-s6000-32x40G.config.bcm
\ No newline at end of file
diff --git a/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/2/buffers.json.j2 b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/2/buffers.json.j2
new file mode 120000
index 000000000000..a1d8e80782f5
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/2/buffers.json.j2
@@ -0,0 +1 @@
+../0/buffers.json.j2
\ No newline at end of file
diff --git a/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/2/buffers_defaults_def.j2 b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/2/buffers_defaults_def.j2
new file mode 120000
index 000000000000..5194e16870af
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/2/buffers_defaults_def.j2
@@ -0,0 +1 @@
+../0/buffers_defaults_def.j2
\ No newline at end of file
diff --git a/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/2/buffers_defaults_t0.j2 b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/2/buffers_defaults_t0.j2
new file mode 120000
index 000000000000..12f4d6638a13
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/2/buffers_defaults_t0.j2
@@ -0,0 +1 @@
+../0/buffers_defaults_t0.j2
\ No newline at end of file
diff --git a/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/2/buffers_defaults_t1.j2 b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/2/buffers_defaults_t1.j2
new file mode 120000
index 000000000000..1dfd55a5dda5
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/2/buffers_defaults_t1.j2
@@ -0,0 +1 @@
+../0/buffers_defaults_t1.j2
\ No newline at end of file
diff --git a/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/2/lanemap.ini b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/2/lanemap.ini
new file mode 100644
index 000000000000..5492bd915860
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/2/lanemap.ini
@@ -0,0 +1,4 @@
+eth1:1,2,3,4
+eth2:5,6,7,8
+eth3:9,10,11,12
+eth4:13,14,15,16
diff --git a/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/2/pg_profile_lookup.ini b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/2/pg_profile_lookup.ini
new file mode 120000
index 000000000000..61f0da8b31c3
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/2/pg_profile_lookup.ini
@@ -0,0 +1 @@
+../0/pg_profile_lookup.ini
\ No newline at end of file
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/2/port_config.ini b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/2/port_config.ini
similarity index 55%
rename from device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/2/port_config.ini
rename to device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/2/port_config.ini
index a4361c7b78d6..11dfe6e0e06c 100644
--- a/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/2/port_config.ini
+++ b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/2/port_config.ini
@@ -3,7 +3,3 @@ Ethernet-BP32     1,2,3,4       Eth0-ASIC2      8        Eth0-ASIC2      Int
 Ethernet-BP36     5,6,7,8       Eth1-ASIC2      9        Eth1-ASIC2      Int
 Ethernet-BP40     9,10,11,12    Eth2-ASIC2      10       Eth2-ASIC2      Int
 Ethernet-BP44     13,14,15,16   Eth3-ASIC2      11       Eth3-ASIC2      Int
-Ethernet-BP48     17,18,19,20   Eth4-ASIC2      12       Eth4-ASIC2      Int
-Ethernet-BP52     21,22,23,24   Eth5-ASIC2      13       Eth5-ASIC2      Int
-Ethernet-BP56     25,26,27,28   Eth6-ASIC2      14       Eth6-ASIC2      Int
-Ethernet-BP60     29,30,31,32   Eth7-ASIC2      15       Eth7-ASIC2      Int
diff --git a/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/2/qos.json.j2 b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/2/qos.json.j2
new file mode 120000
index 000000000000..f84452fa4e97
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/2/qos.json.j2
@@ -0,0 +1 @@
+../0/qos.json.j2
\ No newline at end of file
diff --git a/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/2/sai.profile b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/2/sai.profile
new file mode 120000
index 000000000000..1e172f3e0765
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/2/sai.profile
@@ -0,0 +1 @@
+../0/sai.profile
\ No newline at end of file
diff --git a/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/2/td2-s6000-32x40G.config.bcm b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/2/td2-s6000-32x40G.config.bcm
new file mode 120000
index 000000000000..27d295e2b748
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/2/td2-s6000-32x40G.config.bcm
@@ -0,0 +1 @@
+../0/td2-s6000-32x40G.config.bcm
\ No newline at end of file
diff --git a/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/3/buffers.json.j2 b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/3/buffers.json.j2
new file mode 120000
index 000000000000..a1d8e80782f5
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/3/buffers.json.j2
@@ -0,0 +1 @@
+../0/buffers.json.j2
\ No newline at end of file
diff --git a/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/3/buffers_defaults_def.j2 b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/3/buffers_defaults_def.j2
new file mode 120000
index 000000000000..5194e16870af
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/3/buffers_defaults_def.j2
@@ -0,0 +1 @@
+../0/buffers_defaults_def.j2
\ No newline at end of file
diff --git a/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/3/buffers_defaults_t0.j2 b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/3/buffers_defaults_t0.j2
new file mode 120000
index 000000000000..12f4d6638a13
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/3/buffers_defaults_t0.j2
@@ -0,0 +1 @@
+../0/buffers_defaults_t0.j2
\ No newline at end of file
diff --git a/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/3/buffers_defaults_t1.j2 b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/3/buffers_defaults_t1.j2
new file mode 120000
index 000000000000..1dfd55a5dda5
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/3/buffers_defaults_t1.j2
@@ -0,0 +1 @@
+../0/buffers_defaults_t1.j2
\ No newline at end of file
diff --git a/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/3/lanemap.ini b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/3/lanemap.ini
new file mode 100644
index 000000000000..5492bd915860
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/3/lanemap.ini
@@ -0,0 +1,4 @@
+eth1:1,2,3,4
+eth2:5,6,7,8
+eth3:9,10,11,12
+eth4:13,14,15,16
diff --git a/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/3/pg_profile_lookup.ini b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/3/pg_profile_lookup.ini
new file mode 120000
index 000000000000..61f0da8b31c3
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/3/pg_profile_lookup.ini
@@ -0,0 +1 @@
+../0/pg_profile_lookup.ini
\ No newline at end of file
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/3/port_config.ini b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/3/port_config.ini
similarity index 55%
rename from device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/3/port_config.ini
rename to device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/3/port_config.ini
index e97ded4527b3..32f55b2a1988 100644
--- a/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/3/port_config.ini
+++ b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/3/port_config.ini
@@ -3,7 +3,3 @@ Ethernet-BP64     1,2,3,4          Eth0-ASIC3         16         Eth0-ASIC3
 Ethernet-BP68     5,6,7,8          Eth1-ASIC3         17         Eth1-ASIC3        Int
 Ethernet-BP72     9,10,11,12       Eth2-ASIC3         18         Eth2-ASIC3        Int
 Ethernet-BP76     13,14,15,16      Eth3-ASIC3         19         Eth3-ASIC3        Int
-Ethernet-BP80     17,18,19,20      Eth4-ASIC3         20         Eth4-ASIC3        Int
-Ethernet-BP84     21,22,23,24      Eth5-ASIC3         21         Eth5-ASIC3        Int
-Ethernet-BP92     25,26,27,28      Eth6-ASIC3         22         Eth6-ASIC3        Int
-Ethernet-BP96     29,30,31,32      Eth7-ASIC3         23         Eth7-ASIC3        Int
diff --git a/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/3/qos.json.j2 b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/3/qos.json.j2
new file mode 120000
index 000000000000..f84452fa4e97
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/3/qos.json.j2
@@ -0,0 +1 @@
+../0/qos.json.j2
\ No newline at end of file
diff --git a/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/3/sai.profile b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/3/sai.profile
new file mode 120000
index 000000000000..1e172f3e0765
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/3/sai.profile
@@ -0,0 +1 @@
+../0/sai.profile
\ No newline at end of file
diff --git a/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/3/td2-s6000-32x40G.config.bcm b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/3/td2-s6000-32x40G.config.bcm
new file mode 120000
index 000000000000..27d295e2b748
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/3/td2-s6000-32x40G.config.bcm
@@ -0,0 +1 @@
+../0/td2-s6000-32x40G.config.bcm
\ No newline at end of file
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/topology.sh b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/topology.sh
similarity index 100%
rename from device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/topology.sh
rename to device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/topology.sh
diff --git a/device/virtual/x86_64-kvm_x86_64_4_asic-r0/plugins b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/plugins
new file mode 120000
index 000000000000..29725a9aa071
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/plugins
@@ -0,0 +1 @@
+../x86_64-kvm_x86_64-r0/plugins/
\ No newline at end of file
diff --git a/device/virtual/x86_64-kvm_x86_64_4_asic-r0/pmon_daemon_control.json b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/pmon_daemon_control.json
new file mode 120000
index 000000000000..5a0bb045d20d
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_4_asic-r0/pmon_daemon_control.json
@@ -0,0 +1 @@
+../x86_64-kvm_x86_64-r0/pmon_daemon_control.json
\ No newline at end of file
diff --git a/device/virtual/x86_64-kvm_x86_64_6_asic-r0/asic.conf b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/asic.conf
new file mode 100644
index 000000000000..8a4f716dde7a
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/asic.conf
@@ -0,0 +1 @@
+NUM_ASIC=6
diff --git a/device/virtual/x86_64-kvm_x86_64_6_asic-r0/default_sku b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/default_sku
new file mode 100644
index 000000000000..fc43568478ae
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/default_sku
@@ -0,0 +1 @@
+msft_multi_asic_vs
diff --git a/device/virtual/x86_64-kvm_x86_64_6_asic-r0/installer.conf b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/installer.conf
new file mode 120000
index 000000000000..dd822dfbf819
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/installer.conf
@@ -0,0 +1 @@
+../x86_64-kvm_x86_64-r0/installer.conf
\ No newline at end of file
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/1/buffers.json.j2 b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/0/buffers.json.j2
similarity index 100%
rename from device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/1/buffers.json.j2
rename to device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/0/buffers.json.j2
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/1/buffers_defaults_def.j2 b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/0/buffers_defaults_def.j2
similarity index 100%
rename from device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/1/buffers_defaults_def.j2
rename to device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/0/buffers_defaults_def.j2
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/1/buffers_defaults_t0.j2 b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/0/buffers_defaults_t0.j2
similarity index 100%
rename from device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/1/buffers_defaults_t0.j2
rename to device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/0/buffers_defaults_t0.j2
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/1/buffers_defaults_t1.j2 b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/0/buffers_defaults_t1.j2
similarity index 100%
rename from device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/1/buffers_defaults_t1.j2
rename to device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/0/buffers_defaults_t1.j2
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/0/lanemap.ini b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/0/lanemap.ini
similarity index 100%
rename from device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/0/lanemap.ini
rename to device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/0/lanemap.ini
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/1/pg_profile_lookup.ini b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/0/pg_profile_lookup.ini
similarity index 100%
rename from device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/1/pg_profile_lookup.ini
rename to device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/0/pg_profile_lookup.ini
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/0/port_config.ini b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/0/port_config.ini
similarity index 100%
rename from device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/0/port_config.ini
rename to device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/0/port_config.ini
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/1/qos.json.j2 b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/0/qos.json.j2
similarity index 100%
rename from device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/1/qos.json.j2
rename to device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/0/qos.json.j2
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/1/sai.profile b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/0/sai.profile
similarity index 100%
rename from device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/1/sai.profile
rename to device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/0/sai.profile
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/1/td2-s6000-32x40G.config.bcm b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/0/td2-s6000-32x40G.config.bcm
similarity index 100%
rename from device/virtual/x86_64-kvm_x86_64-r0/msft_four_asic_vs/1/td2-s6000-32x40G.config.bcm
rename to device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/0/td2-s6000-32x40G.config.bcm
diff --git a/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/1/buffers.json.j2 b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/1/buffers.json.j2
new file mode 120000
index 000000000000..a1d8e80782f5
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/1/buffers.json.j2
@@ -0,0 +1 @@
+../0/buffers.json.j2
\ No newline at end of file
diff --git a/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/1/buffers_defaults_def.j2 b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/1/buffers_defaults_def.j2
new file mode 120000
index 000000000000..5194e16870af
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/1/buffers_defaults_def.j2
@@ -0,0 +1 @@
+../0/buffers_defaults_def.j2
\ No newline at end of file
diff --git a/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/1/buffers_defaults_t0.j2 b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/1/buffers_defaults_t0.j2
new file mode 120000
index 000000000000..12f4d6638a13
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/1/buffers_defaults_t0.j2
@@ -0,0 +1 @@
+../0/buffers_defaults_t0.j2
\ No newline at end of file
diff --git a/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/1/buffers_defaults_t1.j2 b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/1/buffers_defaults_t1.j2
new file mode 120000
index 000000000000..1dfd55a5dda5
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/1/buffers_defaults_t1.j2
@@ -0,0 +1 @@
+../0/buffers_defaults_t1.j2
\ No newline at end of file
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/1/lanemap.ini b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/1/lanemap.ini
similarity index 100%
rename from device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/1/lanemap.ini
rename to device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/1/lanemap.ini
diff --git a/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/1/pg_profile_lookup.ini b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/1/pg_profile_lookup.ini
new file mode 120000
index 000000000000..61f0da8b31c3
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/1/pg_profile_lookup.ini
@@ -0,0 +1 @@
+../0/pg_profile_lookup.ini
\ No newline at end of file
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/1/port_config.ini b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/1/port_config.ini
similarity index 100%
rename from device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/1/port_config.ini
rename to device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/1/port_config.ini
diff --git a/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/1/qos.json.j2 b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/1/qos.json.j2
new file mode 120000
index 000000000000..f84452fa4e97
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/1/qos.json.j2
@@ -0,0 +1 @@
+../0/qos.json.j2
\ No newline at end of file
diff --git a/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/1/sai.profile b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/1/sai.profile
new file mode 120000
index 000000000000..1e172f3e0765
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/1/sai.profile
@@ -0,0 +1 @@
+../0/sai.profile
\ No newline at end of file
diff --git a/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/1/td2-s6000-32x40G.config.bcm b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/1/td2-s6000-32x40G.config.bcm
new file mode 120000
index 000000000000..27d295e2b748
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/1/td2-s6000-32x40G.config.bcm
@@ -0,0 +1 @@
+../0/td2-s6000-32x40G.config.bcm
\ No newline at end of file
diff --git a/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/2/buffers.json.j2 b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/2/buffers.json.j2
new file mode 120000
index 000000000000..a1d8e80782f5
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/2/buffers.json.j2
@@ -0,0 +1 @@
+../0/buffers.json.j2
\ No newline at end of file
diff --git a/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/2/buffers_defaults_def.j2 b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/2/buffers_defaults_def.j2
new file mode 120000
index 000000000000..5194e16870af
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/2/buffers_defaults_def.j2
@@ -0,0 +1 @@
+../0/buffers_defaults_def.j2
\ No newline at end of file
diff --git a/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/2/buffers_defaults_t0.j2 b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/2/buffers_defaults_t0.j2
new file mode 120000
index 000000000000..12f4d6638a13
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/2/buffers_defaults_t0.j2
@@ -0,0 +1 @@
+../0/buffers_defaults_t0.j2
\ No newline at end of file
diff --git a/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/2/buffers_defaults_t1.j2 b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/2/buffers_defaults_t1.j2
new file mode 120000
index 000000000000..1dfd55a5dda5
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/2/buffers_defaults_t1.j2
@@ -0,0 +1 @@
+../0/buffers_defaults_t1.j2
\ No newline at end of file
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/2/lanemap.ini b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/2/lanemap.ini
similarity index 100%
rename from device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/2/lanemap.ini
rename to device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/2/lanemap.ini
diff --git a/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/2/pg_profile_lookup.ini b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/2/pg_profile_lookup.ini
new file mode 120000
index 000000000000..61f0da8b31c3
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/2/pg_profile_lookup.ini
@@ -0,0 +1 @@
+../0/pg_profile_lookup.ini
\ No newline at end of file
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/2/port_config.ini b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/2/port_config.ini
similarity index 100%
rename from device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/2/port_config.ini
rename to device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/2/port_config.ini
diff --git a/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/2/qos.json.j2 b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/2/qos.json.j2
new file mode 120000
index 000000000000..f84452fa4e97
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/2/qos.json.j2
@@ -0,0 +1 @@
+../0/qos.json.j2
\ No newline at end of file
diff --git a/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/2/sai.profile b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/2/sai.profile
new file mode 120000
index 000000000000..1e172f3e0765
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/2/sai.profile
@@ -0,0 +1 @@
+../0/sai.profile
\ No newline at end of file
diff --git a/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/2/td2-s6000-32x40G.config.bcm b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/2/td2-s6000-32x40G.config.bcm
new file mode 120000
index 000000000000..27d295e2b748
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/2/td2-s6000-32x40G.config.bcm
@@ -0,0 +1 @@
+../0/td2-s6000-32x40G.config.bcm
\ No newline at end of file
diff --git a/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/3/buffers.json.j2 b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/3/buffers.json.j2
new file mode 120000
index 000000000000..a1d8e80782f5
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/3/buffers.json.j2
@@ -0,0 +1 @@
+../0/buffers.json.j2
\ No newline at end of file
diff --git a/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/3/buffers_defaults_def.j2 b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/3/buffers_defaults_def.j2
new file mode 120000
index 000000000000..5194e16870af
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/3/buffers_defaults_def.j2
@@ -0,0 +1 @@
+../0/buffers_defaults_def.j2
\ No newline at end of file
diff --git a/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/3/buffers_defaults_t0.j2 b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/3/buffers_defaults_t0.j2
new file mode 120000
index 000000000000..12f4d6638a13
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/3/buffers_defaults_t0.j2
@@ -0,0 +1 @@
+../0/buffers_defaults_t0.j2
\ No newline at end of file
diff --git a/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/3/buffers_defaults_t1.j2 b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/3/buffers_defaults_t1.j2
new file mode 120000
index 000000000000..1dfd55a5dda5
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/3/buffers_defaults_t1.j2
@@ -0,0 +1 @@
+../0/buffers_defaults_t1.j2
\ No newline at end of file
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/3/lanemap.ini b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/3/lanemap.ini
similarity index 100%
rename from device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/3/lanemap.ini
rename to device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/3/lanemap.ini
diff --git a/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/3/pg_profile_lookup.ini b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/3/pg_profile_lookup.ini
new file mode 120000
index 000000000000..61f0da8b31c3
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/3/pg_profile_lookup.ini
@@ -0,0 +1 @@
+../0/pg_profile_lookup.ini
\ No newline at end of file
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/3/port_config.ini b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/3/port_config.ini
similarity index 100%
rename from device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/3/port_config.ini
rename to device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/3/port_config.ini
diff --git a/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/3/qos.json.j2 b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/3/qos.json.j2
new file mode 120000
index 000000000000..f84452fa4e97
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/3/qos.json.j2
@@ -0,0 +1 @@
+../0/qos.json.j2
\ No newline at end of file
diff --git a/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/3/sai.profile b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/3/sai.profile
new file mode 120000
index 000000000000..1e172f3e0765
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/3/sai.profile
@@ -0,0 +1 @@
+../0/sai.profile
\ No newline at end of file
diff --git a/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/3/td2-s6000-32x40G.config.bcm b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/3/td2-s6000-32x40G.config.bcm
new file mode 120000
index 000000000000..27d295e2b748
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/3/td2-s6000-32x40G.config.bcm
@@ -0,0 +1 @@
+../0/td2-s6000-32x40G.config.bcm
\ No newline at end of file
diff --git a/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/4/buffers.json.j2 b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/4/buffers.json.j2
new file mode 120000
index 000000000000..a1d8e80782f5
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/4/buffers.json.j2
@@ -0,0 +1 @@
+../0/buffers.json.j2
\ No newline at end of file
diff --git a/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/4/buffers_defaults_def.j2 b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/4/buffers_defaults_def.j2
new file mode 120000
index 000000000000..5194e16870af
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/4/buffers_defaults_def.j2
@@ -0,0 +1 @@
+../0/buffers_defaults_def.j2
\ No newline at end of file
diff --git a/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/4/buffers_defaults_t0.j2 b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/4/buffers_defaults_t0.j2
new file mode 120000
index 000000000000..12f4d6638a13
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/4/buffers_defaults_t0.j2
@@ -0,0 +1 @@
+../0/buffers_defaults_t0.j2
\ No newline at end of file
diff --git a/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/4/buffers_defaults_t1.j2 b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/4/buffers_defaults_t1.j2
new file mode 120000
index 000000000000..1dfd55a5dda5
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/4/buffers_defaults_t1.j2
@@ -0,0 +1 @@
+../0/buffers_defaults_t1.j2
\ No newline at end of file
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/4/lanemap.ini b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/4/lanemap.ini
similarity index 100%
rename from device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/4/lanemap.ini
rename to device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/4/lanemap.ini
diff --git a/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/4/pg_profile_lookup.ini b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/4/pg_profile_lookup.ini
new file mode 120000
index 000000000000..61f0da8b31c3
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/4/pg_profile_lookup.ini
@@ -0,0 +1 @@
+../0/pg_profile_lookup.ini
\ No newline at end of file
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/4/port_config.ini b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/4/port_config.ini
similarity index 100%
rename from device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/4/port_config.ini
rename to device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/4/port_config.ini
diff --git a/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/4/qos.json.j2 b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/4/qos.json.j2
new file mode 120000
index 000000000000..f84452fa4e97
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/4/qos.json.j2
@@ -0,0 +1 @@
+../0/qos.json.j2
\ No newline at end of file
diff --git a/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/4/sai.profile b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/4/sai.profile
new file mode 120000
index 000000000000..1e172f3e0765
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/4/sai.profile
@@ -0,0 +1 @@
+../0/sai.profile
\ No newline at end of file
diff --git a/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/4/td2-s6000-32x40G.config.bcm b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/4/td2-s6000-32x40G.config.bcm
new file mode 120000
index 000000000000..27d295e2b748
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/4/td2-s6000-32x40G.config.bcm
@@ -0,0 +1 @@
+../0/td2-s6000-32x40G.config.bcm
\ No newline at end of file
diff --git a/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/5/buffers.json.j2 b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/5/buffers.json.j2
new file mode 120000
index 000000000000..a1d8e80782f5
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/5/buffers.json.j2
@@ -0,0 +1 @@
+../0/buffers.json.j2
\ No newline at end of file
diff --git a/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/5/buffers_defaults_def.j2 b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/5/buffers_defaults_def.j2
new file mode 120000
index 000000000000..5194e16870af
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/5/buffers_defaults_def.j2
@@ -0,0 +1 @@
+../0/buffers_defaults_def.j2
\ No newline at end of file
diff --git a/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/5/buffers_defaults_t0.j2 b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/5/buffers_defaults_t0.j2
new file mode 120000
index 000000000000..12f4d6638a13
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/5/buffers_defaults_t0.j2
@@ -0,0 +1 @@
+../0/buffers_defaults_t0.j2
\ No newline at end of file
diff --git a/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/5/buffers_defaults_t1.j2 b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/5/buffers_defaults_t1.j2
new file mode 120000
index 000000000000..1dfd55a5dda5
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/5/buffers_defaults_t1.j2
@@ -0,0 +1 @@
+../0/buffers_defaults_t1.j2
\ No newline at end of file
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/5/lanemap.ini b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/5/lanemap.ini
similarity index 100%
rename from device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/5/lanemap.ini
rename to device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/5/lanemap.ini
diff --git a/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/5/pg_profile_lookup.ini b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/5/pg_profile_lookup.ini
new file mode 120000
index 000000000000..61f0da8b31c3
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/5/pg_profile_lookup.ini
@@ -0,0 +1 @@
+../0/pg_profile_lookup.ini
\ No newline at end of file
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/5/port_config.ini b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/5/port_config.ini
similarity index 100%
rename from device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/5/port_config.ini
rename to device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/5/port_config.ini
diff --git a/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/5/qos.json.j2 b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/5/qos.json.j2
new file mode 120000
index 000000000000..f84452fa4e97
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/5/qos.json.j2
@@ -0,0 +1 @@
+../0/qos.json.j2
\ No newline at end of file
diff --git a/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/5/sai.profile b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/5/sai.profile
new file mode 120000
index 000000000000..1e172f3e0765
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/5/sai.profile
@@ -0,0 +1 @@
+../0/sai.profile
\ No newline at end of file
diff --git a/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/5/td2-s6000-32x40G.config.bcm b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/5/td2-s6000-32x40G.config.bcm
new file mode 120000
index 000000000000..27d295e2b748
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/5/td2-s6000-32x40G.config.bcm
@@ -0,0 +1 @@
+../0/td2-s6000-32x40G.config.bcm
\ No newline at end of file
diff --git a/device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/topology.sh b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/topology.sh
similarity index 100%
rename from device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/topology.sh
rename to device/virtual/x86_64-kvm_x86_64_6_asic-r0/msft_multi_asic_vs/topology.sh
diff --git a/device/virtual/x86_64-kvm_x86_64_6_asic-r0/plugins b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/plugins
new file mode 120000
index 000000000000..29725a9aa071
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/plugins
@@ -0,0 +1 @@
+../x86_64-kvm_x86_64-r0/plugins/
\ No newline at end of file
diff --git a/device/virtual/x86_64-kvm_x86_64_6_asic-r0/pmon_daemon_control.json b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/pmon_daemon_control.json
new file mode 120000
index 000000000000..5a0bb045d20d
--- /dev/null
+++ b/device/virtual/x86_64-kvm_x86_64_6_asic-r0/pmon_daemon_control.json
@@ -0,0 +1 @@
+../x86_64-kvm_x86_64-r0/pmon_daemon_control.json
\ No newline at end of file
diff --git a/platform/vs/kvm-image.mk b/platform/vs/kvm-image.mk
index 439a6fc1e418..911b7e9a86be 100644
--- a/platform/vs/kvm-image.mk
+++ b/platform/vs/kvm-image.mk
@@ -10,5 +10,5 @@ $(SONIC_KVM_IMAGE)_DOCKERS += $(filter-out $(patsubst %-$(DBG_IMAGE_MARK).gz,%.g
 else
 $(SONIC_KVM_IMAGE)_DOCKERS = $(SONIC_INSTALL_DOCKER_IMAGES)
 endif
-$(SONIC_KVM_IMAGE)_FILES = $(ONIE_RECOVERY_IMAGE)
+$(SONIC_KVM_IMAGE)_FILES = $(ONIE_RECOVERY_IMAGE) $(ONIE_RECOVERY_KVM_4ASIC_IMAGE) $(ONIE_RECOVERY_KVM_6ASIC_IMAGE)
 SONIC_INSTALLERS += $(SONIC_KVM_IMAGE)
diff --git a/platform/vs/onie.mk b/platform/vs/onie.mk
index 09a807c25b2a..c64a09b8861b 100644
--- a/platform/vs/onie.mk
+++ b/platform/vs/onie.mk
@@ -1,4 +1,10 @@
 ONIE_RECOVERY_IMAGE = onie-recovery-x86_64-kvm_x86_64-r0.iso
 $(ONIE_RECOVERY_IMAGE)_URL = "https://sonicstorage.blob.core.windows.net/packages/onie/onie-recovery-x86_64-kvm_x86_64-r0.iso?sv=2015-04-05&sr=b&sig=XMAk1cttBFM369CMbihe5oZgXwe4uaDVfwg4CTLT%2F5U%3D&se=2155-10-13T10%3A40%3A13Z&sp=r"
 
-SONIC_ONLINE_FILES += $(ONIE_RECOVERY_IMAGE)
+ONIE_RECOVERY_KVM_4ASIC_IMAGE = onie-recovery-x86_64-kvm_x86_64_4_asic-r0.iso
+$(ONIE_RECOVERY_KVM_4ASIC_IMAGE)_URL = "https://sonicstorage.blob.core.windows.net/packages/onie/onie-recovery-x86_64-kvm_x86_64_4_asic-r0.iso?sv=2020-04-08&st=2021-08-27T22%3A41%3A07Z&se=2030-08-28T22%3A41%3A00Z&sr=b&sp=r&sig=zyaX7rHnE5jXldpgrnWq1nvsfmMTrVCSuESZqrIxDLc%3D"
+
+ONIE_RECOVERY_KVM_6ASIC_IMAGE = onie-recovery-x86_64-kvm_x86_64_6_asic-r0.iso
+$(ONIE_RECOVERY_KVM_6ASIC_IMAGE)_URL = "https://sonicstorage.blob.core.windows.net/packages/onie/onie-recovery-x86_64-kvm_x86_64_6_asic-r0.iso?sv=2020-04-08&st=2021-08-27T22%3A42%3A24Z&se=2030-08-28T22%3A42%3A00Z&sr=b&sp=r&sig=RqbtHJt8Hvy7j78jt3TgXo27T7zjdUDfSxqmOID1YUU%3D"
+
+SONIC_ONLINE_FILES += $(ONIE_RECOVERY_IMAGE) $(ONIE_RECOVERY_KVM_4ASIC_IMAGE) $(ONIE_RECOVERY_KVM_6ASIC_IMAGE)