Skip to content

Commit 78173ce

Browse files
mssonicbldmssonicbld
authored
Merge pull request sonic-net#87 from mssonicbld/sonicbld/202205-merge
[code sync] Merge code from sonic-net/sonic-buildimage:202205 to 202205
2 parents d2ba7b0 + cddfe10 commit 78173ce

12 files changed

+49
-18
lines changed

‎device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/ASK-Board-M0-48x1G-4x10G.md5

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
54e297465548abc057d1d513075f848e
1+
429e9dc38eebb3093b21e687edf55e79

‎device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/ASK-Board-M0-48x1G-4x10G.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" version="2022-09-23-1.1" profile="Askboard" dsig="md5">
2+
<data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" version="2023-05-05-1.04" profile="Askboard" dsig="md5">
33
<askboardplt:ASK-Board xmlns:askboardplt="urn:marvell:askboard:yang">
44
<askboardplt:typedefs>
55
<askboardplt:typedef>
@@ -1199,6 +1199,7 @@ lowercase characters.</askboardplt:description>
11991199
<askboardplt:ledPosition askboardplt:type="led-position-type">0</askboardplt:ledPosition>
12001200
<askboardplt:polarityInvertList-list>
12011201
<askboardplt:polarityClassNum askboardplt:type="led-class-num-type">2</askboardplt:polarityClassNum>
1202+
<askboardplt:invertEnable askboardplt:type="boolean-type">true</askboardplt:invertEnable>
12021203
</askboardplt:polarityInvertList-list>
12031204
<askboardplt:portForceDataSupported askboardplt:type="boolean-type">true</askboardplt:portForceDataSupported>
12041205
<askboardplt:portForceDataLocation>
@@ -1226,6 +1227,7 @@ lowercase characters.</askboardplt:description>
12261227
<askboardplt:ledPosition askboardplt:type="led-position-type">1</askboardplt:ledPosition>
12271228
<askboardplt:polarityInvertList-list>
12281229
<askboardplt:polarityClassNum askboardplt:type="led-class-num-type">2</askboardplt:polarityClassNum>
1230+
<askboardplt:invertEnable askboardplt:type="boolean-type">true</askboardplt:invertEnable>
12291231
</askboardplt:polarityInvertList-list>
12301232
<askboardplt:portForceDataSupported askboardplt:type="boolean-type">true</askboardplt:portForceDataSupported>
12311233
<askboardplt:portForceDataLocation>
@@ -1365,11 +1367,11 @@ lowercase characters.</askboardplt:description>
13651367
<askboardplt:class13select askboardplt:type="led-stream-class13-select-type">CLASS_13_SELECT_LINK_DOWN</askboardplt:class13select>
13661368
<askboardplt:invertEnable askboardplt:type="boolean-type">false</askboardplt:invertEnable>
13671369
<askboardplt:ledClockFrequency askboardplt:type="led-stream-clock-out-frequency-type">CLOCK_OUT_FREQUENCY_1000</askboardplt:ledClockFrequency>
1370+
<askboardplt:ledClockPosEdgeModeEnable askboardplt:type="boolean-type">false</askboardplt:ledClockPosEdgeModeEnable>
13681371
</askboardplt:ledstream-configSet>
13691372
<askboardplt:ledstream-class-manipulation-list>
13701373
<askboardplt:classNum askboardplt:type="led-class-num-type">1</askboardplt:classNum>
13711374
<askboardplt:portType askboardplt:type="led-stream-port-type">PORT_TYPE_XG</askboardplt:portType>
1372-
<askboardplt:ledUnit askboardplt:type="led-unit-or-no-unit-type">0</askboardplt:ledUnit>
13731375
<askboardplt:invertEnable askboardplt:type="boolean-type">false</askboardplt:invertEnable>
13741376
<askboardplt:blinkEnable askboardplt:type="boolean-type">false</askboardplt:blinkEnable>
13751377
<askboardplt:blinkSelect askboardplt:type="led-stream-blink-select-type">BLINK_SELECT_0</askboardplt:blinkSelect>
@@ -1381,7 +1383,6 @@ lowercase characters.</askboardplt:description>
13811383
<askboardplt:ledstream-class-manipulation-list>
13821384
<askboardplt:classNum askboardplt:type="led-class-num-type">2</askboardplt:classNum>
13831385
<askboardplt:portType askboardplt:type="led-stream-port-type">PORT_TYPE_XG</askboardplt:portType>
1384-
<askboardplt:ledUnit askboardplt:type="led-unit-or-no-unit-type">0</askboardplt:ledUnit>
13851386
<askboardplt:invertEnable askboardplt:type="boolean-type">false</askboardplt:invertEnable>
13861387
<askboardplt:blinkEnable askboardplt:type="boolean-type">true</askboardplt:blinkEnable>
13871388
<askboardplt:blinkSelect askboardplt:type="led-stream-blink-select-type">BLINK_SELECT_0</askboardplt:blinkSelect>
@@ -1392,7 +1393,6 @@ lowercase characters.</askboardplt:description>
13921393
<askboardplt:ledstream-class-manipulation-list>
13931394
<askboardplt:classNum askboardplt:type="led-class-num-type">3</askboardplt:classNum>
13941395
<askboardplt:portType askboardplt:type="led-stream-port-type">PORT_TYPE_XG</askboardplt:portType>
1395-
<askboardplt:ledUnit askboardplt:type="led-unit-or-no-unit-type">0</askboardplt:ledUnit>
13961396
<askboardplt:invertEnable askboardplt:type="boolean-type">false</askboardplt:invertEnable>
13971397
<askboardplt:blinkEnable askboardplt:type="boolean-type">false</askboardplt:blinkEnable>
13981398
<askboardplt:blinkSelect askboardplt:type="led-stream-blink-select-type">BLINK_SELECT_0</askboardplt:blinkSelect>
@@ -1930,6 +1930,7 @@ lowercase characters.</askboardplt:description>
19301930
<askboardplt:ledPosition askboardplt:type="led-position-type">0</askboardplt:ledPosition>
19311931
<askboardplt:polarityInvertList-list>
19321932
<askboardplt:polarityClassNum askboardplt:type="led-class-num-type">2</askboardplt:polarityClassNum>
1933+
<askboardplt:invertEnable askboardplt:type="boolean-type">true</askboardplt:invertEnable>
19331934
</askboardplt:polarityInvertList-list>
19341935
<askboardplt:portForceDataSupported askboardplt:type="boolean-type">true</askboardplt:portForceDataSupported>
19351936
<askboardplt:portForceDataLocation>
@@ -1957,6 +1958,7 @@ lowercase characters.</askboardplt:description>
19571958
<askboardplt:ledPosition askboardplt:type="led-position-type">1</askboardplt:ledPosition>
19581959
<askboardplt:polarityInvertList-list>
19591960
<askboardplt:polarityClassNum askboardplt:type="led-class-num-type">2</askboardplt:polarityClassNum>
1961+
<askboardplt:invertEnable askboardplt:type="boolean-type">true</askboardplt:invertEnable>
19601962
</askboardplt:polarityInvertList-list>
19611963
<askboardplt:portForceDataSupported askboardplt:type="boolean-type">true</askboardplt:portForceDataSupported>
19621964
<askboardplt:portForceDataLocation>
@@ -2096,11 +2098,11 @@ lowercase characters.</askboardplt:description>
20962098
<askboardplt:class13select askboardplt:type="led-stream-class13-select-type">CLASS_13_SELECT_LINK_DOWN</askboardplt:class13select>
20972099
<askboardplt:invertEnable askboardplt:type="boolean-type">false</askboardplt:invertEnable>
20982100
<askboardplt:ledClockFrequency askboardplt:type="led-stream-clock-out-frequency-type">CLOCK_OUT_FREQUENCY_1000</askboardplt:ledClockFrequency>
2101+
<askboardplt:ledClockPosEdgeModeEnable askboardplt:type="boolean-type">false</askboardplt:ledClockPosEdgeModeEnable>
20992102
</askboardplt:ledstream-configSet>
21002103
<askboardplt:ledstream-class-manipulation-list>
21012104
<askboardplt:classNum askboardplt:type="led-class-num-type">1</askboardplt:classNum>
21022105
<askboardplt:portType askboardplt:type="led-stream-port-type">PORT_TYPE_XG</askboardplt:portType>
2103-
<askboardplt:ledUnit askboardplt:type="led-unit-or-no-unit-type">0</askboardplt:ledUnit>
21042106
<askboardplt:invertEnable askboardplt:type="boolean-type">false</askboardplt:invertEnable>
21052107
<askboardplt:blinkEnable askboardplt:type="boolean-type">false</askboardplt:blinkEnable>
21062108
<askboardplt:blinkSelect askboardplt:type="led-stream-blink-select-type">BLINK_SELECT_0</askboardplt:blinkSelect>
@@ -2112,7 +2114,6 @@ lowercase characters.</askboardplt:description>
21122114
<askboardplt:ledstream-class-manipulation-list>
21132115
<askboardplt:classNum askboardplt:type="led-class-num-type">2</askboardplt:classNum>
21142116
<askboardplt:portType askboardplt:type="led-stream-port-type">PORT_TYPE_XG</askboardplt:portType>
2115-
<askboardplt:ledUnit askboardplt:type="led-unit-or-no-unit-type">0</askboardplt:ledUnit>
21162117
<askboardplt:invertEnable askboardplt:type="boolean-type">false</askboardplt:invertEnable>
21172118
<askboardplt:blinkEnable askboardplt:type="boolean-type">true</askboardplt:blinkEnable>
21182119
<askboardplt:blinkSelect askboardplt:type="led-stream-blink-select-type">BLINK_SELECT_0</askboardplt:blinkSelect>
@@ -2123,7 +2124,6 @@ lowercase characters.</askboardplt:description>
21232124
<askboardplt:ledstream-class-manipulation-list>
21242125
<askboardplt:classNum askboardplt:type="led-class-num-type">3</askboardplt:classNum>
21252126
<askboardplt:portType askboardplt:type="led-stream-port-type">PORT_TYPE_XG</askboardplt:portType>
2126-
<askboardplt:ledUnit askboardplt:type="led-unit-or-no-unit-type">0</askboardplt:ledUnit>
21272127
<askboardplt:invertEnable askboardplt:type="boolean-type">false</askboardplt:invertEnable>
21282128
<askboardplt:blinkEnable askboardplt:type="boolean-type">false</askboardplt:blinkEnable>
21292129
<askboardplt:blinkSelect askboardplt:type="led-stream-blink-select-type">BLINK_SELECT_0</askboardplt:blinkSelect>

