Skip to content

Commit

Permalink
Merge branch '202205' into arlakshm/202205/port_yang
Browse files Browse the repository at this point in the history
  • Loading branch information
@gechiang
gechiang authored Apr 18, 2024
2 parents 1b76b9f + c97be17 commit f3fb253
Show file tree
Hide file tree
Showing 10 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion ...4-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/0/jr2cp-nokia-18x100g-4x25g-config.bcm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2084,7 +2084,7 @@ serdes_lane_config_channel_mode_447=force_nr

rif_id_max=24576
dpp_db_path=/usr/share/bcm/db
sai_recycle_port_lane_base=96
sai_recycle_port_lane_base=200
appl_param_nof_ports_per_modid=64
udh_exists=1
modreg IPS_FORCE_LOCAL_OR_FABRIC FORCE_FABRIC=1
Expand Down
4 changes: 2 additions & 2 deletions device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/0/port_config.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ Ethernet112 24,25,26,27 Ethernet15/1 15 Ext 100000 Eth112
Ethernet120 16,17,18,19 Ethernet16/1 16 Ext 100000 Eth120 0 16 8
Ethernet128 8,9,10,11 Ethernet17/1 17 Ext 100000 Eth128 0 17 8
Ethernet136 0,1,2,3 Ethernet18/1 18 Ext 100000 Eth136 0 18 8
Ethernet-IB0 115 Recirc0/0 37 Inb 10000 Rcy0 0 19 8
Ethernet-Rec0 116 Recirc0/1 39 Rec 10000 Rcy1 1 20 8
Ethernet-IB0 219 Recirc0/0 37 Inb 10000 Rcy0 0 19 8
Ethernet-Rec0 220 Recirc0/1 39 Rec 10000 Rcy1 1 20 8
2 changes: 1 addition & 1 deletion ...4-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/1/jr2cp-nokia-18x100g-4x25g-config.bcm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2085,7 +2085,7 @@ serdes_lane_config_channel_mode_447=force_nr

rif_id_max=24576
dpp_db_path=/usr/share/bcm/db
sai_recycle_port_lane_base=96
sai_recycle_port_lane_base=200
appl_param_nof_ports_per_modid=64
udh_exists=1
modreg IPS_FORCE_LOCAL_OR_FABRIC FORCE_FABRIC=1
Expand Down
4 changes: 2 additions & 2 deletions device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/1/port_config.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ Ethernet256 24,25,26,27 Ethernet33/1 33 Ext 100000 Eth112
Ethernet264 16,17,18,19 Ethernet34/1 34 Ext 100000 Eth120 0 16 8
Ethernet272 8,9,10,11 Ethernet35/1 35 Ext 100000 Eth128 0 17 8
Ethernet280 0,1,2,3 Ethernet36/1 36 Ext 100000 Eth136 0 18 8
Ethernet-IB1 115 Recirc1/0 38 Inb 10000 Rcy0 0 19 8
Ethernet-Rec1 116 Recirc1/1 40 Rec 10000 Rcy1 1 20 8
Ethernet-IB1 219 Recirc1/0 38 Inb 10000 Rcy0 0 19 8
Ethernet-Rec1 220 Recirc1/1 40 Rec 10000 Rcy1 1 20 8
2 changes: 1 addition & 1 deletion .../x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/0/jr2cp-nokia-18x400g-config.bcm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2085,7 +2085,7 @@ serdes_lane_config_channel_mode_447=force_nr

rif_id_max=24576
dpp_db_path=/usr/share/bcm/db
sai_recycle_port_lane_base=96
sai_recycle_port_lane_base=200
appl_param_nof_ports_per_modid=64
udh_exists=1
modreg IPS_FORCE_LOCAL_OR_FABRIC FORCE_FABRIC=1
Expand Down
4 changes: 2 additions & 2 deletions device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/0/port_config.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ Ethernet112 24,25,26,27,28,29,30,31 Ethernet15/1 15 Ext 40000
Ethernet120 16,17,18,19,20,21,22,23 Ethernet16/1 16 Ext 400000 Eth120 0 16 8
Ethernet128 8,9,10,11,12,13,14,15 Ethernet17/1 17 Ext 400000 Eth128 0 17 8
Ethernet136 0,1,2,3,4,5,6,7 Ethernet18/1 18 Ext 400000 Eth136 0 18 8
Ethernet-IB0 115 Recirc0/0 37 Inb 10000 Rcy0 0 19 8
Ethernet-Rec0 116 Recirc0/1 39 Rec 10000 Rcy1 1 20 8
Ethernet-IB0 219 Recirc0/0 37 Inb 10000 Rcy0 0 19 8
Ethernet-Rec0 220 Recirc0/1 39 Rec 10000 Rcy1 1 20 8
2 changes: 1 addition & 1 deletion .../x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/1/jr2cp-nokia-18x400g-config.bcm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2087,7 +2087,7 @@ serdes_lane_config_channel_mode_447=force_nr

rif_id_max=24576
dpp_db_path=/usr/share/bcm/db
sai_recycle_port_lane_base=96
sai_recycle_port_lane_base=200
appl_param_nof_ports_per_modid=64
udh_exists=1
modreg IPS_FORCE_LOCAL_OR_FABRIC FORCE_FABRIC=1
Expand Down
4 changes: 2 additions & 2 deletions device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/1/port_config.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ Ethernet256 24,25,26,27,28,29,30,31 Ethernet33/1 33 Ext 40000
Ethernet264 16,17,18,19,20,21,22,23 Ethernet34/1 34 Ext 400000 Eth120 0 16 8
Ethernet272 8,9,10,11,12,13,14,15 Ethernet35/1 35 Ext 400000 Eth128 0 17 8
Ethernet280 0,1,2,3,4,5,6,7 Ethernet36/1 36 Ext 400000 Eth136 0 18 8
Ethernet-IB1 115 Recirc1/0 38 Inb 10000 Rcy0 0 19 8
Ethernet-Rec1 116 Recirc1/1 40 Rec 10000 Rcy1 1 20 8
Ethernet-IB1 219 Recirc1/0 38 Inb 10000 Rcy0 0 19 8
Ethernet-Rec1 220 Recirc1/1 40 Rec 10000 Rcy1 1 20 8
2 changes: 1 addition & 1 deletion platform/broadcom/sai.mk
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
LIBSAIBCM_XGS_VERSION = 7.1.73.4
LIBSAIBCM_DNX_VERSION = 7.1.66.6
LIBSAIBCM_DNX_VERSION = 7.1.66.7
LIBSAIBCM_BRANCH_NAME = REL_7.0_202205
LIBSAIBCM_XGS_URL_PREFIX = "https://sonicstorage.blob.core.windows.net/public/sai/bcmsai/$(LIBSAIBCM_BRANCH_NAME)/$(LIBSAIBCM_XGS_VERSION)"
LIBSAIBCM_DNX_URL_PREFIX = "https://sonicstorage.blob.core.windows.net/public/sai/bcmsai/$(LIBSAIBCM_BRANCH_NAME)/$(LIBSAIBCM_DNX_VERSION)"
Expand Down
2 changes: 1 addition & 1 deletion src/sonic-utilities
Submodule sonic-utilities updated from c6ac55 to 26f49f

0 comments on commit f3fb253

Please sign in to comment.