Skip to content

Commit

Permalink
Merge pull request #182 from Azure/201911
Browse files Browse the repository at this point in the history
201911
  • Loading branch information
bbinxie authored May 22, 2020
2 parents 522faaf + 209febc commit 5d0d473
Show file tree
Hide file tree
Showing 44 changed files with 1,174 additions and 118 deletions.
2 changes: 1 addition & 1 deletion build_debian.sh
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ sudo LANG=C chroot $FILESYSTEM_ROOT rm /tmp/docker.gpg
sudo LANG=C chroot $FILESYSTEM_ROOT add-apt-repository \
"deb [arch=$CONFIGURED_ARCH] https://download.docker.com/linux/debian stretch stable"
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get update
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install docker-ce=${DOCKER_VERSION}
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install docker-ce=${DOCKER_VERSION} docker-ce-cli=${DOCKER_VERSION}
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y remove software-properties-common gnupg2

if [ "$INSTALL_KUBERNETES" == "y" ]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ port_phy_addr=0xff
robust_hash_disable_egress_vlan=1
robust_hash_disable_mpls=1
robust_hash_disable_vlan=1
sram_scan_enable=0
stable_size=0x5500000
tdma_timeout_usec=15000000
tslam_timeout_usec=15000000
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -872,7 +872,6 @@ port_phy_addr_147.0=0xff
robust_hash_disable_egress_vlan.0=1
robust_hash_disable_mpls.0=1
robust_hash_disable_vlan.0=1
sram_scan_enable.0=0
tdma_timeout_usec.0=15000000
tslam_timeout_usec.0=15000000

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -744,7 +744,6 @@ port_phy_addr_143.0=0xff
robust_hash_disable_egress_vlan.0=1
robust_hash_disable_mpls.0=1
robust_hash_disable_vlan.0=1
sram_scan_enable.0=0
tdma_timeout_usec.0=15000000
tslam_timeout_usec.0=15000000

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"skip_fancontrol": true,
"skip_ledd": true,
"skip_xcvrd": false,
"skip_psud": false,
"skip_syseepromd": false
"skip_syseepromd": false
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"skip_fancontrol": true,
"skip_ledd": true,
"skip_xcvrd": false,
"skip_psud": false,
"skip_syseepromd": false
"skip_syseepromd": false
}
8 changes: 4 additions & 4 deletions device/dell/x86_64-dell_s6000_s1220-r0/sensors.conf
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
# tmp75-i2c-11-4e is an ambient temperature sensor.

chip "tmp75-*"
set temp1_max 50
set temp1_max_hyst 25
set temp1_max 80
set temp1_max_hyst 70

# emc1403-i2c-10-4d has following temperature sensors:
# temp1: CPU0 external Temp Sensor
Expand All @@ -32,5 +32,5 @@ chip "jc42-*"
set temp1_crit 85

chip "dni_dps460-*"
set temp1_max 50
set temp2_max 50
set temp1_max 80
set temp2_max 80
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
{%- set default_topo = 't1' %}
{%- include 'buffers_config.j2' %}
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@

{%- set default_cable = '40m' %}

{%- macro generate_buffer_pool_and_profiles() %}
"BUFFER_POOL": {
"ingress_lossless_pool": {
"size": "28550336",
"type": "ingress",
"mode": "dynamic",
"xoff": "4194112"
},
"egress_pool": {
"size": "28550336",
"type": "egress",
"mode": "static"
}
},
"BUFFER_PROFILE": {
"ingress_lossy_profile": {
"pool":"[BUFFER_POOL|ingress_lossless_pool]",
"size":"0",
"dynamic_th":"3"
},
"egress_lossless_profile": {
"pool":"[BUFFER_POOL|egress_pool]",
"size":"0",
"mode": "static",
"static_th":"32744448"
},
"egress_lossy_profile": {
"pool":"[BUFFER_POOL|egress_pool]",
"size":"0",
"mode": "dynamic",
"dynamic_th":"3"
}
},
{%- endmacro %}
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@

{%- set default_cable = '40m' %}

