Skip to content

Commit

Permalink
Merge branch 'master' into sonic_onboarding_n3248te
Browse files Browse the repository at this point in the history
  • Loading branch information
@arunlk-dell
arunlk-dell authored Sep 21, 2021
2 parents c89b67d + 34dddb8 commit 15620b3
Show file tree
Hide file tree
Showing 116 changed files with 12,982 additions and 395 deletions.
5 changes: 5 additions & 0 deletions .azure-pipelines/azure-pipelines-build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,11 @@ jobs:
make $BUILD_OPTIONS INSTALL_DEBUG_TOOLS=y target/sonic-vs.img.gz && mv target/sonic-vs.img.gz target/sonic-vs-dbg.img.gz
fi
make $BUILD_OPTIONS target/docker-sonic-vs.gz target/sonic-vs.img.gz target/docker-ptf.gz
if [ $(Build.Reason) != 'PullRequest' ];then
gzip -kd target/sonic-vs.img.gz
SONIC_RUN_CMDS="qemu-img convert target/sonic-vs.img -O vhdx -o subformat=dynamic target/sonic-vs.vhdx" make sonic-slave-run
rm target/sonic-vs.img
fi
else
if [ $(dbg_image) == yes ]; then
make $BUILD_OPTIONS INSTALL_DEBUG_TOOLS=y target/sonic-$(GROUP_NAME).bin && \
Expand Down
1 change: 1 addition & 0 deletions device/arista/x86_64-arista_7800r3_48cq2_lc/default_sku
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Arista-7800R3-48CQ2-C48 t1
1 change: 1 addition & 0 deletions device/arista/x86_64-arista_7800r3_48cqm2_lc/default_sku
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Arista-7800R3-48CQM2-C48 t1
8 changes: 8 additions & 0 deletions device/barefoot/x86_64-accton_as9516_32d-r0/platform_components.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"chassis": {
"Newport": {
"component": {
}
}
}
}
8 changes: 8 additions & 0 deletions device/barefoot/x86_64-accton_wedge100bf_32x-r0/platform_components.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"chassis": {
"Wedge100BF-32X-O-AC-F-BF": {
"component": {
}
}
}
}
8 changes: 8 additions & 0 deletions device/barefoot/x86_64-accton_wedge100bf_65x-r0/platform_components.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"chassis": {
"Wedge100BF-65X-O-AC-F-BF": {
"component": {
}
}
}
}
16 changes: 16 additions & 0 deletions device/celestica/x86_64-cel_e1031-r0/system_health_monitoring_config.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"services_to_ignore": [],
"devices_to_ignore": [
"asic",
"psu.temperature",
"PSU2 Fan",
"PSU1 Fan"
],
"user_defined_checkers": [],
"polling_interval": 60,
"led_color": {
"fault": "orange",
"normal": "green",
"booting": "orange_blink"
}
}
12 changes: 6 additions & 6 deletions device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/buffers_defaults_t0.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@
{# Generate list of ports #}
{%- for port_idx in range(0,12) %}
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 8)) %}{%- endif %}
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 2) + 2) %}{%- endif %}
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 2) + 4) %}{%- endif %}
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 2) + 6) %}{%- endif %}
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 8) + 2) %}{%- endif %}
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 8) + 4) %}{%- endif %}
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 8) + 6) %}{%- endif %}
{%- endfor %}
{%- for port_idx in range(12,16) %}
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 8)) %}{%- endif %}
{%- endfor %}
{%- for port_idx in range(16,20) %}
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 8)) %}{%- endif %}
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 2) + 2) %}{%- endif %}
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 2) + 4) %}{%- endif %}
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 2) + 6) %}{%- endif %}
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 8) + 2) %}{%- endif %}
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 8) + 4) %}{%- endif %}
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 8) + 6) %}{%- endif %}
{%- endfor %}
{%- for port_idx in range(20,32) %}
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 8)) %}{%- endif %}
Expand Down
12 changes: 6 additions & 6 deletions device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/buffers_defaults_t1.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@
{# Generate list of ports #}
{%- for port_idx in range(0,12) %}
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 8)) %}{%- endif %}
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 2) + 2) %}{%- endif %}
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 2) + 4) %}{%- endif %}
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 2) + 6) %}{%- endif %}
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 8) + 2) %}{%- endif %}
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 8) + 4) %}{%- endif %}
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 8) + 6) %}{%- endif %}
{%- endfor %}
{%- for port_idx in range(12,16) %}
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 8)) %}{%- endif %}
{%- endfor %}
{%- for port_idx in range(16,20) %}
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 8)) %}{%- endif %}
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 2) + 2) %}{%- endif %}
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 2) + 4) %}{%- endif %}
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 2) + 6) %}{%- endif %}
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 8) + 2) %}{%- endif %}
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 8) + 4) %}{%- endif %}
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 8) + 6) %}{%- endif %}
{%- endfor %}
{%- for port_idx in range(20,32) %}
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 8)) %}{%- endif %}
Expand Down
7 changes: 3 additions & 4 deletions device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/sai_postinit_cmd.soc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -373,6 +373,7 @@ phy $port TXFIR_TAP_CTL4r.3 TXFIR_TAP4_COEFF=0
phy $port TXFIR_TAP_CTL5r.3 TXFIR_TAP5_COEFF=0
phy $port TXFIR_TAP_CTL0r.3 TXFIR_TAP_LOAD=0x1

