Back-merge from Azure/sonic-buildimage/201709.

.gitmodules

@@ -69,3 +69,6 @@
 [submodule "platform/broadcom/sonic-platform-modules-cel"]
 	path = platform/broadcom/sonic-platform-modules-cel
 	url = https://github.com/celestica-Inc/sonic-platform-modules-cel.git
+[submodule "platform/nephos/sonic-platform-modules-ingrasys"]
+	path = platform/nephos/sonic-platform-modules-ingrasys
+	url = https://github.com/Ingrasys-sonic/sonic-platform-modules-ingrasys-nephos.git

README.md

@@ -18,7 +18,7 @@ Any server can be a build image server. We are using a server with 1T hard disk.
 # Prerequisites
 
 ## SAI Version 
-SONiC V2 is using [SAI 0.9.4](https://github.com/opencomputeproject/SAI/tree/v0.9.4). 
+Please refer to [SONiC roadmap](https://github.com/Azure/SONiC/wiki/Sonic-Roadmap-Planning) on the SAI version for each SONiC release. 
 
 ## Clone or fetch the code repository with all git submodules
 To clone the code repository recursively, assuming git version 1.9 or newer:
@@ -45,7 +45,7 @@ To build SONiC installer image and docker images, run the following commands:
 The SONiC installer contains all docker images needed. SONiC uses one image for all devices of a same ASIC vendor. The supported ASIC vendors are:
 
 - PLATFORM=broadcom
-- PLATFORM=marvell (*pending*)
+- PLATFORM=marvell 
 - PLATFORM=mellanox
 - PLATFORM=cavium
 - PLATFORM=centec

build_debian.sh

@@ -141,6 +141,9 @@ sudo chroot $FILESYSTEM_ROOT update-initramfs -u
 ## Install latest intel igb driver
 sudo cp target/debs/igb.ko $FILESYSTEM_ROOT/lib/modules/3.16.0-4-amd64/kernel/drivers/net/ethernet/intel/igb/igb.ko
 
+## Install latest intel ixgbe driver
+sudo cp target/debs/ixgbe.ko $FILESYSTEM_ROOT/lib/modules/3.16.0-4-amd64/kernel/drivers/net/ethernet/intel/ixgbe/ixgbe.ko
+
 ## Install docker
 echo '[INFO] Install docker'
 ## Install apparmor utils since they're missing and apparmor is enabled in the kernel

device/accton/x86_64-accton_as7212_54x-r0/AS7212-54x/port_config.ini

@@ -0,0 +1,55 @@
+# name          lanes
+Ethernet0       0
+Ethernet1       1
+Ethernet2       2
+Ethernet3       3
+Ethernet4       4
+Ethernet5       5
+Ethernet6       6
+Ethernet7       7
+Ethernet8       8
+Ethernet9       9
+Ethernet10      10
+Ethernet11      11
+Ethernet12      12
+Ethernet13      13
+Ethernet14      14
+Ethernet15      15
+Ethernet16      16
+Ethernet17      17
+Ethernet18      18
+Ethernet19      19
+Ethernet20      20
+Ethernet21      21
+Ethernet22      22
+Ethernet23      23
+Ethernet24      24
+Ethernet25      25
+Ethernet26      26
+Ethernet27      27
+Ethernet28      28
+Ethernet29      29
+Ethernet30      30
+Ethernet31      31
+Ethernet32      32
+Ethernet33      33
+Ethernet34      34
+Ethernet35      35
+Ethernet36      36
+Ethernet37      37
+Ethernet38      38
+Ethernet39      39
+Ethernet40      40
+Ethernet41      41
+Ethernet42      42
+Ethernet43      43
+Ethernet44      44
+Ethernet45      45
+Ethernet46      46
+Ethernet47      47
+Ethernet48      48
+Ethernet49      49
+Ethernet50      50
+Ethernet51      51
+Ethernet52      52
+Ethernet53      53

device/accton/x86_64-accton_as7212_54x-r0/AS7212-54x/sai.profile

@@ -0,0 +1,2 @@
+mode=1
+hwId=as7212-54x

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

@@ -0,0 +1,3 @@
+CONSOLE_PORT=0x2f8
+CONSOLE_DEV=1
+CONSOLE_SPEED=115200