Merge branch 'master' of github.com:opencomputeproject/OpenNetworkLinux

Conflicts:
	packages/base/all/initrds/loader-initrd-files/src/bin/swiprep

docker/images/builder8/1.7/Dockerfile

@@ -0,0 +1,27 @@
+############################################################
+#
+# Fix broken cross dependencies.
+# Update Packages.
+# Additional build dependencies.
+#
+############################################################
+FROM opennetworklinux/builder8:1.6
+MAINTAINER Jeffrey Townsend <jeffrey.townsend@bigswitch.com>
+#ENV DEBIAN_FRONTEND noninteractive
+
+RUN apt-get install -f && \
+    apt-get update
+
+RUN xapt -a powerpc libsnmp-dev && \
+    xapt -a armel   libsnmp-dev && \
+    xapt -a arm64   libsnmp-dev
+
+RUN apt-get install -f
+
+RUN DEBIAN_FRONTEND=noninteractive apt-get install tshark -y
+RUN sudo apt-get install -yq libpcap-dev libxml2-dev python-dev g++ swig tcpreplay libusb-dev
+
+# Docker shell and other container tools.
+#
+COPY docker_shell /bin/docker_shell
+COPY container-id /bin/container-id

docker/images/builder8/1.7/Makefile

@@ -0,0 +1,19 @@
+VERSION=1.7
+USER=opennetworklinux
+REPO=builder8
+
+TOOLS=../../../tools/docker_shell ../../../tools/container-id
+
+build: check_version
+	cp $(TOOLS) .
+	docker build -t $(USER)/$(REPO):$(VERSION) .
+	rm -rf $(notdir $(TOOLS))
+
+#
+# Todo: Query remote repository to see if the request version already exists to avoid accidental overwrites
+# when a new image is built but the VERSION variable is not updated.
+#
+check_version:
+
+push:
+	docker push $(USER)/$(REPO):$(VERSION)

docker/tools/PKG.yml

@@ -1,6 +1,6 @@
 common:
   arch: all
-  version: 1.3.0
+  version: 1.4.0
   copyright: Copyright 2013, 2014, 2015 Big Switch Networks
   maintainer: support@bigswitch.com
   support: opennetworklinux@googlegroups.com

docker/tools/container-id

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 # -*- python -*-
 
 import re

docker/tools/onlbuilder

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 
 import os
 import sys
@@ -18,7 +18,7 @@ g_current_uid  = os.getuid()
 g_timestamp = datetime.datetime.now().strftime("%Y-%m-%d.%H%M%S")
 
 g_builder7_image_name="opennetworklinux/builder7:1.2"
-g_builder8_image_name="opennetworklinux/builder8:1.6"
+g_builder8_image_name="opennetworklinux/builder8:1.7"
 
 g_default_image_name=g_builder8_image_name
 g_default_container_name = "%s_%s" % (g_current_user, g_timestamp)

make/kbuild.mk

@@ -103,10 +103,11 @@ K_ARCHIVE_NAME := $(K_NAME).$(K_ARCHIVE_EXT)
 endif
 K_ARCHIVE_PATH := $(ONL_KERNELS)/archives/$(K_ARCHIVE_NAME)
 ifndef K_ARCHIVE_URL
-K_ARCHIVE_URL := https://www.kernel.org/pub/linux/kernel/v3.x/$(K_ARCHIVE_NAME)
+K_ARCHIVE_URL := https://www.kernel.org/pub/linux/kernel/v$(K_MAJOR_VERSION).x/$(K_ARCHIVE_NAME)
 endif
 K_SOURCE_DIR := $(K_TARGET_DIR)/$(K_NAME)
 K_MBUILD_DIR := $(K_SOURCE_DIR)-mbuild
+K_INSTALL_MOD_PATH := $(K_TARGET_DIR)
 K_DTBS_DIR := $(K_SOURCE_DIR)-dtbs
 
 #
@@ -153,6 +154,12 @@ K_MAKE    := $(MAKE) -C $(K_SOURCE_DIR)
 #
 build: setup
 	+$(K_MAKE) $(K_BUILD_TARGET)
+	+$(K_MAKE) modules
+	+$(K_MAKE) modules_install INSTALL_MOD_PATH=$(K_INSTALL_MOD_PATH)
+	find $(K_INSTALL_MOD_PATH) -type l -name source -delete
+	find $(K_INSTALL_MOD_PATH) -type l -name build -delete
+
+
 ifdef K_COPY_SRC
 ifdef K_COPY_DST
 ifdef K_COPY_GZIP
@@ -180,6 +187,7 @@ mbuild: build
 	$(foreach f,$(MODSYNCLIST),$(ONL)/tools/scripts/tree-copy.sh $(K_SOURCE_DIR) $(f) $(K_MBUILD_DIR);)
 	find $(K_MBUILD_DIR) -name "*.o*" -delete
 	find $(K_MBUILD_DIR) -name "*.c" -delete
+	find $(K_MBUILD_DIR) -name "*.ko" -delete
 	$(foreach f,$(MODSYNCKEEP), cp $(K_SOURCE_DIR)/$(f) $(K_MBUILD_DIR)/$(f) || true;)
 
 dtbs: mbuild

packages/base/all/initrds/loader-initrd-files/src/bin/swiprep

@@ -141,21 +141,24 @@ case $(uname -m) in
     ARCH_LIST="armel"
     ;;
   aarch64)
-   ARCH_LIST="arm64"
-   ;;
+    ARCH_LIST="arm64"
+    ;;
   *)
     ;;
 esac
 
 if test "${mode_install}${mode_overlay}"; then
   for arch in $ARCH_LIST; do
-    if unzip -pq "$swipath" "rootfs-${arch}.sqsh" > "$workdir/rootfs.sqsh"; then
+    if unzip -q "$swipath" "rootfs-${arch}.sqsh" -d "$workdir"; then
       :
     else
-      echo "*** unzip of rootfs.sqsh failed" 1>&2
-      rm -f "$workdir/rootfs.sqsh"
+      echo "*** unzip of root squashfs failed" 1>&2
+      rm -f "$workdir/rootfs-${arch}.sqsh"
+    fi
+    if test -s "$workdir/rootfs-${arch}.sqsh"; then
+      mv "$workdir/rootfs-${arch}.sqsh" "$workdir/rootfs.sqsh"
+      break;
     fi
-    if test -s "$workdir/rootfs.sqsh"; then break; fi
   done
   if test ! -s "$workdir/rootfs.sqsh"; then
     echo "*** cannot find a valid rootfs" 1>&2

packages/base/all/initrds/loader-initrd-files/src/bin/udhcpc

@@ -26,4 +26,4 @@
 . /lib/customize.sh
 
 kill $(cat /tmp/udhcpc.pid 2>/dev/null) 2>/dev/null
-exec busybox udhcpc -V $ONL_UDHCPC_VENDOR -p /tmp/udhcpc.pid -s /lib/udhcpc-script "$@"
+exec busybox udhcpc -O url -V $ONL_UDHCPC_VENDOR -p /tmp/udhcpc.pid -s /lib/udhcpc-script "$@"