local port ce18
#*** lane 4 ***
phy $port TXFIR_TAP_CTL0r.4 TXFIR_TAP0_COEFF=0
phy $port TXFIR_TAP_CTL1r.4 TXFIR_TAP1_COEFF=0x1E8
Expand All @@ -382,8 +383,6 @@ phy $port TXFIR_TAP_CTL4r.4 TXFIR_TAP4_COEFF=0
phy $port TXFIR_TAP_CTL5r.4 TXFIR_TAP5_COEFF=0
phy $port TXFIR_TAP_CTL0r.4 TXFIR_TAP_LOAD=0x1


local port ce18
#*** lane 5 ***
phy $port TXFIR_TAP_CTL0r.5 TXFIR_TAP0_COEFF=0
phy $port TXFIR_TAP_CTL1r.5 TXFIR_TAP1_COEFF=0x1E8
Expand All @@ -393,6 +392,7 @@ phy $port TXFIR_TAP_CTL4r.5 TXFIR_TAP4_COEFF=0
phy $port TXFIR_TAP_CTL5r.5 TXFIR_TAP5_COEFF=0
phy $port TXFIR_TAP_CTL0r.5 TXFIR_TAP_LOAD=0x1

local port ce19
#*** lane 6 ***
phy $port TXFIR_TAP_CTL0r.6 TXFIR_TAP0_COEFF=0
phy $port TXFIR_TAP_CTL1r.6 TXFIR_TAP1_COEFF=0x1E8
Expand All @@ -402,7 +402,6 @@ phy $port TXFIR_TAP_CTL4r.6 TXFIR_TAP4_COEFF=0
phy $port TXFIR_TAP_CTL5r.6 TXFIR_TAP5_COEFF=0
phy $port TXFIR_TAP_CTL0r.6 TXFIR_TAP_LOAD=0x1

local port ce19
#*** lane 7 ***
phy $port TXFIR_TAP_CTL0r.7 TXFIR_TAP0_COEFF=4
phy $port TXFIR_TAP_CTL1r.7 TXFIR_TAP1_COEFF=0x1E4
Expand Down Expand Up @@ -974,6 +973,7 @@ phy $port TXFIR_TAP_CTL4r.5 TXFIR_TAP4_COEFF=0
phy $port TXFIR_TAP_CTL5r.5 TXFIR_TAP5_COEFF=0
phy $port TXFIR_TAP_CTL0r.5 TXFIR_TAP_LOAD=0x1

local port ce47
#*** lane 6 ***
phy $port TXFIR_TAP_CTL0r.6 TXFIR_TAP0_COEFF=0
phy $port TXFIR_TAP_CTL1r.6 TXFIR_TAP1_COEFF=0x1E8
Expand All @@ -983,7 +983,6 @@ phy $port TXFIR_TAP_CTL4r.6 TXFIR_TAP4_COEFF=0
phy $port TXFIR_TAP_CTL5r.6 TXFIR_TAP5_COEFF=0
phy $port TXFIR_TAP_CTL0r.6 TXFIR_TAP_LOAD=0x1

local port ce47
#*** lane 7 ***
phy $port TXFIR_TAP_CTL0r.7 TXFIR_TAP0_COEFF=4
phy $port TXFIR_TAP_CTL1r.7 TXFIR_TAP1_COEFF=0x1E4
Expand Down
Loading

0 comments on commit 15620b3

Please sign in to comment.