From 5ab66b191a4c77697943674708bceb266b8a0344 Mon Sep 17 00:00:00 2001 From: Ying Xie Date: Fri, 12 Oct 2018 08:05:38 -0700 Subject: [PATCH] [bcm config] remove scache_filename config entry (#2140) Warm boot is managed by SAI. This configuration entry shouldn't be included in bcm config. Signed-off-by: Ying Xie --- .../Accton-AS5712-54X/td2-as5712-72x10G.config.bcm | 1 - .../td2-a7050-qx32-16x40G+32x10G+8x40G.config.bcm | 1 - .../Arista-7050-QX32/td2-a7050-qx32-32x40G.config.bcm | 1 - .../Arista-7050-QX-32S/td2-a7050-qx32s-32x40G.config.bcm | 1 - .../td2-a7050-q31s4-31x40G-4x10G.config.bcm | 1 - .../Arista-7260CX3-C64/th2-a7260cx3-64-64x100G.config.bcm | 2 -- .../th2-a7260cx3-64-112x50G+8x100G.config.bcm | 2 -- .../Force10-S6000/td2-s6000-32x40G.config.bcm | 1 - .../Force10-Z9100/th-z9100-32x100G.config.bcm | 2 -- .../DellEMC-Z9264f/th2-z9264f-64x100G.config.bcm | 2 -- .../Delta-ag9064/th2-ag9064-64x100G.config.bcm | 1 - .../INGRASYS-S8810-32Q/td2-s8810-32x40G.config.bcm | 1 - .../INGRASYS-S8900-54XC/th-s8900-48x25G+6x100G.config.bcm | 2 -- .../INGRASYS-S8900-64XC/th-s8900-48x25G+16x100G.config.bcm | 2 -- .../INGRASYS-S9100-C32/th-s9100-32x100G.config.bcm | 2 -- src/sonic-device-data/tests/permitted_list | 1 - 16 files changed, 23 deletions(-) diff --git a/device/accton/x86_64-accton_as5712_54x-r0/Accton-AS5712-54X/td2-as5712-72x10G.config.bcm b/device/accton/x86_64-accton_as5712_54x-r0/Accton-AS5712-54X/td2-as5712-72x10G.config.bcm index 715468c621..85ad634792 100644 --- a/device/accton/x86_64-accton_as5712_54x-r0/Accton-AS5712-54X/td2-as5712-72x10G.config.bcm +++ b/device/accton/x86_64-accton_as5712_54x-r0/Accton-AS5712-54X/td2-as5712-72x10G.config.bcm @@ -142,4 +142,3 @@ l3_max_ecmp_mode=1 max_vp_lags=0 stable_size=0x2000000 -scache_filename=/tmp/scache diff --git a/device/arista/x86_64-arista_7050_qx32/Arista-7050-Q16S64/td2-a7050-qx32-16x40G+32x10G+8x40G.config.bcm b/device/arista/x86_64-arista_7050_qx32/Arista-7050-Q16S64/td2-a7050-qx32-16x40G+32x10G+8x40G.config.bcm index 6d72e20b21..4ce6b2d4a9 100644 --- a/device/arista/x86_64-arista_7050_qx32/Arista-7050-Q16S64/td2-a7050-qx32-16x40G+32x10G+8x40G.config.bcm +++ b/device/arista/x86_64-arista_7050_qx32/Arista-7050-Q16S64/td2-a7050-qx32-16x40G+32x10G+8x40G.config.bcm @@ -44,7 +44,6 @@ max_vp_lags=0 miim_intr_enable=0 mmu_lossless=0 module_64ports=0 -scache_filename=/tmp/scache schan_intr_enable=0 stable_size=0x2000000 tdma_timeout_usec=5000000 diff --git a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/td2-a7050-qx32-32x40G.config.bcm b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/td2-a7050-qx32-32x40G.config.bcm index 701a8480dc..76b1af3aba 100644 --- a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/td2-a7050-qx32-32x40G.config.bcm +++ b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/td2-a7050-qx32-32x40G.config.bcm @@ -44,7 +44,6 @@ max_vp_lags=0 miim_intr_enable=0 mmu_lossless=0 module_64ports=0 -scache_filename=/tmp/scache schan_intr_enable=0 stable_size=0x2000000 tdma_timeout_usec=5000000 diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S/td2-a7050-qx32s-32x40G.config.bcm b/device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S/td2-a7050-qx32s-32x40G.config.bcm index c898369b03..3b1a451440 100644 --- a/device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S/td2-a7050-qx32s-32x40G.config.bcm +++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S/td2-a7050-qx32s-32x40G.config.bcm @@ -39,7 +39,6 @@ miim_intr_enable=0 mmu_lossless=0 module_64ports=0 -scache_filename=/tmp/scache stable_size=0x2000000 schan_intr_enable=0 diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/td2-a7050-q31s4-31x40G-4x10G.config.bcm b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/td2-a7050-q31s4-31x40G-4x10G.config.bcm index e34b925da2..4819c7929e 100644 --- a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/td2-a7050-q31s4-31x40G-4x10G.config.bcm +++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/td2-a7050-q31s4-31x40G-4x10G.config.bcm @@ -210,7 +210,6 @@ portmap_101.0=117:40 portmap_102.0=113:40 portmap_103.0=1:40 portmap_104.0=5:40 -scache_filename=/tmp/scache schan_intr_enable=0 serdes_firmware_mode_1.0=2 serdes_firmware_mode_5.0=2 diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/th2-a7260cx3-64-64x100G.config.bcm b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/th2-a7260cx3-64-64x100G.config.bcm index 1197bca761..4c9e658693 100644 --- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/th2-a7260cx3-64-64x100G.config.bcm +++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/th2-a7260cx3-64-64x100G.config.bcm @@ -939,8 +939,6 @@ portmap_9=17:100 robust_hash_disable_egress_vlan=1 robust_hash_disable_mpls=1 robust_hash_disable_vlan=1 -scache_filename=/tmp/scache -scache_filename=/tmp/scache sram_scan_enable=0 stable_size=0x5500000 stable_size=0x5500000 diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/th2-a7260cx3-64-112x50G+8x100G.config.bcm b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/th2-a7260cx3-64-112x50G+8x100G.config.bcm index 120b13c037..456148f067 100644 --- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/th2-a7260cx3-64-112x50G+8x100G.config.bcm +++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/th2-a7260cx3-64-112x50G+8x100G.config.bcm @@ -681,8 +681,6 @@ port_init_cl72_hg=1 robust_hash_disable_egress_vlan=1 robust_hash_disable_mpls=1 robust_hash_disable_vlan=1 -scache_filename=/tmp/scache -scache_filename=/tmp/scache sram_scan_enable=0 stable_size=0x5500000 stable_size=0x5500000 diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/td2-s6000-32x40G.config.bcm b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/td2-s6000-32x40G.config.bcm index 9ab9c29a32..068b587202 100644 --- a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/td2-s6000-32x40G.config.bcm +++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/td2-s6000-32x40G.config.bcm @@ -29,7 +29,6 @@ max_vp_lags=0 miim_intr_enable=0 mmu_lossless=0 module_64ports=0 -scache_filename=/tmp/scache schan_intr_enable=0 stable_size=0x2000000 tdma_timeout_usec=5000000 diff --git a/device/dell/x86_64-dell_z9100_c2538-r0/Force10-Z9100/th-z9100-32x100G.config.bcm b/device/dell/x86_64-dell_z9100_c2538-r0/Force10-Z9100/th-z9100-32x100G.config.bcm index a1c51ef225..ea335c15d6 100644 --- a/device/dell/x86_64-dell_z9100_c2538-r0/Force10-Z9100/th-z9100-32x100G.config.bcm +++ b/device/dell/x86_64-dell_z9100_c2538-r0/Force10-Z9100/th-z9100-32x100G.config.bcm @@ -13,8 +13,6 @@ os=unix parity_correction=1 parity_enable=1 -scache_filename=/tmp/scache - #Port configuration portmap_38=49:100 portmap_39=53:100 diff --git a/device/dell/x86_64-dellemc_z9264f_c3538-r0/DellEMC-Z9264f/th2-z9264f-64x100G.config.bcm b/device/dell/x86_64-dellemc_z9264f_c3538-r0/DellEMC-Z9264f/th2-z9264f-64x100G.config.bcm index 5231b526c1..fdd3b3fc07 100644 --- a/device/dell/x86_64-dellemc_z9264f_c3538-r0/DellEMC-Z9264f/th2-z9264f-64x100G.config.bcm +++ b/device/dell/x86_64-dellemc_z9264f_c3538-r0/DellEMC-Z9264f/th2-z9264f-64x100G.config.bcm @@ -18,8 +18,6 @@ ipv6_lpm_128b_enable=1 parity_correction=1 parity_enable=1 -scache_filename=/tmp/scache - dport_map_enable=1 dport_map_enable=1 diff --git a/device/delta/x86_64-delta_ag9064-r0/Delta-ag9064/th2-ag9064-64x100G.config.bcm b/device/delta/x86_64-delta_ag9064-r0/Delta-ag9064/th2-ag9064-64x100G.config.bcm index 4cc15059e8..859196d8e5 100644 --- a/device/delta/x86_64-delta_ag9064-r0/Delta-ag9064/th2-ag9064-64x100G.config.bcm +++ b/device/delta/x86_64-delta_ag9064-r0/Delta-ag9064/th2-ag9064-64x100G.config.bcm @@ -797,7 +797,6 @@ phy_an_allow_pll_change_hg=0 robust_hash_disable_egress_vlan=1 robust_hash_disable_mpls=1 robust_hash_disable_vlan=1 -scache_filename=/tmp/scache sram_scan_enable=0 stable_size=0x5500000 mmu_lossless=1 diff --git a/device/ingrasys/x86_64-ingrasys_s8810_32q-r0/INGRASYS-S8810-32Q/td2-s8810-32x40G.config.bcm b/device/ingrasys/x86_64-ingrasys_s8810_32q-r0/INGRASYS-S8810-32Q/td2-s8810-32x40G.config.bcm index daa4b7a7ed..894f60345a 100644 --- a/device/ingrasys/x86_64-ingrasys_s8810_32q-r0/INGRASYS-S8810-32Q/td2-s8810-32x40G.config.bcm +++ b/device/ingrasys/x86_64-ingrasys_s8810_32q-r0/INGRASYS-S8810-32Q/td2-s8810-32x40G.config.bcm @@ -2,7 +2,6 @@ os=unix module_64ports=0 -scache_filename=/tmp/scache schan_intr_enable=0 stable_size=0x2000000 diff --git a/device/ingrasys/x86_64-ingrasys_s8900_54xc-r0/INGRASYS-S8900-54XC/th-s8900-48x25G+6x100G.config.bcm b/device/ingrasys/x86_64-ingrasys_s8900_54xc-r0/INGRASYS-S8900-54XC/th-s8900-48x25G+6x100G.config.bcm index 9248b06656..8440176b20 100644 --- a/device/ingrasys/x86_64-ingrasys_s8900_54xc-r0/INGRASYS-S8900-54XC/th-s8900-48x25G+6x100G.config.bcm +++ b/device/ingrasys/x86_64-ingrasys_s8900_54xc-r0/INGRASYS-S8900-54XC/th-s8900-48x25G+6x100G.config.bcm @@ -12,8 +12,6 @@ lpm_ipv6_128b_reserved=0 parity_correction=1 parity_enable=1 -scache_filename=/tmp/scach - #PIPE0 portmap_1=1:25 portmap_2=2:25 diff --git a/device/ingrasys/x86_64-ingrasys_s8900_64xc-r0/INGRASYS-S8900-64XC/th-s8900-48x25G+16x100G.config.bcm b/device/ingrasys/x86_64-ingrasys_s8900_64xc-r0/INGRASYS-S8900-64XC/th-s8900-48x25G+16x100G.config.bcm index 11d8e30a2a..562e584012 100644 --- a/device/ingrasys/x86_64-ingrasys_s8900_64xc-r0/INGRASYS-S8900-64XC/th-s8900-48x25G+16x100G.config.bcm +++ b/device/ingrasys/x86_64-ingrasys_s8900_64xc-r0/INGRASYS-S8900-64XC/th-s8900-48x25G+16x100G.config.bcm @@ -12,8 +12,6 @@ lpm_ipv6_128b_reserved=0 parity_correction=1 parity_enable=1 -scache_filename=/tmp/scach - #PIPE0 portmap_1=17:25 portmap_2=18:25 diff --git a/device/ingrasys/x86_64-ingrasys_s9100-r0/INGRASYS-S9100-C32/th-s9100-32x100G.config.bcm b/device/ingrasys/x86_64-ingrasys_s9100-r0/INGRASYS-S9100-C32/th-s9100-32x100G.config.bcm index 3f4ce8faa7..46b8799efe 100644 --- a/device/ingrasys/x86_64-ingrasys_s9100-r0/INGRASYS-S9100-C32/th-s9100-32x100G.config.bcm +++ b/device/ingrasys/x86_64-ingrasys_s9100-r0/INGRASYS-S9100-C32/th-s9100-32x100G.config.bcm @@ -18,8 +18,6 @@ mmu_lossless=0 parity_correction=1 parity_enable=1 -scache_filename=/tmp/scach - #PIPE0 portmap_1=5:100 portmap_2=1:100 diff --git a/src/sonic-device-data/tests/permitted_list b/src/sonic-device-data/tests/permitted_list index ea78b8165f..a52e1c0d8e 100644 --- a/src/sonic-device-data/tests/permitted_list +++ b/src/sonic-device-data/tests/permitted_list @@ -109,7 +109,6 @@ rate_ext_mdio_divisor robust_hash_disable_egress_vlan robust_hash_disable_mpls robust_hash_disable_vlan -scache_filename schan_intr_enable schan_timeout_usec serdes_automed