From 080ee792e040c6188f650ba929d00140aec2ecdb Mon Sep 17 00:00:00 2001 From: binxie Date: Mon, 3 Dec 2018 17:00:14 +0800 Subject: [PATCH 1/7] add config.bcm for hlx --- .../hx4-cel-hbtn-48x1G+4x10G.config.bcm | 92 +++++++++++++++++++ 1 file changed, 92 insertions(+) create mode 100644 device/celestica/x86_64-cel_e1031-r0/Celestica-E1031-T48S4/hx4-cel-hbtn-48x1G+4x10G.config.bcm diff --git a/device/celestica/x86_64-cel_e1031-r0/Celestica-E1031-T48S4/hx4-cel-hbtn-48x1G+4x10G.config.bcm b/device/celestica/x86_64-cel_e1031-r0/Celestica-E1031-T48S4/hx4-cel-hbtn-48x1G+4x10G.config.bcm new file mode 100644 index 000000000000..c2524e3031b3 --- /dev/null +++ b/device/celestica/x86_64-cel_e1031-r0/Celestica-E1031-T48S4/hx4-cel-hbtn-48x1G+4x10G.config.bcm @@ -0,0 +1,92 @@ +bcm_tunnel_term_compatible_mode=1 +l2xmsg_mode=1 +bcm56340_4x10=0x1 +bcm56340_config=0x1 +bcm_num_cos=8 +bcm_stat_interval=2000000 +cdma_timeout_usec=3000000 +dport_map_direct=0 +ext_sram_freq=0 +ext_tcam_freq=0 +help_cli_enable=0 +ipv6_lpm_128b_enable=0x1 +l3_max_ecmp_mode=1 +led_intensity=100 +lpm_ipv6_128b_reserved=0 +lpm_scaling_enable=1 +max_vp_lags=0 +memlist_enable=0 +miim_intr_enable=0 +module_64ports=1 +os=unix +pbmp_gport_stack.0=0x0000000000000000000000000000000000000000000000000000000000000000 +pbmp_xport_xe.0=0x000000000000000000000000000000000000000000000000003c000000000000 +phy_5464S_xe0.0=0x1 +phy_5464S_xe1.0=0x1 +phy_5464S_xe2.0=0x1 +phy_5464S_xe3.0=0x1 +phy_null_ge48=0x1 +phy_port_primary_and_offset_ge0=0x0000 +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_ge1=0x0001 +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_ge2=0x0002 +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_ge3=0x0003 +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_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_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 +reglist_enable=0 +scache_filename=/tmp/brcm_bcm_scache +schan_intr_enable=0 +skip_L2_USER_ENTRY=1 +stable_size=0x2000000 +tdma_timeout_usec=3000000 +xgxs_rx_lane_map_xe0=0x1032 +xgxs_tx_lane_map_xe0=0x2301 From 9096e14f93cf17c50cc8fa8389f71695695a8d3c Mon Sep 17 00:00:00 2001 From: binxie Date: Mon, 3 Dec 2018 17:00:39 +0800 Subject: [PATCH 2/7] modify config.bcm path for hlx --- .../x86_64-cel_e1031-r0/Celestica-E1031-T48S4/sai.profile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device/celestica/x86_64-cel_e1031-r0/Celestica-E1031-T48S4/sai.profile b/device/celestica/x86_64-cel_e1031-r0/Celestica-E1031-T48S4/sai.profile index 1f36f82fd515..0a7c057622bb 100644 --- a/device/celestica/x86_64-cel_e1031-r0/Celestica-E1031-T48S4/sai.profile +++ b/device/celestica/x86_64-cel_e1031-r0/Celestica-E1031-T48S4/sai.profile @@ -1 +1 @@ -SAI_INIT_CONFIG_FILE=/etc/bcm/helix4-e1031-48x1G+4x10G.config.bcm +SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/hx4-cel-hbtn-48x1G+4x10G.config.bcm From ea70eba589741e91c1783afca957c7329be424d9 Mon Sep 17 00:00:00 2001 From: bbinxie Date: Mon, 3 Dec 2018 17:27:18 +0800 Subject: [PATCH 3/7] Delete hx4-cel-hbtn-48x1G+4x10G.config.bcm --- .../hx4-cel-hbtn-48x1G+4x10G.config.bcm | 92 ------------------- 1 file changed, 92 deletions(-) delete mode 100644 device/celestica/x86_64-cel_e1031-r0/Celestica-E1031-T48S4/hx4-cel-hbtn-48x1G+4x10G.config.bcm diff --git a/device/celestica/x86_64-cel_e1031-r0/Celestica-E1031-T48S4/hx4-cel-hbtn-48x1G+4x10G.config.bcm b/device/celestica/x86_64-cel_e1031-r0/Celestica-E1031-T48S4/hx4-cel-hbtn-48x1G+4x10G.config.bcm deleted file mode 100644 index c2524e3031b3..000000000000 --- a/device/celestica/x86_64-cel_e1031-r0/Celestica-E1031-T48S4/hx4-cel-hbtn-48x1G+4x10G.config.bcm +++ /dev/null @@ -1,92 +0,0 @@ -bcm_tunnel_term_compatible_mode=1 -l2xmsg_mode=1 -bcm56340_4x10=0x1 -bcm56340_config=0x1 -bcm_num_cos=8 -bcm_stat_interval=2000000 -cdma_timeout_usec=3000000 -dport_map_direct=0 -ext_sram_freq=0 -ext_tcam_freq=0 -help_cli_enable=0 -ipv6_lpm_128b_enable=0x1 -l3_max_ecmp_mode=1 -led_intensity=100 -lpm_ipv6_128b_reserved=0 -lpm_scaling_enable=1 -max_vp_lags=0 -memlist_enable=0 -miim_intr_enable=0 -module_64ports=1 -os=unix -pbmp_gport_stack.0=0x0000000000000000000000000000000000000000000000000000000000000000 -pbmp_xport_xe.0=0x000000000000000000000000000000000000000000000000003c000000000000 -phy_5464S_xe0.0=0x1 -phy_5464S_xe1.0=0x1 -phy_5464S_xe2.0=0x1 -phy_5464S_xe3.0=0x1 -phy_null_ge48=0x1 -phy_port_primary_and_offset_ge0=0x0000 -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_ge1=0x0001 -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_ge2=0x0002 -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_ge3=0x0003 -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_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_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 -reglist_enable=0 -scache_filename=/tmp/brcm_bcm_scache -schan_intr_enable=0 -skip_L2_USER_ENTRY=1 -stable_size=0x2000000 -tdma_timeout_usec=3000000 -xgxs_rx_lane_map_xe0=0x1032 -xgxs_tx_lane_map_xe0=0x2301 From 4168121c556980d58b08105a1fcbc9fa99b0f3f7 Mon Sep 17 00:00:00 2001 From: binxie Date: Mon, 3 Dec 2018 17:48:37 +0800 Subject: [PATCH 4/7] add config.bcm and path --- .../helix4-e1031-48x1G+4x10G.config.bcm | 64 +++++++++++++++++++ .../Celestica-E1031-T48S4/sai.profile | 2 +- 2 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 device/celestica/x86_64-cel_e1031-r0/Celestica-E1031-T48S4/helix4-e1031-48x1G+4x10G.config.bcm diff --git a/device/celestica/x86_64-cel_e1031-r0/Celestica-E1031-T48S4/helix4-e1031-48x1G+4x10G.config.bcm b/device/celestica/x86_64-cel_e1031-r0/Celestica-E1031-T48S4/helix4-e1031-48x1G+4x10G.config.bcm new file mode 100644 index 000000000000..c7942d6fc0b8 --- /dev/null +++ b/device/celestica/x86_64-cel_e1031-r0/Celestica-E1031-T48S4/helix4-e1031-48x1G+4x10G.config.bcm @@ -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 diff --git a/device/celestica/x86_64-cel_e1031-r0/Celestica-E1031-T48S4/sai.profile b/device/celestica/x86_64-cel_e1031-r0/Celestica-E1031-T48S4/sai.profile index 0a7c057622bb..f467f997fe62 100644 --- a/device/celestica/x86_64-cel_e1031-r0/Celestica-E1031-T48S4/sai.profile +++ b/device/celestica/x86_64-cel_e1031-r0/Celestica-E1031-T48S4/sai.profile @@ -1 +1 @@ -SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/hx4-cel-hbtn-48x1G+4x10G.config.bcm +SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/helix4-e1031-48x1G+4x10G.config.bcm From d608a83b3d818c56fb1653af5dbe30094c2d579a Mon Sep 17 00:00:00 2001 From: Volodymyr Samotiy Date: Mon, 3 Dec 2018 21:28:58 +0200 Subject: [PATCH 5/7] [submodule]: Update sairedis and utilities pointers (#2334) Signed-off-by: Volodymyr Samotiy --- src/sonic-sairedis | 2 +- src/sonic-utilities | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sonic-sairedis b/src/sonic-sairedis index 11fc262603d4..1288f7705794 160000 --- a/src/sonic-sairedis +++ b/src/sonic-sairedis @@ -1 +1 @@ -Subproject commit 11fc262603d406bcdfa200adcaa62c364c0c4d47 +Subproject commit 1288f770579461d7a5c86975b473695faedd41f9 diff --git a/src/sonic-utilities b/src/sonic-utilities index db550e0a5792..97d73da1fa09 160000 --- a/src/sonic-utilities +++ b/src/sonic-utilities @@ -1 +1 @@ -Subproject commit db550e0a5792b047d734b8931f8c39e164d99da0 +Subproject commit 97d73da1fa0987136d9b55d249a44d057efccd04 From 298d2ad8f47facf751467e8d3f828a483c23e086 Mon Sep 17 00:00:00 2001 From: Joe LeVeque Date: Mon, 3 Dec 2018 16:01:44 -0800 Subject: [PATCH 6/7] [boot] Refactor: All services which start Docker containers start before ntp-config service (#2335) --- files/build_templates/bgp.service.j2 | 1 + files/build_templates/dhcp_relay.service.j2 | 1 + files/build_templates/lldp.service.j2 | 1 + files/build_templates/pmon.service.j2 | 1 + files/build_templates/radv.service.j2 | 1 + files/build_templates/snmp.service.j2 | 1 + files/build_templates/swss.service.j2 | 1 + files/build_templates/syncd.service.j2 | 1 + files/build_templates/teamd.service.j2 | 1 + files/build_templates/telemetry.service.j2 | 1 + files/image_config/ntp/ntp-config.service | 2 +- 11 files changed, 11 insertions(+), 1 deletion(-) diff --git a/files/build_templates/bgp.service.j2 b/files/build_templates/bgp.service.j2 index 6c3e343fcf44..bc023b7d714d 100644 --- a/files/build_templates/bgp.service.j2 +++ b/files/build_templates/bgp.service.j2 @@ -2,6 +2,7 @@ Description=BGP container Requires=updategraph.service After=updategraph.service +Before=ntp-config.service [Service] User={{ sonicadmin_user }} diff --git a/files/build_templates/dhcp_relay.service.j2 b/files/build_templates/dhcp_relay.service.j2 index ea53fa2deda4..b4d9ceb38f0c 100644 --- a/files/build_templates/dhcp_relay.service.j2 +++ b/files/build_templates/dhcp_relay.service.j2 @@ -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 }} diff --git a/files/build_templates/lldp.service.j2 b/files/build_templates/lldp.service.j2 index d35cdacca0f3..d294a08900f4 100644 --- a/files/build_templates/lldp.service.j2 +++ b/files/build_templates/lldp.service.j2 @@ -2,6 +2,7 @@ Description=LLDP container Requires=updategraph.service After=updategraph.service +Before=ntp-config.service [Service] User={{ sonicadmin_user }} diff --git a/files/build_templates/pmon.service.j2 b/files/build_templates/pmon.service.j2 index 83dd8e4b648d..de4e62df5e10 100644 --- a/files/build_templates/pmon.service.j2 +++ b/files/build_templates/pmon.service.j2 @@ -2,6 +2,7 @@ Description=Platform monitor container Requires=updategraph.service After=updategraph.service +Before=ntp-config.service [Service] User={{ sonicadmin_user }} diff --git a/files/build_templates/radv.service.j2 b/files/build_templates/radv.service.j2 index 7d6da31e135f..065f01906076 100644 --- a/files/build_templates/radv.service.j2 +++ b/files/build_templates/radv.service.j2 @@ -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 }} diff --git a/files/build_templates/snmp.service.j2 b/files/build_templates/snmp.service.j2 index 6398477ab6a1..f344f2e805ea 100644 --- a/files/build_templates/snmp.service.j2 +++ b/files/build_templates/snmp.service.j2 @@ -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 diff --git a/files/build_templates/swss.service.j2 b/files/build_templates/swss.service.j2 index 8b8d7b42d1ee..dde548b8cb7f 100644 --- a/files/build_templates/swss.service.j2 +++ b/files/build_templates/swss.service.j2 @@ -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 diff --git a/files/build_templates/syncd.service.j2 b/files/build_templates/syncd.service.j2 index 38b208e74b0b..08860adc8f3d 100644 --- a/files/build_templates/syncd.service.j2 +++ b/files/build_templates/syncd.service.j2 @@ -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 diff --git a/files/build_templates/teamd.service.j2 b/files/build_templates/teamd.service.j2 index bbd04a81b05b..5cd36c6748b9 100644 --- a/files/build_templates/teamd.service.j2 +++ b/files/build_templates/teamd.service.j2 @@ -2,6 +2,7 @@ Description=TEAMD container Requires=updategraph.service After=updategraph.service +Before=ntp-config.service [Service] User={{ sonicadmin_user }} diff --git a/files/build_templates/telemetry.service.j2 b/files/build_templates/telemetry.service.j2 index 5f2e81ed95ea..132924b04193 100644 --- a/files/build_templates/telemetry.service.j2 +++ b/files/build_templates/telemetry.service.j2 @@ -2,6 +2,7 @@ Description=Telemetry container Requires=swss.service After=swss.service +Before=ntp-config.service [Service] User={{ sonicadmin_user }} diff --git a/files/image_config/ntp/ntp-config.service b/files/image_config/ntp/ntp-config.service index fb7ca946197f..c86710e3d209 100644 --- a/files/image_config/ntp/ntp-config.service +++ b/files/image_config/ntp/ntp-config.service @@ -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 From 9a2edda6d2aacda57c4d3ae2baf4d2246c24c075 Mon Sep 17 00:00:00 2001 From: Ying Xie Date: Mon, 3 Dec 2018 17:56:55 -0800 Subject: [PATCH 7/7] [bcm config test] allowing ext_sram_freq and ext_tcam_freq (#2338) Signed-off-by: Ying Xie --- src/sonic-device-data/tests/permitted_list | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/sonic-device-data/tests/permitted_list b/src/sonic-device-data/tests/permitted_list index a52e1c0d8ebe..ba07b29c0cc7 100644 --- a/src/sonic-device-data/tests/permitted_list +++ b/src/sonic-device-data/tests/permitted_list @@ -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