Merge pull request #3 from Azure/master

Merge from Azure to VY

Makefile.cache

@@ -68,6 +68,7 @@
 # Run the 'touch cache.skip.common' command in the base directory to exclude the common files from caching
 SONIC_COMMON_FILES_LIST :=  $(if $(wildcard cache.skip.common),, .platform slave.mk rules/functions Makefile.cache)
 SONIC_COMMON_FLAGS_LIST :=  $(CONFIGURED_PLATFORM) \
+                            $(CONFIGURED_ARCH) \
                             $(BLDENV) \
                             $(SONIC_DEBUGGING_ON) \
                             $(SONIC_PROFILING_ON) $(SONIC_ENABLE_SYNCD_RPC)

Makefile.work

@@ -213,7 +213,7 @@ endif
     #Override Native config to prevent docker service
     SONIC_CONFIG_USE_NATIVE_DOCKERD_FOR_BUILD=y
 
-    DOCKER_MULTIARCH_CHECK := docker run --rm --privileged multiarch/qemu-user-static:register --reset --credential yes
+    DOCKER_MULTIARCH_CHECK := docker run --rm --privileged multiarch/qemu-user-static --reset -p yes --credential yes
 
     DOCKER_SERVICE_SAFE_KILLER :=  (MARCH_PID=`ps -eo pid,cmd | grep "[0-9] dockerd.*march" | awk '{print $$1}'`; echo "Killing march docker $$MARCH_PID"; [ -z "$$MARCH_PID" ] || sudo kill -9 "$$MARCH_PID";)
     DOCKER_SERVICE_MULTIARCH_CHECK := ($(DOCKER_SERVICE_SAFE_KILLER); sudo rm -fr /var/run/march/; (echo "Starting docker march service..."; sudo $(SONIC_NATIVE_DOCKERD_FOR_MUTLIARCH) &) &>/dev/null ; sleep 2; sudo $(SONIC_USERFACL_DOCKERD_FOR_MUTLIARCH);)

build_image.sh

@@ -97,7 +97,7 @@ generate_device_list()
 
     for d in `find -L ./device  -maxdepth 2 -mindepth 2 -type d`; do
         if [ -f $d/platform_asic ]; then
-            if [ "$CONFIGURED_PLATFORM" = "generic" ] || grep -Fxq "$CONFIGURED_PLATFORM" $d/platform_asic; then
+            if [ "$TARGET_MACHINE" = "generic" ] || grep -Fxq "$TARGET_MACHINE" $d/platform_asic; then
                 echo "${d##*/}" >> "$platforms_asic";
             fi;
         fi;

device/accton/x86_64-accton_as7315_27xb-r0/installer.conf

@@ -1,2 +1,2 @@
 CONSOLE_SPEED=115200
-ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="tg3.short_preamble=1 tg3.bcm5718s_reset=1"
+ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="tg3.short_preamble=1 tg3.bcm5718s_reset=1 intel_iommu=off modprobe.blacklist=i2c-ismt,i2c_ismt,i2c-i801,i2c_i801"

device/accton/x86_64-accton_as7326_56x-r0/pddf/pddf-device.json

@@ -32,7 +32,7 @@
         [
             "i2c-i801",
             "i2c_dev",
-            "i2c_mux_pca954x force_deselect_on_exit=1",
+            "i2c_mux_pca954x",
             "optoe"
         ],
         "pddf_kos":

device/accton/x86_64-accton_as7726_32x-r0/pddf/pddf-device.json

@@ -33,7 +33,7 @@
         [
             "i2c-i801",
             "i2c_dev",
-            "i2c_mux_pca954x force_deselect_on_exit=1",
+            "i2c_mux_pca954x",
             "optoe"
         ],
         "pddf_kos":

device/accton/x86_64-accton_as7816_64x-r0/pddf/pddf-device.json

@@ -32,7 +32,7 @@
         [
             "i2c-i801",
             "i2c_dev",
-            "i2c_mux_pca954x force_deselect_on_exit=1",
+            "i2c_mux_pca954x",
             "optoe"
         ],
         "pddf_kos":

device/accton/x86_64-accton_as9716_32d-r0/pddf/pddf-device.json