packages/base/all/initrds/loader-initrd-files/src/bootmodes/swi

@@ -19,7 +19,7 @@ fi
 #
 for url in $SWI; do
     msg_info "Trying ${url}..."
-    timeout -t 60 boot "${url}" && exit 0
+    timeout -t 180 boot "${url}" && exit 0
 done
 
 exit 1

packages/base/all/initrds/loader-initrd-files/src/lib/udhcpc-script

@@ -1,22 +1,22 @@
 #!/bin/sh
 ############################################################
 # <bsn.cl fy=2013 v=onl>
-# 
-#        Copyright 2013, 2014 BigSwitch Networks, Inc.        
-# 
+#
+#        Copyright 2013, 2014 BigSwitch Networks, Inc.
+#
 # Licensed under the Eclipse Public License, Version 1.0 (the
 # "License"); you may not use this file except in compliance
 # with the License. You may obtain a copy of the License at
-# 
+#
 #        http://www.eclipse.org/legal/epl-v10.html
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
 # either express or implied. See the License for the specific
 # language governing permissions and limitations under the
 # License.
-# 
+#
 # </bsn.cl>
 ############################################################
 #
@@ -26,6 +26,9 @@
 
 [ "${interface}" ] || exit
 
+URUN=/var/run/udhcpc
+rm -rf ${URUN} && mkdir -p ${URUN}
+
 case "$1" in
     deconfig)
         ifconfig ${interface} 0.0.0.0
@@ -36,6 +39,9 @@ case "$1" in
 	: >/etc/resolv.conf
 	[ ! "${domain}" ] || echo "search ${domain}" >>/etc/resolv.conf
 	[ ! "${dns}" ] || echo "nameserver ${dns}" >>/etc/resolv.conf
-	[ ! "${boot_file}" ] || echo "${boot_file}" >/tmp/udhcpc.boot_file
+	[ ! "${boot_file}" ] || echo "${boot_file}" > ${URUN}/boot_file
+        [ ! "${siaddr}" ] || echo "${siaddr}" > ${URUN}/siaddr
+        [ ! "${url}" ] || echo "${url}" > ${URUN}/url
         ;;
+
 esac

packages/base/all/vendor-config-onl/src/bin/onlfit

@@ -5,9 +5,28 @@ if [ -z "$1" ]; then
     exit 1
 fi
 
+ARCH=`uname -m`
+case $ARCH in
+    armv7l|ppc)
+    ;;
+    *)
+    echo "This script cannot be used on $ARCH platforms."
+    exit 1
+    ;;
+esac
+
 PLATFORM=$(cat /etc/onl/platform)
 
 dir=`mktemp -d`
