From 05e55e9b8b8fedbf23f5e2c742d4c1c91d7b6a42 Mon Sep 17 00:00:00 2001 From: Samuel Angebault Date: Fri, 27 Apr 2018 11:50:36 -0700 Subject: [PATCH] Add support 4.9 support for 7260CX3 (#34) --- files/Aboot/boot0.j2 | 2 ++ files/initramfs-tools/arista-convertfs.j2 | 3 +++ platform/broadcom/sonic-platform-modules-arista | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/files/Aboot/boot0.j2 b/files/Aboot/boot0.j2 index 2dc75e2f83bb..ad312669f54a 100644 --- a/files/Aboot/boot0.j2 +++ b/files/Aboot/boot0.j2 @@ -170,6 +170,8 @@ platform_specific() { flash_size=28000 fi if [ "$platform" = "rook" ]; then + echo "iommu=on intel_iommu=on tsc=reliable pcie_ports=native" >>/tmp/append + echo "rhash_entries=1 usb-storage.delay_use=0" >>/tmp/append if [ -x /bin/readprefdl ]; then readprefdl -f /tmp/.system-prefdl -d > /mnt/flash/.system-prefdl elif [ -f /etc/prefdl ]; then diff --git a/files/initramfs-tools/arista-convertfs.j2 b/files/initramfs-tools/arista-convertfs.j2 index dfd2fc1d7407..d3718fea8e7c 100644 --- a/files/initramfs-tools/arista-convertfs.j2 +++ b/files/initramfs-tools/arista-convertfs.j2 @@ -41,6 +41,9 @@ get_flash_dev() { wait_for_root_dev() { local try_rounds=30 while [ $try_rounds -gt 0 ]; do + if blkid | sed 's/"//g' | grep -q "$root_dev"; then + return 0 + fi if [ -e "$root_dev" ]; then return 0 fi diff --git a/platform/broadcom/sonic-platform-modules-arista b/platform/broadcom/sonic-platform-modules-arista index ef8a53d6d095..e2f440d7af04 160000 --- a/platform/broadcom/sonic-platform-modules-arista +++ b/platform/broadcom/sonic-platform-modules-arista @@ -1 +1 @@ -Subproject commit ef8a53d6d09560b6844b4f508ef18103f1df6c37 +Subproject commit e2f440d7af04b2995bbfd785ce06cf5531fd68b2