Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add config.bcm file for hlx and modify config.bcm path in sai.profile #2333

Merged
merged 8 commits into from
Dec 4, 2018
Merged

Add config.bcm file for hlx and modify config.bcm path in sai.profile #2333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
080ee79
add config.bcm for hlx
bbinxie Dec 3, 2018
9096e14
modify config.bcm path for hlx
bbinxie Dec 3, 2018
ea70eba
Delete hx4-cel-hbtn-48x1G+4x10G.config.bcm
bbinxie Dec 3, 2018
4168121
add config.bcm and path
bbinxie Dec 3, 2018
d608a83
[submodule]: Update sairedis and utilities pointers (#2334)
Dec 3, 2018
298d2ad
[boot] Refactor: All services which start Docker containers start bef…
jleveque Dec 4, 2018
9a2edda
[bcm config test] allowing ext_sram_freq and ext_tcam_freq (#2338)
yxieca Dec 4, 2018
1c1fa3d
Merge branch 'master' of git://github.com/bbinxie/sonic-buildimage in…
lguohan Dec 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 64 additions & 0 deletions ...e/celestica/x86_64-cel_e1031-r0/Celestica-E1031-T48S4/helix4-e1031-48x1G+4x10G.config.bcm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
bcm56340_4x10=1
bcm56340_config=1
dport_map_direct=0
ext_sram_freq=0
ext_tcam_freq=0
phy_null_ge48=1
phy_port_primary_and_offset_ge0=0x0000
phy_port_primary_and_offset_ge1=0x0001
phy_port_primary_and_offset_ge2=0x0002
phy_port_primary_and_offset_ge3=0x0003
phy_port_primary_and_offset_ge4=0x0004
phy_port_primary_and_offset_ge5=0x0005
phy_port_primary_and_offset_ge6=0x0006
phy_port_primary_and_offset_ge7=0x0007
phy_port_primary_and_offset_ge8=0x0800
phy_port_primary_and_offset_ge9=0x0801
phy_port_primary_and_offset_ge10=0x0802
phy_port_primary_and_offset_ge11=0x0803
phy_port_primary_and_offset_ge12=0x0804
phy_port_primary_and_offset_ge13=0x0805
phy_port_primary_and_offset_ge14=0x0806
phy_port_primary_and_offset_ge15=0x0807
phy_port_primary_and_offset_ge16=0x1000
phy_port_primary_and_offset_ge17=0x1001
phy_port_primary_and_offset_ge18=0x1002
phy_port_primary_and_offset_ge19=0x1003
phy_port_primary_and_offset_ge20=0x1004
phy_port_primary_and_offset_ge21=0x1005
phy_port_primary_and_offset_ge22=0x1006
phy_port_primary_and_offset_ge23=0x1007
phy_port_primary_and_offset_ge24=0x1800
phy_port_primary_and_offset_ge25=0x1801
phy_port_primary_and_offset_ge26=0x1802
phy_port_primary_and_offset_ge27=0x1803
phy_port_primary_and_offset_ge28=0x1804
phy_port_primary_and_offset_ge29=0x1805
phy_port_primary_and_offset_ge30=0x1806
phy_port_primary_and_offset_ge31=0x1807
phy_port_primary_and_offset_ge32=0x2000
phy_port_primary_and_offset_ge33=0x2001
phy_port_primary_and_offset_ge34=0x2002
phy_port_primary_and_offset_ge35=0x2003
phy_port_primary_and_offset_ge36=0x2004
phy_port_primary_and_offset_ge37=0x2005
phy_port_primary_and_offset_ge38=0x2006
phy_port_primary_and_offset_ge39=0x2007
phy_port_primary_and_offset_ge40=0x2800
phy_port_primary_and_offset_ge41=0x2801
phy_port_primary_and_offset_ge42=0x2802
phy_port_primary_and_offset_ge43=0x2803
phy_port_primary_and_offset_ge44=0x2804
phy_port_primary_and_offset_ge45=0x2805
phy_port_primary_and_offset_ge46=0x2806
phy_port_primary_and_offset_ge47=0x2807
phy_xaui_rx_polarity_flip_xe0=1
phy_xaui_rx_polarity_flip_xe1=0
phy_xaui_rx_polarity_flip_xe2=1
phy_xaui_rx_polarity_flip_xe3=0
phy_xaui_tx_polarity_flip_xe0=1
phy_xaui_tx_polarity_flip_xe1=0
phy_xaui_tx_polarity_flip_xe2=1
phy_xaui_tx_polarity_flip_xe3=0
xgxs_rx_lane_map_xe0=0x1032
xgxs_tx_lane_map_xe0=0x2301
2 changes: 1 addition & 1 deletion device/celestica/x86_64-cel_e1031-r0/Celestica-E1031-T48S4/sai.profile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
SAI_INIT_CONFIG_FILE=/etc/bcm/helix4-e1031-48x1G+4x10G.config.bcm
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/helix4-e1031-48x1G+4x10G.config.bcm
1 change: 1 addition & 0 deletions files/build_templates/bgp.service.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
Description=BGP container
Requires=updategraph.service
After=updategraph.service
Before=ntp-config.service

[Service]
User={{ sonicadmin_user }}
Expand Down
1 change: 1 addition & 0 deletions files/build_templates/dhcp_relay.service.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
Description=DHCP relay container
Requires=updategraph.service swss.service teamd.service
After=updategraph.service swss.service teamd.service
Before=ntp-config.service

[Service]
User={{ sonicadmin_user }}
Expand Down
1 change: 1 addition & 0 deletions files/build_templates/lldp.service.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
Description=LLDP container
Requires=updategraph.service
After=updategraph.service
Before=ntp-config.service

[Service]
User={{ sonicadmin_user }}
Expand Down
1 change: 1 addition & 0 deletions files/build_templates/pmon.service.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
Description=Platform monitor container
Requires=updategraph.service
After=updategraph.service
Before=ntp-config.service

[Service]
User={{ sonicadmin_user }}
Expand Down
1 change: 1 addition & 0 deletions files/build_templates/radv.service.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
Description=Router advertiser container
Requires=updategraph.service swss.service
After=updategraph.service swss.service
Before=ntp-config.service

[Service]
User={{ sonicadmin_user }}
Expand Down
1 change: 1 addition & 0 deletions files/build_templates/snmp.service.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
Description=SNMP container
Requires=updategraph.service swss.service
After=updategraph.service swss.service
Before=ntp-config.service

[Service]
ExecStartPre=/usr/bin/{{docker_container_name}}.sh start
Expand Down
1 change: 1 addition & 0 deletions files/build_templates/swss.service.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ Requires=nps-modules-4.9.0-7-amd64.service
{% endif %}
After=database.service updategraph.service
After=interfaces-config.service
Before=ntp-config.service

[Service]
User=root
Expand Down
1 change: 1 addition & 0 deletions files/build_templates/syncd.service.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ After=opennsl-modules-4.9.0-7-amd64.service
{% elif sonic_asic_platform == 'nephos' %}
After=nps-modules-4.9.0-7-amd64.service
{% endif %}
Before=ntp-config.service

[Service]
User=root
Expand Down
1 change: 1 addition & 0 deletions files/build_templates/teamd.service.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
Description=TEAMD container
Requires=updategraph.service
After=updategraph.service
Before=ntp-config.service

[Service]
User={{ sonicadmin_user }}
Expand Down
1 change: 1 addition & 0 deletions files/build_templates/telemetry.service.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
Description=Telemetry container
Requires=swss.service
After=swss.service
Before=ntp-config.service

[Service]
User={{ sonicadmin_user }}
Expand Down
2 changes: 1 addition & 1 deletion files/image_config/ntp/ntp-config.service
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[Unit]
Description=Update NTP configuration
Requires=updategraph.service
After=updategraph.service bgp.service dhcp_relay.service lldp.service pmon.service radv.service snmp.service swss.service syncd.service teamd.service
After=updategraph.service

[Service]
Type=oneshot
Expand Down
2 changes: 2 additions & 0 deletions src/sonic-device-data/tests/permitted_list
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ dport_map_enable
dport_map_indexed
dport_map_port
dpp_clock_ratio
ext_sram_freq
ext_tcam_freq
force_core_pll
fpem_mem_entries
higig2_hdr_mode
Expand Down
2 changes: 1 addition & 1 deletion src/sonic-sairedis
Open in desktop
Submodule sonic-sairedis updated from 11fc26 to 1288f7
2 changes: 1 addition & 1 deletion src/sonic-utilities
Open in desktop
Submodule sonic-utilities updated from db550e to 97d73d