Skip to content

Commit 8439645

Browse files
pphucharpphuchar
authored
Merge branch 'master' into upstream_silverstone-dp
2 parents ea9a615 + 6d0f8dc commit 8439645

File tree

598 files changed

+31980
-10053
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

598 files changed

+31980
-10053
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ If this is a bug fix, make sure your description includes "fixes #xxxx", or
1010
Please provide the following information:
1111
-->
1212

13-
**- What I did**
13+
**- Why I did it**
1414

1515
**- How I did it**
1616

‎Makefile.work

+10
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,16 @@ sonic-slave-bash :
251251
$(DOCKER_BUILD) ; }
252252
@$(DOCKER_RUN) -t $(SLAVE_IMAGE):$(SLAVE_TAG) bash
253253

254+
sonic-slave-run :
255+
@$(OVERLAY_MODULE_CHECK)
256+
@docker inspect --type image $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) &> /dev/null || \
257+
{ echo Image $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) not found. Building... ; \
258+
$(DOCKER_BASE_BUILD) ; }
259+
@docker inspect --type image $(SLAVE_IMAGE):$(SLAVE_TAG) &> /dev/null || \
260+
{ echo Image $(SLAVE_IMAGE):$(SLAVE_TAG) not found. Building... ; \
261+
$(DOCKER_BUILD) ; }
262+
@$(DOCKER_RUN) $(SLAVE_IMAGE):$(SLAVE_TAG) bash -c "$(SONIC_RUN_CMDS)"
263+
254264
showtag:
255265
@echo $(SLAVE_IMAGE):$(SLAVE_TAG)
256266
@echo $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG)

