Skip to content

Commit f3fb253

Browse files
gechianggechiang
authored
Merge branch '202205' into arlakshm/202205/port_yang
2 parents 1b76b9f + c97be17 commit f3fb253

File tree

10 files changed

+14
-14
lines changed

10 files changed

+14
-14
lines changed

‎device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/0/jr2cp-nokia-18x100g-4x25g-config.bcm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2084,7 +2084,7 @@ serdes_lane_config_channel_mode_447=force_nr
20842084

20852085
rif_id_max=24576
20862086
dpp_db_path=/usr/share/bcm/db
2087-
sai_recycle_port_lane_base=96
2087+
sai_recycle_port_lane_base=200
20882088
appl_param_nof_ports_per_modid=64
20892089
udh_exists=1
20902090
modreg IPS_FORCE_LOCAL_OR_FABRIC FORCE_FABRIC=1

‎device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/0/port_config.ini‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ Ethernet112 24,25,26,27 Ethernet15/1 15 Ext 100000 Eth112
1717
Ethernet120 16,17,18,19 Ethernet16/1 16 Ext 100000 Eth120 0 16 8
1818
Ethernet128 8,9,10,11 Ethernet17/1 17 Ext 100000 Eth128 0 17 8
1919
Ethernet136 0,1,2,3 Ethernet18/1 18 Ext 100000 Eth136 0 18 8
20-
Ethernet-IB0 115 Recirc0/0 37 Inb 10000 Rcy0 0 19 8
21-
Ethernet-Rec0 116 Recirc0/1 39 Rec 10000 Rcy1 1 20 8
20+
Ethernet-IB0 219 Recirc0/0 37 Inb 10000 Rcy0 0 19 8
21+
Ethernet-Rec0 220 Recirc0/1 39 Rec 10000 Rcy1 1 20 8

‎device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/1/jr2cp-nokia-18x100g-4x25g-config.bcm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2085,7 +2085,7 @@ serdes_lane_config_channel_mode_447=force_nr
20852085

20862086
rif_id_max=24576
20872087
dpp_db_path=/usr/share/bcm/db
2088-
sai_recycle_port_lane_base=96
2088+
sai_recycle_port_lane_base=200
20892089
appl_param_nof_ports_per_modid=64
20902090
udh_exists=1
20912091
modreg IPS_FORCE_LOCAL_OR_FABRIC FORCE_FABRIC=1

‎device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/1/port_config.ini‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ Ethernet256 24,25,26,27 Ethernet33/1 33 Ext 100000 Eth112
1717
Ethernet264 16,17,18,19 Ethernet34/1 34 Ext 100000 Eth120 0 16 8
1818
Ethernet272 8,9,10,11 Ethernet35/1 35 Ext 100000 Eth128 0 17 8
1919
Ethernet280 0,1,2,3 Ethernet36/1 36 Ext 100000 Eth136 0 18 8
20-
Ethernet-IB1 115 Recirc1/0 38 Inb 10000 Rcy0 0 19 8
21-
Ethernet-Rec1 116 Recirc1/1 40 Rec 10000 Rcy1 1 20 8
20+
Ethernet-IB1 219 Recirc1/0 38 Inb 10000 Rcy0 0 19 8
21+
Ethernet-Rec1 220 Recirc1/1 40 Rec 10000 Rcy1 1 20 8

‎device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/0/jr2cp-nokia-18x400g-config.bcm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2085,7 +2085,7 @@ serdes_lane_config_channel_mode_447=force_nr
20852085

20862086
rif_id_max=24576
20872087
dpp_db_path=/usr/share/bcm/db
2088-
sai_recycle_port_lane_base=96
2088+
sai_recycle_port_lane_base=200
20892089
appl_param_nof_ports_per_modid=64
20902090
udh_exists=1
20912091
modreg IPS_FORCE_LOCAL_OR_FABRIC FORCE_FABRIC=1

‎device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/0/port_config.ini‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ Ethernet112 24,25,26,27,28,29,30,31 Ethernet15/1 15 Ext 40000
1717
Ethernet120 16,17,18,19,20,21,22,23 Ethernet16/1 16 Ext 400000 Eth120 0 16 8
1818
Ethernet128 8,9,10,11,12,13,14,15 Ethernet17/1 17 Ext 400000 Eth128 0 17 8
1919
Ethernet136 0,1,2,3,4,5,6,7 Ethernet18/1 18 Ext 400000 Eth136 0 18 8
20-
Ethernet-IB0 115 Recirc0/0 37 Inb 10000 Rcy0 0 19 8
21-
Ethernet-Rec0 116 Recirc0/1 39 Rec 10000 Rcy1 1 20 8
20+
Ethernet-IB0 219 Recirc0/0 37 Inb 10000 Rcy0 0 19 8
21+
Ethernet-Rec0 220 Recirc0/1 39 Rec 10000 Rcy1 1 20 8

‎device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/1/jr2cp-nokia-18x400g-config.bcm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2087,7 +2087,7 @@ serdes_lane_config_channel_mode_447=force_nr
20872087

20882088
rif_id_max=24576
20892089
dpp_db_path=/usr/share/bcm/db
2090-
sai_recycle_port_lane_base=96
2090+
sai_recycle_port_lane_base=200
20912091
appl_param_nof_ports_per_modid=64
20922092
udh_exists=1
20932093
modreg IPS_FORCE_LOCAL_OR_FABRIC FORCE_FABRIC=1

‎device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/1/port_config.ini‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ Ethernet256 24,25,26,27,28,29,30,31 Ethernet33/1 33 Ext 40000
1717
Ethernet264 16,17,18,19,20,21,22,23 Ethernet34/1 34 Ext 400000 Eth120 0 16 8
1818
Ethernet272 8,9,10,11,12,13,14,15 Ethernet35/1 35 Ext 400000 Eth128 0 17 8
1919
Ethernet280 0,1,2,3,4,5,6,7 Ethernet36/1 36 Ext 400000 Eth136 0 18 8
20-
Ethernet-IB1 115 Recirc1/0 38 Inb 10000 Rcy0 0 19 8
21-
Ethernet-Rec1 116 Recirc1/1 40 Rec 10000 Rcy1 1 20 8
20+
Ethernet-IB1 219 Recirc1/0 38 Inb 10000 Rcy0 0 19 8
21+
Ethernet-Rec1 220 Recirc1/1 40 Rec 10000 Rcy1 1 20 8

‎platform/broadcom/sai.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
LIBSAIBCM_XGS_VERSION = 7.1.73.4
2-
LIBSAIBCM_DNX_VERSION = 7.1.66.6
2+
LIBSAIBCM_DNX_VERSION = 7.1.66.7
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)"
55
LIBSAIBCM_DNX_URL_PREFIX = "https://sonicstorage.blob.core.windows.net/public/sai/bcmsai/$(LIBSAIBCM_BRANCH_NAME)/$(LIBSAIBCM_DNX_VERSION)"

‎src/sonic-utilities‎

0 commit comments

Comments
 (0)