Skip to content

Commit 3283497

Browse files
mssonicbldmssonicbld
authored
[Nokia-7215-A1] Update EZB files for SAI 15.1 (sonic-net#22004)
Update EZB files to version 1.10 to support SAI 1.15.1-1 for ac5x(arm64) Fix init script Fix firmwate status for uboot <!-- Please make sure you've read and understood our contributing guidelines: https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md failure_prs.log skip_prs.log Make sure all your commits include a signature generated with `git commit -s` ** If this is a bug fix, make sure your description includes "fixes #xxxx", or "closes #xxxx" or "resolves #xxxx" Please provide the following information: --> #### Why I did it ##### Work item tracking - Microsoft ADO **(number only)**: #### How I did it #### How to verify it <!-- If PR needs to be backported, then the PR must be tested against the base branch and the earliest backport release branch and provide tested image version on these two branches. For example, if the PR is requested for master, 202211 and 202012, then the requester needs to provide test results on master and 202012. --> #### Which release branch to backport (provide reason below if selected) <!-- - Note we only backport fixes to a release branch, *not* features! - Please also provide a reason for the backporting below. - e.g. - [x] 202006 --> - [ ] 201811 - [ ] 201911 - [ ] 202006 - [ ] 202012 - [ ] 202106 - [ ] 202111 - [ ] 202205 - [ ] 202211 - [ ] 202305 - [x] 202411 #### Tested branch (Please provide the tested image version) <!-- - Please provide tested image version - e.g. - [x] 20201231.100 --> - [ ] <!-- image version 1 --> - [ ] <!-- image version 2 --> #### Description for the changelog <!-- Write a short (one line) summary that describes the changes in this pull request for inclusion in the changelog: --> <!-- Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU. --> #### Link to config_db schema for YANG module changes <!-- Provide a link to config_db schema for the table for which YANG model is defined Link should point to correct section on https://github.com/Azure/sonic-buildimage/blob/master/src/sonic-yang-models/doc/Configuration.md --> #### A picture of a cute animal (not mandatory but encouraged)
1 parent c807b26 commit 3283497

10 files changed

Lines changed: 204 additions & 161 deletions

File tree

‎device/nokia/arm64-nokia_ixs7215_52xb-r0/Nokia-7215-A1/ASK-Board-AC5X-xb.md5‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7333f3669bbbd18bcc3890028d7afb39
1+
281851c080b0939f8d5df37d470488b6

‎device/nokia/arm64-nokia_ixs7215_52xb-r0/Nokia-7215-A1/ASK-Board-AC5X-xb.xml‎

Lines changed: 12 additions & 10 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="2024-09-24-1.09" profile="Askboard" sid="f5800f14-68b6-4eed-bd32-d93056a9feef">
2+
<data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" version="2024-10-24-1.10" profile="Askboard" dsig="md5" sid="7093bb99-b026-4a69-990a-db984aab32e7">
33
<askboardplt:ASK-Board xmlns:askboardplt="urn:marvell:askboard:yang">
44
<askboardplt:typedefs>
55
<askboardplt:typedef>
@@ -183,6 +183,12 @@ with IEEE 1588v2 PTP Support</askboardplt:description>
183183
with IEEE 1588v2 PTP Support</askboardplt:description>
184184
<askboardplt:value>6</askboardplt:value>
185185
</askboardplt:enum>
186+
<askboardplt:enum>
187+
<askboardplt:name>alaska-88E1781</askboardplt:name>
188+
<askboardplt:description>Specifies PHY identifier 88E1781, Integrated Octal 10/100/1000 Mbps Energy
189+
Efficient Ethernet Transceiver</askboardplt:description>
190+
<askboardplt:value>7</askboardplt:value>
191+
</askboardplt:enum>
186192
</askboardplt:typedef>
187193
<askboardplt:typedef>
188194
<askboardplt:name>physical-port-num-type</askboardplt:name>
@@ -513,15 +519,6 @@ with IEEE 1588v2 PTP Support</askboardplt:description>
513519
<askboardplt:min>0</askboardplt:min>
514520
<askboardplt:max>1</askboardplt:max>
515521
</askboardplt:typedef>
516-
<askboardplt:typedef>
517-
<askboardplt:name>led-stream-force-data-type</askboardplt:name>
518-
<askboardplt:type>string</askboardplt:type>
519-
<askboardplt:description>A hexadecimal string with octets represented as hex digits
520-
separated by colons. The canonical representation uses
521-
lowercase characters.</askboardplt:description>
522-
<askboardplt:min>3</askboardplt:min>
523-
<askboardplt:max>11</askboardplt:max>
524-
</askboardplt:typedef>
525522
<askboardplt:typedef>
526523
<askboardplt:name>bit-type</askboardplt:name>
527524
<askboardplt:type>uint32</askboardplt:type>
@@ -642,6 +639,11 @@ lowercase characters.</askboardplt:description>
642639
<askboardplt:description>FALCON</askboardplt:description>
643640
<askboardplt:value>2</askboardplt:value>
644641
</askboardplt:enum>
642+
<askboardplt:enum>
643+
<askboardplt:name>ASIC_AC5P</askboardplt:name>
644+
<askboardplt:description>AC5P</askboardplt:description>
645+
<askboardplt:value>3</askboardplt:value>
646+
</askboardplt:enum>
645647
</askboardplt:typedef>
646648
<askboardplt:typedef>
647649
<askboardplt:name>mpp-num-type</askboardplt:name>

‎device/nokia/arm64-nokia_ixs7215_52xb-r0/Nokia-7215-A1/ASK-L1-AC5X-xb.md5‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1f97e3150eec3a7ee6f56f51f9229db3
1+
6273881a99a44a9ff33fbadcd535a15a

‎device/nokia/arm64-nokia_ixs7215_52xb-r0/Nokia-7215-A1/ASK-L1-AC5X-xb.xml‎

Lines changed: 156 additions & 141 deletions
Large diffs are not rendered by default.

‎device/nokia/arm64-nokia_ixs7215_52xb-r0/Nokia-7215-A1/ASK-PP-AC5X-xb.md5‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
306e882317520250db0161d1cf4c8a3b
1+
f14a2376cd158ea00f075675ed33dd1f

‎device/nokia/arm64-nokia_ixs7215_52xb-r0/Nokia-7215-A1/ASK-PP-AC5X-xb.xml‎

Lines changed: 7 additions & 2 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="2024-09-24-1.09" profile="Askpp" sid="6abefd8a-3345-40a7-b180-4e9375f341df">
2+
<data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" version="2024-10-24-1.10" profile="Askpp" sid="85d852e5-1e5a-4b9b-a68d-7c1f65f7a541">
33
<askppplt:ASK-PP xmlns:askppplt="urn:marvell:askpp:yang">
44
<askppplt:typedefs>
55
<askppplt:typedef>
@@ -378,7 +378,7 @@
378378
<askppplt:typedef>
379379
<askppplt:name>number-physical-port-type</askppplt:name>
380380
<askppplt:type>enumeration</askppplt:type>
381-
<askppplt:description>AC3X/AC5X 128, falcon 64, 128, 256, 512, 1024</askppplt:description>
381+
<askppplt:description>AC3X/AC5X/AC5P 128, falcon 64, 128, 256, 512, 1024</askppplt:description>
382382
<askppplt:enum>
383383
<askppplt:name>no-ports</askppplt:name>
384384
<askppplt:description>no-ports</askppplt:description>
@@ -538,6 +538,11 @@
538538
<askppplt:description>FALCON</askppplt:description>
539539
<askppplt:value>2</askppplt:value>
540540
</askppplt:enum>
541+
<askppplt:enum>
542+
<askppplt:name>ASIC_AC5P</askppplt:name>
543+
<askppplt:description>AC5P</askppplt:description>
544+
<askppplt:value>3</askppplt:value>
545+
</askppplt:enum>
541546
</askppplt:typedef>
542547
</askppplt:typedefs>
543548
<askppplt:ASIC_Type askppplt:type="asic-type">ASIC_AC5X</askppplt:ASIC_Type>

‎device/nokia/arm64-nokia_ixs7215_52xb-r0/Nokia-7215-A1/SAI-AC5X-xb.md5‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
05614f693742dfda5c7140c186516f0c
1+
3b29ed5e5751923b3f346370c6f0d124

‎device/nokia/arm64-nokia_ixs7215_52xb-r0/Nokia-7215-A1/SAI-AC5X-xb.xml‎

Lines changed: 22 additions & 2 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="2024-09-24-1.09" profile="SAI" sid="b48431f8-351b-4524-babb-1ce99b72cd68">
2+
<data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" version="2024-10-24-1.10" profile="SAI" dsig="md5" sid="1ed4cd3c-ea04-44f4-8a20-4d1336284709">
33
<SAIplt:SAI xmlns:SAIplt="urn:marvell:SAI:yang">
44
<SAIplt:typedefs>
55
<SAIplt:typedef>
@@ -166,6 +166,26 @@
166166
<SAIplt:description>FALCON</SAIplt:description>
167167
<SAIplt:value>2</SAIplt:value>
168168
</SAIplt:enum>
169+
<SAIplt:enum>
170+
<SAIplt:name>ASIC_AC5P</SAIplt:name>
171+
<SAIplt:description>AC5P</SAIplt:description>
172+
<SAIplt:value>3</SAIplt:value>
173+
</SAIplt:enum>
174+
</SAIplt:typedef>
175+
<SAIplt:typedef>
176+
<SAIplt:name>boolean-type</SAIplt:name>
177+
<SAIplt:type>enumeration</SAIplt:type>
178+
<SAIplt:description>Boolean 32 bits , due to bing endian</SAIplt:description>
179+
<SAIplt:enum>
180+
<SAIplt:name>false</SAIplt:name>
181+
<SAIplt:description>False</SAIplt:description>
182+
<SAIplt:value>0</SAIplt:value>
183+
</SAIplt:enum>
184+
<SAIplt:enum>
185+
<SAIplt:name>true</SAIplt:name>
186+
<SAIplt:description>True</SAIplt:description>
187+
<SAIplt:value>1</SAIplt:value>
188+
</SAIplt:enum>
169189
</SAIplt:typedef>
170190
</SAIplt:typedefs>
171191
<SAIplt:ASIC_Type SAIplt:type="asic-type">ASIC_AC5X</SAIplt:ASIC_Type>
@@ -453,7 +473,7 @@
453473
<SAIplt:log_dest SAIplt:type="logDest-type">SAI_LOG_SYSLOG</SAIplt:log_dest>
454474
</SAIplt:Logging>
455475
<SAIplt:Feature>
456-
<SAIplt:MACsec SAIplt:type="Feature-enable">Disabled</SAIplt:MACsec>
476+
<SAIplt:PHY_Temperature SAIplt:type="Feature-enable">Disabled</SAIplt:PHY_Temperature>
457477
</SAIplt:Feature>
458478
<SAIplt:Features-using-acl>
459479
<SAIplt:feature SAIplt:type="acl-feature-name-type">control-acl</SAIplt:feature>

‎platform/marvell/sonic-platform-nokia/7215-a1/service/nokia-7215init.service‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ After=sysinit.target
44
Before=pmon.service
55

66
[Service]
7+
Type=oneshot
78
ExecStart=/usr/local/bin/nokia-7215-init.sh
89
StandardOutput=tty
910

‎platform/marvell/sonic-platform-nokia/7215-a1/sonic_platform/component.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,8 @@ def get_firmware_version(self):
175175
return self._get_cpld_version(self.index)
176176

177177
if self.index == 1:
178-
cmdstatus, uboot_version = cmd.getstatusoutput('grep --null-data ^U-Boot /dev/mtd0ro | cut -d" " -f4')
179-
return uboot_version
178+
cmdstatus, uboot_version = cmd.getstatusoutput('fw_printenv current_uboot_version |cut -d= -f 2')
179+
return uboot_version or "V1.1"
180180

181181
def install_firmware(self, image_path):
182182
"""

0 commit comments

Comments
 (0)