‎device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/ASK-L1-M0-D0-48x1G-4x10G.md5

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
679406dae2038d14c9ace67308239951
1+
c2fad8d9eea6eb57614af010b4c7ad17

‎device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/ASK-L1-M0-D0-48x1G-4x10G.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" version="2022-09-23-1.1" profile="Askl1" dsig="md5">
2+
<data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" version="2023-05-05-1.04" profile="Askl1" dsig="md5">
33
<ASKL1plt:ASK-L1 xmlns:ASKL1plt="urn:marvell:ASKL1:yang">
44
<ASKL1plt:typedefs>
55
<ASKL1plt:typedef>

‎device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/ASK-L1-M0-D1-48x1G-4x10G.md5

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6f799ecf09e39b4045ec08fea269b2e2
1+
d1884cf0a6d9728290e522a41337e86e

‎device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/ASK-L1-M0-D1-48x1G-4x10G.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" version="2022-09-23-1.1" profile="Askl1" dsig="md5">
2+
<data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" version="2023-05-05-1.04" profile="Askl1" dsig="md5">
33
<ASKL1plt:ASK-L1 xmlns:ASKL1plt="urn:marvell:ASKL1:yang">
44
<ASKL1plt:typedefs>
55
<ASKL1plt:typedef>

‎device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/ASK-PP-M0-48x1G-4x10G.md5

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2c99d80d226cbb8da7f34fbd55b1af5f
1+
8fdb417a68122b4d127e5b7c6750bd68

