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

[device] Update Arista drivers submodule #1559

Closed
wants to merge 3 commits into from
Closed

[device] Update Arista drivers submodule #1559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c4ce8be
[device] Update Arista drivers submodule
Staphylo Apr 3, 2018
bca342b
Fix sensors.conf after removing old scd driver
Staphylo Apr 3, 2018
39e70cd
[Aboot] Change cmdline format during fast-reboot
Staphylo Apr 3, 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
10 changes: 5 additions & 5 deletions device/arista/x86_64-arista_7050_qx32/sensors.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
# ------------------------------------------------
#

bus "i2c-2" "SCD SMBus master 0 bus 0"
bus "i2c-3" "SCD SMBus master 0 bus 1"
bus "i2c-5" "SCD SMBus master 0 bus 3"
bus "i2c-6" "SCD SMBus master 0 bus 4"
bus "i2c-7" "SCD SMBus master 0 bus 5"
bus "i2c-2" "SCD 0000:04:00.0 SMBus master 0 bus 0"
bus "i2c-3" "SCD 0000:04:00.0 SMBus master 0 bus 1"
bus "i2c-5" "SCD 0000:04:00.0 SMBus master 0 bus 3"
bus "i2c-6" "SCD 0000:04:00.0 SMBus master 0 bus 4"
bus "i2c-7" "SCD 0000:04:00.0 SMBus master 0 bus 5"

chip "k10temp-pci-00c3"
label temp1 "Cpu temp sensor"
Expand Down
10 changes: 5 additions & 5 deletions device/arista/x86_64-arista_7050_qx32s/sensors.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
# ------------------------------------------------
#

bus "i2c-2" "SCD SMBus master 0 bus 0"
bus "i2c-3" "SCD SMBus master 0 bus 1"
bus "i2c-5" "SCD SMBus master 0 bus 3"
bus "i2c-6" "SCD SMBus master 0 bus 4"
bus "i2c-7" "SCD SMBus master 0 bus 5"
bus "i2c-2" "SCD 0000:02:00.0 SMBus master 0 bus 0"
bus "i2c-3" "SCD 0000:02:00.0 SMBus master 0 bus 1"
bus "i2c-5" "SCD 0000:02:00.0 SMBus master 0 bus 3"
bus "i2c-6" "SCD 0000:02:00.0 SMBus master 0 bus 4"
bus "i2c-7" "SCD 0000:02:00.0 SMBus master 0 bus 5"

chip "k10temp-pci-00c3"
label temp1 "Cpu temp sensor"
Expand Down
3 changes: 1 addition & 2 deletions files/Aboot/boot0.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,8 +206,7 @@ write_boot_configs() {
elif [ ! -f "$cmdline_base" ]; then
# some systems were started with other versions of this script and therefore
# do not have the $cmdline_base file. we assume that we are on Sonic or EOS.
cat /proc/cmdline > $cmdline_base
sed -Ei 's/^(.*) rw .*$/\1/' $cmdline_base
cat /proc/cmdline | sed -E 's/^(.*) rw .*$/\1/' | tr ' ' '\n' > $cmdline_base
fi

cp $cmdline_base /tmp/append
Expand Down
2 changes: 1 addition & 1 deletion platform/broadcom/sonic-platform-modules-arista
Open in desktop
Submodule sonic-platform-modules-arista updated 22 files
+5 −2 arista/components/common.py
+5 −3 arista/components/ds125br.py
+16 −18 arista/components/ds460.py
+161 −222 arista/components/scd.py
+35 −0 arista/core/inventory.py
+49 −0 arista/core/utils.py
+4 −3 arista/platforms/a7050qx32.py
+6 −4 arista/platforms/a7050qx32s.py
+3 −1 arista/platforms/a7060cx32s.py
+3 −1 arista/platforms/a7260cx364.py
+1 −1 confs/watchdog-stop.service
+2 −2 debian/rules
+5 −3 debian/sonic-platform-arista.init
+0 −1 src/Makefile
+0 −70 src/gpio-kversfix.h
+0 −1 src/raven-fan-driver.c
+12 −10 src/scd.c
+0 −1,269 src/sonic-support-driver.c
+0 −19 src/sonic-support-driver.h
+6 −0 tests/all-platforms.sh
+35 −0 utils/arista
+0 −144 utils/arista-gardena-watchdog