{%- macro generate_buffer_pool_and_profiles() %}
"BUFFER_POOL": {
"ingress_lossless_pool": {
"size": "28550336",
"type": "ingress",
"mode": "dynamic",
"xoff": "4194112"
},
"egress_pool": {
"size": "28550336",
"type": "egress",
"mode": "static"
}
},
"BUFFER_PROFILE": {
"ingress_lossy_profile": {
"pool":"[BUFFER_POOL|ingress_lossless_pool]",
"size":"0",
"dynamic_th":"3"
},
"egress_lossless_profile": {
"pool":"[BUFFER_POOL|egress_pool]",
"size":"0",
"mode": "static",
"static_th":"32744448"
},
"egress_lossy_profile": {
"pool":"[BUFFER_POOL|egress_pool]",
"size":"0",
"mode": "dynamic",
"dynamic_th":"3"
}
},
{%- endmacro %}
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# PG lossless profiles.
# speed cable size xon xoff threshold xon_offset
10000 5m 1248 2288 35776 -3 2288
25000 5m 1248 2288 53248 -3 2288
40000 5m 1248 2288 66560 -3 2288
50000 5m 1248 2288 90272 -3 2288
100000 5m 1248 2288 165568 -3 2288
10000 40m 1248 2288 37024 -3 2288
25000 40m 1248 2288 53248 -3 2288
40000 40m 1248 2288 71552 -3 2288
50000 40m 1248 2288 96096 -3 2288
100000 40m 1248 2288 177632 -3 2288
10000 300m 1248 2288 46176 -3 2288
25000 300m 1248 2288 79040 -3 2288
40000 300m 1248 2288 108160 -3 2288
50000 300m 1248 2288 141856 -3 2288
100000 300m 1248 2288 268736 -3 2288
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
# name lanes alias index speed
Ethernet0 1,2 fiftyGigE1/1/1 1 50000
Ethernet2 3,4 fiftyGigE1/1/2 1 50000
Ethernet4 5,6 fiftyGigE1/2/1 2 50000
Ethernet6 7,8 fiftyGigE1/2/2 2 50000
Ethernet8 9,10 fiftyGigE1/3/1 3 50000
Ethernet10 11,12 fiftyGigE1/3/2 3 50000
Ethernet12 13,14 fiftyGigE1/4/1 4 50000
Ethernet14 15,16 fiftyGigE1/4/2 4 50000
Ethernet16 17,18 fiftyGigE1/5/1 5 50000
Ethernet18 19,20 fiftyGigE1/5/2 5 50000
Ethernet20 21,22 fiftyGigE1/6/1 6 50000
Ethernet22 23,24 fiftyGigE1/6/2 6 50000
Ethernet24 25,26,27,28 hundredGigE1/7 7 100000
Ethernet28 29,30,31,32 hundredGigE1/8 8 100000
Ethernet32 33,34,35,36 hundredGigE1/9 9 100000
Ethernet36 37,38,39,40 hundredGigE1/10 10 100000
Ethernet40 41,42 fiftyGigE1/11/1 11 50000
Ethernet42 43,44 fiftyGigE1/11/2 11 50000
Ethernet44 45,46 fiftyGigE1/12/1 12 50000
Ethernet46 47,48 fiftyGigE1/12/2 12 50000
Ethernet48 49,50 fiftyGigE1/13/1 13 50000
Ethernet50 51,52 fiftyGigE1/13/2 13 50000
Ethernet52 53,54 fiftyGigE1/14/1 14 50000
Ethernet54 55,56 fiftyGigE1/14/2 14 50000
Ethernet56 57,58 fiftyGigE1/15/1 15 50000
Ethernet58 59,60 fiftyGigE1/15/2 15 50000
Ethernet60 61,62 fiftyGigE1/16/1 16 50000
Ethernet62 63,64 fiftyGigE1/16/2 16 50000
Ethernet64 65,66 fiftyGigE1/17/1 17 50000
Ethernet66 67,68 fiftyGigE1/17/2 17 50000
Ethernet68 69,70 fiftyGigE1/18/1 18 50000
Ethernet70 71,72 fiftyGigE1/18/2 18 50000
Ethernet72 73,74 fiftyGigE1/19/1 19 50000
Ethernet74 75,76 fiftyGigE1/19/2 19 50000
Ethernet76 77,78 fiftyGigE1/20/1 20 50000
Ethernet78 79,80 fiftyGigE1/20/2 20 50000
Ethernet80 81,82 fiftyGigE1/21/1 21 50000
Ethernet82 83,84 fiftyGigE1/21/2 21 50000
Ethernet84 85,86 fiftyGigE1/22/1 22 50000
Ethernet86 87,88 fiftyGigE1/22/2 22 50000
Ethernet88 89,90 fiftyGigE1/23/1 23 50000
Ethernet90 91,92 fiftyGigE1/23/2 23 50000
Ethernet92 93,94 fiftyGigE1/24/1 24 50000
Ethernet94 95,96 fiftyGigE1/24/2 24 50000
Ethernet96 97,98 fiftyGigE1/25/1 25 50000
Ethernet98 99,100 fiftyGigE1/25/2 25 50000
Ethernet100 101,102 fiftyGigE1/26/1 26 50000
Ethernet102 103,104 fiftyGigE1/26/2 26 50000
Ethernet104 105,106,107,108 hundredGigE1/27 27 100000
Ethernet108 109,110,111,112 hundredGigE1/28 28 100000
Ethernet112 113,114,115,116 hundredGigE1/29 29 100000
Ethernet116 117,118,119,120 hundredGigE1/30 30 100000
Ethernet120 121,122 fiftyGigE1/31/1 31 50000
Ethernet122 123,124 fiftyGigE1/31/2 31 50000
Ethernet124 125,126 fiftyGigE1/32/1 32 50000
Ethernet126 127,128 fiftyGigE1/32/2 32 50000
Ethernet128 129 tenGigE1/33 33 10000
Ethernet129 128 tenGigE1/34 34 10000
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{%- include 'qos_config.j2' %}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td3-s5232f-8x100G+48x50G.config.bcm
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
m0 load 0 0x0 /usr/share/sonic/hwsku/linkscan_led_fw.bin
m0 load 0 0x3800 /usr/share/sonic/hwsku/custom_led.bin
Loading

0 comments on commit 5d0d473

Please sign in to comment.