Skip to content

Commit 0b4191f

Browse files
authored
[Arista] Updating driver submodules (sonic-net#5352)
- Merge chassis codebase upstream - Add support for Otterlake supervisor - Add support for NorthFace and Camp chassis - Add support for Eldridge, Dragonfly and Brooks fabrics - Add support for Clearwater2 and Clearwater2Ms linecards - Add new arista Cli to power on/off cards - Add new arista show Cli to inspect supervisor, chassis, fabrics and linecards
1 parent 339cfbf commit 0b4191f

File tree

12 files changed

+37
-4
lines changed

12 files changed

+37
-4
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../x86_64-arista_common/platform_reboot
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../x86_64-arista_common/plugins
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"skip_ledd": true,
3+
"skip_xcvrd": true
4+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../x86_64-arista_common/platform_reboot
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../x86_64-arista_common/plugins/

device/arista/x86_64-arista_7800r3_48cq2_lc/sensors.conf

Whitespace-only changes.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../x86_64-arista_common/platform_reboot
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../x86_64-arista_common/plugins/

device/arista/x86_64-arista_7800r3_48cqm2_lc/sensors.conf

Whitespace-only changes.

files/Aboot/boot0.j2

+25-2
Original file line numberDiff line numberDiff line change
@@ -431,6 +431,11 @@ write_platform_specific_cmdline() {
431431
# set varlog size to 100MB
432432
local varlog_size=100
433433

434+
# sonic_mode is set to fixed by default.
435+
sonic_mode="fixed"
436+
supervisor_mode="supervisor"
437+
linecard_mode="linecard"
438+
434439
# detect the size of the flash partition from name in Aboot/EOS/SONiC
435440
local flash_size=$(($(df "$target_path" | tail -1 | tr -s ' ' | cut -f2 -d' ') / 1000))
436441

@@ -502,14 +507,27 @@ write_platform_specific_cmdline() {
502507
aboot_machine=arista_7280cr3k_32d4
503508
flash_size=7382
504509
fi
505-
if in_array "$platform" "rook" "magpie" "woodpecker"; then
510+
if [ "$sid" = "Clearwater2" ]; then
511+
aboot_machine=arista_7800r3_48cq2_lc
512+
sonic_mode="$linecard_mode"
513+
fi
514+
if [ "$sid" = "Clearwater2Ms" ]; then
515+
aboot_machine=arista_7800r3_48cqm2_lc
516+
sonic_mode="$linecard_mode"
517+
fi
518+
if [ "$sid" = "OtterLake" ]; then
519+
aboot_machine=arista_7800_sup
520+
flash_size=30000
521+
sonic_mode=$supervisor_mode
522+
fi
523+
if in_array "$platform" "rook" "magpie" "woodpecker" "sprucefish"; then
506524
cmdline_add tsc=reliable
507525
cmdline_add pcie_ports=native
508526
cmdline_add rhash_entries=1
509527
cmdline_add usb-storage.delay_use=0
510528
cmdline_add reassign_prefmem
511529
fi
512-
if in_array "$platform" "rook"; then
530+
if in_array "$platform" "rook" "sprucefish"; then
513531
cmdline_add iommu=on
514532
cmdline_add intel_iommu=on
515533
read_system_eeprom
@@ -523,6 +541,9 @@ write_platform_specific_cmdline() {
523541
cmdline_add modprobe.blacklist=snd_hda_intel,hdaudio
524542
read_system_eeprom
525543
fi
544+
if in_array "$platform" "lorikeet" "hedgehog"; then
545+
read_system_eeprom
546+
fi
526547

527548
if [ $flash_size -ge 28000 ]; then
528549
varlog_size=4096
@@ -535,6 +556,8 @@ write_platform_specific_cmdline() {
535556
fi
536557

537558
cmdline_add "varlog_size=$varlog_size"
559+
560+
cmdline_add "sonic.mode=$sonic_mode"
538561
}
539562

540563
write_image_specific_cmdline() {

0 commit comments

Comments
 (0)