@@ -33,7 +33,7 @@
             "i2c-ismt",
             "i2c-i801",
             "i2c_dev",
-            "i2c_mux_pca954x force_deselect_on_exit=1",
+            "i2c_mux_pca954x",
             "optoe"
         ],
         "pddf_kos":

device/arista/x86_64-arista_7050_qx32s/default_sku

@@ -1 +1 @@
-Arista-7050-QX-32S t1
+Arista-7050QX-32S t1

device/arista/x86_64-arista_7800_sup/platform.json

@@ -0,0 +1,12 @@
+{
+    "chassis": {
+        "name": "DCS-7800A-SUP1A",
+        "components": [],
+        "fans": [],
+        "fan_drawers": [],
+        "psus": [],
+        "thermals": [],
+        "sfps": []
+    },
+    "interfaces": {}
+}

device/arista/x86_64-arista_7800r3_48cq2_lc/platform.json

@@ -0,0 +1,173 @@
+{
+    "chassis": {
+        "name": "7800R3-48CQ2-LC",
+        "components": [],
+        "fans": [],
+        "fan_drawers": [],
+        "psus": [],
+        "thermals": [
+            {
+                "name": "Cpu temp sensor"
+            },
+            {
+                "name": "Center back"
+            },
+            {
+                "name": "Fap0 core0"
+            },
+            {
+                "name": "Fap0 core1"
+            },
+            {
+                "name": "PCIE"
+            }
+        ],
+        "sfps": [
+            {
+                "name": "qsfp1"
+            },
+            {
+                "name": "qsfp2"
+            },
+            {
+                "name": "qsfp3"
+            },
+            {
+                "name": "qsfp4"
+            },
+            {
+                "name": "qsfp5"
+            },
+            {
+                "name": "qsfp6"
+            },
+            {
+                "name": "qsfp7"
+            },
+            {
+                "name": "qsfp8"
+            },
+            {
+                "name": "qsfp9"
+            },
+            {
+                "name": "qsfp10"
+            },
+            {
+                "name": "qsfp11"
+            },
+            {
+                "name": "qsfp12"
+            },
+            {
+                "name": "qsfp13"
+            },
+            {
+                "name": "qsfp14"
+            },
+            {
+                "name": "qsfp15"
+            },
+            {
+                "name": "qsfp16"
+            },
+            {
+                "name": "qsfp17"
+            },
+            {
+                "name": "qsfp18"
+            },
+            {
+                "name": "qsfp19"
+            },
+            {
+                "name": "qsfp20"
+            },
+            {
+                "name": "qsfp21"
+            },
+            {
+                "name": "qsfp22"
+            },
+            {
+                "name": "qsfp23"
+            },
+            {
+                "name": "qsfp24"
+            },
+            {
+                "name": "qsfp25"
+            },
+            {
+                "name": "qsfp26"
+            },
+            {
+                "name": "qsfp27"
+            },
+            {
+                "name": "qsfp28"
+            },
+            {
+                "name": "qsfp29"
+            },
+            {
+                "name": "qsfp30"
+            },
+            {
+                "name": "qsfp31"
+            },
+            {
+                "name": "qsfp32"
+            },
+            {
+                "name": "qsfp33"
+            },
+            {
+                "name": "qsfp34"
+            },
+            {
+                "name": "qsfp35"
+            },
+            {
+                "name": "qsfp36"
+            },
+            {
+                "name": "qsfp37"
+            },
+            {
+                "name": "qsfp38"
+            },
+            {
+                "name": "qsfp39"
+            },
+            {
+                "name": "qsfp40"
+            },
+            {
+                "name": "qsfp41"
+            },
+            {
+                "name": "qsfp42"
+            },
+            {
+                "name": "qsfp43"
+            },
+            {
+                "name": "qsfp44"
+            },
+            {
+                "name": "qsfp45"
+            },
+            {
+                "name": "qsfp46"
+            },
+            {
+                "name": "qsfp47"
+            },
+            {
+                "name": "qsfp48"
+            }
+        ]
+    },
+    "interfaces": {}
+}

device/arista/x86_64-arista_7800r3_48cqm2_lc/platform.json

@@ -0,0 +1 @@
+../x86_64-arista_7800r3_48cq2_lc/platform.json