Merge remote-tracking branch 'msft_github/master'

* msft_github/master: [snmpagent]: Update sonic-snmpagent submodule (sonic-net#1004) [swss]: Update the ipinip.j2 template to specify the IPv4 loopback address (sonic-net#998) Change all port_config.ini column headers from 'port' to 'index' (sonic-net#1001) [docker-platform-monitor]: Remove stale fancontrol.pid file (if exists) before starting fancontrol (sonic-net#1002) [swss]: Update swss/common submodules (sonic-net#988) [snmp]: Update py-swsssdk/snmpagent submodules (sonic-net#996) [Broadcom]: Update SAI version to 3.0.3.2-5 (sonic-net#997) [Mellanox]: Update outdated MSN2410 minigraph (sonic-net#995) Add time stamp suffix to the dirty images version string (sonic-net#958) [Mellanox]: Remove FW upgrade procedure in docker (sonic-net#989) [snmp]: Update sonic-snmpagent submodule (sonic-net#986) [Broadcom]: Update SAI version to 3.0.3.2-4 (sonic-net#983) [Ingrasys]: Add Ingrasys S8900-64XC sfputil function and update submodule (sonic-net#984) [mellanox]: Update Mellanox SAI version (sonic-net#979) [Ingrasys]: Change hwmon kernel modules installation order (sonic-net#980) [Makefile] Allowing interactive session with the slave docker-container (sonic-net#903) [snmp]: Update sonic-snmpagent submodule (sonic-net#978) Disable snmpd module disk_hw, so no syslog messages about unavailable disks (sonic-net#977) [teamd]: Remove deprecated blocking logic before starting teamd (sonic-net#976) [Broadcom]: Update libsai version to 3.0.3.2-2 (sonic-net#973) [device/accton]: Add a new supported device, AS7312-54X (sonic-net#955) [sairedis]: update sairedis submodule (sonic-net#974) lacp runner will send lacp update right after it received SIGINT (sonic-net#969) [config]: Fix management interface configuration (sonic-net#966) [Broadcom]: Update OpenNSL modules (sonic-net#970) [utilities]: Update sonic-utilities (sonic-net#968) [interfaces]: Change MTU value to 9100 (sonic-net#967) Framework to plugin Organization specific scripts during ONIE Image build (sonic-net#951) Always start with Forwarding State flag set for bgpd (sonic-net#963) Update sonic-utilities to be compatible with sonic-net#942 (sonic-net#965) [swss]: Fix the command to get HWSKU with sonic-cfggen (sonic-net#964) [bgp]: Fix the deployment_id with DEVICE_METADATA (sonic-net#962) [Ingrasys] Update Ingrasys submodule for S8900-54XC (sonic-net#954) [build/onie installer] Install grub for SONiC post migration from another NOS (sonic-net#949) [syncd]: Comment out unused docker-ptf-brcm.mk [Broadcom]: Update OpenNSL/SAI version (sonic-net#959) [swss]: Move swss/common/sairedis submodule to 201709 tag [sairedis]: update sairedis submodule head (sonic-net#956) [service template] Starting new docker when HWSKU change is detected (sonic-net#946) [config] Fix an issue that bgp asn data type is not consistent (sonic-net#953) [mellanox]: Update Mellanox SAI version ansd SDK version [Ingrasys] update port_config.ini and sfputil for ingrasys platforms (sonic-net#952) [frr]: RR client support in minigraph for FRR (sonic-net#923) [configdb] Migrate minigraph configurations to DB (sonic-net#942) [devices]: Add led plugin for Arista 7060CX-32S and 7260CX3-64 (sonic-net#945) [sonic-slave]: SLAVE_TAG should be for both Dockerfile and Dockerfile.user (sonic-net#950) [github]: add templates for submitting issues and PR (sonic-net#947) [rsyslog]: Use timegenerated instead of timestamp (sonic-net#944) [dell]: remove nos_to_sonic_grub.cfg (sonic-net#943) [slave.mk]: Apply series of patches to SONIC_PYTHON_STDEB_DEBS targets if they exist (sonic-net#941) [rsyslog]: Use SONiC template in containers (sonic-net#940) [Broadcom]: Remove BRCM_OPENNSL library and upgrade BRCM_SAI to 3.0.3.2 (sonic-net#938) [baseimage]: allocate varlog disk in the initramfs stage (sonic-net#936) [sairedis]: revert deadlock fix in sonic-sairedis submodule (sonic-net#934) Replace CRLF line endings with LF (sonic-net#932) Fix confusing comment (sonic-net#931) Update sfputil support for Ingrasys S9100 (sonic-net#929) [quagga]: Disable ipv4 over ipv6 and enable ipv6 over ipv4 peer group (sonic-net#922) [quagga] enable core dump for bgpd and zebra (sonic-net#927) [devices]: Update Dell s6100/z9100 platform modules (sonic-net#925) Revert "Migrate DEVICE_METADATA to db (sonic-net#919)" (sonic-net#928) Migrate DEVICE_METADATA to db (sonic-net#919) [devices]: Bump sonic-platform-modules-arista submodule (sonic-net#924) [image]: build sonic-broadcom.raw image for sonic conversion from ftos (sonic-net#901) [sonic-slave] Force pyangbind version to 0.5.10 (sonic-net#918) [Arista-7260CX3] Rename hwSKU Arista-7260CX3-64 to Arista-7260CX3-C64, introducing new hwSKU Arista-7260CX3-D108C8 (sonic-net#920) [devices]: modify sfputil plugins for mellanox devices for new platform API (sonic-net#916) [cavm]Update sai revision and packet driver (sonic-net#914) [translate-acl] Specify pyangbind version to not introduce new dependency (sonic-net#915) Update sfputil support for Arista platforms (sonic-net#912) Port speed (sonic-net#879) [Accton]: Add a new supported device AS5712-54X (sonic-net#898) [kernel]: update kernel submodule (sonic-net#910) [device]: Updated dell s6100 submodule to 5ab014 (sonic-net#909) [broadcom]: update broadcom sai package to 2.1.5.1-17 (sonic-net#908) IPv4 prefixes shouldn't be sent by default over IPv6 session with FRR. (sonic-net#905) [submodule]: update sonic linux kernel (sonic-net#906) [sonic-sairedis] update sairedis submodule (sonic-net#211, sonic-net#212) (sonic-net#904) [mlnx-fw-upgrade]: Define required FW version in build time. (sonic-net#902) [SAI]: Remove the SAI submodule from buildimage repo (sonic-net#893) [Submodule update]: sonic-utilities (sonic-net#888) Revert "[mellanox]: Update Mellanox SAI version" [mellanox]: Update Mellanox SAI version [utilities]: Update sonic-utilities submodule [swss-common]: Update sonic-swss-common submodule [mellanox]: Disable fsat boot mode for SX kernel [quagga]: Update sonic-quagga submodule [Broadcom]: Update Broadcom SAI/SDK version (sonic-net#883) Squash merge v1.0.3 branch onto master
zhenggen-xu · Oct 3, 2017 · 5bf7c5e · 5bf7c5e
2 parents 05dcbeb + b81f2f2
commit 5bf7c5e
Show file tree

Hide file tree

Showing 153 changed files with 6,039 additions and 1,863 deletions.
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,60 @@
+<!--
+If you are reporting a new issue, make sure that we do not have any duplicates
+already open. You can ensure this by searching the issue list for this
+repository. If there is a duplicate, please close your issue and add a comment
+to the existing issue instead.
+
+If you suspect your issue is a bug, please edit your issue description to
+include the BUG REPORT INFORMATION shown below. If you fail to provide this
+information within 7 days, we cannot debug your issue and will close it. We
+will, however, reopen it if you later provide the information.
+
+For more information about reporting issues, see
+https://github.com/Azure/SONiC/wiki#report-issues
+
+---------------------------------------------------
+GENERAL SUPPORT INFORMATION
+---------------------------------------------------
+
+The GitHub issue tracker is for bug reports and feature requests.
+General support can be found at the following locations:
+
+- SONiC Support Forums - https://groups.google.com/forum/#!forum/sonicproject
+
+---------------------------------------------------
+BUG REPORT INFORMATION
+---------------------------------------------------
+Use the commands below to provide key information from your environment:
+You do NOT have to include this information if this is a FEATURE REQUEST
+-->
+
+**Description**
+
+<!--
+Briefly describe the problem you are having in a few paragraphs.
+-->
+
+**Steps to reproduce the issue:**
+1.
+2.
+3.
+
+**Describe the results you received:**
+
+
+**Describe the results you expected:**
+
+
+**Additional information you deem important (e.g. issue happens only occasionally):**
+
+    **Output of `show version`:**
+
+    ```
+    (paste your output here)
+    ```
+
+    **Attach debug file `sudo generate_dump`:**
+
+    ```
+    (paste your output here)
+    ```
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,26 @@
+<!--
+Please make sure you've read and understood our contributing guidelines;
+https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md
+
+** Make sure all your commits include a signature generated with `git commit -s` **
+
+If this is a bug fix, make sure your description includes "fixes #xxxx", or
+"closes #xxxx"
+
+Please provide the following information:
+-->
+
+**- What I did**
+
+**- How I did it**
+
+**- How to verify it**
+
+**- Description for the changelog**
+<!--
+Write a short (one line) summary that describes the changes in this
+pull request for inclusion in the changelog:
+-->
+
+
+**- A picture of a cute animal (not mandatory but encouraged)**
diff --git a/.gitmodules b/.gitmodules
@@ -44,6 +44,7 @@
 [submodule "src/sonic-utilities"]
 	path = src/sonic-utilities
 	url = git@gitli.corp.linkedin.com:sonic/sonic-utilities.git
+	branch = v1.0.3
 [submodule "platform/broadcom/sonic-platform-modules-s6000"]
 	path = platform/broadcom/sonic-platform-modules-s6000
 	url = https://github.com/Azure/sonic-platform-modules-s6000
@@ -56,10 +57,6 @@
 [submodule "platform/broadcom/sonic-platform-modules-ingrasys"]
 	path = platform/broadcom/sonic-platform-modules-ingrasys
 	url = https://github.com/Ingrasys-sonic/sonic-platform-modules-ingrasys
-[submodule "src/SAI"]
-	path = src/SAI
-	url = https://github.com/opencomputeproject/SAI
-	branch = v0.9.4
 [submodule "src/sonic-platform-daemons"]
 	path = src/sonic-platform-daemons
 	url = git@gitli.corp.linkedin.com:sonic/sonic-platform-daemons.git

diff --git a/Makefile b/Makefile
@@ -1,5 +1,18 @@
 ###############################################################################
 ## Wrapper for starting make inside sonic-slave container
+#
+#  Supported parameters:
+#
+#  * PLATFORM: Specific platform we wish to build images for.
+#  * BUILD_NUMBER: Desired version-number to pass to the building-system.
+#  * ENABLE_DHCP_GRAPH_SERVICE: Enables get-graph service to fetch minigraph files
+#    through http.
+#  * SHUTDOWN_BGP_ON_START: Sets admin-down state for all bgp peerings after restart.
+#  * SONIC_ENABLE_SYNCD_RPC: Enables rpc-based syncd builds.
+#  * USERNAME: Desired username -- default at rules/config
+#  * PASSWORD: Desired password -- default at rules/config
+#  * KEEP_SLAVE_ON: Keeps slave container up after building-process concludes.
+#
 ###############################################################################
 
 SHELL = /bin/bash
@@ -13,7 +26,7 @@ $(shell rm -f .screen)
 MAKEFLAGS += -B
 
 SLAVE_BASE_TAG = $(shell shasum sonic-slave/Dockerfile | awk '{print substr($$1,0,11);}')
-SLAVE_TAG = $(shell shasum sonic-slave/Dockerfile.user | awk '{print substr($$1,0,11);}')
+SLAVE_TAG = $(shell cat sonic-slave/Dockerfile.user sonic-slave/Dockerfile | shasum | awk '{print substr($$1,0,11);}')
 SLAVE_BASE_IMAGE = sonic-slave-base
 SLAVE_IMAGE = sonic-slave-$(USER)
 
@@ -37,6 +50,16 @@ DOCKER_BUILD = docker build --no-cache \
 	       sonic-slave && \
 	       docker tag $(SLAVE_IMAGE):latest $(SLAVE_IMAGE):$(SLAVE_TAG)
 
+SONIC_BUILD_INSTRUCTION :=  make \
+                           -f slave.mk \
+                           PLATFORM=$(PLATFORM) \
+                           BUILD_NUMBER=$(BUILD_NUMBER) \
+                           ENABLE_DHCP_GRAPH_SERVICE=$(ENABLE_DHCP_GRAPH_SERVICE) \
+                           SHUTDOWN_BGP_ON_START=$(SHUTDOWN_BGP_ON_START) \
+                           SONIC_ENABLE_SYNCD_RPC=$(ENABLE_SYNCD_RPC) \
+                           PASSWORD=$(PASSWORD) \
+                           USERNAME=$(USERNAME)
+
 .PHONY: sonic-slave-build sonic-slave-bash
 
 .DEFAULT_GOAL :=  all
@@ -48,16 +71,11 @@ DOCKER_BUILD = docker build --no-cache \
 	@docker inspect --type image $(SLAVE_IMAGE):$(SLAVE_TAG) &> /dev/null || \
 	    { echo Image $(SLAVE_IMAGE):$(SLAVE_TAG) not found. Building... ; \
 	    $(DOCKER_BUILD) ; }
-	@$(DOCKER_RUN) $(SLAVE_IMAGE):$(SLAVE_TAG) make \
-	    -f slave.mk \
-	    PLATFORM=$(PLATFORM) \
-	    BUILD_NUMBER=$(BUILD_NUMBER) \
-	    ENABLE_DHCP_GRAPH_SERVICE=$(ENABLE_DHCP_GRAPH_SERVICE) \
-	    SHUTDOWN_BGP_ON_START=$(SHUTDOWN_BGP_ON_START) \
-	    SONIC_ENABLE_SYNCD_RPC=$(ENABLE_SYNCD_RPC) \
-	    PASSWORD=$(PASSWORD) \
-	    USERNAME=$(USERNAME) \
-	    $@
+ifeq "$(KEEP_SLAVE_ON)" "yes"
+	@$(DOCKER_RUN) $(SLAVE_IMAGE):$(SLAVE_TAG) bash -c "$(SONIC_BUILD_INSTRUCTION) $@; /bin/bash"
+else
+	@$(DOCKER_RUN) $(SLAVE_IMAGE):$(SLAVE_TAG) $(SONIC_BUILD_INSTRUCTION) $@
+endif
 
 sonic-slave-build :
 	$(DOCKER_BASE_BUILD)

diff --git a/build_debian.sh b/build_debian.sh
@@ -63,6 +63,7 @@ if [[ -d $FILESYSTEM_ROOT ]]; then
 fi
 mkdir -p $FILESYSTEM_ROOT
 mkdir -p $FILESYSTEM_ROOT/$PLATFORM_DIR
+mkdir -p $FILESYSTEM_ROOT/$PLATFORM_DIR/x86_64-grub
 touch $FILESYSTEM_ROOT/$PLATFORM_DIR/firsttime
 
 ## Build a basic Debian system by debootstrap
@@ -132,6 +133,8 @@ sudo chmod +x $FILESYSTEM_ROOT/etc/initramfs-tools/scripts/init-premount/arista-
 ## 2. Bind-mount docker working directory (docker aufs cannot work over aufs rootfs)
 sudo cp files/initramfs-tools/union-mount $FILESYSTEM_ROOT/etc/initramfs-tools/scripts/init-bottom/union-mount
 sudo chmod +x $FILESYSTEM_ROOT/etc/initramfs-tools/scripts/init-bottom/union-mount
+sudo cp files/initramfs-tools/varlog $FILESYSTEM_ROOT/etc/initramfs-tools/scripts/init-bottom/varlog
+sudo chmod +x $FILESYSTEM_ROOT/etc/initramfs-tools/scripts/init-bottom/varlog
 sudo cp files/initramfs-tools/union-fsck $FILESYSTEM_ROOT/etc/initramfs-tools/hooks/union-fsck
 sudo chmod +x $FILESYSTEM_ROOT/etc/initramfs-tools/hooks/union-fsck
 sudo chroot $FILESYSTEM_ROOT update-initramfs -u
@@ -203,7 +206,13 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
     curl                    \
     kexec-tools             \
     less                    \
-    unzip
+    unzip                   \
+    gdisk
+
+sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y download \
+    grub-pc-bin
+
+sudo mv $FILESYSTEM_ROOT/grub-pc-bin*.deb $FILESYSTEM_ROOT/$PLATFORM_DIR/x86_64-grub
 
 ## Disable kexec supported reboot which was installed by default
 sudo sed -i 's/LOAD_KEXEC=true/LOAD_KEXEC=false/' $FILESYSTEM_ROOT/etc/default/kexec
@@ -239,10 +248,11 @@ EOF
 ## Config sysctl
 sudo mkdir -p $FILESYSTEM_ROOT/var/core
 sudo augtool --autosave "
-set /files/etc/sysctl.conf/kernel.core_pattern '|/usr/bin/coredump-compress %e %p'
+set /files/etc/sysctl.conf/kernel.core_pattern '|/usr/bin/coredump-compress %e %t %p'
 
 set /files/etc/sysctl.conf/kernel.softlockup_panic 1
 set /files/etc/sysctl.conf/kernel.panic 10
+set /files/etc/sysctl.conf/fs.suid_dumpable 2
 
 set /files/etc/sysctl.conf/net.ipv4.conf.default.forwarding 1
 set /files/etc/sysctl.conf/net.ipv4.conf.all.forwarding 1
@@ -312,6 +322,14 @@ if [ -f sonic_debian_extension.sh ]; then
     ./sonic_debian_extension.sh $FILESYSTEM_ROOT $PLATFORM_DIR
 fi
 
+## Organization specific extensions such as Configuration & Scripts for features like AAA, ZTP...
+if [ "${enable_organization_extensions}" = "y" ]; then
+   if [ -f files/build_templates/organization_extensions.sh ]; then
+      sudo chmod 755 files/build_templates/organization_extensions.sh 
+      ./files/build_templates/organization_extensions.sh -f $FILESYSTEM_ROOT -h $HOSTNAME
+   fi
+fi
+
 ## Clean up apt
 sudo LANG=C chroot $FILESYSTEM_ROOT apt-get autoremove
 sudo LANG=C chroot $FILESYSTEM_ROOT apt-get autoclean

diff --git a/build_image.sh b/build_image.sh
@@ -14,11 +14,8 @@
 
 IMAGE_VERSION=$(. functions.sh && sonic_get_version)
 
-if [ "$IMAGE_TYPE" = "onie" ]; then
-    echo "Build ONIE installer"
-    mkdir -p `dirname $OUTPUT_ONIE_IMAGE`
-    sudo rm -f $OUTPUT_ONIE_IMAGE
-
+generate_onie_installer_image()
+{
     # Copy platform-specific ONIE installer config files where onie-mk-demo.sh expects them
     rm -rf ./installer/x86_64/platforms/
     mkdir -p ./installer/x86_64/platforms/
@@ -27,6 +24,7 @@ if [ "$IMAGE_TYPE" = "onie" ]; then
             if [ -f ./device/$VENDOR/$PLATFORM/installer.conf ]; then
                 cp ./device/$VENDOR/$PLATFORM/installer.conf ./installer/x86_64/platforms/$PLATFORM
             fi
+
         done
     done
 
@@ -35,6 +33,50 @@ if [ "$IMAGE_TYPE" = "onie" ]; then
     ./onie-mk-demo.sh $TARGET_PLATFORM $TARGET_MACHINE $TARGET_PLATFORM-$TARGET_MACHINE-$ONIEIMAGE_VERSION \
           installer platform/$TARGET_MACHINE/platform.conf $OUTPUT_ONIE_IMAGE OS $IMAGE_VERSION $ONIE_IMAGE_PART_SIZE \
           $ONIE_INSTALLER_PAYLOAD
+}
+
+if [ "$IMAGE_TYPE" = "onie" ]; then
+    echo "Build ONIE installer"
+    mkdir -p `dirname $OUTPUT_ONIE_IMAGE`
+    sudo rm -f $OUTPUT_ONIE_IMAGE
+
+    generate_onie_installer_image
+
+## Build a raw partition dump image using the ONIE installer that can be
+## used to dd' in-lieu of using the onie-nos-installer. Used while migrating
+## into SONiC from other NOS.
+elif [ "$IMAGE_TYPE" = "raw" ]; then
+
+    echo "Build RAW image"
+    mkdir -p `dirname $OUTPUT_RAW_IMAGE`
+    sudo rm -f $OUTPUT_RAW_IMAGE
+
+    generate_onie_installer_image
+
+    echo "Creating SONiC raw partition : $OUTPUT_RAW_IMAGE of size $RAW_IMAGE_DISK_SIZE MB"
+    fallocate -l "$RAW_IMAGE_DISK_SIZE"M $OUTPUT_RAW_IMAGE
+
+    ## Generate a compressed 8GB partition dump that can be used to 'dd' in-lieu of using the onie-nos-installer
+    ## Run the installer 
+    ## The 'build' install mode of the installer is used to generate this dump.
+    sudo chmod a+x $OUTPUT_ONIE_IMAGE
+    sudo ./$OUTPUT_ONIE_IMAGE
+
+    [ -r $OUTPUT_RAW_IMAGE ] || {
+        echo "Error : $OUTPUT_RAW_IMAGE not generated!"
+        exit 1
+    }
+
+    gzip $OUTPUT_RAW_IMAGE
+
+    [ -r $OUTPUT_RAW_IMAGE.gz ] || {
+        echo "Error : gzip $OUTPUT_RAW_IMAGE failed!"
+        exit 1
+    }
+
+    mv $OUTPUT_RAW_IMAGE.gz $OUTPUT_RAW_IMAGE
+    echo "The compressed raw image is in $OUTPUT_RAW_IMAGE"
+
 ## Use 'aboot' as target machine category which includes Aboot as bootloader
 elif [ "$IMAGE_TYPE" = "aboot" ]; then
     echo "Build Aboot installer"

diff --git a/device/accton/x86_64-accton_as5712_54x-r0/Accton-AS5712-54X/port_config.ini b/device/accton/x86_64-accton_as5712_54x-r0/Accton-AS5712-54X/port_config.ini
@@ -0,0 +1,74 @@
+# name         lanes              alias
+Ethernet0      13                 tenGigE0
+Ethernet1      14                 tenGigE1
+Ethernet2      15                 tenGigE2
+Ethernet3      16                 tenGigE3
+Ethernet4      21                 tenGigE4
+Ethernet5      22                 tenGigE5
+Ethernet6      23                 tenGigE6
+Ethernet7      24                 tenGigE7
+Ethernet8      25                 tenGigE8
+Ethernet9      26                 tenGigE9
+Ethernet10     27                 tenGigE10
+Ethernet11     28                 tenGigE11
+Ethernet12     29                 tenGigE12
+Ethernet13     30                 tenGigE13
+Ethernet14     31                 tenGigE14
+Ethernet15     32                 tenGigE15
+Ethernet16     45                 tenGigE16
+Ethernet17     46                 tenGigE17
+Ethernet18     47                 tenGigE18
+Ethernet19     48                 tenGigE19
+Ethernet20     49                 tenGigE20
+Ethernet21     50                 tenGigE21
+Ethernet22     51                 tenGigE22
+Ethernet23     52                 tenGigE23
+Ethernet24     53                 tenGigE24
+Ethernet25     54                 tenGigE25
+Ethernet26     55                 tenGigE26
+Ethernet27     56                 tenGigE27
+Ethernet28     57                 tenGigE28
+Ethernet29     58                 tenGigE29
+Ethernet30     59                 tenGigE30
+Ethernet31     60                 tenGigE31
+Ethernet32     61                 tenGigE32
+Ethernet33     62                 tenGigE33
+Ethernet34     63                 tenGigE34
+Ethernet35     64                 tenGigE35
+Ethernet36     65                 tenGigE36
+Ethernet37     66                 tenGigE37
+Ethernet38     67                 tenGigE38
+Ethernet39     68                 tenGigE39
+Ethernet40     69                 tenGigE40
+Ethernet41     70                 tenGigE41
+Ethernet42     71                 tenGigE42
+Ethernet43     72                 tenGigE43
+Ethernet44     73                 tenGigE44
+Ethernet45     74                 tenGigE45
+Ethernet46     75                 tenGigE46
+Ethernet47     76                 tenGigE47
+Ethernet48     97                 tenGigE48
+Ethernet49     98                 tenGigE49
+Ethernet50     99                 tenGigE50
+Ethernet51     100                tenGigE51
+Ethernet52     101                tenGigE52
+Ethernet53     102                tenGigE53
+Ethernet54     103                tenGigE54
+Ethernet55     104                tenGigE55
+Ethernet56     81                 tenGigE56
+Ethernet57     82                 tenGigE57
+Ethernet58     83                 tenGigE58
+Ethernet59     84                 tenGigE59
+Ethernet60     105                tenGigE60
+Ethernet61     106                tenGigE61
+Ethernet62     107                tenGigE62
+Ethernet63     108                tenGigE63
+Ethernet64     109                tenGigE64
+Ethernet65     110                tenGigE65
+Ethernet66     111                tenGigE66
+Ethernet67     112                tenGigE67
+Ethernet68     77                 tenGigE68
+Ethernet69     78                 tenGigE69
+Ethernet70     79                 tenGigE70
+Ethernet71     80                 tenGigE71
+
diff --git a/device/accton/x86_64-accton_as5712_54x-r0/Accton-AS5712-54X/sai.profile b/device/accton/x86_64-accton_as5712_54x-r0/Accton-AS5712-54X/sai.profile
@@ -0,0 +1,2 @@
+SAI_INIT_CONFIG_FILE=/etc/bcm/td2-as5712-72x10G.config.bcm
+
diff --git a/device/accton/x86_64-accton_as5712_54x-r0/installer.conf b/device/accton/x86_64-accton_as5712_54x-r0/installer.conf
@@ -0,0 +1,3 @@
+CONSOLE_PORT=0x2f8
+CONSOLE_DEV=1
+CONSOLE_SPEED=115200