Merge branch 'sonic-net:master' into master

abdosi · Nov 19, 2024 · 5b399fc · 5b399fc
2 parents e6884d3 + 59f39d4
commit 5b399fc
Show file tree

Hide file tree

Showing 81 changed files with 13,083 additions and 2,833 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -106,6 +106,9 @@
 [submodule "src/sonic-gnmi"]
 	path = src/sonic-gnmi
 	url = https://github.com/sonic-net/sonic-gnmi.git
+[submodule "src/sonic-bmp"]
+	path = src/sonic-bmp
+	url = https://github.com/sonic-net/sonic-bmp.git
 [submodule "src/sonic-genl-packet"]
 	path = src/sonic-genl-packet
 	url = https://github.com/sonic-net/sonic-genl-packet

diff --git a/build_debian.sh b/build_debian.sh
@@ -364,6 +364,7 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
     mtr-tiny                \
     locales                 \
     cgroup-tools            \
+    ipmitool                \
     ndisc6                  \
     makedumpfile            \
     conntrack               \

diff --git a/device/arista/x86_64-arista_720dt_48s/td3x2-a720dt-48s-flex.config.bcm b/device/arista/x86_64-arista_720dt_48s/td3x2-a720dt-48s-flex.config.bcm
@@ -5,7 +5,6 @@ bcm_num_cos.0=9
 bcm_stat_flags=1
 bcm_stat_jumbo.0=9236
 cdma_timeout_usec.0=15000000
-disable_pcie_firmware_check.0=1
 dma_desc_timeout_usec.0=15000000
 fpem_mem_entries.0=0
 higig2_hdr_mode.0=1