‎README.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
*master builds*:
2-
31
[![Total alerts](https://img.shields.io/lgtm/alerts/g/Azure/sonic-buildimage.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/Azure/sonic-buildimage/alerts/)
42
[![Language grade: Python](https://img.shields.io/lgtm/grade/python/g/Azure/sonic-buildimage.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/Azure/sonic-buildimage/context:python)
53

4+
5+
*master builds*:
6+
67
[![Innovium](https://sonic-jenkins.westus2.cloudapp.azure.com/job/innovium/job/buildimage-invm-all/badge/icon?subject=Innovium)](https://sonic-jenkins.westus2.cloudapp.azure.com/job/innovium/job/buildimage-invm-all)
78
[![Barefoot](https://sonic-jenkins.westus2.cloudapp.azure.com/job/barefoot/job/buildimage-bf-all/badge/icon?subject=Barefoot)](https://sonic-jenkins.westus2.cloudapp.azure.com/job/barefoot/job/buildimage-bf-all)
89
[![Broadcom](https://sonic-jenkins.westus2.cloudapp.azure.com/job/broadcom/job/buildimage-brcm-all/badge/icon?subject=Broadcom)](https://sonic-jenkins.westus2.cloudapp.azure.com/job/broadcom/job/buildimage-brcm-all)

‎build_debian.sh

+10-1
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,10 @@ sudo chmod +x $FILESYSTEM_ROOT/etc/initramfs-tools/scripts/init-premount/arista-
165165
sudo cp files/initramfs-tools/resize-rootfs $FILESYSTEM_ROOT/etc/initramfs-tools/scripts/init-premount/resize-rootfs
166166
sudo chmod +x $FILESYSTEM_ROOT/etc/initramfs-tools/scripts/init-premount/resize-rootfs
167167

168+
# Hook into initramfs: run fsck to repair a non-clean filesystem prior to be mounted
169+
sudo cp files/initramfs-tools/fsck-rootfs $FILESYSTEM_ROOT/etc/initramfs-tools/scripts/init-premount/fsck-rootfs
170+
sudo chmod +x $FILESYSTEM_ROOT/etc/initramfs-tools/scripts/init-premount/fsck-rootfs
171+
168172
## Hook into initramfs: after partition mount and loop file mount
169173
## 1. Prepare layered file system
170174
## 2. Bind-mount docker working directory (docker overlay storage cannot work over overlay rootfs)
@@ -200,7 +204,12 @@ sudo LANG=C chroot $FILESYSTEM_ROOT rm /tmp/docker.gpg
200204
sudo LANG=C chroot $FILESYSTEM_ROOT add-apt-repository \
201205
"deb [arch=$CONFIGURED_ARCH] https://download.docker.com/linux/debian $IMAGE_DISTRO stable"
202206
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get update
203-
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install docker-ce=${DOCKER_VERSION} docker-ce-cli=${DOCKER_VERSION}
207+
if dpkg --compare-versions ${DOCKER_VERSION} ge "18.09"; then
208+
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install docker-ce=${DOCKER_VERSION} docker-ce-cli=${DOCKER_VERSION}
209+
else
210+
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install docker-ce=${DOCKER_VERSION}
211+
fi
212+
204213
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y remove software-properties-common gnupg2
205214

206215
if [ "$INSTALL_KUBERNETES" == "y" ]

‎device/accton/x86_64-accton_as4630_54pe-r0/Accton-AS4630-54PE/port_config.ini

+55-55
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,55 @@
1-
# name lanes alias index speed
2-
Ethernet0 26 thousandE1 1 1000
3-
Ethernet1 25 thousandE2 2 1000
4-
Ethernet2 28 thousandE3 3 1000
5-
Ethernet3 27 thousandE4 4 1000
6-
Ethernet4 30 thousandE5 5 1000
7-
Ethernet5 29 thousandE6 6 1000
8-
Ethernet6 32 thousandE7 7 1000
9-
Ethernet7 31 thousandE8 8 1000
10-
Ethernet8 38 thousandE9 9 1000
11-
Ethernet9 37 thousandE10 10 1000
12-
Ethernet10 40 thousandE11 11 1000
13-
Ethernet11 39 thousandE12 12 1000
14-
Ethernet12 34 thousandE13 13 1000
15-
Ethernet13 33 thousandE14 14 1000
16-
Ethernet14 36 thousandE15 15 1000
17-
Ethernet15 35 thousandE16 16 1000
18-
Ethernet16 46 thousandE17 17 1000
19-
Ethernet17 45 thousandE18 18 1000
20-
Ethernet18 48 thousandE19 19 1000
21-
Ethernet19 47 thousandE20 20 1000
22-
Ethernet20 42 thousandE21 21 1000
23-
Ethernet21 41 thousandE22 22 1000
24-
Ethernet22 44 thousandE23 23 1000
25-
Ethernet23 43 thousandE24 24 1000
26-
Ethernet24 2 thousandE25 25 1000
27-
Ethernet25 1 thousandE26 26 1000
28-
Ethernet26 4 thousandE27 27 1000
29-
Ethernet27 3 thousandE28 28 1000
30-
Ethernet28 6 thousandE29 29 1000
31-
Ethernet29 5 thousandE30 30 1000
32-
Ethernet30 8 thousandE31 31 1000
33-
Ethernet31 7 thousandE32 32 1000
34-
Ethernet32 10 thousandE33 33 1000
35-
Ethernet33 9 thousandE34 34 1000
36-
Ethernet34 12 thousandE35 35 1000
37-
Ethernet35 11 thousandE36 36 1000
38-
Ethernet36 14 thousandE37 37 1000
39-
Ethernet37 13 thousandE38 38 1000
40-
Ethernet38 16 thousandE39 39 1000
41-
Ethernet39 15 thousandE40 40 1000
42-
Ethernet40 18 thousandE41 41 1000
43-
Ethernet41 17 thousandE42 42 1000
44-
Ethernet42 20 thousandE43 43 1000
45-
Ethernet43 19 thousandE44 44 1000
46-
Ethernet44 22 thousandE45 45 1000
47-
Ethernet45 21 thousandE46 46 1000
48-
Ethernet46 24 thousandE47 47 1000
49-
Ethernet47 23 thousandE48 48 1000
50-
Ethernet48 67 twentyfiveGigE49 49 25000
51-
Ethernet49 66 twentyfiveGigE50 50 25000
52-
Ethernet50 65 twentyfiveGigE51 51 25000
53-
Ethernet51 68 twentyfiveGigE52 52 25000
54-
Ethernet52 73,74,75,76 hundredGigE53 53 100000
55-
Ethernet56 69,70,71,72 hundredGigE54 54 100000
1+
# name lanes alias index speed autoneg
2+
Ethernet0 26 thousandE1 1 1000 1
3+
Ethernet1 25 thousandE2 2 1000 1
4+
Ethernet2 28 thousandE3 3 1000 1
5+
Ethernet3 27 thousandE4 4 1000 1
6+
Ethernet4 30 thousandE5 5 1000 1
7+
Ethernet5 29 thousandE6 6 1000 1
8+
Ethernet6 32 thousandE7 7 1000 1
9+
Ethernet7 31 thousandE8 8 1000 1
10+
Ethernet8 38 thousandE9 9 1000 1
11+
Ethernet9 37 thousandE10 10 1000 1
12+
Ethernet10 40 thousandE11 11 1000 1
13+
Ethernet11 39 thousandE12 12 1000 1
14+
Ethernet12 34 thousandE13 13 1000 1
15+
Ethernet13 33 thousandE14 14 1000 1
16+
Ethernet14 36 thousandE15 15 1000 1
17+
Ethernet15 35 thousandE16 16 1000 1
18+
Ethernet16 46 thousandE17 17 1000 1
19+
Ethernet17 45 thousandE18 18 1000 1
20+
Ethernet18 48 thousandE19 19 1000 1
21+
Ethernet19 47 thousandE20 20 1000 1
22+
Ethernet20 42 thousandE21 21 1000 1
23+
Ethernet21 41 thousandE22 22 1000 1
24+
Ethernet22 44 thousandE23 23 1000 1
25+
Ethernet23 43 thousandE24 24 1000 1
26+
Ethernet24 2 thousandE25 25 1000 1
27+
Ethernet25 1 thousandE26 26 1000 1
28+
Ethernet26 4 thousandE27 27 1000 1
29+
Ethernet27 3 thousandE28 28 1000 1
30+
Ethernet28 6 thousandE29 29 1000 1
31+
Ethernet29 5 thousandE30 30 1000 1
32+
Ethernet30 8 thousandE31 31 1000 1
33+
Ethernet31 7 thousandE32 32 1000 1
34+
Ethernet32 10 thousandE33 33 1000 1
35+
Ethernet33 9 thousandE34 34 1000 1
36+
Ethernet34 12 thousandE35 35 1000 1
37+
Ethernet35 11 thousandE36 36 1000 1
38+
Ethernet36 14 thousandE37 37 1000 1
39+
Ethernet37 13 thousandE38 38 1000 1
40+
Ethernet38 16 thousandE39 39 1000 1
41+
Ethernet39 15 thousandE40 40 1000 1
42+
Ethernet40 18 thousandE41 41 1000 1
43+
Ethernet41 17 thousandE42 42 1000 1
44+
Ethernet42 20 thousandE43 43 1000 1
45+
Ethernet43 19 thousandE44 44 1000 1
46+
Ethernet44 22 thousandE45 45 1000 1
47+
Ethernet45 21 thousandE46 46 1000 1
48+
Ethernet46 24 thousandE47 47 1000 1
49+
Ethernet47 23 thousandE48 48 1000 1
50+
Ethernet48 67 twentyfiveGigE49 49 25000 0
51+
Ethernet49 66 twentyfiveGigE50 50 25000 0
52+
Ethernet50 65 twentyfiveGigE51 51 25000 0
53+
Ethernet51 68 twentyfiveGigE52 52 25000 0
54+
Ethernet52 73,74,75,76 hundredGigE53 53 100000 0
55+
Ethernet56 69,70,71,72 hundredGigE54 54 100000 0

‎device/accton/x86_64-accton_as4630_54pe-r0/custom_led.bin

952 Bytes
Binary file not shown.

‎device/accton/x86_64-accton_as4630_54pe-r0/led_proc_init.soc

+1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
m0 load 0 0x3800 /usr/share/sonic/platform/custom_led.bin
12
led start
23
led auto on

‎device/accton/x86_64-accton_as4630_54pe-r0/media_settings.json

+52
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
{
2+
"PORT_MEDIA_SETTINGS": {
3+
"49": {
4+
"Default": {
5+
"preemphasis": {
6+
"lane0":"0x124106"
7+
}
8+
}
9+
},
10+
"50": {
11+
"Default": {
12+
"preemphasis": {
13+
"lane0":"0x124106"
14+
}
15+
}
16+
},
17+
"51": {
18+
"Default": {
19+
"preemphasis": {
20+
"lane0":"0x124106"
21+
}
22+
}
23+
},
24+
"52": {
25+
"Default": {
26+
"preemphasis": {
27+
"lane0":"0x124106"
28+
}
29+
}
30+
},
31+
"53": {
32+
"Default": {
33+
"preemphasis": {
34+
"lane0":"0x124106",
35+
"lane1":"0x124106",
36+
"lane2":"0x124106",
37+
"lane3":"0x124106"
38+
}
39+
}
40+
},
41+
"54": {
42+
"Default": {
43+
"preemphasis": {
44+
"lane0":"0x124106",
45+
"lane1":"0x124106",
46+
"lane2":"0x124106",
47+
"lane3":"0x124106"
48+
}
49+
}
50+
}
51+
}
52+
}

‎device/accton/x86_64-accton_as5835_54t-r0/Accton-AS5835-54T/td3-as5835t-48x10G+6x100G.config.bcm renamed to ‎device/accton/x86_64-accton_as5835_54t-r0/Accton-AS5835-54T/mv2-as5835t-48x10G+6x100G.config.bcm

+21-2
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,29 @@ parity_enable=0
1414
mem_cache_enable=0
1515

1616
l2_mem_entries=32768
17-
#l3_mem_entries=49152
18-
#fpem_mem_entries=16384
17+
l3_mem_entries=16384
18+
fpem_mem_entries=16384
1919
l2xmsg_mode=1
2020

21+
# Platform specfic
22+
bcm_num_cos=8
23+
bcm_stat_interval=2000000
24+
cdma_timeout_usec=3000000
25+
ifp_inports_support_enable=1
26+
ipv6_lpm_128b_enable=0x1
27+
l3_alpm_enable=2
28+
l3_max_ecmp_mode=1
29+
max_vp_lags=0
30+
miim_intr_enable=0
31+
module_64ports=1
32+
port_flex_enable=1
33+
schan_intr_enable=0
34+
stable_size=0x5500000 ;Specify the stable cache size in bytes used for Warm boot operations
35+
tdma_timeout_usec=3000000
36+
skip_L2_USER_ENTRY=0
37+
bcm_tunnel_term_compatible_mode=1
38+
l3_alpm_ipv6_128b_bkt_rsvd=1
39+
2140
#FC0
2241
dport_map_port_1=2
2342
dport_map_port_2=1

‎device/accton/x86_64-accton_as5835_54t-r0/Accton-AS5835-54T/port_config.ini

100644100755
+5-5
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ Ethernet44 74 tenGigE45 45 10000
4747
Ethernet45 73 tenGigE46 46 10000
4848
Ethernet46 76 tenGigE47 47 10000
4949
Ethernet47 75 tenGigE48 48 10000
50-
Ethernet48 29,30,31,32 hundredGigE49 49 100000
51-
Ethernet52 33,34,35,36 hundredGigE50 53 100000
52-
Ethernet56 37,38,39,40 hundredGigE51 57 100000
53-
Ethernet60 41,42,43,44 hundredGigE52 61 100000
50+
Ethernet48 37,38,39,40 hundredGigE49 49 100000
51+
Ethernet52 29,30,31,32 hundredGigE50 53 100000
52+
Ethernet56 33,34,35,36 hundredGigE51 57 100000
53+
Ethernet60 49,50,51,52 hundredGigE52 61 100000
5454
Ethernet64 45,46,47,48 hundredGigE53 65 100000
55-
Ethernet68 49,50,51,52 hundredGigE54 69 100000
55+
Ethernet68 41,42,43,44 hundredGigE54 69 100000

‎device/accton/x86_64-accton_as5835_54t-r0/Accton-AS5835-54T/sai.profile

100644100755
+2-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
SAI_INIT_CONFIG_FILE=/etc/bcm/td3-as5835t-48x10G+6x100G.config.bcm
1+
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/mv2-as5835t-48x10G+6x100G.config.bcm
2+
SAI_BOARD_CONFIG_PATH=/etc/accton

‎device/accton/x86_64-accton_as7326_56x-r0/led_proc_init.soc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#led auto off
22
#led stop
3-
m0 load 0 0x0 /usr/share/sonic/platform/linkscan_led_fw.bin
3+
#m0 load 0 0x0 /usr/share/sonic/platform/linkscan_led_fw.bin
44
m0 load 0 0x3800 /usr/share/sonic/platform/custom_led.bin
55
led auto on
66
led start

‎device/accton/x86_64-accton_as7726_32x-r0/Accton-AS7726-32X/sai.profile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
SAI_INIT_CONFIG_FILE=/etc/bcm/td3-as7726-32x100G.config.bcm
1+
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td3-as7726-32x100G.config.bcm

‎device/accton/x86_64-accton_as7726_32x-r0/Accton-AS7726-32X/td3-as7726-32x100G.config.bcm

+9-7
Original file line numberDiff line numberDiff line change
@@ -11,26 +11,28 @@ mem_cache_enable=0
1111

1212
l2_mem_entries=32768
1313
l3_mem_entries=16384
14-
fpem_mem_entries=131072
14+
fpem_mem_entries=16384
1515
l2xmsg_mode=1
1616

1717
# Platform specfic
1818
bcm_num_cos=8
1919
bcm_stat_interval=2000000
2020
cdma_timeout_usec=3000000
21+
ifp_inports_support_enable=1
2122
ipv6_lpm_128b_enable=0x1
2223
l3_max_ecmp_mode=1
23-
#l3_alpm_enable=2
24+
l3_alpm_enable=2
2425
lpm_scaling_enable=0
2526
max_vp_lags=0
2627
miim_intr_enable=0
2728
module_64ports=1
29+
port_flex_enable=1
2830
schan_intr_enable=0
2931
stable_size=0x5500000
3032
tdma_timeout_usec=3000000
3133
skip_L2_USER_ENTRY=0
3234
bcm_tunnel_term_compatible_mode=1
33-
35+
l3_alpm_ipv6_128b_bkt_rsvd=1
3436
phy_an_c73=1
3537

3638
dport_map_port_1=1
@@ -100,10 +102,10 @@ portmap_115=113:100
100102
portmap_119=117:100
101103
portmap_123=121:100
102104
portmap_127=125:100
103-
portmap_66=129:10:m
104-
portmap_130=128:10:m
105-
portmap_65=130:10
106-
portmap_131=131:10
105+
#portmap_66=129:10:m
106+
#portmap_130=128:10:m
107+
#portmap_65=130:10
108+
#portmap_131=131:10
107109

108110
phy_chain_rx_lane_map_physical{1.0}=0x1320
109111
phy_chain_rx_lane_map_physical{5.0}=0x0123

‎device/accton/x86_64-accton_as7726_32x-r0/custom_led.bin

1.18 KB
Binary file not shown.

‎device/accton/x86_64-accton_as7726_32x-r0/led_proc_init.soc

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
2+
m0 load 0 0x3800 /usr/share/sonic/platform/custom_led.bin
3+
led auto on
4+
led start

‎device/accton/x86_64-accton_as7816_64x-r0/Accton-AS7816-64X/sai.profile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th2-as7816-64x100G.config.bcm
1+
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th2-as7816-64x25G-48x100G_row1.config.bcm

‎device/accton/x86_64-accton_as7816_64x-r0/Accton-AS7816-64X/th2-as7816-64x100G.config.bcm renamed to ‎device/accton/x86_64-accton_as7816_64x-r0/Accton-AS7816-64X/th2-as7816-64x25G-48x100G_row1.config.bcm

+7-6
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,21 @@ max_vp_lags=0
2626
miim_intr_enable=0
2727
module_64ports=1
2828
oversubscribe_mode=1
29+
port_flex_enable=1
2930

3031
#add loopback port
3132
# port 33 is the first loopback port
32-
portmap_33=260:10
33+
#portmap_33=260:10
3334
# port 66 is the first management port
34-
portmap_66=257:10
35+
#portmap_66=257:10
3536
# port 67 is the second loopback port
36-
portmap_67=261:10
37+
#portmap_67=261:10
3738
# port 100 is the second management port
38-
portmap_100=259:10
39+
#portmap_100=259:10
3940
# port 101 is the third loopback port
40-
portmap_101=262:10
41+
#portmap_101=262:10
4142
# port 135 is the fourth loopback port
42-
portmap_135=263:10
43+
#portmap_135=263:10
4344

4445
#Port0
4546
#FC18

0 commit comments

Comments
 (0)