‎device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/ASK-PP-M0-48x1G-4x10G.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" version="2022-09-23-1.1" profile="Askpp" dsig="md5">
2+
<data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" version="2023-05-05-1.04" profile="Askpp" dsig="md5">
33
<askppplt:ASK-PP xmlns:askppplt="urn:marvell:askpp:yang">
44
<askppplt:typedefs>
55
<askppplt:typedef>

‎device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/SAI-M0-48x1G-4x10G.md5

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
986a0c912dd5aa7db7907e95b2fc1e4a
1+
6a6dc37a64244b9e80f31008ea68f276

‎device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/SAI-M0-48x1G-4x10G.xml

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" version="2022-09-23-1.1" profile="SAI" dsig="md5">
2+
<data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" version="2023-05-05-1.04" profile="SAI" dsig="md5">
33
<SAIplt:SAI xmlns:SAIplt="urn:marvell:SAI:yang">
44
<SAIplt:typedefs>
55
<SAIplt:typedef>
@@ -16,6 +16,33 @@
1616
<SAIplt:min>0</SAIplt:min>
1717
<SAIplt:max>1023</SAIplt:max>
1818
</SAIplt:typedef>
19+
<SAIplt:typedef>
20+
<SAIplt:name>logDest-type</SAIplt:name>
21+
<SAIplt:type>enumeration</SAIplt:type>
22+
<SAIplt:description>Logging Feature Options</SAIplt:description>
23+
<SAIplt:enum>
24+
<SAIplt:name>SAI_LOG_SYSLOG</SAIplt:name>
25+
<SAIplt:description>SYSLOG {Syslog service should be running to use this option}</SAIplt:description>
26+
<SAIplt:value>0</SAIplt:value>
27+
</SAIplt:enum>
28+
<SAIplt:enum>
29+
<SAIplt:name>SAI_LOG_CONSOLE</SAIplt:name>
30+
<SAIplt:description>CONSOLE</SAIplt:description>
31+
<SAIplt:value>1</SAIplt:value>
32+
</SAIplt:enum>
33+
<SAIplt:enum>
34+
<SAIplt:name>SAI_LOG_FILE</SAIplt:name>
35+
<SAIplt:description>FILE {Warning !!! Use with caution. Can cause disk full issues}</SAIplt:description>
36+
<SAIplt:value>2</SAIplt:value>
37+
</SAIplt:enum>
38+
</SAIplt:typedef>
39+
<SAIplt:typedef>
40+
<SAIplt:name>log-dest-file-path-type</SAIplt:name>
41+
<SAIplt:type>string</SAIplt:type>
42+
<SAIplt:description>A string with path to file for logging feature</SAIplt:description>
43+
<SAIplt:min>2</SAIplt:min>
44+
<SAIplt:max>30</SAIplt:max>
45+
</SAIplt:typedef>
1946
</SAIplt:typedefs>
2047
<SAIplt:ASK-BOARD-Profile-Name SAIplt:type="string">ASK-Board-M0-48x1G-4x10G.xml</SAIplt:ASK-BOARD-Profile-Name>
2148
<SAIplt:Features>
@@ -292,11 +319,15 @@
292319
<SAIplt:max_ipv6_tunnel SAIplt:type="uint32">8</SAIplt:max_ipv6_tunnel>
293320
<SAIplt:max_tti SAIplt:type="uint32">1024</SAIplt:max_tti>
294321
<SAIplt:wred_size SAIplt:type="uint32">0</SAIplt:wred_size>
322+
<SAIplt:max_nat SAIplt:type="uint32">0</SAIplt:max_nat>
295323
</SAIplt:Scaling>
296324
<SAIplt:Counters>
297325
<SAIplt:cnc-base-list>
298326
<SAIplt:counter-base SAIplt:type="uint32">4096</SAIplt:counter-base>
299327
</SAIplt:cnc-base-list>
300328
</SAIplt:Counters>
329+
<SAIplt:Logging>
330+
<SAIplt:log_dest SAIplt:type="logDest-type">SAI_LOG_SYSLOG</SAIplt:log_dest>
331+
</SAIplt:Logging>
301332
</SAIplt:SAI>
302333
</data>

‎platform/broadcom/sai.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
LIBSAIBCM_XGS_VERSION = 7.1.54.4
1+
LIBSAIBCM_XGS_VERSION = 7.1.54.4-3
22
LIBSAIBCM_DNX_VERSION = 7.1.54.4
33
LIBSAIBCM_BRANCH_NAME = REL_7.0_202205
44
LIBSAIBCM_XGS_URL_PREFIX = "https://sonicstorage.blob.core.windows.net/public/sai/bcmsai/$(LIBSAIBCM_BRANCH_NAME)/$(LIBSAIBCM_XGS_VERSION)"

‎platform/marvell-armhf/sai.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Marvell SAI
22

3-
export MRVL_SAI_VERSION = 1.10.2-4
3+
export MRVL_SAI_VERSION = 1.10.2-5
44
export MRVL_SAI = mrvllibsai_$(MRVL_SAI_VERSION)_$(PLATFORM_ARCH).deb
55

66
$(MRVL_SAI)_SRC_PATH = $(PLATFORM_PATH)/sai

0 commit comments

Comments
 (0)