-(cd $dir && wget $1)
-onlfs rw boot mv $dir/* /mnt/onl/boot/${PLATFORM}.itb
+rc=
+
+if (cd $dir && wget $1); then
+    onlfs rw boot mv $dir/* /mnt/onl/boot/${PLATFORM}.itb
+    rc=0
+else
+    echo "Download failed."
+    rc=1
+fi
+
 rmdir $dir
+exit $rc

packages/base/all/vendor-config-onl/src/bin/onlinitrd

@@ -0,0 +1,32 @@
+#!/bin/sh
+############################################################
+if [ -z "$1" ]; then
+    echo "usage: $0 <initrd url>"
+    exit 1
+fi
+
+ARCH=`uname -m`
+case $ARCH in
+    x86_64)
+    ;;
+    *)
+    echo "This script cannot be used on $ARCH platforms."
+    exit 1
+    ;;
+esac
+
+PLATFORM=$(cat /etc/onl/platform)
+
+dir=`mktemp -d`
+rc=
+
+if (cd $dir && wget $1); then
+    onlfs rw boot mv $dir/* /mnt/onl/boot/${PLATFORM}.cpio.gz
+    rc=0
+else
+    echo "Download failed."
+    rc=1
+fi
+
+rmdir $dir
+exit $rc

packages/base/all/vendor-config-onl/src/bin/onlkernel

@@ -5,7 +5,26 @@ if [ -z "$1" ]; then
     exit 1
 fi
 
+ARCH=`uname -m`
+case $ARCH in
+    x86_64)
+    ;;
+    *)
+    echo "This script cannot be used on $ARCH platforms."
+    exit 1
+    ;;
+esac
+
 dir=`mktemp -d`
-(cd $dir && wget $1)
-onlfs rw boot mv $dir/* /mnt/onl/boot
+rc=
+
+if (cd $dir && wget $1); then
+    onlfs rw boot mv $dir/* /mnt/onl/boot
+    rc=0
+else
+    echo "Download failed."
+    rc=1
+fi
+
 rmdir $dir
+exit $rc

packages/base/all/vendor-config-onl/src/lib/platform-config-defaults-x86-64.yml

@@ -19,10 +19,18 @@ default:
     # this is mostly to *reject* invalid disk labels,
     # since we will never create our own
 
+    kernel-3.2: &kernel-3-2
+      =: kernel-3.2-lts-x86_64-all
+      package: onl-kernel-3.2-lts-x86-64-all:amd64
+
     kernel-3.16: &kernel-3-16
       =: kernel-3.16-lts-x86_64-all
       package: onl-kernel-3.16-lts-x86-64-all:amd64
 
+    kernel-4.9: &kernel-4-9
+      =: kernel-4.9-lts-x86_64-all
+      package: onl-kernel-4.9-lts-x86-64-all:amd64
+
     # pick one of the above kernels
     kernel:
       <<: *kernel-3-16

packages/base/all/vendor-config-onl/src/python/onl/platform/base.py

@@ -487,6 +487,10 @@ class OnlPlatformPortConfig_48x25_6x100(object):
     PORT_COUNT=54
     PORT_CONFIG="48x25 + 6x100"
 
+class OnlPlatformPortConfig_48x25_8x100(object):
+    PORT_COUNT=56
+    PORT_CONFIG="48x25 + 8x100"
+
 class OnlPlatformPortConfig_32x40(object):
     PORT_COUNT=32
     PORT_CONFIG="32x40"

packages/base/amd64/kernels/kernel-3.16-lts-x86-64-all/builds/Makefile

@@ -13,8 +13,8 @@ THIS_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
 include $(ONL)/make/config.mk
 
 kernel:
-	$(MAKE) -C $(ONL)/packages/base/any/kernels/3.16-lts/configs/x86_64-all K_TARGET_DIR=$(THIS_DIR) $(ONL_MAKE_PARALLEL)
 	rm -rf lib
+	$(MAKE) -C $(ONL)/packages/base/any/kernels/3.16-lts/configs/x86_64-all K_TARGET_DIR=$(THIS_DIR) $(ONL_MAKE_PARALLEL)
 	ARCH=x86_64 $(ONL)/tools/scripts/kmodbuild.sh linux-3.16.39-mbuild "$(wildcard $(ONL)/packages/base/any/kernels/modules/*)" onl/onl/common
 
 clean:

packages/base/amd64/kernels/kernel-3.2-lts-x86-64-all/Makefile

@@ -0,0 +1 @@
+include $(ONL)/make/pkg.mk

packages/base/amd64/kernels/kernel-3.2-lts-x86-64-all/PKG.yml

@@ -0,0 +1,29 @@
+variables:
+  basename: onl-kernel-3.2-lts-x86-64-all
+
+common:
+  arch: amd64
+  version: 1.0.0
+  copyright: Copyright 2013, 2014, 2015 Big Switch Networks
+  maintainer: support@bigswitch.com
+  support: opennetworklinux@googlegroups.com
+
+packages:
+  - name: $basename
+    version: 1.0.0
+    summary: Open Network Linux 3.2 LTS Kernel for X86_64 Platforms.
+
+    files:
+      builds/kernel-3.2* : $$PKG_INSTALL/
+      builds/linux-*mbuild   : $$PKG_INSTALL/mbuilds
+
+    changelog:  Change changes changes.,
+
+  - name: $basename-modules
+    version: 1.0.0
+    summary: Open Network Linux 3.2 LTS Kernel Modules for X86_64 Platforms
+
+    files:
+      builds/lib: /lib
+
+    changelog:  Change changes changes.,

packages/base/amd64/kernels/kernel-3.2-lts-x86-64-all/builds/.gitignore

@@ -0,0 +1,3 @@
+linux-*
+kernel-*
+lib

packages/base/amd64/kernels/kernel-3.2-lts-x86-64-all/builds/Makefile

@@ -0,0 +1,21 @@
+# -*- Makefile -*-
+############################################################
+# <bsn.cl fy=2013 v=none>
+#
+#        Copyright 2013, 2014 BigSwitch Networks, Inc.
+#
+#
+#
+# </bsn.cl>
+############################################################
+THIS_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
+
+include $(ONL)/make/config.mk
+
+kernel:
+	$(MAKE) -C $(ONL)/packages/base/any/kernels/3.2-lts/configs/x86_64-all K_TARGET_DIR=$(THIS_DIR) $(ONL_MAKE_PARALLEL)
+	rm -rf lib
+	ARCH=x86_64 $(ONL)/tools/scripts/kmodbuild.sh linux-3.2.84-mbuild "$(wildcard $(ONL)/packages/base/any/kernels/modules/*)" onl/onl/common
+
+clean:
+	rm -rf linux-3.2* kernel-3.2*

packages/base/amd64/kernels/kernel-4.9-lts-x86-64-all/Makefile

@@ -0,0 +1 @@
+include $(ONL)/make/pkg.mk

packages/base/amd64/kernels/kernel-4.9-lts-x86-64-all/PKG.yml

@@ -0,0 +1,29 @@
+variables:
+  basename: onl-kernel-4.9-lts-x86-64-all
+
+common:
+  arch: amd64
+  version: 1.0.0
+  copyright: Copyright 2013, 2014, 2015 Big Switch Networks
+  maintainer: support@bigswitch.com
+  support: opennetworklinux@googlegroups.com
+
+packages:
+  - name: $basename
+    version: 1.0.0
+    summary: Open Network Linux 4.9 LTS Kernel for X86_64 Platforms.
+
+    files:
+      builds/kernel-4.9* : $$PKG_INSTALL/
+      builds/linux-*mbuild   : $$PKG_INSTALL/mbuilds
+
+    changelog:  Change changes changes.,
+
+  - name: $basename-modules
+    version: 1.0.0
+    summary: Open Network Linux 4.9 LTS Kernel Modules for X86_64 Platforms
+
+    files:
+      builds/lib: /lib
+
+    changelog:  Change changes changes.,

packages/base/amd64/kernels/kernel-4.9-lts-x86-64-all/builds/.gitignore

@@ -0,0 +1,3 @@
+linux-*
+kernel-*
+lib

packages/base/amd64/kernels/kernel-4.9-lts-x86-64-all/builds/Makefile

@@ -0,0 +1,21 @@
+# -*- Makefile -*-
+############################################################
+# <bsn.cl fy=2013 v=none>
+#
+#        Copyright 2013, 2014 BigSwitch Networks, Inc.
+#
+#
+#
+# </bsn.cl>
+############################################################
+THIS_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
+
+include $(ONL)/make/config.mk
+
+kernel:
+	rm -rf lib
+	$(MAKE) -C $(ONL)/packages/base/any/kernels/4.9-lts/configs/x86_64-all K_TARGET_DIR=$(THIS_DIR) $(ONL_MAKE_PARALLEL)
+	ARCH=x86_64 $(ONL)/tools/scripts/kmodbuild.sh linux-4.9.30-mbuild "$(wildcard $(ONL)/packages/base/any/kernels/modules/*)" onl/onl/common
+
+clean:
+	rm -rf linux-4.9* kernel-4.9*

packages/base/amd64/upgrade/PKG.yml

@@ -1,6 +1,8 @@
 prerequisites:
     packages:
+      - onl-kernel-3.2-lts-x86-64-all:amd64
       - onl-kernel-3.16-lts-x86-64-all:amd64
+      - onl-kernel-4.9-lts-x86-64-all:amd64
       - onl-loader-initrd:amd64
 
 common:

packages/base/amd64/upgrade/builds/Makefile

@@ -1,7 +1,9 @@
 include $(ONL)/make/config.amd64.mk
 
 # All amd64 kernels
-KERNELS := $(shell $(ONLPM) --find-file onl-kernel-3.16-lts-x86-64-all:amd64 kernel-3.16-lts-x86_64-all)
+KERNELS := $(shell $(ONLPM) --find-file onl-kernel-3.2-lts-x86-64-all:amd64 kernel-3.2-lts-x86_64-all) \
+           $(shell $(ONLPM) --find-file onl-kernel-3.16-lts-x86-64-all:amd64 kernel-3.16-lts-x86_64-all) \
+	   $(shell $(ONLPM) --find-file onl-kernel-4.9-lts-x86-64-all:amd64 kernel-4.9-lts-x86_64-all)
 
 
 # Loader initrd

packages/base/any/initrds/buildroot/builds/Makefile

@@ -26,7 +26,7 @@ all: setup $(BUILDROOT_ARCHDIRS)
 
 clean:
 	rm -rf $(BUILDROOT_ARCHDIRS)
-
+	rm -rf .setup.done
 
 setup: setup-pyroute2 setup-dnspython setup-libyaml setup-pyyaml setup-jq setup-pyparted
 	cp $(wildcard patches/busybox*.patch) $(BUILDROOT_SOURCE)/package/busybox/

packages/base/any/initrds/buildroot/builds/patches/busybox-003-additional-dhcp-options.patch

@@ -0,0 +1,126 @@
+dhcp additional options patch
+
+Copyright (C) 2013 Curt Brune <curt@cumulusnetworks.com>
+Copyright (C) 2014 david_yang <david_yang@accton.com>
+Copyright (C) 2017 Jeffrey Townsend <jeffrey.townsend@bigswitch.com>
+
+SPDX-License-Identifier:     GPL-2.0
+
+Enable the send/receive of additional DHCP options:
+
+  DHCP_LOG_SERVER
+  DHCP_WWW_SERVER
+  DHCP_DEFAULT_URL
+
+diff -urpN a/networking/udhcp/common.c b/networking/udhcp/common.c
+--- a/networking/udhcp/common.c	2017-07-18 15:11:59.626055248 +0000
++++ b/networking/udhcp/common.c	2017-07-18 15:09:47.942052391 +0000
+@@ -26,7 +26,7 @@ const struct dhcp_optflag dhcp_optflags[
+ //	{ OPTION_IP | OPTION_LIST                 , 0x04 }, /* DHCP_TIME_SERVER   */
+ //	{ OPTION_IP | OPTION_LIST                 , 0x05 }, /* DHCP_NAME_SERVER   */
+ 	{ OPTION_IP | OPTION_LIST     | OPTION_REQ, 0x06 }, /* DHCP_DNS_SERVER    */
+-//	{ OPTION_IP | OPTION_LIST                 , 0x07 }, /* DHCP_LOG_SERVER    */
++	{ OPTION_IP | OPTION_LIST                 , 0x07 }, /* DHCP_LOG_SERVER    */
+ //	{ OPTION_IP | OPTION_LIST                 , 0x08 }, /* DHCP_COOKIE_SERVER */
+ 	{ OPTION_IP | OPTION_LIST                 , 0x09 }, /* DHCP_LPR_SERVER    */
+ 	{ OPTION_STRING_HOST          | OPTION_REQ, 0x0c }, /* DHCP_HOST_NAME     */
+@@ -44,6 +44,7 @@ const struct dhcp_optflag dhcp_optflags[
+ 	{ OPTION_STRING_HOST                      , 0x28 }, /* DHCP_NIS_DOMAIN    */
+ 	{ OPTION_IP | OPTION_LIST                 , 0x29 }, /* DHCP_NIS_SERVER    */
+ 	{ OPTION_IP | OPTION_LIST     | OPTION_REQ, 0x2a }, /* DHCP_NTP_SERVER    */
++	{ OPTION_BIN                              , 0x2b }, /* DHCP_VENDOR_OPTS   */
+ 	{ OPTION_IP | OPTION_LIST                 , 0x2c }, /* DHCP_WINS_SERVER   */
+ 	{ OPTION_U32                              , 0x33 }, /* DHCP_LEASE_TIME    */
+ 	{ OPTION_IP                               , 0x36 }, /* DHCP_SERVER_ID     */
+@@ -51,18 +52,22 @@ const struct dhcp_optflag dhcp_optflags[
+ //TODO: must be combined with 'sname' and 'file' handling:
+ 	{ OPTION_STRING_HOST                      , 0x42 }, /* DHCP_TFTP_SERVER_NAME */
+ 	{ OPTION_STRING                           , 0x43 }, /* DHCP_BOOT_FILE     */
++	{ OPTION_IP | OPTION_LIST                 , 0x48 }, /* DHCP_WWW_SERVER    */
+ //TODO: not a string, but a set of LASCII strings:
+ //	{ OPTION_STRING                           , 0x4D }, /* DHCP_USER_CLASS    */
++	{ OPTION_STRING                           , 0x72 }, /* DHCP_DEFAULT_URL   */
+ #if ENABLE_FEATURE_UDHCP_RFC3397
+ 	{ OPTION_DNS_STRING | OPTION_LIST         , 0x77 }, /* DHCP_DOMAIN_SEARCH */
+ 	{ OPTION_SIP_SERVERS                      , 0x78 }, /* DHCP_SIP_SERVERS   */
+ #endif
+ 	{ OPTION_STATIC_ROUTES | OPTION_LIST      , 0x79 }, /* DHCP_STATIC_ROUTES */
++	{ OPTION_BIN                              , 0x7d }, /* DHCP_VIVSO_OPTS    */
+ #if ENABLE_FEATURE_UDHCP_8021Q
+ 	{ OPTION_U16                              , 0x84 }, /* DHCP_VLAN_ID       */
+ 	{ OPTION_U8                               , 0x85 }, /* DHCP_VLAN_PRIORITY */
+ #endif
+ 	{ OPTION_6RD                              , 0xd4 }, /* DHCP_6RD           */
++	{ OPTION_IP                               , 0x96 }, /* DHCP_TFTP_SERVER_IP */
+ 	{ OPTION_STATIC_ROUTES | OPTION_LIST      , 0xf9 }, /* DHCP_MS_STATIC_ROUTES */
+ 	{ OPTION_STRING                           , 0xfc }, /* DHCP_WPAD          */
+
+@@ -95,7 +100,7 @@ const char dhcp_option_strings[] ALIGN1
+ //	"timesrv" "\0"     /* DHCP_TIME_SERVER    */
+ //	"namesrv" "\0"     /* DHCP_NAME_SERVER    */
+ 	"dns" "\0"         /* DHCP_DNS_SERVER     */
+-//	"logsrv" "\0"      /* DHCP_LOG_SERVER     */
++	"logsrv" "\0"      /* DHCP_LOG_SERVER     */
+ //	"cookiesrv" "\0"   /* DHCP_COOKIE_SERVER  */
+ 	"lprsrv" "\0"      /* DHCP_LPR_SERVER     */
+ 	"hostname" "\0"    /* DHCP_HOST_NAME      */
+@@ -110,13 +115,16 @@ const char dhcp_option_strings[] ALIGN1
+ 	"nisdomain" "\0"   /* DHCP_NIS_DOMAIN     */
+ 	"nissrv" "\0"      /* DHCP_NIS_SERVER     */
+ 	"ntpsrv" "\0"      /* DHCP_NTP_SERVER     */
++	"vendoropts" "\0"  /* DHCP_VENDOR_OPTS    */
+ 	"wins" "\0"        /* DHCP_WINS_SERVER    */
+ 	"lease" "\0"       /* DHCP_LEASE_TIME     */
+ 	"serverid" "\0"    /* DHCP_SERVER_ID      */
+ 	"message" "\0"     /* DHCP_ERR_MESSAGE    */
+ 	"tftp" "\0"        /* DHCP_TFTP_SERVER_NAME */
+ 	"bootfile" "\0"    /* DHCP_BOOT_FILE      */
++	"wwwsrv" "\0"      /* DHCP_WWW_SERVER     */
+ //	"userclass" "\0"   /* DHCP_USER_CLASS     */
++	"url" "\0"         /* DHCP_DEFAULT_URL    */
+ #if ENABLE_FEATURE_UDHCP_RFC3397
+ 	"search" "\0"      /* DHCP_DOMAIN_SEARCH  */
+ // doesn't work in udhcpd.conf since OPTION_SIP_SERVERS
+@@ -124,11 +132,13 @@ const char dhcp_option_strings[] ALIGN1
+ 	"sipsrv" "\0"      /* DHCP_SIP_SERVERS    */
+ #endif
+ 	"staticroutes" "\0"/* DHCP_STATIC_ROUTES  */
++	"vivso" "\0"       /* DHCP_VIVSO_OPTS     */
+ #if ENABLE_FEATURE_UDHCP_8021Q
+ 	"vlanid" "\0"      /* DHCP_VLAN_ID        */
+ 	"vlanpriority" "\0"/* DHCP_VLAN_PRIORITY  */
+ #endif
+ 	"ip6rd" "\0"       /* DHCP_6RD            */
++	"tftpsiaddr" "\0"  /* DHCP_TFTP_SERVER_IP */
+ 	"msstaticroutes""\0"/* DHCP_MS_STATIC_ROUTES */
+ 	"wpad" "\0"        /* DHCP_WPAD           */
+ 	;
+@@ -145,6 +155,7 @@ const uint8_t dhcp_option_lengths[] ALIG
+ 	[OPTION_IP] =      4,
+ 	[OPTION_IP_PAIR] = 8,
+ //	[OPTION_BOOLEAN] = 1,
++	[OPTION_BIN] =  1,  /* ignored by udhcp_str2optset */
+ 	[OPTION_STRING] =  1,  /* ignored by udhcp_str2optset */
+ 	[OPTION_STRING_HOST] = 1,  /* ignored by udhcp_str2optset */
+ #if ENABLE_FEATURE_UDHCP_RFC3397
+diff -urpN a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
+--- a/networking/udhcp/dhcpc.c	2017-07-18 15:11:59.626055248 +0000
++++ b/networking/udhcp/dhcpc.c	2017-07-18 15:11:11.066054194 +0000
+@@ -100,6 +100,7 @@ static const uint8_t len_of_option_as_st
+ 	[OPTION_IP_PAIR         ] = sizeof("255.255.255.255 ") * 2,
+ 	[OPTION_STATIC_ROUTES   ] = sizeof("255.255.255.255/32 255.255.255.255 "),
+ 	[OPTION_6RD             ] = sizeof("32 128 ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff 255.255.255.255 "),
++	[OPTION_BIN             ] = 2,
+ 	[OPTION_STRING          ] = 1,
+ 	[OPTION_STRING_HOST     ] = 1,
+ #if ENABLE_FEATURE_UDHCP_RFC3397
+@@ -240,6 +241,9 @@ static NOINLINE char *xmalloc_optname_op
+ 			dest += sprintf(dest, type == OPTION_U32 ? "%lu" : "%ld", (unsigned long) ntohl(val_u32));
+ 			break;
+ 		}
++		case OPTION_BIN:
++			*bin2hex(dest, (void*) option, len) = '\0';
++			return ret;
+ 		/* Note: options which use 'return' instead of 'break'
+ 		 * (for example, OPTION_STRING) skip the code which handles
+ 		 * the case of list of options.

packages/base/any/kernels/3.16-lts/configs/powerpc-e500v-all/powerpc-e500v-all.config

@@ -1391,7 +1391,7 @@ CONFIG_I2C_MUX=y
 # CONFIG_I2C_MUX_GPIO is not set
 # CONFIG_I2C_MUX_PCA9541 is not set
 CONFIG_I2C_MUX_PCA954x=y
-# CONFIG_I2C_MUX_PCA954X_DESELECT_ON_EXIT is not set
+CONFIG_I2C_MUX_PCA954X_DESELECT_ON_EXIT=y
 CONFIG_I2C_HELPER_AUTO=y
 
 #

packages/base/any/kernels/3.16-lts/configs/x86_64-all/x86_64-all.config

@@ -470,7 +470,9 @@ CONFIG_X86_PAT=y
 CONFIG_ARCH_USES_PG_UNCACHED=y
 CONFIG_ARCH_RANDOM=y
 CONFIG_X86_SMAP=y
-# CONFIG_EFI is not set
+CONFIG_EFI=y
+CONFIG_EFI_STUB=y
+# CONFIG_EFI_MIXED is not set
 CONFIG_SECCOMP=y
 # CONFIG_HZ_100 is not set
 CONFIG_HZ_250=y
@@ -521,6 +523,7 @@ CONFIG_ACPI_CONTAINER=y
 # CONFIG_ACPI_SBS is not set
 # CONFIG_ACPI_HED is not set
 CONFIG_ACPI_CUSTOM_METHOD=y
+# CONFIG_ACPI_BGRT is not set
 # CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set
 # CONFIG_ACPI_APEI is not set
 # CONFIG_ACPI_EXTLOG is not set
@@ -1219,6 +1222,9 @@ CONFIG_CB710_DEBUG_ASSUMPTIONS=y
 # Altera FPGA firmware download module
 #
 # CONFIG_ALTERA_STAPL is not set
+# CONFIG_INTEL_MEI is not set
+# CONFIG_INTEL_MEI_ME is not set
+# CONFIG_INTEL_MEI_TXE is not set
 # CONFIG_VMWARE_VMCI is not set
 
 #
@@ -2180,6 +2186,8 @@ CONFIG_SENSORS_UCD9200=y
 # CONFIG_SENSORS_SMSC47M192 is not set
 # CONFIG_SENSORS_SMSC47B397 is not set
 # CONFIG_SENSORS_SCH56XX_COMMON is not set
+# CONFIG_SENSORS_SCH5627 is not set
+# CONFIG_SENSORS_SCH5636 is not set
 # CONFIG_SENSORS_SMM665 is not set
 # CONFIG_SENSORS_ADC128D818 is not set
 # CONFIG_SENSORS_ADS1015 is not set
@@ -2228,7 +2236,59 @@ CONFIG_X86_PKG_TEMP_THERMAL=m
 #
 # Texas Instruments thermal drivers
 #
-# CONFIG_WATCHDOG is not set
+CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_CORE=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+
+#
+# Watchdog Device Drivers
+#
+# CONFIG_SOFT_WATCHDOG is not set
+# CONFIG_XILINX_WATCHDOG is not set
+# CONFIG_DW_WATCHDOG is not set
+# CONFIG_ACQUIRE_WDT is not set
+# CONFIG_ADVANTECH_WDT is not set
+# CONFIG_ALIM1535_WDT is not set
+# CONFIG_ALIM7101_WDT is not set
+# CONFIG_F71808E_WDT is not set
+# CONFIG_SP5100_TCO is not set
+# CONFIG_SBC_FITPC2_WATCHDOG is not set
+# CONFIG_EUROTECH_WDT is not set
+# CONFIG_IB700_WDT is not set
+# CONFIG_IBMASR is not set
+# CONFIG_WAFER_WDT is not set
+# CONFIG_I6300ESB_WDT is not set
+# CONFIG_IE6XX_WDT is not set
+CONFIG_ITCO_WDT=y
+# CONFIG_ITCO_VENDOR_SUPPORT is not set
+# CONFIG_IT8712F_WDT is not set
+# CONFIG_IT87_WDT is not set
+# CONFIG_HP_WATCHDOG is not set
+# CONFIG_SC1200_WDT is not set
+# CONFIG_PC87413_WDT is not set
+# CONFIG_NV_TCO is not set
+# CONFIG_60XX_WDT is not set
+# CONFIG_CPU5_WDT is not set
+# CONFIG_SMSC_SCH311X_WDT is not set
+# CONFIG_SMSC37B787_WDT is not set
+# CONFIG_VIA_WDT is not set
+# CONFIG_W83627HF_WDT is not set
+# CONFIG_W83877F_WDT is not set
+# CONFIG_W83977F_WDT is not set
+# CONFIG_MACHZ_WDT is not set
+# CONFIG_SBC_EPX_C3_WATCHDOG is not set
+# CONFIG_MEN_A21_WDT is not set
+
+#
+# PCI-based Watchdog Cards
+#
+# CONFIG_PCIPCWATCHDOG is not set
+# CONFIG_WDTPCI is not set
+
+#
+# USB-based Watchdog Cards
+#
+# CONFIG_USBPCWATCHDOG is not set
 CONFIG_SSB_POSSIBLE=y
 
 #
@@ -2281,7 +2341,7 @@ CONFIG_MFD_CORE=y
 # CONFIG_MFD_MC13XXX_I2C is not set
 # CONFIG_HTC_PASIC3 is not set
 # CONFIG_HTC_I2CPLD is not set
-# CONFIG_LPC_ICH is not set
+CONFIG_LPC_ICH=y
 CONFIG_LPC_SCH=y
 # CONFIG_MFD_JANZ_CMODIO is not set
 # CONFIG_MFD_KEMPLD is not set
@@ -2914,6 +2974,12 @@ CONFIG_ISCSI_IBFT_FIND=y
 CONFIG_ISCSI_IBFT=y
 # CONFIG_GOOGLE_FIRMWARE is not set
 
+#
+# EFI (Extensible Firmware Interface) Support
+#
+# CONFIG_EFI_VARS is not set
+CONFIG_EFI_RUNTIME_MAP=y
+
 #
 # File systems
 #
@@ -3045,6 +3111,7 @@ CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
 # CONFIG_UFS_FS is not set
 # CONFIG_EXOFS_FS is not set
 # CONFIG_F2FS_FS is not set
+CONFIG_EFIVAR_FS=y
 CONFIG_ORE=y
 CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=y
@@ -3308,6 +3375,7 @@ CONFIG_STRICT_DEVMEM=y
 CONFIG_X86_VERBOSE_BOOTUP=y
 CONFIG_EARLY_PRINTK=y
 # CONFIG_EARLY_PRINTK_DBGP is not set
+# CONFIG_EARLY_PRINTK_EFI is not set
 # CONFIG_X86_PTDUMP is not set
 CONFIG_DEBUG_RODATA=y
 # CONFIG_DEBUG_RODATA_TEST is not set

packages/base/any/kernels/3.16-lts/patches/driver-igb-netberg-aurora.patch

@@ -0,0 +1,400 @@
+diff -Nu a/drivers/net/ethernet/intel/igb/bcm_phy.c b/drivers/net/ethernet/intel/igb/bcm_phy.c
+--- a/drivers/net/ethernet/intel/igb/bcm_phy.c	1970-01-01 08:00:00.000000000 +0800
++++ b/drivers/net/ethernet/intel/igb/bcm_phy.c	2017-06-20 17:00:46.000000000 +0800
+@@ -0,0 +1,206 @@
++#include "e1000_hw.h"
++#include "linux/brcmphy.h"
++
++/*
++ * 1000Base-T Control Register
++ */
++#define MII_BCM54XX_AUX_CTL_ENCODE(val) (((val & 0x7) << 12)|(val & 0x7))
++
++/*
++ * MII Link Advertisment
++ */
++#define MII_ANA_ASF             (1 << 0) /* Advertise Selector Field */
++#define MII_ANA_HD_10           (1 << 5) /* Half duplex 10Mb/s supported */
++#define MII_ANA_FD_10           (1 << 6) /* Full duplex 10Mb/s supported */
++#define MII_ANA_HD_100          (1 << 7) /* Half duplex 100Mb/s supported */
++#define MII_ANA_FD_100          (1 << 8) /* Full duplex 100Mb/s supported */
++#define MII_ANA_T4              (1 << 9) /* T4 */
++#define MII_ANA_PAUSE           (1 << 10)/* Pause supported */
++#define MII_ANA_ASYM_PAUSE      (1 << 11)/* Asymmetric pause supported */
++#define MII_ANA_RF              (1 << 13)/* Remote fault */
++#define MII_ANA_NP              (1 << 15)/* Next Page */
++
++#define MII_ANA_ASF_802_3       (1)      /* 802.3 PHY */
++
++/*
++ * BCM54XX: Shadow registers
++ * Shadow values go into bits [14:10] of register 0x1c to select a shadow
++ * register to access.
++ */
++#define BCM54XX_SHD_AUTODETECT  0x1e    /* 11110: Auto detect Regisrer */
++#define BCM54XX_SHD_MODE        0x1f    /* 11111: Mode Control Register */
++#define BCM54XX_SHD_MODE_SER    1<<6
++
++/*
++ * Indirect register access functions for the 1000BASE-T/100BASE-TX/10BASE-T
++ * 0x1c shadow registers.
++ */
++
++int bcmphy_write(struct e1000_hw *hw,u32 reg, u16 regval)
++{
++    u32 ret;
++    struct e1000_phy_info *phy = &hw->phy;
++
++    ret = phy->ops.write_reg(hw,reg, regval);
++    return ret;
++}
++
++u16 bcmphy_read(struct e1000_hw *hw, u32 reg)
++{
++    u16 val;
++    struct e1000_phy_info *phy = &hw->phy;
++
++    phy->ops.read_reg(hw,reg, &val);
++    return val;
++}
++
++static int bcm54xx_shadow_read(struct e1000_hw *hw, u16 shadow)
++{
++    bcmphy_write(hw, MII_BCM54XX_SHD, MII_BCM54XX_SHD_VAL(shadow));
++    return MII_BCM54XX_SHD_DATA(bcmphy_read(hw, MII_BCM54XX_SHD));
++}
++
++static int bcm54xx_shadow_write(struct e1000_hw *hw, u16 shadow, u16 val)
++{
++    return bcmphy_write(hw, MII_BCM54XX_SHD,
++                            MII_BCM54XX_SHD_WRITE |
++                            MII_BCM54XX_SHD_VAL(shadow) |
++                            MII_BCM54XX_SHD_DATA(val));
++}
++
++static int bcm54xx_auxctl_write(struct e1000_hw *hw, u16 regnum, u16 val)
++{
++    return bcmphy_write(hw, MII_BCM54XX_AUX_CTL, (regnum | val));
++}
++
++static int bcm54xx_config_init(struct e1000_hw *hw)
++{
++    int reg, err;
++
++    reg = bcmphy_read(hw, MII_BCM54XX_ECR);
++    if (reg < 0)
++        return reg;
++
++    /* Mask interrupts globally.  */
++    reg |= MII_BCM54XX_ECR_IM;
++    err = bcmphy_write(hw, MII_BCM54XX_ECR, reg);
++    if (err < 0)
++        return err;
++
++    /* Unmask events we are interested in.  */
++    reg = ~(MII_BCM54XX_INT_DUPLEX |
++            MII_BCM54XX_INT_SPEED |
++            MII_BCM54XX_INT_LINK);
++    err = bcmphy_write(hw, MII_BCM54XX_IMR, reg);
++    if (err < 0)
++        return err;
++
++    return 0;
++}
++
++void bcm54616s_linkup(struct e1000_hw *hw, int speed, int duplex)
++{
++    u16 regval;
++
++    /* set speed and full duplex*/
++    regval = bcmphy_read(hw,PHY_CONTROL);
++    regval &= ~(MII_CR_SPEED_SELECT_MSB |
++                MII_CR_SPEED_SELECT_LSB |
++                MII_CR_FULL_DUPLEX);
++
++    switch(speed) {
++        case SPEED_10:
++            regval |= MII_CR_SPEED_10;
++            break;
++        case SPEED_100:
++            regval |= MII_CR_SPEED_100;
++            break;
++        case SPEED_1000:
++        default:
++            regval |= MII_CR_SPEED_1000;
++            break;
++    }
++
++    switch(duplex) {
++        case FULL_DUPLEX:
++            regval |= MII_CR_FULL_DUPLEX;
++            break;
++    }
++
++    bcmphy_write(hw,PHY_CONTROL, regval);
++
++    regval = bcmphy_read(hw, PHY_CONTROL);
++    regval &= ~(MII_CR_ISOLATE);
++    bcmphy_write(hw, PHY_CONTROL, regval);
++}
++
++int bcm54616s_config_init(struct e1000_hw *hw)
++{
++    int err, reg;
++    u16 regval;
++    int i;
++
++    /* reset PHY */
++    regval = (1<<15);
++    bcmphy_write(hw, PHY_CONTROL, regval);
++
++    mdelay(10);
++
++    /* disable Power down and iso */
++    regval = bcmphy_read(hw,PHY_CONTROL);
++    regval &= ~(MII_CR_POWER_DOWN | MII_CR_ISOLATE);
++    bcmphy_write(hw, PHY_CONTROL, regval);
++
++    /* disable suport I */
++    /*0000 0100 1100 0010 */
++    bcm54xx_auxctl_write(hw, 0, 0x04c2);
++
++    regval = bcmphy_read(hw, MII_BCM54XX_AUX_CTL);
++
++    /* set 1000base-T */
++    regval = bcmphy_read(hw, PHY_1000T_CTRL);
++    regval |= (CR_1000T_FD_CAPS | CR_1000T_REPEATER_DTE);
++    bcmphy_write(hw, PHY_1000T_CTRL, regval);
++
++    /* set ctrl  */
++    regval = (MII_CR_SPEED_1000 |
++              MII_CR_FULL_DUPLEX |
++              MII_CR_SPEED_SELECT_MSB);
++    bcmphy_write(hw, PHY_CONTROL, regval);
++
++    /* Setup read from auxilary control shadow register 7 */
++    bcmphy_write(hw, MII_BCM54XX_AUX_CTL, MII_BCM54XX_AUX_CTL_ENCODE(7));
++
++    /* Read Misc Control register */
++    reg = ((bcmphy_read(hw, MII_BCM54XX_AUX_CTL) & 0x8FFF) | 0x8010);
++    bcmphy_write(hw, MII_BCM54XX_AUX_CTL, reg);
++
++    /* Enable auto-detect and copper prefer */
++    bcm54xx_shadow_write(hw, BCM54XX_SHD_AUTODETECT, 0x31);
++
++    err = bcm54xx_config_init(hw);
++
++    /* set link parner */
++    regval = MII_ANA_ASF_802_3;
++    regval |= MII_ANA_HD_10;
++    regval |= MII_ANA_HD_100;
++    regval |= MII_ANA_FD_10;
++    regval |= MII_ANA_FD_100;
++    regval |= MII_ANA_ASYM_PAUSE;
++    regval |= (MII_ANA_PAUSE | MII_ANA_ASYM_PAUSE);
++    regval |= MII_ANA_PAUSE;
++    bcmphy_write(hw, PHY_AUTONEG_ADV, reg);
++
++    i=0;
++    while (1) {
++        regval = bcm54xx_shadow_read(hw,BCM54XX_SHD_MODE);
++        if (regval & BCM54XX_SHD_MODE_SER)
++            break;
++        if (i++ > 500) {
++            //printk("SERDES no link %x\n",regval);
++            break;
++        }
++        mdelay(1);   /* 1 ms */
++    }
++    return err;
++}
+diff -Nu a/drivers/net/ethernet/intel/igb/e1000_82575.c b/drivers/net/ethernet/intel/igb/e1000_82575.c
+--- a/drivers/net/ethernet/intel/igb/e1000_82575.c	2017-06-20 16:44:29.000000000 +0800
++++ b/drivers/net/ethernet/intel/igb/e1000_82575.c	2017-06-20 17:00:52.000000000 +0800
+@@ -317,6 +317,10 @@
+ 		break;
+ 	case BCM54616_E_PHY_ID:
+ 		phy->type = e1000_phy_bcm54616;
++		phy->ops.check_polarity     = NULL;
++		phy->ops.get_info       	= igb_get_phy_info_bcm;
++		phy->ops.force_speed_duplex = igb_phy_force_speed_duplex_bcm;
++		bcm54616s_config_init(hw);
+ 		break;
+     case BCM50210S_E_PHY_ID:
+         break;
+@@ -1636,6 +1640,7 @@
+ 		ret_val = igb_e1000_copper_link_setup_82577(hw);
+ 		break;
+ 	case e1000_phy_bcm54616:
++		ret_val = igb_copper_link_setup_bcm(hw);
+ 		break;
+ 	case e1000_phy_bcm5461s:
+ 		break;
+diff -Nu a/drivers/net/ethernet/intel/igb/e1000_82575.h b/drivers/net/ethernet/intel/igb/e1000_82575.h
+--- a/drivers/net/ethernet/intel/igb/e1000_82575.h	2017-06-20 16:44:27.000000000 +0800
++++ b/drivers/net/ethernet/intel/igb/e1000_82575.h	2017-06-20 17:00:57.000000000 +0800
+@@ -25,6 +25,8 @@
+ #ifndef _E1000_82575_H_
+ #define _E1000_82575_H_
+ 
++extern void bcm54616s_linkup(struct e1000_hw *hw,int speed , int duplex);
++extern int bcm54616s_config_init(struct e1000_hw *hw);
+ #define ID_LED_DEFAULT_82575_SERDES	((ID_LED_DEF1_DEF2 << 12) | \
+ 					 (ID_LED_DEF1_DEF2 <<  8) | \
+ 					 (ID_LED_DEF1_DEF2 <<  4) | \
+diff -Nu a/drivers/net/ethernet/intel/igb/e1000_phy.c b/drivers/net/ethernet/intel/igb/e1000_phy.c
+--- a/drivers/net/ethernet/intel/igb/e1000_phy.c	2017-06-20 16:44:27.000000000 +0800
++++ b/drivers/net/ethernet/intel/igb/e1000_phy.c	2017-06-20 17:01:05.000000000 +0800
+@@ -1187,6 +1187,19 @@
+ 	return E1000_SUCCESS;
+ }
+ 
++s32 igb_copper_link_setup_bcm(struct e1000_hw *hw)
++{
++	struct e1000_phy_info *phy = &hw->phy;
++	s32 ret_val;
++	u16 phy_data;
++
++        ret_val = phy->ops.read_reg(hw, PHY_CONTROL, &phy_data);
++        phy_data &= ~(MII_CR_ISOLATE);
++        ret_val = phy->ops.write_reg(hw, PHY_CONTROL, phy_data);
++
++	return 0;
++}
++
+ /**
+  *  e1000_copper_link_setup_m88_gen2 - Setup m88 PHY's for copper link
+  *  @hw: pointer to the HW structure
+@@ -1720,6 +1733,62 @@
+ 	return ret_val;
+ }
+ 
++s32 igb_phy_force_speed_duplex_bcm(struct e1000_hw *hw)
++{
++	struct e1000_phy_info *phy = &hw->phy;
++	s32 ret_val;
++	u16 phy_data;
++	bool link;
++
++	ret_val = phy->ops.read_reg(hw, PHY_CONTROL, &phy_data);
++	if (ret_val)
++		return ret_val;
++
++	e1000_phy_force_speed_duplex_setup(hw, &phy_data);
++
++	phy_data &= ~(MII_CR_POWER_DOWN | MII_CR_ISOLATE);
++	ret_val = phy->ops.write_reg(hw, PHY_CONTROL, phy_data);
++	if (ret_val)
++		return ret_val;
++
++	/* Clear Auto-Crossover to force MDI manually.  IGP requires MDI
++	* forced whenever speed and duplex are forced.
++	*/
++	#if 0
++	ret_val = phy->ops.read_reg(hw, IGP01E1000_PHY_PORT_CTRL, &phy_data);
++	if (ret_val)
++		return ret_val;
++
++	phy_data &= ~IGP01E1000_PSCR_AUTO_MDIX;
++	phy_data &= ~IGP01E1000_PSCR_FORCE_MDI_MDIX;
++
++	ret_val = phy->ops.write_reg(hw, IGP01E1000_PHY_PORT_CTRL, phy_data);
++	if (ret_val)
++		return ret_val;
++
++	hw_dbg("IGP PSCR: %X\n", phy_data);
++	#endif
++	udelay(1);
++
++	if (phy->autoneg_wait_to_complete) {
++		DEBUGFUNC("Waiting for forced speed/duplex link on IGP phy.\n");
++
++		ret_val = e1000_phy_has_link_generic(hw, PHY_FORCE_LIMIT,
++						     100000, &link);
++		if (ret_val)
++			return ret_val;
++
++		if (!link)
++			DEBUGFUNC("Link taking longer than expected.\n");
++
++		/* Try once more */
++		ret_val = e1000_phy_has_link_generic(hw, PHY_FORCE_LIMIT,
++						     100000, &link);
++	}
++
++	return ret_val;
++}
++
+ /**
+  *  e1000_phy_force_speed_duplex_m88 - Force speed/duplex for m88 PHY
+  *  @hw: pointer to the HW structure
+@@ -2614,6 +2683,29 @@
+ 	}
+ 
+ 	return ret_val;
++}
++
++s32 igb_get_phy_info_bcm(struct e1000_hw *hw)
++{
++	struct e1000_phy_info *phy = &hw->phy;
++	s32 ret_val;
++	bool link;
++
++	if (phy->media_type != e1000_media_type_copper) {
++		DEBUGFUNC("Phy info is only valid for copper media\n");
++		return -E1000_ERR_CONFIG;
++	}
++
++	ret_val = e1000_phy_has_link_generic(hw, 1, 0, &link);
++	if (ret_val)
++		return ret_val;
++
++	if (!link) {
++		DEBUGFUNC("Phy info is only valid if link is up\n");
++		return -E1000_ERR_CONFIG;
++	}
++
++	return ret_val;
+ }
+ 
+ /**
+diff -Nu a/drivers/net/ethernet/intel/igb/e1000_phy.h b/drivers/net/ethernet/intel/igb/e1000_phy.h
+--- a/drivers/net/ethernet/intel/igb/e1000_phy.h	2017-06-20 16:44:27.000000000 +0800
++++ b/drivers/net/ethernet/intel/igb/e1000_phy.h	2017-06-20 17:01:24.000000000 +0800
+@@ -99,6 +99,9 @@
+ s32 e1000_write_phy_reg_mphy(struct e1000_hw *hw, u32 address, u32 data,
+ 			     bool line_override);
+ bool e1000_is_mphy_ready(struct e1000_hw *hw);
++s32  igb_copper_link_setup_bcm(struct e1000_hw *hw);
++s32  igb_phy_force_speed_duplex_bcm(struct e1000_hw *hw);
++s32  igb_get_phy_info_bcm(struct e1000_hw *hw);
+ 
+ #define E1000_MAX_PHY_ADDR		8
+ 
+diff -Nu a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
+--- a/drivers/net/ethernet/intel/igb/igb_main.c	2017-06-20 16:44:27.000000000 +0800
++++ b/drivers/net/ethernet/intel/igb/igb_main.c	2017-06-20 17:01:29.000000000 +0800
+@@ -4814,6 +4814,14 @@
+ 						   &adapter->link_speed,
+ 						   &adapter->link_duplex);
+ 
++			switch (hw->phy.type) {
++			       case e1000_phy_bcm54616:
++			           bcm54616s_linkup(hw, adapter->link_speed, adapter->link_duplex);
++			           break;
++			       default:
++			           break;
++			}
++
+ 			ctrl = E1000_READ_REG(hw, E1000_CTRL);
+ 			/* Links status message must follow this format */
+ 			netdev_info(netdev,
+diff -Nu a/drivers/net/ethernet/intel/igb/Makefile b/drivers/net/ethernet/intel/igb/Makefile
+--- a/drivers/net/ethernet/intel/igb/Makefile	2017-06-20 16:44:27.000000000 +0800
++++ b/drivers/net/ethernet/intel/igb/Makefile	2017-06-20 17:01:34.000000000 +0800
+@@ -35,4 +35,4 @@
+ 	e1000_mac.o e1000_nvm.o e1000_phy.o e1000_mbx.o \
+ 	e1000_i210.o igb_ptp.o igb_hwmon.o \
+ 	e1000_manage.o igb_param.o kcompat.o e1000_api.o \
+-	igb_vmdq.o igb_procfs.o igb_debugfs.o
++	igb_vmdq.o igb_procfs.o igb_debugfs.o bcm_phy.o

packages/base/any/kernels/3.16-lts/patches/series

@@ -25,3 +25,4 @@ platform-powerpc-85xx-Makefile.patch
 platform-powerpc-dni-7448-r0.patch
 platform-powerpc-quanta-lb9-r0.patch
 driver-support-intel-igb-bcm50210-phy.patch
+driver-igb-netberg-aurora.patch

packages/base/any/kernels/3.2-lts/configs/arm-iproc-all/Makefile

@@ -26,6 +26,8 @@ ifndef K_TARGET_DIR
 K_TARGET_DIR := $(THIS_DIR)
 endif
 
+K_PATCH_DIR := $(THIS_DIR)/patches
+
 include ../../kconfig.mk
 K_CONFIG := arm-iproc-all.config
 K_BUILD_TARGET := Image